diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index f09bb3d21d5..f0e26ea204c 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -16,3 +16,9 @@ long_desc=" of the Pine email suite from The University of Washington. It aims to 'emulate Pico as closely as possible and perhaps include extra functionality'." + +nano_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nasm/template b/srcpkgs/nasm/template index b7b2f71a3cd..4ed8d846943 100644 --- a/srcpkgs/nasm/template +++ b/srcpkgs/nasm/template @@ -2,7 +2,7 @@ pkgname=nasm version=2.10.07 revision=1 -makedepends="groff perl" +hostmakedepends="groff perl" short_desc="An 80x86 assembler designed for portability and modularity" maintainer="Juan RP " homepage="http://www.nasm.us" @@ -26,3 +26,9 @@ do_install() { touch ${DESTDIR}/usr/share/info/dir vinstall LICENSE 644 usr/share/licenses/nasm } + +nasm_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nautilus-dropbox/template b/srcpkgs/nautilus-dropbox/template index e1a24ea84b9..8bad410f905 100644 --- a/srcpkgs/nautilus-dropbox/template +++ b/srcpkgs/nautilus-dropbox/template @@ -2,8 +2,8 @@ pkgname=nautilus-dropbox version=1.4.0 revision=1 -makedepends="pkg-config nautilus-devel pygtk-devel python-docutils" -depends="pygtk" +hostmakedepends="pkg-config" +makedepends="nautilus-devel pygtk-devel python-docutils" build_style=gnu-configure configure_args="--disable-static" short_desc="dropbox plugin for nautilus" @@ -12,3 +12,10 @@ license="GPL-2" homepage="http://www.dropbox.com" distfiles="https://linux.dropbox.com/packages/${pkgname}-${version}.tar.bz2" checksum=3412554d31a4a819a45edcb96bb1ab071a3e2d781817b90a14df8010137cb802 + +nautilus-dropbox_package() { + depends="pygtk" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template index c8441e0c38d..952e2d37dd8 100644 --- a/srcpkgs/nautilus-sendto/template +++ b/srcpkgs/nautilus-sendto/template @@ -21,3 +21,9 @@ long_desc=" Nautilus Send To also provides the option of compressing the files (tar.bz2, tar.gz, or zip) before sending." + +nautilus-sendto_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nautilus/libnautilus.template b/srcpkgs/nautilus/libnautilus.template deleted file mode 100644 index 622c74f5af7..00000000000 --- a/srcpkgs/nautilus/libnautilus.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libnautilus'. -# -short_desc="${sourcepkg} - shared libraries" -replaces="nautilus<3.2.1" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/nautilus/nautilus-devel.template b/srcpkgs/nautilus/nautilus-devel.template deleted file mode 100644 index 654ecf295fb..00000000000 --- a/srcpkgs/nautilus/nautilus-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'nautilus-devel'. -# -depends="gtk+3-devel libnautilus-${version}_${revision}" -short_desc="${sourcepkg} - 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/nautilus/template b/srcpkgs/nautilus/template index 725efce6386..c9457ed31fc 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -2,11 +2,9 @@ pkgname=nautilus version=3.8.0 revision=1 -subpackages="lib${pkgname} ${pkgname}-devel" build_style=gnu-configure configure_args="--disable-update-mimedb --disable-debug --disable-schemas-compile --disable-nst-extension" -depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.6.0" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gtk+3-devel>=3.8.0 libnotify-devel libexif-devel exempi-devel libxml2-devel tracker-devel>=0.16 gnome-desktop-devel>=3.8.0" @@ -20,3 +18,29 @@ long_desc=" Nautilus is the official file manager for the GNOME desktop. It is designed to be primarly a file manager, but there is support for web and file viewing too." + +libnautilus_package() { + short_desc+=" - shared libraries" + replaces="nautilus<3.2.1" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +nautilus-devel_package() { + depends="gtk+3-devel libnautilus-${version}_${revision}" + short_desc="${sourcepkg} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + vmove usr/share/gtk-doc + } +} + +nautilus_package() { + depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.6.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ncdu/template b/srcpkgs/ncdu/template index 29daf307ed0..d0174fa3e38 100644 --- a/srcpkgs/ncdu/template +++ b/srcpkgs/ncdu/template @@ -2,16 +2,21 @@ pkgname=ncdu version=1.9 revision=1 -distfiles="http://dev.yorhel.nl/download/${pkgname}-${version}.tar.gz" build_style=gnu-configure makedepends="ncurses-devel" short_desc="NCurses Disk Usage" maintainer="Juan RP " homepage="http://dev.yorhel.nl/ncdu" license="MIT" +distfiles="http://dev.yorhel.nl/download/${pkgname}-${version}.tar.gz" checksum=ea7349544a9da77764293d84e52862110ab49ee29b949158bc4bab908d3dd3a5 long_desc=" Ncdu is a ncurses-based du viewer. It provides a fast and easy-to-use interface through famous du utility. It allows to browse through the directories and show percentages of disk usage with ncurses library." +ncdu_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/neon/neon-devel.template b/srcpkgs/neon/neon-devel.template deleted file mode 100644 index a6491221a74..00000000000 --- a/srcpkgs/neon/neon-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'neon-devel'. -# -noarch=yes -depends="expat-devel openssl-devel neon>=${version}" -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,share} - mv ${SRCPKGDESTDIR}/usr/{bin,include} ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/{doc,man} ${DESTDIR}/usr/share -} diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index 574b72bf855..f1c383740cf 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -1,13 +1,12 @@ # Template file for 'neon' pkgname=neon version=0.29.6 -revision=2 -subpackages="neon-devel" +revision=3 build_style=gnu-configure configure_args="--with-expat --with-ssl=openssl --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static" -depends="ca-certificates" -makedepends="expat-devel openssl-devel>=1.0.1 mit-krb5-devel libproxy-devel" +makedepends="expat-devel openssl-devel>=1.0.1 mit-krb5-devel libproxy-devel + ca-certificates" short_desc="HTTP and WebDAV client library, with a C interface" maintainer="Juan RP " homepage="http://www.webdav.org/neon/" @@ -31,3 +30,22 @@ long_desc=" simplifying handling XML HTTP response bodies * WebDAV metadata support; wrappers for PROPFIND and PROPPATCH to simplify property manipulation." + +neon-devel_package() { + depends="expat-devel openssl-devel neon>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/bin + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/doc + vmove usr/share/man + } +} + +neon_package() { + depends="ca-certificates" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/net-snmp/libnet-snmp.template b/srcpkgs/net-snmp/libnet-snmp.template deleted file mode 100644 index b86f981dff6..00000000000 --- a/srcpkgs/net-snmp/libnet-snmp.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libnet-snmp'. -# -short_desc="${short_desc} - shared libraries" -long_desc="${long_desc} - - This package contains the net-snmp shared libraries." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/net-snmp/net-snmp-devel.template b/srcpkgs/net-snmp/net-snmp-devel.template deleted file mode 100644 index 5d4e563be32..00000000000 --- a/srcpkgs/net-snmp/net-snmp-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'net-snmp-devel'. -# -noarch=yes -depends="libnet-snmp>=$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/bin/net-snmp-config usr/bin - vmove usr/include usr - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template index 507ce3a6daa..8359617fe8f 100644 --- a/srcpkgs/net-snmp/template +++ b/srcpkgs/net-snmp/template @@ -1,16 +1,14 @@ # Template build file for 'net-snmp'. pkgname=net-snmp version=5.7.1 -revision=2 -distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz" -depends="python" -makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel python-devel python-distribute" -fulldepends="perl>=5.16" -subpackages="lib${pkgname} $pkgname-devel" +revision=4 +makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel + python-devel python-distribute perl>=5.16" short_desc="Simple Network Management Protocol (SNMP) suite" maintainer="Juan RP " homepage="http://www.net-snmp.org/" license="BSD" +distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz" checksum=7c71c9650c65b715356547e20ca2dbe6313944278af8cc19c32a5337f46b181f long_desc=" Simple Network Management Protocol (SNMP) is a widely used protocol for monitoring @@ -35,3 +33,27 @@ do_install() { make DESTDIR=${DESTDIR} INSTALL_PREFIX=${DESTDIR} \ INSTALLDIRS=vendor install } + +libnet-snmp_package() { + short_desc="${short_desc} - shared libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +net-snmp-devel_package() { + depends="libnet-snmp>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/bin/net-snmp-config + vmove usr/include + vmove usr/share/man/man3 + } +} + +net-snmp_package() { + depends="python perl>=5.16" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/net-tools/template b/srcpkgs/net-tools/template index 59ba5c2d110..18649975a1a 100644 --- a/srcpkgs/net-tools/template +++ b/srcpkgs/net-tools/template @@ -27,3 +27,9 @@ do_install() { vmove "bin/*" usr/bin vmove "sbin/*" usr/sbin } + +net-tools_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/netbsd-rumpkernel/netbsd-rumpkernel-devel.template b/srcpkgs/netbsd-rumpkernel/netbsd-rumpkernel-devel.template deleted file mode 100644 index 747e86cc6ab..00000000000 --- a/srcpkgs/netbsd-rumpkernel/netbsd-rumpkernel-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'netbsd-rumpkernel-devel'. -# -depends="${sourcepkg}>=$version" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/share usr - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template index 9d654edb825..cb717c9516b 100644 --- a/srcpkgs/netbsd-rumpkernel/template +++ b/srcpkgs/netbsd-rumpkernel/template @@ -20,7 +20,6 @@ long_desc=" nofetch=yes noextract=yes -subpackages="${pkgname}-devel" do_fetch() { local url="git://github.com/anttikantee/buildrump.sh.git" @@ -44,3 +43,19 @@ do_install() { chmod 644 ${DESTDIR}/usr/lib/*.a chmod 755 ${DESTDIR}/usr/lib/*.so.* } + +netbsd-rumpkernel-devel_package() { + depends="${sourcepkg}>=$version" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/share + vmove "usr/lib/*.a" + } +} + +netbsd-rumpkernel_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index e7cce3b64a7..dfd217c03cc 100644 --- a/srcpkgs/netbsd-wtf/template +++ b/srcpkgs/netbsd-wtf/template @@ -16,10 +16,16 @@ long_desc=" nofetch=yes noextract=yes -noarch=yes do_fetch() { local url="git://github.com/voidlinux/netbsd-wtf" msg_normal " Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } + +netbsd-wtf_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/netcat/template b/srcpkgs/netcat/template index fce674761b0..09d19ffb053 100644 --- a/srcpkgs/netcat/template +++ b/srcpkgs/netcat/template @@ -17,3 +17,9 @@ long_desc=" feature-rich network debugging and exploration tool, since it can create almost any kind of connection you would need and has several interesting built-in capabilities." + +netcat_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nethogs/template b/srcpkgs/nethogs/template index 178512fb814..8d59eb54a5a 100644 --- a/srcpkgs/nethogs/template +++ b/srcpkgs/nethogs/template @@ -11,10 +11,15 @@ distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=b09cb3c2690a522f8b1314221095d5abb1958d50b56de6d36b11a8e6f28961d0 wrksrc=$pkgname -do_install() -{ +do_install() { sed -i 's|DESTDIR := /usr/local|#DESTDIR := /usr/local|' Makefile make vinstall nethogs 755 usr/sbin vinstall nethogs.8 644 usr/share/man/man8 } + +nethogs_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/netpgp/libnetpgp-devel.template b/srcpkgs/netpgp/libnetpgp-devel.template deleted file mode 100644 index 18c40e781ac..00000000000 --- a/srcpkgs/netpgp/libnetpgp-devel.template +++ /dev/null @@ -1,22 +0,0 @@ -# Template file for 'libnetpgp'. -# -depends="zlib-devel bzip2-devel openssl-devel libnetpgp" -short_desc="BSD licensed library for PGP tasks - development files" -long_desc=" - The netpgp library is a BSD-licensed library for managing PGP keys. - - On top of the library, the netpgp command can digitally sign files and - verify that the signatures attached to files were signed by a given user - identifier. netpgp can also encrypt files using the public or private - keys of users and, in the same manner, decrypt files which were encrypted. - - This packages includes development files: headers, static libs, etc." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/share/man - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man -} diff --git a/srcpkgs/netpgp/libnetpgp.template b/srcpkgs/netpgp/libnetpgp.template deleted file mode 100644 index cc6cf6b1c60..00000000000 --- a/srcpkgs/netpgp/libnetpgp.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'libnetpgp'. -# -short_desc="BSD licensed library for PGP tasks" -long_desc=" - - The netpgp library is a BSD-licensed library for managing PGP keys. - - On top of the library, the netpgp command can digitally sign files and - verify that the signatures attached to files were signed by a given user - identifier. netpgp can also encrypt files using the public or private - keys of users and, in the same manner, decrypt files which were encrypted." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index 59170b112f6..bfe6a052fa5 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -1,14 +1,14 @@ # Template file for 'netpgp' pkgname=netpgp version=20101107 -homepage="http://www.netbsd.org" -distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$pkgname-$version.tar.gz" +revision=4 build_style=gnu-configure -revision=3 makedepends="zlib-devel openssl-devel" short_desc="PGP signing, verification, encryption and decryption program" maintainer="Juan RP " license="BSD" +homepage="http://www.netbsd.org" +distfiles="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$pkgname-$version.tar.gz" checksum=a0259f7dc886788386c0d827fdba9ad8e0dfcfab1d602dc29e02ae6cc2f9bab9 long_desc=" The netpgp library is a BSD-licensed library for managing PGP keys. @@ -31,5 +31,25 @@ long_desc=" The other user's public key can be added to our keyring. The other user will add our public key to their keyring." -subpackages="libnetpgp libnetpgp-devel" +libnetpgp_package() { + short_desc="BSD licensed library for PGP tasks" + pkg_install() { + vmove "usr/lib/*.so*" + } +} +libnetpgp-devel_package() { + depends="zlib-devel bzip2-devel openssl-devel libnetpgp>=${version}" + short_desc="BSD licensed library for PGP tasks - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/share/man/man3 + } +} + +netpgp_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index 1deeaed4203..e7ab5dba2de 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -2,7 +2,6 @@ pkgname=netsurf version=2.9 revision=3 -depends="desktop-file-utils shared-mime-info" makedepends="pkg-config perl libjpeg-turbo-devel libmng-devel libpng-devel>=1.5.10 librsvg-devel libxml2-devel libcurl-devel lcms-devel libwebp-devel libparserutils-devel libwapcaplet-devel @@ -38,3 +37,10 @@ do_install() { vinstall "${wrksrc}/${pkgname}-${version}/COPYING" \ 0644 "/usr/share/licenses/${pkgname}" } + +netsurf_package() { + depends="desktop-file-utils shared-mime-info" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/network-manager-applet/libnm-gtk.template b/srcpkgs/network-manager-applet/libnm-gtk.template deleted file mode 100644 index 2c8e8264393..00000000000 --- a/srcpkgs/network-manager-applet/libnm-gtk.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libnm-gtk'. -# -short_desc="${short_desc} - runtime library" -replaces="${sourcepkg}<0.9.1.95" - -do_install() { - vmove "usr/lib/*.so*" usr/lib - vmove "usr/lib/girepository-*" usr/lib -} diff --git a/srcpkgs/network-manager-applet/network-manager-applet-devel.template b/srcpkgs/network-manager-applet/network-manager-applet-devel.template deleted file mode 100644 index a788f572bc6..00000000000 --- a/srcpkgs/network-manager-applet/network-manager-applet-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for network-manager-applet-devel'. -# -depends="gtk+3-devel NetworkManager-devel>=${version} - libnm-gtk-${version}_${revision}" -short_desc="${short_desc} - development files" -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 6ea84f5d973..4f9c8bbb99e 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -1,19 +1,43 @@ # Template file for 'network-manager-applet' pkgname=network-manager-applet version=0.9.8.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --with-bluetooth" depends="NetworkManager>=${version} polkit-gnome notification-daemon hicolor-icon-theme" makedepends="pkg-config intltool GConf-devel libgnome-keyring-devel NetworkManager-devel>=${version} gnome-bluetooth-devel libnotify-devel - polkit-devel libgudev-devel gobject-introspection" -fulldepends="iso-codes" -subpackages="libnm-gtk ${pkgname}-devel" + polkit-devel libgudev-devel gobject-introspection iso-codes" short_desc="NetworkManager panel applet for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org/projects/NetworkManager/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz" checksum=1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590 + +libnm-gtk_package() { + short_desc="${short_desc} - runtime library" + replaces="${sourcepkg}<0.9.1.95" + pkg_install() { + vmove "usr/lib/*.so*" + vmove "usr/lib/girepository-*" + } +} + +network-manager-applet-devel_package() { + depends="gtk+3-devel NetworkManager-devel>=${version} + libnm-gtk-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +network-manager-applet_package() { + depends="iso-codes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index 7a61920d476..86ec549481a 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -36,3 +36,9 @@ do_install() { # Create newlisp symlink; ln -sfr ${DESTDIR}/usr/bin/newlisp-${version} ${DESTDIR}/usr/bin/newlisp } + +newlisp_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nfs-utils/nfs-utils-server.template b/srcpkgs/nfs-utils/nfs-utils-server.template deleted file mode 100644 index d46107e30b1..00000000000 --- a/srcpkgs/nfs-utils/nfs-utils-server.template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'nfs-utils-server'. -# -short_desc="Network File System utilities -- Server utilities" - -depends="rpcbind" -replaces="nfs-utils<1.2.6_2" -conf_files="/etc/exports" - -mutable_files=" -/var/lib/nfs/etab -/var/lib/nfs/rmtab -/var/lib/nfs/xtab -/var/lib/nfs/state" - -make_dirs=" -/var/lib/nfs/v4recovery 0755 root root -/var/lib/nfs/sm 0750 root root -/etc/exports.d 0750 root root" - -do_install() { - vmove etc/exports etc - for f in exportfs rpc.mountd rpc.nfsd blkmapd rpc.svcgssd; do - vmove usr/sbin/${f} usr/sbin - [ "$f" = "blkmapd" ] && continue - vmove usr/share/man/man8/${f}.8 usr/share/man/man8 - done - for f in mountd nfsd blkmapd svcgssd; do - vmove usr/share/man/man8/${f}.8 usr/share/man/man8 - done - vmove usr/share/man/man5 usr/share/man - vmove usr/share/man/man7 usr/share/man - vmove var/lib/nfs var/lib - for f in blkmapd nfsd rpc-mountd rpc-svcgssd; do - vmove usr/lib/systemd/system/${f}.service usr/lib/systemd/system - done - vmove usr/lib/systemd/system/proc-fs-nfsd.mount usr/lib/systemd/system -} diff --git a/srcpkgs/nfs-utils/template b/srcpkgs/nfs-utils/template index 9ed327ea61d..200d2423175 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -1,7 +1,7 @@ # Template file for 'nfs-utils' pkgname=nfs-utils version=1.2.7 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4 --with-statedir=/var/lib/nfs --enable-libmount-mount @@ -13,18 +13,11 @@ homepage="http://nfs.sourceforge.net" distfiles="${KERNEL_SITE}/utils/${pkgname}/${version}/${pkgname}-${version}.tar.xz" checksum=d78768a0819c5eeed5e5abb6c4c9048962e9f8b9ef45451ea4db6aee38720121 -depends="rpcbind" -subpackages="$pkgname-server" -makedepends="pkg-config libblkid-devel libmount-devel libtirpc-devel +hostmakedepends="pkg-config" +makedepends="libblkid-devel libmount-devel libtirpc-devel librpcsecgss-devel libnfsidmap-devel libevent-devel device-mapper-devel libcap-devel mit-krb5-devel sqlite-devel" -conf_files="/etc/idmapd.conf" - -make_dirs=" -/var/lib/nfs/rpc_pipefs 0755 root root -/var/lib/nfs/sm 0750 root root" - post_install() { vmove "sbin/*" usr/sbin # conffiles @@ -35,3 +28,49 @@ post_install() { install -m644 ${FILESDIR}/*.{service,mount} \ ${DESTDIR}/usr/lib/systemd/system } + +nfs-utils-server_package() { + short_desc="Network File System utilities -- Server utilities" + depends="rpcbind" + replaces="nfs-utils<1.2.6_2" + conf_files="/etc/exports" + mutable_files=" + /var/lib/nfs/etab + /var/lib/nfs/rmtab + /var/lib/nfs/xtab + /var/lib/nfs/state" + make_dirs=" + /var/lib/nfs/v4recovery 0755 root root + /var/lib/nfs/sm 0750 root root + /etc/exports.d 0750 root root" + pkg_install() { + vmove etc/exports etc + for f in exportfs rpc.mountd rpc.nfsd blkmapd rpc.svcgssd; do + vmove usr/sbin/${f} + [ "$f" = "blkmapd" ] && continue + vmove usr/share/man/man8/${f}.8 + done + for f in mountd nfsd blkmapd svcgssd; do + vmove usr/share/man/man8/${f}.8 + done + vmove usr/share/man/man5 + vmove usr/share/man/man7 + vmove var/lib/nfs + for f in blkmapd nfsd rpc-mountd rpc-svcgssd; do + vmove usr/lib/systemd/system/${f}.service + done + vmove usr/lib/systemd/system/proc-fs-nfsd.mount + } +} + +nfs-utils_package() { + conf_files="/etc/idmapd.conf" + make_dirs=" + /var/lib/nfs/rpc_pipefs 0755 root root + /var/lib/nfs/sm 0750 root root" + depends="rpcbind" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index f0c4d2be426..7f3f63d9231 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -10,28 +10,6 @@ homepage="http://nginx.org" distfiles="http://nginx.org/download/nginx-$version.tar.gz" checksum=d2947c98c5bed311b1e6c04e35a730af92e40e2e6bfe9201fa7f404987457137 -conf_files=" -/etc/nginx/fastcgi.conf -/etc/nginx/fastcgi_params -/etc/nginx/koi-win -/etc/nginx/koi-utf -/etc/nginx/mime.types -/etc/nginx/nginx.conf -/etc/nginx/scgi_params -/etc/nginx/uwsgi_params -/etc/nginx/win-utf -/etc/logrotate.d/nginx" - -system_accounts="nginx" -nginx_homedir="/var/tmp/nginx" - -systemd_services="nginx.service on" - -make_dirs=" -/var/log/nginx 0750 root root -/var/tmp 1777 root root -/var/tmp/nginx 0750 root root" - do_configure() { local cfgdir=/etc/nginx local tmpdir=/var/tmp/nginx @@ -80,3 +58,29 @@ do_install() { vinstall ${FILESDIR}/nginx.service 644 usr/lib/systemd/system vinstall LICENSE 644 usr/share/licenses/nginx } + +nginx_package() { + conf_files=" + /etc/nginx/fastcgi.conf + /etc/nginx/fastcgi_params + /etc/nginx/koi-win + /etc/nginx/koi-utf + /etc/nginx/mime.types + /etc/nginx/nginx.conf + /etc/nginx/scgi_params + /etc/nginx/uwsgi_params + /etc/nginx/win-utf + /etc/logrotate.d/nginx" + depends="shadow" + system_accounts="nginx" + nginx_homedir="/var/tmp/nginx" + systemd_services="nginx.service on" + make_dirs=" + /var/log/nginx 0750 root root + /var/tmp 1777 root root + /var/tmp/nginx 0750 root root" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template index dfa801ed528..ffdb611d6ea 100644 --- a/srcpkgs/ngrep/template +++ b/srcpkgs/ngrep/template @@ -2,8 +2,9 @@ pkgname=ngrep version=1.45 revision=1 -makedepends="automake pkg-config pcre-devel libpcap-devel openssl-devel" -short_desc=" grep-like utility for network interfaces" +hostmakedepends="automake pkg-config" +makedepends="pcre-devel libpcap-devel openssl-devel" +short_desc="grep-like utility for network interfaces" maintainer="Juan RP " license="MIT" homepage="http://ngrep.sourceforge.net/" @@ -28,3 +29,9 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } + +ngrep_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nilfs-utils/libnilfs.template b/srcpkgs/nilfs-utils/libnilfs.template deleted file mode 100644 index ed944d1fafd..00000000000 --- a/srcpkgs/nilfs-utils/libnilfs.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libnilfs'. -# -short_desc="NILFS userspace runtime libraries" -long_desc="${long_desc} - - This package contains the NILFS runtime libraries." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/nilfs-utils/nilfs-utils-devel.template b/srcpkgs/nilfs-utils/nilfs-utils-devel.template deleted file mode 100644 index 8c520694895..00000000000 --- a/srcpkgs/nilfs-utils/nilfs-utils-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'nilfs-devel'. -# -depends="libuuid-devel libmount-devel libnilfs>=$version" -short_desc="NILFS userspace 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/*.a" usr/lib -} diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template index a32b9044240..0eceb556c9f 100644 --- a/srcpkgs/nilfs-utils/template +++ b/srcpkgs/nilfs-utils/template @@ -1,12 +1,10 @@ # Template file for 'nilfs-utils' pkgname=nilfs-utils version=2.1.4 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-libmount" makedepends="libuuid-devel libmount-devel" -conf_files="/etc/nilfs_cleanerd.conf" -subpackages="libnilfs ${pkgname}-devel" short_desc="A log-structured file system for Linux - userspace utils" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -24,3 +22,27 @@ post_install() { vmkdir usr/sbin vmove "sbin/*" usr/sbin } + +libnilfs_package() { + short_desc="NILFS userspace runtime libraries" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +nilfs-utils-devel_package() { + depends="libuuid-devel libmount-devel libnilfs>=$version" + short_desc="NILFS userspace development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +nilfs-utils_package() { + conf_files="/etc/nilfs_cleanerd.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/nmap/nmapfe.template b/srcpkgs/nmap/nmapfe.template deleted file mode 100644 index 1d299df4a86..00000000000 --- a/srcpkgs/nmap/nmapfe.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'nmapfe'. -# -depends="nmap>=$version desktop-file-utils pygtk" -pycompile_module="radialnet zenmapCore zenmapGUI" -noarch=yes -short_desc="${short_desc} - GTK Frontend" -long_desc="${long_desc} - - This package contains nmapfe - a GTK Frontend written in pygtk." - -do_install() { - vmove usr/bin/nmapfe usr/bin - vmove usr/bin/xnmap usr/bin - vmove usr/bin/zenmap usr/bin - vmove usr/lib usr - vmove usr/share/applications usr/share - vmove usr/share/zenmap usr/share - vmove usr/share/man/man1/zenmap.1 usr/share/man/man1 - rm -f ${SRCPKGDESTDIR}/usr/bin/uninstall_zenmap -} diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index 004541ea42e..d3280de3c44 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -4,7 +4,6 @@ version=6.25 revision=1 build_style=gnu-configure makedepends="libpcap-devel openssl-devel pcre-devel>=8.30 lua-devel pygtk-devel" -subpackages="nmapfe" short_desc="Utility for network discovery and security auditing" maintainer="Juan RP " license="GPL-2" @@ -21,3 +20,26 @@ long_desc=" versions) they are running, what type of packet filters/firewalls are in use, and dozens of other characteristics. It was designed to rapidly scan large networks, but works fine against single hosts." + +nmapfe_package() { + noarch=yes + depends="nmap>=$version desktop-file-utils pygtk" + pycompile_module="radialnet zenmapCore zenmapGUI" + short_desc="${short_desc} - GTK Frontend" + pkg_install() { + vmove usr/bin/nmapfe + vmove usr/bin/xnmap + vmove usr/bin/zenmap + vmove usr/lib + vmove usr/share/applications + vmove usr/share/zenmap + vmove usr/share/man/man1/zenmap.1 + rm -f ${DESTDIR}/usr/bin/uninstall_zenmap + } +} + +nmap_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index e34379d50d6..9dcfc35658e 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -10,8 +10,7 @@ homepage="http://nodejs.org/" distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz" checksum=1624dc37866ebfb5431e3393e6b049cf238cac8ad4d20c6d567263b1259177ab -makedepends="pkg-config openssl-devel v8-devel zlib-devel" -fulldepends="python" +makedepends="pkg-config openssl-devel v8-devel zlib-devel python" do_configure() { export LD="$CXX" @@ -26,3 +25,10 @@ do_install() { make LD="$CXX" DESTDIR="$DESTDIR" install vinstall LICENSE 644 usr/share/licenses/${pkgname} } + +nodejs_package() { + depends="python" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template index 2fe23d900fa..f37adec17f9 100644 --- a/srcpkgs/notification-daemon/template +++ b/srcpkgs/notification-daemon/template @@ -2,11 +2,10 @@ pkgname=notification-daemon version=0.7.6 revision=1 -replaces="notification-daemon>=0" build_style=gnu-configure configure_args="--disable-static" -depends="desktop-file-utils" -makedepends="pkg-config intltool glib-devel gtk+3-devel libcanberra-devel" +hostmakedepends="pkg-config intltool" +makedepends="libglib-devel gtk+3-devel libcanberra-devel" short_desc="Shows notification messages on the desktop" maintainer="Juan RP " homepage="http://www.galago-project.org/specs/notification/" @@ -17,3 +16,11 @@ long_desc=" notification-daemon is an application that shows notifications sent by other applications on your desktop in the form of popups. It is based on the libnotify library." + +notification-daemon_package() { + replaces="notification-daemon>=0" + depends="desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template index 957c76f2679..585d09fe38d 100644 --- a/srcpkgs/notify-python/template +++ b/srcpkgs/notify-python/template @@ -3,14 +3,13 @@ pkgname=notify-python version=0.1.1 revision=8 patch_args="-Np1" -distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure -depends="pygtk" makedepends="pkg-config libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel" short_desc="Python bindings for libnotify" homepage="http://www.galago-project.org/" license="LGPL-2.1" maintainer="Juan RP " +distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz" checksum=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022 long_desc=" libnotify sends desktop notifications to a notification daemon, as defined @@ -20,6 +19,10 @@ long_desc=" $pkgname provides just the Python bindings for libnotify." -pycompile_module="gtk-2.0/pynotify" - - +notify-python_package() { + pycompile_module="gtk-2.0/pynotify" + depends="pygtk" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nss-mdns/template b/srcpkgs/nss-mdns/template index db9d5d50c0e..14ce822dc86 100644 --- a/srcpkgs/nss-mdns/template +++ b/srcpkgs/nss-mdns/template @@ -4,10 +4,16 @@ version=0.10 revision=4 build_style=gnu-configure configure_args="--enable-avahi --disable-lynx" -depends="avahi" short_desc="NSS module for Multicast DNS name resolution" maintainer="Juan RP " homepage="http://0pointer.de/lennart/projects/$pkgname" license="LGPL-2.1" distfiles="${homepage}/$pkgname-$version.tar.gz" checksum=1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d + +nss-mdns_package() { + depends="avahi" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nss-myhostname/template b/srcpkgs/nss-myhostname/template index 935f55ba400..7b7a1c70ed8 100644 --- a/srcpkgs/nss-myhostname/template +++ b/srcpkgs/nss-myhostname/template @@ -23,3 +23,9 @@ long_desc=" post_install() { rm -rf ${DESTDIR}/usr/share/doc } + +nss-myhostname_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nss/nss-devel.template b/srcpkgs/nss/nss-devel.template deleted file mode 100644 index 17c124917cc..00000000000 --- a/srcpkgs/nss/nss-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'nss-devel'. -# -noarch=yes -depends="nspr-devel>=4.9.3 nss-${version}_${revision}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/bin/nss-config usr/bin - vmove usr/lib/pkgconfig usr/lib - vmove usr/include usr -} diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 3e99c3e0a5c..752f87114b8 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -2,9 +2,9 @@ pkgname=nss version=3.14.3 _distver=$(echo $version|sed -e "s|\.|_|g") -revision=1 -makedepends="perl nspr-devel>=4.9.3 sqlite-devel" -subpackages="nss-devel" +revision=2 +hostmakedepends="perl" +makedepends="nspr-devel>=4.9.3 sqlite-devel" short_desc="Mozilla Network Security Services" maintainer="Juan RP " homepage="http://www.mozilla.org/projects/security/pki/nss/" @@ -78,3 +78,19 @@ do_install() { install -m644 mozilla/dist/public/nss/*.h ${DESTDIR}/usr/include/nss } + +nss-devel_package() { + depends="nspr-devel>=4.9.3 nss-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/bin/nss-config + vmove usr/lib/pkgconfig + vmove usr/include + } +} + +nss_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ntfs-3g/ntfs-3g-devel.template b/srcpkgs/ntfs-3g/ntfs-3g-devel.template deleted file mode 100644 index b4217c9ec2b..00000000000 --- a/srcpkgs/ntfs-3g/ntfs-3g-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'ntfs-3g-devel'. -# -depends="fuse-devel ntfs-3g>=${version}" -short_desc="${short_desc} -- development files" -replaces="ntfsprogs-devel>=0" -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template index f854e5c1991..fd49d8b655c 100644 --- a/srcpkgs/ntfs-3g/template +++ b/srcpkgs/ntfs-3g/template @@ -1,12 +1,13 @@ # Template file for 'ntfs-3g' pkgname=ntfs-3g version=2013.1.13 -revision=1 +revision=2 wrksrc="${pkgname}_ntfsprogs-${version}" build_style=gnu-configure configure_args="--exec-prefix=/usr --disable-static --with-fuse=external --enable-posix-acls --enable-xattr-mappings" -makedepends="pkg-config libuuid-devel fuse-devel" +hostmakedepends="pkg-config" +makedepends="libuuid-devel fuse-devel" short_desc="Stable Read/Write NTFS Driver in userspace" maintainer="Juan RP " homepage="http://www.tuxera.com/community/ntfs-3g-download/" @@ -14,10 +15,24 @@ license="GPL-2" distfiles="http://www.tuxera.com/opensource/${pkgname}_ntfsprogs-${version}.tgz" checksum=4b383f0074a3ab7683339d1f18222b107aaeb4983db119292c43c2b275cefb27 -provides="ntfsprogs-${version}" -replaces="ntfsprogs>=0" -subpackages="$pkgname-devel" - post_install() { vmove "sbin/*" usr/sbin } + +ntfs-3g-devel_package() { + depends="fuse-devel ntfs-3g>=${version}" + short_desc="${short_desc} -- development files" + replaces="ntfsprogs-devel>=0" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +ntfs-3g_package() { + provides="ntfsprogs-${version}" + replaces="ntfsprogs>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ntp/ntp-perl.template b/srcpkgs/ntp/ntp-perl.template deleted file mode 100644 index 59024bab74a..00000000000 --- a/srcpkgs/ntp/ntp-perl.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'ntp-perl'. -# -depends="ntp>=$version perl>=0" -noarch=yes -short_desc="${short_desc} (perl scripts)" -long_desc="${long_desc} - - This package contains perl scripts ntp-wait and ntptrace." - -do_install() { - for f in ntp-wait ntptrace; do - vmove usr/bin/${f} usr/bin - done -} diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 0c1a164c887..2c25b542907 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -1,7 +1,7 @@ # Template file for 'ntp' pkgname=ntp version=4.2.6p5 -revision=9 +revision=10 build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --with-lineeditlibs=readline" hostmakedepends="bison perl-HTML-Parser" @@ -13,13 +13,6 @@ homepage="http://www.ntp.org/" distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$version.tar.gz" checksum=d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c -subpackages="ntp-perl" -conf_files="/etc/ntp.conf" -systemd_services="ntpdate.service on ntpd.service on" -system_accounts="ntpd" -provides="ntp-daemon-0" -replaces="ntp-daemon>=0" - post_install() { # ntpd service vinstall ${FILESDIR}/ntpd.service 644 usr/lib/systemd/system @@ -35,3 +28,27 @@ post_install() { vmkdir usr/share/man mv man/man* ${DESTDIR}/usr/share/man } + +ntp-perl_package() { + depends="ntp>=$version perl>=0" + noarch=yes + short_desc="${short_desc} (perl scripts)" + pkg_install() { + for f in ntp-wait ntptrace; do + vmove usr/bin/${f} + done + } +} + +ntp_package() { + depends="shadow" + conf_files="/etc/ntp.conf" + systemd_services="ntpdate.service on ntpd.service on" + system_accounts="ntpd" + provides="ntp-daemon-0" + replaces="ntp-daemon>=0" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/numactl/libnuma-devel.template b/srcpkgs/numactl/libnuma-devel.template deleted file mode 100644 index 7f21889c170..00000000000 --- a/srcpkgs/numactl/libnuma-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'libnuma-devel '. -# -noarch=yes -depends="libnuma-${version}_${revision}" -short_desc="${short_desc} -- development files" -long_desc=" - The libnuma library provides convenient ways for you to add NUMA memory - policies into your own program. - - This package contains development files for libnuma." - -do_install() { - vmove usr/include usr - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/numactl/libnuma.template b/srcpkgs/numactl/libnuma.template deleted file mode 100644 index 778fde20a11..00000000000 --- a/srcpkgs/numactl/libnuma.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libnuma'. -# -short_desc="${short_desc} -- shared library" -long_desc=" - The libnuma library provides convenient ways for you to add NUMA memory - policies into your own program." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template index dc8753f92c2..33adc3d4e4f 100644 --- a/srcpkgs/numactl/template +++ b/srcpkgs/numactl/template @@ -1,8 +1,7 @@ # Template file for 'numactl' pkgname=numactl version=2.0.8 -revision=1 -subpackages="libnuma libnuma-devel" +revision=2 short_desc="Simple NUMA policy support" maintainer="Juan RP " license="LGPL-2.1" @@ -23,3 +22,25 @@ do_install() { # Remove static libs. rm -f ${DESTDIR}/usr/lib/*.a } + +libnuma_package() { + short_desc="${short_desc} -- shared library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +libnuma-devel_package() { + depends="libnuma-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/share/man/man3 + } +} + +numactl_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template index a0f325585e3..7389f5ad890 100644 --- a/srcpkgs/nvi/template +++ b/srcpkgs/nvi/template @@ -23,3 +23,9 @@ post_install() { # remove cat pages. rm -rf ${DESTDIR}/usr/share/man/cat1 } + +nvi_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/nvidia/nvidia-dkms.template b/srcpkgs/nvidia/nvidia-dkms.template deleted file mode 100644 index 2561b355c5d..00000000000 --- a/srcpkgs/nvidia/nvidia-dkms.template +++ /dev/null @@ -1,21 +0,0 @@ -# Template file for 'nvidia-dkms'. -# -short_desc="NVIDIA drivers for linux -- DKMS kernel module" -nonfree=yes -triggers="dkms" -dkms_modules="nvidia ${version}" - -do_install() { - vmkdir usr/src/nvidia-${version} - vcopy "${_pkg}/kernel/*" usr/src/nvidia-${version} - - # systemd modules-load.d(5) file. - vmkdir usr/lib/modules-load.d - echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf - chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf - - # Blacklist nouveau. - vmkdir usr/lib/modprobe.d - echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf - chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf -} diff --git a/srcpkgs/nvidia/nvidia-opencl.template b/srcpkgs/nvidia/nvidia-opencl.template deleted file mode 100644 index 3a120903e2c..00000000000 --- a/srcpkgs/nvidia/nvidia-opencl.template +++ /dev/null @@ -1,28 +0,0 @@ -# Template file for 'nvidia-opencl'. -# -short_desc="NVIDIA drivers for linux -- OpenCL implementation" -nonfree=yes -provides="libOpenCL-${version}" -replaces="libOpenCL>=0" - -do_install() { - cd ${_pkg} - - vinstall nvidia.icd 644 etc/OpenCL/vendors - - vinstall libOpenCL.so.1.0.0 755 usr/lib - ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so - ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so.1 - - vinstall libnvidia-compiler.so.${version} 755 usr/lib - ln -sf libnvidia-compiler.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-compiler.so - ln -sf libnvidia-compiler.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-compiler.so.1 - - vinstall libnvidia-opencl.so.${version} 755 usr/lib - ln -sf libnvidia-opencl.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-opencl.so - ln -sf libnvidia-opencl.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-opencl.so.1 -} diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index 157cc816923..993f162515d 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -9,12 +9,8 @@ homepage="http://www.nvidia.com" create_wrksrc=yes noextract=yes -nonfree=yes -subpackages="nvidia-dkms nvidia-opencl" -depends="nvidia-dkms-${version}_${revision} pkg-config" -conflicts="catalyst>=0" -if [ "${XBPS_MACHINE}" = "i686" ]; then +if [ "$XBPS_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="ftp://download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" checksum=0a0f10979b1bca8e4a244e204b58aeb9a580924a9dd7b11b21d15abfe1ad49ad @@ -97,4 +93,71 @@ do_install() { vinstall LICENSE 644 usr/share/licenses/nvidia vinstall README.txt 644 usr/share/doc/nvidia README vinstall NVIDIA_Changelog 644 usr/share/doc/nvidia + + # opencl pkg + vinstall nvidia.icd 644 etc/OpenCL/vendors + + vinstall libOpenCL.so.1.0.0 755 usr/lib + ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so + ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so.1 + + vinstall libnvidia-compiler.so.${version} 755 usr/lib + ln -sf libnvidia-compiler.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-compiler.so + ln -sf libnvidia-compiler.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-compiler.so.1 + + vinstall libnvidia-opencl.so.${version} 755 usr/lib + ln -sf libnvidia-opencl.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-opencl.so + ln -sf libnvidia-opencl.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-opencl.so.1 + + # dkms pkg + vmkdir usr/src/nvidia-${version} + vcopy "${_pkg}/kernel/*" usr/src/nvidia-${version} + + # systemd modules-load.d(5) file. + vmkdir usr/lib/modules-load.d + echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf + chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf + + # Blacklist nouveau. + vmkdir usr/lib/modprobe.d + echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf + chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf +} + +nvidia-dkms_package() { + nonfree=yes + triggers="dkms" + dkms_modules="nvidia ${version}" + depends="dkms" + short_desc="NVIDIA drivers for linux -- DKMS kernel module" + pkg_install() { + vmove usr/src + vmove usr/lib/modules-load.d + vmove usr/lib/modprobe.d + } +} + +nvidia-opencl_package() { + nonfree=yes + short_desc="NVIDIA drivers for linux -- OpenCL implementation" + provides="libOpenCL-${version}" + replaces="libOpenCL>=0" + pkg_install() { + vmove "usr/lib/libOpenCL*" + vmove "usr/lib/libnvidia-compiler*" + vmove "usr/lib/libnvidia-opencl*" + } +} + +nvidia_package() { + nonfree=yes + depends="nvidia-dkms-${version}_${revision} pkg-config" + conflicts="catalyst>=0" + pkg_install() { + vmove usr + } } diff --git a/srcpkgs/nvidia304/nvidia304-dkms.template b/srcpkgs/nvidia304/nvidia304-dkms.template deleted file mode 100644 index 36c75bcd014..00000000000 --- a/srcpkgs/nvidia304/nvidia304-dkms.template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'nvidia304-dkms'. -# -short_desc="NVIDIA drivers for linux (304.xx series) -- DKMS kernel module" - -nonfree=yes -triggers="dkms" -provides="nvidia-dkms-${version}" -replaces="nvidia-dkms>=0" -dkms_modules="nvidia ${version}" - -do_install() { - vmkdir usr/src/nvidia-${version} - vcopy "${_pkg}/kernel/*" usr/src/nvidia-${version} - - # systemd modules-load.d(5) file. - vmkdir usr/lib/modules-load.d - echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf - chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf - - # Blacklist nouveau. - vmkdir usr/lib/modprobe.d - echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf - chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf -} diff --git a/srcpkgs/nvidia304/nvidia304-opencl.template b/srcpkgs/nvidia304/nvidia304-opencl.template deleted file mode 100644 index aba8c016fe1..00000000000 --- a/srcpkgs/nvidia304/nvidia304-opencl.template +++ /dev/null @@ -1,29 +0,0 @@ -# Template file for 'nvidia304-opencl'. -# -short_desc="NVIDIA drivers for linux (304.xx series) -- OpenCL implementation" - -nonfree=yes -provides="nvidia-opencl-${version} libOpenCL-${version}" -replaces="nvidia-openctl>=0 libOpenCL>=0" - -do_install() { - cd ${_pkg} - - vinstall nvidia.icd 644 etc/OpenCL/vendors - - vinstall libOpenCL.so.1.0.0 755 usr/lib - ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so - ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so.1 - - vinstall libnvidia-compiler.so.${version} 755 usr/lib - ln -sf libnvidia-compiler.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-compiler.so - ln -sf libnvidia-compiler.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-compiler.so.1 - - vinstall libnvidia-opencl.so.${version} 755 usr/lib - ln -sf libnvidia-opencl.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-opencl.so - ln -sf libnvidia-opencl.so.${version} \ - ${DESTDIR}/usr/lib/libnvidia-opencl.so.1 -} diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index 010fbc84c74..9602fd25f12 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -9,13 +9,6 @@ homepage="http://www.nvidia.com" create_wrksrc=yes noextract=yes -nonfree=yes -provides="nvidia-${version}" -replaces="nvidia>=0" -subpackages="${pkgname}-dkms ${pkgname}-opencl" -depends="${pkgname}-dkms-${version}_${revision} pkg-config" -conflicts="catalyst>=0" - if [ "${XBPS_MACHINE}" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" distfiles="ftp://download.nvidia.com/XFree86/Linux-x86/${version}/${_pkg}.run" @@ -105,4 +98,74 @@ do_install() { vinstall LICENSE 644 usr/share/licenses/nvidia vinstall README.txt 644 usr/share/doc/nvidia README vinstall NVIDIA_Changelog 644 usr/share/doc/nvidia + + # dkms pkg + vmkdir usr/src/nvidia-${version} + vcopy "${_pkg}/kernel/*" usr/src/nvidia-${version} + + # systemd modules-load.d(5) file. + vmkdir usr/lib/modules-load.d + echo "nvidia" > ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf + chmod 644 ${DESTDIR}/usr/lib/modules-load.d/nvidia.conf + + # Blacklist nouveau. + vmkdir usr/lib/modprobe.d + echo "blacklist nouveau" > ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf + chmod 644 ${DESTDIR}/usr/lib/modprobe.d/nvidia.conf + # opencl pkg + vinstall nvidia.icd 644 etc/OpenCL/vendors + + vinstall libOpenCL.so.1.0.0 755 usr/lib + ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so + ln -sf libOpenCL.so.1.0.0 ${DESTDIR}/usr/lib/libOpenCL.so.1 + + vinstall libnvidia-compiler.so.${version} 755 usr/lib + ln -sf libnvidia-compiler.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-compiler.so + ln -sf libnvidia-compiler.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-compiler.so.1 + + vinstall libnvidia-opencl.so.${version} 755 usr/lib + ln -sf libnvidia-opencl.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-opencl.so + ln -sf libnvidia-opencl.so.${version} \ + ${DESTDIR}/usr/lib/libnvidia-opencl.so.1 +} + +nvidia304-dkms_package() { + short_desc="NVIDIA drivers for linux (304.xx series) -- DKMS kernel module" + nonfree=yes + depends="dkms" + triggers="dkms" + dkms_modules="nvidia ${version}" + provides="nvidia-dkms-${version}" + replaces="nvidia-dkms>=0" + pkg_install() { + vmove usr/src + vmove usr/lib/modules-load.d + vmove usr/lib/modprobe.d + } +} + +nvidia304-opencl_package() { + short_desc="NVIDIA drivers for linux (304.xx series) -- OpenCL implementation" + nonfree=yes + provides="nvidia-opencl-${version} libOpenCL-${version}" + replaces="nvidia-openctl>=0 libOpenCL>=0" + pkg_install() { + vmove "usr/lib/libOpenCL*" + vmove "usr/lib/libnvidia-compiler*" + vmove "usr/lib/libnvidia-opencl*" + } +} + +nvidia304_package() { + nonfree=yes + provides="nvidia-${version}" + replaces="nvidia>=0" + depends="${pkgname}-dkms-${version}_${revision} pkg-config" + conflicts="catalyst>=0" + pkg_install() { + vmove usr + } }