diff --git a/srcpkgs/jpeg/jpeg-devel.template b/srcpkgs/jpeg/jpeg-devel.template index 2282357510..05d93a5ba1 100644 --- a/srcpkgs/jpeg/jpeg-devel.template +++ b/srcpkgs/jpeg/jpeg-devel.template @@ -5,15 +5,12 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 replaces="jpeg-devel>=0" Add_dependency run glibc-devel -Add_dependency run jpeg +Add_dependency run jpeg ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib } diff --git a/srcpkgs/jpeg/jpeg-tools.template b/srcpkgs/jpeg/jpeg-tools.template index b694c6bb7e..6468e3106d 100644 --- a/srcpkgs/jpeg/jpeg-tools.template +++ b/srcpkgs/jpeg/jpeg-tools.template @@ -5,12 +5,9 @@ long_desc="${long_desc} This package contains tools to manipulate JPG files." -revision=2 replaces="jpeg-tools>=0" - -do_install() -{ - mkdir -p ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/{bin,share} ${DESTDIR}/usr +do_install() { + vmove usr/bin usr + vmove usr/share usr } diff --git a/srcpkgs/jpeg/template b/srcpkgs/jpeg/template index 0bc720c5eb..bbb11c6e92 100644 --- a/srcpkgs/jpeg/template +++ b/srcpkgs/jpeg/template @@ -1,7 +1,7 @@ # Template build file for 'jpeg'. pkgname=jpeg -version=8c -revision=2 +version=8d +homepage="http://www.ijg.org" distfiles="http://www.ijg.org/files/jpegsrc.v${version}.tar.gz" build_style=gnu-configure make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr @@ -9,7 +9,8 @@ make_install_target="prefix=$XBPS_DESTDIR/$pkgname-$version/usr configure_args="--enable-shared --enable-static" short_desc="IJG's jpeg compression utilities" maintainer="Juan RP " -checksum=edfc0b3e004b2fe58ffeeec89f96e3a3c28972c46725ec127d01edf8a1cc7c9a +license="Unknown" +checksum=00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 long_desc=" The jpeg package contains a library of functions for manipulating JPEG images, as well as simple client programs for accessing the @@ -23,7 +24,6 @@ long_desc=" subpackages="jpeg-devel jpeg-tools" replaces="jpeg>=0" -post_install() -{ - install -D -m644 ${wrksrc}/jpegint.h ${DESTDIR}/usr/include +post_install() { + vinstall jpegint.h 644 usr/include }