diff --git a/srcpkgs/jack/jack-devel.template b/srcpkgs/jack/jack-devel.template deleted file mode 100644 index ec0445bdb3..0000000000 --- a/srcpkgs/jack/jack-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'jack-devel'. -# -noarch=yes -depends="libjack>=${version}" -short_desc="${short_desc} (Development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/jack/libjack.template b/srcpkgs/jack/libjack.template deleted file mode 100644 index 9dbf7516dc..0000000000 --- a/srcpkgs/jack/libjack.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'libjack'. -# -short_desc="${short_desc} (Runtime library)" -long_desc="${long_desc} - - This package contains the JACK runtime lib(s)." - -do_install() { - vmove "usr/lib/*.so*" usr/lib - vmove usr/lib/jack usr/lib -} - - diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template index 1cad029946..333231838d 100644 --- a/srcpkgs/jack/template +++ b/srcpkgs/jack/template @@ -2,10 +2,9 @@ pkgname=jack version=1.9.9.5 build_style=waf -revision=1 +revision=2 configure_args="--alsa --classic --dbus" # XXX libffado (firewire) -subpackages="libjack jack-devel" makedepends="python pkg-config libsamplerate-devel readline-devel dbus-devel celt-devel" short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)" @@ -36,3 +35,27 @@ post_install() { vinstall ${FILESDIR}/40-hpet-permissions.rules \ 644 usr/lib/udev/rules.d } + +libjack_package() { + short_desc="${short_desc} -- runtime library" + pkg_install() { + vmove "usr/lib/*.so*" + vmove usr/lib/jack + } +} + +jack-devel_package() { + depends="libjack>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +jack_package() { + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/jansson/jansson-devel.template b/srcpkgs/jansson/jansson-devel.template deleted file mode 100644 index e07464b3dd..0000000000 --- a/srcpkgs/jansson/jansson-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'jansson-devel'. -# -depends="${sourcepkg}>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/jansson/template b/srcpkgs/jansson/template index f5fe0c846c..b17c65002d 100644 --- a/srcpkgs/jansson/template +++ b/srcpkgs/jansson/template @@ -2,7 +2,6 @@ pkgname=jansson version=2.4 revision=1 -subpackages="${pkgname}-devel" build_style=gnu-configure short_desc="Library for encoding, decoding and manipulating JSON data" maintainer="Juan RP " @@ -14,3 +13,19 @@ checksum=de589151586e0766a08921f3167953a3ed62079be828bcc949cd9b2b6dcfaf90 post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} } + +jansson-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + } +} + +jansson_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/jasper/jasper-devel.template b/srcpkgs/jasper/jasper-devel.template deleted file mode 100644 index 5495e1cae9..0000000000 --- a/srcpkgs/jasper/jasper-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'jasper-devel'. -# -noarch=yes -depends="libjpeg-turbo-devel libjasper>=${version}" -short_desc="${sourcepkg} - development files" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr -} diff --git a/srcpkgs/jasper/libjasper.template b/srcpkgs/jasper/libjasper.template deleted file mode 100644 index 54b3772341..0000000000 --- a/srcpkgs/jasper/libjasper.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libjasper'. -# -short_desc="${sourcepkg} - shared library" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/jasper/template b/srcpkgs/jasper/template index a376005918..ca7079e46d 100644 --- a/srcpkgs/jasper/template +++ b/srcpkgs/jasper/template @@ -1,8 +1,7 @@ # Template build file for 'jasper'. pkgname=jasper version=1.900.1 -revision=6 -subpackages="libjasper $pkgname-devel" +revision=7 build_style=gnu-configure configure_args="--enable-shared --disable-static --without-x --disable-opengl" makedepends="unzip libjpeg-turbo-devel" @@ -16,3 +15,24 @@ checksum=6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494 post_install() { vinstall LICENSE 644 usr/share/licenses/jasper } + +libjasper_package() { + short_desc+=" - shared library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +jasper-devel_package() { + depends="libjpeg-turbo-devel libjasper>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + } +} + +jasper_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/john/template b/srcpkgs/john/template index d602c28027..37e7a96785 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -5,7 +5,6 @@ _jumbover=5 revision=1 wrksrc=${pkgname}-${version}-jumbo-${_jumbover} makedepends="libgomp-devel openssl-devel" -conf_files="/etc/john/john.conf" short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)" maintainer="Juan RP " license="GPL-2" @@ -29,9 +28,9 @@ do_build() { sed -i 's|-m486||g' src/Makefile sed -i 's|#OMPFLAGS = -fopenmp|OMPFLAGS = -fopenmp|' src/Makefile - if [ "${XBPS_MACHINE}" = "x86_64" ]; then + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then make ${makejobs} -C src linux-x86-64 - elif [ "${XBPS_MACHINE}" = "i686" ]; then + elif [ "${XBPS_TARGET_MACHINE" = "i686" ]; then make ${makejobs} -C src linux-x86-mmx fi } @@ -64,3 +63,11 @@ do_install() { ln -s john ssh2john ln -s john zip2john } + +john_package() { + conf_files="/etc/john/john.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template index e5245dac85..6abcc5c4cf 100644 --- a/srcpkgs/jre/template +++ b/srcpkgs/jre/template @@ -5,10 +5,10 @@ version=7u10 revision=1 wrksrc="jre${_extraversion}" -if [ "${XBPS_MACHINE}" = "x86_64" ]; then +if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-x64.tar.gz" checksum=a2a45566f4a87e70c0e13577d3bf2b7eeabcdda3279958a75ded1ece96e070d1 -else +elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then distfiles="http://uni-smr.ac.ru/archive/dev/java/JRE/oracle/7/jre-${version}-linux-i586.tar.gz" checksum=0e91c275a87dc1ba049df3cfef16eb958199d80e55bea6a3555900d309615199 fi @@ -17,15 +17,9 @@ short_desc="Oracle's Java Runtime Environment (JRE) - Version 7" maintainer="davehome " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" license="oracle" +only_for_archs="i686 x86_64" -nonfree=yes -nostrip=yes -depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info" -provides="java-runtime-${version}" -replaces="java-runtime>=0" - -do_install() -{ +do_install() { # Install desktop related items vmkdir usr/share vcopy lib/desktop/icons usr/share @@ -76,3 +70,15 @@ do_install() echo "/usr/share/java/jre/lib/${_arch}" > \ ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf } + +jre_package() { + nonfree=yes + nostrip=yes + depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info" + provides="java-runtime-${version}" + replaces="java-runtime>=0" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/js/js-devel.template b/srcpkgs/js/js-devel.template deleted file mode 100644 index d24482e95d..0000000000 --- a/srcpkgs/js/js-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'gjs-devel'. -# -depends="nspr-devel js" -short_desc="${sourcepkg} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - vmove usr/bin usr - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/js/template b/srcpkgs/js/template index d5e3adf1ee..f45d5d71ec 100644 --- a/srcpkgs/js/template +++ b/srcpkgs/js/template @@ -1,21 +1,35 @@ # Template file for 'js' pkgname=js version=1.8.5 +revision=5 build_wrksrc="js/src" -distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz" build_style=gnu-configure configure_args="--with-system-nspr --enable-threadsafe" -revision=4 makedepends="zip python perl>=0 nspr-devel" short_desc="Spidermonkey JavaScript interpreter and library" homepage="https://developer.mozilla.org/en/docs/SpiderMonkey" license="MPL-1.1, GPL-2, LGPL-2.1" maintainer="Juan RP " +distfiles="${MOZILLA_SITE}/js/js185-1.0.0.tar.gz" checksum=5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687 long_desc=" SpiderMonkey 1.8.5 is the JavaScript engine that shipped in Firefox 4.0. It is much faster than SpiderMonkey 1.8, implements ES-5 (ECMA 262, 5th Edition), and contains many new language and API features." -subpackages="js-devel" +js-devel_package() { + depends="nspr-devel js>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} +js_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/json-c/json-c-devel.template b/srcpkgs/json-c/json-c-devel.template deleted file mode 100644 index b23d978327..0000000000 --- a/srcpkgs/json-c/json-c-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'json-c-devel'. -# -depends="json-c" -short_desc="${sourcepkg} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - vmove "usr/lib/*.a" usr/lib - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template index 44f95300e5..d9818fded5 100644 --- a/srcpkgs/json-c/template +++ b/srcpkgs/json-c/template @@ -1,22 +1,35 @@ # Template build file for 'json-c'. pkgname=json-c version=0.9 -homepage="http://oss.metaparadigm.com/$pkgname" -distfiles="$homepage/$pkgname-$version.tar.gz" +revision=3 build_style=gnu-configure -revision=2 short_desc="A JSON implementation in C" maintainer="Juan RP " license="MIT" +homepage="http://oss.metaparadigm.com/$pkgname" +distfiles="$homepage/$pkgname-$version.tar.gz" checksum=702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475 long_desc=" JSON-C implements a reference counting object model that allows you to easily construct JSON objects in C, output them as JSON formatted strings and parse JSON formatted strings back into the C representation of JSON objects." -subpackages="${pkgname}-devel" - -post_install() -{ +post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +json-c-devel_package() { + depends="json-c>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove "usr/lib/*.a" + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +json-c_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/json-glib/json-glib-devel.template b/srcpkgs/json-glib/json-glib-devel.template deleted file mode 100644 index 4dc880904e..0000000000 --- a/srcpkgs/json-glib/json-glib-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'json-glib-devel'. -# -depends="glib-devel json-glib>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove "usr/lib/*.a" usr/lib - vmove usr/include usr - vmove usr/share usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template index b0f66216c3..e2f324d5d6 100644 --- a/srcpkgs/json-glib/template +++ b/srcpkgs/json-glib/template @@ -3,10 +3,9 @@ pkgname=json-glib version=0.15.2 revision=1 configure_args="--enable-static --with-pic=yes" -subpackages="${pkgname}-devel" build_style=gnu-configure hostmakedepends="pkg-config gobject-introspection" -makedepends="glib-devel" +makedepends="libglib-devel" short_desc="A JSON parser for GLib-based libraries and applications" maintainer="Juan RP " homepage="http://live.gnome.org/JsonGlib" @@ -20,3 +19,20 @@ long_desc=" structures, using a DOM-like API. JSON-GLib also offers GObject integration, providing the ability to serialize and deserialize GObject instances to and from JSON data types." + +json-glib-devel_package() { + depends="glib-devel json-glib>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove "usr/lib/*.a" + vmove usr/include + vmove usr/share + vmove usr/lib/pkgconfig + } +} + +json-glib_package() { + pkg_install() { + vmove usr + } +}