Reverted to old pkgbuild way, but adding patches later