diff --git a/srcpkgs/endless-sky-data b/srcpkgs/endless-sky-data deleted file mode 120000 index 9931a47c7f..0000000000 --- a/srcpkgs/endless-sky-data +++ /dev/null @@ -1 +0,0 @@ -endless-sky \ No newline at end of file diff --git a/srcpkgs/endless-sky/patches/paths.patch b/srcpkgs/endless-sky/patches/paths.patch index cf765e07cf..8516bdfb93 100644 --- a/srcpkgs/endless-sky/patches/paths.patch +++ b/srcpkgs/endless-sky/patches/paths.patch @@ -1,15 +1,15 @@ ---- SConstruct.old 2017-12-06 12:54:20.524502000 -0800 -+++ SConstruct 2017-12-12 12:39:21.764384877 -0800 -@@ -18,7 +18,7 @@ - env.Append(LINKFLAGS = ["-static-libstdc++"]) - - opts = Variables() --opts.Add(PathVariable("PREFIX", "Directory to install under", "/usr/local", PathVariable.PathIsDirCreate)) -+opts.Add(PathVariable("PREFIX", "Directory to install under", "/usr", PathVariable.PathIsDirCreate)) - opts.Add(PathVariable("DESTDIR", "Destination root directory", "", PathVariable.PathAccept)) - opts.Add(EnumVariable("mode", "Compilation mode", "release", allowed_values=("release", "debug", "profile"))) +--- SConstruct ++++ SConstruct +@@ -41,7 +41,7 @@ + PathVariable("BUILDDIR", "Directory to store compiled object files in", "build", PathVariable.PathIsDirCreate), + PathVariable("BIN_DIR", "Directory to store binaries in", ".", PathVariable.PathIsDirCreate), + PathVariable("DESTDIR", "Destination root directory, e.g. if building a package", "", PathVariable.PathAccept), +- PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr/local", PathVariable.PathIsDirCreate), ++ PathVariable("PREFIX", "Directory to install under (will be prefixed by DESTDIR)", "/usr", PathVariable.PathIsDirCreate), + ) opts.Update(env) -@@ -66,7 +66,7 @@ + Help(opts.GenerateHelpText(env)) +@@ -150,7 +150,7 @@ # Install the binary: diff --git a/srcpkgs/endless-sky/template b/srcpkgs/endless-sky/template index bb0215fd6f..11927a76af 100644 --- a/srcpkgs/endless-sky/template +++ b/srcpkgs/endless-sky/template @@ -1,7 +1,7 @@ # Template file for 'endless-sky' pkgname=endless-sky -version=0.9.12 -revision=3 +version=0.9.13 +revision=1 build_style=scons makedepends="SDL2-devel glew-devel libjpeg-turbo-devel libmad-devel libopenal-devel libpng-devel" @@ -11,11 +11,5 @@ maintainer="CoolOhm " license="GPL-3.0-or-later" homepage="http://endless-sky.github.io/" distfiles="https://github.com/endless-sky/endless-sky/archive/v${version}.tar.gz" -checksum=31f76ac11666415478678d924174d43a620a7fd1093e95131776aed12b912eb4 - -endless-sky-data_package() { - short_desc+=" - data files" - pkg_install() { - vmove usr/share/games/endless-sky - } -} +checksum=001c8a28bbec7491f2725fbaa52b1ade813d33cec2d16521f241c80d04685b9d +replaces="endless-sky-data>=0"