diff --git a/srcpkgs/samba/libsmbclient.template b/srcpkgs/samba/libsmbclient.template deleted file mode 100644 index 6297b0ef5c5..00000000000 --- a/srcpkgs/samba/libsmbclient.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libsmbclient'. -# -short_desc="Shared libraries for communication with SMB/CIFS servers" -depends="mit-krb5-libs>=1.10.1" - -do_install() { - vmove "usr/lib/libwbclient.so*" usr/lib - vmove "usr/lib/libsmbclient.so*" usr/lib - vmove usr/share/man/man7/libsmbclient.7 usr/share/man/man7 -} diff --git a/srcpkgs/samba/samba-devel.template b/srcpkgs/samba/samba-devel.template deleted file mode 100644 index 5e55769ed41..00000000000 --- a/srcpkgs/samba/samba-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'samba-devel'. -# -noarch=yes -depends="libsmbclient>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/samba/smbclient.template b/srcpkgs/samba/smbclient.template deleted file mode 100644 index 04e886320ee..00000000000 --- a/srcpkgs/samba/smbclient.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'smbclient'. -# -short_desc="Command-line SMB/CIFS clients for Unix" - -do_install() { - vmove usr/bin usr - vmove usr/share/man/man1 usr/share/man -} diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 1db70a45cf4..327978d7529 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba version=3.6.12 -revision=1 +revision=2 build_wrksrc=source3 build_style=gnu-configure configure_args="--with-fhs --with-pam --with-pam_smbpass --with-ldap @@ -19,18 +19,10 @@ homepage="http://www.samba.org" distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz" checksum=6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b -conf_files="/etc/samba/smb.conf /etc/pam.d/samba" -subpackages="smbclient libsmbclient samba-devel" makedepends="pkg-config perl readline-devel python-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel>=1.10.1 libldap-devel pam-devel acl-devel avahi-libs-devel tdb-devel talloc-devel cups-devel" -# Don't restart services automatically. -systemd_services=" -nmbd.service off -smbd.service off -winbindd.service off" - post_install() { cd ${wrksrc} # conf file @@ -70,3 +62,42 @@ post_install() { # PAM support vinstall ${FILESDIR}/samba.pam 644 etc/pam.d samba } + +smbclient_package() { + short_desc="Command-line SMB/CIFS clients for Unix" + pkg_install() { + vmove usr/bin + vmove usr/share/man/man1 + } +} + +libsmbclient_package() { + short_desc="Shared libraries for communication with SMB/CIFS servers" + depends="mit-krb5-libs>=1.10.1" + pkg_install() { + vmove "usr/lib/libwbclient.so*" + vmove "usr/lib/libsmbclient.so*" + vmove usr/share/man/man7/libsmbclient.7 + } +} + +samba-devel_package() { + depends="libsmbclient>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + } +} + +samba_package() { + conf_files="/etc/samba/smb.conf /etc/pam.d/samba" + # Don't restart services automatically. + systemd_services=" + nmbd.service off + smbd.service off + winbindd.service off" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/sane/libsane.template b/srcpkgs/sane/libsane.template deleted file mode 100644 index 7f6a37bd6af..00000000000 --- a/srcpkgs/sane/libsane.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libsane'. -# -short_desc="${short_desc} - runtime shared library" - -do_install() { - vmove "usr/lib/libsane.so.*" usr/lib - cd ${DESTDIR}/usr/lib && ln -sf libsane.so.1 libsane.so -} diff --git a/srcpkgs/sane/sane-devel.template b/srcpkgs/sane/sane-devel.template deleted file mode 100644 index 37fc26cf712..00000000000 --- a/srcpkgs/sane/sane-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'sane-devel'. -# -noarch=yes -depends="libsane>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/bin/sane-config usr/bin - vmove usr/share/man/man1/sane-config.1 usr/share/man/man1 - vinstall tools/sane-backends.pc 644 usr/lib/pkgconfig -} diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index d8afb971ebd..12b778105af 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -1,16 +1,13 @@ # Template build file for 'sane'. pkgname=sane version=1.0.23 -revision=2 +revision=3 wrksrc="sane-backends-${version}" -subpackages="lib${pkgname} $pkgname-devel" build_style=gnu-configure configure_args="--disable-locking --enable-avahi --with-docdir=/usr/share/doc/sane --disable-latex --enable-libusb_1_0 --enable-pthread" -depends="net-snmp" makedepends="pkg-config avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel net-snmp-devel libieee1284-devel" -systemd_services="saned.socket on" short_desc="Scanner Access Now Easy" maintainer="Juan RP " homepage="http://www.sane-project.org/" @@ -19,85 +16,6 @@ license="GPL-2" distfiles="ftp://ftp.archlinux.org/other/sane/sane-backends-${version}.tar.gz" checksum=4d4f5b2881615af7fc0ed75fdde7dc623a749e80e40f3f792fe4010163cbb029 -conf_files=" -/etc/sane.d/abaton.conf -/etc/sane.d/agfafocus.conf -/etc/sane.d/apple.conf -/etc/sane.d/artec.conf -/etc/sane.d/artec_eplus48u.conf -/etc/sane.d/avision.conf -/etc/sane.d/bh.conf -/etc/sane.d/canon.conf -/etc/sane.d/canon630u.conf -/etc/sane.d/canon_dr.conf -/etc/sane.d/canon_pp.conf -/etc/sane.d/cardscan.conf -/etc/sane.d/coolscan.conf -/etc/sane.d/coolscan2.conf -/etc/sane.d/coolscan3.conf -/etc/sane.d/dc210.conf -/etc/sane.d/dc240.conf -/etc/sane.d/dc25.conf -/etc/sane.d/dell1600n_net.conf -/etc/sane.d/dll.conf -/etc/sane.d/dmc.conf -/etc/sane.d/epjitsu.conf -/etc/sane.d/epson.conf -/etc/sane.d/epson2.conf -/etc/sane.d/fujitsu.conf -/etc/sane.d/genesys.conf -/etc/sane.d/gphoto2.conf -/etc/sane.d/gt68xx.conf -/etc/sane.d/hp.conf -/etc/sane.d/hp3900.conf -/etc/sane.d/hp4200.conf -/etc/sane.d/hp5400.conf -/etc/sane.d/hpsj5s.conf -/etc/sane.d/hs2p.conf -/etc/sane.d/ibm.conf -/etc/sane.d/kodak.conf -/etc/sane.d/kodakaio.conf -/etc/sane.d/leo.conf -/etc/sane.d/lexmark.conf -/etc/sane.d/ma1509.conf -/etc/sane.d/magicolor.conf -/etc/sane.d/matsushita.conf -/etc/sane.d/microtek.conf -/etc/sane.d/microtek2.conf -/etc/sane.d/mustek.conf -/etc/sane.d/mustek_pp.conf -/etc/sane.d/mustek_usb.conf -/etc/sane.d/nec.conf -/etc/sane.d/net.conf -/etc/sane.d/p5.conf -/etc/sane.d/pie.conf -/etc/sane.d/pixma.conf -/etc/sane.d/plustek.conf -/etc/sane.d/plustek_pp.conf -/etc/sane.d/qcam.conf -/etc/sane.d/ricoh.conf -/etc/sane.d/rts8891.conf -/etc/sane.d/s9036.conf -/etc/sane.d/saned.conf -/etc/sane.d/sceptre.conf -/etc/sane.d/sharp.conf -/etc/sane.d/sm3840.conf -/etc/sane.d/snapscan.conf -/etc/sane.d/sp15c.conf -/etc/sane.d/st400.conf -/etc/sane.d/stv680.conf -/etc/sane.d/tamarack.conf -/etc/sane.d/teco1.conf -/etc/sane.d/teco2.conf -/etc/sane.d/teco3.conf -/etc/sane.d/test.conf -/etc/sane.d/u12.conf -/etc/sane.d/umax.conf -/etc/sane.d/umax1220u.conf -/etc/sane.d/umax_pp.conf -/etc/sane.d/v4l.conf -/etc/sane.d/xerox_mfp.conf" - post_install() { # fix hp officejets echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf @@ -108,4 +26,112 @@ post_install() { # Install systemd service. vinstall ${FILESDIR}/saned@.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/saned.socket 644 usr/lib/systemd/system + + cd ${DESTDIR}/usr/lib && ln -sf libsane.so.1 libsane.so + vinstall tools/sane-backends.pc 644 usr/lib/pkgconfig +} + +libsane_package() { + short_desc="${short_desc} - runtime shared library" + pkg_install() { + vmove "usr/lib/libsane.so*" usr/lib + } +} + +sane-devel_package() { + depends="libsane>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/bin/sane-config + vmove usr/share/man/man1/sane-config.1 + vmove usr/lib/pkgconfig + } +} + +sane_package() { + depends="net-snmp" + systemd_services="saned.socket on" + conf_files=" + /etc/sane.d/abaton.conf + /etc/sane.d/agfafocus.conf + /etc/sane.d/apple.conf + /etc/sane.d/artec.conf + /etc/sane.d/artec_eplus48u.conf + /etc/sane.d/avision.conf + /etc/sane.d/bh.conf + /etc/sane.d/canon.conf + /etc/sane.d/canon630u.conf + /etc/sane.d/canon_dr.conf + /etc/sane.d/canon_pp.conf + /etc/sane.d/cardscan.conf + /etc/sane.d/coolscan.conf + /etc/sane.d/coolscan2.conf + /etc/sane.d/coolscan3.conf + /etc/sane.d/dc210.conf + /etc/sane.d/dc240.conf + /etc/sane.d/dc25.conf + /etc/sane.d/dell1600n_net.conf + /etc/sane.d/dll.conf + /etc/sane.d/dmc.conf + /etc/sane.d/epjitsu.conf + /etc/sane.d/epson.conf + /etc/sane.d/epson2.conf + /etc/sane.d/fujitsu.conf + /etc/sane.d/genesys.conf + /etc/sane.d/gphoto2.conf + /etc/sane.d/gt68xx.conf + /etc/sane.d/hp.conf + /etc/sane.d/hp3900.conf + /etc/sane.d/hp4200.conf + /etc/sane.d/hp5400.conf + /etc/sane.d/hpsj5s.conf + /etc/sane.d/hs2p.conf + /etc/sane.d/ibm.conf + /etc/sane.d/kodak.conf + /etc/sane.d/kodakaio.conf + /etc/sane.d/leo.conf + /etc/sane.d/lexmark.conf + /etc/sane.d/ma1509.conf + /etc/sane.d/magicolor.conf + /etc/sane.d/matsushita.conf + /etc/sane.d/microtek.conf + /etc/sane.d/microtek2.conf + /etc/sane.d/mustek.conf + /etc/sane.d/mustek_pp.conf + /etc/sane.d/mustek_usb.conf + /etc/sane.d/nec.conf + /etc/sane.d/net.conf + /etc/sane.d/p5.conf + /etc/sane.d/pie.conf + /etc/sane.d/pixma.conf + /etc/sane.d/plustek.conf + /etc/sane.d/plustek_pp.conf + /etc/sane.d/qcam.conf + /etc/sane.d/ricoh.conf + /etc/sane.d/rts8891.conf + /etc/sane.d/s9036.conf + /etc/sane.d/saned.conf + /etc/sane.d/sceptre.conf + /etc/sane.d/sharp.conf + /etc/sane.d/sm3840.conf + /etc/sane.d/snapscan.conf + /etc/sane.d/sp15c.conf + /etc/sane.d/st400.conf + /etc/sane.d/stv680.conf + /etc/sane.d/tamarack.conf + /etc/sane.d/teco1.conf + /etc/sane.d/teco2.conf + /etc/sane.d/teco3.conf + /etc/sane.d/test.conf + /etc/sane.d/u12.conf + /etc/sane.d/umax.conf + /etc/sane.d/umax1220u.conf + /etc/sane.d/umax_pp.conf + /etc/sane.d/v4l.conf + /etc/sane.d/xerox_mfp.conf" + pkg_install() { + vmove etc + vmove usr + } } diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template index 03dda1b5d8d..b31b9d7925f 100644 --- a/srcpkgs/scons/template +++ b/srcpkgs/scons/template @@ -2,13 +2,13 @@ pkgname=scons version=2.0.1 revision=2 -distfiles="http://prdownloads.sourceforge.net/$pkgname/$pkgname-$version.tar.gz" build_style=python-module -fulldepends="python" +makedepends="python" short_desc="SCons, a software construction tool" maintainer="davehome " homepage="http://www.scons.org/" license="MIT" +distfiles="http://prdownloads.sourceforge.net/$pkgname/$pkgname-$version.tar.gz" checksum=0a8151da41c4a26c776c84f44f747ce03e093d43be3e83b38c14a76ab3256762 long_desc=" SCons is a software construction tool—that is, a superior alternative to the @@ -18,10 +18,16 @@ long_desc=" configuration files are actually executed as Python scripts. This gives SCons many powerful capabilities not found in other software build tools." -noarch=yes -pycompile_dirs="usr/lib/scons-$version/SCons" - post_install() { vmkdir usr/share mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share } + +scons_package() { + depends="python" + noarch="yes" + pycompile_dirs="usr/lib/scons-2.0.1/SCons" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template index b510bb1858b..b55c6569577 100644 --- a/srcpkgs/screen/template +++ b/srcpkgs/screen/template @@ -35,3 +35,10 @@ post_install() { vinstall etc/screenrc 0644 usr/share/examples/screen vinstall etc/etcscreenrc 0644 usr/share/examples/screen } + +screen_package() { + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/scrnsaverproto/template b/srcpkgs/scrnsaverproto/template index 2c1440cc8be..799b6f185e5 100644 --- a/srcpkgs/scrnsaverproto/template +++ b/srcpkgs/scrnsaverproto/template @@ -1,16 +1,18 @@ # Template build file for 'scrnsaverproto'. pkgname=scrnsaverproto version=1.2.0 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 short_desc="ScrnSaver extension headers from X.org" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99 -long_desc=" - This provides the ScrnSaver extension headers from modular X.org X11 - project." -noarch=yes +scrnsaverproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template index 83afe43d987..4ce5c0361df 100644 --- a/srcpkgs/scrot/template +++ b/srcpkgs/scrot/template @@ -1,17 +1,22 @@ # Template file for 'scrot' pkgname=scrot version=0.8 -distfiles="http://linuxbrit.co.uk/downloads/$pkgname-$version.tar.gz" +revision=1 build_style=gnu-configure make_install_args="docsdir=/usr/share/doc/scrot" -revision=1 -makedepends="libX11-devel giblib-devel imlib2-devel glibc-devel" +makedepends="libX11-devel giblib-devel imlib2-devel" short_desc="A simple command-line screenshot utility for X" maintainer="Juan RP " homepage="http://scrot.sourcearchive.com/" license="MIT" +distfiles="http://linuxbrit.co.uk/downloads/$pkgname-$version.tar.gz" checksum=613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c98093994f2 long_desc=" scrot is a commandline screen capture util like "import", but using imlib2." +scrot_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/scrypt/template b/srcpkgs/scrypt/template index cf7b78ff45c..8b7114e7b03 100644 --- a/srcpkgs/scrypt/template +++ b/srcpkgs/scrypt/template @@ -15,3 +15,9 @@ long_desc=" Tarsnap online backup system and is designed to be far more secure against hardware brute-force attacks than alternative functions such as PBKDF2 or bcrypt." + +scrypt_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/scummvm/template b/srcpkgs/scummvm/template index 356c6be233b..985352c502d 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -3,8 +3,8 @@ pkgname=scummvm version=1.5.0 revision=1 makedepends="pkg-config nasm zlib-devel libpng-devel SDL-devel libmad-devel -fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel faad2-devel -freetype-devel" + fluidsynth-devel libvorbis-devel libtheora-devel libflac-devel faad2-devel + freetype-devel" short_desc="Free implementation of LucasArts' SCUMM interpreter" maintainer="Juan RP " homepage="http://www.scummvm.org/" @@ -37,3 +37,9 @@ do_install() { vinstall icons/scummvm.xpm 644 usr/share/pixmaps vinstall gui/themes/scummmodern.zip 644 usr/share/scummvm } + +scummvm_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sdb/sdb-devel.template b/srcpkgs/sdb/sdb-devel.template deleted file mode 100644 index 256fc2a42aa..00000000000 --- a/srcpkgs/sdb/sdb-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'sdb-devel'. -# -depends="vala sdb>=${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/share usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/sdb/template b/srcpkgs/sdb/template index 38765a34a88..15bcb6d8d9e 100644 --- a/srcpkgs/sdb/template +++ b/srcpkgs/sdb/template @@ -4,15 +4,31 @@ version=0.5 revision=1 build_style=gnu-makefile short_desc="Simple key-value database with JSON support" -checksum=ed3225e4a6c88cc3c31c80dff6faa74c2a861aa0db1dce37db0e97a6fec595fa maintainer="pancake " license="LGPL-3" homepage="https://github.com/radare/sdb" +distfiles="https://github.com/radare/sdb/archive/$pkgname-$version.tar.gz" +checksum=ed3225e4a6c88cc3c31c80dff6faa74c2a861aa0db1dce37db0e97a6fec595fa long_desc=" sdb is a simple key/value database with disk storage. mcsdbd is a memcache server with disk storage based on sdb. sdbtypes is a vala library that implements several data structures on top of an sdb or memcache instance." -distfiles="https://github.com/radare/sdb/archive/$pkgname-$version.tar.gz" makedepends="vala-devel" -subpackages="sdb-devel" + +sdb-devel_package() { + depends="vala sdb>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/share + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + } +} + +sdb_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sdlmame/template b/srcpkgs/sdlmame/template index 0d55c285ba8..6229786acc2 100644 --- a/srcpkgs/sdlmame/template +++ b/srcpkgs/sdlmame/template @@ -13,10 +13,9 @@ license="mame" checksum=78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 noextract=yes -nonfree=yes -fulldepends="liberation-fonts-ttf" makedepends="unzip perl pkg-config SDL-devel>=1.2.15_4 SDL_ttf-devel - libXinerama-devel gtk+-devel GConf-devel alsa-lib-devel python" + libXinerama-devel gtk+-devel GConf-devel alsa-lib-devel python + liberation-fonts-ttf" do_extract() { # mame source code is double-zipped to save space. @@ -73,3 +72,11 @@ do_install() { # Include the license vinstall docs/license.txt 644 usr/share/licenses/${pkgname} } + +sdlmame_package() { + depends="liberation-fonts-ttf" + nonfree="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sdparm/template b/srcpkgs/sdparm/template index 5f6d761c6fc..714efbba365 100644 --- a/srcpkgs/sdparm/template +++ b/srcpkgs/sdparm/template @@ -24,3 +24,9 @@ long_desc=" post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +sdparm_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/seahorse-nautilus/template b/srcpkgs/seahorse-nautilus/template index 26ae3e1ba89..1b3e0a993e7 100644 --- a/srcpkgs/seahorse-nautilus/template +++ b/srcpkgs/seahorse-nautilus/template @@ -4,12 +4,10 @@ version=3.8.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile" -depends="desktop-file-utils" hostmakedepends="pkg-config intltool gnome-doc-utils" makedepends="gtk+3-devel>=3.8 nautilus-devel>=3.8 libnotify-devel gpgme-devel libcryptui-devel>=3.8 gcr-devel>=3.8 - libgnome-keyring-devel>=3.8" -fulldepends="gnupg" + libgnome-keyring-devel>=3.8 gnupg" short_desc="A Nautilus plugin for OpenPGP file encryption/decryption" maintainer="Juan RP " homepage="http://www.gnome.org/projects/seahorse/" @@ -31,3 +29,10 @@ long_desc=" This package contains a plugin for the GNOME file manager, Nautilus to encrypt or decrypt OpenPGP files with GnuPG." + +seahorse-nautilus_package() { + depends="gnupg desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template index 47f93802495..1ad6a4fc1bb 100644 --- a/srcpkgs/seahorse-sharing/template +++ b/srcpkgs/seahorse-sharing/template @@ -4,8 +4,8 @@ version=3.6.1 revision=2 build_style=gnu-configure makedepends="pkg-config intltool gnome-doc-utils gtk+3-devel>=3.6.1 - gpgme-devel libsoup-devel>=2.40 avahi-glib-libs-devel libSM-devel" -fulldepends="gnupg" + gpgme-devel libsoup-devel>=2.40 avahi-glib-libs-devel libSM-devel + gnupg" short_desc="Sharing of PGP public keys via DNS-SD and HKP" maintainer="Juan RP " homepage="http://www.gnome.org/projects/seahorse/" @@ -27,3 +27,10 @@ long_desc=" This package contains additional functionality for GNOME's Seahorse to share PGP public keys via DNS-SD and HKP." + +seahorse-sharing_package() { + depends="gnupg" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/seahorse/template b/srcpkgs/seahorse/template index b1a759e1951..1173e8acc12 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -5,11 +5,10 @@ revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --enable-ldap --enable-hkp --disable-debug" -depends="hicolor-icon-theme desktop-file-utils gcr>=3.6.2" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool" makedepends="gtk+3-devel>=3.8 gcr-devel>=3.8 libsecret-devel - gpgme-devel libldap-devel libsoup-devel avahi-glib-libs-devel" -fulldepends="openssh>=6.1p1" + gpgme-devel libldap-devel libsoup-devel avahi-glib-libs-devel + openssh>=6.1p1" short_desc="Encryption Made Easy" maintainer="Juan RP " homepage="http://projects.gnome.org/seahorse/" @@ -28,3 +27,10 @@ long_desc=" * Cache your passphrase so you don't have to keep typing it * Backup your keys and keyring * more..." + +seahorse_package() { + depends="hicolor-icon-theme desktop-file-utils gcr>=3.6.2 openssh>=6.1p1" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template index 4d750774838..78d42e76297 100644 --- a/srcpkgs/sed/template +++ b/srcpkgs/sed/template @@ -2,7 +2,6 @@ pkgname=sed version=4.2.2 revision=2 -conflicts="chroot-sed>=0" build_style=gnu-configure configure_args="--enable-acl" makedepends="acl-devel" @@ -14,6 +13,13 @@ distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" checksum=fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff if [ "$CROSS_BUILD" ]; then - configure_args="${configure_args} ac_cv_func_aclsort=yes" + configure_args+=" ac_cv_func_aclsort=yes" LDFLAGS="-L${XBPS_CROSS_BASE}/lib -lacl" fi + +sed_package() { + conflicts="chroot-sed>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/seed/libseed-devel.template b/srcpkgs/seed/libseed-devel.template deleted file mode 100644 index 58d61437d4e..00000000000 --- a/srcpkgs/seed/libseed-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'libseed-devel'. -# -noarch=yes -depends="webkit-gtk3-devel libgirepository-devel glib-devel - libseed-${version}_${revision}" -short_desc="GObject JavaScript bindings for the webkit engine - Development" -long_desc="${long_desc} - - This package contains the static libraries and development headers, needed - to build programs using the Seed interpreter." - -do_install() { - vmove usr/include usr - vmove usr/lib usr - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/seed/libseed.template b/srcpkgs/seed/libseed.template deleted file mode 100644 index ab57d3f586a..00000000000 --- a/srcpkgs/seed/libseed.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'libseed'. -# -short_desc="GObject JavaScript bindings for the webkit engine - Runtime" -long_desc="${long_desc} - - This package contains the runtime library and all modules, needed by - programs embedding the Seed interpreter." - -do_install() -{ - vmove "usr/lib/libseed*.so*" usr/lib - vmove "usr/lib/seed-gtk3/*.so" usr/lib/seed-gtk3 - vmove usr/share/seed-gtk3 usr/share -} diff --git a/srcpkgs/seed/template b/srcpkgs/seed/template index 47314ce5218..4e9ad21e18f 100644 --- a/srcpkgs/seed/template +++ b/srcpkgs/seed/template @@ -1,13 +1,12 @@ # Template file for 'seed' pkgname=seed version=3.2.0 -revision=4 -subpackages="libseed libseed-devel" +revision=5 build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config intltool readline-devel gobject-introspection - webkit-gtk3-devel libsoup-devel dbus-glib-devel sqlite-devel" -fulldepends="gir-freedesktop gnome-js-common" + webkit-gtk3-devel libsoup-devel dbus-glib-devel sqlite-devel + gir-freedesktop gnome-js-common" short_desc="GObject JavaScript bindings for the webkit engine - Interpreter" maintainer="Juan RP " homepage="http://live.gnome.org/Seed/" @@ -20,3 +19,30 @@ long_desc=" GNOME platform. Seed serves as something which enables you to write standalone applications in JavaScript, or easily enable your application to be extensible in JavaScript." + +libseed_package() { + short_desc="GObject JavaScript bindings for the webkit engine - Runtime" + pkg_install() { + vmove "usr/lib/libseed*.so*" + vmove "usr/lib/seed-gtk3/*.so" + vmove usr/share/seed-gtk3 + } +} + +libseed-devel_package() { + depends="webkit-gtk3-devel libgirepository-devel glib-devel + libseed-${version}_${revision}" + short_desc="GObject JavaScript bindings for the webkit engine - Development" + pkg_install() { + vmove usr/include + vmove usr/lib + vmove usr/share/gtk-doc + } +} + +seed_package() { + depends="gir-freedesktop gnome-js-common" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/serd/libserd.template b/srcpkgs/serd/libserd.template deleted file mode 100644 index b50d90259cd..00000000000 --- a/srcpkgs/serd/libserd.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'libserd'. -# -short_desc="${short_desc} - Runtime library" -long_desc="${long_desc} - - This package contains the serd runtime library." - -do_install() -{ - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/serd/serd-devel.template b/srcpkgs/serd/serd-devel.template deleted file mode 100644 index 4159c0484c6..00000000000 --- a/srcpkgs/serd/serd-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'serd-devel'. -# -noarch=yes -depends="glibc-devel libserd>=${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/serd/template b/srcpkgs/serd/template index 12f4f3de015..fce94ae4eaf 100644 --- a/srcpkgs/serd/template +++ b/srcpkgs/serd/template @@ -1,14 +1,14 @@ # Template file for 'serd' pkgname=serd version=0.18.0 +revision=2 build_style=waf -homepage="http://drobilla.net/software/serd/" -distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" -revision=1 makedepends="python" short_desc="Lightweight C library for RDF syntax." maintainer="davehome " license="ISC" +homepage="http://drobilla.net/software/serd/" +distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=37b8641382876a8f2c25697021cfcd153bc3c6c62983590edc8df0df2dea54aa long_desc=" Serd is a lightweight C library for RDF syntax which supports reading and @@ -19,5 +19,24 @@ long_desc=" situations where a simple reader/writer with minimal dependencies is ideal (e.g. in LV2 hosts or plugins)." -subpackages="$pkgname-devel lib$pkgname" +serd-devel_package() { + depends="libserd>=${version}" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} +libserd_package() { + short_desc="${short_desc} - Runtime library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +serd_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sessreg/template b/srcpkgs/sessreg/template index b1e2a3739ec..775959ae02c 100644 --- a/srcpkgs/sessreg/template +++ b/srcpkgs/sessreg/template @@ -1,16 +1,22 @@ # Template build file for 'sessreg'. pkgname=sessreg version=1.0.6 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Manage utmp/wtmp entries for xdm" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=73f31670842b7d969504a61f3c694bf1911f844831c390396971ae2b74de7190 long_desc=" Sessreg is a simple program to manage utmp/wtmp entries for xdm sessions and other clients not started from init." - + +sessreg_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/setxkbmap/template b/srcpkgs/setxkbmap/template index df6d6b3683b..72b0a78d714 100644 --- a/srcpkgs/setxkbmap/template +++ b/srcpkgs/setxkbmap/template @@ -1,16 +1,22 @@ # Template build file for 'setxkbmap'. pkgname=setxkbmap version=1.2.0 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libxkbfile-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libxkbfile-devel" short_desc="Set the keyboard map using the X Keyboard Extension" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39 long_desc=" The setxkbmap command maps the keyboard to use the layout determined by the options specified on the command line." +setxkbmap_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sexy-python/template b/srcpkgs/sexy-python/template index 66438b3ebdd..4d39816ff79 100644 --- a/srcpkgs/sexy-python/template +++ b/srcpkgs/sexy-python/template @@ -2,14 +2,21 @@ pkgname=sexy-python version=0.1.9 revision=4 -distfiles="http://releases.chipx86.com/libsexy/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure -depends="pygtk" -makedepends="pkg-config libsexy-devel pygtk-devel" +hostmakedepends="pkg-config" +makedepends="libsexy-devel pygtk-devel" short_desc="Python bindings for libsexy" homepage="http://blog.chipx86.com/category/open-source/libsexy/" license="LGPL-2.1+" maintainer="Juan RP " +distfiles="http://releases.chipx86.com/libsexy/$pkgname/$pkgname-$version.tar.gz" checksum=2d8d257bbfa498a89792e0405ed8cf70396648b3df3c8e32cdc3dcc9bb666f15 long_desc=" This packages provides the libsexy Python bindings." + +sexy-python_package() { + depends="pygtk" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sg3_utils/libsgutils.template b/srcpkgs/sg3_utils/libsgutils.template deleted file mode 100644 index 690c7806c42..00000000000 --- a/srcpkgs/sg3_utils/libsgutils.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libsgutils'. -# -short_desc="${short_desc} --- shared library" -replaces="sg3_utils<1.31" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/sg3_utils/sg3_utils-devel.template b/srcpkgs/sg3_utils/sg3_utils-devel.template deleted file mode 100644 index bef1a14c8b7..00000000000 --- a/srcpkgs/sg3_utils/sg3_utils-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'sg3_utils-devel'. -# -depends="libsgutils>=${version}" -short_desc="${short_desc} - development files" -noarch=yes - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/sg3_utils/template b/srcpkgs/sg3_utils/template index a94b56490eb..3ac5090cc7d 100644 --- a/srcpkgs/sg3_utils/template +++ b/srcpkgs/sg3_utils/template @@ -1,14 +1,35 @@ # Template file for 'sg3_utils' pkgname=sg3_utils version=1.35 -revision=1 -subpackages="libsgutils $pkgname-devel" +revision=2 build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config" +hostmakedepends="pkg-config" short_desc="Generic SCSI utilities" maintainer="Juan RP " homepage="http://sg.danny.cz/sg/sg3_utils.html" license="BSD, GPL-2" distfiles="http://sg.danny.cz/sg/p/$pkgname-$version.tgz" checksum=385e73a3acc961efd50a610db9c737f14ccc98ba8488e54355be1f08417e08af + +libsgutils_package() { + short_desc="${short_desc} --- shared library" + replaces="sg3_utils<1.31" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +sg3_utils-devel_package() { + depends="libsgutils>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + } +} + +sg3_utils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/shared-color-profiles/template b/srcpkgs/shared-color-profiles/template index a03577115ff..16901844633 100644 --- a/srcpkgs/shared-color-profiles/template +++ b/srcpkgs/shared-color-profiles/template @@ -1,14 +1,13 @@ # Template file for 'shared-color-profiles' pkgname=shared-color-profiles version=0.1.5 -homepage="http://github.com/hughsie/shared-color-profiles" -distfiles="http://people.freedesktop.org/~hughsient/releases/$pkgname-$version.tar.gz" -build_style=gnu-configure -noarch=yes revision=1 +build_style=gnu-configure short_desc="Color profiles from contributors for color calibration" maintainer="Juan RP " license="GPL-2" +homepage="http://github.com/hughsie/shared-color-profiles" +distfiles="http://people.freedesktop.org/~hughsient/releases/$pkgname-$version.tar.gz" checksum=6edc31d5b9e89469fe9aaf4b2edef46631224957f3ef6a18d6b2582708584ed0 long_desc=" Shared Color Profiles contain ICC profiles from different vendors that are all @@ -17,3 +16,9 @@ long_desc=" These include a Adobe RGB compatible and sRGB compatible, as well as various user or manufacturer supplied profiles." +shared-color-profiles_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/shared-color-targets/template b/srcpkgs/shared-color-targets/template index cb2aa89262e..e716b362b6e 100644 --- a/srcpkgs/shared-color-targets/template +++ b/srcpkgs/shared-color-targets/template @@ -1,15 +1,21 @@ # Template file for 'shared-color-targets' pkgname=shared-color-targets version=0.1.1 -homepage="http://github.com/hughsie/shared-color-targets" -distfiles="http://people.freedesktop.org/~hughsient/releases/$pkgname-$version.tar.xz" -build_style=gnu-configure -noarch=yes revision=1 +build_style=gnu-configure short_desc="Shared color targets for creating color profiles" maintainer="Juan RP " license="GPL-2" +homepage="http://github.com/hughsie/shared-color-targets" +distfiles="http://people.freedesktop.org/~hughsient/releases/$pkgname-$version.tar.xz" checksum=656dd3c467ebbaf953ffa37075a58a8410ad54bf348f95055451e9b7689a6b29 long_desc=" $pkgname contains target files for popular scanner calibration targets. These include the IT 8.7 targets from http://www.targets.coloraid.de/" + +shared-color-targets_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template index a871573756b..b3ceaf3df31 100644 --- a/srcpkgs/shared-mime-info/template +++ b/srcpkgs/shared-mime-info/template @@ -4,7 +4,8 @@ version=1.1 revision=1 build_style=gnu-configure configure_args="--disable-update-mimedb" -makedepends="pkg-config intltool glib-devel libxml2-devel" +hostmakedepends="pkg-config intltool" +makedepends="libglib-devel libxml2-devel" short_desc="Core database of common types" maintainer="Juan RP " license="GPL-2" @@ -25,3 +26,9 @@ long_desc=" update-mime-database command used to extend it." disable_parallel_build=yes + +shared-mime-info_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 726ea0f4bf2..62dd1d366f8 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -5,7 +5,6 @@ revision=1 build_style=configure configure_args="--prefix=/usr --disable-schemas-compile --disable-desktop-update --disable-icon-update --release" -depends="hicolor-icon-theme desktop-file-utils libgexiv2>=0.6.0" makedepends="pkg-config vala-devel>=0.18 libgomp-devel libgphoto2-devel libgexiv2-devel>=0.6.0 libunique-devel libraw-devel rest-devel sqlite-devel gtk+3-devel webkit-gtk3-devel libgudev-devel json-glib-devel @@ -21,3 +20,10 @@ long_desc=" environment. It allows you to import photos from disk or camera, organize them in various ways, view them in full-window or fullscreen mode, and export them to share with others." + +shotwell_package() { + depends="hicolor-icon-theme desktop-file-utils libgexiv2>=0.6.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template index 9e068a11b80..8bce794e28a 100644 --- a/srcpkgs/simple-scan/template +++ b/srcpkgs/simple-scan/template @@ -4,9 +4,8 @@ version=3.6.0 revision=3 build_style=gnu-configure configure_args="--disable-schemas-compile" -depends="hicolor-icon-theme sane" makedepends="pkg-config itstool intltool colord-devel>=0.1.23_3 -gtk+3-devel>=3.6.0_3 dconf-devel sane-devel libgudev-devel" + gtk+3-devel>=3.6.0_3 dconf-devel sane-devel libgudev-devel" short_desc="Simple scanning utility" maintainer="Juan RP " license="GPL-3" @@ -19,3 +18,10 @@ long_desc=" Simple Scan is basically a frontend for SANE - which is the same backend as XSANE uses. This means that all existing scanners will work and the interface is well tested." + +simple-scan_package() { + depends="hicolor-icon-theme sane" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index 308ce81ecda..a449ed287ee 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,17 +1,15 @@ # Template file for 'skype' pkgname=skype -nonfree=yes -only_for_archs=i686 -nostrip=yes -version=4.0.0.7 -distfiles="http://download.skype.com/linux/${pkgname}-${version}.tar.bz2" -checksum=d615fb48bb0535ab4fbf0630b08c825c3b09f05f41520c9faba36c8db9e23a57 -fulldepends="hicolor-icon-theme desktop-file-utils" revision=2 +only_for_archs=i686 +version=4.0.0.7 +makedepends="hicolor-icon-theme desktop-file-utils" short_desc="P2P software for high-quality voice communication" maintainer="davehome " homepage="http://www.skype.com" license="skype" +distfiles="http://download.skype.com/linux/${pkgname}-${version}.tar.bz2" +checksum=d615fb48bb0535ab4fbf0630b08c825c3b09f05f41520c9faba36c8db9e23a57 long_desc=" Skype is a proprietary voice over Internet Protocol service and software application originally created by Niklas Zennström and Janus Friis, and @@ -26,8 +24,7 @@ long_desc=" videoconferencing. Competitors include SIP and H.323-based services, such as Empathy, Linphone, Ekiga as well as the Google Talk service." -do_install() -{ +do_install() { # Based on an Arch AUR PKGBUILD # Executable @@ -57,3 +54,12 @@ do_install() vinstall LICENSE 644 usr/share/licenses/skype vinstall "third-party_attributions.txt" 644 usr/share/licenses/skype } + +skype_package() { + nonfree="yes" + nostrip="yes" + depends="${makedepends}" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/skypetab-ng/template b/srcpkgs/skypetab-ng/template index 52263754872..64257831817 100644 --- a/srcpkgs/skypetab-ng/template +++ b/srcpkgs/skypetab-ng/template @@ -1,9 +1,9 @@ # Template file for 'skypetab-ng' pkgname=skypetab-ng version="$(date -u +%Y%m%d)" -depends="skype" -makedepends="pkg-config qt-devel libX11-devel" revision=1 +hostmakedepends="pkg-config" +makedepends="libX11-devel qt-devel" short_desc="A program that adds tabs to Skype for Linux" maintainer="davehome " homepage="http://keks-n.net/skypetab" @@ -20,26 +20,28 @@ only_for_archs=i686 nofetch=yes noextract=yes - - do_fetch() { local url="git://github.com/kekekeks/${pkgname}.git" msg_normal " Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } -do_configure() -{ - qmake -spec linux-g++-32 +do_configure() { + qmake } -do_build() -{ +do_build() { make ${makejobs} } -do_install() -{ +do_install() { make ${makejobs} INSTALL_ROOT=${DESTDIR} install chmod +x "${DESTDIR}/usr/share/applications/${pkgname}.desktop" } + +skypetab-ng_package() { + depends="skype" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/slim/template b/srcpkgs/slim/template index 731ce823be9..3bde13da504 100644 --- a/srcpkgs/slim/template +++ b/srcpkgs/slim/template @@ -11,7 +11,6 @@ homepage="http://slim.berlios.de/" distfiles="http://download.berlios.de/slim/slim-${version}.tar.gz" checksum=818d209f51e2fa8d5b94ef75ce90a7415be48b45e796d66f8083a9532b655629 -conf_files="/etc/slim.conf /etc/pam.d/slim" # XXX make cmake find host libraries . makedepends="libpng-devel libjpeg-turbo-devel libX11-devel libXmu-devel libXft-devel pam-devel" hostmakedepends="cmake pkg-config ${makedepends}" @@ -23,3 +22,11 @@ pre_configure() { post_install() { vinstall ${FILESDIR}/slim.pam 644 etc/pam.d slim } + +slim_package() { + conf_files="/etc/slim.conf /etc/pam.d/slim" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/sloccount/template b/srcpkgs/sloccount/template index 3d8bc55a9b9..320c2050abd 100644 --- a/srcpkgs/sloccount/template +++ b/srcpkgs/sloccount/template @@ -2,8 +2,7 @@ pkgname=sloccount version=2.26 revision=1 -makedepends="flex" -depends="perl" +hostmakedepends="flex" short_desc="Tool to count physical source lines of code in many languages" maintainer="pancake " license="GPL-2" @@ -22,3 +21,10 @@ do_install() { ${DESTDIR}/usr/share/doc/sloccount chmod 644 ${DESTDIR}/usr/share/doc/sloccount/* } + +sloccount_package() { + depends="perl" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/slock/template b/srcpkgs/slock/template index 21515970c40..c5e69151c01 100644 --- a/srcpkgs/slock/template +++ b/srcpkgs/slock/template @@ -2,7 +2,8 @@ pkgname=slock version=1.1 revision=1 -makedepends="pkg-config libXext-devel" +hostmakedepends="pkg-config" +makedepends="libXext-devel" short_desc="A simple screen locker for X" maintainer="Juan RP " license="MIT" @@ -21,3 +22,9 @@ do_build() { do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install } + +slock_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/smartmontools/template b/srcpkgs/smartmontools/template index f89bc797e91..582e6b663be 100644 --- a/srcpkgs/smartmontools/template +++ b/srcpkgs/smartmontools/template @@ -19,7 +19,15 @@ long_desc=" harddisks. In many cases, these utilities will provide advanced warning of disk degradation and failure." -conf_files="/etc/smartd.conf" -mutable_files="/var/db/smartmontools/drivedb.h" -systemd_services="smartd.service on" makedepends="libcap-ng-devel" + +smartmontools_package() { + conf_files="/etc/smartd.conf" + mutable_files="/var/db/smartmontools/drivedb.h" + systemd_services="smartd.service on" + pkg_install() { + vmove etc + vmove usr + vmove var + } +} diff --git a/srcpkgs/smpeg/smpeg-devel.template b/srcpkgs/smpeg/smpeg-devel.template deleted file mode 100644 index d0ed78a7d15..00000000000 --- a/srcpkgs/smpeg/smpeg-devel.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'smpeg-devel'. -# -depends="SDL-devel smpeg" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr -} diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template index 6f5cdbf2254..39520f47f72 100644 --- a/srcpkgs/smpeg/template +++ b/srcpkgs/smpeg/template @@ -1,8 +1,7 @@ # Template file for 'smpeg' pkgname=smpeg version=0.4.4 -revision=4 -distfiles="http://mirrors.dotsrc.org/lokigames/open-source/smpeg/smpeg-$version.tar.gz" +revision=5 build_style=gnu-configure configure_args="--disable-gtk-player --disable-opengl-player" make_build_args="LDFLAGS+=-lstdc++" @@ -11,16 +10,31 @@ short_desc="SDL MPEG Player Library" homepage="https://icculus.org/smpeg/" license="LGPL-2" maintainer="Juan RP " +distfiles="http://mirrors.dotsrc.org/lokigames/open-source/smpeg/smpeg-$version.tar.gz" checksum=1efa7984d0aada0c2954cd0aaef357e9d7871dadd3368dbe742ab5f260523e57 long_desc=" SMPEG is based on UC Berkeley's mpeg_play software MPEG decoder and SPLAY, an MPEG audio decoder created by Woo-jae Jung." -subpackages="$pkgname-devel" - -post_install() -{ +post_install() { # Remove unused stuff rm -rf ${DESTDIR}/usr/share/man rm -f ${DESTDIR}/usr/bin/plaympeg } + +smpeg-devel_package() { + depends="SDL-devel smpeg>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/share + } +} + +smpeg_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/smproxy/template b/srcpkgs/smproxy/template index 945369e383a..97341b8bdc8 100644 --- a/srcpkgs/smproxy/template +++ b/srcpkgs/smproxy/template @@ -1,16 +1,22 @@ # Template build file for 'smproxy'. pkgname=smproxy version=1.0.5 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=1 -makedepends="pkg-config libSM-devel libXt-devel libXmu-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libSM-devel libXt-devel libXmu-devel" short_desc="X11R6 session management application" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=c72ccb094e4971ec2339ee06439114e86ffdcdf449a6accd5552e817142fd609 long_desc=" smproxy allows X applications that do not support X11R6 session management to participate in an X11R6 session." +smproxy_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index d35292dd0f4..9e116337bfd 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -19,3 +19,9 @@ long_desc=" line editor (readline), a program, or a combination of two of these. These modes include generation of "listening" sockets, named pipes, and pseudo terminals." + +socat_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sord/libsord.template b/srcpkgs/sord/libsord.template deleted file mode 100644 index 3bc1b5c12f3..00000000000 --- a/srcpkgs/sord/libsord.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libsord'. -# -short_desc="${short_desc} - Runtime library" -long_desc="${long_desc} - - This package contains the serd runtime library." - - -do_install() -{ - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/sord/sord-devel.template b/srcpkgs/sord/sord-devel.template deleted file mode 100644 index 4dbb7bcc652..00000000000 --- a/srcpkgs/sord/sord-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'sord-devel'. -# -depends="glibc-devel serd-devel libsord" -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/sord/template b/srcpkgs/sord/template index 98955fd9d8a..71833d645d7 100644 --- a/srcpkgs/sord/template +++ b/srcpkgs/sord/template @@ -1,9 +1,8 @@ # Template file for 'sord' pkgname=sord version=0.8.0 -revision=2 +revision=3 build_style=waf -subpackages="$pkgname-devel lib$pkgname" makedepends="pkg-config python serd-devel pcre-devel>=8.30" short_desc="Lightweight C library for storing RDF data in memory." maintainer="davehome " @@ -13,3 +12,25 @@ distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=99df73a0a859fbfc6423a7d5930d019c8c0e17e04ed101114c54f1911dbd8a59 long_desc=" Sord is a lightweight C library for storing RDF data in memory." + +sord-devel_package() { + depends="serd-devel libsord>=${version}" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +libsord_package() { + short_desc="${short_desc} - Runtime library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +sord_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sound-juicer/template b/srcpkgs/sound-juicer/template index beca381bc93..de5ffeaf53c 100644 --- a/srcpkgs/sound-juicer/template +++ b/srcpkgs/sound-juicer/template @@ -5,11 +5,9 @@ revision=2 build_style=gnu-configure configure_args="--disable-schemas-install --disable-scrollkeeper --with-gconf-schema-file-dir=/usr/share/gconf/schemas" -depends="hicolor-icon-theme desktop-file-utils" makedepends="which pkg-config intltool gnome-doc-utils glib-devel GConf-devel brasero-devel>=3.6.0 libdiscid-devel libmusicbrainz5-devel - libcanberra-devel gst-plugins-base1-devel" -fulldepends="gst-plugins-good1" + libcanberra-devel gst-plugins-base1-devel gst-plugins-good1" short_desc="CD ripping tool using GTK+ and GStreamer" maintainer="Juan RP " homepage="http://burtonini.com/blog/computers/sound-juicer" @@ -25,3 +23,10 @@ post_install() { gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${pkgname}.schemas \ --domain ${pkgname} ${wrksrc}/*.schemas } + +sound-juicer_package() { + depends="hicolor-icon-theme desktop-file-utils gst-plugins-good1" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sound-theme-freedesktop/template b/srcpkgs/sound-theme-freedesktop/template index 2fe5c5d5834..c3237b09ad4 100644 --- a/srcpkgs/sound-theme-freedesktop/template +++ b/srcpkgs/sound-theme-freedesktop/template @@ -1,19 +1,23 @@ # Template file for 'sound-theme-freedesktop' pkgname=sound-theme-freedesktop version=0.7 -distfiles="http://people.freedesktop.org/~mccann/dist/$pkgname-$version.tar.bz2" -build_style=gnu-configure -makedepends="pkg-config intltool" revision=2 +build_style=gnu-configure +hostmakedepends="pkg-config intltool" short_desc="Freedesktop sound theme" homepage="http://freedesktop.org/wiki/Specifications/sound-theme-spec" license="Custom" maintainer="Juan RP " +distfiles="http://people.freedesktop.org/~mccann/dist/$pkgname-$version.tar.bz2" checksum=e6595afb02b76099ef6df42c2ac7c4f9680c21c3f26b2a7ca0943d1fdbbd9aef long_desc=" This is all kinds of sounds stolen from gnome-audio, KDE, Ekiga, Pidgin/Purple, ALSA, put together as XDG sound theme. This goes well along with libcanberra." -noarch=yes - +sound-theme-freedesktop_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/soundtouch/soundtouch-devel.template b/srcpkgs/soundtouch/soundtouch-devel.template deleted file mode 100644 index 389369a824d..00000000000 --- a/srcpkgs/soundtouch/soundtouch-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'soundtouch-devel'. -# -depends="${sourcepkg}>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template index 970720edddc..161988faefe 100644 --- a/srcpkgs/soundtouch/template +++ b/srcpkgs/soundtouch/template @@ -4,7 +4,6 @@ version=1.7.0 revision=2 wrksrc=${pkgname} build_style=gnu-configure -subpackages="${pkgname}-devel" hostmakedepends="libtool automake pkg-config" short_desc="SoundTouch Audio Processing Library" maintainer="Juan RP " @@ -31,3 +30,19 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/doc } + +soundtouch-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + } +} + +soundtouch_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template index 93e9e176960..1a9f35af32a 100644 --- a/srcpkgs/spacefm/template +++ b/srcpkgs/spacefm/template @@ -3,7 +3,6 @@ pkgname=spacefm version=0.8.4 revision=1 build_style=gnu-configure -depends="hicolor-icon-theme desktop-file-utils" makedepends="pkg-config intltool gtk+-devel startup-notification-devel libudev-devel" short_desc="Multi-panel tabbed file manager" @@ -12,3 +11,10 @@ license="GPL-3" homepage="http://ignorantguru.github.com/spacefm/" distfiles="https://raw.github.com/IgnorantGuru/spacefm/master/packages/${version}/spacefm-${version}.tar.xz" checksum=125a97fbfc52f5feb6bd29a7316afa4f166bf2994c39d7a78f84493d857e9977 + +spacefm_package() { + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/spice-gtk/spice-gtk-devel.template b/srcpkgs/spice-gtk/spice-gtk-devel.template deleted file mode 100644 index f68f4734171..00000000000 --- a/srcpkgs/spice-gtk/spice-gtk-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'spice-gtk-devel'. -# -noarch=yes -depends="gtk+3-devel pixman-devel openssl-devel celt051-devel - ${sourcepkg}-${version}_${revision}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/vala usr/share - vmove usr/share/gir-1.0 usr/share -} diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index de3c5c37710..945ecd620ac 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -1,8 +1,7 @@ # Template file for 'spice-gtk' pkgname=spice-gtk version=0.14 -revision=5 -subpackages="${pkgname}-devel" +revision=6 build_style=gnu-configure configure_args="--disable-static --enable-vala --enable-introspection --enable-smartcard=no" @@ -16,3 +15,21 @@ short_desc="GTK+2/3 SPICE widget" maintainer="davehome " distfiles="http://spice-space.org/download/gtk/${pkgname}-${version}.tar.bz2" checksum=a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5 + +spice-gtk-devel_package() { + depends="gtk+3-devel pixman-devel openssl-devel celt051-devel + ${sourcepkg}-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/vala + vmove usr/share/gir-1.0 + } +} + +spice-gtk_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template index 73a7f09b0ca..6b3e5a07cf1 100644 --- a/srcpkgs/spice-protocol/template +++ b/srcpkgs/spice-protocol/template @@ -2,7 +2,6 @@ pkgname=spice-protocol version=0.12.2 revision=2 -noarch=yes build_style=gnu-configure configure_args="--datarootdir=/usr/lib" short_desc="Spice Protocol headers" @@ -13,3 +12,10 @@ distfiles="http://www.spicespace.org/download/releases/$pkgname-$version.tar.bz2 checksum=8bb2d9e4d75c1cb2065ecf2d6607bb1f91f0df6b27ddaa70320fd1f58cd3d56c long_desc=" This package contains the protocol headers for Spice." + +spice-protocol_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template index 87a12e5bc5a..a181dafd240 100644 --- a/srcpkgs/spice-vdagent/template +++ b/srcpkgs/spice-vdagent/template @@ -1,11 +1,10 @@ # Template file for 'spice-vdagent' pkgname=spice-vdagent version=0.8.1 -revision=3 +revision=4 build_style=gnu-configure -depends="dbus ConsoleKit-x11" -makedepends="pkg-config dbus-devel libXfixes-devel libXrandr-devel spice-protocol" -fulldepends="desktop-file-utils" +makedepends="pkg-config dbus-devel libXfixes-devel libXrandr-devel + spice-protocol desktop-file-utils" short_desc="Spice agent for Linux" homepage="http://spice-space.org/" license="GPL-3" @@ -22,9 +21,16 @@ Features: * Support of copy and paste (text and images) between the active X-session and the client" -systemd_services="${pkgname}d.service on" - post_install() { rm -rf ${DESTDIR}/etc/rc.d vinstall ${FILESDIR}/${pkgname}d.service 644 usr/lib/systemd/system } + +spice-vdagent_package() { + systemd_services="spice-vdagentd.service on" + depends="dbus" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/spice/spice-devel.template b/srcpkgs/spice/spice-devel.template deleted file mode 100644 index adb8ce31c58..00000000000 --- a/srcpkgs/spice/spice-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'spice-devel'. -# -noarch=yes -depends="pixman-devel celt051-devel openssl-devel spice>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index 5cd73ea0b06..5a629e79d76 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -1,8 +1,7 @@ # Template file for 'spice' pkgname=spice version=0.12.0 -revision=2 -subpackages="spice-devel" +revision=3 build_style=gnu-configure configure_args="--disable-tunnel --disable-opengl --disable-smartcard --with-sasl --disable-static --disable-xinerama" @@ -15,3 +14,18 @@ license="GPL-2" homepage="http://www.spicespace.org" distfiles="$homepage/download/releases/$pkgname-$version.tar.bz2" checksum=6ad7cef8527ed0275c305e6f99c47887976ca20e65eef164a1041e43be35b796 + +spice-devel_package() { + depends="pixman-devel celt051-devel openssl-devel spice>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +spice_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template index 90c704d0c5f..eb72be1a6cf 100644 --- a/srcpkgs/splint/template +++ b/srcpkgs/splint/template @@ -3,7 +3,7 @@ pkgname=splint version=3.1.2 revision=2 build_style=gnu-configure -makedepends="flex" +hostmakedepends="flex" short_desc="Secure Programming Lint" maintainer="Juan RP " homepage="http://www.splint.org" @@ -18,3 +18,9 @@ long_desc=" standard lint." disable_parallel_build=yes + +splint_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sqlalchemy-migrate/template b/srcpkgs/sqlalchemy-migrate/template index 1f0fbd71925..6679f4877df 100644 --- a/srcpkgs/sqlalchemy-migrate/template +++ b/srcpkgs/sqlalchemy-migrate/template @@ -2,11 +2,8 @@ pkgname=sqlalchemy-migrate version=0.7.2 revision=2 -noarch=yes build_style=python-module -depends="python python-sqlalchemy python-decorator python-tempita" makedepends="python-distribute" -pycompile_module="migrate" short_desc="SQLAlchemy Schema Migration Tools" maintainer="Juan RP " homepage="https://code.google.com/p/sqlalchemy-migrate/" @@ -17,3 +14,12 @@ long_desc=" Schema migration tools for SQLAlchemy, designed to support an agile approach to database design, and make it easier to keep development and production databases in sync, as schema changes are required." + +sqlalchemy-migrate_package() { + noarch="yes" + pycompile_module="migrate" + depends="python python-sqlalchemy python-decorator python-tempita" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template index ab63db47d3c..1b34109e361 100644 --- a/srcpkgs/squashfs-tools/template +++ b/srcpkgs/squashfs-tools/template @@ -34,3 +34,9 @@ do_install() { install -d ${DESTDIR}/usr/bin install -m755 {mk,un}squashfs ${DESTDIR}/usr/bin } + +squashfs-tools_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sratom/sratom-devel.template b/srcpkgs/sratom/sratom-devel.template deleted file mode 100644 index 40067a628c7..00000000000 --- a/srcpkgs/sratom/sratom-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'sratom-devel'. -# -noarch=yes -depends="glibc-devel serd-devel>=0.18.0 sord-devel lv2 sratom>=${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/sratom/template b/srcpkgs/sratom/template index 084354eed8c..bf837f65b23 100644 --- a/srcpkgs/sratom/template +++ b/srcpkgs/sratom/template @@ -1,18 +1,30 @@ # Template file for 'sratom' pkgname=sratom version=0.4.0 +revision=2 build_style=waf -homepage="http://drobilla.net/software/sratom/" -distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" -revision=1 makedepends="pkg-config python lv2 serd-devel>=0.18.0 sord-devel" short_desc="Library for serialising LV2 atoms to/from RDF (Turtle syntax)." maintainer="davehome " license="ISC" +homepage="http://drobilla.net/software/sratom/" +distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=5075a4edb4e9b52075798a82eb1e53042ae61de28466ee95116fec63cef69741 long_desc=" Sratom is a library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax." -subpackages="$pkgname-devel" +sratom-devel_package() { + depends="serd-devel>=0.18.0 sord-devel lv2 sratom>=${version}" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} +sratom_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sshfs-fuse/template b/srcpkgs/sshfs-fuse/template index c2c001008c6..ee560e7a543 100644 --- a/srcpkgs/sshfs-fuse/template +++ b/srcpkgs/sshfs-fuse/template @@ -3,8 +3,7 @@ pkgname=sshfs-fuse version=2.3 revision=2 build_style=gnu-configure -makedepends="pkg-config glib-devel fuse-devel" -fulldepends="openssh>=6.1p1" +makedepends="pkg-config glib-devel fuse-devel openssh>=6.1p1" short_desc="FUSE client based on the SSH File Transfer Protocol" maintainer="Juan RP " homepage="http://fuse.sourceforge.net/sshfs.html" @@ -16,3 +15,10 @@ long_desc=" most SSH servers already support this protocol it is very easy to set up: i.e. on the server side there's nothing to do. On the client side mounting the filesystem is as easy as logging into the server with ssh." + +sshfs-fuse_package() { + depends="openssh>=6.1p1" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/st/template b/srcpkgs/st/template index 818a8fb5ac5..31501a9016c 100644 --- a/srcpkgs/st/template +++ b/srcpkgs/st/template @@ -2,8 +2,7 @@ pkgname=st version=0.4 revision=1 -makedepends="pkg-config libX11-devel libXinerama-devel libXft-devel" -fulldepends="terminus-font" +makedepends="pkg-config libX11-devel libXinerama-devel libXft-devel terminus-font" short_desc="simple terminal implementation for X" maintainer="pancake " license="MIT" @@ -20,3 +19,10 @@ do_install() { vinstall st 755 usr/bin vinstall st.1 644 usr/share/man/man1 } + +st_package() { + depends="terminus-font" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/startup-notification/startup-notification-devel.template b/srcpkgs/startup-notification/startup-notification-devel.template deleted file mode 100644 index ecf03303c92..00000000000 --- a/srcpkgs/startup-notification/startup-notification-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'startup-notification-devel'. -# -depends="${sourcepkg}>=${version}" -short_desc="${short_desc} development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/startup-notification/template b/srcpkgs/startup-notification/template index f2a0d145308..04559d12742 100644 --- a/srcpkgs/startup-notification/template +++ b/srcpkgs/startup-notification/template @@ -1,8 +1,7 @@ # Template build file for 'startup-notification'. pkgname=startup-notification version=0.12 -revision=6 -subpackages="$pkgname-devel" +revision=7 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" @@ -18,3 +17,18 @@ long_desc=" startup notification protocol. Using this protocol a desktop environment can track the launch of an application and provide feedback such as a busy cursor, among other features." + +startup-notification-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +startup-notification_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template index 9d5f7159a4d..f5492b37a96 100644 --- a/srcpkgs/steam/template +++ b/srcpkgs/steam/template @@ -1,7 +1,6 @@ # Template file for 'steam' # only_for_archs=i686 -nonfree=yes pkgname=steam version=1.0.0.35 @@ -25,3 +24,10 @@ do_install() { # Ignore steamdeps. ln -sf /bin/true ${DESTDIR}/usr/bin/steamdeps } + +steam_package() { + nonfree="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template index 26e343d090e..b7f3dcd7aa7 100644 --- a/srcpkgs/strace/template +++ b/srcpkgs/strace/template @@ -12,3 +12,9 @@ checksum=c49cd98873c119c5f201356200a9b9687da1ceea83a05047e2ae0a7ac1e41195 long_desc=" strace is a system call tracer, i.e. a debugging tool which prints out a trace of all the system calls made by a process/program." + +strace_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/strigi/strigi-devel.template b/srcpkgs/strigi/strigi-devel.template deleted file mode 100644 index 9cc3036c9dd..00000000000 --- a/srcpkgs/strigi/strigi-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'strigi-devel'. -# -depends="exiv2-devel libxml2-devel clucene-devel dbus-devel qt-devel strigi" -short_desc="${sourcepkg} -- development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/strigi - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/strigi/*.cmake ${DESTDIR}/usr/lib/strigi -} diff --git a/srcpkgs/strigi/template b/srcpkgs/strigi/template index 6604374fd92..49433433176 100644 --- a/srcpkgs/strigi/template +++ b/srcpkgs/strigi/template @@ -1,8 +1,7 @@ # Template file for 'strigi' pkgname=strigi version=0.7.2 -revision=3 -distfiles="http://www.vandenoever.info/software/${pkgname}/${pkgname}-${version}.tar.bz2" +revision=4 build_style=cmake configure_args="-DENABLE_INOTIFY=ON" makedepends="pkg-config cmake exiv2-devel libxml2-devel clucene-devel dbus-devel qt-devel" @@ -10,6 +9,7 @@ short_desc="Small fast desktop searching program" homepage="http://www.vandenoever.info/software/strigi/" license="LGPL-2" maintainer="Juan RP " +distfiles="http://www.vandenoever.info/software/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=1ca421bbe420d1839bbe6bfe7c4b52a05590a9b7a7eda77924b554c98e602ab8 long_desc=" Strigi is a daemon which uses a very fast and efficient crawler that can index @@ -18,5 +18,18 @@ long_desc=" program. Strigi can index different file formats, including the contents of the archive files." -subpackages="strigi-devel" +strigi-devel_package() { + depends="exiv2-devel libxml2-devel clucene-devel dbus-devel qt-devel strigi>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/strigi/*.cmake" + } +} +strigi_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/subversion/libsvn.template b/srcpkgs/subversion/libsvn.template deleted file mode 100644 index 0be713a2978..00000000000 --- a/srcpkgs/subversion/libsvn.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libsvn'. -# -short_desc="${short_desc} - shared libraries" - -do_install() { - vmove usr/lib usr -} diff --git a/srcpkgs/subversion/subversion-apache.template b/srcpkgs/subversion/subversion-apache.template deleted file mode 100644 index 744f434c294..00000000000 --- a/srcpkgs/subversion/subversion-apache.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'subversion-apache'. -# -short_desc="${short_desc} - apache httpd modules" - -do_install() { - vmove usr/libexec usr -} diff --git a/srcpkgs/subversion/subversion-devel.template b/srcpkgs/subversion/subversion-devel.template deleted file mode 100644 index e76323baccc..00000000000 --- a/srcpkgs/subversion/subversion-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'subversion-devel'. -# -noarch=yes -depends="libsvn>=$version" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/subversion/subversion-gnome-keyring-auth.template b/srcpkgs/subversion/subversion-gnome-keyring-auth.template deleted file mode 100644 index 6d8a9ca3ac6..00000000000 --- a/srcpkgs/subversion/subversion-gnome-keyring-auth.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'subversion-gnome-keyring-auth'. -# -short_desc="subversion - gnome-keyring authentication support" - -do_install() { - vmove "usr/lib/lib*gnome_keyring*.so*" usr/lib -} diff --git a/srcpkgs/subversion/subversion-perl.template b/srcpkgs/subversion/subversion-perl.template deleted file mode 100644 index 0f1c580ee5a..00000000000 --- a/srcpkgs/subversion/subversion-perl.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'subversion-perl'. -# -depends="perl>=5.16" -short_desc="${short_desc} - perl bindings" - -do_install() { - vmove "usr/lib/libsvn_swig_perl-1.so*" usr/lib - vmove usr/lib/perl5 usr/lib - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/subversion/subversion-python.template b/srcpkgs/subversion/subversion-python.template deleted file mode 100644 index a5df4144b2b..00000000000 --- a/srcpkgs/subversion/subversion-python.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'subversion-python'. -# -depends="python" -pycompile_module="libsvn svn" -short_desc="${short_desc} - python bindings" - -do_install() { - vmove "usr/lib/libsvn_swig_py-1.so*" usr/lib - vmove "usr/lib/python*" usr/lib -} diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index 65999a58843..f3262496475 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -1,7 +1,7 @@ # Template file for 'subversion' pkgname=subversion version=1.7.8 -revision=2 +revision=3 short_desc="Enterprise-class centralized version control for the masses" maintainer="Juan RP " license="Apache-2.0, BSD" @@ -9,16 +9,11 @@ distfiles="http://apache.mirror.rafal.ca/subversion/${pkgname}-${version}.tar.bz homepage="http://subversion.apache.org/" checksum=fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686 -subpackages="${pkgname}-python ${pkgname}-perl ${pkgname}-apache - ${pkgname}-gnome-keyring-auth ${pkgname}-devel libsvn" - -depends="ca-certificates" - # XXX enable kwallet when kdelibs is available. makedepends="pkg-config perl>=5.16 python-devel swig apr-util-devel libldap-devel db-devel gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel - neon-devel apache-devel" + neon-devel apache-devel ca-certificates" do_configure() { ./configure ${CONFIGURE_SHARED_ARGS} \ @@ -58,3 +53,59 @@ do_install() { ln -sf subversion ${DESTDIR}/usr/share/bash-completion/completions/${i} done } + +subversion-python_package() { + depends="python" + pycompile_module="libsvn svn" + short_desc="${short_desc} - python bindings" + pkg_install() { + vmove "usr/lib/libsvn_swig_py-1.so*" + vmove "usr/lib/python*" + } +} + +subversion-perl_package() { + depends="perl>=5.16" + short_desc="${short_desc} - perl bindings" + pkg_install() { + vmove "usr/lib/libsvn_swig_perl-1.so*" + vmove usr/lib/perl5 + vmove usr/share/man/man3 + } +} + +subversion-apache_package() { + short_desc="${short_desc} - apache httpd modules" + pkg_install() { + vmove usr/libexec + } +} + +subversion-gnome-keyring-auth_package() { + short_desc="subversion - gnome-keyring authentication support" + pkg_install() { + vmove "usr/lib/lib*gnome_keyring*.so*" + } +} + +subversion-devel_package() { + depends="libsvn>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + } +} + +libsvn_package() { + short_desc="${short_desc} - shared libraries" + pkg_install() { + vmove usr/lib + } +} + +subversion_package() { + depends="ca-certificates" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index e4d6e63165a..2a9298e34ce 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -7,7 +7,6 @@ configure_args="--with-ignore-dot -with-all-insults --with-env-editor --enable-shell-sets-home --enable-noargs-shell --without-sendmail --with-logfac=auth --disable-root-mailer" makedepends="zlib-devel pam-devel" -conf_files="/etc/pam.d/sudo /etc/sudoers" short_desc="Allow others to run commands as root" maintainer="Juan RP " homepage="http://www.gratisoft.us/sudo/" @@ -22,3 +21,11 @@ post_install() { rm -rf ${DESTDIR}/usr/share/doc rm -rf ${DESTDIR}/usr/include } + +sudo_package() { + conf_files="/etc/pam.d/sudo /etc/sudoers" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/suil/suil-devel.template b/srcpkgs/suil/suil-devel.template deleted file mode 100644 index 82cddf6fb12..00000000000 --- a/srcpkgs/suil/suil-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'suil-devel'. -# -noarch=yes -depends="glibc-devel suil>=${version}" -short_desc="${short_desc} - Development files" -long_desc="${long_desc} - - This package contains files for development, headers, etc." - -do_install() -{ - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template index 5306fe9969a..827d4c1f7c1 100644 --- a/srcpkgs/suil/template +++ b/srcpkgs/suil/template @@ -1,14 +1,14 @@ # Template file for 'suil' pkgname=suil version=0.6.4 +revision=2 build_style=waf -homepage="http://drobilla.net/software/suil/" -distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" -revision=1 makedepends="python lv2 gtk+-devel qt-devel libstdc++-devel" short_desc="Lightweight C library for loading and wrapping LV2 plugin UIs" maintainer="davehome " license="BSD-style" +homepage="http://drobilla.net/software/suil/" +distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=42b13627e9c17b697871724d0312fa0e23bec3a146bba9f53311c24c0e17ff8a long_desc=" Suil is a lightweight C library for loading and wrapping LV2 plugin UIs. @@ -25,5 +25,17 @@ long_desc=" embed a Qt plugin UI without depending on Qt, and a Qt program can embed a Gtk plugin UI without depending on Gtk." -subpackages="$pkgname-devel" +suil-devel_package() { + depends="suil>=${version}" + short_desc="${short_desc} - Development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} +suil_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/surf/template b/srcpkgs/surf/template index cdfac94b68c..e25f6cc2f21 100644 --- a/srcpkgs/surf/template +++ b/srcpkgs/surf/template @@ -10,3 +10,9 @@ license="MIT" homepage="http://surf.suckless.org" distfiles="http://dl.suckless.org/surf/$pkgname-$version.tar.gz" checksum=fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 + +surf_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index b52f8c6ad7e..bb0dbd3aa11 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -1,9 +1,8 @@ # Template file for 'sushi' pkgname=sushi version=3.8.0 -revision=1 +revision=2 build_style=gnu-configure -depends="webkit-gtk3>=1.8" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gtk+3-devel>=3.8 webkitgtk-devel gjs-devel gtksourceview-devel>=3.8 clutter-gst-devel>=2.0.2 @@ -15,3 +14,9 @@ license="GPL-2" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" checksum=9e17c3601a509c428d72dee04da194555fd4f2d3d12287ef9bacf9b147bf5fae + +sushi_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/swh-lv2/template b/srcpkgs/swh-lv2/template index 6a0f8571ce3..e68c0af318c 100644 --- a/srcpkgs/swh-lv2/template +++ b/srcpkgs/swh-lv2/template @@ -14,7 +14,12 @@ checksum=5809441a94571d2f492a5e015ad035ea747127e0322e531b79a960fd0c3d250d long_desc=" Collection of GPL (free software) LV2 audio plugins" - pre_build() { sed -i -e "s|/usr/local|$DESTDIR/usr|" Makefile } + +swh-lv2_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/swig/template b/srcpkgs/swig/template index b1d7abe58d0..0111490cec6 100644 --- a/srcpkgs/swig/template +++ b/srcpkgs/swig/template @@ -17,3 +17,9 @@ long_desc=" generate the wrapper code that scripting languages need to access the underlying C/C++ code. In addition, SWIG provides a variety of customization features that let you tailor the wrapping process to suit your application." + +swig_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index d4add20c92a..090b7415ed6 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -33,3 +33,9 @@ long_desc=" post_install() { rm -rf ${DESTDIR}/usr/include } + +sylpheed_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index 1ed895438fb..0adfd6bf665 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -4,7 +4,7 @@ version=1.4.10 revision=1 wrksrc=${pkgname}-${version}-Source makedepends="cmake libSM-devel libICE-devel libXext-devel -libXtst-devel>=1.2.1_2 libXinerama-devel" + libXtst-devel>=1.2.1_2 libXinerama-devel" short_desc="Share a single mouse and keyboard between multiple computers" maintainer="Juan RP " homepage="http://synergy-foss.org/" @@ -19,8 +19,6 @@ long_desc=" the mouse and keyboard is as simple as moving the mouse off the edge of your screen. Synergy is released under the GNU Public License (GPL)." -conf_files="/etc/${pkgname}.conf" - do_build() { cmake -DCMAKE_INSTALL_PREFIX=/usr . make ${makejobs} @@ -33,3 +31,11 @@ do_install() { install -m644 doc/synergy.conf.example* \ ${DESTDIR}/usr/share/examples/${pkgname} } + +synergy_package() { + conf_files="/etc/synergy.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/sysfsutils/libsysfs-devel.template b/srcpkgs/sysfsutils/libsysfs-devel.template deleted file mode 100644 index 3332eb99daa..00000000000 --- a/srcpkgs/sysfsutils/libsysfs-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'libsysfs-devel'. -# -depends="glibc-devel libsysfs" -short_desc="libsysfs - development tools" -long_desc="${long_desc} - - This package contains the libsysfs files for development: headers, - static libs, etc." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/sysfsutils/libsysfs.template b/srcpkgs/sysfsutils/libsysfs.template deleted file mode 100644 index fe08244019e..00000000000 --- a/srcpkgs/sysfsutils/libsysfs.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'libsysfs'. -# -short_desc="Library to query system device information exposed through sysfs" -long_desc="${long_desc} - - The library's purpose is to provide a consistant and stable interface for - querying system device information exposed through sysfs." - - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/sysfsutils/template b/srcpkgs/sysfsutils/template index 68f81ddae53..ef947e1ba73 100644 --- a/srcpkgs/sysfsutils/template +++ b/srcpkgs/sysfsutils/template @@ -1,16 +1,36 @@ # Template file for 'sysfsutils' pkgname=sysfsutils version=2.1.0 -distfiles="${SOURCEFORGE_SITE}/linux-diag/$pkgname-$version.tar.gz" +revision=5 build_style=gnu-configure -revision=4 short_desc="System Utilities Based on Sysfs" homepage="http://linux-diag.sourceforge.net/Sysfsutils.html" license="GPL-2, LGPL-2.1" maintainer="Juan RP " +distfiles="${SOURCEFORGE_SITE}/linux-diag/$pkgname-$version.tar.gz" checksum=e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a long_desc=" These are a set of utilites built upon sysfs, a new virtual filesystem in Linux kernel versions 2.5+ that exposes a system's device tree." -subpackages="libsysfs libsysfs-devel" +libsysfs_package() { + short_desc="Library to query system device information exposed through sysfs" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +libsysfs-devel_package() { + depends="libsysfs>=${version}" + short_desc="libsysfs - development tools" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +sysfsutils_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template index c2bd2e2cccd..c4f4b637633 100644 --- a/srcpkgs/syslinux/template +++ b/srcpkgs/syslinux/template @@ -20,3 +20,9 @@ do_install() { make INSTALLROOT=${DESTDIR} install vmove "sbin/*" usr/bin } + +syslinux_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/sysprof/template b/srcpkgs/sysprof/template index ed386283302..bf015f2ac36 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -18,3 +18,9 @@ long_desc=" Load and Save profiles Fast, no-nonsense graphical user interface Command line tool included" + +sysprof_package() { + pkg_install() { + vmove usr + } +}