diff --git a/srcpkgs/gd/depends b/srcpkgs/gd/depends index 7814dba774..58353b7c1b 100644 --- a/srcpkgs/gd/depends +++ b/srcpkgs/gd/depends @@ -1,2 +1,2 @@ abi_depends=">=2.0.35" -api_depends="${abi_depends}" +api_depends=">=2.0.35_4" # gdlib-config in -devel subpkg. diff --git a/srcpkgs/gd/gd-devel.template b/srcpkgs/gd/gd-devel.template index 32dacfee5d..16b1de7781 100644 --- a/srcpkgs/gd/gd-devel.template +++ b/srcpkgs/gd/gd-devel.template @@ -5,7 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=3 +revision=4 Add_dependency run libXpm-devel Add_dependency run libX11-devel @@ -14,12 +14,10 @@ Add_dependency run fontconfig-devel Add_dependency run freetype-devel Add_dependency run libpng-devel Add_dependency run zlib-devel -Add_dependency run glibc-devel Add_dependency run gd -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/bin/gdlib-config usr/bin } diff --git a/srcpkgs/gd/gd-progs.template b/srcpkgs/gd/gd-progs.template index 7505f939f3..4dc2f6e8f3 100644 --- a/srcpkgs/gd/gd-progs.template +++ b/srcpkgs/gd/gd-progs.template @@ -6,12 +6,10 @@ long_desc="${long_desc} This package contains the utility programs that use the GD library." -revision=5 +revision=6 Add_dependency run perl ">=0" -do_install() -{ - mkdir -p ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr +do_install() { + vmove usr/bin usr }