From 041800bfd3189f4b52054a39da775b7d7cba3df3 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 14 Apr 2013 15:20:19 +0200 Subject: [PATCH] Convert packages to the new template format (u). --- srcpkgs/uboot-mkimage/template | 6 ++++ srcpkgs/ucl/template | 6 ++++ srcpkgs/udis86/template | 16 +++++++++- srcpkgs/udis86/udis86-devel.template | 7 ----- srcpkgs/udisks/template | 9 +++++- srcpkgs/udisks2/template | 23 ++++++++++++-- srcpkgs/udisks2/udisks2-devel.template | 12 -------- srcpkgs/ufw/template | 17 ++++++++--- srcpkgs/uml-utilities/template | 12 +++++--- srcpkgs/unrar/template | 10 ++++-- srcpkgs/unzip/template | 42 +++++++++++++++----------- srcpkgs/upower/template | 26 +++++++++++++--- srcpkgs/upower/upower-devel.template | 11 ------- srcpkgs/upx/template | 6 ++++ srcpkgs/urlgrabber/template | 15 ++++++--- srcpkgs/usbutils/template | 15 ++++++--- srcpkgs/uwsgi/template | 10 ++++-- 17 files changed, 163 insertions(+), 80 deletions(-) delete mode 100644 srcpkgs/udis86/udis86-devel.template delete mode 100644 srcpkgs/udisks2/udisks2-devel.template delete mode 100644 srcpkgs/upower/upower-devel.template diff --git a/srcpkgs/uboot-mkimage/template b/srcpkgs/uboot-mkimage/template index 20cafc5083..f049f07776 100644 --- a/srcpkgs/uboot-mkimage/template +++ b/srcpkgs/uboot-mkimage/template @@ -22,3 +22,9 @@ do_install() { vinstall tools/mkimage 755 usr/bin vinstall doc/mkimage.1 644 usr/share/man/man1 } + +uboot-mkimage_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ucl/template b/srcpkgs/ucl/template index 98f006fe7d..f6392a30f6 100644 --- a/srcpkgs/ucl/template +++ b/srcpkgs/ucl/template @@ -9,3 +9,9 @@ homepage="http://www.oberhumer.com/opensource/ucl/" license="GPL-2" distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz" checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 + +ucl_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/udis86/template b/srcpkgs/udis86/template index 99c9928e7f..4d5ab2ba53 100644 --- a/srcpkgs/udis86/template +++ b/srcpkgs/udis86/template @@ -9,4 +9,18 @@ license="BSD" homepage="http://udis86.sourceforge.net/" distfiles=${SOURCEFORGE_SITE}/udis86/${pkgname}-${version}.tar.gz checksum=6128d266abcabed6077fdeebd2fbb7fb48eb599efbdae98922de2f6acd82ce3a -subpackages="udis86-devel" + +udis86-devel_package() { + short_desc="${short_desc} - development files" + depends="${sourcepkg}>=${version}" + pkg_install() { + vmove usr/include + vmove usr/lib + } +} + +udis86_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/udis86/udis86-devel.template b/srcpkgs/udis86/udis86-devel.template deleted file mode 100644 index 0b88925cff..0000000000 --- a/srcpkgs/udis86/udis86-devel.template +++ /dev/null @@ -1,7 +0,0 @@ -short_desc="${short_desc} - development files" -depends="${sourcepkg}>=${version}" - -do_install() { - vmove usr/include usr - vmove usr/lib usr -} diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template index 885a3431f8..daac0f9be6 100644 --- a/srcpkgs/udisks/template +++ b/srcpkgs/udisks/template @@ -7,7 +7,6 @@ configure_args="--disable-static --enable-lvm2" makedepends="pkg-config intltool libxslt docbook-xsl device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel dbus-glib-devel libgudev-devel>=183 sg3_utils-devel" -make_dirs="/var/lib/udisks 0750 root root" short_desc="Disk Management Service" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/udisks" @@ -38,3 +37,11 @@ pre_build() { post_install() { vinstall ${FILESDIR}/udisks.service 644 usr/lib/systemd/system } + +udisks_package() { + make_dirs="/var/lib/udisks 0750 root root" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index d8a3e3d04f..bf313d5086 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -1,7 +1,7 @@ # Template file for 'udisks2' pkgname=udisks2 version=2.1.0 -revision=1 +revision=2 wrksrc="udisks-${version}" build_style=gnu-configure configure_args="--disable-static --with-udevdir=/usr/lib/udev @@ -9,11 +9,28 @@ configure_args="--disable-static --with-udevdir=/usr/lib/udev makedepends="pkg-config intltool gobject-introspection libxslt docbook-xsl acl-devel device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel systemd-devel" -subpackages="udisks2-devel" -make_dirs="/var/lib/udisks2 0750 root root" short_desc="Disk Management Service, version 2" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/udisks" license="GPL-2" distfiles="http://udisks.freedesktop.org/releases/udisks-${version}.tar.bz2" checksum=310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8 + +udisks2-devel_package() { + depends="libglib-devel udisks2>=$version" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + vmove usr/share/gtk-doc + } +} + +udisks2_package() { + make_dirs="/var/lib/udisks2 0750 root root" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/udisks2/udisks2-devel.template b/srcpkgs/udisks2/udisks2-devel.template deleted file mode 100644 index 049d1ac5ce..0000000000 --- a/srcpkgs/udisks2/udisks2-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'udisks2-devel'. -# -noarch=yes -depends="glib-devel udisks2>=$version" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gir-1.0 usr/share - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template index c07dea9ac8..58f66f01d7 100644 --- a/srcpkgs/ufw/template +++ b/srcpkgs/ufw/template @@ -3,7 +3,7 @@ pkgname=ufw version=0.33 revision=1 build_style=python-module -fulldepends="iptables python" +makedepends="iptables python" short_desc="Uncomplicated Firewall" maintainer="Juan RP " homepage="https://launchpad.net/ufw" @@ -15,11 +15,18 @@ long_desc=" netfilter firewall. It provides a command line interface and ims to be uncomplicated and easy to use." -noarch=yes -pycompile_module="ufw" -conf_files="/etc/default/ufw /etc/ufw/ufw.conf" - post_install() { vinstall ${FILESDIR}/ufw.service 644 usr/lib/systemd/system vmove "lib/*" usr/lib } + +ufw_package() { + depends="${makedepends}" + conf_files="/etc/default/ufw /etc/ufw/ufw.conf" + noarch="yes" + pycompile_module="ufw" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/uml-utilities/template b/srcpkgs/uml-utilities/template index 03bda1018f..03990b473b 100644 --- a/srcpkgs/uml-utilities/template +++ b/srcpkgs/uml-utilities/template @@ -3,13 +3,13 @@ pkgname=uml-utilities version=20070815 revision=4 wrksrc=tools-${version} -distfiles="http://user-mode-linux.sourceforge.net/uml_utilities_${version}.tar.bz2" build_style=gnu-makefile makedepends="readline-devel fuse-devel" short_desc="User Mode Linux Utilities" homepage="http://user-mode-linux.sourceforge.net" license="GPL-2" maintainer="Juan RP " +distfiles="http://user-mode-linux.sourceforge.net/uml_utilities_${version}.tar.bz2" checksum=f815f591a1c177729546969acf720958c5fd72b8d4d36bae26fdc5b64669b60e long_desc=" User-mode Linux is a port of the Linux kernel to its own system call interface. @@ -20,8 +20,12 @@ long_desc=" This package contains userspace utilities for use with User-mode Linux, including uml_mconsole, uml_moo, uml_switch, uml_net and tunctl." - -pre_build() -{ +pre_build() { sed -i -e "s|lib64|lib|" Makefile } + +uml-utilities_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template index 29eecbf647..783be58c1f 100644 --- a/srcpkgs/unrar/template +++ b/srcpkgs/unrar/template @@ -1,11 +1,10 @@ # Template file for 'unrar' pkgname=unrar version=4.2.1 +revision=1 wrksrc=unrar -nonfree=yes homepage="http://www.rarlab.com/rar" distfiles="${homepage}/unrarsrc-${version}.tar.gz" -revision=1 short_desc="Unarchiver for .rar files (non-free version)" maintainer="Juan RP " license="freeware - see /usr/share/licenses/unrar/license.txt" @@ -23,3 +22,10 @@ do_install() { vinstall unrar 755 usr/bin vinstall license.txt 644 usr/share/licenses/unrar } + +unrar_package() { + nonfree="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/unzip/template b/srcpkgs/unzip/template index 1be811218a..82dd6d7549 100644 --- a/srcpkgs/unzip/template +++ b/srcpkgs/unzip/template @@ -1,31 +1,37 @@ # Template file for 'unzip' pkgname=unzip version=6.0 -homepage="http://infozip.sf.net/" -license="BSD" +revision=2 makedepends="bzip2-devel" wrksrc=unzip60 -distfiles="${SOURCEFORGE_SITE}/infozip/${pkgname}60.tar.gz" -revision=2 short_desc="List, test and extract compressed files in a ZIP archive" maintainer="Juan RP " +homepage="http://infozip.sf.net/" +license="BSD" +distfiles="${SOURCEFORGE_SITE}/infozip/${pkgname}60.tar.gz" checksum=036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 -CFLAGS="-D_FILE_OFFSET_BITS=64 -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT" -CFLAGS="${CFLAGS} -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE" -CFLAGS="${CFLAGS} -DNO_LCHMOD -DDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNATIVE" +do_build() { + CFLAGS="-D_FILE_OFFSET_BITS=64 -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT \ + -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE \ + -DNO_LCHMOD -LDDATE_FORMAT=DF_YMD -DUSE_BZIP2 -DNATIVE" -do_build() -{ - cd ${wrksrc} && make ${makejobs} -f unix/Makefile LOCAL_UNZIP="$CFLAGS" \ - prefix=/usr LF2="" CC=$CC D_USE_BZ2=-DUSE_BZIP2 \ - L_BZ2=-lbz2 unzips || return 1 + make ${makejobs} -f unix/Makefile LOCAL_UNZIP="$CFLAGS" \ + prefix=/usr LF2="" CC=$CC CFLAGS="$CFLAGS" \ + D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips } -do_install() -{ - cd ${wrksrc} && make ${makejobs} -f unix/Makefile prefix=${DESTDIR}/usr \ - LN='ln -fs' INSTALL_PROGRAM="install" install || return 1 - mkdir -p ${DESTDIR}/usr/share && \ - mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share +do_install() { + cd ${wrksrc} + make ${makejobs} -f unix/Makefile prefix=${DESTDIR}/usr \ + LN='ln -fs' INSTALL_PROGRAM="install" install + + vmkdir usr/share + mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share +} + +unzip_package() { + pkg_install() { + vmove usr + } } diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index b117f19f8b..d2cbcc8f6f 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -1,15 +1,13 @@ # Template file for 'upower' pkgname=upower version=0.9.20 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static --with-backend=linux --without-idevice --enable-systemd --with-systemdutildir=/usr/lib/systemd --with-systemdsystemunitdir=/usr/lib/systemd/system" -conf_files="/etc/UPower/UPower.conf" -subpackages="upower-devel" -makedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection - libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel" +hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" +makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel" short_desc="Abstraction for enumerating power devices" maintainer="Juan RP " license="GPL-2" @@ -20,3 +18,21 @@ checksum=6817237486561294b1004a9a50a01a4d69f17e8d708c6baf9d92104fe2e6e184 pre_configure() { sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure } + +upower-devel_package() { + depends="dbus-devel libglib-devel upower>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + } +} + +upower_package() { + conf_files="/etc/UPower/UPower.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/upower/upower-devel.template b/srcpkgs/upower/upower-devel.template deleted file mode 100644 index 4cc92459e6..0000000000 --- a/srcpkgs/upower/upower-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'upower-devel'. -# -noarch=yes -depends="dbus-devel glib-devel upower>=$version" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gir-1.0 usr/share -} diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template index 3c608278f5..951674c764 100644 --- a/srcpkgs/upx/template +++ b/srcpkgs/upx/template @@ -20,3 +20,9 @@ do_install() { vinstall src/upx.out 755 usr/bin upx vinstall doc/upx.1 644 usr/share/man/man1 } + +upx_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/urlgrabber/template b/srcpkgs/urlgrabber/template index 9c2e977439..8081c36722 100644 --- a/srcpkgs/urlgrabber/template +++ b/srcpkgs/urlgrabber/template @@ -2,13 +2,13 @@ pkgname=urlgrabber version=3.9.1 revision=2 -distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz" build_style=python-module -fulldepends="python>=0 pycurl" +makedepends="python pycurl" short_desc="A high-level cross-protocol url-grabber and Python library" homepage="http://urlgrabber.baseurl.org/" license="LGPL-2.1" maintainer="Juan RP " +distfiles="http://urlgrabber.baseurl.org/download/$pkgname-$version.tar.gz" checksum=4437076c8708e5754ea04540e46c7f4f233734ee3590bb8a96389264fb0650d0 long_desc=" urlgrabber is a pure python package that drastically simplifies the fetching @@ -19,6 +19,11 @@ long_desc=" those pesky file-fetching details, and lets you focus on whatever it is that your program is written to do!" -noarch=yes -pycompile_module="$pkgname" - +urlgrabber_package() { + depends="${makedepends}" + noarch="yes" + pycompile_module="urlgrabber" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template index edb6fff86d..96276479f2 100644 --- a/srcpkgs/usbutils/template +++ b/srcpkgs/usbutils/template @@ -2,14 +2,14 @@ pkgname=usbutils version=006 revision=1 +build_style=gnu-configure +configure_args="--datadir=/usr/share/hwdata --disable-zlib" +hostmakedepends="pkg-config which hwids" +makedepends="libusb-devel" homepage="http://linux-usb.sourceforge.net/" short_desc="Linux USB utilities" maintainer="Juan RP " license="GPL-2" -build_style=gnu-configure -configure_args="--datadir=/usr/share/hwdata --disable-zlib" -makedepends="pkg-config which libusb-devel" -fulldepends="hwids" distfiles="${KERNEL_SITE}/utils/usb/$pkgname/${pkgname}-${version}.tar.xz" checksum=d9b5b5e7e5f797896e42efaa0a1f83089210bfed79312c1f04dd30b4f729ed0e long_desc=" @@ -24,3 +24,10 @@ post_install() { # Remove update-usbids.sh - handled by hwids rm -f ${DESTDIR}/usr/sbin/update-usbids.sh } + +usbutils_package() { + depends="hwids" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template index 1e9167351d..658ec1bd1c 100644 --- a/srcpkgs/uwsgi/template +++ b/srcpkgs/uwsgi/template @@ -1,9 +1,8 @@ # Template file for 'uwsgi' pkgname=uwsgi version=1.2.4 -revision=1 +revision=2 build_style=python-module -pycompile_dirs="." makedepends="sqlite-devel python-devel python-distribute libxml2-devel" short_desc="Fast, self-healing application container server" maintainer="Juan RP " @@ -22,3 +21,10 @@ long_desc=" It uses the uwsgi (all lowercase, already included by default in the Nginx and Cherokee releases) protocol for all the networking/interprocess communications, but it can speak other protocols as well (http, fastcgi, mongrel2...)" + +uwsgi_package() { + pycompile_module="uwsgidecorators.py" + pkg_install() { + vmove usr + } +}