diff --git a/doc/manual.txt b/doc/manual.txt index 347a4661f9..992f3978a6 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -27,7 +27,6 @@ A simple `template` example is as follows: -------------------------------------------------------------------------- # Template file for 'foo' -## source section pkgname="foo" version="1.0" revision="1" @@ -39,12 +38,6 @@ homepage="http://www.foo.org" distfiles="http://www.foo.org/foo-${version}.tar.gz" checksum="fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff" -## package section -foo_package() { - pkg_install() { - vmove all - } -} --------------------------------------------------------------------------- diff --git a/srcpkgs/2bwm-git/template b/srcpkgs/2bwm-git/template index 86f14cf756..1e72f83cab 100644 --- a/srcpkgs/2bwm-git/template +++ b/srcpkgs/2bwm-git/template @@ -29,9 +29,3 @@ do_install() { install -Dm644 hidden.man ${DESTDIR}/usr/share/man/man1/hidden.1 vinstall README.md 644 usr/share/doc/${pkgname} } - -2bwm-git_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 67b7e75dad..f1e5993e58 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -65,9 +65,3 @@ Ice-devel_package() { vmove usr/include } } - -Ice_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index 31ca4ee994..8f6810641f 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -32,9 +32,3 @@ LuaJIT-devel_package() { vmove "usr/lib/*.so" } } - -LuaJIT_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index 12460bb3f9..3f1f3a770a 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -22,6 +22,7 @@ hostmakedepends="automake libtool flex pkg-config llvm>=3.3" makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel libudev-devel>=183 libdrm-devel expat-devel talloc-devel libxml2-python libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel elfutils-devel" +conf_files="/etc/drirc" pre_configure() { NOCONFIGURE=1 ./autogen.sh @@ -175,10 +176,3 @@ mesa-vmwgfx-dri_package() { vmove usr/lib/gallium-pipe/pipe_vmwgfx.so } } - -MesaLib_package() { - conf_files="/etc/drirc" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template index df357d7082..7141f18fb3 100644 --- a/srcpkgs/ModemManager/template +++ b/srcpkgs/ModemManager/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-static --sbindir=/usr/bin --with-udev-base-dir=/usr/lib/udev --with-polkit=permissive" hostmakedepends="pkg-config intltool" makedepends="glib-devel libgudev-devel polkit-devel libqmi-devel libmbim-devel systemd-devel ppp" +depends="hicolor-icon-theme ppp" +systemd_services="${pkgname}.service on" short_desc="Mobile broadband modem management service" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/ModemManager/" @@ -29,11 +31,3 @@ libmm-glib_package() { vmove "usr/lib/libmm-glib.so.*" } } - -ModemManager_package() { - depends="hicolor-icon-theme ppp" - systemd_services="${pkgname}.service on" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/MoinMoin/template b/srcpkgs/MoinMoin/template index b73468543e..33e3f406f0 100644 --- a/srcpkgs/MoinMoin/template +++ b/srcpkgs/MoinMoin/template @@ -3,8 +3,11 @@ pkgname=MoinMoin version=1.9.4 revision=1 wrksrc=moin-${version} +noarch="yes" build_style=python-module makedepends="python" +depends="python" +pycompile_module="MoinMoin jabberbot" short_desc="MoinMoin, a Python clone of WikiWiki" maintainer="Juan RP " homepage="http://moinmo.in" @@ -16,12 +19,3 @@ long_desc=" emphasis on easy access to and modification of information. MoinMoin is a Python WikiClone that allows you to easily set up your own wiki, only requiring a Python installation." - -MoinMoin_package() { - noarch="yes" - pycompile_module="MoinMoin jabberbot" - depends="python" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ORBit2/template b/srcpkgs/ORBit2/template index 13883fbf1a..61f390bcf1 100644 --- a/srcpkgs/ORBit2/template +++ b/srcpkgs/ORBit2/template @@ -42,9 +42,3 @@ ORBit2-devel_package() { vmove usr/share/aclocal } } - -ORBit2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/Pyrex/template b/srcpkgs/Pyrex/template index 96ef9778a9..59cc44d577 100644 --- a/srcpkgs/Pyrex/template +++ b/srcpkgs/Pyrex/template @@ -4,6 +4,8 @@ version=0.9.9 revision=2 build_style=python-module makedepends="python" +noarch="yes" +pycompile_module="Pyrex" short_desc="Language for writing Python extension modules" maintainer="Juan RP " homepage="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex" @@ -13,11 +15,3 @@ checksum=5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 long_desc=" Pyrex lets you write code that mixes Python and C data types any way you want, and compiles it into a C extension for Python." - -Pyrex_package() { - noarch="yes" - pycompile_module="Pyrex" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template index e3e1de8cd0..77defac96a 100644 --- a/srcpkgs/SDL/template +++ b/srcpkgs/SDL/template @@ -67,6 +67,11 @@ else configure_args+=" --disable-pulseaudio" fi +if [ "$build_option_opengl" ]; then + # libGL.so.1 is dynamically loaded with dlopen. + depends="libGL" +fi + SDL-devel_package() { short_desc="${short_desc} -- development files" depends="alsa-lib-devel SDL>=${version}" @@ -88,13 +93,3 @@ SDL-devel_package() { vmove usr/share } } - -SDL_package() { - if [ "$build_option_opengl" ]; then - # libGL.so.1 is dynamically loaded with dlopen. - depends="libGL" - fi - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template index 6318c48f95..dfe3e60924 100644 --- a/srcpkgs/SDL2/template +++ b/srcpkgs/SDL2/template @@ -65,6 +65,15 @@ else configure_args+=" --disable-pulseaudio" fi +if [ "$build_option_opengl" ]; then + # libGL.so.1 is dynamically loaded with dlopen. + depends+=" libGL" +fi +if [ "$build_option_gles" ]; then + # libGLESv2.so.1 is dynamically loaded with dlopen. + depends+=" libGLES" +fi + SDL2-devel_package() { short_desc+=" - development files" depends="alsa-lib-devel ${sourcepkg}>=${version}_${revision}" @@ -90,17 +99,3 @@ SDL2-devel_package() { vmove usr/share } } - -SDL2_package() { - if [ "$build_option_opengl" ]; then - # libGL.so.1 is dynamically loaded with dlopen. - depends+=" libGL" - fi - if [ "$build_option_gles" ]; then - # libGLESv2.so.1 is dynamically loaded with dlopen. - depends+=" libGLES" - fi - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template index ec4dbf5011..a2996bfcc0 100644 --- a/srcpkgs/SDL_image/template +++ b/srcpkgs/SDL_image/template @@ -5,6 +5,8 @@ revision=9 build_style=gnu-configure configure_args="--disable-static" makedepends="libpng-devel>=1.6 tiff-devel SDL-devel libwebp-devel>=0.2.0" +# The following are dlopen(3)ed at runtime. +depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.2.0" short_desc="Load images as SDL surfaces" maintainer="Juan RP " license="BSD" @@ -24,11 +26,3 @@ SDL_image-devel_package() { vmove usr/lib/pkgconfig } } - -SDL_image_package() { - # The following are dlopen(3)ed at runtime. - depends="libpng>=1.6 tiff libjpeg-turbo libwebp>=0.2.0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template index 3bc14bb9df..78994f4cf3 100644 --- a/srcpkgs/SDL_mixer/template +++ b/srcpkgs/SDL_mixer/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-static" makedepends="SDL-devel libvorbis-devel libmikmod-devel>=3.2.0 libflac-devel smpeg-devel fluidsynth-devel" +# The following deps are dlopen(3)ed at runtime. +depends="libvorbis libmikmod smpeg libflac" short_desc="Multi-channel audio mixer library" maintainer="Juan RP " license="BSD" @@ -31,17 +33,9 @@ post_install() { SDL_mixer-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} (development files)" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -SDL_mixer_package() { - # The following deps are dlopen(3)ed at runtime. - depends="libvorbis libmikmod smpeg libflac" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template index 9cc34e67e2..f7b5356e53 100644 --- a/srcpkgs/SDL_net/template +++ b/srcpkgs/SDL_net/template @@ -27,9 +27,3 @@ SDL_net-devel_package() { vmove usr/lib/pkgconfig } } - -SDL_net_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template index a2091d7475..05f27bbaaf 100644 --- a/srcpkgs/SDL_sound/template +++ b/srcpkgs/SDL_sound/template @@ -26,14 +26,8 @@ long_desc=" SDL_sound-devel_package() { depends="SDL_sound>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include } } - -SDL_sound_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template index d53cb8e43c..411dc4244b 100644 --- a/srcpkgs/SDL_ttf/template +++ b/srcpkgs/SDL_ttf/template @@ -28,9 +28,3 @@ SDL_ttf-devel_package() { vmove usr/lib/pkgconfig } } - -SDL_ttf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 10800e7d83..28e67db7ed 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -18,6 +18,7 @@ makedepends="pcre-devel>=8.30 libglib-devel>=2.32.3_2 gtk+-devel dbus-glib-devel libexif-devel exo-devel>=0.10.2 xfce4-panel-devel startup-notification-devel systemd-devel gvfs-devel hicolor-icon-theme desktop-file-utils" +depends="gvfs hicolor-icon-theme desktop-file-utils" Thunar-devel_package() { depends="libglib-devel gtk+-devel Thunar>=${version}" @@ -28,10 +29,3 @@ Thunar-devel_package() { vmove usr/share/gtk-doc } } - -Thunar_package() { - depends="gvfs hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template index 2fc134e985..5ec795792c 100644 --- a/srcpkgs/Twisted/template +++ b/srcpkgs/Twisted/template @@ -4,6 +4,8 @@ version=13.2.0 revision=1 build_style=python-module makedepends="python-devel zope.interface>=4.0.1 pycrypto pyopenssl" +depends="zope.interface>=4.0.1 pycrypto pyopenssl" +pycompile_module="twisted" short_desc="Event-driven networking engine written in Python" maintainer="Juan RP " homepage="http://twistedmatrix.com/" @@ -14,11 +16,3 @@ checksum=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 if [ "$CROSS_BUILD" ]; then hostmakedepends="${makedepends}" fi - -Twisted_package() { - depends="zope.interface>=4.0.1 pycrypto pyopenssl" - pycompile_module="twisted" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/VirtualGL/template b/srcpkgs/VirtualGL/template index a150b7467d..1f71cc1175 100644 --- a/srcpkgs/VirtualGL/template +++ b/srcpkgs/VirtualGL/template @@ -28,9 +28,3 @@ VirtualGL-devel_package() { vmove usr/include } } - -VirtualGL_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/WindowMaker/template b/srcpkgs/WindowMaker/template index 34d896eb0f..ff64127fa1 100644 --- a/srcpkgs/WindowMaker/template +++ b/srcpkgs/WindowMaker/template @@ -9,6 +9,13 @@ configure_args="--enable-xinerama --with-nlsdir=/usr/share/locale makedepends="pkg-config libXinerama-devel libXrandr-devel libXmu-devel libpng-devel>=1.6 libXpm-devel libXft-devel tiff-devel giflib-devel fontconfig-devel" +conf_files=" + /etc/WindowMaker + /etc/WindowMaker/WindowMaker + /etc/WindowMaker/WMRootMenu + /etc/WindowMaker/WMWindowAttributes + /etc/WindowMaker/WMState + /etc/WindowMaker/WMGLOBA" short_desc="An X11 window manager with a NEXTSTEP look and feel" maintainer="Juan RP " license="GPL-3" @@ -29,16 +36,3 @@ WindowMaker-devel_package() { vmove usr/lib/pkgconfig } } - -WindowMaker_package() { - conf_files=" - /etc/WindowMaker - /etc/WindowMaker/WindowMaker - /etc/WindowMaker/WMRootMenu - /etc/WindowMaker/WMWindowAttributes - /etc/WindowMaker/WMState - /etc/WindowMaker/WMGLOBA" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/a2jmidid/template b/srcpkgs/a2jmidid/template index 73528ee1c5..989901e981 100644 --- a/srcpkgs/a2jmidid/template +++ b/srcpkgs/a2jmidid/template @@ -13,9 +13,3 @@ checksum=2a9635f62aabc59edb54ada07048dd47e896b90caff94bcee710d3582606f55f long_desc=" a2jmidid is daemon for exposing legacy ALSA sequencer applications in JACK MIDI system." - -a2jmidid_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/aalib/template b/srcpkgs/aalib/template index 1b87ce77cd..5ee713dfaf 100644 --- a/srcpkgs/aalib/template +++ b/srcpkgs/aalib/template @@ -30,9 +30,3 @@ aalib-devel_package() { vmove usr/share/man/man3 } } - -aalib_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/abGate/template b/srcpkgs/abGate/template index c78be27c24..ee65e236f9 100644 --- a/srcpkgs/abGate/template +++ b/srcpkgs/abGate/template @@ -5,16 +5,10 @@ build_style=gnu-makefile revision=2 hostmakedepends="pkg-config" makedepends="qt-devel gtkmm2-devel lv2" +depends="lv2" short_desc="LV2 Noise Gate plugin" maintainer="davehome " license="GPL-3" homepage="http://abgate.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/abgate/${pkgname}-${version}.tar.gz" checksum=df1e0457757ba3c01ba55eba975fd04f8b96c10157ae1955738c0a77106dafa4 - -abGate_package() { - depends="lv2" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/abcde/template b/srcpkgs/abcde/template index 6d5062c92f..db8c370854 100644 --- a/srcpkgs/abcde/template +++ b/srcpkgs/abcde/template @@ -2,20 +2,14 @@ pkgname=abcde version=2.5.4 revision=2 +noarch="yes" +conf_files="/etc/${pkgname}.conf" makedepends="cd-discid vorbis-tools perl" +depends="${makedepends}" build_style="gnu-makefile" maintainer="Philipp Hirsch " +short_desc="A Better CD Encoder" license="GPL-2" homepage="http://code.google.com/p/abcde/" distfiles="http://abcde.googlecode.com/files/${pkgname}-${version}.tar.gz" checksum=85b679b970e728a986487adcbff7c51eb0e72f9fa10c4450521f8e029fa6e591 -short_desc="A Better CD Encoder" - -abcde_package() { - noarch="yes" - depends="${makedepends}" - conf_files="/etc/${pkgname}.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/abiword/template b/srcpkgs/abiword/template index d7988bd1c6..1ee5cb32c3 100644 --- a/srcpkgs/abiword/template +++ b/srcpkgs/abiword/template @@ -9,6 +9,8 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.6 fribidi-devel libgsf-devel enchant-devel gtk+3-devel librsvg-devel wv-devel>=1.2.9 boost-devel libxslt-devel libwmf-devel libchamplain-devel redland-devel libical-devel" +replaces="abiword-plugins>=0" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Free word processing program similar to Microsoft(R) Word" maintainer="davehome " license="GPL-3" @@ -32,11 +34,3 @@ abiword-devel_package() { vmove usr/lib/pkgconfig } } - -abiword_package() { - replaces="abiword-plugins>=0" - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/abook/template b/srcpkgs/abook/template index 1a5f268017..93517496cd 100644 --- a/srcpkgs/abook/template +++ b/srcpkgs/abook/template @@ -2,18 +2,11 @@ pkgname=abook version=0.5.6 revision=1 +build_style=gnu-configure +makedepends="ncurses-devel readline-devel" maintainer="Philipp Hirsch " license="GPL-2" homepage="http://abook.sourceforge.net/" +short_desc="text-based addressbook designed to use with mutt mail client" distfiles="http://prdownloads.sourceforge.net/abook/${pkgname}-${version}.tar.gz" checksum=0646f6311a94ad3341812a4de12a5a940a7a44d5cb6e9da5b0930aae9f44756e -short_desc="text-based addressbook designed to use with mutt mail client" -makedepends="ncurses-devel readline-devel" -build_style=gnu-configure - - -abook_package() { - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/accountsservice/template b/srcpkgs/accountsservice/template index 6095c144a1..d69df02950 100644 --- a/srcpkgs/accountsservice/template +++ b/srcpkgs/accountsservice/template @@ -7,6 +7,9 @@ configure_args="--disable-static --with-systemdsystemunitdir=/usr/lib/systemd/system" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="polkit-devel systemd-devel" +make_dirs=" + /var/lib/AccountsService/users 755 root root + /var/lib/AccountsService/icons 755 root root" short_desc="D-Bus interfaces for querying and manipulating user account information" maintainer="Juan RP " homepage="http://cgit.freedesktop.org/accountsservice/" @@ -29,12 +32,3 @@ accountsservice-devel_package() { vmove usr/share/gtk-doc } } - -accountsservice_package() { - make_dirs=" - /var/lib/AccountsService/users 755 root root - /var/lib/AccountsService/icons 755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/acct/template b/srcpkgs/acct/template index 08d7742ee3..df63c29449 100644 --- a/srcpkgs/acct/template +++ b/srcpkgs/acct/template @@ -18,9 +18,3 @@ post_install() { rm ${DESTDIR}/usr/bin/last rm ${DESTDIR}/usr/share/man/man1/last.1 } - -acct_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/acl/template b/srcpkgs/acl/template index 427951e543..e167a89251 100644 --- a/srcpkgs/acl/template +++ b/srcpkgs/acl/template @@ -2,6 +2,7 @@ pkgname=acl version=2.2.52 revision=2 +bootstrap=yes build_style=gnu-configure configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" makedepends="attr-devel" @@ -12,8 +13,6 @@ license="LGPL-2.1" distfiles="${NONGNU_SITE}/acl/acl-${version}.src.tar.gz" checksum=179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 -bootstrap=yes - if [ -z "$CHROOT_READY" ]; then CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include" LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib" @@ -42,9 +41,3 @@ acl-progs_package() { vmove usr/share } } - -acl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/acpi/template b/srcpkgs/acpi/template index 5f11ae3351..36efb5e56a 100644 --- a/srcpkgs/acpi/template +++ b/srcpkgs/acpi/template @@ -9,9 +9,3 @@ license="GPL-2" homepage="http://sourceforge.net/projects/acpiclient/" distfiles="http://downloads.sourceforge.net/acpiclient/$pkgname-$version.tar.gz" checksum=d7a504b61c716ae5b7e81a0c67a50a51f06c7326f197b66a4b823de076a35005 - -acpi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/acpica-utils/template b/srcpkgs/acpica-utils/template index 2e6a4886e8..97800e4164 100644 --- a/srcpkgs/acpica-utils/template +++ b/srcpkgs/acpica-utils/template @@ -41,9 +41,3 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } - -acpica-utils_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/acpid/template b/srcpkgs/acpid/template index b4329d1c52..cdf78de483 100644 --- a/srcpkgs/acpid/template +++ b/srcpkgs/acpid/template @@ -3,6 +3,8 @@ pkgname=acpid version=2.0.19 revision=1 build_style=gnu-configure +conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh" +systemd_services="acpid.socket on" short_desc="The ACPI Daemon (acpid) With Netlink Support" maintainer="Juan RP " license="GPL-2" @@ -22,11 +24,3 @@ post_install() { vinstall ${FILESDIR}/handler.sh 755 etc/acpi vinstall ${FILESDIR}/anything 644 etc/acpi/events } - -acpid_package() { - conf_files="/etc/acpi/events/anything /etc/acpi/handler.sh" - systemd_services="acpid.socket on" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/acr/template b/srcpkgs/acr/template index 1cf9495ca0..70c490c833 100644 --- a/srcpkgs/acr/template +++ b/srcpkgs/acr/template @@ -2,6 +2,7 @@ pkgname=acr version=0.9.6 revision=1 +noarch="yes" build_style=gnu-configure short_desc="AutoConf Replacement" maintainer="pancake " @@ -13,10 +14,3 @@ long_desc=" ACR tries to replace autoconf functionality generating a full-compatible 'configure' script (runtime flags). But using shell-script instead of m4. This means that ACR is faster, smaller and easy to use." - -acr_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/adobe-flash-plugin/template b/srcpkgs/adobe-flash-plugin/template index 74b3bc6a3a..8ecadb152f 100644 --- a/srcpkgs/adobe-flash-plugin/template +++ b/srcpkgs/adobe-flash-plugin/template @@ -20,6 +20,9 @@ short_desc="Adobe Flash Player plugin for Netscape compatible browsers" maintainer="Juan RP " homepage="http://www.adobe.com" license="Adobe License (non free)" +nonfree="yes" +makedepends="curl hicolor-icon-theme desktop-file-utils" +depends="${makedepends}" create_srcdir=yes create_wrksrc=yes @@ -40,11 +43,3 @@ do_install() { vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \ usr/share/licenses/${pkgname} LICENSE.pdf } - -adobe-flash-plugin_package() { - nonfree="yes" - depends="curl hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/adobe-flash-plugin11.1/template b/srcpkgs/adobe-flash-plugin11.1/template index 4f9deef852..e373485fc6 100644 --- a/srcpkgs/adobe-flash-plugin11.1/template +++ b/srcpkgs/adobe-flash-plugin11.1/template @@ -20,6 +20,11 @@ short_desc="Adobe Flash Player plugin (11.1 series)" homepage="http://www.adobe.com" license="Propietary license - adobe" maintainer="Juan RP " +nonfree="yes" +replaces="adobe-flash-plugin>=0" +provides="adobe-flash-plugin-11.1.102.63" +makedepends="curl hicolor-icon-theme desktop-file-utils" +depends="${makedepends}" create_srcdir=yes create_wrksrc=yes @@ -39,13 +44,3 @@ do_install() { vinstall "${XBPS_SRCDISTDIR}/${pkgname}-${version}/$(basename ${_eula})" 644 \ usr/share/licenses/${pkgname} LICENSE.pdf } - -adobe-flash-plugin11.1_package() { - nonfree="yes" - replaces="adobe-flash-plugin>=0" - provides="adobe-flash-plugin-11.1.102.63" - depends="curl hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/agar/template b/srcpkgs/agar/template index ecb936d011..ae3628d83a 100644 --- a/srcpkgs/agar/template +++ b/srcpkgs/agar/template @@ -46,9 +46,3 @@ agar-devel_package() { vmove usr/share/man } } - -agar_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/agg/template b/srcpkgs/agg/template index f983cb50a7..b1f4d2ef2e 100644 --- a/srcpkgs/agg/template +++ b/srcpkgs/agg/template @@ -32,9 +32,3 @@ agg-devel_package() { vmove usr/share } } - -agg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/akonadi/template b/srcpkgs/akonadi/template index 3b236ecb2f..54df3c0470 100644 --- a/srcpkgs/akonadi/template +++ b/srcpkgs/akonadi/template @@ -17,6 +17,7 @@ configure_args="-DAKONADI_BUILD_TESTS=OFF -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE hostmakedepends="cmake automoc4 pkg-config" makedepends="shared-mime-info sqlite-devel boost-devel>=1.54 qt-devel phonon-devel soprano-devel>=2.9.2_4" +depends="shared-mime-info" akonadi-devel_package() { short_desc+=" - development files" @@ -28,10 +29,3 @@ akonadi-devel_package() { vmove "usr/lib/*.so" } } - -akonadi_package() { - depends="shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/allegro4/template b/srcpkgs/allegro4/template index 3fb4a67a31..a86b9ea7de 100644 --- a/srcpkgs/allegro4/template +++ b/srcpkgs/allegro4/template @@ -8,6 +8,8 @@ configure_args="-DWANT_DOCS=OFF" hostmakedepends="pkg-config cmake" makedepends="zlib-devel alsa-lib-devel jack-devel libXpm-devel libXxf86vm-devel libXxf86dga-devel libXcursor-devel libvorbis-devel libpng-devel glu-devel" +# libGL.so is dlopen()ed. +depends="libGL" short_desc="Portable library mainly aimed at video game and multimedia programming" maintainer="Juan RP " license="Allegro License (MIT alike)" @@ -24,11 +26,3 @@ allegro4-devel_package() { vmove "usr/lib/*.so" } } - -allegro4_package() { - # libGL.so is dlopen()ed. - depends="libGL" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/alsa-lib/template b/srcpkgs/alsa-lib/template index 09dc201786..dc2c1a3870 100644 --- a/srcpkgs/alsa-lib/template +++ b/srcpkgs/alsa-lib/template @@ -40,12 +40,6 @@ alsa-lib-devel_package() { } } -alsa-lib_package() { - pkg_install() { - vmove all - } -} - if [ -z "$CROSS_BUILD" ]; then alsa-lib-python_package() { short_desc+=" - python smixer plugin" diff --git a/srcpkgs/alsa-plugins/template b/srcpkgs/alsa-plugins/template index d80a2d8032..fab7852826 100644 --- a/srcpkgs/alsa-plugins/template +++ b/srcpkgs/alsa-plugins/template @@ -58,9 +58,3 @@ alsa-plugins-ffmpeg_package() { vmove "usr/lib/alsa-lib/*a52*" } } - -alsa-plugins_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/alsa-utils/template b/srcpkgs/alsa-utils/template index 5dd4fd0260..72d311de4c 100644 --- a/srcpkgs/alsa-utils/template +++ b/srcpkgs/alsa-utils/template @@ -7,6 +7,9 @@ configure_args="--with-systemdsystemunitdir=/usr/lib/systemd/system --with-udev-rules-dir=/usr/lib/udev/rules.d -disable-alsaconf" hostmakedepends="pkg-config xmlto" makedepends="ncurses-devel alsa-lib-devel>=1.0.27 libsamplerate-devel" +# Needs snd_pcm_abort() from >= 1.0.27. +depends="alsa-lib>=1.0.27" +make_dirs="/var/lib/alsa 0750 root root" short_desc="The Advanced Linux Sound Architecture (ALSA) utils" maintainer="Juan RP " homepage="http://www.alsa-project.org" @@ -24,12 +27,3 @@ post_install() { make -C alsactl 90-alsa-restore.rules vinstall alsactl/90-alsa-restore.rules 644 usr/lib/udev/rules.d } - -alsa-utils_package() { - # Needs snd_pcm_abort() from >= 1.0.27. - depends="alsa-lib>=1.0.27" - make_dirs="/var/lib/alsa 0750 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/anjuta/template b/srcpkgs/anjuta/template index 814f8082b2..8a2eae9248 100644 --- a/srcpkgs/anjuta/template +++ b/srcpkgs/anjuta/template @@ -21,6 +21,7 @@ makedepends="gtksourceview-devel>=3.10 libxml2-devel vte3-devel gjs-devel>=1.38 libxslt-devel glade3-devel>=3.16 graphviz-devel vala-devel>=0.22 gdl-devel>=3.10 libgda-devel devhelp-devel>=3.10 sqlite-devel apr-util-devel neon-devel subversion-devel python-devel" +depends="autogen" anjuta-devel_package() { short_desc+=" - Development files" @@ -41,10 +42,3 @@ anjuta-docs_package() { vmove usr/share/gtk-doc } } - -anjuta_package() { - depends="autogen" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 3c688fc0a5..2cca8de921 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -2,21 +2,15 @@ pkgname=ansible version=1.4.3 revision=1 +noarch="yes" build_style=python-module hostmakedepends="python" makedepends="python-devel python-jinja python-paramiko pyyaml" +depends="python python-jinja python-paramiko pyyaml" +pycompile_module="${pkgname}" short_desc="A radically simple deployment, model-driven configuration management, and command execution framework" maintainer="Juan RP " license="GPL-3" homepage="http://www.ansibleworks.com" distfiles="http://www.ansibleworks.com/releases/$pkgname-$version.tar.gz" checksum=0741788cdd86d2e3bbfb4474c26bb13d57690ed2e2c8ff8dd1c271a7de590ee3 - -ansible_package() { - noarch="yes" - pycompile_module="${pkgname}" - depends="python python-jinja python-paramiko pyyaml" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/apache-mpm-event/template b/srcpkgs/apache-mpm-event/template index da2aa70dd2..f17a42510f 100644 --- a/srcpkgs/apache-mpm-event/template +++ b/srcpkgs/apache-mpm-event/template @@ -28,6 +28,10 @@ long_desc=" This MPM is experimental and less tested than the worker and prefork MPMs." +# dlopen(3) run-time dependencies. +depends="apache>=$version" +systemd_services="apache-mpm-event.service on" + pre_configure() { cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout } @@ -39,12 +43,3 @@ post_install() { vinstall httpd 755 usr/sbin httpd.event vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } - -apache-mpm-event_package() { - # dlopen(3) run-time dependencies. - depends="apache>=$version" - systemd_services="apache-mpm-event.service on" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/apache-mpm-worker/template b/srcpkgs/apache-mpm-worker/template index aa33b1df7a..f23bfa135c 100644 --- a/srcpkgs/apache-mpm-worker/template +++ b/srcpkgs/apache-mpm-worker/template @@ -25,6 +25,10 @@ long_desc=" recommended especially for high-traffic sites because it is faster and has a smaller memory footprint than the traditional prefork MPM." +# dlopen(3) run-time dependencies. +depends="apache>=$version" +systemd_services="apache-mpm-worker.service on" + pre_configure() { cat ${XBPS_SRCPKGDIR}/apache/files/xbps.layout >> config.layout } @@ -36,12 +40,3 @@ post_install() { vinstall httpd 755 usr/sbin httpd.worker vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } - -apache-mpm-worker_package() { - # dlopen(3) run-time dependencies. - depends="apache>=$version" - systemd_services="apache-mpm-worker.service on" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/apache/template b/srcpkgs/apache/template index 11941faafa..ae13191c76 100644 --- a/srcpkgs/apache/template +++ b/srcpkgs/apache/template @@ -22,6 +22,25 @@ configure_args="--prefix= --enable-pie --enable-modules=all hostmakedepends="pkg-config perl" makedepends="zlib-devel libuuid-devel pcre-devel>=8.30 openssl-devel db-devel gdbm-devel expat-devel libldap-devel apr-util-devel" +conf_files=" + /etc/httpd/extra/httpd-autoindex.conf + /etc/httpd/extra/httpd-dav.conf + /etc/httpd/extra/httpd-manual.conf + /etc/httpd/extra/httpd-vhosts.conf + /etc/httpd/extra/httpd-info.conf + /etc/httpd/extra/httpd-languages.conf + /etc/httpd/extra/httpd-userdir.conf + /etc/httpd/extra/httpd-ssl.conf + /etc/httpd/extra/httpd-mpm.conf + /etc/httpd/extra/httpd-default.conf + /etc/httpd/extra/httpd-multilang-errordoc.conf + /etc/httpd/httpd.conf + /etc/httpd/magic + /etc/httpd/mime.types" +systemd_services="apache.service on" +system_accounts="httpd" +httpd_descr="Apache HTTP server" +httpd_homedir="/srv/httpd" short_desc="The Number One HTTP Server On The Internet" maintainer="Juan RP " homepage="http://httpd.apache.org/" @@ -87,28 +106,3 @@ apache-devel_package() { vmove "usr/share/man/man1/apxs*" } } - -apache_package() { - conf_files=" - /etc/httpd/extra/httpd-autoindex.conf - /etc/httpd/extra/httpd-dav.conf - /etc/httpd/extra/httpd-manual.conf - /etc/httpd/extra/httpd-vhosts.conf - /etc/httpd/extra/httpd-info.conf - /etc/httpd/extra/httpd-languages.conf - /etc/httpd/extra/httpd-userdir.conf - /etc/httpd/extra/httpd-ssl.conf - /etc/httpd/extra/httpd-mpm.conf - /etc/httpd/extra/httpd-default.conf - /etc/httpd/extra/httpd-multilang-errordoc.conf - /etc/httpd/httpd.conf - /etc/httpd/magic - /etc/httpd/mime.types" - systemd_services="apache.service on" - system_accounts="httpd" - httpd_descr="Apache HTTP server" - httpd_homedir="/srv/httpd" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/apg/template b/srcpkgs/apg/template index c65464fb5c..9ae8278947 100644 --- a/srcpkgs/apg/template +++ b/srcpkgs/apg/template @@ -23,9 +23,3 @@ do_install() { install -D -m644 doc/man/$i.1 ${DESTDIR}/usr/share/man/man1/$i.1 done } - -apg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/apr-util/template b/srcpkgs/apr-util/template index 35019fe408..3d8d340327 100644 --- a/srcpkgs/apr-util/template +++ b/srcpkgs/apr-util/template @@ -86,9 +86,3 @@ apr-util-sqlite_package() { vmove "usr/lib/apr-util-1/apr_dbd_sqlite*" } } - -apr-util_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template index 869dfcf541..82881fcc9a 100644 --- a/srcpkgs/apr/template +++ b/srcpkgs/apr/template @@ -36,9 +36,3 @@ apr-devel_package() { vmove usr/lib/pkgconfig } } - -apr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/aqemu/template b/srcpkgs/aqemu/template index f85d78414f..ef90e413b8 100644 --- a/srcpkgs/aqemu/template +++ b/srcpkgs/aqemu/template @@ -6,6 +6,7 @@ build_style=cmake configure_args="-DWITHOUT_EMBEDDED_DISPLAY=1" hostmakedepends="cmake" makedepends="qt-devel qemu desktop-file-utils" +depends="qemu desktop-file-utils" short_desc="GUI to QEMU and KVM emulators, written in Qt4" maintainer="Juan RP " homepage="http://aqemu.sourceforge.net" @@ -16,10 +17,3 @@ long_desc=" AQEMU is GUI to QEMU and KVM emulators, written in Qt4. The program has user-friendly interface and allows to set up the majority of QEMU and KVM options." - -aqemu_package() { - depends="qemu desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/aria2/template b/srcpkgs/aria2/template index 505a58bd32..9955343cd7 100644 --- a/srcpkgs/aria2/template +++ b/srcpkgs/aria2/template @@ -12,16 +12,10 @@ configure_args="--with-openssl --with-libexpat --without-gnutls hostmakedepends="pkg-config" makedepends="zlib-devel gmp-devel expat-devel openssl-devel sqlite-devel c-ares-devel ca-certificates" +depends="ca-certificates" short_desc="Lightweight multi-protocol/multi-source command-line download utility" maintainer="Juan RP " license="GPL-2" homepage="http://aria2.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460 - -aria2_package() { - depends="ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/arm-mem-git/template b/srcpkgs/arm-mem-git/template index 6de7a2c39b..c8e9aaaf55 100644 --- a/srcpkgs/arm-mem-git/template +++ b/srcpkgs/arm-mem-git/template @@ -19,9 +19,3 @@ do_fetch() { do_install() { vinstall libarmmem.so 755 usr/lib } - -arm-mem-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/artwiz-fonts/template b/srcpkgs/artwiz-fonts/template index 80927a7bb6..d50d34515d 100644 --- a/srcpkgs/artwiz-fonts/template +++ b/srcpkgs/artwiz-fonts/template @@ -2,6 +2,8 @@ pkgname=artwiz-fonts version=1.3 revision=1 +noarch="yes" +wrksrc="artwiz-aleczapka-en-${version}" short_desc="Small futuristic ASCII fonts for X" maintainer="Ypnose " homepage="http://artwizaleczapka.sourceforge.net/" @@ -9,7 +11,8 @@ license="GPL-2" distfiles="http://downloads.sourceforge.net/sourceforge/artwizaleczapka/artwiz-aleczapka-en-${version}.tar.bz2" checksum=19f163de81548db9b9dd7d3a415fba379f1d17989020236aa4eb88c25929afe1 makedepends="font-util mkfontdir" -wrksrc="artwiz-aleczapka-en-${version}" +depends="${makedepends}" +font_dirs="/usr/share/fonts/artwiz-fonts" do_install() { vmkdir usr/share/fonts/artwiz-fonts @@ -18,12 +21,3 @@ do_install() { vinstall fonts.alias 644 usr/share/fonts/artwiz-fonts vinstall README 644 usr/share/doc/artwiz-fonts } - -artwiz-fonts_package() { - depends="${makedepends}" - noarch="yes" - font_dirs="/usr/share/fonts/artwiz-fonts" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/asciidoc/template b/srcpkgs/asciidoc/template index 7ae7ed55e6..4e1393365d 100644 --- a/srcpkgs/asciidoc/template +++ b/srcpkgs/asciidoc/template @@ -2,8 +2,35 @@ pkgname=asciidoc version=8.6.9 revision=1 +noarch="yes" build_style=gnu-configure makedepends="python libxslt docbook-xsl" +depends="${makedepends}" +conf_files=" + /etc/asciidoc/asciidoc.conf + /etc/asciidoc/docbook45.conf + /etc/asciidoc/filters/code/code-filter.conf + /etc/asciidoc/filters/graphviz/graphviz-filter.conf + /etc/asciidoc/filters/latex/latex-filter.conf + /etc/asciidoc/filters/music/music-filter.conf + /etc/asciidoc/filters/source/source-highlight-filter.conf + /etc/asciidoc/help.conf + /etc/asciidoc/html4.conf + /etc/asciidoc/lang-de.conf + /etc/asciidoc/lang-en.conf + /etc/asciidoc/lang-es.conf + /etc/asciidoc/lang-fr.conf + /etc/asciidoc/lang-hu.conf + /etc/asciidoc/lang-it.conf + /etc/asciidoc/lang-pt-BR.conf + /etc/asciidoc/lang-ru.conf + /etc/asciidoc/lang-uk.conf + /etc/asciidoc/latex.conf + /etc/asciidoc/slidy.conf + /etc/asciidoc/text.conf + /etc/asciidoc/wordpress.conf + /etc/asciidoc/xhtml11.conf + /etc/asciidoc/xhtml11-quirks.conf" short_desc="Text based document generation" maintainer="Juan RP " homepage="http://www.methods.co.nz/asciidoc/" @@ -18,36 +45,3 @@ long_desc=" AsciiDoc is highly configurable: both the AsciiDoc source file syntax and the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user." - -asciidoc_package() { - depends="${makedepends}" - conf_files=" - /etc/asciidoc/asciidoc.conf - /etc/asciidoc/docbook45.conf - /etc/asciidoc/filters/code/code-filter.conf - /etc/asciidoc/filters/graphviz/graphviz-filter.conf - /etc/asciidoc/filters/latex/latex-filter.conf - /etc/asciidoc/filters/music/music-filter.conf - /etc/asciidoc/filters/source/source-highlight-filter.conf - /etc/asciidoc/help.conf - /etc/asciidoc/html4.conf - /etc/asciidoc/lang-de.conf - /etc/asciidoc/lang-en.conf - /etc/asciidoc/lang-es.conf - /etc/asciidoc/lang-fr.conf - /etc/asciidoc/lang-hu.conf - /etc/asciidoc/lang-it.conf - /etc/asciidoc/lang-pt-BR.conf - /etc/asciidoc/lang-ru.conf - /etc/asciidoc/lang-uk.conf - /etc/asciidoc/latex.conf - /etc/asciidoc/slidy.conf - /etc/asciidoc/text.conf - /etc/asciidoc/wordpress.conf - /etc/asciidoc/xhtml11.conf - /etc/asciidoc/xhtml11-quirks.conf" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/aspell-en/template b/srcpkgs/aspell-en/template index cac6b57980..b08b866404 100644 --- a/srcpkgs/aspell-en/template +++ b/srcpkgs/aspell-en/template @@ -2,6 +2,7 @@ pkgname=aspell-en version=7.1 revision=1 +noarch=yes wrksrc="aspell6-en-${version}-0" build_style=configure hostmakedepends="which" @@ -12,10 +13,3 @@ license="LGPL-2.1" maintainer="Juan RP " distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2" checksum=ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a - -aspell-en_package() { - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/aspell/template b/srcpkgs/aspell/template index c07b230d20..f775ea35b8 100644 --- a/srcpkgs/aspell/template +++ b/srcpkgs/aspell/template @@ -22,6 +22,7 @@ build_style=gnu-configure configure_args="--enable-compile-in-filters" hostmakedepends="perl" makedepends="ncurses-devel" +depends="perl" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gettext-devel" @@ -41,10 +42,3 @@ aspell-devel_package() { vmove usr/share/man/man1/pspell-config.1 } } - -aspell_package() { - depends="perl" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/astyle/template b/srcpkgs/astyle/template index 1d43fe2b9a..017da159d0 100644 --- a/srcpkgs/astyle/template +++ b/srcpkgs/astyle/template @@ -17,9 +17,3 @@ do_install() { vmkdir usr/share/doc/html/astyle install -m644 ../../doc/*.html ${DESTDIR}/usr/share/doc/html/astyle } - -astyle_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/at-spi2-atk/template b/srcpkgs/at-spi2-atk/template index 4f132ca53e..f07246fa7f 100644 --- a/srcpkgs/at-spi2-atk/template +++ b/srcpkgs/at-spi2-atk/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-core-devel>=2.10" +depends="at-spi2-core>=2.10" short_desc="A GTK+ module that bridges ATK to D-Bus at-spi" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -28,10 +29,3 @@ at-spi2-atk-devel_package() { vmove "usr/lib/*.so" } } - -at-spi2-atk_package() { - depends="at-spi2-core>=2.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/at-spi2-core/template b/srcpkgs/at-spi2-core/template index 2b10fd5f4f..16b40c9413 100644 --- a/srcpkgs/at-spi2-core/template +++ b/srcpkgs/at-spi2-core/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool dbus gobject-introspection" makedepends="libXext-devel libSM-devel libXtst-devel libXevie-devel dbus-devel" +conf_files="/etc/at-spi2/accessibility.conf" short_desc="Assistive Technology Service Provider Interface" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -23,10 +24,3 @@ at-spi2-core-devel_package() { vmove "usr/lib/*.so" } } - -at-spi2-core_package() { - conf_files="/etc/at-spi2/accessibility.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/atf/template b/srcpkgs/atf/template index ec504ecf4e..a23ae1c27c 100644 --- a/srcpkgs/atf/template +++ b/srcpkgs/atf/template @@ -5,6 +5,8 @@ revision=1 build_style=gnu-configure hostmakedepends="libtool gdb" makedepends="gdb xmlcatmgr" +depends="${makedepends}" +xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd" short_desc="Automated Testing Framework" maintainer="Juan RP " homepage="http://code.google.com/p/kyua/wiki/ATF" @@ -40,11 +42,3 @@ atf-libs_package() { vmove "usr/lib/*.so.*" } } - -atf_package() { - depends="gdb xmlcatmgr" - xml_entries="system http://www.NetBSD.org/XML/atf/tests-results.dtd /usr/share/xml/atf/tests-results.dtd" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/atk/template b/srcpkgs/atk/template index c2fa1df5c1..31ead333cf 100644 --- a/srcpkgs/atk/template +++ b/srcpkgs/atk/template @@ -51,9 +51,3 @@ atk-devel_package() { vmove usr/share/gtk-doc } } - -atk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template index de1a26975a..cb44242a1a 100644 --- a/srcpkgs/atkmm/template +++ b/srcpkgs/atkmm/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-documentation" hostmakedepends="pkg-config" makedepends="libsigc++-devel atk-devel glibmm-devel" +replaces="gtkmm<2.22" short_desc="Set of interfaces for accessibility (C++ bindings)" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" @@ -28,7 +29,7 @@ long_desc=" atkmm-devel_package() { depends="glibmm-devel atk-devel atkmm>=${version}" - short_desc="Set of interfaces for accessibility (C++ bindings) - development files" + short_desc+=" - development files" replaces="gtkmm-devel<2.22" pkg_install() { vmove usr/include @@ -36,10 +37,3 @@ atkmm-devel_package() { vmove usr/lib/atkmm-1.6 } } - -atkmm_package() { - replaces="gtkmm<2.22" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/atop/template b/srcpkgs/atop/template index c965837e51..febd2ee570 100644 --- a/srcpkgs/atop/template +++ b/srcpkgs/atop/template @@ -7,6 +7,7 @@ wrksrc=atop-${_distver}-${_patchver} revision=1 build_style=gnu-makefile makedepends="ncurses-devel zlib-devel" +systemd_services="atop.service true" short_desc="A system and process level monitor" maintainer="Juan RP " license="GPL-2" @@ -21,11 +22,3 @@ post_install() { # systemd service vinstall atop.service 644 usr/lib/systemd/system } - -atop_package() { - systemd_services="atop.service true" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/attica/template b/srcpkgs/attica/template index 92542b0b34..576fc08923 100644 --- a/srcpkgs/attica/template +++ b/srcpkgs/attica/template @@ -19,9 +19,3 @@ attica-devel_package() { vmove usr/lib/pkgconfig } } - -attica_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/attr/template b/srcpkgs/attr/template index 23d4a18df5..c9757ccbbc 100644 --- a/srcpkgs/attr/template +++ b/srcpkgs/attr/template @@ -2,6 +2,7 @@ pkgname=attr version=2.4.47 revision=2 +bootstrap=yes build_style=gnu-configure configure_args="--libdir=/usr/lib --libexecdir=/usr/lib" short_desc="Extended attribute support library for ACL support" @@ -11,8 +12,6 @@ license="LGPL-2.1" distfiles="${NONGNU_SITE}/attr/attr-${version}.src.tar.gz" checksum=25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 -bootstrap=yes - do_install() { make DIST_ROOT=${DESTDIR} install install-lib install-dev } @@ -39,9 +38,3 @@ attr-progs_package() { vmove usr/share/locale } } - -attr_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/aubio/template b/srcpkgs/aubio/template index 68521322ab..d559167a36 100644 --- a/srcpkgs/aubio/template +++ b/srcpkgs/aubio/template @@ -34,9 +34,3 @@ aubio-devel_package() { vmove usr/lib/pkgconfig } } - -aubio_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/audacious-plugins/template b/srcpkgs/audacious-plugins/template index c39ff0c3ad..7ce7aad55f 100644 --- a/srcpkgs/audacious-plugins/template +++ b/srcpkgs/audacious-plugins/template @@ -15,9 +15,3 @@ license="GPL-3" homepage="http://audacious-media-player.org/" distfiles="http://distfiles.audacious-media-player.org/${pkgname}-${version}.tar.bz2" checksum=8b10c61481d7ee9972f329d79f56001aa7b092aab44a0084bdd1472fe529b874 - -audacious-plugins_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/audacious/template b/srcpkgs/audacious/template index 75f22c100b..0e237036bf 100644 --- a/srcpkgs/audacious/template +++ b/srcpkgs/audacious/template @@ -5,7 +5,8 @@ revision=1 build_style=gnu-configure configure_args="--enable-thunar" hostmakedepends="pkg-config" -makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel" +makedepends="libSM-devel gtk+3-devel dbus-glib-devel libguess-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Lightweight, advanced audio player focused on audio quality" maintainer="davehome " license="GPL-3" @@ -32,10 +33,3 @@ audacious-devel_package() { vmove "usr/lib/*.so" } } - -audacious_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/autoconf/template b/srcpkgs/autoconf/template index 9813ecbfdc..6d4c1dfb57 100644 --- a/srcpkgs/autoconf/template +++ b/srcpkgs/autoconf/template @@ -2,8 +2,10 @@ pkgname=autoconf version=2.69 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="perl>=0" +depends="gawk diffutils m4" short_desc="Generates automatic source code configuration scripts" maintainer="Juan RP " license="GPL-2, GPL-3" @@ -18,11 +20,3 @@ long_desc=" configuration script for a package from a template file that lists the operating system features that the package can use, in the form of m4 macro calls." - -autoconf_package() { - depends="gawk diffutils m4" - noarch=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/autoconf213/template b/srcpkgs/autoconf213/template index 2040c910e7..f83e2a1ebf 100644 --- a/srcpkgs/autoconf213/template +++ b/srcpkgs/autoconf213/template @@ -2,8 +2,10 @@ pkgname=autoconf213 version=2.13 revision=1 +noarch=yes wrksrc="autoconf-${version}" hostmakedepends="perl>=0" +depends="gawk diffutils m4" short_desc="Generates automatic source code configuration scripts (2.13 version)" maintainer="Juan RP " license="GPL-2, GPL-3" @@ -33,11 +35,3 @@ do_install() { mv ${DESTDIR}/usr/share/autoconf ${DESTDIR}/usr/share/autoconf213 sed -e 's,/usr/share/autoconf,/usr/share/autoconf213,g' -i ${DESTDIR}/usr/bin/* } - -autoconf213_package() { - depends="gawk diffutils m4" - noarch=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/autogen/template b/srcpkgs/autogen/template index 5ab03bcba8..a23bb3b82c 100644 --- a/srcpkgs/autogen/template +++ b/srcpkgs/autogen/template @@ -46,9 +46,3 @@ autogen-docs_package() { vmove usr/share/man } } - -autogen_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/automake/template b/srcpkgs/automake/template index 98c0ce9838..15263d6b97 100644 --- a/srcpkgs/automake/template +++ b/srcpkgs/automake/template @@ -2,19 +2,13 @@ pkgname=automake version=1.14 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="perl autoconf>=2.60" +depends="perl autoconf>=2.60" short_desc="GNU Standards-compliant Makefile generator" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnu.org/software/automake" distfiles="http://ftp.gnu.org/gnu/automake/${pkgname}-${version}.tar.xz" checksum=e1188f5d074374cf06946cabb2b9e70bee141637a8fd1fab9a660c8930fe8059 - -automake_package() { - depends="perl autoconf>=2.60" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/automoc4/template b/srcpkgs/automoc4/template index 48323c4dbf..337f4d42c6 100644 --- a/srcpkgs/automoc4/template +++ b/srcpkgs/automoc4/template @@ -11,11 +11,3 @@ license="BSD" maintainer="Juan RP " distfiles="ftp://ftp.kde.org/pub/kde/stable/$pkgname/$version/$pkgname-$version.tar.bz2" checksum=234116f4c05ae21d828594d652b4c4a052ef75727e2d8a4f3a4fb605de9e4c49 -long_desc=" - automoc4 tool, used to build KDE4 and related packages." - -automoc4_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/avahi-discover/template b/srcpkgs/avahi-discover/template index 3e923612b2..629e5e9d8b 100644 --- a/srcpkgs/avahi-discover/template +++ b/srcpkgs/avahi-discover/template @@ -7,6 +7,7 @@ pkgname=avahi-discover version=0.6.31 wrksrc="avahi-${version}" revision=13 +noarch=yes build_style=gnu-configure configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-doxygen-doc --enable-compat-libdns_sd --enable-compat-howl @@ -17,7 +18,7 @@ configure_args="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-static ssp_cv_lib=no --enable-python --enable-pygtk --enable-glib --enable-gobject --enable-gtk --enable-gtk3 --enable-introspection" -short_desc="Multicast DNS Service Discovery" +short_desc="Service discover user interface for avahi" maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.avahi.org" @@ -27,6 +28,8 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 hostmakedepends="pkg-config intltool" makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel pygtk-devel dbus-python gtk+3-devel gobject-introspection" +depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils" +pycompile_module="avahi_discover" if [ "$CROSS_BUILD" ]; then msg_error "$pkgver: this package is not cross buildable currently.\n" @@ -123,17 +126,3 @@ avahi-ui-utils_package() { vmove usr/bin/bshell } } - -avahi-discover_package() { - depends="avahi>=$version python avahi-python>=$version dbus-python pygtk desktop-file-utils" - short_desc="Service discover user interface for avahi" - noarch=yes - pycompile_module="avahi_discover" - pkg_install() { - vmove usr/lib/python2.7/site-packages/avahi_discover - vmove usr/share/applications/avahi-discover.desktop - vmove usr/share/man/man1/avahi-discover.1 - vmove usr/share/avahi/interfaces/avahi-discover.ui - vmove usr/bin/avahi-discover - } -} diff --git a/srcpkgs/avahi/template b/srcpkgs/avahi/template index 3807651947..a6a6a74ffe 100644 --- a/srcpkgs/avahi/template +++ b/srcpkgs/avahi/template @@ -21,6 +21,14 @@ checksum=8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 hostmakedepends="pkg-config intltool" makedepends="dbus-devel libcap-devel libdaemon-devel gdbm-devel" +depends="dbus" +systemd_services="avahi-daemon.service on" +conf_files=" + /etc/avahi/services/ssh.service + /etc/avahi/services/sftp-ssh.service + /etc/avahi/avahi-daemon.conf + /etc/avahi/hosts + /etc/avahi/avahi-dnsconfd.action" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libtool glib-devel" @@ -99,17 +107,3 @@ avahi-utils_package() { vmove usr/share/man/man1 } } - -avahi_package() { - systemd_services="avahi-daemon.service on" - conf_files=" - /etc/avahi/services/ssh.service - /etc/avahi/services/sftp-ssh.service - /etc/avahi/avahi-daemon.conf - /etc/avahi/hosts - /etc/avahi/avahi-dnsconfd.action" - depends="dbus" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/awesome/template b/srcpkgs/awesome/template index 5119bbbe5b..f43372f04b 100644 --- a/srcpkgs/awesome/template +++ b/srcpkgs/awesome/template @@ -10,6 +10,8 @@ makedepends=" xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel>=0.1.0_2 startup-notification-devel>=0.12_3 imlib2-devel ImageMagick>=6.7.9.6_2 lgi>=0.7.2 libxdg-basedir-devel>=1.1.1_1 gdk-pixbuf-devel lua-devel>=5.2 dbus-devel" +depends="dbus-x11 lgi>=0.7.2" +conf_files="/etc/xdg/awesome/rc.lua" short_desc="Highly configurable, next gen framework window manager for X" maintainer="davehome " license="GPL-2" @@ -22,11 +24,6 @@ pre_configure() { sed -i -e "s|es fr de ru|es fr de|g" CMakeLists.txt } -awesome_package() { - conf_files="/etc/xdg/awesome/rc.lua" - depends="dbus-x11 lgi>=0.7.2" - pkg_install() { - vmove all - vinstall ${wrksrc}/awesome.desktop 644 usr/share/xsessions - } +post_install() { + vinstall awesome.desktop 644 usr/share/xsessions } diff --git a/srcpkgs/awoken-icons/template b/srcpkgs/awoken-icons/template index 8c8ffe1fd4..f53496df20 100644 --- a/srcpkgs/awoken-icons/template +++ b/srcpkgs/awoken-icons/template @@ -2,14 +2,16 @@ pkgname=awoken-icons version=2.5.2 revision=1 +noarch="yes" distfiles="https://dl.dropbox.com/u/8029324/AwOken-2.5.zip" checksum="d122ee0457079aaa30a664ae582fbc6208414e8728f497dce399ed9f33f9b36e" makedepends="unzip" +depends="zenity xdg-utils ImageMagick" wrksrc="AwOken-2.5" maintainer="Steven R " homepage="http://alecive.deviantart.com/art/AwOken-163570862" license="CCPL:by-sa" -short_desc="Simple and quite complete icon set, Token-style." +short_desc="Simple and quite complete icon set, Token-style" do_install() { vmkdir "usr/bin" @@ -44,12 +46,3 @@ awoken-icons-white_package() { vmove usr/bin/awoken-icon-theme-customization-white } } - -awoken-icons_package() { - noarch="yes" - depends="zenity xdg-utils ImageMagick" - pkg_install() { - vmove usr/share/icons/AwOken - vmove usr/bin/awoken-icon-theme-customization - } -} \ No newline at end of file diff --git a/srcpkgs/b43-fwcutter/template b/srcpkgs/b43-fwcutter/template index f4680b3b95..6c9de551c8 100644 --- a/srcpkgs/b43-fwcutter/template +++ b/srcpkgs/b43-fwcutter/template @@ -14,9 +14,3 @@ do_install() { vinstall b43-fwcutter 755 usr/bin vinstall b43-fwcutter.1 644 usr/share/man/man1 } - -b43-fwcutter_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/babl/template b/srcpkgs/babl/template index c2dcc35dd8..8479a48fea 100644 --- a/srcpkgs/babl/template +++ b/srcpkgs/babl/template @@ -23,15 +23,9 @@ long_desc=" babl-devel_package() { depends="babl>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -babl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/backintime/template b/srcpkgs/backintime/template index 253fb302b2..678f0b7411 100644 --- a/srcpkgs/backintime/template +++ b/srcpkgs/backintime/template @@ -2,21 +2,16 @@ pkgname=backintime version=1.0.8 revision=2 +noarch="yes" wrksrc=$pkgname-$version/common build_style=gnu-configure hostmakedepends="which" +makedepends="python rsync cron-daemon" +depends="${makedepends}" +pycompile_dirs="/usr/share/backintime" short_desc="A simple backup tool for Linux" maintainer="tripledes " license="GPL-2" homepage="http://$pkgname.le-web.org" distfiles="http://$pkgname.le-web.org/download/$pkgname/$pkgname-${version}_src.tar.gz" checksum=fb83736ae0671b0d63468a9d39a29334320d93df004911cc192b1989df97d931 - -backintime_package() { - noarch="yes" - pycompile_dirs="/usr/share/backintime" - depends="python rsync cron-daemon" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/balsa/template b/srcpkgs/balsa/template index b5f20b25c6..97ff137a83 100644 --- a/srcpkgs/balsa/template +++ b/srcpkgs/balsa/template @@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool automake gettext-devel" makedepends="iso-codes enchant-devel libnotify-devel libesmtp-devel gtk+3-devel gmime-devel webkitgtk-devel openssl-devel gpgme-devel libsecret-devel pcre-devel hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils" short_desc="An email client for GNOME" maintainer="pancake " homepage="http://pawsa.fedorapeople.org/balsa/" @@ -24,10 +25,3 @@ pre_configure() { mkdir m4 autoreconf -fi } - -balsa_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/baobab/template b/srcpkgs/baobab/template index f1a38752bf..d9886b188a 100644 --- a/srcpkgs/baobab/template +++ b/srcpkgs/baobab/template @@ -6,17 +6,11 @@ build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends="gtk+3-devel vala-devel>=0.22 gsettings-desktop-schemas-devel>=3.10" +depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" +replaces="gnome-utils>=3.0" short_desc="A graphical directory tree analyzer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9 - -baobab_package() { - replaces="gnome-utils>=3.0" - depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bar-git/template b/srcpkgs/bar-git/template index 458eefc3de..c93409bad5 100644 --- a/srcpkgs/bar-git/template +++ b/srcpkgs/bar-git/template @@ -24,9 +24,3 @@ post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} vinstall README.md 644 usr/share/doc/${pkgname} } - -bar-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template index 311e17dae6..57f2f285a5 100644 --- a/srcpkgs/base-chroot/template +++ b/srcpkgs/base-chroot/template @@ -2,6 +2,7 @@ pkgname=base-chroot version=0.40 revision=1 +noarch=yes bootstrap=yes build_style=meta homepage="http://www.voidlinux.eu" @@ -18,8 +19,4 @@ makedepends=" chroot-gettext chroot-texinfo chroot-sed chroot-gawk chroot-findutils chroot-make chroot-gzip chroot-file chroot-tar chroot-m4 chroot-fakeroot chroot-distcc chroot-git ccache xbps-src>=20130317_4 xbps xz" - -base-chroot_package() { - noarch="yes" - depends="${makedepends}" -} +depends="${makedepends}" diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template index aa1d6f43a0..921f9660d2 100644 --- a/srcpkgs/base-directories/template +++ b/srcpkgs/base-directories/template @@ -2,6 +2,7 @@ pkgname=base-directories version=0.22 revision=1 +noarch=yes bootstrap=yes build_style=meta short_desc="Void Linux base system directories" @@ -11,7 +12,3 @@ license="Public domain" long_desc=" This package installs the base system directories as specifed by FHS that aren't installed by any other package and are required on any GNU/Linux system." - -base-directories_package() { - noarch=yes -} diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template index c693603dfa..35b748c95a 100644 --- a/srcpkgs/base-files/template +++ b/srcpkgs/base-files/template @@ -9,6 +9,24 @@ short_desc="Void Linux base system files" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public domain" +conf_files=" + /etc/inputrc + /etc/profile + /etc/hosts + /etc/host.conf + /etc/securetty + /etc/skel/.bash_profile + /etc/skel/.bash_logout + /etc/skel/.bashrc + /etc/skel/.inputrc + /etc/issue + /etc/passwd + /etc/group + /etc/fstab + /etc/crypttab + /etc/nsswitch.conf" +noarch="yes" +depends="base-directories xbps-triggers" do_install() { # Install misc config files. @@ -43,27 +61,3 @@ do_install() { # Create /proc/self/mounts -> /etc/mtab symlink. ln -sf /proc/self/mounts ${DESTDIR}/etc/mtab } - -base-files_package() { - conf_files=" - /etc/inputrc - /etc/profile - /etc/hosts - /etc/host.conf - /etc/securetty - /etc/skel/.bash_profile - /etc/skel/.bash_logout - /etc/skel/.bashrc - /etc/skel/.inputrc - /etc/issue - /etc/passwd - /etc/group - /etc/fstab - /etc/crypttab - /etc/nsswitch.conf" - noarch="yes" - depends="base-directories xbps-triggers" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/base-system-busybox/template b/srcpkgs/base-system-busybox/template index d2a6cf676f..6c70dda62e 100644 --- a/srcpkgs/base-system-busybox/template +++ b/srcpkgs/base-system-busybox/template @@ -11,6 +11,19 @@ license="GPL-2" distfiles="${homepage}/downloads/busybox-$version.tar.bz2" checksum=cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 +# Applets provided by this busybox version. +# Keep this list updated with ${FILESDIR}/dotconfig. +# +# XXX bzip2 provides libbz2, split it into libbz2 pkg. +_FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk + grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi + patch powertop procps-ng psmisc rfkill run-parts sed tar + traceroute util-linux wget which whois xz" +for f in ${_FEATURES}; do + provides+="${f}-${version}_${revision} " + replaces+="${f}>=0 " +done + do_build() { cp -f ${FILESDIR}/dotconfig .config if [ "$CROSS_BUILD" ]; then @@ -30,21 +43,3 @@ do_install() { 755 usr/share/udhcpc default.script rm -f ${DESTDIR}/{bin,sbin,usr/sbin} } - -base-system-busybox_package() { - # Applets provided by this busybox version. - # Keep this list updated with ${FILESDIR}/dotconfig. - # - # XXX bzip2 provides libbz2, split it into libbz2 pkg. - FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils gawk - grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi - patch powertop procps-ng psmisc rfkill run-parts sed tar - traceroute util-linux wget which whois xz" - for f in ${FEATURES}; do - provides+="${f}-${version}_${revision} " - replaces+="${f}>=0 " - done - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template index de627dfd25..99e426442c 100644 --- a/srcpkgs/base-system/template +++ b/srcpkgs/base-system/template @@ -25,11 +25,9 @@ elif [ "$XBPS_TARGET_MACHINE" = "armv6l" ]; then makedepends+=" rpi-base-files rpi-firmware" fi -base-system_package() { - # gcc and glibc shouldn't be direct dependencies. - for f in ${makedepends}; do - if [ "$f" != "gcc" -a "$f" != "glibc" ]; then - depends+=" $f" - fi - done -} +# gcc and glibc shouldn't be direct dependencies. +for f in ${makedepends}; do + if [ "$f" != "gcc" -a "$f" != "glibc" ]; then + depends+=" $f" + fi +done diff --git a/srcpkgs/base-voidstrap/template b/srcpkgs/base-voidstrap/template index 4a9d533be9..07025bf912 100644 --- a/srcpkgs/base-voidstrap/template +++ b/srcpkgs/base-voidstrap/template @@ -2,18 +2,15 @@ pkgname=base-voidstrap version=0.2 revision=1 +noarch="yes" build_style=meta +makedepends=" + base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep + texinfo file sed gawk less util-linux which tar man-pages man-db shadow + e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata + iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi" +depends="${makedepends}" homepage="http://www.voidlinux.eu" short_desc="Void Linux base system for the voidstrap script" maintainer="Juan RP " license="Public domain" - -makedepends="base-files>=0.77 ncurses coreutils findutils diffutils dash bash grep - texinfo file sed gawk less util-linux which tar man-pages man-db shadow - e2fsprogs btrfs-progs xfsprogs kbd psmisc procps-ng sudo tzdata - iana-etc systemd cron-daemon openssh>=6.1p1 xbps netbsd-wtf nvi" - -base-voidstrap_package() { - noarch="yes" - depends="${makedepends}" -} diff --git a/srcpkgs/bash-completion/template b/srcpkgs/bash-completion/template index 26fd81d5a2..1ca255983c 100644 --- a/srcpkgs/bash-completion/template +++ b/srcpkgs/bash-completion/template @@ -2,8 +2,10 @@ pkgname=bash-completion version=2.1 revision=2 +noarch="yes" build_style=gnu-configure makedepends="bash" +depends="${makedepends}" short_desc="Programmable completion for the GNU Bash shell" maintainer="Juan RP " license="GPL-2" @@ -24,11 +26,3 @@ post_install() { rm -f ${DESTDIR}/usr/share/bash-completion/completions/${f} done } - -bash-completion_package() { - depends="bash" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template index 72141016b9..22ad7218dd 100644 --- a/srcpkgs/bash/template +++ b/srcpkgs/bash/template @@ -21,6 +21,8 @@ configure_args="--without-bash-malloc --with-curses --with-installed-readline bash_cv_func_strcoll_broken=no bash_cv_func_vsnprintf=yes" hostmakedepends="bison" makedepends="readline-devel" +conflicts="chroot-bash>=0" +register_shell="/bin/bash" short_desc="The GNU Bourne Again Shell" maintainer="Juan RP " homepage="http://www.gnu.org/software/bash/bash.html" @@ -46,11 +48,3 @@ pre_configure() { msg_normal " Applying patch bash${ver}-$p.\n" done } - -bash_package() { - conflicts="chroot-bash>=0" - register_shell="/bin/bash" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bbswitch/template b/srcpkgs/bbswitch/template index 90690b41f4..6485b03c0c 100644 --- a/srcpkgs/bbswitch/template +++ b/srcpkgs/bbswitch/template @@ -3,6 +3,9 @@ pkgname=bbswitch version=0.7 revision=1 makedepends="dkms" +depends="dkms" +dkms_modules="${pkgname} ${version}" +triggers="dkms" short_desc="kernel module allowing to switch dedicated graphics card on Optimus laptops" maintainer="Juan RP " license="GPL-2" @@ -20,12 +23,3 @@ do_install() { sed "s,#MODULE_VERSION#,${version}," dkms/dkms.conf > \ ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf } - -bbswitch_package() { - dkms_modules="${pkgname} ${version}" - triggers="dkms" - depends="dkms" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bc/template b/srcpkgs/bc/template index 992b50c35c..e2cd39797d 100644 --- a/srcpkgs/bc/template +++ b/srcpkgs/bc/template @@ -27,9 +27,3 @@ long_desc=" do_build() { make ${makejobs} LEX="flex -I" } - -bc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bdftopcf/template b/srcpkgs/bdftopcf/template index c6220d1b42..35701bfd9b 100644 --- a/srcpkgs/bdftopcf/template +++ b/srcpkgs/bdftopcf/template @@ -20,9 +20,3 @@ long_desc=" architecture to read them directly without reformatting. This allows fast reading on the appropriate machine, but the files are still portable (but read more slowly) on other machines." - -bdftopcf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template index 68fdb21a0b..f6675dd5c3 100644 --- a/srcpkgs/beets/template +++ b/srcpkgs/beets/template @@ -2,21 +2,15 @@ pkgname=beets version=1.3.2 revision=1 +noarch="yes" distfiles="https://github.com/sampsyo/beets/archive/v${version}.tar.gz" checksum="1946b5e981a2858112b7f3aadb2d5f22c1d1438f2753cfda9996091c5e30520a" build_style=python-module hostmakedepends="python-devel" makedepends="python-distribute" +depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute" +pycompile_module="beets beetsplug" maintainer="Steven R " homepage="https://github.com/sampsyo/beets" license="GPL" short_desc="Media library management system for obsessive-compulsive music geeks" - -beets_package() { - noarch="yes" - depends="python>=2.7 pyyaml python-Unidecode python-musicbrainzngs mutagen>=1.22 python-munkres python-distribute" - pycompile_module="beets beetsplug" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bigreqsproto/template b/srcpkgs/bigreqsproto/template index 111ed4e4fc..c3843e3433 100644 --- a/srcpkgs/bigreqsproto/template +++ b/srcpkgs/bigreqsproto/template @@ -1,20 +1,12 @@ # Template build for 'bigreqsproto'. pkgname=bigreqsproto version=1.1.0 -build_style=gnu-configure revision=2 +noarch="yes" +build_style=gnu-configure short_desc="BigReqs extension headers from modular Xorg X11" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=4864e12d3c5a99b0a9ee4704822455299345e6c65b23c688a4e4bf11481107bd -long_desc=" - BigReqs extension headers from modular Xorg X11." - -bigreqsproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bijiben/template b/srcpkgs/bijiben/template index 1353cedf3c..139b92168e 100644 --- a/srcpkgs/bijiben/template +++ b/srcpkgs/bijiben/template @@ -8,16 +8,10 @@ hostmakedepends="pkg-config intltool itstool gobject-introspection" makedepends="libuuid-devel webkitgtk-devel>=2.1.90 gnome-desktop-devel>=3.10 gnome-online-accounts-devel>=3.10 tracker-devel>=0.16.2_2 clutter-gtk-devel>=1.4.4_2 zeitgeist-devel>=0.9.14" +depends="zeitgeist>=0.9.14 desktop-file-utils" short_desc="Intuitive note editor with strong GNOME desktop integration" maintainer="Juan RP " homepage="http://live.gnome.org/Apps/Bijiben" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4 - -bijiben_package() { - depends="zeitgeist>=0.9.14 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bin86/template b/srcpkgs/bin86/template index 6d29c30086..237eb5cad2 100644 --- a/srcpkgs/bin86/template +++ b/srcpkgs/bin86/template @@ -8,8 +8,6 @@ homepage="http://www.debath.co.uk/" license="GPL-2" distfiles="http://www.debath.co.uk/dev86/bin86-$version.tar.gz" checksum=35b99e05395264d0692f8b327f9b4f18de9e483484faa5ccbaa7c9f353d9c30c -long_desc=" - This package provides a complete 8086 assembler and loader." do_build() { make ${makejobs} PREFIX=/usr @@ -20,9 +18,3 @@ do_install() { vmkdir usr/share/man/man1 make PREFIX=${DESTDIR}/usr MANDIR=${DESTDIR}/usr/share/man/man1 install } - -bin86_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bind/template b/srcpkgs/bind/template index 18107eabb4..c4c25b8a78 100644 --- a/srcpkgs/bind/template +++ b/srcpkgs/bind/template @@ -17,6 +17,14 @@ long_desc=" hostmakedepends="automake libtool perl" makedepends="openssl-devel mit-krb5-devel libxml2-devel libcap-devel readline-devel" +depends="shadow" +systemd_services="named.service true" +conf_files="/etc/named/named.conf" +system_accounts="named" +named_desc="BIND DNS server" +named_homedir="/var/named" +named_shell="/bin/false" +make_dirs="/var/named 0770 root named" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libxml2-devel" @@ -87,17 +95,3 @@ bind-devel_package() { vmove "usr/lib/*.so" } } - -bind_package() { - systemd_services="named.service true" - conf_files="/etc/named/named.conf" - system_accounts="named" - named_desc="BIND DNS server" - named_homedir="/var/named" - named_shell="/bin/false" - make_dirs="/var/named 0770 root named" - depends="shadow" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/binutils/template b/srcpkgs/binutils/template index 98517b426c..56f87cd64c 100644 --- a/srcpkgs/binutils/template +++ b/srcpkgs/binutils/template @@ -2,6 +2,8 @@ pkgname=binutils version=2.24 revision=1 +bootstrap=yes +replaces="chroot-binutils>=0" short_desc="GNU binary utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/binutils/" @@ -9,8 +11,6 @@ license="GPL-3" distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" checksum=4930b2886309112c00a279483eaef2f0f8e1b1b62010e0239c16b22af7c346d4 -bootstrap=yes - if [ "$CHROOT_READY" ]; then hostmakedepends="flex perl" fi @@ -114,10 +114,3 @@ binutils-devel_package() { vmove usr/lib/libopcodes.so } } - -binutils_package() { - replaces="chroot-binutils>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bison/template b/srcpkgs/bison/template index dd45e70e55..0b049ee2d5 100644 --- a/srcpkgs/bison/template +++ b/srcpkgs/bison/template @@ -4,6 +4,7 @@ version=2.7 revision=1 build_style=gnu-configure hostmakedepends="perl" +depends="m4" short_desc="GNU yacc(1) replacement" maintainer="Juan RP " homepage="http://www.gnu.org/software/bison/bison.html" @@ -13,10 +14,3 @@ checksum=43d8c5c466486031d5e7195a152ff49651ccac91599692e788b5ec5b693ca7fd long_desc=" Bison is the GNU replacement for yacc(1). Some programs depend on extensions present in Bison." - -bison_package() { - depends="m4" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template index 8683442d2f..520554b4cb 100644 --- a/srcpkgs/bitcoin/template +++ b/srcpkgs/bitcoin/template @@ -39,22 +39,14 @@ do_install() { vinstall COPYING 644 usr/share/licenses/$pkgname } -bitcoin_package() { - pkg_install() { - vmove all - } -} - if [ -z "$CROSS_BUILD" ]; then - -bitcoin-qt_package() { - depends="desktop-file-utils" - short_desc+=" - QT GUI" - pkg_install() { - vinstall ${wrksrc}/src/bitcoin-qt 755 usr/bin - vinstall ${wrksrc}/src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications - vinstall ${wrksrc}/src/share/pixmaps/bitcoin64.xpm 644 usr/share/pixmaps + bitcoin-qt_package() { + depends="desktop-file-utils" + short_desc+=" - QT GUI" + pkg_install() { + vinstall ${wrksrc}/src/bitcoin-qt 755 usr/bin + vinstall ${wrksrc}/src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications + vinstall ${wrksrc}/src/share/pixmaps/bitcoin64.xpm 644 usr/share/pixmaps + } } -} - fi # !CROSS_BUILD diff --git a/srcpkgs/bleachbit/template b/srcpkgs/bleachbit/template index 1b8b993741..3663f93a77 100644 --- a/srcpkgs/bleachbit/template +++ b/srcpkgs/bleachbit/template @@ -2,22 +2,16 @@ pkgname=bleachbit version=1.0 revision=1 +noarch="yes" build_style=gnu-makefile make_install_args="prefix=/usr" hostmakedepends="desktop-file-utils gtk-update-icon-cache hicolor-icon-theme" makedepends="pygtk-devel" +depends="pygtk>=2 ${hostmakedepends}" +pycompile_dirs="/usr/share/bleachbit" short_desc="Deletes unneeded files to free disk space and maintain privacy" maintainer="graysky " license="GPL3" homepage="http://bleachbit.sourceforge.net" distfiles="http://downloads.sourceforge.net/$pkgname/$pkgname-$version.tar.bz2" checksum=1b18c7ae2eadbe6c799159f2cc04f5b99dfbb8d3b87af61fa7ac192a8ce38162 - -bleachbit_package() { - noarch="yes" - depends="pygtk>=2 desktop-file-utils gtk-update-icon-cache hicolor-icon-theme" - pycompile_dirs="/usr/share/bleachbit" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bluefish/template b/srcpkgs/bluefish/template index 690c9effc7..aba9d86986 100644 --- a/srcpkgs/bluefish/template +++ b/srcpkgs/bluefish/template @@ -6,18 +6,12 @@ build_style=gnu-configure configure_args="--enable-spell-check --disable-update-databases --disable-xml-catalog-update" hostmakedepends="pkg-config intltool" makedepends="python-devel libxml2-devel gtk+-devel enchant-devel gucharmap-devel xmlcatmgr" +depends="python hicolor-icon-theme desktop-file-utils xmlcatmgr" +xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --" +pycompile_dirs="/usr/share/bluefish" short_desc="A powerful HTML editor for experienced web designers and programmers" maintainer="Juan RP " license="GPL-3" homepage="http://bluefish.openoffice.nl/" distfiles="http://www.bennewitz.com/bluefish/stable/source/bluefish-${version}.tar.bz2" checksum=771621d848af6342fbab50a52bc7d6fddb29c4616f31ab939c508175c146b3a3 - -bluefish_package() { - xml_entries="nextCatalog /usr/share/xml/bluefish/catalog.xml --" - pycompile_dirs="/usr/share/bluefish" - depends="python hicolor-icon-theme desktop-file-utils xmlcatmgr" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/blueman/template b/srcpkgs/blueman/template index 195b255a7c..d0f91f3ed6 100644 --- a/srcpkgs/blueman/template +++ b/srcpkgs/blueman/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--enable-polkit=yes --enable-hal=no" makedepends="intltool Pyrex libbluetooth-devel startup-notification-devel gtk+-devel pygtk-devel bluez notify-python dbus-python obexd" +depends="pygtk desktop-file-utils hicolor-icon-theme bluez notify-python dbus-python obexd" +pycompile_module="blueman" short_desc="GTK+ Bluetooth Manager" maintainer="Juan RP " homepage="http://blueman-project.org/" @@ -22,13 +24,3 @@ long_desc=" * Connecting to audio devices * Sending/Receiving/Browsing files via OBEX * Pairing" - -blueman_package() { - pycompile_module="blueman" - depends="pygtk desktop-file-utils hicolor-icon-theme - bluez notify-python dbus-python obexd" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 422cf03915..040cb188af 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -9,6 +9,8 @@ configure_args="--with-udevdir=/usr/lib/udev hostmakedepends="pkg-config flex" makedepends="libglib-devel libudev-devel>=183 dbus-devel systemd-devel cups-devel libical-devel readline-devel" +conf_files="/etc/bluetooth/main.conf" +systemd_services="bluetooth.service true" short_desc="Bluetooth tools and daemons" maintainer="Juan RP " homepage="http://www.bluez.org/" @@ -16,6 +18,10 @@ license="GPL-2" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" checksum=4581beedde485246b16e2b4665d60f3fe041284b5d5afc3a0a818604ad525ad3 +post_install() { + vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth +} + libbluetooth_package() { short_desc="Library to use the Bluez Linux Bluetooth Stack" pkg_install() { @@ -39,12 +45,3 @@ bluez-cups_package() { vmove usr/lib/cups/backend/bluetooth } } - -bluez_package() { - conf_files="/etc/bluetooth/main.conf" - systemd_services="bluetooth.service true" - pkg_install() { - vmove all - vinstall ${wrksrc}/src/main.conf 644 etc/bluetooth - } -} diff --git a/srcpkgs/bokken/template b/srcpkgs/bokken/template index c363efa4d9..ac384b6e1d 100644 --- a/srcpkgs/bokken/template +++ b/srcpkgs/bokken/template @@ -9,7 +9,10 @@ homepage="http://inguma.eu/projects/bokken/" distfiles="http://inguma.eu/attachments/download/197/${pkgname}-${version}.tar.gz" checksum=4770602585b3e77b2977a8a6906c91ae0d64373eae328f42688106224c8bbc12 +noarch="yes" makedepends="pygtk pygtksourceview radare2 r2-bindings" +depends="${makedepends}" +pycompile_dirs="/usr/lib/bokken" do_install() { vmkdir usr/lib/bokken @@ -17,12 +20,3 @@ do_install() { cp -rf * ${DESTDIR}/usr/lib/bokken ln -frs ${DESTDIR}/usr/lib/bokken/bokken.py ${DESTDIR}/usr/bin/bokken } - -bokken_package() { - noarch="yes" - pycompile_dirs="/usr/lib/bokken" - depends="${makedepends}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index 43c8b52eaa..7860e19bc3 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -107,9 +107,3 @@ boost-devel_package() { vmove "usr/lib/*.so" } } - -boost_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bootchart/template b/srcpkgs/bootchart/template index ba7d15654f..48da79e00f 100644 --- a/srcpkgs/bootchart/template +++ b/srcpkgs/bootchart/template @@ -16,9 +16,3 @@ long_desc=" by passing \"init=/usr/sbin/bootchartd\" to the kernel. Bootchart will then fork init off to resume normal system startup, while monitoring and logging startup information in the background." - -bootchart_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/boxfs/template b/srcpkgs/boxfs/template index fb7ab5ae48..8120a165f3 100644 --- a/srcpkgs/boxfs/template +++ b/srcpkgs/boxfs/template @@ -6,7 +6,6 @@ short_desc="FUSE-based filesystem that lets you mount your box.net account to a maintainer="pancake " license="GPL-2" homepage="https://code.google.com/p/boxfs/" - hostmakedepends="pkg-config subversion" makedepends="libxml2-devel libzip-devel libapp-devel fuse-devel libcurl-devel" @@ -22,9 +21,3 @@ do_build() { do_install() { vinstall boxfs 755 usr/bin } - -boxfs_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/brasero/template b/srcpkgs/brasero/template index a139a83cf4..bfd964c109 100644 --- a/srcpkgs/brasero/template +++ b/srcpkgs/brasero/template @@ -9,6 +9,7 @@ hostmakedepends="pkg-config intltool which gnome-doc-utils makedepends="gst-plugins-base1-devel totem-pl-parser-devel>=3.10 libnotify-devel libcanberra-devel nautilus-devel>=3.10 tracker-devel>=0.16_2 libisofs-devel libburn-devel libSM-devel cdrtools dconf-devel" +depends="cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils" short_desc="Application to burn CD/DVD for the Gnome Desktop" maintainer="Juan RP " homepage="http://www.gnome.org/projects/brasero" @@ -38,10 +39,3 @@ brasero-devel_package() { vmove usr/share/gtk-doc } } - -brasero_package() { - depends="cdrtools dconf shared-mime-info hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bridge-utils/template b/srcpkgs/bridge-utils/template index a78cb3aeb9..4199d12ae4 100644 --- a/srcpkgs/bridge-utils/template +++ b/srcpkgs/bridge-utils/template @@ -14,9 +14,3 @@ checksum=42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688 pre_configure() { autoreconf -fi } - -bridge-utils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bsdbuild/template b/srcpkgs/bsdbuild/template index 4ee5fa1171..ce8a0d2864 100644 --- a/srcpkgs/bsdbuild/template +++ b/srcpkgs/bsdbuild/template @@ -2,9 +2,11 @@ pkgname=bsdbuild version=3.0 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--with-manpages --with-manlinks" hostmakedepends="groff perl" +depends="perl" short_desc="Simple, self-contained and portable build system" maintainer="Juan RP " homepage="http://hypertriton.com/bsdbuild/" @@ -30,11 +32,3 @@ pre_install() { vmkdir usr/share/man/man1 vmkdir usr/share/man/man5 } - -bsdbuild_package() { - depends="perl" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bspwm-git/template b/srcpkgs/bspwm-git/template index 199a0a1d44..212b76a03a 100644 --- a/srcpkgs/bspwm-git/template +++ b/srcpkgs/bspwm-git/template @@ -18,9 +18,3 @@ do_fetch() { post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -bspwm-git_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/btrfs-progs/template b/srcpkgs/btrfs-progs/template index e9234a59f2..4b47b386f5 100644 --- a/srcpkgs/btrfs-progs/template +++ b/srcpkgs/btrfs-progs/template @@ -38,9 +38,3 @@ libbtrfs-devel_package() { vmove "usr/lib/*.so" } } - -btrfs-progs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/buildbot-slave/template b/srcpkgs/buildbot-slave/template index 33d3bbb5eb..b66cc25c37 100644 --- a/srcpkgs/buildbot-slave/template +++ b/srcpkgs/buildbot-slave/template @@ -2,8 +2,11 @@ pkgname=buildbot-slave version=0.8.8 revision=1 +noarch="yes" build_style=python-module makedepends="python Twisted" +depends="${makedepends}" +pycompile_module="buildslave" short_desc="BuildBot Slave Daemon" maintainer="Juan RP " homepage="http://trac.buildbot.net/" @@ -25,12 +28,3 @@ long_desc=" This package contains only the buildslave implementation. The buildbot master is available in the buildbot package." - -buildbot-slave_package() { - noarch="yes" - pycompile_module="buildslave" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template index d82bff0ccf..3342e72f2b 100644 --- a/srcpkgs/buildbot/template +++ b/srcpkgs/buildbot/template @@ -2,8 +2,11 @@ pkgname=buildbot version=0.8.8 revision=1 +noarch="yes" build_style=python-module makedepends="python python-jinja sqlalchemy-migrate python-simplejson Twisted" +depends="${makedepends}" +pycompile_module="buildbot" short_desc="A system to automate the compile/test cycle" maintainer="Juan RP " homepage="http://trac.buildbot.net/" @@ -30,12 +33,3 @@ post_install() { vmkdir usr/share/buildbot/contrib install -m755 ${wrksrc}/contrib/*.py ${contribdir} } - -buildbot_package() { - noarch="yes" - pycompile_module="buildbot" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bumblebee/template b/srcpkgs/bumblebee/template index aa4dba6157..3d0eca6d60 100644 --- a/srcpkgs/bumblebee/template +++ b/srcpkgs/bumblebee/template @@ -3,11 +3,21 @@ pkgname=bumblebee version=3.2.1 revision=1 build_style=gnu-configure -configure_args="CONF_DRIVER_MODULE_NVIDIA=nvidia -CONF_LDPATH_NVIDIA=/usr/lib -CONF_MODPATH_NVIDIA=/usr/lib/xorg/modules --sbindir=/usr/bin ---with-udev-rules=/usr/lib/udev/rules.d/ --without-pidfile" +configure_args=" + CONF_DRIVER_MODULE_NVIDIA=nvidia + CONF_LDPATH_NVIDIA=/usr/lib + CONF_MODPATH_NVIDIA=/usr/lib/xorg/modules + --sbindir=/usr/bin + --with-udev-rules=/usr/lib/udev/rules.d/ + --without-pidfile" makedepends="pkg-config help2man VirtualGL-devel glib-devel MesaLib-devel" +depends="VirtualGL" +systemd_services="bumblebeed.service true" +conf_files=" + /etc/bumblebee/bumblebee.conf + /etc/bumblebee/xorg.conf.nouveau + /etc/bumblebee/xorg.conf.nvidia" +system_groups="bumblebee" short_desc="NVIDIA Optimus support for Linux through VirtualGL" maintainer="davehome " homepage="http://www.bumblebee-project.org/" @@ -29,16 +39,3 @@ post_install() { mv -v ${DESTDIR}/etc/bash_completion.d/bumblebee \ ${DESTDIR}/usr/share/bash-completion/completions/optirun } - - -bumblebee_package() { - depends="VirtualGL" - systemd_services="bumblebeed.service true" - conf_files="/etc/bumblebee/bumblebee.conf - /etc/bumblebee/xorg.conf.nouveau - /etc/bumblebee/xorg.conf.nvidia" - system_groups="bumblebee" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/busybox/template b/srcpkgs/busybox/template index 2fc46491d8..e6c2046445 100644 --- a/srcpkgs/busybox/template +++ b/srcpkgs/busybox/template @@ -27,9 +27,3 @@ do_install() { vinstall busybox 755 usr/bin vinstall docs/busybox.1 644 usr/share/man/man1 } - -busybox_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bwidget/template b/srcpkgs/bwidget/template index 224b7319be..6e7f240810 100644 --- a/srcpkgs/bwidget/template +++ b/srcpkgs/bwidget/template @@ -2,6 +2,9 @@ pkgname=bwidget version=1.9.6 revision=2 +noarch=yes +makedepends="tk>=8.6" +depends="${makedepends}" short_desc="Set of extension widgets for Tcl/Tk" maintainer="pancake " homepage="http://tcllib.sourceforge.net/" @@ -9,7 +12,6 @@ license="tcl/tk" distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/$version/${pkgname}-${version}.tar.gz" checksum=155e9cf2c6973956a0bbde450f2df358ce1eb97a2b2950d0681a36f861e67553 - do_install() { local _tclversion=8.6 @@ -19,11 +21,3 @@ do_install() { $DESTDIR/usr/lib/tcl$_tclversion/BWidget rmdir $DESTDIR/usr/lib/tcl8.6/$pkgname-$version } - -bwidget_package() { - noarch=yes - depends="tk>=8.6" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bzip2/template b/srcpkgs/bzip2/template index 471320ebb2..bd295a5d8f 100644 --- a/srcpkgs/bzip2/template +++ b/srcpkgs/bzip2/template @@ -3,6 +3,7 @@ pkgname=bzip2 version=1.0.6 revision=7 bootstrap=yes +replaces="chroot-bzip2>=0" homepage="http://www.bzip.org" distfiles="http://www.bzip.org/$version/$pkgname-$version.tar.gz" short_desc="The bzip2 compression library" @@ -48,10 +49,3 @@ bzip2-devel_package() { vmove "usr/lib/*.so" } } - -bzip2_package() { - replaces="chroot-bzip2>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/bzr/template b/srcpkgs/bzr/template index 1624aa7e39..ead7fc2b47 100644 --- a/srcpkgs/bzr/template +++ b/srcpkgs/bzr/template @@ -5,6 +5,8 @@ revision=1 build_style=python-module hostmakedepends="Cython" makedepends="zlib-devel python-devel ca-certificates" +depends="ca-certificates" +pycompile_module="bzrlib" short_desc="Distributed version control system that Just Works" maintainer="Juan RP " license="GPL-2" @@ -15,11 +17,3 @@ checksum=0994797182eb828867eee81cccc79480bd2946c99304266bc427b902cf91dab0 pre_install() { sed -i -e "s|man/man1|share/man/man1|" setup.py } - -bzr_package() { - pycompile_module="bzrlib" - depends="ca-certificates" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/bzrtools/template b/srcpkgs/bzrtools/template index 5dd9b1fcbf..1912f1a594 100644 --- a/srcpkgs/bzrtools/template +++ b/srcpkgs/bzrtools/template @@ -3,22 +3,14 @@ pkgname=bzrtools version=2.4.1 wrksrc=$pkgname revision=1 +noarch="yes" build_style=python-module makedepends="python bzr" +depends="${makedepends}" +pycompile_module="bzrlib/plugins/bzrtools" homepage="http://bazaar-vcs.org/BzrTools" license="GPL-2" distfiles="http://launchpad.net/$pkgname/stable/$version/+download/$pkgname-$version.tar.gz" short_desc="Plugin providing a collection of utilities for bzr" maintainer="Juan RP " checksum=f62771dd221ad820e0363386608985e282cb88b52b5a6f0ed7b7fb2e99804def -long_desc=" - This is a plugin providing a collection of utilities for bzr." - -bzrtools_package() { - noarch="yes" - pycompile_module="bzrlib/plugins/bzrtools" - depends="${makedepends}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/c-ares/template b/srcpkgs/c-ares/template index e81fd888b3..8930b6df60 100644 --- a/srcpkgs/c-ares/template +++ b/srcpkgs/c-ares/template @@ -19,9 +19,3 @@ c-ares-devel_package() { vmove usr/share/man } } - -c-ares_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ca-certificates/template b/srcpkgs/ca-certificates/template index 88fae67181..75299e8e67 100644 --- a/srcpkgs/ca-certificates/template +++ b/srcpkgs/ca-certificates/template @@ -3,7 +3,10 @@ pkgname=ca-certificates version=20130906 revision=2 wrksrc="${pkgname}" +noarch="yes" hostmakedepends="python openssl run-parts" +depends="openssl run-parts" +conf_files="/etc/ca-certificates.conf" short_desc="Common CA certificates" maintainer="Juan RP " homepage="http://packages.qa.debian.org/c/ca-certificates.html" @@ -28,12 +31,3 @@ do_install() { cd ${DESTDIR}/usr/share/ca-certificates find . -name '*.crt' | sort | cut -b3- > ${DESTDIR}/etc/ca-certificates.conf } - -ca-certificates_package() { - conf_files="/etc/ca-certificates.conf" - depends="openssl run-parts" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cabextract/template b/srcpkgs/cabextract/template index adec2773de..0753bd6637 100644 --- a/srcpkgs/cabextract/template +++ b/srcpkgs/cabextract/template @@ -9,11 +9,3 @@ license="GPL-3" homepage="http://www.cabextract.org.uk/" distfiles="http://www.cabextract.org.uk/${pkgname}-${version}.tar.gz" checksum=f7ba8ba2c2d71912846eaaa2bed9200a7722ef0addeec32db7471c350a48e41e -long_desc=" - A program to extract Microsoft cabinet (.CAB) files." - -cabextract_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cairo-dock-plugins/template b/srcpkgs/cairo-dock-plugins/template index 8fb38f3487..db19a28123 100644 --- a/srcpkgs/cairo-dock-plugins/template +++ b/srcpkgs/cairo-dock-plugins/template @@ -9,6 +9,7 @@ makedepends="alsa-lib-devel fftw-devel pulseaudio-devel libexif-devel libical-devel libxklavier-devel zeitgeist-devel libsensors-devel upower-devel cairo-dock-devel>=3.3.1_2 gnome-menus-devel webkitgtk-devel vte3-devel vala-devel python-devel python3-devel" +depends="cairo-dock>=${version}" short_desc="Plugins for cairo-dock" maintainer="Juan RP " license="GPL-2" @@ -39,10 +40,3 @@ cairo-dock-plugins-vala_package() { vmove usr/share/vala } } - -cairo-dock-plugins_package() { - depends="cairo-dock>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cairo-dock/template b/srcpkgs/cairo-dock/template index 5920437f6a..6523a91ff6 100644 --- a/srcpkgs/cairo-dock/template +++ b/srcpkgs/cairo-dock/template @@ -6,6 +6,7 @@ build_style=cmake configure_args="-Denable-desktop-manager=ON" hostmakedepends="cmake pkg-config" makedepends="libcurl-devel dbus-glib-devel libXtst-devel gtk+3-devel librsvg-devel glu-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="Light eye-candy fully themable animated dock" maintainer="Juan RP " license="GPL-2" @@ -29,10 +30,3 @@ libgldi_package() { vmove "usr/lib/*.so.*" } } - -cairo-dock_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cairo/template b/srcpkgs/cairo/template index 747b86ecaf..5fa8f4679c 100644 --- a/srcpkgs/cairo/template +++ b/srcpkgs/cairo/template @@ -24,6 +24,7 @@ long_desc=" hostmakedepends="which automake libtool pkg-config" makedepends="libpng-devel>=1.6 fontconfig-devel pixman-devel>=0.28 libXrender-devel>=0.9.7_3 libglib-devel" +depends="pixman>=0.28" pre_configure() { autoreconf -fi @@ -70,10 +71,3 @@ cairo-devel_package() { vmove "usr/lib/*.so" } } - -cairo_package() { - depends="pixman>=0.28" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cairomm/template b/srcpkgs/cairomm/template index 7e6d361db6..a0738739f4 100644 --- a/srcpkgs/cairomm/template +++ b/srcpkgs/cairomm/template @@ -6,6 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libsigc++-devel fontconfig-devel libpng-devel>=1.6 libXrender-devel cairo-devel>=1.12.14_6" +depends="cairo>=1.12.14_6" short_desc="C++ bindings to Cairo vector graphics library" maintainer="Juan RP " homepage="http://www.cairographics.org" @@ -27,10 +28,3 @@ cairomm-devel_package() { vmove usr/lib/pkgconfig } } - -cairomm_package() { - depends="cairo>=1.12.14_6" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/calf/template b/srcpkgs/calf/template index ca15ae2853..af73463286 100644 --- a/srcpkgs/calf/template +++ b/srcpkgs/calf/template @@ -7,6 +7,7 @@ configure_args="--enable-experimental" makedepends="expat-devel dssi-devel jack-devel glib-devel gtk+-devel libglade-devel cairo-devel ladish-devel>=1_3 ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme" +depends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme" homepage="http://calf.sourceforge.net" short_desc="LV2/DSSI/LADSPA plug-ins suite and standalone JACK host" maintainer="davehome " @@ -19,10 +20,3 @@ long_desc=" multitrack software, as software replacement for instruments and guitar stomp boxes (and not as single modules in a modular synthesizer, which was a primary design goal in some other open source plugin packages)." - -calf_package() { - depends="ladspa-sdk lv2 desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cantarell-fonts/template b/srcpkgs/cantarell-fonts/template index 3e2707dca2..8aa5afbee3 100644 --- a/srcpkgs/cantarell-fonts/template +++ b/srcpkgs/cantarell-fonts/template @@ -2,9 +2,11 @@ pkgname=cantarell-fonts version=0.0.15 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="fontconfig" +depends="${makedepends}" short_desc="Cantarell family of TrueType fonts" maintainer="Juan RP " homepage="http://abattis.org/cantarell/" @@ -21,11 +23,3 @@ post_install() { vinstall ${FILESDIR}/21-cantarell-hinting.conf 644 etc/fonts/conf.avail ln -s ../conf.avail/21-cantarell-hinting.conf ${DESTDIR}/etc/fonts/conf.d } - -cantarell-fonts_package() { - depends="fontconfig" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/caribou/template b/srcpkgs/caribou/template index 83276c6557..ae6d6a761e 100644 --- a/srcpkgs/caribou/template +++ b/srcpkgs/caribou/template @@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool gnome-doc-utils gobject-introspection" makedepends=" vala-devel>=0.20 libxklavier-devel libgee08-devel pygobject-devel clutter-devel gtk+3-devel libXtst-devel gir-freedesktop" +depends="pygobject pyatspi dbus-python gir-freedesktop at-spi2-atk desktop-file-utils" +pycompile_module="$pkgname" short_desc="An alternative to the Gnome On-screen Keyboard" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -35,11 +37,3 @@ caribou-devel_package() { vmove "usr/lib/*.so" } } - -caribou_package() { - depends="pygobject pyatspi dbus-python gir-freedesktop at-spi2-atk desktop-file-utils" - pycompile_module="$pkgname" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/catalyst/template b/srcpkgs/catalyst/template index 5f56fd0769..4f808e80e3 100644 --- a/srcpkgs/catalyst/template +++ b/srcpkgs/catalyst/template @@ -1,15 +1,20 @@ # Template file for 'catalyst' +_desc="AMD catalyst driver for Linux" + pkgname=catalyst version=13.9 revision=1 -short_desc="AMD catalyst driver for Linux" maintainer="Juan RP " license="Propietary AMD license" homepage="http://www.amd.com" only_for_archs="i686 x86_64" create_wrksrc=yes +nonfree=yes makedepends="unzip" +depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision}" +conflicts="nvidia>=0" +short_desc="${_desc} - Libraries and Utilities" distfiles=http://www2.ati.com/drivers/linux/amd-catalyst-${version}-linux-x86.x86_64.zip checksum=ebade5062713c69d2b703b0a3f62defc409d58e98ceab3bfac7a71643c0c4cd3 @@ -100,7 +105,7 @@ do_install() { } catalyst-dkms_package() { - short_desc+=" - DKMS kernel module" + short_desc="${_desc} - DKMS kernel module" triggers="dkms" dkms_modules="fglrx ${version}_${revision}" nonfree=yes @@ -126,7 +131,7 @@ catalyst-dkms_package() { } catalyst-opencl_package() { - short_desc+=" - OpenCL implementation" + short_desc="${_desc} - OpenCL implementation" provides="libOpenCL-${version}" replaces="libOpenCL>=0" nonfree=yes @@ -146,13 +151,3 @@ catalyst-opencl_package() { ln -s libOpenCL.so.1 ${PKGDESTDIR}/usr/lib/libOpenCL.so } } - -catalyst_package() { - short_desc+=" - Libraries and Utilities" - depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision}" - conflicts="nvidia>=0" - nonfree=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template index 49566df57e..27de688f0d 100644 --- a/srcpkgs/ccache/template +++ b/srcpkgs/ccache/template @@ -18,9 +18,3 @@ post_install() { ln -sfr ${DESTDIR}/usr/bin/ccache ${DESTDIR}/usr/lib/ccache/bin/${f} done } - -ccache_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template index 4be121a6bc..07a5b931c6 100644 --- a/srcpkgs/cclive/template +++ b/srcpkgs/cclive/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="boost-devel>=1.54 pcre-devel libcurl-devel libquvi-devel>=0.4.1_4 glibmm-devel" +depends="libquvi>=0.4.1_4" short_desc="Commandline downloader for popular video websites" maintainer="Juan RP " license="AGPL-3" @@ -15,10 +16,3 @@ checksum=586a120faddcfa16f5bb058b5c901f1659336c6fc85a0d3f1538882a44ee10e1 do_configure() { ./configure ${configure_args} boost_cv_rpath_link_ldflag="-L/usr/lib" } - -cclive_package() { - depends="libquvi>=0.4.1_4" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cd-discid/template b/srcpkgs/cd-discid/template index caf9032abe..5ab0c906f6 100644 --- a/srcpkgs/cd-discid/template +++ b/srcpkgs/cd-discid/template @@ -6,12 +6,6 @@ build_style="gnu-makefile" maintainer="Philipp Hirsch " license="GPL-2" homepage="http://linukz.org/cd-discid.shtml" +short_desc="An utility to get CDDB discid information from a CD-ROM disc" distfiles="http://linukz.org/download/${pkgname}-${version}.tar.gz" checksum=ffd68cd406309e764be6af4d5cbcc309e132c13f3597c6a4570a1f218edd2c63 -short_desc="An utility to get CDDB discid information from a CD-ROM disc" - -cd-discid_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template index 8250b9211b..f02d0082bd 100644 --- a/srcpkgs/cdparanoia/template +++ b/srcpkgs/cdparanoia/template @@ -40,9 +40,3 @@ cdparanoia-devel_package() { vmove "usr/lib/*.a" } } - -cdparanoia_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cdrtools/template b/srcpkgs/cdrtools/template index 01a8fe1df3..b7e4c24db5 100644 --- a/srcpkgs/cdrtools/template +++ b/srcpkgs/cdrtools/template @@ -6,6 +6,7 @@ build_style=gnu-makefile make_build_args="CCOM=gcc RUNPATH= LDPATH= NOWARN=true" make_install_args="INS_BASE=/usr MANDIR=/man" makedepends="acl-devel" +conf_files="/etc/default/rscsi /etc/default/cdrecord" short_desc="Highly portable CD/DVD/BluRay command line recording software" homepage="http://cdrecord.berlios.de/" license="CDDL" @@ -34,10 +35,3 @@ post_install() { rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/lib/lib* ${DESTDIR}/usr/lib/profiled } - -cdrtools_package() { - conf_files="/etc/default/rscsi /etc/default/cdrecord" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/celt/template b/srcpkgs/celt/template index 4f3ce5e669..03a2486bcf 100644 --- a/srcpkgs/celt/template +++ b/srcpkgs/celt/template @@ -31,9 +31,3 @@ celt-devel_package() { vmove "usr/lib/*.a" } } - -celt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/celt051/template b/srcpkgs/celt051/template index 2500001ec4..5a4679ed9d 100644 --- a/srcpkgs/celt051/template +++ b/srcpkgs/celt051/template @@ -32,9 +32,3 @@ celt051-devel_package() { vmove "usr/lib/*.a" } } - -celt051_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cgminer/template b/srcpkgs/cgminer/template index f1c13b27dd..613fef579d 100644 --- a/srcpkgs/cgminer/template +++ b/srcpkgs/cgminer/template @@ -9,6 +9,7 @@ configure_args=" --enable-bab --with-system-libusb" hostmakedepends="pkg-config automake libtool yasm" makedepends="libcurl-devel libusb-devel jansson-devel libudev-devel ncurses-devel" +conf_files="/etc/cgminer.conf" short_desc="Multi-threaded multi-pool CPU and GPU miner for bitcoin" maintainer="Juan RP " license="GPL-3" @@ -37,11 +38,3 @@ post_install() { sed -i -e 's#/usr/local/bin#/usr/bin#g' ${DESTDIR}/etc/cgminer.conf vinstall ${FILESDIR}/cgminer.service 644 usr/lib/systemd/system } - -cgminer_package() { - conf_files="/etc/cgminer.conf" - pkg_install() { - vmove all - } -} - diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 79f7d43871..e48209ea34 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -11,6 +11,12 @@ makedepends=" clutter-gst-devel>=2.0.8_2 libgee08-devel>=0.12 libcanberra-devel librsvg-devel libgudev-devel gnome-desktop-devel>=3.10 gst-plugins-good1>=1:1.2.0 gnome-video-effects" +depends="clutter-gst>=2.0.8_2 + clutter-gtk>=1.4.4_2 + gst-plugins-good1>=1:1.2 + desktop-file-utils + hicolor-icon-theme + gnome-video-effects" short_desc="GNOME tool to take pictures and videos from your webcam" maintainer="Juan RP " homepage="http://www.gnome.org/projects/cheese/" @@ -46,15 +52,3 @@ cheese-devel_package() { vmove usr/share/gtk-doc } } - -cheese_package() { - depends="clutter-gst>=2.0.8_2 - clutter-gtk>=1.4.4_2 - gst-plugins-good1>=1:1.2 - desktop-file-utils - hicolor-icon-theme - gnome-video-effects" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cherokee/template b/srcpkgs/cherokee/template index 76b4b5dfc9..edb833c919 100644 --- a/srcpkgs/cherokee/template +++ b/srcpkgs/cherokee/template @@ -9,6 +9,16 @@ configure_args=" --with-wwwgroup=httpd --with-python=python --enable-os-string=Linux" makedepends="pcre-devel>=8.30 python-devel libldap-devel pam-devel libmysqlclient-devel ffmpeg-devel>=2.1 geoip-devel" +depends="shadow" +conf_files="/etc/${pkgname}/${pkgname}.conf" +systemd_services="cherokee.service on" +system_accounts="httpd" +httpd_descr="Cherokee HTTP server" +httpd_homedir="/srv/httpd" +make_dirs=" + /etc/cherokee/ssl 0755 httpd httpd + /var/log/cherokee 0755 httpd httpd + /var/lib/cherokee/graphs/images 0755 httpd httpd" short_desc="An innovative, feature rich, and yet easy to configure open source Web Server" maintainer="davehome " homepage="http://www.cherokee-project.com/" @@ -58,19 +68,3 @@ libcherokee_package() { vmove usr/lib/cherokee } } - -cherokee_package() { - depends="shadow" - conf_files="/etc/${pkgname}/${pkgname}.conf" - systemd_services="cherokee.service on" - system_accounts="httpd" - httpd_descr="Cherokee HTTP server" - httpd_homedir="/srv/httpd" - make_dirs=" - /etc/cherokee/ssl 0755 httpd httpd - /var/log/cherokee 0755 httpd httpd - /var/lib/cherokee/graphs/images 0755 httpd httpd" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chicken/template b/srcpkgs/chicken/template index 62f3a579f3..99357ced17 100644 --- a/srcpkgs/chicken/template +++ b/srcpkgs/chicken/template @@ -42,9 +42,3 @@ chicken-devel_package() { vmove "usr/lib/*.so" } } - -chicken_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chromaprint/template b/srcpkgs/chromaprint/template index 3a9ad45f05..88acc09879 100644 --- a/srcpkgs/chromaprint/template +++ b/srcpkgs/chromaprint/template @@ -21,9 +21,3 @@ chromaprint-devel_package() { vmove "usr/lib/*.so" } } - -chromaprint_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chromium-bsu/template b/srcpkgs/chromium-bsu/template index 652fcb50dd..9862de30d5 100644 --- a/srcpkgs/chromium-bsu/template +++ b/srcpkgs/chromium-bsu/template @@ -20,14 +20,8 @@ long_desc=" makedepends="ftgl-devel>=2.1.3rc5_4 fontconfig-devel SDL-devel SDL_image-devel libopenal-devel freealut-devel desktop-file-utils" +depends="desktop-file-utils" post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -chromium-bsu_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 767cee5b19..285d80f5c6 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -47,6 +47,8 @@ makedepends="libpng-devel>=1.6 gtk+-devel nss-devel GConf-devel pciutils-devel libXcursor-devel libflac-devel speex-devel libmtp-devel v8-devel>=3.20 libjpeg-turbo-devel libevent-devel json-c-devel re2-devel harfbuzz-devel libwebp-devel minizip-devel jsoncpp-devel zlib-devel hwids" +depends="desktop-file-utils hicolor-icon-theme" +nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe" if [ "$XBPS_MACHINE" = "x86_64" ]; then makedepends+=" gcc-c++-multilib" @@ -184,11 +186,3 @@ do_install() { vinstall ${FILESDIR}/chromium.sh 755 usr/bin chromium vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -chromium_package() { - depends="desktop-file-utils hicolor-icon-theme" - nostrip_files="nacl_irt_x86_64.nexe nacl_irt_x86_32.nexe" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chrony/template b/srcpkgs/chrony/template index 2ba8e907b8..2a0a2a9c99 100644 --- a/srcpkgs/chrony/template +++ b/srcpkgs/chrony/template @@ -6,6 +6,12 @@ build_style=gnu-configure configure_args="--without-nss" hostmakedepends="pkg-config" makedepends="libtomcrypt-devel libcap-devel readline-devel" +conf_files="/etc/chrony.conf" +system_accounts="chrony" +systemd_services="chrony.service on" +make_dirs=" + /var/log/chrony 0755 chrony chrony + /var/db/chrony 0755 chrony chrony" short_desc="Sets your computer's clock from time servers on the Net" maintainer="Juan RP " license="GPL-2" @@ -22,15 +28,3 @@ post_install() { vmkdir usr/lib/systemd/ntp-units.d echo "chrony.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/50-chrony.list } - -chrony_package() { - conf_files="/etc/chrony.conf" - system_accounts="chrony" - systemd_services="chrony.service on" - make_dirs=" - /var/log/chrony 0755 chrony chrony - /var/db/chrony 0755 chrony chrony" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template index 63d9e042cd..f9eb3f1b8a 100644 --- a/srcpkgs/chroot-bash/template +++ b/srcpkgs/chroot-bash/template @@ -36,15 +36,9 @@ long_desc=" broken_as_needed=yes bootstrap=yes +provides="bash-4.2" +conflicts="bash>=0" post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-bash_package() { - provides="bash-4.2" - conflicts="bash>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-coreutils/template b/srcpkgs/chroot-coreutils/template index 00e236f92f..a41e1b6b3e 100644 --- a/srcpkgs/chroot-coreutils/template +++ b/srcpkgs/chroot-coreutils/template @@ -16,15 +16,9 @@ distfiles="http://ftp.gnu.org/gnu/coreutils/coreutils-$version.tar.xz" checksum=4e075a0d238072a5bd079046e1f024dc5e0d9133d43a39c73d0b86b0d1e2c5e5 bootstrap=yes +provides="coreutils-${version}" +conflicts="coreutils>=0" pre_configure() { sed -i 's/^\(SUBDIRS =\).*/\1 lib src/g' Makefile.in } - -chroot-coreutils_package() { - provides="coreutils-${version}" - conflicts="coreutils>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-diffutils/template b/srcpkgs/chroot-diffutils/template index f7dcc2d238..3b5b8be539 100644 --- a/srcpkgs/chroot-diffutils/template +++ b/srcpkgs/chroot-diffutils/template @@ -13,6 +13,8 @@ distfiles="${GNU_SITE}/diffutils/diffutils-$version.tar.xz" checksum=ab4fb75d0ef35f3c8c9a148cd3526ba6f4db71d10467a041eb45006436079149 bootstrap=yes +conflicts="diffutils>=0" +provides="diffutils-${version}" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h @@ -21,11 +23,3 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-diffutils_package() { - conflicts="diffutils>=0" - provides="diffutils-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template index e4ce8dac1f..f75fae0b59 100644 --- a/srcpkgs/chroot-distcc/template +++ b/srcpkgs/chroot-distcc/template @@ -3,6 +3,8 @@ pkgname=chroot-distcc version=3.2rc1 revision=1 wrksrc="distcc-${version}" +bootstrap=yes +conflicts="distcc>=0" short_desc="Distributed compilation for faster C/C++ builds -- for xbps-src use" maintainer="pancake " homepage="http://code.google.com/p/distcc" @@ -10,8 +12,6 @@ license="GPL-2" distfiles="http://distcc.googlecode.com/files/distcc-${version}.tar.bz2" checksum=311671e844625d7fdb18dd3d096cd855751cfe8de13827682bcb7beff9133b30 -bootstrap=yes - do_configure() { sed -i -e 's|^\(all: $(bin_PROGRAMS)\) pump include-server|\1|g' Makefile.in @@ -39,10 +39,3 @@ do_install() { ln -sfr ${DESTDIR}/usr/bin/distcc ${DESTDIR}/usr/lib/distcc/bin/${f} done } - -chroot-distcc_package() { - conflicts="distcc>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-fakeroot/template b/srcpkgs/chroot-fakeroot/template index d75f224f6c..d61a284d83 100644 --- a/srcpkgs/chroot-fakeroot/template +++ b/srcpkgs/chroot-fakeroot/template @@ -5,7 +5,10 @@ revision=1 bootstrap=yes wrksrc="fakeroot-${version}" build_style=gnu-configure +provides="fakeroot-${version}_${revision}" +conflicts="fakeroot>=0" makedepends="chroot-util-linux" +depends="${makedepends}" short_desc="Gives a fake root environment -- for xbps-src use" maintainer="Juan RP " homepage="http://packages.debian.org/fakeroot" @@ -24,12 +27,3 @@ post_install() { rm -rf ${DESTDIR}/usr/share rm -f ${DESTDIR}/usr/lib/*.a } - -chroot-fakeroot_package() { - depends="chroot-util-linux" - provides="fakeroot-${version}_${revision}" - conflicts="fakeroot>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-findutils/template b/srcpkgs/chroot-findutils/template index c8a96521ae..33b38401d1 100644 --- a/srcpkgs/chroot-findutils/template +++ b/srcpkgs/chroot-findutils/template @@ -14,6 +14,8 @@ distfiles="http://ftp.gnu.org/gnu/findutils/findutils-$version.tar.gz" checksum=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a bootstrap=yes +conflicts="findutils>=0" +provides="findutils-${version}" post_install() { for f in locate oldfind updatedb; do @@ -21,11 +23,3 @@ post_install() { done rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec } - -chroot-findutils_package() { - conflicts="findutils>=0" - provides="findutils-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template index b0222edafd..a6ca11215a 100644 --- a/srcpkgs/chroot-gawk/template +++ b/srcpkgs/chroot-gawk/template @@ -13,15 +13,9 @@ distfiles="http://ftp.gnu.org/gnu/gawk/gawk-$version.tar.gz" checksum=c3a7cf7d976e05c6a1d8a9b3f14fa55d4304707408ddafb1396212653ea00be5 bootstrap=yes +conflicts="gawk>=0" +provides="gawk-${version}" post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-gawk_package() { - conflicts="gawk>=0" - provides="gawk-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-gcc/template b/srcpkgs/chroot-gcc/template index a877332b1e..3aec3db158 100644 --- a/srcpkgs/chroot-gcc/template +++ b/srcpkgs/chroot-gcc/template @@ -26,6 +26,19 @@ checksum=" create_wrksrc=yes bootstrap=yes +provides=" + libgcc-${version} + libstdc++-${version} + libstdc++-devel-${version} + gcc-${version} + gcc-c++-${version}" +conflicts=" + libgcc>=0 + libstdc++>=0 + libstdc++-devel>=0 + gcc>=0 + gcc-c++>=0" +noverifyrdeps=yes if [ "$CHROOT_READY" ]; then hostmakedepends+=" perl flex" @@ -201,13 +214,3 @@ do_install() { # Remove all python scripts in libdir. rm -f ${DESTDIR}/usr/lib/*.py } - -chroot-gcc_package() { - provides="libgcc-${version} libstdc++-${version} libstdc++-devel-${version} - gcc-${version} gcc-c++-${version}" - conflicts="libgcc>=0 libstdc++>=0 libstdc++-devel>=0 gcc>=0 gcc-c++>=0" - noverifyrdeps=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chroot-gettext/template b/srcpkgs/chroot-gettext/template index 965d23bbbf..7d52a0d1a6 100644 --- a/srcpkgs/chroot-gettext/template +++ b/srcpkgs/chroot-gettext/template @@ -18,15 +18,9 @@ distfiles="http://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.gz" checksum=36f3c1043df803565d4977c1efbd41e1ec0f0301acf5f057984406c34cb9f948 bootstrap=yes +conflicts="gettext>=0" +provides="gettext-${version}" post_install() { rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/lib ${DESTDIR}/usr/include } - -chroot-gettext_package() { - conflicts="gettext>=0" - provides="gettext-${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template index d53bc3fe0c..7a50fa9d37 100644 --- a/srcpkgs/chroot-git/template +++ b/srcpkgs/chroot-git/template @@ -3,6 +3,9 @@ pkgname=chroot-git version=1.8.2 revision=1 wrksrc="git-$version" +bootstrap=yes +conflicts="git>=0" +provides="git-${version}" build_style=gnu-configure configure_args="--without-curl --without-openssl --without-python --without-expat --without-tcltk --with-zlib=${XBPS_MASTERDIR}/usr @@ -16,8 +19,6 @@ license="GPL-2" distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" checksum=c2f35bcefa4f62a54c4bde41cc0f1cd3ddf03e9a6bc8a79557f1683789f213e6 -bootstrap=yes - if [ "$CHROOT_READY" ]; then hostmakedepends="perl" fi @@ -33,11 +34,3 @@ post_install() { rm -rf ${DESTDIR}/usr/share/man rm -rf ${DESTDIR}/usr/share/perl5 } - -chroot-git_package() { - conflicts="git>=0" - provides="git-${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template index 48d9f3a811..c3f8e50788 100644 --- a/srcpkgs/chroot-grep/template +++ b/srcpkgs/chroot-grep/template @@ -22,15 +22,9 @@ long_desc=" don't have to install it manually." bootstrap=yes +conflicts="grep>=0" +provides="grep-${version}" post_install() { rm -rf ${DESTDIR}/usr/share/info ${DESTDIR}/usr/share/man } - -chroot-grep_package() { - conflicts="grep>=0" - provides="grep-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-gzip/template b/srcpkgs/chroot-gzip/template index 9ba787550d..1153aa821b 100644 --- a/srcpkgs/chroot-gzip/template +++ b/srcpkgs/chroot-gzip/template @@ -12,6 +12,8 @@ distfiles="http://ftp.gnu.org/gnu/gzip/gzip-$version.tar.gz" checksum=d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee bootstrap=yes +conflicts="gzip>=0" +provides="gzip-${version}" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h @@ -20,11 +22,3 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-gzip_package() { - conflicts="gzip>=0" - provides="gzip-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-m4/template b/srcpkgs/chroot-m4/template index 9129a80361..e41c7fd0d6 100644 --- a/srcpkgs/chroot-m4/template +++ b/srcpkgs/chroot-m4/template @@ -13,6 +13,8 @@ distfiles="http://ftp.gnu.org/gnu/m4/m4-$version.tar.bz2" checksum=42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c bootstrap=yes +conflicts="m4>=0" +provides="m4-${version}" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h @@ -21,11 +23,3 @@ pre_configure() { post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-m4_package() { - conflicts="m4>=0" - provides="m4-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-make/template b/srcpkgs/chroot-make/template index adc95b60ae..d459e2bc02 100644 --- a/srcpkgs/chroot-make/template +++ b/srcpkgs/chroot-make/template @@ -4,6 +4,8 @@ version=4.0 revision=1 bootstrap=yes wrksrc="make-${version}" +conflicts="make>=0" +provides="make-${version}_${revision}" build_style=gnu-configure configure_args="--disable-nls --without-guile" short_desc="The GNU make system -- for xbps-src use" @@ -23,11 +25,3 @@ post_install() { rm -rf ${DESTDIR}/usr/share rm -rf ${DESTDIR}/usr/include } - -chroot-make_package() { - conflicts="make>=0" - provides="make-${version}_${revision}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chroot-patch/template b/srcpkgs/chroot-patch/template index d33be34f89..4ede904205 100644 --- a/srcpkgs/chroot-patch/template +++ b/srcpkgs/chroot-patch/template @@ -3,8 +3,11 @@ pkgname=chroot-patch version=2.7.1 revision=2 wrksrc="patch-${version}" +bootstrap=yes build_style=gnu-configure configure_args="--disable-xattr" +conflicts="patch>=0" +provides="patch-${version}" short_desc="Patch files using diff output -- for xbps-src use" maintainer="Juan RP " homepage="http://savannah.gnu.org/projects/patch/" @@ -12,16 +15,6 @@ license="GPL-3" distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.bz2" checksum=aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11 -bootstrap=yes - post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-patch_package() { - conflicts="patch>=0" - provides="patch-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-sed/template b/srcpkgs/chroot-sed/template index af559f1b97..4d10dc6839 100644 --- a/srcpkgs/chroot-sed/template +++ b/srcpkgs/chroot-sed/template @@ -18,15 +18,9 @@ long_desc=" This package is only meant to be used by xbps-src, don't install it manually." bootstrap=yes +conflicts="sed>=0" +provides="sed-${version}" post_install() { rm -rf ${DESTDIR}/usr/share } - -chroot-sed_package() { - conflicts="sed>=0" - provides="sed-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/chroot-tar/template b/srcpkgs/chroot-tar/template index f12567cf54..04a1502e4d 100644 --- a/srcpkgs/chroot-tar/template +++ b/srcpkgs/chroot-tar/template @@ -13,15 +13,9 @@ distfiles="http://ftp.gnu.org/gnu/tar/tar-$version.tar.xz" checksum=1b2a6b4b9de6b48e9e994276197e1f18e512a9acf6f598905f0e481ca3f8245b bootstrap=yes +conflicts="tar>=0" +provides="tar-${version}_${revision}" post_install() { rm -rf ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec } - -chroot-tar_package() { - conflicts="tar>=0" - provides="tar-${version}_${revision}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chroot-texinfo/template b/srcpkgs/chroot-texinfo/template index 1fef22d9c7..a274cae4f8 100644 --- a/srcpkgs/chroot-texinfo/template +++ b/srcpkgs/chroot-texinfo/template @@ -13,6 +13,8 @@ checksum=1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68 bootstrap=yes hostmakedepends="ncurses-devel" makedepends="ncurses-devel" +conflicts="texinfo>=0" +provides="texinfo-${version}" do_configure() { ./configure ${configure_args} --disable-nls @@ -33,11 +35,3 @@ do_install() { rm -f ${DESTDIR}/usr/bin/infokey rm -rf ${DESTDIR}/usr/share } - -chroot-texinfo_package() { - conflicts="texinfo>=0" - provides="texinfo-${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/chrpath/template b/srcpkgs/chrpath/template index 286c4678f6..b7c0e048a3 100644 --- a/srcpkgs/chrpath/template +++ b/srcpkgs/chrpath/template @@ -12,9 +12,3 @@ checksum="c1aa5342eac0daad81b8da05aa282ae1ccd6f68bc75ca94064304f541eed071b" long_desc=" chrpath allows you to modify the dynamic library load path (rpath and runpath) of compiled programs and libraries." - -chrpath_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template index 98eab8641a..716805391f 100644 --- a/srcpkgs/cifs-utils/template +++ b/srcpkgs/cifs-utils/template @@ -32,9 +32,3 @@ post_install() { chmod +s ${DESTDIR}/usr/bin/mount.cifs rm -rf ${DESTDIR}/usr/include } - -cifs-utils_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cinnamon-control-center/template b/srcpkgs/cinnamon-control-center/template index 9f0619ca7f..c37009dd8a 100644 --- a/srcpkgs/cinnamon-control-center/template +++ b/srcpkgs/cinnamon-control-center/template @@ -13,6 +13,7 @@ makedepends="dbus-glib-devel gnome-menus-devel libgnomekbd-devel cinnamon-deskto libnotify-devel upower-devel polkit-devel colord-devel ibus-devel pulseaudio-devel libcanberra-devel cups-devel cheese-devel libXxf86misc-devel desktop-file-utils hicolor-icon-theme" +depends="cinnamon-settings-daemon cinnamon-translations desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -50,10 +51,3 @@ cinnamon-control-center-devel_package() { vmove "usr/lib/*.so" } } - -cinnamon-control-center_package() { - depends="cinnamon-settings-daemon cinnamon-translations desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cinnamon-desktop/template b/srcpkgs/cinnamon-desktop/template index a056faa3c8..86849096db 100644 --- a/srcpkgs/cinnamon-desktop/template +++ b/srcpkgs/cinnamon-desktop/template @@ -7,7 +7,8 @@ build_style=gnu-configure configure_args=" --disable-static" hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection gettext-devel intltool which" -makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config libxkbfile-devel " +makedepends="gdk-pixbuf-devel gtk+3-devel libXrandr-devel xkeyboard-config libxkbfile-devel" +depends="xkeyboard-config" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -30,11 +31,3 @@ cinnamon-desktop-devel_package() { vmove usr/share/gir-1.0 } } - -cinnamon-desktop_package() { - depends="xkeyboard-config" - pkg_install() { - vmove all - } -} - diff --git a/srcpkgs/cinnamon-screensaver/template b/srcpkgs/cinnamon-screensaver/template index 186aecc338..8a09aa5980 100644 --- a/srcpkgs/cinnamon-screensaver/template +++ b/srcpkgs/cinnamon-screensaver/template @@ -11,6 +11,8 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection gettext-devel intltool which" makedepends="dbus-glib-devel libgnomekbd-devel cinnamon-desktop-devel libXxf86misc-devel pam-devel systemd-devel desktop-file-utils hicolor-icon-theme" +depends="cinnamon-translations desktop-file-utils hicolor-icon-theme" +conf_files="/etc/pam.d/${pkgname}" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -26,11 +28,3 @@ pre_configure() { post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} } - -cinnamon-screensaver_package() { - depends="cinnamon-translations desktop-file-utils hicolor-icon-theme" - conf_files="/etc/pam.d/${pkgname}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cinnamon-session/template b/srcpkgs/cinnamon-session/template index ee4a3cc4a8..760e7b9afa 100644 --- a/srcpkgs/cinnamon-session/template +++ b/srcpkgs/cinnamon-session/template @@ -11,6 +11,7 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel systemd-devel pangox-compat-devel cinnamon-desktop-devel desktop-file-utils hicolor-icon-theme" +depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -22,10 +23,3 @@ do_fetch() { pre_configure() { ./autogen.sh } - -cinnamon-session_package() { - depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cinnamon-settings-daemon/template b/srcpkgs/cinnamon-settings-daemon/template index 8e53c69243..c102e05921 100644 --- a/srcpkgs/cinnamon-settings-daemon/template +++ b/srcpkgs/cinnamon-settings-daemon/template @@ -13,6 +13,7 @@ makedepends="gtk+3-devel dbus-devel upower-devel json-glib-devel libSM-devel systemd-devel libnotify-devel cinnamon-desktop-devel lcms2-devel ibus-devel pulseaudio-devel libcanberra-devel colord-devel cups-devel nss-devel polkit-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -33,10 +34,3 @@ cinnamon-settings-daemon-devel_package() { vmove usr/lib/pkgconfig } } - -cinnamon-settings-daemon_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cinnamon-translations/template b/srcpkgs/cinnamon-translations/template index 5a6c67e3a2..2dca4d2df3 100644 --- a/srcpkgs/cinnamon-translations/template +++ b/srcpkgs/cinnamon-translations/template @@ -2,6 +2,7 @@ pkgname=cinnamon-translations version=2.0.3 revision=1 +noarch=yes short_desc="Translations for Cinnamon and Nemo" maintainer="Juan RP " license="GPL-3" @@ -15,10 +16,3 @@ do_install () { vmkdir /usr/share/cinnamon/locale cp -a mo-export/* ${DESTDIR}/usr/share/cinnamon/locale } - -cinnamon-translations_package() { - noarch=yes - pkg_install () { - vmove all - } -} diff --git a/srcpkgs/cinnamon/template b/srcpkgs/cinnamon/template index 42296b893e..50dcceedf6 100644 --- a/srcpkgs/cinnamon/template +++ b/srcpkgs/cinnamon/template @@ -20,6 +20,7 @@ makedepends="cjs-devel clutter-gtk-devel gnome-menus-devel gstreamer1-devel muffin-devel webkitgtk-devel libgnomekbd-devel polkit-devel libcanberra-devel startup-notification-devel pulseaudio-devel dbus-glib-devel GConf-devel libgnome-keyring-devel NetworkManager-devel libcroco-devel ${_RUNTIMEDEPS}" +depends="${_RUNTIMEDEPS}" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -55,10 +56,3 @@ post_install() { vinstall ${FILESDIR}/org.cinnamon.settings-users.policy 644 usr/share/polkit-1/actions vinstall ${FILESDIR}//polkit-cinnamon-authentication-agent-1.desktop 644 usr/share/applications } - -cinnamon_package() { - depends="${_RUNTIMEDEPS}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cjs/template b/srcpkgs/cjs/template index 62083eaeb3..8e6f789798 100644 --- a/srcpkgs/cjs/template +++ b/srcpkgs/cjs/template @@ -28,9 +28,3 @@ cjs-devel_package() { vmove usr/lib/pkgconfig } } - -cjs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/clipgrab/template b/srcpkgs/clipgrab/template index 04937ec4e7..aec073a080 100644 --- a/srcpkgs/clipgrab/template +++ b/srcpkgs/clipgrab/template @@ -3,6 +3,7 @@ pkgname=clipgrab version=3.2.1.2 revision=1 makedepends="qt-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A friendly downloader for YouTube and other sites" maintainer="Juan RP " license="GPL-3" @@ -20,10 +21,3 @@ do_install() { vinstall icon.png 644 usr/share/pixmaps clipgrab.png vinstall ${FILESDIR}/clipgrab.desktop 644 usr/share/applications } - -clipgrab_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cloog/template b/srcpkgs/cloog/template index 1fef48e704..25edaa974c 100644 --- a/srcpkgs/cloog/template +++ b/srcpkgs/cloog/template @@ -5,6 +5,7 @@ revision=3 build_style=gnu-configure configure_args="--with-isl=system --with-gmp=system" makedepends="gmp-devel isl-devel" +replaces="cloog-ppl>=0" short_desc="Library that generates loops for scanning polyhedra" maintainer="Juan RP " homepage="http://www.bastoul.net/cloog/" @@ -26,10 +27,3 @@ cloog-devel_package() { vmove "usr/lib/*.a" } } - -cloog_package() { - replaces="cloog-ppl>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/clucene/template b/srcpkgs/clucene/template index 5ba66b56a5..a545243463 100644 --- a/srcpkgs/clucene/template +++ b/srcpkgs/clucene/template @@ -34,9 +34,3 @@ clucene-devel_package() { vmove usr/lib/pkgconfig } } - -clucene_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/clutter-gst/template b/srcpkgs/clutter-gst/template index 61de691128..de266dfb9b 100644 --- a/srcpkgs/clutter-gst/template +++ b/srcpkgs/clutter-gst/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-debug" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="clutter-devel>=1.16 gst-plugins-bad1-devel>=1:1.2.0" +depends="gst-plugins-base1>=1:1.2 gst-plugins-bad1>=1:1.2" short_desc="GStreamer bindings for the Clutter Toolkit" maintainer="Juan RP " homepage="http://www.gtk.org/" @@ -24,10 +25,3 @@ clutter-gst-devel_package() { vmove "usr/lib/*.so" } } - -clutter-gst_package() { - depends="gst-plugins-base1>=1:1.2 gst-plugins-bad1>=1:1.2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/clutter-gtk/template b/srcpkgs/clutter-gtk/template index 3b29d4689d..c998353c56 100644 --- a/srcpkgs/clutter-gtk/template +++ b/srcpkgs/clutter-gtk/template @@ -23,9 +23,3 @@ clutter-gtk-devel_package() { vmove usr/share/gtk-doc } } - -clutter-gtk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/clutter/template b/srcpkgs/clutter/template index 07319ba6b0..39b21d7601 100644 --- a/srcpkgs/clutter/template +++ b/srcpkgs/clutter/template @@ -9,6 +9,8 @@ hostmakedepends="pkg-config intltool gobject-introspection" makedepends=" atk-devel pango-devel libXi-devel libXcomposite-devel json-glib-devel libxkbcommon-devel cogl-devel>=1.16.0_2 libevdev-devel libgudev-devel" +# egl/kms/wayland support in cogl +depends="cogl>=1.16.0_2" short_desc="OpenGL based interactive canvas library" maintainer="Juan RP " homepage="http://www.clutter-project.org" @@ -33,11 +35,3 @@ clutter-devel_package() { vmove "usr/share/gir-*" } } - -clutter_package() { - # egl/kms/wayland support in cogl - depends="cogl>=1.16.0_2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template index b0fa37c735..ee5b789d57 100644 --- a/srcpkgs/cmake-gui/template +++ b/srcpkgs/cmake-gui/template @@ -4,14 +4,14 @@ version=2.8.12 revision=1 wrksrc="cmake-${version}" build_style=configure -configure_script=./bootstrap -configure_args="--prefix=/usr --mandir=/share/man - --docdir=/share/doc/cmake --system-libs --qt-gui" +configure_script="./bootstrap" +configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake --system-libs --qt-gui" if [ -n "$XBPS_MAKEJOBS" ]; then configure_args+=" --parallel=$XBPS_MAKEJOBS" fi makedepends="zlib-devel expat-devel libcurl-devel ncurses-devel libarchive-devel>=3.1.2 qt-devel desktop-file-utils shared-mime-info" +depends="desktop-file-utils shared-mime-info" short_desc="Cross-platform, open-source build system - QT GUI" maintainer="Juan RP " license="BSD" @@ -19,13 +19,13 @@ homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v2.8/cmake-$version.tar.gz" checksum=d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287 -cmake-gui_package() { - depends="desktop-file-utils shared-mime-info" - pkg_install() { - vmove usr/bin/cmake-gui - vmove usr/share/man/man1/cmake-gui.1 - vmove usr/share/applications - vmove usr/share/mime/packages - vmove usr/share/pixmaps - } +do_install() { + # We are only interested in cmake-gui. + make DESTDIR=${wrksrc}/${pkgname} install + + vmove ${pkgname}/usr/bin/cmake-gui + vmove ${pkgname}/usr/share/man/man1/cmake-gui.1 + vmove ${pkgname}/usr/share/applications + vmove ${pkgname}/usr/share/mime/packages + vmove ${pkgname}/usr/share/pixmaps } diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template index bbece223ee..3fc5b72f05 100644 --- a/srcpkgs/cmake/template +++ b/srcpkgs/cmake/template @@ -16,9 +16,3 @@ license="BSD" homepage="http://www.cmake.org" distfiles="http://www.cmake.org/files/v2.8/$pkgname-$version.tar.gz" checksum=fa28c12791d64c36ba6b6cb062a4b4bd4223053f6b9ea501b1bdbdf4d5df3a67 - -cmake_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cmus/template b/srcpkgs/cmus/template index 0d825074f4..eee7607e12 100644 --- a/srcpkgs/cmus/template +++ b/srcpkgs/cmus/template @@ -98,9 +98,3 @@ cmus-wavpack_package() { vmove usr/lib/cmus/ip/wavpack.so } } - -cmus_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cntlm/template b/srcpkgs/cntlm/template index e1c21341d7..c04962339a 100644 --- a/srcpkgs/cntlm/template +++ b/srcpkgs/cntlm/template @@ -4,6 +4,7 @@ version=0.92.3 revision=1 build_style=gnu-configure hostmakedepends="which" +conf_files="/etc/cntlm.conf" short_desc="NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy" maintainer="Ypnose " license="GPL-2" @@ -19,10 +20,3 @@ do_build() { post_install() { vinstall ${FILESDIR}/cntlm.service 644 usr/lib/systemd/system } - -cntlm_package() { - conf_files="/etc/cntlm.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cogl/template b/srcpkgs/cogl/template index 87659c568a..59fcde40c9 100644 --- a/srcpkgs/cogl/template +++ b/srcpkgs/cogl/template @@ -9,6 +9,7 @@ configure_args="--enable-introspection --enable-cogl-gst=yes hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libXcomposite-devel libXrandr-devel libXdamage-devel pango-devel gdk-pixbuf-devel gst-plugins-base1-devel>=1:1.2.0 wayland-devel" +depends="gst-plugins-base1>=1:1.2.0" short_desc="Library for using 3D graphics hardware for rendering" maintainer="Juan RP " homepage="http://www.clutter-project.org" @@ -28,10 +29,3 @@ cogl-devel_package() { vmove usr/share/gir-1.0 } } - -cogl_package() { - depends="gst-plugins-base1>=1:1.2.0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/colord-gtk/template b/srcpkgs/colord-gtk/template index d1024d60d2..cb662b8cd4 100644 --- a/srcpkgs/colord-gtk/template +++ b/srcpkgs/colord-gtk/template @@ -18,16 +18,10 @@ long_desc=" colord-gtk-devel_package() { depends="colord-devel>=0.1.31 gtk+3-devel>=3.8.0 ${sourcepkg}>=${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gir-1.0 } } - -colord-gtk_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/colord/template b/srcpkgs/colord/template index 442c929f33..c1df14558c 100644 --- a/srcpkgs/colord/template +++ b/srcpkgs/colord/template @@ -10,6 +10,13 @@ configure_args="--disable-static --disable-schemas-compile hostmakedepends="pkg-config intltool gobject-introspection docbook2x" makedepends="vala-devel>=0.20 libgudev-devel polkit-devel lcms2-devel dbus-devel libusb-devel libgusb-devel>=0.1.6 systemd-devel sqlite-devel shared-color-profiles" +depends="shared-color-profiles shadow" +conf_files="/etc/colord.conf" +system_accounts="colord" +colord_homedir="/var/lib/colord" +make_dirs=" + /var/lib/colord 0755 colord colord + /var/lib/colord/icc 0755 colord colord" short_desc="System daemon for managing color devices" maintainer="Juan RP " homepage="http://www.freedesktop.org/software/colord" @@ -36,16 +43,3 @@ colord-devel_package() { vmove usr/share/vala } } - -colord_package() { - conf_files="/etc/colord.conf" - system_accounts="colord" - colord_homedir="/var/lib/colord" - make_dirs=" - /var/lib/colord 0755 colord colord - /var/lib/colord/icc 0755 colord colord" - depends="shared-color-profiles shadow" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/compositeproto/template b/srcpkgs/compositeproto/template index 67de8c2804..895d171a80 100644 --- a/srcpkgs/compositeproto/template +++ b/srcpkgs/compositeproto/template @@ -2,6 +2,7 @@ pkgname=compositeproto version=0.4.1 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Composite extension headers from modular X.org" homepage="http://xorg.freedesktop.org" @@ -9,13 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=e2744576731e1416503aade0d58a7861d0260f70b993351473a9f38ced606984 -long_desc=" - This package provides Composite extension headers from the modular - X.org X11 project." - -compositeproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/compton-git/template b/srcpkgs/compton-git/template index 1a2a2224ea..77b7b47996 100644 --- a/srcpkgs/compton-git/template +++ b/srcpkgs/compton-git/template @@ -2,26 +2,19 @@ pkgname=compton-git version=20131217 revision=1 +only_for_archs="i686 x86_64" build_style=gnu-makefile hostmakedepends="pkg-config asciidoc" makedepends="dbus-devel libXcomposite-devel libXdamage-devel libXrandr-devel pcre-devel libconfig-devel libdrm-devel MesaLib-devel libXinerama-devel desktop-file-utils" +depends="desktop-file-utils" maintainer="Steven R " homepage="https://github.com/chjj/compton" license="MIT" short_desc="A compositor for X (fork of xcompmgr-dana)" -only_for_archs="i686 x86_64" - do_fetch() { local url="git://github.com/chjj/compton.git" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } - -compton-git_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/confuse/template b/srcpkgs/confuse/template index c112a64210..a6574877b9 100644 --- a/srcpkgs/confuse/template +++ b/srcpkgs/confuse/template @@ -35,9 +35,3 @@ confuse-devel_package() { vmove usr/lib/pkgconfig } } - -confuse_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template index 2f44fcdb88..19b29628ed 100644 --- a/srcpkgs/conky-cli/template +++ b/srcpkgs/conky-cli/template @@ -1,31 +1,24 @@ # Template file for 'conky-cli' pkgname=conky-cli -_pkgname=conky version=1.9.0 revision=2 +wrksrc="${pkgname/-cli/}-${version}" build_style=gnu-configure configure_args="--disable-lua --disable-x11 --disable-xft --disable-imlib2 --disable-own-window --disable-xdamage --disable-double-buffer --enable-curl --enable-wlan --enable-rss --enable-ibm" hostmakedepends="pkg-config" makedepends="ncurses-devel wireless_tools-devel libglib-devel libcurl-devel libxml2-devel" +conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" +provides="conky-${version}" +conflicts="conky>=0" short_desc="Conky command line without X11" maintainer="Ypnose " license="BSD, GPL" homepage="http://conky.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/${_pkgname}/${_pkgname}-${version}.tar.gz" +distfiles="${SOURCEFORGE_SITE}/${pkgname/-cli/}/${pkgname/-cli/}-${version}.tar.gz" checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca -wrksrc="${_pkgname}-${version}" post_install() { vinstall COPYING 644 usr/share/licenses/$_pkgname } - -conky-cli_package() { - conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" - provides="conky-${version}" - conflicts="conky>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index f55fc7fd93..e2cf3544a0 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -8,18 +8,11 @@ configure_args="--enable-ibm --enable-curl --enable-rss --enable-weather-xoap hostmakedepends="pkg-config docbook2x" makedepends="alsa-lib-devel libglib-devel libxml2-devel libXft-devel libXdamage-devel imlib2-devel wireless_tools-devel libcurl-devel ncurses-devel" +conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" +conflicts="conky>=0" short_desc="Lightweight system monitor for X" maintainer="Juan RP " license="BSD, GPL" homepage="http://conky.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca - -conky_package() { - conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" - provides="conky-${version}" - conflicts="conky>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/connman-ui-git/template b/srcpkgs/connman-ui-git/template index 894aef790c..cd2cae5ebc 100644 --- a/srcpkgs/connman-ui-git/template +++ b/srcpkgs/connman-ui-git/template @@ -17,9 +17,3 @@ do_fetch() { pre_configure() { autoreconf -fi } - -connman-ui-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/connman/template b/srcpkgs/connman/template index fb1a44e740..dac652c4db 100644 --- a/srcpkgs/connman/template +++ b/srcpkgs/connman/template @@ -14,8 +14,8 @@ distfiles="${KERNEL_SITE}/network/$pkgname/$pkgname-$version.tar.xz" checksum=7e4e624cadf42feed18e783351b10f81ef23d7e298bddc7ffe26fe5e69f25b8b hostmakedepends="pkg-config" -makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 - gnutls-devel>=3.1.5 readline-devel wpa_supplicant" +makedepends="libglib-devel dbus-devel iptables-devel>=1.4.18 gnutls-devel>=3.1.5 readline-devel wpa_supplicant" +depends="wpa_supplicant" post_install() { # Install the client connmanctl. @@ -30,10 +30,3 @@ connman-devel_package() { vmove usr/lib/pkgconfig } } - -connman_package() { - depends="wpa_supplicant" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/containers/template b/srcpkgs/containers/template index 05d5df7e6e..4208e8a7b2 100644 --- a/srcpkgs/containers/template +++ b/srcpkgs/containers/template @@ -26,9 +26,3 @@ do_install() { sed -e 's,-s ,,g' -i Makefile make BINDIR=/usr/bin DESTDIR=${DESTDIR} install } - -containers_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template index 0304f13dc3..1fa49a2854 100644 --- a/srcpkgs/coreutils/template +++ b/srcpkgs/coreutils/template @@ -4,6 +4,8 @@ version=8.22 revision=1 hostmakedepends="perl" makedepends="gmp-devel acl-devel libcap-devel" +depends="coreutils-doc-${version}_${revision}" +conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3" short_desc="The GNU core utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/coreutils" @@ -53,14 +55,6 @@ do_install() { fi } -coreutils_package() { - conflicts="chroot-coreutils>=0 procps-ng<3.3.5_3" - depends="coreutils-doc-${version}_${revision}" - pkg_install() { - vmove all - } -} - if [ -z "$CROSS_BUILD" ]; then coreutils-doc_package() { noarch=yes diff --git a/srcpkgs/cpio/template b/srcpkgs/cpio/template index 74436aa959..9382df5a7a 100644 --- a/srcpkgs/cpio/template +++ b/srcpkgs/cpio/template @@ -21,9 +21,3 @@ post_install() { # Remove rmt that conflicts with the one from tar. rm -rf ${DESTDIR}/usr/libexec } - -cpio_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cppcheck/template b/srcpkgs/cppcheck/template index 14e9d74e12..4c2032f668 100644 --- a/srcpkgs/cppcheck/template +++ b/srcpkgs/cppcheck/template @@ -11,9 +11,3 @@ license="GPL-2" homepage="http://cppcheck.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=73eb56e5ea268e917c73f64e68744add35409bdc93be99773d814f9cc0a7221e - -cppcheck_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cproto/template b/srcpkgs/cproto/template index 8365d58322..e07cbefd47 100644 --- a/srcpkgs/cproto/template +++ b/srcpkgs/cproto/template @@ -14,9 +14,3 @@ checksum=1231309b1e9712551e1247120b096d019e1c66e612ad446184ad2def89f32d5d do_install() { make bindir=${DESTDIR}/usr/bin mandir=${DESTDIR}/usr/share/man install } - -cproto_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cpufrequtils/template b/srcpkgs/cpufrequtils/template index dc73490c52..f76dede9c6 100644 --- a/srcpkgs/cpufrequtils/template +++ b/srcpkgs/cpufrequtils/template @@ -34,9 +34,3 @@ libcpufreq-devel_package() { vmove usr/include } } - -cpufrequtils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cpuminer/template b/srcpkgs/cpuminer/template index 7268dcdf31..62038eb047 100644 --- a/srcpkgs/cpuminer/template +++ b/srcpkgs/cpuminer/template @@ -11,9 +11,3 @@ license="GPL-3" homepage="https://github.com/pooler/cpuminer" distfiles="${SOURCEFORGE_SITE}/cpuminer/pooler-cpuminer-${version}.tar.gz" checksum=93460fbb5b368cbf8b2f90bc915a78ced37fed8a39dd1ee2e3983101bd1fdc1f - -cpuminer_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cracklib/template b/srcpkgs/cracklib/template index 9c02266ce0..cbb2cb5598 100644 --- a/srcpkgs/cracklib/template +++ b/srcpkgs/cracklib/template @@ -57,9 +57,3 @@ libcracklib_package() { vmove "usr/lib/*.so*" } } - -cracklib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cronie/template b/srcpkgs/cronie/template index 84064e9cdf..efdaca9116 100644 --- a/srcpkgs/cronie/template +++ b/srcpkgs/cronie/template @@ -6,6 +6,17 @@ build_style=gnu-configure configure_args="--with-inotify --without-selinux --with-pam --disable-anacron --localstatedir=/var --enable-pie --enable-relro" makedepends="pam-devel run-parts" +depends="run-parts" +make_dirs=" + /etc/cron.d/daily 0755 root root + /etc/cron.d/weekly 0755 root root + /etc/cron.d/monthly 0755 root root + /etc/cron.d/yearly 0755 root root + /var/spool/cron 0755 root root" +conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" +replaces="cron-daemon>=0" +provides="cron-daemon-0" +systemd_services="cronie.service on" short_desc="Runs specified programs at scheduled times" maintainer="Juan RP " homepage="https://fedorahosted.org/cronie/" @@ -22,20 +33,3 @@ post_install() { touch ${DESTDIR}/etc/cron.deny chmod 644 ${DESTDIR}/etc/cron.deny } - -cronie_package() { - make_dirs=" - /etc/cron.d/daily 0755 root root - /etc/cron.d/weekly 0755 root root - /etc/cron.d/monthly 0755 root root - /etc/cron.d/yearly 0755 root root - /var/spool/cron 0755 root root" - conf_files="/etc/crontab /etc/pam.d/crond /etc/cron.deny" - replaces="cron-daemon>=0" - provides="cron-daemon-0" - systemd_services="cronie.service on" - depends="run-parts" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cross-arm-linux-gnueabihf/template b/srcpkgs/cross-arm-linux-gnueabihf/template index 38202f45d1..a098d56659 100644 --- a/srcpkgs/cross-arm-linux-gnueabihf/template +++ b/srcpkgs/cross-arm-linux-gnueabihf/template @@ -38,6 +38,8 @@ checksum=" create_wrksrc=yes makedepends="perl flex" +depends="${pkgname}-libc-${version}_${revision}" +nostrip_files="libgcc.a libgcov.a libgcc_eh.a" only_for_archs="i686 x86_64" _CROSS_TARGET=${_triplet} @@ -289,7 +291,6 @@ do_clean() { rm -rf /usr/libexec/gcc/${_CROSS_TARGET} } -# Packages cross-arm-linux-gnueabihf-libc_package() { short_desc+=" - glibc files" noarch=yes @@ -303,11 +304,3 @@ cross-arm-linux-gnueabihf-libc_package() { ${DESTDIR}/usr/${_CROSS_TARGET}/usr } } - -cross-arm-linux-gnueabihf_package() { - depends="${pkgname}-libc-${version}_${revision}" - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cross-arm-linux-musleabi/template b/srcpkgs/cross-arm-linux-musleabi/template index 6080407a3e..665673ac88 100644 --- a/srcpkgs/cross-arm-linux-musleabi/template +++ b/srcpkgs/cross-arm-linux-musleabi/template @@ -38,6 +38,8 @@ checksum=" create_wrksrc=yes hostmakedepends="perl flex" +nostrip_files="libgcc.a libgcov.a libgcc_eh.a" +depends="${pkgname}-libc-${version}_${revision}" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -241,11 +243,3 @@ cross-arm-linux-musleabi-libc_package() { vmove usr/${_CROSS_TARGET} } } - -cross-arm-linux-musleabi_package() { - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - depends="${pkgname}-libc-${version}_${revision}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cross-i686-linux-musl/template b/srcpkgs/cross-i686-linux-musl/template index 9e83d7fe93..c09e56c15d 100644 --- a/srcpkgs/cross-i686-linux-musl/template +++ b/srcpkgs/cross-i686-linux-musl/template @@ -36,6 +36,8 @@ checksum=" create_wrksrc=yes hostmakedepends="perl flex" +nostrip_files="libgcc.a libgcov.a libgcc_eh.a" +depends="${pkgname}-libc-${version}_${revision}" if [ "$CROSS_BUILD" ]; then makedepends="libfl-devel" @@ -243,11 +245,3 @@ cross-i686-linux-musl-libc_package() { vmove usr/${_CROSS_TARGET} } } - -cross-i686-linux-musl_package() { - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - depends="${pkgname}-libc-${version}_${revision}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cross-i686-pc-linux-gnu/template b/srcpkgs/cross-i686-pc-linux-gnu/template index 4d256182a1..da40ae5ad4 100644 --- a/srcpkgs/cross-i686-pc-linux-gnu/template +++ b/srcpkgs/cross-i686-pc-linux-gnu/template @@ -38,6 +38,8 @@ checksum=" only_for_archs="x86_64" create_wrksrc=yes makedepends="perl flex" +depends="${pkgname}-libc-${version}_${revision}" +nostrip_files="libgcc.a libgcov.a libgcc_eh.a" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -288,11 +290,3 @@ cross-i686-pc-linux-gnu-libc_package() { vmove usr/${_CROSS_TARGET} } } - -cross-i686-pc-linux-gnu_package() { - depends="${pkgname}-libc-${version}_${revision}" - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cross-mips-softfloat-linux-gnu/template b/srcpkgs/cross-mips-softfloat-linux-gnu/template index 7979b366c3..e88cfa611c 100644 --- a/srcpkgs/cross-mips-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mips-softfloat-linux-gnu/template @@ -39,6 +39,8 @@ checksum=" create_wrksrc=yes disable_debug=yes makedepends="perl flex" +depends="${pkgname}-libc-${version}_${revision}" +nostrip_files="libgcc.a libgcov.a libgcc_eh.a" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -280,11 +282,3 @@ cross-mips-softfloat-linux-gnu-libc_package() { vmove usr/${_CROSS_TARGET} } } - -cross-mips-softfloat-linux-gnu_package() { - depends="${pkgname}-libc-${version}_${revision}" - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template index 6f29a4b38b..a5e23d1519 100644 --- a/srcpkgs/cross-mipsel-softfloat-linux-gnu/template +++ b/srcpkgs/cross-mipsel-softfloat-linux-gnu/template @@ -39,6 +39,8 @@ checksum=" create_wrksrc=yes disable_debug=yes makedepends="perl flex" +depends="${pkgname}-libc-${version}_${revision}" +nostrip_files="libgcc.a libgcov.a libgcc_eh.a" _CROSS_TARGET=${_triplet} _CROSS_SYSROOT="/usr/${_CROSS_TARGET}" @@ -280,11 +282,3 @@ cross-mipsel-softfloat-linux-gnu-libc_package() { vmove usr/${_CROSS_TARGET} } } - -cross-mipsel-softfloat-linux-gnu_package() { - depends="${pkgname}-libc-${version}_${revision}" - nostrip_files="libgcc.a libgcov.a libgcc_eh.a" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cross-vpkg-dummy/template b/srcpkgs/cross-vpkg-dummy/template index 45fc7a93de..165323db27 100644 --- a/srcpkgs/cross-vpkg-dummy/template +++ b/srcpkgs/cross-vpkg-dummy/template @@ -9,12 +9,10 @@ license="Public domain" homepage="http://www.voidlinux.eu" noarch=yes - -cross-vpkg-dummy_package() { - depends="base-directories xbps-triggers" - provides="binutils-2.23.51.0.3 bash-4.2 coreutils-8.17 diffutils-3.2 - fakeroot-1.18.4_1 findutils-4.4.2 gawk-4.0.0 libgcc-4.7.2 libstdc++-4.7.2 - libstdc++-devel-4.7.2 gcc-4.7.2 gcc-c++-4.7.2 gettext-0.18.1.1 - glibc-2.17 glibc-devel-2.17 musl-0.9.9 grep-2.10 gzip-1.4 m4-1.4.16 make-3.82 - patch-2.7.1 sed-4.2.1 tar-1.26 texinfo-4.13a util-linux-2.21 xz-5.0.4" -} +depends="base-directories xbps-triggers" +provides=" + binutils-2.23.51.0.3 bash-4.2 coreutils-8.17 diffutils-3.2 + fakeroot-1.18.4_1 findutils-4.4.2 gawk-4.0.0 libgcc-4.7.2 libstdc++-4.7.2 + libstdc++-devel-4.7.2 gcc-4.7.2 gcc-c++-4.7.2 gettext-0.18.1.1 + glibc-2.17 glibc-devel-2.17 musl-0.9.9 grep-2.10 gzip-1.4 m4-1.4.16 make-3.82 + patch-2.7.1 sed-4.2.1 tar-1.26 texinfo-4.13a util-linux-2.21 xz-5.0.4" diff --git a/srcpkgs/crypto++/template b/srcpkgs/crypto++/template index d4f1587b20..ec500d90b1 100644 --- a/srcpkgs/crypto++/template +++ b/srcpkgs/crypto++/template @@ -37,9 +37,3 @@ crypto++-devel_package() { vmove usr/lib/pkgconfig } } - -crypto++_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cryptsetup/template b/srcpkgs/cryptsetup/template index e346362891..f0ac2ed466 100644 --- a/srcpkgs/cryptsetup/template +++ b/srcpkgs/cryptsetup/template @@ -36,9 +36,3 @@ cryptsetup-devel_package() { vmove "usr/lib/*.so" } } - -cryptsetup_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template index 21da89d58e..175675d99a 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -8,6 +8,9 @@ hostmakedepends="pkg-config" makedepends="lcms2-devel libpng-devel>=1.6 libqpdf-devel poppler-cpp-devel>=0.24.1 fontconfig-devel avahi-glib-libs-devel ghostscript-devel cups-devel ghostscript poppler-utils" +depends="ghostscript poppler-utils" +conf_files="/etc/cups/cups-browsed.conf" +systemd_services="cups-browsed.service on" short_desc="The OpenPrinting CUPS Filters" maintainer="Juan RP " license="GPL-2, LGPL-2.1, MIT" @@ -25,12 +28,3 @@ post_install() { vinstall utils/cups-browsed.service 644 usr/lib/systemd/system chgrp -R lp ${DESTDIR}/etc/cups } - -cups-filters_package() { - conf_files="/etc/cups/cups-browsed.conf" - systemd_services="cups-browsed.service on" - depends="ghostscript poppler-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index e30ac8a62b..13b0e43739 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -14,6 +14,22 @@ hostmakedepends="automake pkg-config poppler-utils" makedepends="acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel openssl-devel pam-devel mit-krb5-devel poppler-devel libusb-devel avahi-libs-devel systemd-devel gnutls-devel>=3.1.5 bc" +depends="libcups>=${version}_${revision} cups-filters bc" +systemd_services="cups.socket on" +conf_files=" + /etc/cups/cupsd.conf + /etc/cups/snmp.conf + /etc/cups/printers.conf + /etc/cups/classes.conf + /etc/cups/subscriptions.conf + /etc/dbus-1/system.d/cups.conf + /etc/pam.d/cups" +make_dirs=" + /var/cache/cups/rss 0750 root lp + /var/run/cups/certs 0750 root lp + /var/log/cups 0750 root root + /var/spool/cups 0755 root lp + /etc/cups/ssl 0700 root lp" pre_configure() { aclocal -I config-scripts @@ -91,25 +107,3 @@ cups-devel_package() { vmove "usr/lib/*.so" } } - -cups_package() { - systemd_services="cups.socket on" - conf_files=" - /etc/cups/cupsd.conf - /etc/cups/snmp.conf - /etc/cups/printers.conf - /etc/cups/classes.conf - /etc/cups/subscriptions.conf - /etc/dbus-1/system.d/cups.conf - /etc/pam.d/cups" - make_dirs=" - /var/cache/cups/rss 0750 root lp - /var/run/cups/certs 0750 root lp - /var/log/cups 0750 root root - /var/spool/cups 0755 root lp - /etc/cups/ssl 0700 root lp" - depends="libcups>=${version}_${revision} cups-filters bc" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template index 6c9abe6351..98702e04d2 100644 --- a/srcpkgs/curl/template +++ b/srcpkgs/curl/template @@ -8,6 +8,7 @@ configure_args="--disable-ldaps --with-gssapi=/usr --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" hostmakedepends="pkg-config perl groff" makedepends="libidn-devel openssl-devel mit-krb5-devel" +depends="ca-certificates" short_desc="Client that groks URLs" maintainer="Juan RP " license="MIT" @@ -35,10 +36,3 @@ libcurl-devel_package() { vmove usr/share/man/man3 } } - -curl_package() { - depends="ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/curlftpfs/template b/srcpkgs/curlftpfs/template index 6a0e123776..160c903104 100644 --- a/srcpkgs/curlftpfs/template +++ b/srcpkgs/curlftpfs/template @@ -21,9 +21,3 @@ long_desc=" automatically reconnection if the server times out transform absolute symlinks to point back into the ftp file system " - -curlftpfs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cvs/template b/srcpkgs/cvs/template index 0ff72dc52b..2d134d8887 100644 --- a/srcpkgs/cvs/template +++ b/srcpkgs/cvs/template @@ -7,6 +7,7 @@ configure_args="--with-editor=/usr/bin/vi --with-external-zlib cvs_cv_func_printf_ptr=yes ac_cv_func_malloc_0_nonnull=yes" hostmakedepends="nvi openssh" makedepends="mit-krb5-devel openssh" +depends="openssh>=6.1p1" short_desc="Concurrent Versions System" maintainer="Juan RP " homepage="http://www.nongnu.org/cvs/" @@ -21,10 +22,3 @@ long_desc=" CVS is a production quality system in wide use around the world, including many free software projects." - -cvs_package() { - depends="openssh>=6.1p1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cvs2svn/template b/srcpkgs/cvs2svn/template index 7ec256c428..b5848ee374 100644 --- a/srcpkgs/cvs2svn/template +++ b/srcpkgs/cvs2svn/template @@ -6,9 +6,11 @@ XBPS_FETCH_CMD="wget" pkgname=cvs2svn version=2.3.0 revision=2 +noarch="yes" build_style=gnu-makefile make_build_args="man" makedepends="wget cvs python" +depends="cvs python>=0" short_desc="CVS to Subversion, git and bazaar repository conversion tool" maintainer="Juan RP " homepage="http://cvs2svn.tigris.org/" @@ -33,11 +35,3 @@ post_install() { install -m644 *.1 ${DESTDIR}/usr/share/man/man1 vinstall COPYING 644 usr/share/licenses/cvs2svn } - -cvs2svn_package() { - depends="cvs python>=0" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/cwm-git/template b/srcpkgs/cwm-git/template index bf71094287..998bb77c63 100644 --- a/srcpkgs/cwm-git/template +++ b/srcpkgs/cwm-git/template @@ -24,9 +24,3 @@ pre_build() { post_install() { vinstall README 644 usr/share/doc/${pkgname} } - -cwm-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/cyrus-sasl/template b/srcpkgs/cyrus-sasl/template index 9db270f072..44f66d59d6 100644 --- a/srcpkgs/cyrus-sasl/template +++ b/srcpkgs/cyrus-sasl/template @@ -26,6 +26,8 @@ disable_parallel_build=yes hostmakedepends="groff" makedepends="openssl-devel db-devel>=5.3 libldap-devel mit-krb5-devel pam-devel postgresql-libs-devel libmysqlclient-devel>=5.5.27 sqlite-devel" +depends="libsasl>=${version}" +systemd_services="saslauthd.service on" do_configure() { ./configure ${configure_args} --disable-static --enable-shared \ @@ -91,11 +93,3 @@ cyrus-sasl-modules_package() { vmove usr/lib/sasl2 } } - -cyrus-sasl_package() { - systemd_services="saslauthd.service on" - depends="libsasl>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/damageproto/template b/srcpkgs/damageproto/template index e4f7db01a6..2271be9d38 100644 --- a/srcpkgs/damageproto/template +++ b/srcpkgs/damageproto/template @@ -1,21 +1,12 @@ # Template build file 'damageproto'. pkgname=damageproto version=1.2.1 -build_style=gnu-configure revision=1 +noarch="yes" +build_style=gnu-configure short_desc="Damage extension headers from modular X.org" maintainer="Juan RP " homepage="${XORG_HOME}" license="custom" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=5c7c112e9b9ea8a9d5b019e5f17d481ae20f766cb7a4648360e7c1b46fc9fc5b -long_desc=" - This package contains header files and documentation for the X Damage - extension of X RandR. This is from the modular X.org X11 project." - -damageproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/darkice/template b/srcpkgs/darkice/template index f1194fdc69..dcea61cb92 100644 --- a/srcpkgs/darkice/template +++ b/srcpkgs/darkice/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure makedepends="pkg-config lame-devel libogg-devel libvorbis-devel faac-devel alsa-lib-devel pulseaudio-devel jack-devel libsamplerate-devel" +conf_files="/etc/darkice.cfg" short_desc="A live audio streamer source client for icecast" maintainer="davehome " license="GPL-3" @@ -14,11 +15,3 @@ checksum=170342cb4dbb0b44a62e37d0db1515fa7799c410fc4995bf8f32aaa6614f5f79 long_desc=" DarkIce is a live audio streamer. It records audio from an audio interface (e.g. sound card), encodes it and sends it to a streaming server." - -darkice_package() { - conf_files="/etc/darkice.cfg" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/dash/template b/srcpkgs/dash/template index 2d7b806782..a07e7ad4e4 100644 --- a/srcpkgs/dash/template +++ b/srcpkgs/dash/template @@ -4,6 +4,8 @@ version=0.5.7 revision=7 build_style=gnu-configure hostmakedepends="bison coreutils" +depends="coreutils" +register_shell="/bin/sh" short_desc="POSIX-compliant Unix shell, much smaller than GNU bash" maintainer="Juan RP " homepage="http://gondor.apana.org.au/~herbert/dash/" @@ -14,11 +16,3 @@ checksum=ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39 post_install() { ln -sfr ${DESTDIR}/usr/bin/dash ${DESTDIR}/usr/bin/sh } - -dash_package() { - register_shell="/bin/sh" - depends="coreutils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/db/template b/srcpkgs/db/template index c21d46bd41..2cf6a799da 100644 --- a/srcpkgs/db/template +++ b/srcpkgs/db/template @@ -62,9 +62,3 @@ libdb_package() { vmove "usr/lib/libdb-*.so*" } } - -db_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template index 480e5b297d..8763c7d9dd 100644 --- a/srcpkgs/dbus-glib/template +++ b/srcpkgs/dbus-glib/template @@ -36,9 +36,3 @@ dbus-glib-devel_package() { vmove usr/lib/pkgconfig } } - -dbus-glib_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dbus-python/template b/srcpkgs/dbus-python/template index c963cab1ed..6f7283078d 100644 --- a/srcpkgs/dbus-python/template +++ b/srcpkgs/dbus-python/template @@ -4,6 +4,8 @@ version=1.2.0 revision=1 hostmakedepends="pkg-config" makedepends="glib-devel dbus-glib-devel python-devel python3-devel>=3.3.2_2" +depends="python" +pycompile_module="dbus" short_desc="D-Bus Python bindings" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -33,9 +35,6 @@ do_install() { cd $wrksrc/build-python2 make DESTDIR=${DESTDIR} install - cd $wrksrc/build-python3 - make DESTDIR=${DESTDIR}/python3 install - rm -rf ${DESTDIR}/usr/share/doc } @@ -55,16 +54,7 @@ dbus-python3_package() { short_desc="D-Bus Python3 bindings" depends="python3" pkg_install() { - vmkdir usr/lib - mv ${DESTDIR}/python3/usr/lib/python3.3 ${PKGDESTDIR}/usr/lib - } -} - -dbus-python_package() { - pycompile_module="dbus" - depends="python" - pkg_install() { - rm -rf ${DESTDIR}/python3 - vmove all + cd $wrksrc/build-python3 + make DESTDIR=${PKGDESTDIR} install } } diff --git a/srcpkgs/dbus-sharp/template b/srcpkgs/dbus-sharp/template index 4d82974fcd..f11fff7fb3 100644 --- a/srcpkgs/dbus-sharp/template +++ b/srcpkgs/dbus-sharp/template @@ -2,11 +2,13 @@ pkgname=dbus-sharp version=0.7 revision=1 +noarch="yes" distfiles="https://github.com/mono/dbus-sharp/archive/v${version}.tar.gz" checksum="535360a164b62bd629f7ca7396a0dcfb143e05287ac2cc95ab4387bd81dd6d58" build_style=gnu-configure hostmakedepends="pkg-config automake" makedepends="mono" +depends="${makedepends}" maintainer="Steven R " homepage="http://github.com/mono/dbus-sharp/" license="Custom" @@ -15,11 +17,3 @@ short_desc="C# implementation of D-Bus" pre_configure() { ./autogen.sh } - -dbus-sharp_package() { - noarch="yes" - depends="mono" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dbus/template b/srcpkgs/dbus/template index 9571d5ae0e..6792c6f116 100644 --- a/srcpkgs/dbus/template +++ b/srcpkgs/dbus/template @@ -19,6 +19,7 @@ checksum=" create_wrksrc=yes hostmakedepends="pkg-config intltool gperf" makedepends="expat-devel libX11-devel libcap-devel" +conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" if [ "$CROSS_BUILD" ]; then _systemddir="$XBPS_CROSS_BASE" @@ -151,10 +152,3 @@ dbus-x11_package() { vmove usr/share/man/man1/dbus-launch.1 } } - -dbus_package() { - conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dconf/template b/srcpkgs/dconf/template index 3b9c34965e..2d6218bef0 100644 --- a/srcpkgs/dconf/template +++ b/srcpkgs/dconf/template @@ -36,9 +36,3 @@ dconf-editor_package() { vmove usr/share/man/man1/dconf-editor.1 } } - -dconf_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dcron/template b/srcpkgs/dcron/template index ab8b33199f..6ff1727733 100644 --- a/srcpkgs/dcron/template +++ b/srcpkgs/dcron/template @@ -2,6 +2,10 @@ pkgname=dcron version=4.5 revision=19 +conf_files="/var/spool/cron/root" +replaces="cron-daemon>=0" +provides="cron-daemon-0" +systemd_services="dcron.service on" short_desc="Dillon's lightweight cron daemon" maintainer="Juan RP " homepage="http://www.jimpryor.net/linux/dcron.html" @@ -34,15 +38,3 @@ do_install() { # crontab must be setuid for all users to work! chmod 4755 ${DESTDIR}/usr/bin/crontab } - -dcron_package() { - conf_files="/var/spool/cron/root" - replaces="cron-daemon>=0" - provides="cron-daemon-0" - systemd_services="dcron.service on" - pkg_install() { - vmove etc - vmove usr - vmove var - } -} diff --git a/srcpkgs/ddrescue/template b/srcpkgs/ddrescue/template index 1ada024271..1d6c5f4c43 100644 --- a/srcpkgs/ddrescue/template +++ b/srcpkgs/ddrescue/template @@ -14,9 +14,3 @@ checksum=bef96c181b031cc7de9d02c0aec2e8dbf860d149fa2f35f967448a48ffd2752f do_configure() { ./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" } - -ddrescue_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index e684ef322d..af98066fa1 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -9,6 +9,7 @@ makedepends="pkg-config intltool gtk+3-devel libSM-devel libICE-devel libjpeg-turbo-devel libpng-devel libmad-devel libflac-devel wavpack-devel libsndfile-devel libcdio-devel libcddb-devel libX11-devel dbus-devel pulseaudio-devel faad2-devel libsamplerate-devel yasm" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Ultimate Music Player For GNU/Linux" maintainer="davehome " license="GPL-2,LGPL-2.1" @@ -21,10 +22,3 @@ post_install() { # Remove devel stuff. rm -rf ${DESTDIR}/usr/include } - -deadbeef_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/deheader/template b/srcpkgs/deheader/template index 31af088a61..aa0c37a023 100644 --- a/srcpkgs/deheader/template +++ b/srcpkgs/deheader/template @@ -2,7 +2,9 @@ pkgname=deheader version=0.6 revision=2 +noarch="yes" makedepends="python" +depends="python" short_desc="C and C++ header analyzer" homepage="http://www.catb.org/~esr/deheader/" license="BSD" @@ -16,16 +18,6 @@ long_desc=" sometimes exposes dependencies and cohesions of which developers were unaware." do_install() { - install -d ${DESTDIR}/usr/bin - install -d ${DESTDIR}/usr/share/man/man1 - install -m755 deheader ${DESTDIR}/usr/bin - install -m644 deheader.1 ${DESTDIR}/usr/share/man/man1 -} - -deheader_package() { - depends="python" - noarch="yes" - pkg_install() { - vmove usr - } + vinstall deheader 755 usr/bin + vinstall deheader.1 644 usr/share/man/man1 } diff --git a/srcpkgs/dejavu-fonts-ttf/template b/srcpkgs/dejavu-fonts-ttf/template index 299d1eebdb..b279da199a 100644 --- a/srcpkgs/dejavu-fonts-ttf/template +++ b/srcpkgs/dejavu-fonts-ttf/template @@ -10,6 +10,9 @@ distfiles="${SOURCEFORGE_SITE}/dejavu/$pkgname-$version.tar.bz2" checksum=d0a72c3ae99f5b8d7470daf091ec43f78dc942795aed5c996ab1aa678702eb5d makedepends="font-util xbps-triggers>=0.58" +depends="${makedepends}" +noarch="yes" +font_dirs="/usr/share/fonts/TTF" do_install() { vmkdir usr/share/fonts/TTF @@ -19,12 +22,3 @@ do_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -dejavu-fonts-ttf_package() { - depends="${makedepends}" - noarch="yes" - font_dirs="/usr/share/fonts/TTF" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/desktop-file-utils/template b/srcpkgs/desktop-file-utils/template index 10ea86eb77..15c5d7dec2 100644 --- a/srcpkgs/desktop-file-utils/template +++ b/srcpkgs/desktop-file-utils/template @@ -16,9 +16,3 @@ long_desc=" with desktop entries and the applications database. More specifically, it contains the update-desktop-database utility, used to rebuild the database that connects MIME types to applications." - -desktop-file-utils_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/desmume/template b/srcpkgs/desmume/template index d493c243eb..05b1bb7511 100644 --- a/srcpkgs/desmume/template +++ b/srcpkgs/desmume/template @@ -7,6 +7,7 @@ configure_args="--enable-wifi --enable-hud --disable-openal" hostmakedepends="pkg-config intltool" makedepends="SDL-devel libpcap-devel soundtouch-devel alsa-lib-devel gtk+-devel agg-devel zziplib-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="Nintendo DS emulator" maintainer="Juan RP " license="GPL-2" @@ -22,10 +23,3 @@ fi pre_configure() { sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in } - -desmume_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dev86/template b/srcpkgs/dev86/template index 2f0b62c2e4..d6036315ee 100644 --- a/srcpkgs/dev86/template +++ b/srcpkgs/dev86/template @@ -2,7 +2,9 @@ pkgname=dev86 version=0.16.19 revision=1 +nostrip=yes makedepends="bin86" +depends="${makedepends}" short_desc="8086 cross development compiler, assembler and linker" homepage="http://www.debath.co.uk/dev86/" license="GPL+, GPL-2+, LGPL-2+" @@ -29,11 +31,3 @@ do_install() { rm -f ${DESTDIR}/usr/bin/{as,ld,nm,objdump,size}86 rm -f ${DESTDIR}/usr/share/man/man1/{as,ld}86.1 } - -dev86_package() { - depends="bin86" - nostrip=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index 33643ce90d..0a3807264b 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -41,9 +41,3 @@ devhelp-gedit-plugin_package() { vmove usr/lib/gedit } } - -devhelp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dgen-sdl/template b/srcpkgs/dgen-sdl/template index afea4c66d7..6f56269a8c 100644 --- a/srcpkgs/dgen-sdl/template +++ b/srcpkgs/dgen-sdl/template @@ -14,9 +14,3 @@ checksum=efc61733dae4f5f5e74930a25f5632ff5732ecbcabf50f189c10e5e024c5fb45 post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -dgen-sdl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dhcpcd-dbus/template b/srcpkgs/dhcpcd-dbus/template index 85def49e1a..f5f658801d 100644 --- a/srcpkgs/dhcpcd-dbus/template +++ b/srcpkgs/dhcpcd-dbus/template @@ -3,7 +3,9 @@ pkgname=dhcpcd-dbus version=0.4.2 revision=3 build_style=gnu-makefile -makedepends="pkg-config dbus-devel dhcpcd dbus" +hostmakedepends="pkg-config" +makedepends="dbus-devel dhcpcd dbus" +depends="dhcpcd dbus" short_desc="dhcpcd D-Bus interface" homepage="http://roy.marples.name/projects/dhcpcd-dbus" license="BSD" @@ -13,11 +15,3 @@ checksum=beaf6c45b0066530576d44357ae8a4b32dd036c200910eb5ca5364dc8d4dc996 long_desc=" dhcpcd-dbus is the dhcpcd D-Bus interface, receives interface configuration events from the dhcpcd control socket and emits them to the DBus listeners." - -dhcpcd-dbus_package() { - depends="dhcpcd dbus" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template index 5d4fd817f3..ac9a6dd1ae 100644 --- a/srcpkgs/dhcpcd-gtk/template +++ b/srcpkgs/dhcpcd-gtk/template @@ -6,6 +6,7 @@ wrksrc=dhcpcd-ui-${version} build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel libnotify-devel dbus-devel dhcpcd dhcpcd-dbus" +depends="dhcpcd dhcpcd-dbus" short_desc="GTK+ monitor and configuration GUI for dhcpcd" homepage="http://roy.marples.name/projects/dhcpcd-ui" license="BSD" @@ -24,10 +25,3 @@ long_desc=" A drop down menu shows available Access Points, which one your connected to, if they're encrypted or not and their overall quality. You can click on one to configure the PSK or WEP key 0 for it." - -dhcpcd-gtk_package() { - depends="dhcpcd dhcpcd-dbus" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index f873dec17d..b4d4f8efb9 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -6,6 +6,7 @@ build_style=configure configure_args="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --rundir=/run" hostmakedepends="which ntp" +conf_files="/etc/dhcpcd.conf" short_desc="RFC2131 compliant DHCP client" maintainer="Juan RP " license="Simplified BSD" @@ -18,10 +19,3 @@ post_install() { vinstall ${FILESDIR}/dhcpcd.service 644 usr/lib/systemd/system vinstall ${FILESDIR}/dhcpcd@.service 644 usr/lib/systemd/system } - -dhcpcd_package() { - conf_files="/etc/dhcpcd.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dialog/template b/srcpkgs/dialog/template index eca569b2a6..1b36b0fa73 100644 --- a/srcpkgs/dialog/template +++ b/srcpkgs/dialog/template @@ -20,9 +20,3 @@ long_desc=" these types of dialog boxes are implemented: yes/no box, menu box, input box, message box, text box, info box, guage box, checklist box, and radiolist box." - -dialog_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/diffutils/template b/srcpkgs/diffutils/template index f58051246c..7c219e4a2b 100644 --- a/srcpkgs/diffutils/template +++ b/srcpkgs/diffutils/template @@ -3,6 +3,7 @@ pkgname=diffutils version=3.3 revision=1 build_style=gnu-configure +conflicts="chroot-diffutils>=0" short_desc="The GNU diff utilities" maintainer="Juan RP " homepage="http://www.gnu.org/software/diffutils" @@ -14,10 +15,3 @@ long_desc=" features are a superset of the Unix features and they are significantly faster. Cmp has been moved into this package from the GNU textutils package. These programs are usually used for creating patch files." - -diffutils_package() { - conflicts="chroot-diffutils>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/distcc/template b/srcpkgs/distcc/template index 62f7935123..f7eb6e0923 100644 --- a/srcpkgs/distcc/template +++ b/srcpkgs/distcc/template @@ -5,6 +5,10 @@ revision=5 build_style=gnu-configure configure_args="--disable-Werror" makedepends="pkg-config python-devel popt-devel avahi-libs-devel" +conflicts="chroot-distcc>=0" +conf_files=" + /etc/distcc/hosts + /etc/distcc/clients.allow" short_desc="Distributed compilation for faster C/C++ builds" maintainer="pancake " homepage="http://code.google.com/p/distcc" @@ -30,7 +34,7 @@ post_install() { distcc-pump_package() { depends="distcc-${version}_${revision}" - short_desc="${short_desc} -- Pump mode support files" + short_desc+=" - Pump mode support files" pycompile_module="include_server" pkg_install() { vmove usr/bin/pump @@ -40,14 +44,3 @@ distcc-pump_package() { vmove usr/share/doc/distcc/README.pump } } - -distcc_package() { - conflicts="chroot-distcc>=0" - conf_files=" - /etc/distcc/hosts - /etc/distcc/clients.allow" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/djmount/template b/srcpkgs/djmount/template index 785d9434c6..0b4a479613 100644 --- a/srcpkgs/djmount/template +++ b/srcpkgs/djmount/template @@ -23,9 +23,3 @@ do_install() { vinstall djmount/djmount 755 usr/bin vinstall djmount.1 644 usr/share/man/man1 } - -djmount_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/djvulibre/template b/srcpkgs/djvulibre/template index 4e3c8d330c..c1df80f164 100644 --- a/srcpkgs/djvulibre/template +++ b/srcpkgs/djvulibre/template @@ -27,10 +27,3 @@ djvulibre-devel_package() { vmove usr/lib/pkgconfig } } - -djvulibre_package() { - pkg_install() { - vmove usr/bin - vmove usr/share - } -} diff --git a/srcpkgs/dkms/template b/srcpkgs/dkms/template index 05a076d62a..5730cdd84b 100644 --- a/srcpkgs/dkms/template +++ b/srcpkgs/dkms/template @@ -2,6 +2,9 @@ pkgname=dkms version=2.2.0.3 revision=5 +noarch="yes" +conf_files="/etc/dkms/framework.conf" +depends="bash kmod gcc make coreutils linux-headers" homepage="http://linux.dell.com/dkms" distfiles="${homepage}/permalink/dkms-$version.tar.gz" short_desc="Dynamic Kernel Modules System" @@ -25,12 +28,3 @@ do_install() { vinstall ${FILESDIR}/kernel.d/dkms.prerm 750 \ etc/kernel.d/pre-remove 20-dkms } - -dkms_package() { - conf_files="/etc/dkms/framework.conf" - noarch="yes" - depends="bash kmod gcc make coreutils linux-headers" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index d41f07128f..f313a6b189 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -17,6 +17,7 @@ elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then fi hostmakedepends="unzip" +depends="libphobos>=${version} gcc" do_build() { cd src @@ -69,10 +70,3 @@ libphobos_package() { vinstall ${wrksrc}/src/druntime/LICENSE 644 usr/share/licenses/libphobos } } - -dmd_package() { - depends="libphobos>=${version} gcc" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dmenu/template b/srcpkgs/dmenu/template index 30ea8d4330..a9a8453001 100644 --- a/srcpkgs/dmenu/template +++ b/srcpkgs/dmenu/template @@ -30,9 +30,3 @@ do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -dmenu_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dmidecode/template b/srcpkgs/dmidecode/template index 7a47f1eea8..99394068ae 100644 --- a/srcpkgs/dmidecode/template +++ b/srcpkgs/dmidecode/template @@ -21,9 +21,3 @@ long_desc=" This will often include usage status for the CPU sockets, expansion slots (e.g. AGP, PCI, ISA) and memory module slots, and the list of I/O ports (e.g. serial, parallel, USB)." - -dmidecode_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dmraid/template b/srcpkgs/dmraid/template index 1aa6102ac3..295810f8c4 100644 --- a/srcpkgs/dmraid/template +++ b/srcpkgs/dmraid/template @@ -9,6 +9,8 @@ build_wrksrc="${_distver}-${_patchver}/${pkgname}" build_style=gnu-configure configure_args="--enable-led --enable-intel_led --enable-shared_lib" makedepends="device-mapper-devel>=2.02.95_3" +systemd_services="dmraid.service off" +depends="device-mapper>=2.02.95_3" short_desc="Device mapper RAID interface" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -38,11 +40,3 @@ post_install() { # systemd service. vinstall ${FILESDIR}/dmraid.service 644 usr/lib/systemd/system } - -dmraid_package() { - systemd_services="dmraid.service off" - depends="device-mapper>=2.02.95_3" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dmxproto/template b/srcpkgs/dmxproto/template index 0e445707a3..2905a22d73 100644 --- a/srcpkgs/dmxproto/template +++ b/srcpkgs/dmxproto/template @@ -1,21 +1,15 @@ # Template build file for 'dmxproto'. pkgname=dmxproto version=2.3 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +noarch="yes" +build_style=gnu-configure short_desc="Distributed Multi-headed X protocol headers from modular X.org" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=3a882ca43a1f359e3489468e6c407fd7d56d559f8895cf096a2ec877d6c403b0 long_desc=" Distributed Multi-headed X protocol headers from modular X.org: your networked Xinerama." - -dmxproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index f004f28917..166c261306 100644 --- a/srcpkgs/dnsmasq/template +++ b/srcpkgs/dnsmasq/template @@ -4,6 +4,8 @@ version=2.67 revision=1 hostmakedepends="pkg-config" makedepends="dbus-devel libcap-devel libidn-devel" +conf_files="/etc/dnsmasq.conf" +system_accounts="dnsmasq" short_desc="Lightweight, easy to configure DNS forwarder and DHCP server" maintainer="Juan RP " license="GPL-2" @@ -31,11 +33,3 @@ do_install() { vinstall ${FILESDIR}/dnsmasq.service 644 usr/lib/systemd/system vinstall dbus/dnsmasq.conf 644 etc/dbus-1/system.d } - -dnsmasq_package() { - conf_files="/etc/dnsmasq.conf" - system_accounts="dnsmasq" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/docbook-dsssl/template b/srcpkgs/docbook-dsssl/template index f0cb92fa4b..c147272e09 100644 --- a/srcpkgs/docbook-dsssl/template +++ b/srcpkgs/docbook-dsssl/template @@ -2,7 +2,10 @@ pkgname=docbook-dsssl version=1.79 revision=1 +noarch="yes" makedepends="xmlcatmgr docbook-xml>=4.2" +depends="${makedepends}" +sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --" short_desc="DSSSL stylesheets for the DocBook DTD" maintainer="Juan RP " homepage="http://www.docbook.org/" @@ -25,12 +28,3 @@ do_install() { install -d ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular cp -rp ${wrksrc}/* ${DESTDIR}/usr/share/sgml/docbook/dsssl/modular } - -docbook-dsssl_package() { - depends="${makedepends}" - noarch="yes" - sgml_entries="CATALOG /usr/share/sgml/docbook/dsssl/modular/catalog --" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/docbook-xml/template b/srcpkgs/docbook-xml/template index 3afcb5ea7b..edaf241b65 100644 --- a/srcpkgs/docbook-xml/template +++ b/srcpkgs/docbook-xml/template @@ -2,17 +2,30 @@ pkgname=docbook-xml version=4.5 revision=2 +noarch="yes" wrksrc="docbook" +makedepends="bsdtar xmlcatmgr" +depends="xmlcatmgr" +xml_entries=" + rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2 + rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3 + rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4 + rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5 + rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2 + nextCatalog /usr/share/xml/docbook/4.2/catalog -- + nextCatalog /usr/share/xml/docbook/4.3/catalog -- + nextCatalog /usr/share/xml/docbook/4.4/catalog -- + nextCatalog /usr/share/xml/docbook/4.5/catalog -- + nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --" +homepage="http://www.oasis-open.org/docbook/" +license="MIT" +short_desc="XML DTD designed for computer documentation" +maintainer="Juan RP " distfiles=" http://www.oasis-open.org/docbook/xml/$version/$pkgname-$version.zip http://www.oasis-open.org/docbook/xml/4.4/$pkgname-4.4.zip http://www.oasis-open.org/docbook/xml/4.3/$pkgname-4.3.zip http://www.oasis-open.org/docbook/xml/4.2/$pkgname-4.2.zip" -makedepends="bsdtar xmlcatmgr" -homepage="http://www.oasis-open.org/docbook/" -license="MIT" -short_desc="XML DTD designed for computer documentation" -maintainer="Juan RP " checksum=" 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090 @@ -47,22 +60,3 @@ do_install() { sed -e 's|V4.2|V4.1.2|g' < ${dir}/catalog > ${dir}/catalog-4.1.2 chmod 644 ${dir}/catalog-4.1.2 } - -docbook-xml_package() { - depends="xmlcatmgr" - noarch="yes" - xml_entries=" - rewriteSystem http://www.oasis-open.org/docbook/xml/4.2 /usr/share/xml/docbook/4.2 - rewriteSystem http://www.oasis-open.org/docbook/xml/4.3 /usr/share/xml/docbook/4.3 - rewriteSystem http://www.oasis-open.org/docbook/xml/4.4 /usr/share/xml/docbook/4.4 - rewriteSystem http://www.oasis-open.org/docbook/xml/4.5 /usr/share/xml/docbook/4.5 - rewriteSystem http://www.oasis-open.org/docbook/xml/4.1.2 /usr/share/xml/docbook/4.2 - nextCatalog /usr/share/xml/docbook/4.2/catalog -- - nextCatalog /usr/share/xml/docbook/4.3/catalog -- - nextCatalog /usr/share/xml/docbook/4.4/catalog -- - nextCatalog /usr/share/xml/docbook/4.5/catalog -- - nextCatalog /usr/share/xml/docbook/4.2/catalog-4.1.2 --" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/docbook-xsl/template b/srcpkgs/docbook-xsl/template index cbf7c5d7ec..8dbc144ade 100644 --- a/srcpkgs/docbook-xsl/template +++ b/srcpkgs/docbook-xsl/template @@ -2,7 +2,10 @@ pkgname=docbook-xsl version=1.77.1 revision=2 +noarch="yes" makedepends="xmlcatmgr docbook-xml>=4.2" +depends="${makedepends}" +xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --" short_desc="Docbook XSL modular stylesheet" maintainer="Juan RP " homepage="http://docbook.sourceforge.net/" @@ -36,12 +39,3 @@ do_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -docbook-xsl_package() { - depends="${makedepends}" - noarch="yes" - xml_entries="nextCatalog /usr/share/xsl/docbook/catalog.xml --" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/docbook/template b/srcpkgs/docbook/template index 96622bc591..b0bf8129f4 100644 --- a/srcpkgs/docbook/template +++ b/srcpkgs/docbook/template @@ -1,6 +1,24 @@ # Template file for 'docbook' pkgname=docbook version=4.5 +revision=1 +noarch="yes" +makedepends="bsdtar xmlcatmgr ISOEnts" +depends="xmlcatmgr ISOEnts" +sgml_entries=" + CATALOG /usr/share/sgml/docbook/2.4.1/catalog -- + CATALOG /usr/share/sgml/docbook/3.0/catalog -- + CATALOG /usr/share/sgml/docbook/3.1/catalog -- + CATALOG /usr/share/sgml/docbook/4.0/catalog -- + CATALOG /usr/share/sgml/docbook/4.1/catalog -- + CATALOG /usr/share/sgml/docbook/4.2/catalog -- + CATALOG /usr/share/sgml/docbook/4.3/catalog -- + CATALOG /usr/share/sgml/docbook/4.4/catalog -- + CATALOG /usr/share/sgml/docbook/4.5/catalog --" +short_desc="SGML DTD designed for computer documentation" +homepage="http://www.docbook.org" +license="Copyright only" +maintainer="Juan RP " distfiles=" http://www.docbook.org/sgml/$version/$pkgname-$version.zip http://www.docbook.org/sgml/4.4/$pkgname-4.4.zip @@ -11,12 +29,6 @@ distfiles=" http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip http://www.oasis-open.org/docbook/sgml/2.4.1/docbk241.zip" -makedepends="bsdtar xmlcatmgr ISOEnts" -revision=1 -short_desc="SGML DTD designed for computer documentation" -homepage="http://www.docbook.org" -license="Copyright only" -maintainer="Juan RP " checksum=" 8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43 0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c @@ -56,21 +68,3 @@ do_install() { install -m644 ${FILESDIR}/catalog${vernodot} ${dir}/catalog done } - -docbook_package() { - depends="xmlcatmgr ISOEnts" - noarch="yes" - sgml_entries=" -CATALOG /usr/share/sgml/docbook/2.4.1/catalog -- -CATALOG /usr/share/sgml/docbook/3.0/catalog -- -CATALOG /usr/share/sgml/docbook/3.1/catalog -- -CATALOG /usr/share/sgml/docbook/4.0/catalog -- -CATALOG /usr/share/sgml/docbook/4.1/catalog -- -CATALOG /usr/share/sgml/docbook/4.2/catalog -- -CATALOG /usr/share/sgml/docbook/4.3/catalog -- -CATALOG /usr/share/sgml/docbook/4.4/catalog -- -CATALOG /usr/share/sgml/docbook/4.5/catalog --" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/docbook2x/template b/srcpkgs/docbook2x/template index 02983fff8b..4c34b4b586 100644 --- a/srcpkgs/docbook2x/template +++ b/srcpkgs/docbook2x/template @@ -6,6 +6,10 @@ patch_args="-Np1" wrksrc="docbook2X-${version}" build_style=gnu-configure makedepends="texinfo libxslt docbook docbook-dsssl docbook-xsl perl-XML-SAX" +depends="${makedepends}" +xml_entries=" + nextCatalog /usr/share/docbook2X/dtd/catalog.xml -- + nextCatalog /usr/share/docbook2X/xslt/catalog.xml --" short_desc="DocBook converter to UNIX manpage and GNU Texinfo format" maintainer="Juan RP " homepage="http://docbook2x.sourceforge.net" @@ -19,13 +23,3 @@ long_desc=" post_install() { sed -i -e 's|${prefix}|/usr|g' ${DESTDIR}/usr/bin/* } - -docbook2x_package() { - depends="${makedepends}" - xml_entries=" -nextCatalog /usr/share/docbook2X/dtd/catalog.xml -- -nextCatalog /usr/share/docbook2X/xslt/catalog.xml --" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index af7e6cfa5b..976a824d48 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -8,6 +8,7 @@ makedepends=" zlib-devel glew-devel libusb-devel gtk+-devel miniupnpc-devel>=1.8 SDL2-devel pulseaudio-devel alsa-lib-devel ffmpeg-devel>=2.1 libgomp-devel libopenal-devel soundtouch-devel lzo-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A Gamecube / Wii / Triforce emulator" maintainer="Juan RP " license="GPL-2" @@ -18,10 +19,3 @@ checksum=9ee1cbb671ff45b1d9300f5d726787ccdf06214d0b82c91587890a9bcd3a49c5 post_install() { rm -f ${DESTDIR}/usr/lib/*.a } - -dolphin-emu_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dosbox/template b/srcpkgs/dosbox/template index 73bfe13473..651707a9cd 100644 --- a/srcpkgs/dosbox/template +++ b/srcpkgs/dosbox/template @@ -31,8 +31,3 @@ post_install() { vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications } -dosbox_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dosfstools/template b/srcpkgs/dosfstools/template index f92a72e581..807b5dd83f 100644 --- a/srcpkgs/dosfstools/template +++ b/srcpkgs/dosfstools/template @@ -14,9 +14,3 @@ long_desc=" The dosfstools package includes the mkdosfs (a.k.a. mkfs.dos and mkfs.vfat) and dosfsck (a.k.a. fsck.msdos and fsck.vfat) utilities, which respectively make and check MS-DOS FAT filesystems on hard drives or on floppies." - -dosfstools_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dotconf/template b/srcpkgs/dotconf/template index 5031f73791..bf0aef3420 100644 --- a/srcpkgs/dotconf/template +++ b/srcpkgs/dotconf/template @@ -16,18 +16,12 @@ pre_configure() { autoreconf -i } -dotconf_package() { - pkg_install() { - vmove all - } -} - dotconf-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } -} \ No newline at end of file +} diff --git a/srcpkgs/dovecot/template b/srcpkgs/dovecot/template index 639d77c832..bdb111eec0 100644 --- a/srcpkgs/dovecot/template +++ b/srcpkgs/dovecot/template @@ -39,6 +39,36 @@ fi makedepends="zlib-devel bzip2-devel openssl-devel mit-krb5-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel libldap-devel libcap-devel pam-devel libcurl-devel expat-devel" +# For SSL support. +depends="openssl>=0 shadow" +systemd_services="dovecot.service true" +system_accounts="dovecot dovenull" +dovecot_homedir="/var/chroot" +dovenull_homedir="/var/chroot" +conf_files=" + /etc/dovecot/conf.d/10-auth.conf + /etc/dovecot/conf.d/10-director.conf + /etc/dovecot/conf.d/10-logging.conf + /etc/dovecot/conf.d/10-mail.conf + /etc/dovecot/conf.d/10-master.conf + /etc/dovecot/conf.d/10-ssl.conf + /etc/dovecot/conf.d/15-lda.conf + /etc/dovecot/conf.d/20-imap.conf + /etc/dovecot/conf.d/20-lmtp.conf + /etc/dovecot/conf.d/20-pop3.conf + /etc/dovecot/conf.d/90-acl.conf + /etc/dovecot/conf.d/90-plugin.conf + /etc/dovecot/conf.d/90-quota.conf + /etc/dovecot/conf.d/auth-checkpassword.conf.ext + /etc/dovecot/conf.d/auth-deny.conf.ext + /etc/dovecot/conf.d/auth-master.conf.ext + /etc/dovecot/conf.d/auth-passwdfile.conf.ext + /etc/dovecot/conf.d/auth-sql.conf.ext + /etc/dovecot/conf.d/auth-static.conf.ext + /etc/dovecot/conf.d/auth-system.conf.ext + /etc/dovecot/conf.d/auth-vpopmail.conf.ext + /etc/dovecot/dovecot.conf + /etc/ssl/dovecot-openssl.cnf" post_install() { local econfdir=usr/share/doc/dovecot/example-config @@ -100,39 +130,3 @@ dovecot-plugin-sqlite_package() { vmove usr/lib/dovecot/modules/libdriver_sqlite.so } } - -dovecot_package() { - systemd_services="dovecot.service true" - system_accounts="dovecot dovenull" - dovecot_homedir="/var/chroot" - dovenull_homedir="/var/chroot" - conf_files=" - /etc/dovecot/conf.d/10-auth.conf - /etc/dovecot/conf.d/10-director.conf - /etc/dovecot/conf.d/10-logging.conf - /etc/dovecot/conf.d/10-mail.conf - /etc/dovecot/conf.d/10-master.conf - /etc/dovecot/conf.d/10-ssl.conf - /etc/dovecot/conf.d/15-lda.conf - /etc/dovecot/conf.d/20-imap.conf - /etc/dovecot/conf.d/20-lmtp.conf - /etc/dovecot/conf.d/20-pop3.conf - /etc/dovecot/conf.d/90-acl.conf - /etc/dovecot/conf.d/90-plugin.conf - /etc/dovecot/conf.d/90-quota.conf - /etc/dovecot/conf.d/auth-checkpassword.conf.ext - /etc/dovecot/conf.d/auth-deny.conf.ext - /etc/dovecot/conf.d/auth-master.conf.ext - /etc/dovecot/conf.d/auth-passwdfile.conf.ext - /etc/dovecot/conf.d/auth-sql.conf.ext - /etc/dovecot/conf.d/auth-static.conf.ext - /etc/dovecot/conf.d/auth-system.conf.ext - /etc/dovecot/conf.d/auth-vpopmail.conf.ext - /etc/dovecot/dovecot.conf - /etc/ssl/dovecot-openssl.cnf" - # For SSL support. - depends="openssl>=0 shadow" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template index b6713dfc67..4565c3a6ec 100644 --- a/srcpkgs/doxygen/template +++ b/srcpkgs/doxygen/template @@ -31,9 +31,3 @@ doxygen-gui_package() { vmove usr/share/man/man1/doxywizard.1 } } - -doxygen_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 0510c69161..b18e54fb6f 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -4,6 +4,11 @@ version=034 revision=2 hostmakedepends="libxslt docbook-xsl asciidoc" makedepends="psmisc cpio xz systemd" +depends="${makedepends}" +conf_files="/etc/dracut.conf" +make_dirs=" + /etc/dracut.conf.d 0755 root root + /usr/lib/dracut/dracut.conf.d 0755 root root" homepage="http://www.kernel.org/pub/linux/utils/boot/dracut/dracut.html" short_desc="A new initramfs infrastructure" maintainer="Juan RP " @@ -37,14 +42,3 @@ dracut-network_package() { done } } - -dracut_package() { - depends="${makedepends}" - conf_files="/etc/dracut.conf" - make_dirs=" - /etc/dracut.conf.d 0755 root root - /usr/lib/dracut/dracut.conf.d 0755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dri2proto/template b/srcpkgs/dri2proto/template index 0f12fc806a..65fbf80bc3 100644 --- a/srcpkgs/dri2proto/template +++ b/srcpkgs/dri2proto/template @@ -2,6 +2,7 @@ pkgname=dri2proto version=2.8 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Direct Rendering Interface 2 prototypes" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 -long_desc=" - Definitions needed by Direct Rendering Interface version 2." - -dri2proto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dri3proto/template b/srcpkgs/dri3proto/template index a56b0b9619..56c62f5e1a 100644 --- a/srcpkgs/dri3proto/template +++ b/srcpkgs/dri3proto/template @@ -2,6 +2,7 @@ pkgname=dri3proto version=1.0 revision=1 +noarch="yes" build_style=gnu-configure short_desc="DRI3 extension headers from X.org" maintainer="Juan RP " @@ -9,10 +10,3 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 - -dri3proto_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/dssi-vst/template b/srcpkgs/dssi-vst/template index 55c4e4dcb3..fb96565d2b 100644 --- a/srcpkgs/dssi-vst/template +++ b/srcpkgs/dssi-vst/template @@ -3,7 +3,8 @@ pkgname=dssi-vst version=0.9.2.20131028 revision=1 makedepends="pkg-config zlib-devel jack-devel alsa-lib-devel liblo-devel -dssi-devel ladspa-sdk wine wine-devel" + dssi-devel ladspa-sdk wine wine-devel" +depends="dssi ladspa-sdk ladspa-sdk-progs wine" short_desc="Run Windows VST plugins on Linux" maintainer="davehome " license="GPL" @@ -35,10 +36,3 @@ do_build() { do_install() { make ${makejobs} DESTDIR=${DESTDIR} install } - -dssi-vst_package() { - depends="dssi ladspa-sdk ladspa-sdk-progs wine" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dssi/template b/srcpkgs/dssi/template index b13c7912b4..f864360d4a 100644 --- a/srcpkgs/dssi/template +++ b/srcpkgs/dssi/template @@ -18,7 +18,7 @@ long_desc=" dssi-devel_package() { depends="dssi>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -27,14 +27,8 @@ dssi-devel_package() { dssi-example-plugins_package() { depends="dssi>=${version}" - short_desc="${short_desc} - Example plugins" + short_desc+=" - Example plugins" pkg_install() { vmove usr/lib/dssi } } - -dssi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dtach/template b/srcpkgs/dtach/template index 3eab4f12e0..f25a86210b 100644 --- a/srcpkgs/dtach/template +++ b/srcpkgs/dtach/template @@ -24,9 +24,3 @@ do_install() { install -Dm755 dtach "${DESTDIR}/usr/bin/dtach" install -Dm644 dtach.1 "${DESTDIR}/usr/share/man/man1/dtach.1" } - -dtach_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dumpet/template b/srcpkgs/dumpet/template index 02b6b7c62d..55412defaf 100644 --- a/srcpkgs/dumpet/template +++ b/srcpkgs/dumpet/template @@ -3,18 +3,11 @@ pkgname=dumpet version=2.1 revision=1 build_style=gnu-makefile -makedepends="pkg-config popt-devel libxml2-devel" +hostmakedepends="pkg-config" +makedepends="popt-devel libxml2-devel" short_desc="Tool to dump and debug bootable CD-like images" maintainer="Juan RP " license="GPL-2" homepage="https://fedorahosted.org/dumpet/" distfiles="https://fedorahosted.org/releases/d/u/dumpet/dumpet-$version.tar.bz2" checksum=2cc1fa3a1b06f885e4524d1be80bdacc5b6a55057d0577262f2f5186b49a4da3 -long_desc=" - This package contains dumpet, a $short_desc." - -dumpet_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template index 338a37c99b..5d2dad4f26 100644 --- a/srcpkgs/duplicity/template +++ b/srcpkgs/duplicity/template @@ -7,6 +7,8 @@ checksum="6f489b0445681f0697488f3d4097b4c56a7fe8a5fea5fadd2e431724039c5a12" build_style=python-module hostmakedepends="python-devel" makedepends="librsync-devel" +depends="python>=2.7" +pycompile_module="duplicity" maintainer="Steven R " homepage="http://duplicity.nongnu.org/" license="GPL" @@ -16,11 +18,3 @@ pre_configure() { chmod 644 "${BUILDDIR}bin/duplicity.1" chmod 644 "${BUILDDIR}bin/rdiffdir.1" } - -duplicity_package() { - depends="python>=2.7" - pycompile_module="duplicity" - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/dvtm/template b/srcpkgs/dvtm/template index 0aa8d571a1..e99a1ed0dc 100644 --- a/srcpkgs/dvtm/template +++ b/srcpkgs/dvtm/template @@ -3,6 +3,7 @@ pkgname=dvtm version=0.9 revision=3 makedepends="ncurses-devel" +depends="ncurses" # needs tic at post-install short_desc="Tiling window manager for the console" maintainer="pancake " homepage="http://www.brain-dump.org/projects/dvtm/" @@ -23,10 +24,3 @@ do_install() { # Install terminfo file to the correct dir. vinstall dvtm.info 644 usr/share/terminfo/d } - -dvtm_package() { - depends="ncurses" # needs tic at post-install - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dwm/template b/srcpkgs/dwm/template index 3c17a42563..3e3c61e2a1 100644 --- a/srcpkgs/dwm/template +++ b/srcpkgs/dwm/template @@ -30,9 +30,3 @@ do_install() { vinstall README 644 usr/share/doc/$pkgname vinstall ${FILESDIR}/dwm.desktop 644 usr/share/xsessions } - -dwm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/dzen2/template b/srcpkgs/dzen2/template index 6e736cba03..d2f4e6a91d 100644 --- a/srcpkgs/dzen2/template +++ b/srcpkgs/dzen2/template @@ -30,9 +30,3 @@ do_install() { cd gadgets make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=${DESTDIR} install } - -dzen2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template index f9e7ee05f2..c979f4a5f1 100644 --- a/srcpkgs/e2fsprogs/template +++ b/srcpkgs/e2fsprogs/template @@ -18,6 +18,7 @@ configure_args="--enable-htree --enable-elf-shlibs --disable-fsck make_install_args="install-libs" hostmakedepends="pkg-config" makedepends="libuuid-devel libblkid-devel" +conf_files="/etc/mke2fs.conf" post_install() { # Remove stuff belonging to libblkid or libuuid pkgs. @@ -56,10 +57,3 @@ e2fsprogs-libs_package() { vmove "usr/lib/*.so.*" } } - -e2fsprogs_package() { - conf_files="/etc/mke2fs.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/eclipse-ecj/template b/srcpkgs/eclipse-ecj/template index 89d620b790..1984f6b09c 100644 --- a/srcpkgs/eclipse-ecj/template +++ b/srcpkgs/eclipse-ecj/template @@ -2,6 +2,8 @@ pkgname=eclipse-ecj version=4.5 revision=1 +noarch="yes" +create_wrksrc=yes short_desc="A fork of the Eclipse Java bytecode compiler for GCJ" maintainer="davehome " license="EPL" @@ -11,7 +13,6 @@ distfiles="http://mirrors.kernel.org/sources.redhat.com/java/ecj-${version}.jar" long_desc=" A fork of the open source Eclipse Java bytecode incremental compiler for GCJ." -create_wrksrc=yes do_extract() { cp -v "${XBPS_SRCDISTDIR}/ecj-${version}.jar" "${wrksrc}" @@ -22,10 +23,3 @@ do_install() { vinstall "${FILESDIR}/ecj1" 755 usr/bin } - -eclipse-ecj_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/econnman/template b/srcpkgs/econnman/template index 82033507ee..8dad79c25f 100644 --- a/srcpkgs/econnman/template +++ b/srcpkgs/econnman/template @@ -2,20 +2,14 @@ pkgname=econnman version=1.1 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="pkg-config" makedepends="efl-devel python-efl connman desktop-file-utils" +depends="python-efl connman desktop-file-utils" homepage="http://enlightenment.org" short_desc="Enlightenment ConnMan user interface" maintainer="Juan RP " license="LGPL-3" distfiles="http://download.enlightenment.org/rel/apps/econnman/econnman-${version}.tar.gz" checksum=60f30748b2642b83763fe1e00f6a54ff27425c761633bb8cc0396fba15e7f714 - -econnman_package() { - noarch=yes - depends="python-efl connman desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ecryptfs-utils/template b/srcpkgs/ecryptfs-utils/template index 7e23157ca8..5fb75c3d07 100644 --- a/srcpkgs/ecryptfs-utils/template +++ b/srcpkgs/ecryptfs-utils/template @@ -63,9 +63,3 @@ ecryptfs-utils-python_package() { vmove usr/lib/python2.7 } } - -ecryptfs-utils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ed/template b/srcpkgs/ed/template index 9d240bc400..cb80acca1a 100644 --- a/srcpkgs/ed/template +++ b/srcpkgs/ed/template @@ -2,6 +2,7 @@ pkgname=ed version=1.8 revision=1 +build_style=gnu-configure short_desc="GNU Line-oriented text editor" maintainer="Juan RP " license="GPL-3" @@ -14,22 +15,3 @@ long_desc=" A restricted version of ed, red, can only edit files in the current directory and cannot execute shell commands. Ed is the standard text editor in the sense that it is the original editor for Unix, and thus widely available." - -do_configure() { - ./configure --prefix=/usr \ - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" -} - -do_build() { - make ${makejobs} -} - -do_install() { - make DESTDIR=${DESTDIR} install -} - -ed_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template index 24877c0c81..f6f98d42f9 100644 --- a/srcpkgs/efibootmgr/template +++ b/srcpkgs/efibootmgr/template @@ -23,9 +23,3 @@ do_install() { vinstall src/efibootmgr/efibootmgr 755 usr/sbin vinstall src/man/man8/efibootmgr.8 644 usr/share/man/man8 } - -efibootmgr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template index 50390099d1..c913ea404f 100644 --- a/srcpkgs/efl/template +++ b/srcpkgs/efl/template @@ -13,6 +13,9 @@ makedepends="openssl-devel systemd-devel glib-devel libXdamage-devel libXinerama-devel xcb-util-devel xcb-util-keysyms-devel xcb-util-image-devel xcb-util-renderutil-devel xcb-util-wm-devel pixman-devel libxkbcommon-devel printproto libXp-devel libXrandr-devel libXScrnSaver-devel libmount-devel lua-devel" +replaces=" + ecore>=0 evas>=0 edje>=0 eio>=0 eina>=0 emotion>=0 eeze>=0 e_dbus>=0 eet>=0 + embryo>=0 efreet>=0 ethumb>=0" homepage="http://enlightenment.org" short_desc="Enlightenment Foundation Libraries" maintainer="Juan RP " @@ -106,22 +109,3 @@ efl-devel_package() { vmove usr/lib/pkgconfig } } - -efl_package() { - replaces=" - ecore>=0 - evas>=0 - edje>=0 - eio>=0 - eina>=0 - emotion>=0 - eeze>=0 - e_dbus>=0 - eet>=0 - embryo>=0 - efreet>=0 - ethumb>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/eigen2/template b/srcpkgs/eigen2/template index 5c4ddf85e2..74834d9f12 100644 --- a/srcpkgs/eigen2/template +++ b/srcpkgs/eigen2/template @@ -2,8 +2,9 @@ pkgname=eigen2 version=2.0.17 revision=1 -wrksrc="eigen-eigen-b23437e61a07" create_srcdir=yes +noarch=yes +wrksrc="eigen-eigen-b23437e61a07" build_style=cmake hostmakedepends="cmake" short_desc="A lightweight C++ template library for vector and matrix math, a.k.a. linear algebra" @@ -12,10 +13,3 @@ license="GPL-3" homepage="http://eigen.tuxfamily.org/index.php?title=Main_Page" distfiles="http://bitbucket.org/eigen/eigen/get/${version}.tar.bz2" checksum=7255e856ed367ce6e6e2d4153b0e4e753c8b8d36918bf440dd34ad56aff09960 - -eigen2_package() { - noarch=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/elementary/template b/srcpkgs/elementary/template index f3d13c2288..338b0e2452 100644 --- a/srcpkgs/elementary/template +++ b/srcpkgs/elementary/template @@ -4,6 +4,7 @@ version=1.8.2 revision=1 hostmakedepends="pkg-config" makedepends="efl-devel>=${version} desktop-file-utils" +depends="desktop-file-utils" build_style=gnu-configure configure_args="--with-tests=none --disable-static --enable-quick-launch --disable-elementary-test" homepage="http://enlightenment.org" @@ -33,10 +34,3 @@ elementary-devel_package() { vmove "usr/lib/*.so" } } - -elementary_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/elfutils/template b/srcpkgs/elfutils/template index e8d88c4622..9cd04674ce 100644 --- a/srcpkgs/elfutils/template +++ b/srcpkgs/elfutils/template @@ -29,9 +29,3 @@ elfutils-devel_package() { vmove "usr/lib/*.a" } } - -elfutils_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/elinks/template b/srcpkgs/elinks/template index 4a479611dd..5d5fe3549a 100644 --- a/srcpkgs/elinks/template +++ b/srcpkgs/elinks/template @@ -10,9 +10,3 @@ homepage="http://elinks.or.cz" license="GPL-3" distfiles="http://elinks.or.cz/download/$pkgname-$version.tar.bz2" checksum=383646375b8a325bef5a132c8300caab90eb0b842c5f8eff68febc00e29acada - -elinks_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template index 23e18e6fa9..1a947e54f4 100644 --- a/srcpkgs/emacs/template +++ b/srcpkgs/emacs/template @@ -79,9 +79,3 @@ if [ "$build_option_xml" ]; then else configure_args+=" --without-xml2" fi - -emacs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/emotion_generic_players/template b/srcpkgs/emotion_generic_players/template index f378e2ac3b..1bffb2db34 100644 --- a/srcpkgs/emotion_generic_players/template +++ b/srcpkgs/emotion_generic_players/template @@ -11,9 +11,3 @@ maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/libs/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=5e1e77d7d833ddd4b8d0125b275dde69804d9ab410a5bab2a10e83e3c6c368e7 - -emotion_generic_players_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/empathy/template b/srcpkgs/empathy/template index 8c6fdbbefe..4724f18935 100644 --- a/srcpkgs/empathy/template +++ b/srcpkgs/empathy/template @@ -17,16 +17,10 @@ makedepends=" webkitgtk-devel>=2.1 libgudev-devel pulseaudio-devel cheese-devel>=3.10 enchant-devel NetworkManager-devel libchamplain-devel>=0.12.5_2 gnutls-devel>=3.1.5 gsettings-desktop-schemas-devel>=3.10 geoclue2 iso-codes" +depends="gsettings-desktop-schemas>=3.10 geoclue2 iso-codes" short_desc="GNOME instant messaging client using the Telepathy framework" maintainer="Juan RP " homepage="http://live.gnome.org/Empathy" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf - -empathy_package() { - depends="gsettings-desktop-schemas>=3.10 geoclue2 iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/enca/template b/srcpkgs/enca/template index dcdc8eb720..823a648d82 100644 --- a/srcpkgs/enca/template +++ b/srcpkgs/enca/template @@ -38,9 +38,3 @@ enca-devel_package() { vmove usr/share/gtk-doc } } - -enca_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/encfs/template b/srcpkgs/encfs/template index 0089a67f01..d2f1912e2a 100644 --- a/srcpkgs/encfs/template +++ b/srcpkgs/encfs/template @@ -11,9 +11,3 @@ license="GPL-3" homepage="http://www.arg0.net/encfs" distfiles="http://encfs.googlecode.com/files/${pkgname}-${version}.tgz" checksum=282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8 - -encfs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/enchant/template b/srcpkgs/enchant/template index f910de917a..72e405f94a 100644 --- a/srcpkgs/enchant/template +++ b/srcpkgs/enchant/template @@ -45,9 +45,3 @@ enchant-devel_package() { vmove usr/lib/pkgconfig } } - -enchant_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template index 5e793d1099..eb6c8c69b8 100644 --- a/srcpkgs/encodings/template +++ b/srcpkgs/encodings/template @@ -2,8 +2,10 @@ pkgname=encodings version=1.0.4 revision=3 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config font-utils" +depends="font-util" short_desc="X11 Font Index Generator" homepage="http://xorg.freedesktop.org" license="Public domain" @@ -23,11 +25,3 @@ post_install() { # encodings.dir are generated at pkg post-install time. find ${DESTDIR} -name encodings.dir -delete } - -encodings_package() { - depends="font-util" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 230c21a4d2..bf4f1aaa2a 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -8,6 +8,9 @@ hostmakedepends="pkg-config efl>=1.8" makedepends=" pam-devel efl-devel>=1.8.1 elementary-devel>=1.8.0 evas_generic_loaders>=1.8 emotion_generic_players>=1.8 hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=1.8 emotion_generic_players>=1.8" +conf_files="/etc/enlightenment/sysactions.conf" +provides="notification-daemon-0_1" homepage="http://enlightenment.org" short_desc="Enlightenment desktop" maintainer="Juan RP " @@ -30,12 +33,3 @@ enlightenment-devel_package() { vmove usr/lib/pkgconfig } } - -enlightenment_package() { - conf_files="/etc/enlightenment/sysactions.conf" - provides="notification-daemon-0_1" - depends="hicolor-icon-theme desktop-file-utils evas_generic_loaders>=1.8 emotion_generic_players>=1.8" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/enscript/template b/srcpkgs/enscript/template index f6d4975d74..985decaa5a 100644 --- a/srcpkgs/enscript/template +++ b/srcpkgs/enscript/template @@ -2,13 +2,14 @@ pkgname=enscript version=1.6.5.2 revision=1 -homepage="http://git.savannah.gnu.org/cgit/enscript.git" -distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure makedepends="perl" +conf_files="/etc/enscript.cfg" short_desc="Converts text to Postscript, HTML or RTF with syntax highlighting" maintainer="Juan RP " license="GPL-2" +homepage="http://git.savannah.gnu.org/cgit/enscript.git" +distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" checksum=db3e33bdb36f9e7252a386ea1faa9b5444cc9ba0ac2dd46fffc1f14887a4cb75 long_desc=" GNU Enscript takes ASCII files (often source code) and converts them to @@ -18,11 +19,3 @@ long_desc=" It is often used for its syntax highlighting, as it comes with rules for a wide range of programming languages. New rules can be added using an awk-like stateful scripting language." - -enscript_package() { - conf_files="/etc/enscript.cfg" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/enventor/template b/srcpkgs/enventor/template index cbabc26aea..89b51ace9a 100644 --- a/srcpkgs/enventor/template +++ b/srcpkgs/enventor/template @@ -5,6 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}.0" hostmakedepends="pkg-config" makedepends="efl-devel>=1.8 elementary-devel>=1.8 desktop-file-utils" +depends="desktop-file-utils" build_style=gnu-configure configure_args="--disable-static" homepage="http://enlightenment.org" @@ -13,10 +14,3 @@ maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=144ca4eabea0c5b640e338f8f03a5692f60d51f4d667d264fc9299ed4148f67d - -enventor_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/envypn-font/template b/srcpkgs/envypn-font/template index 8f4ef16dbf..a00b378724 100644 --- a/srcpkgs/envypn-font/template +++ b/srcpkgs/envypn-font/template @@ -2,6 +2,7 @@ pkgname=envypn-font version=1.6 revision=1 +noarch="yes" short_desc="Readable bitmap font inspired by Envy Code R" maintainer="Ypnose " homepage="http://tetedulinuxien.fr/" @@ -9,6 +10,8 @@ license="MirOS License" distfiles="http://linuxien.legtux.org/projects/${pkgname}/${pkgname}-${version}.tar.gz" checksum=85239d176c39f67eece90c8e5730247fe1b38f5fd577269b73476a296284130b makedepends="font-util mkfontdir" +depends="${makedepends}" +font_dirs="/usr/share/fonts/envypn" do_install() { vmkdir usr/share/fonts/envypn @@ -18,12 +21,3 @@ do_install() { vinstall CHANGELOG 644 usr/share/doc/envypn vinstall README 644 usr/share/doc/envypn } - -envypn-font_package() { - depends="${makedepends}" - noarch="yes" - font_dirs="/usr/share/fonts/envypn" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index b4257ddf44..7c77c7bfaf 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -7,6 +7,7 @@ hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-intro makedepends=" gnome-desktop-devel>=3.10 libpeas-devel>=1.9 lcms2-devel exempi-devel libexif-devel librsvg-devel>=2.39 gnome-icon-theme shared-mime-info" +depends="hicolor-icon-theme desktop-file-utils gnome-icon-theme shared-mime-info" short_desc="Eye of GNOME graphics viewer program" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -29,11 +30,3 @@ eog-devel_package() { vmove usr/share/eog/gir-1.0 } } - -eog_package() { - depends="hicolor-icon-theme desktop-file-utils - gnome-icon-theme shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/epdfview/template b/srcpkgs/epdfview/template index 66fd6dcb3c..8b23f6fe25 100644 --- a/srcpkgs/epdfview/template +++ b/srcpkgs/epdfview/template @@ -4,6 +4,7 @@ version=0.1.8 revision=4 build_style=gnu-configure makedepends="pkg-config glib-devel>=2.32 gtk+-devel poppler-glib-devel>=0.20" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Lightweight PDF viewer using Poppler and GTK+" maintainer="Juan RP " homepage="http://www.emma-soft.com/projects/epdfview/" @@ -23,10 +24,3 @@ post_install() { usr/share/icons/hicolor/${f}x${f}/apps ${pkgname}.png done } - -epdfview_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/epiphany/template b/srcpkgs/epiphany/template index 62bef90849..90ca0f24be 100644 --- a/srcpkgs/epiphany/template +++ b/srcpkgs/epiphany/template @@ -9,6 +9,8 @@ makedepends="nss-devel libsoup-gnome-devel>=2.44 libnotify-devel webkitgtk-devel>=2.1 sqlite-devel libxslt-devel avahi-glib-libs-devel startup-notification-devel NetworkManager-devel gcr-devel>=3.10 gnome-desktop-devel>=3.10 libsecret-devel libwnck-devel iso-codes" +depends="webkitgtk>=2.1 libsoup>=2.44 gsettings-desktop-schemas>=3.10 gcr>=3.10 + ca-certificates hicolor-icon-theme desktop-file-utils iso-codes" short_desc="Intuitive GNOME web browser" maintainer="Juan RP " homepage="http://www.gnome.org/projects/epiphany/" @@ -24,11 +26,3 @@ long_desc=" side by using the WebKitGTK+ rendering engine; and on the user interface side by closely following the GNOME Human Interface Guidelines (HIG) and by close integration with the GNOME desktop." - -epiphany_package() { - depends="webkitgtk>=2.1 libsoup>=2.44 gsettings-desktop-schemas>=3.10 gcr>=3.10 - ca-certificates hicolor-icon-theme desktop-file-utils iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/epson-inkjet-printer-escpr/template b/srcpkgs/epson-inkjet-printer-escpr/template index 9af5af6189..83f13b0732 100644 --- a/srcpkgs/epson-inkjet-printer-escpr/template +++ b/srcpkgs/epson-inkjet-printer-escpr/template @@ -25,9 +25,3 @@ post_install() { # gzip ppd files. find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f } - -epson-inkjet-printer-escpr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ethtool/template b/srcpkgs/ethtool/template index f100fe8cb8..0f4ad8c392 100644 --- a/srcpkgs/ethtool/template +++ b/srcpkgs/ethtool/template @@ -9,9 +9,3 @@ homepage="http://www.kernel.org/pub/software/network/ethtool/" license="GPL-2" distfiles="http://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${version}.tar.xz" checksum=d53f5546196a95387f25c2f413d7537aad74b74a5c7b62f0aafd545f9e602fd4 - -ethtool_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template index 95c902b96c..bd3de50dfb 100644 --- a/srcpkgs/ettercap/template +++ b/srcpkgs/ettercap/template @@ -6,6 +6,7 @@ build_style=cmake configure_args="-DENABLE_GTK=OFF" hostmakedepends="cmake flex" makedepends="ncurses-devel libcurl-devel libltdl-devel libnet-devel libpcap-devel openssl-devel pcre-devel" +conf_files="/etc/${pkgname}/etter.conf" short_desc="A network sniffer/interceptor/logger for ethernet LANs" maintainer="Juan RP " license="GPL-2" @@ -14,10 +15,3 @@ homepage="http://ettercap.github.com/ettercap/" do_fetch() { git clone -b v${version} git://github.com/Ettercap/ettercap.git ${pkgname}-${version} } - -ettercap_package() { - conf_files="/etc/${pkgname}/etter.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/evas_generic_loaders/template b/srcpkgs/evas_generic_loaders/template index 7ee66b1f5a..a4ec3d944e 100644 --- a/srcpkgs/evas_generic_loaders/template +++ b/srcpkgs/evas_generic_loaders/template @@ -59,9 +59,3 @@ if [ "$build_option_raw" ]; then else configure_args+=" --disable-libraw" fi - -evas_generic_loaders_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/evieext/template b/srcpkgs/evieext/template index 7975842089..6ceb1409c9 100644 --- a/srcpkgs/evieext/template +++ b/srcpkgs/evieext/template @@ -2,6 +2,7 @@ pkgname=evieext version=1.0.2 revision=2 +noarch="yes" build_style=gnu-configure short_desc="EvIE extension headers" homepage="http://xorg.freedesktop.org" @@ -9,13 +10,3 @@ license="MIT/X11" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=0b85113a9770083715927f9c7a7d0ab354c8a508a91cb6e8e11130851494d125 -long_desc=" - This package provides the X11 Event Interception extension (EvIE) - headers from modular X.org." - -evieext_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/evilwm/template b/srcpkgs/evilwm/template index 6878fefd0d..bfdadecaed 100644 --- a/srcpkgs/evilwm/template +++ b/srcpkgs/evilwm/template @@ -16,9 +16,3 @@ post_install() { vinstall ${FILESDIR}/evilwm.desktop 644 usr/share/xsessions vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/$pkgname } - -evilwm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index ac6f1f1fa4..f501b67f66 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -22,6 +22,7 @@ makedepends="tiff-devel libarchive-devel nautilus-devel>=3.10 poppler-glib-devel libxml2-devel djvulibre-devel libgxps-devel libSM-devel libICE-devel libspectre-devel libsecret-devel gsettings-desktop-schemas-devel>=3.10 gnome-icon-theme" +depends="desktop-file-utils hicolor-icon-theme gnome-icon-theme" libevince_package() { short_desc+=" - runtime libraries" @@ -42,10 +43,3 @@ evince-devel_package() { vmove usr/share/gtk-doc } } - -evince_package() { - depends="desktop-file-utils hicolor-icon-theme gnome-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 8adb01b125..17bee7db98 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool flex gperf gobject-introspection" makedepends="db-devel>=5.3 sqlite-devel mit-krb5-devel nss-devel libical-devel libsecret-devel libsoup-gnome-devel>=2.44 gcr-devel>=3.10 libldap-devel libgdata-devel>=0.14 vala-devel>=0.22 libgweather-devel>=3.10" +depends="libgdata>=0.14 libsoup-gnome>=2.44 libgweather>=3.10" short_desc="Centralized access to appointments and contacts" maintainer="Juan RP " license="GPL-2" @@ -31,10 +32,3 @@ evolution-data-server-devel_package() { vmove usr/share/vala } } - -evolution-data-server_package() { - depends="libgdata>=0.14 libsoup-gnome>=2.44 libgweather>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 1a8497a3d6..220ea645a9 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -14,6 +14,7 @@ makedepends=" gtkhtml-devel>=4.6.0 libsoup-gnome-devel>=2.44 gnome-desktop-devel>=3.10 libnotify-devel gstreamer1-devel>=1:1.2 libgweather-devel>=3.10 NetworkManager-devel enchant-devel iso-codes" +depends="gtkhtml>=4.6 hicolor-icon-theme desktop-file-utils iso-codes" short_desc="Integrated mail, addressbook and calendaring for GNOME" maintainer="davehome " license="GPL-2" @@ -27,10 +28,3 @@ post_install() { rm -rf ${DESTDIR}/usr/lib/pkgconfig rm -rf ${DESTDIR}/usr/share/gtk-doc } - -evolution_package() { - depends="gtkhtml>=4.6 hicolor-icon-theme desktop-file-utils iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/exempi/template b/srcpkgs/exempi/template index 57c4c78b57..6ac83b8048 100644 --- a/srcpkgs/exempi/template +++ b/srcpkgs/exempi/template @@ -29,9 +29,3 @@ exempi-devel_package() { vmove "usr/lib/*.so" } } - -exempi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/exfat-utils/template b/srcpkgs/exfat-utils/template index 1567d612fd..022e42406e 100644 --- a/srcpkgs/exfat-utils/template +++ b/srcpkgs/exfat-utils/template @@ -18,9 +18,3 @@ do_install() { install -m444 {dump,fsck,mkfs,label}/*.8 \ ${DESTDIR}/usr/share/man/man8 } - -exfat-utils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/exiftool/template b/srcpkgs/exiftool/template index 2f1dd9e595..e62b85798d 100755 --- a/srcpkgs/exiftool/template +++ b/srcpkgs/exiftool/template @@ -2,21 +2,15 @@ pkgname=exiftool version=9.45 revision=1 +noarch="yes" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" checksum="aa123e35c7648270418481d64cb9a2dddf4b223e11c93ea5df31e01823a04024" build_style=perl-module makedepends="perl>=5.18" hostmakedepends="${makedepends}" +depends="${makedepends}" wrksrc="Image-ExifTool-${version}" maintainer="Steven R " homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" license="GPL" short_desc="Reader and rewriter of EXIF informations that supports raw files" - -exiftool_package() { - noarch="yes" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template index b89ac9dcbf..f8dd9f0030 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -16,16 +16,10 @@ long_desc=" exiv2-devel_package() { depends="zlib-devel expat-devel libstdc++-devel exiv2" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -exiv2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template index 2d34e2271f..1377bca10e 100644 --- a/srcpkgs/exo/template +++ b/srcpkgs/exo/template @@ -5,6 +5,8 @@ revision=1 build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config intltool gtk+-devel libxfce4util-devel libxfce4ui-devel perl-URI" +depends="hicolor-icon-theme desktop-file-utils perl-URI" +conf_files="/etc/xdg/xfce4/helpers.rc" short_desc="Application library for the Xfce desktop environment" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -14,7 +16,7 @@ checksum=b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce exo-devel_package() { depends="gtk+-devel libxfce4util-devel exo-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -23,12 +25,3 @@ exo-devel_package() { vmove "usr/share/*doc" } } - -exo_package() { - depends="hicolor-icon-theme desktop-file-utils perl-URI" - conf_files="/etc/xdg/xfce4/helpers.rc" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/expat/template b/srcpkgs/expat/template index 53ca4c9f2a..638ec43d71 100644 --- a/srcpkgs/expat/template +++ b/srcpkgs/expat/template @@ -12,7 +12,7 @@ checksum=823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 expat-devel_package() { depends="expat>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" @@ -20,14 +20,8 @@ expat-devel_package() { } } -expat_package() { - pkg_install() { - vmove "usr/lib/*.so*" - } -} - xmlwf_package() { - short_desc="${short_desc} -- xmlwf utility" + short_desc+=" - xmlwf utility" pkg_install() { vmove usr/bin vmove usr/share diff --git a/srcpkgs/exquisite/template b/srcpkgs/exquisite/template index 7c968aaf94..c49a7aeb1e 100644 --- a/srcpkgs/exquisite/template +++ b/srcpkgs/exquisite/template @@ -11,9 +11,3 @@ license="BSD" homepage="http://www.enlightenment.org" distfiles="http://download.enlightenment.org/releases/exquisite-${version}.tar.gz" checksum=4b874ca1f57d9fc31436ff11b0d6d35b522b43c665c893341c0feb0ca9fa02fd - -exquisite_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/extundelete/template b/srcpkgs/extundelete/template index 8302fd5715..4b28fea6a5 100644 --- a/srcpkgs/extundelete/template +++ b/srcpkgs/extundelete/template @@ -10,9 +10,3 @@ homepage="http://extundelete.sourceforge.net" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=a1f9dd61247056d36401ce5d6785e74d08a184340eebd3865c345ddaa93f19f4 - -extundelete_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/eyeD3/template b/srcpkgs/eyeD3/template index c4b9b61c09..e9103e3957 100644 --- a/srcpkgs/eyeD3/template +++ b/srcpkgs/eyeD3/template @@ -2,21 +2,15 @@ pkgname=eyeD3 version=0.7.4 revision=1 +noarch="yes" distfiles="http://eyed3.nicfit.net/releases/eyeD3-${version}.tgz" checksum="a138e6e1fd5b8c2b7947a2d22868167ede16bb96e8e02a067951388bf1fb3000" build_style=python-module hostmakedepends="python-devel python-distribute" makedepends="python-devel" +depends="python>=2.7" +pycompile_module="eyeD3" maintainer="Steven R " homepage="http://eyed3.nicfit.net/" license="GPL" short_desc="Python tool for working with audio files, specifically mp3 files containing ID3 metadata (i.e. song info)." - -eyeD3_package() { - noarch="yes" - depends="python>=2.7" - pycompile_module="eyeD3" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/f2fs-tools/template b/srcpkgs/f2fs-tools/template index 8239c397f6..3a3099af22 100644 --- a/srcpkgs/f2fs-tools/template +++ b/srcpkgs/f2fs-tools/template @@ -19,9 +19,3 @@ do_fetch() { pre_configure() { autoreconf -fi } - -f2fs-tools_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/faac/template b/srcpkgs/faac/template index 8500976183..46a3384d8f 100644 --- a/srcpkgs/faac/template +++ b/srcpkgs/faac/template @@ -29,9 +29,3 @@ faac-devel_package() { vmove usr/include } } - -faac_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/faad2/template b/srcpkgs/faad2/template index 5e6660fc0d..7c995bf5db 100644 --- a/srcpkgs/faad2/template +++ b/srcpkgs/faad2/template @@ -31,9 +31,3 @@ faad2-devel_package() { vmove "usr/lib/*.a" } } - -faad2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fakechroot/template b/srcpkgs/fakechroot/template index db6979220b..ab23c7adda 100644 --- a/srcpkgs/fakechroot/template +++ b/srcpkgs/fakechroot/template @@ -4,6 +4,10 @@ version=2.17.1 revision=2 build_style=gnu-configure configure_args="--disable-static --sbindir=/usr/bin" +conf_files=" + /etc/fakechroot/chroot.env + /etc/fakechroot/debootstrap.env + /etc/fakechroot/rinse.env" short_desc="Gives a fake chroot environment" maintainer="Juan RP " homepage="https://github.com/dex4er/fakechroot" @@ -12,13 +16,3 @@ license="LGPL-2.1" do_fetch() { git clone -b ${version} git://github.com/dex4er/fakechroot ${pkgname}-${version} } - -fakechroot_package() { - conf_files=" - /etc/fakechroot/chroot.env - /etc/fakechroot/debootstrap.env - /etc/fakechroot/rinse.env" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/farstream/template b/srcpkgs/farstream/template index 1ad113f7b8..45629d0f3e 100644 --- a/srcpkgs/farstream/template +++ b/srcpkgs/farstream/template @@ -6,7 +6,9 @@ build_style=gnu-configure configure_args="--disable-valgrind --disable-debug --disable-static" makedepends="pkg-config intltool gupnp-igd-devel>=0.2.0 libnice-devel>=0.1.3 gst-plugins-base1-devel python-devel gst-python-devel pygobject2-devel -gobject-introspection" + gobject-introspection" +depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1" +replaces="farsight2>=0" short_desc="GStreamer modules and libraries for videoconferencing" maintainer="Juan RP " license="LGPL-2.1" @@ -30,11 +32,3 @@ farstream-devel_package() { vmove usr/share/gir-1.0 } } - -farstream_package() { - depends="gst-python pygobject2 pygtk gst-plugins-good1 gst-plugins-bad1" - replaces="farsight2>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fbset/template b/srcpkgs/fbset/template index cc0757da2b..b84fca81ec 100644 --- a/srcpkgs/fbset/template +++ b/srcpkgs/fbset/template @@ -12,6 +12,7 @@ checksum=517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338 hostmakedepends="flex" makedepends="libfl-devel" +conf_files="/etc/fb.modes" do_build() { sed -e 's,$(DESTDIR)/bin,$(DESTDIR)/usr/bin,g' -i Makefile @@ -21,10 +22,3 @@ do_build() { do_install() { make DESTDIR=$DESTDIR PREFIX=/usr install } - -fbset_package() { - conf_files="/etc/fb.modes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fdupes/template b/srcpkgs/fdupes/template index a89e682b65..98a79c1624 100644 --- a/srcpkgs/fdupes/template +++ b/srcpkgs/fdupes/template @@ -17,9 +17,3 @@ do_install() { vinstall fdupes 755 usr/bin vinstall fdupes.1 644 usr/share/man/man1 } - -fdupes_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/feh/template b/srcpkgs/feh/template index 1a7cf623e1..f58f3a6b73 100644 --- a/srcpkgs/feh/template +++ b/srcpkgs/feh/template @@ -4,8 +4,8 @@ version=2.9.1 revision=2 build_style=gnu-makefile make_build_args="PREFIX=/usr exif=1 help=1" -make_install_args="PREFIX=/usr" -makedepends="pkg-config giblib-devel libcurl-devel libexif-devel +hostmakedepends="pkg-config" +makedepends="giblib-devel libcurl-devel libexif-devel libpng-devel>=1.6 libjpeg-turbo-devel libXinerama-devel libXt-devel" short_desc="Fast and light imlib2-based image viewer" maintainer="Juan RP " @@ -13,9 +13,3 @@ license="MIT" homepage="http://feh.finalrewind.org/" distfiles="${homepage}/feh-${version}.tar.bz2" checksum=4a02d2328c37ae7d7df09c49ccfcbad90458735b132c70937047b3395fb45925 - -feh_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fetchmail/template b/srcpkgs/fetchmail/template index 803cbbbd1f..75d39057e9 100644 --- a/srcpkgs/fetchmail/template +++ b/srcpkgs/fetchmail/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--with-ssl=${XBPS_CROSS_BASE}/usr" hostmakedepends="python-devel" makedepends="openssl-devel" +depends="python" short_desc="A remote-mail retrieval utility" maintainer="Juan RP " license="GPL-2" homepage="http://fetchmail.berlios.de/" distfiles="http://download.berlios.de/$pkgname/${pkgname}-${version}.tar.xz" checksum=79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 - -fetchmail_package() { - depends="python" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 506f53326f..99468f7fde 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -130,9 +130,3 @@ ffmpeg-devel_package() { vmove usr/share/man/man3 } } - -ffmpeg_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fftw/template b/srcpkgs/fftw/template index cd0f1174bf..942877d2ed 100644 --- a/srcpkgs/fftw/template +++ b/srcpkgs/fftw/template @@ -77,9 +77,3 @@ fftw-devel_package() { vmove usr/share/info } } - -fftw_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 8cdbb17dd1..88d63d94dc 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--disable-schemas-compile --enable-magic --disable-static" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool" makedepends="nautilus-devel>=3.10 json-glib-devel libnotify-devel libarchive-devel>=3.1.2" +depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME Front-end to archiving programs like tar and zip" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/3.10/$pkgname-$version.tar.xz" checksum=fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790 - -file-roller_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/file/template b/srcpkgs/file/template index 0bc0c1d160..7e0e813901 100644 --- a/srcpkgs/file/template +++ b/srcpkgs/file/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-static" makedepends="zlib-devel" +conflicts="chroot-file>=0" short_desc="File type identification utility" maintainer="Juan RP " homepage="http://www.darwinsys.com/file/" @@ -32,10 +33,3 @@ file-devel_package() { vmove usr/share/man/man3 } } - -file_package() { - conflicts="chroot-file>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/filezilla/template b/srcpkgs/filezilla/template index 1099f2f7ae..17e65189ef 100644 --- a/srcpkgs/filezilla/template +++ b/srcpkgs/filezilla/template @@ -7,16 +7,10 @@ configure_args="--disable-static --disable-manualupdatecheck --disable-autoupdat hostmakedepends="pkg-config" makedepends="gnutls-devel tinyxml-devel dbus-devel libidn-devel sqlite-devel gtk+-devel wxGTK-devel xdg-utils hicolor-icon-theme desktop-file-utils" +depends="xdg-utils hicolor-icon-theme desktop-file-utils" short_desc="Fast and reliable FTP, FTPS and SFTP client" maintainer="Juan RP " license="GPL-3" homepage="http://filezilla-project.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/FileZilla_${version}_src.tar.bz2" checksum=2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 - -filezilla_package() { - depends="xdg-utils hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template index b9b1818dea..a8ea8a7ea7 100644 --- a/srcpkgs/firefox-i18n/template +++ b/srcpkgs/firefox-i18n/template @@ -9,9 +9,15 @@ license="MPL-2.1" long_desc=" This package includes the language packs for the firefox browser." +noarch=yes create_wrksrc=yes create_srcdir=yes +depends="firefox>=${version}" +for f in ${_LANG_PACKS}; do + depends+=" firefox-i18n-${f}>=${version}" +done + _LANG_PACKS="af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN @@ -992,11 +998,3 @@ firefox-i18n-zu_package() { usr/lib/firefox/browser/extensions langpack-zu@firefox.mozilla.org.xpi } } - -firefox-i18n_package() { - depends="firefox>=${version}" - for f in ${_LANG_PACKS}; do - depends+=" firefox-i18n-${f}>=${version}" - done - noarch=yes -} diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index c580faf543..ede3680220 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -17,6 +17,7 @@ makedepends="libjpeg-turbo-devel libpng-devel>=1.6 gst-plugins-base-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel libXrender-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel libXScrnSaver-devel libXt-devel" +depends="desktop-file-utils hicolor-icon-theme" # Google API key (see http://www.chromium.org/developers/how-tos/api-keys) # Note: This is for Void Linux use ONLY. @@ -58,10 +59,3 @@ do_install() { # https://bugzilla.mozilla.org/show_bug.cgi?id=658850 ln -sf firefox ${DESTDIR}/usr/lib/firefox/firefox-bin } - -firefox_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fish-shell/template b/srcpkgs/fish-shell/template index b767714e6e..9c675963ed 100644 --- a/srcpkgs/fish-shell/template +++ b/srcpkgs/fish-shell/template @@ -7,6 +7,7 @@ checksum="af527af9d145df5675ca3031c1a87007d4f4753a1cde49da88f4eb883a1cf044" build_style=gnu-configure hostmakedepends="autoconf doxygen" makedepends="ncurses-devel" +register_shell="/usr/bin/fish" wrksrc="fish-${version}" maintainer="Steven R " homepage="http://fishshell.com/" @@ -17,10 +18,3 @@ pre_configure() { autoconf autoheader } - -fish-shell_package() { - register_shell="/usr/bin/fish" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fixesproto/template b/srcpkgs/fixesproto/template index 0c7893bf18..5e57ddc5f1 100644 --- a/srcpkgs/fixesproto/template +++ b/srcpkgs/fixesproto/template @@ -2,22 +2,13 @@ pkgname=fixesproto version=5.0 revision=2 +noarch="yes" build_style=gnu-configure makedepends="xextproto" +depends="${makedepends}" short_desc="Fixes extension headers from X.org" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=ba2f3f31246bdd3f2a0acf8bd3b09ba99cab965c7fb2c2c92b7dc72870e424ce -long_desc=" - This provides the Fixes extension headers from modular X.org X11 - project." - -fixesproto_package() { - depends="${makedepends}" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index 8f3fc7297e..3a86424f4f 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -50,9 +50,3 @@ libflac-devel_package() { vmove usr/share/doc } } - -flac_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/flashrom/template b/srcpkgs/flashrom/template index 146f006156..5e3464b999 100644 --- a/srcpkgs/flashrom/template +++ b/srcpkgs/flashrom/template @@ -20,9 +20,3 @@ do_build() { do_install() { make install DESTDIR=${DESTDIR} PREFIX=/usr } - -flashrom_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template index e4fe36cae9..59e1ef403c 100644 --- a/srcpkgs/flex/template +++ b/srcpkgs/flex/template @@ -4,6 +4,7 @@ version=2.5.37 revision=2 build_style=gnu-configure hostmakedepends="help2man bison" +depends="bison libfl-devel>=${version}" short_desc="The Fast Lexical Analyzer" maintainer="Juan RP " homepage="http://flex.sourceforge.net" @@ -26,11 +27,3 @@ libfl-devel_package() { vmove "usr/lib/*.a" } } - -flex_package() { - depends="bison libfl-devel>=${version}" - pkg_install() { - vmove usr/bin - vmove usr/share - } -} diff --git a/srcpkgs/flowcanvas/template b/srcpkgs/flowcanvas/template index 06fcd973a4..bacdeebe58 100644 --- a/srcpkgs/flowcanvas/template +++ b/srcpkgs/flowcanvas/template @@ -24,9 +24,3 @@ flowcanvas-devel_package() { vmove usr/lib/pkgconfig } } - -flowcanvas_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fltk/template b/srcpkgs/fltk/template index a9cd026fdc..40fea3b3db 100644 --- a/srcpkgs/fltk/template +++ b/srcpkgs/fltk/template @@ -29,9 +29,3 @@ fltk-devel_package() { vmove usr/share/doc } } - -fltk_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fluidsynth/template b/srcpkgs/fluidsynth/template index f9266d684a..cdade35ba9 100644 --- a/srcpkgs/fluidsynth/template +++ b/srcpkgs/fluidsynth/template @@ -36,9 +36,3 @@ fluidsynth-devel_package() { vmove usr/lib/pkgconfig } } - -fluidsynth_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fluxbox/template b/srcpkgs/fluxbox/template index 1d8863218f..150e565d64 100644 --- a/srcpkgs/fluxbox/template +++ b/srcpkgs/fluxbox/template @@ -3,9 +3,9 @@ pkgname=fluxbox version=1.3.4 revision=1 build_style=gnu-configure -makedepends="pkg-config libXrender-devel libXft-devel - libXpm-devel imlib2-devel libXext-devel - libXinerama-devel libXrandr-devel fribidi-devel" +hostmakedepends="pkg-config" +makedepends="libXrender-devel libXft-devel libXpm-devel imlib2-devel + libXext-devel libXinerama-devel libXrandr-devel fribidi-devel" short_desc="Highly configurable and low resource X11 Window manager" maintainer="Juan RP " homepage="http://www.fluxbox.org" @@ -17,9 +17,3 @@ post_install() { vinstall ${FILESDIR}/fluxbox.desktop 644 usr/share/xsessions vinstall COPYING 644 usr/share/licenses/${pkgname} } - -fluxbox_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/folks/template b/srcpkgs/folks/template index 681c2f5d3f..2f3794e69d 100644 --- a/srcpkgs/folks/template +++ b/srcpkgs/folks/template @@ -11,6 +11,7 @@ hostmakedepends="pkg-config intltool which gobject-introspection" makedepends=" readline-devel vala-devel>=0.22 telepathy-glib-devel>=0.21 zeitgeist-devel libgee08-devel>=0.12 evolution-data-server-devel>=3.10 tracker-devel>=0.16_2" +depends="zeitgeist" short_desc="GObject Library to aggregate people into metacontacts" maintainer="Juan RP " license="LGPL-2.1" @@ -38,10 +39,3 @@ folks-devel_package() { vmove "usr/lib/*.so" } } - -folks_package() { - depends="zeitgeist" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/font-adobe-100dpi/template b/srcpkgs/font-adobe-100dpi/template index 6653b90f09..d75f47bd30 100644 --- a/srcpkgs/font-adobe-100dpi/template +++ b/srcpkgs/font-adobe-100dpi/template @@ -2,33 +2,18 @@ pkgname=font-adobe-100dpi version=1.0.3 revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-utils" +depends="font-util" +font_dirs="/usr/share/fonts/X11/100dpi" short_desc="Standard 100dpi Adobe PCF fonts" homepage="http://xorg.freedesktop.org/" license="opensource" maintainer="Juan RP " distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054 -long_desc=" - Theses are the PCF versions of the following Adobe fonts for 100dpi displays: - - Courier - - Helvetica - - New Century Schoolbook - - Symbol - - Times - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-adobe-100dpi_package() { - noarch="yes" - font_dirs="/usr/share/fonts/X11/100dpi" - depends="font-util" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-adobe-75dpi/template b/srcpkgs/font-adobe-75dpi/template index d183215ae4..95727cda47 100644 --- a/srcpkgs/font-adobe-75dpi/template +++ b/srcpkgs/font-adobe-75dpi/template @@ -2,33 +2,18 @@ pkgname=font-adobe-75dpi version=1.0.3 revision=2 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-utils" +depends="font-util" +font_dirs="/usr/share/fonts/X11/75dpi" short_desc="Standard 75pi Adobe PCF fonts" homepage="http://xorg.freedesktop.org/" license="opensource" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09 -long_desc=" - These are the PCF versions of the following Adobe fonts for 75dpi displays: - - Courier - - Helvetica - - New Century Schoolbook - - Symbol - - Times - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-adobe-75dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/75dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-adobe-utopia-100dpi/template b/srcpkgs/font-adobe-utopia-100dpi/template index a23b787804..96ebc0537b 100644 --- a/srcpkgs/font-adobe-utopia-100dpi/template +++ b/srcpkgs/font-adobe-utopia-100dpi/template @@ -2,29 +2,18 @@ pkgname=font-adobe-utopia-100dpi version=1.0.4 revision=2 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-utils" +depends="font-util" +font_dirs="/usr/share/fonts/X11/100dpi" short_desc="100dpi Adobe Utopia PCF fonts" homepage="http://xorg.freedesktop.org/" license="opensource" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5 -long_desc=" - These are the PCF versions of the following Adobe fonts for 100dpi displays: - - Adobe Utopia - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-adobe-utopia-100dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/100dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-adobe-utopia-75dpi/template b/srcpkgs/font-adobe-utopia-75dpi/template index 661d45b8b6..41db385a2a 100644 --- a/srcpkgs/font-adobe-utopia-75dpi/template +++ b/srcpkgs/font-adobe-utopia-75dpi/template @@ -2,29 +2,18 @@ pkgname=font-adobe-utopia-75dpi version=1.0.4 revision=2 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" +depends="font-util" +font_dirs="/usr/share/fonts/X11/75dpi" short_desc="100dpi Adobe Utopia PCF fonts" homepage="http://xorg.freedesktop.org/" license="opensource" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94 -long_desc=" - These are the PCF versions of the following Adobe fonts for 75dpi displays: - - Adobe Utopia - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-adobe-utopia-75dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/75dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-adobe-utopia-type1/template b/srcpkgs/font-adobe-utopia-type1/template index 8997eb67f2..0d3be175ad 100644 --- a/srcpkgs/font-adobe-utopia-type1/template +++ b/srcpkgs/font-adobe-utopia-type1/template @@ -1,30 +1,19 @@ # Template build file for 'font-adobe-utopia-type1'. pkgname=font-adobe-utopia-type1 version=1.0.4 +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/Type1" short_desc="Adobe Utopia Type1 fonts" homepage="http://xorg.freedesktop.org/" license="opensource" maintainer="Juan RP " distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077 -long_desc=" - This are the Type1 versions of the following Adobe fonts: - - Adobe Utopia - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-adobe-utopia-type1_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/Type1" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-alias/template b/srcpkgs/font-alias/template index c7c47cfdf8..24d72a4a71 100644 --- a/srcpkgs/font-alias/template +++ b/srcpkgs/font-alias/template @@ -2,22 +2,11 @@ pkgname=font-alias version=1.0.3 revision=2 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +noarch="yes" build_style=gnu-configure short_desc="Standard aliases for X11 PCF fonts" license="MIT" homepage="http://xorg.freedesktop.org/" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a -long_desc=" - The font-alias package contains a font.alias tables for the various PCF - packages of modular Xorg. It maps common legacy names to full font - descriptors. The most important alias is fixed, which is needed for - the X server to run." - -font-alias_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bh-100dpi/template b/srcpkgs/font-bh-100dpi/template index 00f0749a8c..423081400d 100644 --- a/srcpkgs/font-bh-100dpi/template +++ b/srcpkgs/font-bh-100dpi/template @@ -1,32 +1,19 @@ # Template build file for 'font-bh-100dpi'. pkgname=font-bh-100dpi version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/100dpi" short_desc="Standard 100dpi Bigelow and Holmes PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481 -long_desc=" - These are the PCF versions of the following Bigelow and Holmes fonts - for 100dpi displays: - - Lucida - - Lucida Bright - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bh-100dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/100dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bh-75dpi/template b/srcpkgs/font-bh-75dpi/template index d9ee4f5b9a..5f4ff3768e 100644 --- a/srcpkgs/font-bh-75dpi/template +++ b/srcpkgs/font-bh-75dpi/template @@ -1,32 +1,19 @@ # Template build file for 'font-bh-75dpi'. pkgname=font-bh-75dpi version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/75dpi" short_desc="Standard 75dpi Bigelow and Holmes PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c -long_desc=" - These are the PCF versions of the following Bigelow and Holmes fonts - for 75dpi displays: - - Lucida - - Lucida Bright - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bh-75dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/75dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bh-lucidatypewriter-100dpi/template b/srcpkgs/font-bh-lucidatypewriter-100dpi/template index 949058e50d..129104d698 100644 --- a/srcpkgs/font-bh-lucidatypewriter-100dpi/template +++ b/srcpkgs/font-bh-lucidatypewriter-100dpi/template @@ -2,30 +2,18 @@ pkgname=font-bh-lucidatypewriter-100dpi version=1.0.3 revision=2 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" +depends="font-util" +font_dirs="/usr/share/fonts/X11/100dpi" short_desc="100dpi Bigelow and Holmes Lucida Typewriter PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb -long_desc=" - This are the PCF versions of the following Bigelow and Holmes fonts - for 100dpi displays: - - Lucida Typewriter - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bh-lucidatypewriter-100dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/100dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bh-lucidatypewriter-75dpi/template b/srcpkgs/font-bh-lucidatypewriter-75dpi/template index a88e4dbcd1..1fadab3cd4 100644 --- a/srcpkgs/font-bh-lucidatypewriter-75dpi/template +++ b/srcpkgs/font-bh-lucidatypewriter-75dpi/template @@ -1,31 +1,19 @@ # Template build file for 'font-bh-lucidatypewriter-75dpi'. pkgname=font-bh-lucidatypewriter-75dpi version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/75dpi" short_desc="75dpi Bigelow and Holmes Lucida Typewriter PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31 -long_desc=" - This are the PCF versions of the following Bigelow and Holmes fonts - for 75dpi displays: - - Lucida Typewriter - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bh-lucidatypewriter-75dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/75dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bh-ttf/template b/srcpkgs/font-bh-ttf/template index 901fbb0e30..abd499c709 100644 --- a/srcpkgs/font-bh-ttf/template +++ b/srcpkgs/font-bh-ttf/template @@ -1,32 +1,19 @@ # Template build file for 'font-bh-ttf'. pkgname=font-bh-ttf version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/TTF" short_desc="Standard Bigelow and Holmes TrueType fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=1b4bea63271b4db0726b5b52c97994c3313b6023510349226908090501abd25f -long_desc=" - These are the TrueType versions of the following Bigelow and Holmes fonts: - - Luxi Mono - - Luxi Sans - - Luxi Serif - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bh-ttf_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/TTF" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bh-type1/template b/srcpkgs/font-bh-type1/template index afb6794ecd..07b0b0b9e6 100644 --- a/srcpkgs/font-bh-type1/template +++ b/srcpkgs/font-bh-type1/template @@ -1,32 +1,19 @@ # Template build file for 'font-bh-type1'. pkgname=font-bh-type1 version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/Type1" short_desc="Standard Bigelow and Holmes Type1 fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1 -long_desc=" - This are the Type1 versions of the following Bigelow and Holmes fonts: - - Luxi Mono - - Luxi Sans - - Luxi Serif - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bh-type1_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/Type1" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bitstream-100dpi/template b/srcpkgs/font-bitstream-100dpi/template index c6141447c8..33a96eb4ab 100644 --- a/srcpkgs/font-bitstream-100dpi/template +++ b/srcpkgs/font-bitstream-100dpi/template @@ -1,32 +1,19 @@ # Template build file for 'font-bitstream-100dpi'. pkgname=font-bitstream-100dpi version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/100dpi" short_desc="Standard 100dpi Bitstream PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce -long_desc=" - This are the PCF versions of the following Bitstream fonts for - 100dpi displays: - - Charter - - Terminal - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bitstream-100dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/100dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bitstream-75dpi/template b/srcpkgs/font-bitstream-75dpi/template index 4187670a4e..2538c42767 100644 --- a/srcpkgs/font-bitstream-75dpi/template +++ b/srcpkgs/font-bitstream-75dpi/template @@ -1,32 +1,19 @@ # Template build file for 'font-bitstream-75dpi'. pkgname=font-bitstream-75dpi version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/75dpi" short_desc="Standard 100dpi Bitstream PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e -long_desc=" - These are the PCF versions of the following Bitstream fonts for - 75dpi displays: - - Charter - - Terminal - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bitstream-75dpi_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/75dpi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bitstream-speedo/template b/srcpkgs/font-bitstream-speedo/template index e732c49062..ded1119832 100644 --- a/srcpkgs/font-bitstream-speedo/template +++ b/srcpkgs/font-bitstream-speedo/template @@ -2,30 +2,19 @@ pkgname=font-bitstream-speedo version=1.0.0 revision=2 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config bdftopcf" makedepends="font-util" +depends="font-util" +font_dirs="/usr/lib/X11/fonts/Speedo" short_desc="Standard Speedo Bitstream PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=99ac01786ac400cc7407f1c427b92c5ff1ac5a31ce7d5907b7ad3c969214f6e6 -long_desc=" - These are the PCF versions of the following Speedo Bitstream fonts: - - Speedo - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bitstream-speedo_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/lib/X11/fonts/Speedo" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-bitstream-type1/template b/srcpkgs/font-bitstream-type1/template index a19bb31979..865e35e454 100644 --- a/srcpkgs/font-bitstream-type1/template +++ b/srcpkgs/font-bitstream-type1/template @@ -1,30 +1,19 @@ # Template build file for 'font-bitstream-type1'. pkgname=font-bitstream-type1 version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/Type1" short_desc="Standard Type1 Bitstream PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688 -long_desc=" - These are the PCF versions of the following Type1 Bitstream fonts: - - Type1 - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-bitstream-type1_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/Type1" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-cursor-misc/template b/srcpkgs/font-cursor-misc/template index b3e872b500..0c294dc448 100644 --- a/srcpkgs/font-cursor-misc/template +++ b/srcpkgs/font-cursor-misc/template @@ -1,30 +1,19 @@ # Template build file for 'font-cursor-misc'. pkgname=font-cursor-misc version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/misc" short_desc="Standard X11 cursors in PCF format" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635 -long_desc=" - The font-cursor-misc package provides around 75 cursors in the - portable PCF format. These include the X cursor, arrows, clock - cursor, crosshair, fleur cursor, iron cross, sailboat cursor, and - many more." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-cursor-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-daewoo-misc/template b/srcpkgs/font-daewoo-misc/template index b8b6bbcb08..0475563213 100644 --- a/srcpkgs/font-daewoo-misc/template +++ b/srcpkgs/font-daewoo-misc/template @@ -1,29 +1,19 @@ # Template build file for 'font-daewoo-misc'. pkgname=font-daewoo-misc version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/misc" short_desc="Daewoo Gothic PCF format" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8 -long_desc=" - These are the PCF versions of the Daewoo Gothic fonts for 100dpi displays. - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-daewoo-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-dec-misc/template b/srcpkgs/font-dec-misc/template index f947a5c5bd..c422c1fe7e 100644 --- a/srcpkgs/font-dec-misc/template +++ b/srcpkgs/font-dec-misc/template @@ -1,31 +1,19 @@ # Template build file for 'font-dec-misc'. pkgname=font-dec-misc version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/misc" short_desc="DEC cursor and session PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b -long_desc=" - These are the PCF versions of the following DEC fonts for 100dpi displays: - - Cursor - - Session - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-dec-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-ibm-type1/template b/srcpkgs/font-ibm-type1/template index 2523c2f529..f5f52e41e8 100644 --- a/srcpkgs/font-ibm-type1/template +++ b/srcpkgs/font-ibm-type1/template @@ -1,29 +1,19 @@ # Template build file for 'font-ibm-type1'. pkgname=font-ibm-type1 version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/Type1" short_desc="IBM Courier Type1 fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df -long_desc=" - These are the Type1 versions of the IBM Courier fonts. - - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-ibm-type1_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/Type1" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-isas-misc/template b/srcpkgs/font-isas-misc/template index cea93de310..c96e88cd91 100644 --- a/srcpkgs/font-isas-misc/template +++ b/srcpkgs/font-isas-misc/template @@ -1,28 +1,19 @@ # Template build file for 'font-isas-misc'. pkgname=font-isas-misc version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/misc" short_desc="72dpi PCF versions of the Chinese Song Ti fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867 -long_desc=" - These are the PCF versions of the Song Si fonts for 72dpi displays. - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-isas-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-misc-misc/template b/srcpkgs/font-misc-misc/template index 8ffde9c9ae..06fd6a6316 100644 --- a/srcpkgs/font-misc-misc/template +++ b/srcpkgs/font-misc-misc/template @@ -1,28 +1,19 @@ # Template build file for 'font-misc-misc'. pkgname=font-misc-misc version=1.1.2 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/misc" short_desc="Standard X11 fixed PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794 -long_desc=" - The standard X11 public domain fixed font that you can - share and enjoy. It is in PCF format." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-misc-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-mutt-misc/template b/srcpkgs/font-mutt-misc/template index 73d0808c98..1e42449128 100644 --- a/srcpkgs/font-mutt-misc/template +++ b/srcpkgs/font-mutt-misc/template @@ -1,28 +1,19 @@ # Template build file for 'font-mutt-misc'. pkgname=font-mutt-misc version=1.0.3 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/share/fonts/X11/misc" short_desc="100dpi PCF versions of the ClearlyU fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f -long_desc=" - These are the PCF versions of the ClearlyU fonts for 100dpi displays. - This is from the modular Xorg project." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-mutt-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-sony-misc/template b/srcpkgs/font-sony-misc/template index 79d6e55b20..85ca2e08d0 100644 --- a/srcpkgs/font-sony-misc/template +++ b/srcpkgs/font-sony-misc/template @@ -1,28 +1,19 @@ # Template build file for 'font-sony-misc'. pkgname=font-sony-misc version=1.0.0 -distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" +revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config bdftopcf font-util" -revision=2 +depends="font-util" +font_dirs="/usr/lib/X11/fonts/misc" short_desc="Standard X11 sony PCF fonts" homepage="http://xorg.freedesktop.org/" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2" checksum=1ae93ae76020b57cb0054ba9f33b4d5aec71342c6596750c07303d5c53452e23 -long_desc=" - The standard X11 sony fonts that you can share and enjoy. - It is in PCF format." post_install() { rm -f ${DESTDIR}/${font_dirs}/fonts.* } - -font-sony-misc_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/lib/X11/fonts/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-unifont-bdf/template b/srcpkgs/font-unifont-bdf/template index e75013f2ca..9603d0cff3 100644 --- a/srcpkgs/font-unifont-bdf/template +++ b/srcpkgs/font-unifont-bdf/template @@ -3,9 +3,12 @@ pkgname=font-unifont-bdf version=5.1.20080820 revision=1 create_wrksrc=yes +noarch=yes homepage="http://unifoundry.com/unifont.html" distfiles="http://unifoundry.com/unifont-${version}.bdf.gz" makedepends="font-util" +depends="font-util" +font_dirs="/usr/share/fonts/misc" short_desc="GNU Unifont Glyphs" maintainer="Juan RP " license="GPL-2, Freeware" @@ -14,20 +17,9 @@ long_desc=" This page contains GNU Unifont, with glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP)." -noarch=yes - do_install() { gunzip -c ${XBPS_SRCDISTDIR}/unifont-${version}.bdf.gz \ > unifont-${version}.bdf vinstall unifont-${version}.bdf \ 644 usr/share/fonts/misc unifont.bdf } - -font-unifont-bdf_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/font-util/template b/srcpkgs/font-util/template index d7327844f5..134ed54333 100644 --- a/srcpkgs/font-util/template +++ b/srcpkgs/font-util/template @@ -4,6 +4,11 @@ version=1.3.0 revision=2 build_style=gnu-configure hostmakedepends="pkg-config bdftopcf" +# +# These aren't really required, but this is to centralize the +# requirement of dependent packages. +# +depends="font-alias expat freetype fontconfig mkfontdir mkfontscale" short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts" maintainer="Juan RP " license="MIT" @@ -16,14 +21,3 @@ long_desc=" and generating truncated BDF font from ISO 10646-1-encoded BDF font. It also provides mapping-files (character set tables) and the fontutil pkg-config and autoconf macro files." - -font-util_package() { - # - # These aren't really required, but this is to centralize the - # requirement of dependent packages. - # - depends="font-alias expat freetype fontconfig mkfontdir mkfontscale" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fontcacheproto/template b/srcpkgs/fontcacheproto/template index 2f5132818c..d50be71a44 100644 --- a/srcpkgs/fontcacheproto/template +++ b/srcpkgs/fontcacheproto/template @@ -1,21 +1,12 @@ # Template build file for 'fontcacheproto'. pkgname=fontcacheproto version=0.1.2 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +noarch="yes" +build_style=gnu-configure short_desc="Fontcache extension headers from X.org" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=48063ed49b200927376645f9ffe65faa39af84d59ba6f60f2abb2f9c6fa3d9f9 -long_desc=" - This package provides the Fontcache extension headers from the - modular X.org X11 project." - -fontcacheproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fontconfig/template b/srcpkgs/fontconfig/template index 8f12f13716..cc73ba4e99 100644 --- a/srcpkgs/fontconfig/template +++ b/srcpkgs/fontconfig/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static --enable-docs --with-cache-dir=/var/cache/$pkgname" hostmakedepends="pkg-config" makedepends="expat-devel zlib-devel freetype-devel" +conf_files="/etc/fonts/fonts.conf" short_desc="Library for configuring and customizing font access" maintainer="Juan RP " homepage="http://www.fontconfig.org" @@ -24,10 +25,3 @@ fontconfig-devel_package() { vmove usr/share/doc } } - -fontconfig_package() { - conf_files="/etc/fonts/fonts.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fontsproto/template b/srcpkgs/fontsproto/template index 15f7645a4d..ce6d9973de 100644 --- a/srcpkgs/fontsproto/template +++ b/srcpkgs/fontsproto/template @@ -1,21 +1,12 @@ # Template build file for 'fontsproto'. pkgname=fontsproto version=2.1.0 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +noarch="yes" +build_style=gnu-configure short_desc="Fonts extension headers from X.org" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=5a9af61dc9142488c9ba6e4ae30a9d970ea0f889a1ab7f59de1c1898c83aeb35 -long_desc=" - This package provides the fonts extension headers from the modular - X.org X11 project." - -fontsproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/foobillard++/template b/srcpkgs/foobillard++/template index 66e39cf6ea..785f7df16e 100644 --- a/srcpkgs/foobillard++/template +++ b/srcpkgs/foobillard++/template @@ -6,6 +6,7 @@ wrksrc=foobillardplus-${version} homepage="http://foobillardplus.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/foobillardplus/foobillardplus-$version.tar.gz" makedepends="freetype-devel libpng-devel>=1.6 MesaLib-devel SDL_net-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="An OpenGL billard game - fork of foobillard" maintainer="Juan RP " license="GPL-2" @@ -36,10 +37,3 @@ do_install() { vinstall foobillardplus.xbm 644 usr/share/pixmaps find ${DESTDIR} -depth -type d -name .svn -exec rm -rf {} \; } - -foobillard++_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/foomatic-db-engine/template b/srcpkgs/foomatic-db-engine/template index 9dd97f6489..bb7143c69b 100644 --- a/srcpkgs/foomatic-db-engine/template +++ b/srcpkgs/foomatic-db-engine/template @@ -1,15 +1,16 @@ # Template file for 'foomatic-db-engine' pkgname=foomatic-db-engine version=4.0.8 -homepage="https://www.openprinting.org/" -distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz" +revision=1 build_style=gnu-configure hostmakedepends="wget perl foomatic-db foomatic-filters ghostscript cups" makedepends="libxml2-devel cups-devel" -revision=1 +depends="${hostmakedepends}" short_desc="OpenPrinting printer support - programs" maintainer="Juan RP " license="GPL-2, MIT" +homepage="https://www.openprinting.org/" +distfiles="https://www.openprinting.org/download/foomatic/$pkgname-$version.tar.gz" checksum=f0c4892ae5566ea2efaae8bd58352fd32001d112f2f9dfff63f7de03b46733e1 long_desc=" Foomatic is a printing system designed to make it easier to set up common @@ -22,10 +23,3 @@ long_desc=" packages. The foomatic-db package includes drivers for most common printers using Ghostscript as the print processor, as well as some common glue code used in other filter systems." - -foomatic-db-engine_package() { - depends="${hostmakedepends}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/foomatic-db-nonfree/template b/srcpkgs/foomatic-db-nonfree/template index f09535049c..a550a56780 100644 --- a/srcpkgs/foomatic-db-nonfree/template +++ b/srcpkgs/foomatic-db-nonfree/template @@ -2,6 +2,7 @@ pkgname=foomatic-db-nonfree version=20130331 revision=2 +noarch="yes" build_style=gnu-configure short_desc="OpenPrinting printer support - nonfree database" homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic" @@ -19,10 +20,3 @@ long_desc=" manufactured-supplied PPD drivers released under non-free licenses. You will probably need the foomatic-db-engine package for this package to be useful." - -foomatic-db-nonfree_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/foomatic-db/template b/srcpkgs/foomatic-db/template index 3fcf337400..179f3a9088 100644 --- a/srcpkgs/foomatic-db/template +++ b/srcpkgs/foomatic-db/template @@ -2,6 +2,7 @@ pkgname=foomatic-db version=20120626 revision=2 +noarch="yes" build_style=gnu-configure short_desc="OpenPrinting printer support - database" homepage="http://www.linuxfoundation.org/collaborate/workgroups/openprinting/databasefoomatic" @@ -18,10 +19,3 @@ long_desc=" This package contains the printer database distributed by OpenPrinting for most common drivers. You will probably need the foomatic-db-engine package for this package to be useful." - -foomatic-db_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/foomatic-filters/template b/srcpkgs/foomatic-filters/template index af3942a753..822e956c19 100644 --- a/srcpkgs/foomatic-filters/template +++ b/srcpkgs/foomatic-filters/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--enable-dbus" hostmakedepends="pkg-config perl enscript" makedepends="dbus-devel cups-devel" +depends="perl" +conf_files="/etc/foomatic/filter.conf" short_desc="OpenPrinting printer support - filters" maintainer="Juan RP " license="GPL-2, MIT" @@ -23,11 +25,3 @@ long_desc=" printer-specific, but spooler-independent PPD file. For use with CUPS, you will need the cups package installed on your system." - -foomatic-filters_package() { - depends="perl" - conf_files="/etc/foomatic/filter.conf" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/foremost/template b/srcpkgs/foremost/template index 7ffb6f5c3b..556797e2da 100644 --- a/srcpkgs/foremost/template +++ b/srcpkgs/foremost/template @@ -2,6 +2,7 @@ pkgname=foremost version=1.5.7 revision=1 +conf_files="/etc/foremost.conf" short_desc="Forensic program to recover lost files" maintainer="Juan RP " license="Public domain, GPL-2" @@ -26,11 +27,3 @@ do_install() { vinstall foremost.8.gz 644 usr/share/man/man8 vinstall foremost.conf 644 etc } - -foremost_package() { - conf_files="/etc/foremost.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/fossil/template b/srcpkgs/fossil/template index aadeb2f0e2..2eaf5fb241 100644 --- a/srcpkgs/fossil/template +++ b/srcpkgs/fossil/template @@ -28,9 +28,3 @@ do_install() { # Install license. vinstall COPYRIGHT-BSD2.txt 644 usr/share/licenses/${pkgname} LICENSE } - -fossil_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fox/template b/srcpkgs/fox/template index 57e9a80777..c04c3431b5 100644 --- a/srcpkgs/fox/template +++ b/srcpkgs/fox/template @@ -35,9 +35,3 @@ fox-utils_package() { vmove usr/share } } - -fox_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/freealut/template b/srcpkgs/freealut/template index f24a2b196d..1795d5bbb0 100644 --- a/srcpkgs/freealut/template +++ b/srcpkgs/freealut/template @@ -1,21 +1,20 @@ # Template file for 'freealut' pkgname=freealut version=1.1.0 -build_style=gnu-configure revision=3 -homepage="http://www.openal.org" -distfiles="http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$version.tar.gz" -makedepends="pkg-config libopenal-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libopenal-devel" short_desc="OpenAL Utility Toolkit (ALUT)" maintainer="davehome " license="LGPL-2.1" +homepage="http://www.openal.org" +distfiles="http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$version.tar.gz" checksum=60d1ea8779471bb851b89b49ce44eecb78e46265be1a6e9320a28b100c8df44f -long_desc=" - freealut is a free implementation of OpenAL's ALUT standard." freealut-devel_package() { depends="libopenal-devel freealut>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/bin vmove usr/include @@ -23,9 +22,3 @@ freealut-devel_package() { vmove "usr/lib/*.a" } } - -freealut_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/freefont-ttf/template b/srcpkgs/freefont-ttf/template index 87c3838b70..3d7b20a933 100644 --- a/srcpkgs/freefont-ttf/template +++ b/srcpkgs/freefont-ttf/template @@ -2,9 +2,12 @@ pkgname=freefont-ttf version=20120503 revision=3 +noarch="yes" wrksrc=freefont-${version} hostmakedepends="unzip" makedepends="font-util xbps-triggers>=0.58" +depends="${makedepends}" +font_dirs="/usr/share/fonts/TTF" short_desc="Free family of scalable outline fonts" maintainer="Juan RP " homepage="http://www.nongnu.org/freefont/" @@ -17,12 +20,3 @@ do_install() { install -m644 ${wrksrc}/*.ttf ${DESTDIR}/usr/share/fonts/TTF vinstall ${FILESDIR}/conf.avail 644 etc/fonts/conf.avail 69-freefont.conf } - -freefont-ttf_package() { - depends="${makedepends}" - noarch="yes" - font_dirs="/usr/share/fonts/TTF" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/freetype/template b/srcpkgs/freetype/template index a2d04b100f..3865945e40 100644 --- a/srcpkgs/freetype/template +++ b/srcpkgs/freetype/template @@ -32,9 +32,3 @@ freetype-devel_package() { vmove usr/lib/pkgconfig } } - -freetype_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fribidi/template b/srcpkgs/fribidi/template index 7db46b7b4b..5655d21283 100644 --- a/srcpkgs/fribidi/template +++ b/srcpkgs/fribidi/template @@ -22,9 +22,3 @@ fribidi-devel_package() { vmove usr/share } } - -fribidi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fs-uae/template b/srcpkgs/fs-uae/template index 487bfcde8b..a54de1f17b 100644 --- a/srcpkgs/fs-uae/template +++ b/srcpkgs/fs-uae/template @@ -14,6 +14,7 @@ long_desc=" hostmakedepends="pkg-config" makedepends="SDL-devel freetype-devel libglib-devel libpng-devel>=1.6 libopenal-devel" +depends="desktop-file-utils hicolor-icon-theme" do_build() { make ${makejobs} @@ -23,10 +24,3 @@ do_install() { make prefix=${DESTDIR}/usr install vinstall ${FILESDIR}/fs-uae.desktop 644 usr/share/applications } - -fs-uae_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fs-utils/template b/srcpkgs/fs-utils/template index 96fb04ff44..b70fd640dd 100644 --- a/srcpkgs/fs-utils/template +++ b/srcpkgs/fs-utils/template @@ -15,9 +15,3 @@ do_fetch() { msg_normal "Fetching source from $url ...\n" git clone -b${version} ${url} ${pkgname}-${version} } - -fs-utils_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fsarchiver/template b/srcpkgs/fsarchiver/template index 21000408fe..1b3e29abd8 100644 --- a/srcpkgs/fsarchiver/template +++ b/srcpkgs/fsarchiver/template @@ -12,9 +12,3 @@ license="GPL-2" homepage="http://www.fsarchiver.org/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=409add97337783cb135f15c07318acf5067f5837f07bd62c7e358f3dcf5dced5 - -fsarchiver_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ftgl/template b/srcpkgs/ftgl/template index dde71b579c..ce72bc3286 100644 --- a/srcpkgs/ftgl/template +++ b/srcpkgs/ftgl/template @@ -29,9 +29,3 @@ ftgl-devel_package() { vmove usr/share/doc } } - -ftgl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ftjam/template b/srcpkgs/ftjam/template index 9948d9f6d3..9afe0db21a 100644 --- a/srcpkgs/ftjam/template +++ b/srcpkgs/ftjam/template @@ -19,11 +19,3 @@ long_desc=" post_install() { vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/ftjam } - -ftjam_package() { - replaces="jam>=0" - provides="jam-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fuse-archivemount/template b/srcpkgs/fuse-archivemount/template index e57ffe78cc..7d384fda00 100644 --- a/srcpkgs/fuse-archivemount/template +++ b/srcpkgs/fuse-archivemount/template @@ -12,9 +12,3 @@ license="LGPL-2" homepage="http://www.cybernoia.de/software/archivemount/" distfiles="${homepage}/${pkgname/fuse-/}-${version}.tar.gz" checksum=e78899a8b7c9cb43fa4526d08c54a9e171475c00bf095770b8779a33e37661ff - -fuse-archivemount_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/fuse-exfat/template b/srcpkgs/fuse-exfat/template index ff872feb31..e00e8e06e7 100644 --- a/srcpkgs/fuse-exfat/template +++ b/srcpkgs/fuse-exfat/template @@ -4,6 +4,7 @@ version=1.0.0 revision=1 hostmakedepends="scons" makedepends="fuse-devel exfat-utils>=${version}" +depends="exfat-utils>=${version}" short_desc="Free exFAT file system implementation" maintainer="Juan RP " license="GPL-3" @@ -18,10 +19,3 @@ do_install() { install -Dm444 fuse/mount.exfat-fuse.8 \ ${DESTDIR}/usr/share/man/man8/mount.exfat-fuse.8 } - -fuse-exfat_package() { - depends="exfat-utils>=${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/fuse/template b/srcpkgs/fuse/template index b3fcb53870..24445d2189 100644 --- a/srcpkgs/fuse/template +++ b/srcpkgs/fuse/template @@ -39,9 +39,3 @@ fuse-devel_package() { vmove "usr/lib/*.so" } } - -fuse_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template index 616d44fc02..53c12026c3 100644 --- a/srcpkgs/gajim/template +++ b/srcpkgs/gajim/template @@ -2,23 +2,16 @@ pkgname=gajim version=0.15.3 revision=1 +noarch=yes build_style=gnu-configure configure_args="--enable-site-packages" +hostmakedepends="intltool python" +makedepends="dbus-python pygtk-devel pyopenssl pysqlite" +depends="python dbus-python pysqlite pyopenssl pygtk" +pycompile_module="gajim" short_desc="Full featured Jabber/XMPP client" maintainer="pancake " homepage="https://www.gajim.org" license="GPL-3" distfiles="https://gajim.org/downloads/0.15/gajim-$version.tar.bz2" checksum=4848e98b25b523e28014528a8b89289bf987d5ce9419dd78ccff74a35aa583f4 - -hostmakedepends="intltool python" -makedepends="dbus-python pygtk-devel pyopenssl pysqlite" - -gajim_package() { - noarch=yes - depends="python dbus-python pysqlite pyopenssl pygtk" - pycompile_module="gajim" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template index 14070f92eb..ff9159c7a5 100644 --- a/srcpkgs/garcon/template +++ b/srcpkgs/garcon/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="glib-devel libxfce4util-devel" +conf_files="/etc/xdg/menus/xfce-applications.menu" short_desc="Glib/GIO freedesktop.org compliant menu implementation" maintainer="Juan RP " homepage="http://wiki.xfce.org/dev/garcon" @@ -32,10 +33,3 @@ garcon-devel_package() { vmove usr/share/gtk-doc } } - -garcon_package() { - conf_files="/etc/xdg/menus/xfce-applications.menu" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gawk/template b/srcpkgs/gawk/template index dadc982c0c..dc7c889c7c 100644 --- a/srcpkgs/gawk/template +++ b/srcpkgs/gawk/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure configure_args="--with-readline" makedepends="readline-devel" +conflicts="chroot-gawk>=0" short_desc="The GNU awk utility" maintainer="Juan RP " license="GPL-3" @@ -16,10 +17,3 @@ pre_configure() { # Create symlinks for bins and manpages. sed -i -e "s|\$(LN)|\$(LN_S)|g" Makefile.in doc/Makefile.in } - -gawk_package() { - conflicts="chroot-gawk>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template index 00584e5a0d..d06644aca3 100644 --- a/srcpkgs/gc/template +++ b/srcpkgs/gc/template @@ -35,9 +35,3 @@ gc-devel_package() { vmove usr/lib/pkgconfig } } - -gc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template index a37b2fe01f..057c6a1fcb 100644 --- a/srcpkgs/gcc/template +++ b/srcpkgs/gcc/template @@ -12,6 +12,7 @@ checksum=2f7c37eb4fc14422ff2358a9ef59c974a75ab41204ef0e49fc34ab1d8981a9c3 hostmakedepends="perl flex" makedepends="zlib-devel libmpc-devel>=1.0.1_2 ppl-devel>=1.0 cloog-devel isl-devel libfl-devel" +depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}" if [ -z "$CROSS_BUILD" ]; then # Required by gcj @@ -403,17 +404,3 @@ gcc-c++_package() { vmove usr/share/man/man1/g++.1 } } - -gcc_package() { - depends="binutils libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}" - pkg_install() { - if [ -d ${DESTDIR}/usr/lib/pkgconfig ]; then - rmdir ${DESTDIR}/usr/lib/pkgconfig - fi - if [ -d ${DESTDIR}/usr/lib/security ]; then - rmdir ${DESTDIR}/usr/lib/security - fi - rm -rf ${DESTDIR}/usr/include/c++ - vmove all - } -} diff --git a/srcpkgs/gcr/template b/srcpkgs/gcr/template index 3e2c9fb1cc..d779d2b98d 100644 --- a/srcpkgs/gcr/template +++ b/srcpkgs/gcr/template @@ -8,6 +8,8 @@ configure_args="--enable-introspection --disable-update-mime hostmakedepends="which pkg-config intltool gnome-doc-utils gobject-introspection libtasn1-tools gnupg perl-XML-Parser" makedepends="gtk+3-devel p11-kit-devel libgcrypt-devel vala-devel" +depends="hicolor-icon-theme desktop-file-utils" +replaces="gnome-keyring<3.3.92" short_desc="GNOME crypto package" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -39,11 +41,3 @@ gcr-devel_package() { vmove "usr/lib/*.so" } } - -gcr_package() { - replaces="gnome-keyring<3.3.92" - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gd/template b/srcpkgs/gd/template index bdeef1a0bc..757e8f7e5e 100644 --- a/srcpkgs/gd/template +++ b/srcpkgs/gd/template @@ -33,9 +33,3 @@ gd-progs_package() { vmove usr/bin } } - -gd_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gdb/template b/srcpkgs/gdb/template index 85dfb1d505..9fb8ba8a48 100644 --- a/srcpkgs/gdb/template +++ b/srcpkgs/gdb/template @@ -5,6 +5,8 @@ revision=1 build_style=gnu-configure configure_args="--disable-nls --with-system-readline --with-system-gdbinit=/etc/gdb/gdbinit" makedepends="ncurses-devel zlib-devel readline-devel" +conf_files="/etc/gdb/gdbinit" +pycompile_dirs="usr/share/gdb/python/gdb" short_desc="The GNU Debugger" maintainer="Juan RP " homepage="http://www.gnu.org/software/gdb/" @@ -42,11 +44,3 @@ post_install() { rm -f ${DESTDIR}/usr/share/info/${f}.info* done } - -gdb_package() { - conf_files="/etc/gdb/gdbinit" - pycompile_dirs="usr/share/gdb/python/gdb" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gdbm/template b/srcpkgs/gdbm/template index 1104a75592..702a77d6ea 100644 --- a/srcpkgs/gdbm/template +++ b/srcpkgs/gdbm/template @@ -39,9 +39,3 @@ gdbm-devel_package() { vmove usr/share/man } } - -gdbm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index a2b8ccda3d..0f5692a0fa 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--without-libjasper --with-included-loaders=png --with-x11" hostmakedepends="perl pkg-config glib-devel" makedepends="libglib-devel libpng-devel>=1.6 libjpeg-turbo-devel tiff-devel libX11-devel" +triggers="gtk-pixbuf-loaders" short_desc="An Image loading library for The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://www.gtk.org/" @@ -52,10 +53,3 @@ gdk-pixbuf-devel_package() { vmove usr/share/gtk-doc } } - -gdk-pixbuf_package() { - triggers="gtk-pixbuf-loaders" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gdl/template b/srcpkgs/gdl/template index f8f61a8f9f..27248c581a 100644 --- a/srcpkgs/gdl/template +++ b/srcpkgs/gdl/template @@ -30,9 +30,3 @@ gdl-doc_package() { vmove usr/share/gtk-doc } } - -gdl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gdm/template b/srcpkgs/gdm/template index 080adbffc6..40eb695f71 100644 --- a/srcpkgs/gdm/template +++ b/srcpkgs/gdm/template @@ -12,6 +12,20 @@ hostmakedepends="pkg-config itstool intltool which gnome-doc-utils gobject-intro makedepends="pam-devel nss-devel accountsservice-devel gtk+3-devel>=3.10 upower-devel libcanberra-devel systemd-devel xrdb dconf>=0.16 hicolor-icon-theme xorg-server gnome-session>=3.10 gnome-settings-daemon>=3.10" +conf_files=" + /etc/gdm/custom.conf + /etc/pam.d/gdm + /etc/pam.d/gdm-autologin + /etc/pam.d/gdm-fingerprint + /etc/pam.d/gdm-password + /etc/pam.d/gdm-smartcard + /etc/pam.d/gdm-welcome" +# Create the 'gdm' system user/group. +system_accounts="gdm" +gdm_homedir="/var/lib/gdm" +systemd_services="gdm.service off" +depends="xrdb xorg-server hicolor-icon-theme + dconf>=0.18 gnome-session>=3.10 gnome-settings-daemon>=3.10" short_desc="GNOME Display Manager" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -61,23 +75,3 @@ gdm-devel_package() { vmove "usr/lib/*.so" } } - -gdm_package() { - conf_files=" - /etc/gdm/custom.conf - /etc/pam.d/gdm - /etc/pam.d/gdm-autologin - /etc/pam.d/gdm-fingerprint - /etc/pam.d/gdm-password - /etc/pam.d/gdm-smartcard - /etc/pam.d/gdm-welcome" - # Create the 'gdm' system user/group. - system_accounts="gdm" - gdm_homedir="/var/lib/gdm" - systemd_services="gdm.service off" - depends="xrdb xorg-server hicolor-icon-theme - dconf>=0.18 gnome-session>=3.10 gnome-settings-daemon>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/geany/template b/srcpkgs/geany/template index 8ae6d7f0c9..55077d92f2 100644 --- a/srcpkgs/geany/template +++ b/srcpkgs/geany/template @@ -4,6 +4,7 @@ version=1.23 revision=1 build_style=waf makedepends="pkg-config intltool python gtk+-devel vte-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Fast and lightweight IDE" maintainer="davehome " license="GPL-2" @@ -18,7 +19,7 @@ long_desc=" geany-plugins_package() { depends="geany>=$version" - short_desc="${short_desc} - builtin plugins" + short_desc+=" - builtin plugins" pkg_install() { vmove usr/lib/geany } @@ -26,16 +27,9 @@ geany-plugins_package() { geany-devel_package() { depends="gtk+-devel" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -geany_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template index bef64c8d5c..9f812cb0c4 100644 --- a/srcpkgs/geary/template +++ b/srcpkgs/geary/template @@ -3,21 +3,14 @@ pkgname=geary version=0.4.2 revision=1 build_style=cmake +hostmakedepends="pkg-config intltool cmake desktop-file-utils" +makedepends="vala-devel webkitgtk-devel libgee08-devel libsecret-devel + libgnome-keyring-devel gmime-devel libunique-devel sqlite-devel libnotify-devel + libcanberra-devel libgirepository-devel" +depends="gir-freedesktop hicolor-icon-theme desktop-file-utils" short_desc="A lightweight email program for the GNOME desktop" maintainer="Juan RP " license="GPL-3" homepage="http://yorba.org/geary/" distfiles="http://yorba.org/download/geary/${version%.*}/geary-${version}.tar.xz" checksum=e111e1f650afb8fe35d3a9f8ce19f698ee41263d5b21b31bf0b5bd4a24a207b3 - -hostmakedepends="pkg-config intltool cmake desktop-file-utils" -makedepends="vala-devel webkitgtk-devel libgee08-devel libsecret-devel - libgnome-keyring-devel gmime-devel libunique-devel sqlite-devel libnotify-devel - libcanberra-devel libgirepository-devel" - -geary_package() { - depends="gir-freedesktop hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index d18977c14c..137cc00f6d 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool itstool gnome-doc-utils makedepends=" gtksourceview-devel>=3.10 libpeas-devel>=1.9 enchant-devel pygobject-devel gsettings-desktop-schemas-devel>=3.10 zeitgeist-devel iso-codes" +depends="zeitgeist hicolor-icon-theme desktop-file-utils iso-codes" short_desc="A text editor for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -27,10 +28,3 @@ gedit-devel_package() { vmove usr/share/gedit/gir-1.0 } } - -gedit_package() { - depends="zeitgeist hicolor-icon-theme desktop-file-utils iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/geeqie/template b/srcpkgs/geeqie/template index f1d836ac49..56fcf221ec 100644 --- a/srcpkgs/geeqie/template +++ b/srcpkgs/geeqie/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure configure_args="--disable-gps" makedepends="pkg-config intltool gtk+-devel exiv2-devel lcms-devel" +depends="desktop-file-utils" short_desc="Lightweight Gtk+ based image viewer" maintainer="Juan RP " license="GPL-3" @@ -19,10 +20,3 @@ long_desc=" geeqie works on files and directories, there is no need to import images fast preview for many raw image formats tools for image comparison, sorting and managing photo collection" - -geeqie_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gegl/template b/srcpkgs/gegl/template index 300b9a4d55..0ccc576bb7 100644 --- a/srcpkgs/gegl/template +++ b/srcpkgs/gegl/template @@ -23,9 +23,3 @@ gegl-devel_package() { vmove usr/lib/pkgconfig } } - -gegl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template index 5ac9acb572..d423e40ddf 100644 --- a/srcpkgs/gendesk/template +++ b/srcpkgs/gendesk/template @@ -20,9 +20,3 @@ do_install() { vinstall default.png 644 usr/share/pixmaps vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -gendesk_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gengetopt/template b/srcpkgs/gengetopt/template index beaeac5312..96d018e068 100644 --- a/srcpkgs/gengetopt/template +++ b/srcpkgs/gengetopt/template @@ -2,6 +2,7 @@ pkgname=gengetopt version=2.22.5 revision=1 +disable_parallel_build=yes build_style=gnu-configure hostmakedepends="flex" short_desc="A tool to write cli option parsing code for C programs" @@ -13,11 +14,3 @@ checksum=3b6fb3240352b0eb0c5b8583b58b62cbba58167cef5a7e82fa08a7f968ed2137 long_desc=" This program generates a C function that uses getopt_long function to parse the command line options, to validate them and fills a struct." - -disable_parallel_build=yes - -gengetopt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/geoclue/template b/srcpkgs/geoclue/template index b10c2b404f..29e8a2db14 100644 --- a/srcpkgs/geoclue/template +++ b/srcpkgs/geoclue/template @@ -28,9 +28,3 @@ geoclue-devel_package() { vmove "usr/lib/*.so" } } - -geoclue_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/geoclue2/template b/srcpkgs/geoclue2/template index 2ecf76d37d..a2a98d591f 100644 --- a/srcpkgs/geoclue2/template +++ b/srcpkgs/geoclue2/template @@ -7,6 +7,7 @@ build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="json-glib-devel libsoup-gnome-devel>=2.44" +depends="libsoup>=2.44" short_desc="The Geoinformation Service (2.x series)" homepage="http://www.freedesktop.org/wiki/Software/GeoClue" license="LGPL-2.1" @@ -17,10 +18,3 @@ long_desc=" Geoclue is a modular geoinformation service built on top of the D-Bus messaging system. The goal of the Geoclue project is to make creating location-aware applications as simple as possible." - -geoclue2_package() { - depends="libsoup>=2.44" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template index 2c7145299f..250fe3be03 100644 --- a/srcpkgs/geocode-glib/template +++ b/srcpkgs/geocode-glib/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="json-glib-devel>=0.16.2 libsoup-gnome-devel>=2.44" +depends="json-glib>=0.16.2 libsoup-gnome>=2.44" short_desc="GLib library for geocoding and reverse geocoding" homepage="http://www.gnome.org" license="LGPL-2.1" @@ -30,10 +31,3 @@ geocode-glib-devel_package() { vmove usr/share/gir-1.0 } } - -geocode-glib_package() { - depends="json-glib>=0.16.2 libsoup-gnome>=2.44" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/geoip/template b/srcpkgs/geoip/template index 2f0781fdaf..ce8220f0f0 100644 --- a/srcpkgs/geoip/template +++ b/srcpkgs/geoip/template @@ -6,6 +6,7 @@ wrksrc="GeoIP-${version}" build_style=gnu-configure configure_args="--mandir=/usr/share/man --sysconfdir=/etc/geoip" makedepends="zlib-devel" +conf_files="/etc/geoip/GeoIP.conf" short_desc="Non-DNS IP-to-country resolver C library and utilities" maintainer="davehome " homepage="http://www.maxmind.com/app/c" @@ -19,7 +20,7 @@ long_desc=" real-time." libgeoip_package() { - short_desc="${short_desc} (Runtime library)" + short_desc+=" - Runtime library" pkg_install() { vmove "usr/lib/*.so*" vmove usr/share/GeoIP @@ -27,18 +28,10 @@ libgeoip_package() { } geoip-devel_package() { + short_desc+=" - development files" depends="zlib-devel libgeoip>=${version}" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -geoip_package() { - conf_files="/etc/geoip/GeoIP.conf" - pkg_install() { - vmove etc - vmove usr/bin - vmove usr/share - } -} diff --git a/srcpkgs/getmail/template b/srcpkgs/getmail/template index 64ca656bf8..42caed6a88 100644 --- a/srcpkgs/getmail/template +++ b/srcpkgs/getmail/template @@ -2,21 +2,15 @@ pkgname=getmail version=4.43.0 revision=1 +noarch=yes build_style=python-module hostmakedepends="python-devel" makedepends="${hostmakedepends}" +depends="python" +pycompile_module="getmailcore" short_desc="A POP3 mail retriever with reliable Maildir and command delivery" maintainer="Juan RP " license="GPL-2" homepage="http://pyropus.ca/software/getmail" distfiles="http://pyropus.ca/software/getmail/old-versions/$pkgname-$version.tar.gz" checksum=1e22458966344983d38affd2c443929171d48a1107cf8298293e5d291a916c29 - -getmail_package() { - pycompile_module="getmailcore" - depends="python" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gettext-tiny/template b/srcpkgs/gettext-tiny/template index 04e8758b9a..d2ed7cceab 100644 --- a/srcpkgs/gettext-tiny/template +++ b/srcpkgs/gettext-tiny/template @@ -10,6 +10,7 @@ distfiles="https://github.com/rofl0r/${pkgname}/archive/v${version}.tar.gz" checksum=70f3aa3874214fe30cdc7159dca08a6ceb253c0cad9acde50f53d3164f43fe52 create_srcdir=yes +conflicts="gettext>=0" do_build() { make ${makejobs} prefix=/usr @@ -19,13 +20,6 @@ do_install() { make ${makejobs} prefix=/usr DESTDIR=${DESTDIR} install } -gettext-tiny_package() { - conflicts="gettext>=0" - pkg_install() { - vmove usr - } -} - gettext-tiny-devel_package() { conflicts="glibc-devel>=0 musl>=0" short_desc+=" - development files" diff --git a/srcpkgs/gettext/template b/srcpkgs/gettext/template index a90cfd2d5b..6c4707f806 100644 --- a/srcpkgs/gettext/template +++ b/srcpkgs/gettext/template @@ -7,6 +7,7 @@ configure_args="--disable-java --disable-native-java --disable-csharp --disable-libasprintf --enable-threads=posix --disable-rpath --without-emacs --disable-openmp" makedepends="ncurses-devel libxml2-devel libcroco-devel acl-devel" +conflicts="chroot-gettext>=0" short_desc="Internationalized Message Handling Library and tools" maintainer="Juan RP " homepage="http://www.gnu.org/software/gettext/" @@ -39,10 +40,3 @@ gettext-libs_package() { vmove "usr/lib/*.so*" } } - -gettext_package() { - conflicts="chroot-gettext>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ghostscript/template b/srcpkgs/ghostscript/template index d603c6edfe..972312e7ed 100644 --- a/srcpkgs/ghostscript/template +++ b/srcpkgs/ghostscript/template @@ -13,6 +13,7 @@ disable_parallel_build=yes hostmakedepends="automake libtool pkg-config" makedepends="dbus-devel libXext-devel libXt-devel libpng-devel>=1.6 fontconfig-devel jasper-devel tiff-devel lcms2-devel cups-devel" +depends="gsfonts" pre_configure() { # force it to use system libs. @@ -84,10 +85,3 @@ ghostscript-devel_package() { vmove usr/share/man/man1/ijs-config.1 } } - -ghostscript_package() { - depends="gsfonts" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/giblib/template b/srcpkgs/giblib/template index e87b7bfa75..c8ac68838e 100644 --- a/srcpkgs/giblib/template +++ b/srcpkgs/giblib/template @@ -30,9 +30,3 @@ giblib-devel_package() { vmove usr/lib/pkgconfig } } - -giblib_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/giggle/template b/srcpkgs/giggle/template index 6387d9145a..927d825cb8 100644 --- a/srcpkgs/giggle/template +++ b/srcpkgs/giggle/template @@ -15,12 +15,13 @@ long_desc=" build_style=gnu-configure hostmakedepends="pkg-config itstool intltool" makedepends="gtksourceview-devel>=3.8 vte3-devel" +depends="desktop-file-utils hicolor-icon-theme" # Required by glib-2.32. CFLAGS="-lgmodule-2.0" libgiggle_package() { - short_desc="${short_desc} - Runtime libraries" + short_desc+=" - Runtime libraries" pkg_install() { vmove "usr/lib/*.so*" } @@ -28,17 +29,8 @@ libgiggle_package() { giggle-devel_package() { depends="libgiggle>=$version" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include } } - -giggle_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr/bin - vmove usr/share - vmove usr/lib/giggle - } -} diff --git a/srcpkgs/gimp/template b/srcpkgs/gimp/template index aef667e4ab..07c179fd92 100644 --- a/srcpkgs/gimp/template +++ b/srcpkgs/gimp/template @@ -12,6 +12,15 @@ makedepends="libpng-devel>=1.6 gtk+-devel lcms-devel libmng-devel libXpm-devel libcurl-devel babl-devel gegl-devel pygtk-devel libgudev-devel jasper-devel poppler-glib-devel ghostscript-devel iso-codes" short_desc="The GNU image manipulation program" +conf_files=" + /etc/gimp/2.0/gimprc + /etc/gimp/2.0/gtkrc + /etc/gimp/2.0/templaterc + /etc/gimp/2.0/unitrc + /etc/gimp/2.0/sessionrc + /etc/gimp/2.0/controllerrc + /etc/gimp/2.0/menurc" +depends="desktop-file-utils hicolor-icon-theme iso-codes" maintainer="Juan RP " homepage="http://www.gimp.org" license="GPL-3" @@ -48,18 +57,3 @@ gimp-python_package() { vmove "usr/lib/gimp/2.0/plug-ins/*.py" } } - -gimp_package() { - conf_files=" - /etc/gimp/2.0/gimprc - /etc/gimp/2.0/gtkrc - /etc/gimp/2.0/templaterc - /etc/gimp/2.0/unitrc - /etc/gimp/2.0/sessionrc - /etc/gimp/2.0/controllerrc - /etc/gimp/2.0/menurc" - depends="desktop-file-utils hicolor-icon-theme iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 6467080d97..39ed3187f4 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -7,7 +7,9 @@ configure_args="--with-curl --with-expat --without-tcltk ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" make_install_args="NO_INSTALL_HARDLINKS=1" hostmakedepends="xmlto>=0.0.25_2 asciidoc perl python" -makedepends="openssl-devel libcurl-devel expat-devel" +makedepends="openssl-devel libcurl-devel expat-devel ca-certificates" +# Required by https:// +depends="ca-certificates" short_desc="GIT Tree History Storage Tool" maintainer="Juan RP " homepage="http://git-scm.com/" @@ -44,12 +46,3 @@ git-perl_package() { vmove usr/share/man/man3 } } - - -git_package() { - # Required by https:// - depends="ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template index 925990edf8..6cbd55d7b1 100644 --- a/srcpkgs/gitflow/template +++ b/srcpkgs/gitflow/template @@ -2,13 +2,14 @@ pkgname=gitflow version=20120925 revision=1 +noarch="yes" +depends="git" short_desc="Git extensions to provide high-level repository operations" maintainer="pancake " license="Liberal BSD" homepage="https://github.com/nvie/gitflow" checksum=654604b5ead726de0ebb1932b49785a6146c59d312f4931080a04e86b7afb177 - do_fetch() { git clone git://github.com/nvie/gitflow.git ${pkgname}-${version} cd ${pkgname}-${version} @@ -24,11 +25,3 @@ do_install() { mkdir -p ${DESTDIR} make install prefix=${DESTDIR}/usr } - -gitflow_package() { - noarch="yes" - depends="git" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gjs/template b/srcpkgs/gjs/template index 6bac40ad9d..8d5b241e23 100644 --- a/srcpkgs/gjs/template +++ b/srcpkgs/gjs/template @@ -26,9 +26,3 @@ gjs-devel_package() { vmove "usr/lib/*.so" } } - -gjs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gkrellm/template b/srcpkgs/gkrellm/template index c03690a68e..444e09c4e1 100644 --- a/srcpkgs/gkrellm/template +++ b/srcpkgs/gkrellm/template @@ -1,44 +1,15 @@ # Template build file for 'gkrellm'. +LDFLAGS="-lgmodule-2.0" + pkgname=gkrellm version=2.3.5 revision=1 build_style=gnu-makefile -make_build_args="PREFIX=/usr" -make_install_args="PREFIX=/usr" -makedepends="pkg-config openssl-devel gtk+-devel libsensors-devel" +hostmakedepends="pkg-config" +makedepends="openssl-devel gtk+-devel libsensors-devel" short_desc="GTK2 based system monitor" maintainer="Juan RP " homepage="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html" license="GPL-2" distfiles="http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version.tar.bz2" checksum=702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b -long_desc=" - With a single process, GKrellM manages multiple stacked monitors and supports - applying themes to match the monitors appearance to your window manager, - Gtk, or any other theme. - - * SMP CPU, Disk, Proc, and active net interface monitors with LEDs. - * Internet monitor that displays current and charts historical port hits - * Memory and swap space usage meters and a system uptime monitor. - * File system meters show capacity/free space and can mount/umount. - * A mailbox monitor which can launch mail reader, remote mail fetch. - * Clock/calendar and hostname display. - * APM laptop battery monitor. - * CPU/motherboard temperature display if lm_sensors modules installed. - * Multiple monitors managed by a single process to reduce system load. - * Charts are autoscaling with configurable grid line resolution, or - can be set to a fixed scale mode. - * Separate colors for "in" and "out" data. The in color is used for - CPU user time, disk read, forks, and net receive data. The out color - is used for CPU sys time, disk write, load, and net transmit data. - * GKrellM is plugin capable so special interest monitors can be created. - * A different theme can be created with the GIMP. - * And a lot more..." - -LDFLAGS="-lgmodule-2.0" - -gkrellm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/glade3/template b/srcpkgs/glade3/template index 561dfad35f..671fd44888 100644 --- a/srcpkgs/glade3/template +++ b/srcpkgs/glade3/template @@ -7,6 +7,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" makedepends="gtk+3-devel libxml2-devel python-devel pygobject-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="An User Interface Designer for GTK+3" homepage="http://glade.gnome.org/" license="GPL-2" @@ -44,10 +45,3 @@ glade3-devel_package() { vmove "usr/lib/*.so" } } - -glade3_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glamor-egl/template b/srcpkgs/glamor-egl/template index 15ab5c56a9..04287b9365 100644 --- a/srcpkgs/glamor-egl/template +++ b/srcpkgs/glamor-egl/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorg-util-macros" makedepends="libdrm-devel MesaLib-devel xorg-server-devel>=1.14<1.15" +depends="xserver-abi-video-14_1" short_desc="OpenGL based 2D rendering acceleration library" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/Glamor/" @@ -27,10 +28,3 @@ glamor-egl-devel_package() { vmove "usr/lib/*.so" } } - -glamor-egl_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glances/template b/srcpkgs/glances/template index f001321536..928e171ec9 100644 --- a/srcpkgs/glances/template +++ b/srcpkgs/glances/template @@ -2,23 +2,16 @@ pkgname=glances version=1.7.3 revision=1 +noarch=yes +create_srcdir=yes distfiles="https://github.com/nicolargo/glances/archive/v${version}.tar.gz" checksum="03a5c8193fd3c91b8249c2501bc612008fa81861c14f82464a10b45d08c4ca4f" build_style=python-module hostmakedepends="python-devel" makedepends="python-distribute" +depends="python python-psutil ${makedepends}" +pycompile_module="glances" maintainer="Steven R " homepage="https://github.com/nicolargo/glances" license="LGPL3" -short_desc="Cross-platform curses-based monitoring tool written in Python." - -create_srcdir=yes - -glances_package() { - noarch="yes" - depends="python python-psutil ${makedepends}" - pycompile_module="glances" - pkg_install() { - vmove all - } -} \ No newline at end of file +short_desc="Cross-platform curses-based monitoring tool written in Python" diff --git a/srcpkgs/glew/template b/srcpkgs/glew/template index ccaa2b7813..079d32e816 100644 --- a/srcpkgs/glew/template +++ b/srcpkgs/glew/template @@ -37,9 +37,3 @@ glew-devel_package() { vmove usr/lib/pkgconfig } } - -glew_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/glib-networking/template b/srcpkgs/glib-networking/template index f5cac76e18..d587569570 100644 --- a/srcpkgs/glib-networking/template +++ b/srcpkgs/glib-networking/template @@ -10,16 +10,10 @@ hostmakedepends="pkg-config intltool" makedepends="libglib-devel libproxy-devel libgpg-error-devel libgcrypt-devel p11-kit-devel gnutls-devel>=3.1.5 gsettings-desktop-schemas-devel>=3.8.0 ca-certificates" +depends="ca-certificates gsettings-desktop-schemas" short_desc="Network-related giomodules for glib" maintainer="Juan RP " homepage="http://www.gnome.org" license="LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7 - -glib-networking_package() { - depends="ca-certificates gsettings-desktop-schemas" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 5056d7d2b4..5067021245 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -65,9 +65,3 @@ glib-devel_package() { done } } - -glib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 1b25bafaf2..0d46c8919d 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -12,6 +12,21 @@ homepage="http://www.gnu.org/software/libc" license="GPL-2, LGPL-2.1, BSD" distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz" checksum=2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3 +# Do not strip these files, objcopy errors out. +nostrip_files=" + XBS5_ILP32_OFFBIG + XBS5_ILP32_OFF32 + POSIX_V6_ILP32_OFF32 + POSIX_V6_ILP32_OFFBIG + POSIX_V7_ILP32_OFF32 + POSIX_V7_ILP32_OFFBIG + POSIX_V6_LP64_OFF64 + POSIX_V7_LP64_OFF64 + XBS5_LP64_OFF64" +conf_files=" + /etc/rpc + /etc/ld.so.conf" +depends="base-files glibc-locales>=${version}_${revision}" if [ "$CHROOT_READY" ]; then hostmakedepends="bison perl" @@ -129,24 +144,3 @@ nscd_package() { vinstall ${FILESDIR}/nscd.conf 644 etc } } - -glibc_package() { - # Do not strip these files, objcopy errors out. - nostrip_files=" - XBS5_ILP32_OFFBIG - XBS5_ILP32_OFF32 - POSIX_V6_ILP32_OFF32 - POSIX_V6_ILP32_OFFBIG - POSIX_V7_ILP32_OFF32 - POSIX_V7_ILP32_OFFBIG - POSIX_V6_LP64_OFF64 - POSIX_V7_LP64_OFF64 - XBS5_LP64_OFF64" - conf_files=" - /etc/rpc - /etc/ld.so.conf" - depends="base-files glibc-locales>=${version}_${revision}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glibc32/template b/srcpkgs/glibc32/template index a43563c16e..fee3bdfabf 100644 --- a/srcpkgs/glibc32/template +++ b/srcpkgs/glibc32/template @@ -22,8 +22,11 @@ long_desc=" This package installs the 32 bit libraries for x86_64 systems." only_for_archs=x86_64 +nostrip=yes +noverifyrdeps=yes hostmakedepends="bsdtar" makedepends="zlib32" +depends="glibc>=$version" do_install() { for f in ${distfiles}; do @@ -56,20 +59,10 @@ glibc32-devel_package() { nostrip=yes noverifyrdeps=yes depends="glibc-devel>=$version glibc32>=$version" - short_desc+="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib32/*.a" vmove "usr/lib32/*.o" } } - -glibc32_package() { - nostrip=yes - noverifyrdeps=yes - depends="glibc>=$version" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index 7244390666..3cfed5ef25 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool libtool glib-devel>=2.38" makedepends="libglib-devel>=2.38 libsigc++-devel>=2.2.10" +depends="glib>=2.38" short_desc="C++ bindings for GLib" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" @@ -33,10 +34,3 @@ glibmm-devel_package() { vmove "usr/lib/*.so" } } - -glibmm_package() { - depends="glib>=2.38" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glm/template b/srcpkgs/glm/template index c2ec1b0e0a..224fe1a39e 100644 --- a/srcpkgs/glm/template +++ b/srcpkgs/glm/template @@ -2,6 +2,8 @@ pkgname=glm version=0.9.3.4 revision=1 +noarch=yes +hostmakedepends="unzip" maintainer="Juan RP " license="MIT" short_desc="A C++ mathematics library for graphics programming" @@ -16,8 +18,6 @@ long_desc=" naming conventions and functionalities than GLSL so that when a programmer knows GLSL, he knows GLM as well which makes it really easy to use." -hostmakedepends="unzip" - do_install() { vmkdir usr/include/glm vmkdir usr/share/doc @@ -27,10 +27,3 @@ do_install() { find ${DESTDIR} -type f -exec chmod 644 {} \; find ${DESTDIR} -type d -exec chmod 755 {} \; } - -glm_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/glproto/template b/srcpkgs/glproto/template index 0ff19d5bd4..33767bcee4 100644 --- a/srcpkgs/glproto/template +++ b/srcpkgs/glproto/template @@ -2,6 +2,7 @@ pkgname=glproto version=1.4.17 revision=1 +noarch="yes" build_style=gnu-configure short_desc="GL extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,10 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 - -glproto_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/glu/template b/srcpkgs/glu/template index a26d3bc001..ac2b0ecd49 100644 --- a/srcpkgs/glu/template +++ b/srcpkgs/glu/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config MesaLib-devel>=9.0" +replaces="libGLU<9.0" maintainer="Juan RP " license="LGPL-2.1" short_desc="Mesa OpenGL utility library (GLU)" @@ -21,16 +22,9 @@ long_desc=" glu-devel_package() { depends="MesaLib-devel>=9.0 glu-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -glu_package() { - replaces="libGLU<9.0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/glusterfs/template b/srcpkgs/glusterfs/template index 864022c7cc..e2f2baa9e4 100644 --- a/srcpkgs/glusterfs/template +++ b/srcpkgs/glusterfs/template @@ -8,6 +8,13 @@ configure_args="--sbindir=/usr/bin --with-mountutildir=/usr/bin ac_cv_file__etc_redhat_release=no" hostmakedepends="pkg-config python flex automake libtool" makedepends="fuse-devel libxml2-devel libfl-devel openssl-devel readline-devel python" +# python is required by gsyncd. +depends="python" +pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon" +systemd_services="glusterd.service on" +conf_files=" + /etc/glusterfs/glusterfs-logrotate + /etc/glusterfs/glusterd.vol" short_desc="Distributed file system capable of scaling to several petabytes" maintainer="Juan RP " license="GPL-2, LGPL-3" @@ -40,16 +47,3 @@ libglusterfs_package() { vmove "usr/lib/*.so.*" } } - -glusterfs_package() { - # python is required by gsyncd. - depends="python" - pycompile_dirs="/usr/libexec/glusterfs/python/syncdaemon" - systemd_services="glusterd.service on" - conf_files=" - /etc/glusterfs/glusterfs-logrotate - /etc/glusterfs/glusterd.vol" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template index 60b60470a0..26f4fdbb59 100644 --- a/srcpkgs/gmime/template +++ b/srcpkgs/gmime/template @@ -23,9 +23,3 @@ gmime-devel_package() { vmove usr/share/gtk-doc } } - -gmime_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template index 2dcdfd8f49..77256d7870 100644 --- a/srcpkgs/gmp/template +++ b/srcpkgs/gmp/template @@ -34,9 +34,3 @@ gmp-devel_package() { vmove usr/share } } - -gmp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gmtk/template b/srcpkgs/gmtk/template index dc9601bac5..81e49a1951 100644 --- a/srcpkgs/gmtk/template +++ b/srcpkgs/gmtk/template @@ -22,9 +22,3 @@ gmtk-devel_package() { vmove "usr/lib/*.so" } } - -gmtk_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template index 2a3004fbcd..ea9eff7fa6 100644 --- a/srcpkgs/gnac/template +++ b/srcpkgs/gnac/template @@ -18,11 +18,5 @@ makedepends="which pkg-config intltool gnome-doc-utils glib-devel libxml2-devel gtk+3-devel gst-plugins-base-devel libunique-devel libnotify-devel gst-plugins-good gst-plugins-bad gst-plugins-ugly desktop-file-utils hicolor-icon-theme" - -gnac_package() { - depends="gst-plugins-good gst-plugins-bad gst-plugins-ugly - desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} +depends="gst-plugins-good gst-plugins-bad gst-plugins-ugly + desktop-file-utils hicolor-icon-theme" diff --git a/srcpkgs/gnome-backgrounds/template b/srcpkgs/gnome-backgrounds/template index 58444dd7f9..5200d70cc0 100644 --- a/srcpkgs/gnome-backgrounds/template +++ b/srcpkgs/gnome-backgrounds/template @@ -2,6 +2,7 @@ pkgname=gnome-backgrounds version=3.10.1 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool" short_desc="Set of background images for the GNOME Desktop" @@ -10,10 +11,3 @@ homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=cc47e7b21f94464b013e5805baa51c3fa540008df0109717e8d77e48ea003b87 - -gnome-backgrounds_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-bluetooth/template b/srcpkgs/gnome-bluetooth/template index c11f264fd3..72da43c09f 100644 --- a/srcpkgs/gnome-bluetooth/template +++ b/srcpkgs/gnome-bluetooth/template @@ -7,6 +7,7 @@ configure_args="--disable-desktop-update --disable-schemas-compile --disable-icon-update" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends="libXi-devel gtk+3-devel>=3.8 libnotify-devel dconf-devel>=0.18 gvfs-devel>=1.18 bluez>=5" +depends="bluez>=5 dconf>=0.18 gvfs>=1.18 hicolor-icon-theme desktop-file-utils" short_desc="The GNOME Bluetooth Subsystem" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeBluetooth" @@ -34,10 +35,3 @@ gnome-bluetooth-devel_package() { vmove "usr/lib/*.so" } } - -gnome-bluetooth_package() { - depends="bluez>=5 dconf>=0.18 gvfs>=1.18 hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-boxes/template b/srcpkgs/gnome-boxes/template index ed7078bbf1..bd72e652bb 100644 --- a/srcpkgs/gnome-boxes/template +++ b/srcpkgs/gnome-boxes/template @@ -9,16 +9,10 @@ makedepends="clutter-gtk-devel>=1.4.4_2 gtk+3-devel gtk-vnc-devel libuuid-devel libvirt-glib-devel>=0.1.6 libxml2-devel libgudev-devel libosinfo-devel>=0.2.7 tracker-devel spice-gtk-devel>=0.14_4 spice-protocol vala-devel>=0.22 libsoup-devel>=2.44 qemu" +depends="qemu libvirt-glib>=0.1.6 libosinfo>=0.2.7 desktop-file-utils hicolor-icon-theme shared-mime-info" short_desc="GNOME 3 application to access remote or virtual systems" maintainer="davehome " homepage="https://live.gnome.org/Boxes" license="LGPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=906d5e7aaf4c0d90ea34ce019d5d2cf8665827cea28c21e811e6a2a509a7459e - -gnome-boxes_package() { - depends="qemu libvirt-glib>=0.1.6 libosinfo>=0.2.7 desktop-file-utils hicolor-icon-theme shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-calculator/template b/srcpkgs/gnome-calculator/template index f7485993d0..dacf6e066e 100644 --- a/srcpkgs/gnome-calculator/template +++ b/srcpkgs/gnome-calculator/template @@ -6,17 +6,11 @@ build_style=gnu-configure hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="libxml2-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.10 hicolor-icon-theme desktop-file-utils" +depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils" +replaces="gcalctool>=0" short_desc="The GNOME calculator" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=2e583252e9332d8c7be52f1512a113869be1ad27fa829f7b49c89c9ea66d6d3e - -gnome-calculator_package() { - depends="gsettings-desktop-schemas>=3.10 hicolor-icon-theme desktop-file-utils" - replaces="gcalctool>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index efdb33c3b0..2d18364e99 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -7,6 +7,7 @@ hostmakedepends="pkg-config intltool itstool gobject-introspection" makedepends="glib-devel vala-devel>=0.22 gnome-desktop-devel>=3.10 libgweather-devel>=3.10 libcanberra-devel libnotify-devel geocode-glib-devel geoclue2 desktop-file-utils hicolor-icon-theme" +depends="geoclue2 desktop-file-utils hicolor-icon-theme" short_desc="Clock application for the GNOME Desktop" maintainer="davehome " homepage="https://live.gnome.org/GnomeClocks" @@ -20,10 +21,3 @@ long_desc=" - View alarms - Set alarms - Times/dates in other locations" - -gnome-clocks_package() { - depends="geoclue2 desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-color-manager/template b/srcpkgs/gnome-color-manager/template index 10767b2d25..d0b59668d1 100644 --- a/srcpkgs/gnome-color-manager/template +++ b/srcpkgs/gnome-color-manager/template @@ -10,17 +10,11 @@ makedepends="exiv2-devel colord-devel>=1.0.3 gtk+3-devel clutter-gtk-devel>=1.4.4_2 libcanberra-devel gnome-desktop-devel>=3.10 libexif-devel vte3-devel colord-gtk-devel mash-devel>=0.2.0_4 shared-color-profiles shared-color-targets" +depends="desktop-file-utils hicolor-icon-theme colord + shared-color-profiles shared-color-targets" short_desc="Color profile manager for the GNOME desktop" maintainer="Juan RP " homepage="http://projects.gnome.org/gnome-color-manager/" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=2944627f4166aaac08ba9d73614cbd79eba93573bd7d32e17a12082e30fb1399 - -gnome-color-manager_package() { - depends="desktop-file-utils hicolor-icon-theme colord - shared-color-profiles shared-color-targets" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-common/template b/srcpkgs/gnome-common/template index 3af59dd0f8..b8f0b807c1 100644 --- a/srcpkgs/gnome-common/template +++ b/srcpkgs/gnome-common/template @@ -2,19 +2,13 @@ pkgname=gnome-common version=3.7.4 revision=2 +noarch="yes" build_style=gnu-configure hostmakedepends="automake" +depends="automake" short_desc="Common scripts and macros to develop with GNOME" maintainer="davehome " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/${pkgname}/3.7/${pkgname}-${version}.tar.xz" checksum=2af2d97010d2a9aeb3b99dd2ce07d1ef023e15a27b412ffe4f067f016ff7117b - -gnome-common_package() { - depends="automake" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 23710806c1..9704b7f799 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -7,16 +7,10 @@ hostmakedepends="pkg-config intltool gobject-introspection" makedepends="vala-devel>=0.22 telepathy-glib-devel>=0.21 gnome-desktop-devel>=3.10 folks-devel>=0.9.5 libnotify-devel cheese-devel>=3.10" +depends="desktop-file-utils" short_desc="GNOME contacts manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b - -gnome-contacts_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 8ecf998790..ab0045d502 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -25,19 +25,12 @@ makedepends=" colord-gtk-devel>=0.1.24 accountsservice-devel vala-devel>=0.22 libXxf86misc-devel ModemManager-devel iso-codes" +depends="gsettings-desktop-schemas>=3.10 pulseaudio desktop-file-utils + ModemManager hicolor-icon-theme sound-theme-freedesktop apg iso-codes" + gnome-control-center-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/share/pkgconfig } } - -gnome-control-center_package() { - depends="gsettings-desktop-schemas>=3.10 - pulseaudio desktop-file-utils - ModemManager hicolor-icon-theme - sound-theme-freedesktop apg iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 4361f52e36..409ab43c59 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -7,6 +7,7 @@ configure_args="--with-gnome-distributor=void" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends="libxkbfile-devel gtk+3-devel gsettings-desktop-schemas-devel>=3.10 xkeyboard-config iso-codes" +depends="gsettings-desktop-schemas>=3.10 xkeyboard-config iso-codes" short_desc="GNOME desktop management utilities" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -26,10 +27,3 @@ gnome-desktop-devel_package() { vmove "usr/lib/*.so" } } - -gnome-desktop_package() { - depends="gsettings-desktop-schemas>=3.10 xkeyboard-config iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-dictionary/template b/srcpkgs/gnome-dictionary/template index 27cbb575f2..85cd8de192 100644 --- a/srcpkgs/gnome-dictionary/template +++ b/srcpkgs/gnome-dictionary/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="gtk+3-devel gsettings-desktop-schemas-devel>=3.10" +depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" +replaces="gnome-utils>=3.0" short_desc="Look up words in dictionary sources" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -18,12 +20,3 @@ post_install() { rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig \ ${DESTDIR}/usr/share/gtk-doc } - -gnome-dictionary_package() { - replaces="gnome-utils>=3.0" - depends="hicolor-icon-theme desktop-file-utils - gsettings-desktop-schemas>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-disk-utility/template b/srcpkgs/gnome-disk-utility/template index 05618af6ab..802cf00359 100644 --- a/srcpkgs/gnome-disk-utility/template +++ b/srcpkgs/gnome-disk-utility/template @@ -8,16 +8,10 @@ hostmakedepends="pkg-config intltool gnome-doc-utils" makedepends="liblzma-devel gtk+3-devel libcanberra-devel udisks2-devel libdvdread-devel libsecret-devel libpwquality-devel systemd-devel gnome-settings-daemon-devel>=3.8 libnotify-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="GNOME libraries and applications for dealing with storage devices" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa - -gnome-disk-utility_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-doc-utils/template b/srcpkgs/gnome-doc-utils/template index c1c49b1c5e..3a9c051e3a 100644 --- a/srcpkgs/gnome-doc-utils/template +++ b/srcpkgs/gnome-doc-utils/template @@ -2,10 +2,13 @@ pkgname=gnome-doc-utils version=0.20.10 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--disable-scrollkeeper" makedepends="pkg-config intltool libxslt-devel gsettings-desktop-schemas docbook-xml docbook-xsl rarian python libxml2-python libxslt" +depends="libxslt docbook-xml docbook-xsl rarian python libxml2-python" +pycompile_module="xml2po" short_desc="Documentation utilities for GNOME" homepage="https://live.gnome.org/GnomeDocUtils" license="GPL-2, LGPL-2.1" @@ -17,12 +20,3 @@ long_desc=" project. Notably, it contains utilities for building documentation and all auxiliary files in your source tree, and it contains the DocBook XSLT stylesheets that were once distributed with Yelp." - -gnome-doc-utils_package() { - noarch="yes" - pycompile_module="xml2po" - depends="libxslt docbook-xml docbook-xsl rarian python libxml2-python" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index 54e82052bb..6d7286171f 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -9,16 +9,10 @@ makedepends=" gnome-online-accounts-devel>=3.10 libgdata-devel>=0.14 tracker-devel>=0.16_2 evince-devel>=3.10 gjs-devel>=1.38 libsoup-gnome-devel>=2.44 vala-devel>=0.22 webkitgtk-devel>=2.1" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Documents Manager for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=26f8234fa74c00afb323f76de7028655b82d285acce057dd07b6ed98943951b2 - -gnome-documents_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index b47ebb43ab..02bd247823 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -6,17 +6,11 @@ build_style=gnu-configure configure_args="--disable-schemas-compile --disable-scrollkeeper" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="gtk+3-devel gnome-desktop-devel>=3.10" +depends="desktop-file-utils" +replaces="gnome-utils>=3.0" short_desc="A font viewer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=3928350f58ac6c95f44b64cba1a5f03437b19d9b2645a7b01176067504fdd652 - -gnome-font-viewer_package() { - replaces="gnome-utils>=3.0" - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-getting-started-docs/template b/srcpkgs/gnome-getting-started-docs/template index 8247db433e..6cd7ee387b 100644 --- a/srcpkgs/gnome-getting-started-docs/template +++ b/srcpkgs/gnome-getting-started-docs/template @@ -2,6 +2,7 @@ pkgname=gnome-getting-started-docs version=3.10.2 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gnome-doc-utils" homepage="http://www.gnome.org" @@ -10,10 +11,3 @@ maintainer="Juan RP " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=a524e623ce79f210235020a553399f59be43a2eb912ffc4ca40d27b4851c4a34 - -gnome-getting-started-docs_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-icon-theme-extras/template b/srcpkgs/gnome-icon-theme-extras/template index 9f7a7da057..730ee362ac 100644 --- a/srcpkgs/gnome-icon-theme-extras/template +++ b/srcpkgs/gnome-icon-theme-extras/template @@ -2,8 +2,10 @@ pkgname=gnome-icon-theme-extras version=3.6.2 revision=2 +noarch="yes" build_style=gnu-configure makedepends="pkg-config intltool icon-naming-utils gnome-icon-theme" +depends="gnome-icon-theme" short_desc="GNOME Desktop icon theme (additional icons)" homepage="http://gnome.org/" license="GPL-2" @@ -16,11 +18,3 @@ long_desc=" to represent the different applications, files, directories, and devices. This package contains additional icons for the default GNOME icon theme." - -gnome-icon-theme-extras_package() { - depends="gnome-icon-theme" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnome-icon-theme-symbolic/template b/srcpkgs/gnome-icon-theme-symbolic/template index c40c23ca63..c0a37327da 100644 --- a/srcpkgs/gnome-icon-theme-symbolic/template +++ b/srcpkgs/gnome-icon-theme-symbolic/template @@ -3,19 +3,13 @@ pkgname=gnome-icon-theme-symbolic version=3.10.1 revision=2 build_style=gnu-configure +noarch="yes" configure_args="GTK_UPDATE_ICON_CACHE=/bin/true" hostmakedepends="pkg-config intltool icon-naming-utils gnome-icon-theme>=3.8.0" +depends="gnome-icon-theme>=3.10.0" # hasn't been updated yet short_desc="GNOME Desktop icon theme (symbolic icons)" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=344e88e5f9dac3184bf012d9bac972110df2133b93d76f2ad128d4c9cbf41412 - -gnome-icon-theme-symbolic_package() { - depends="gnome-icon-theme>=3.10.0" # hasn't been updated yet - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-icon-theme/template b/srcpkgs/gnome-icon-theme/template index 9aad618de2..c70f0c8618 100644 --- a/srcpkgs/gnome-icon-theme/template +++ b/srcpkgs/gnome-icon-theme/template @@ -2,6 +2,7 @@ pkgname=gnome-icon-theme version=3.10.0 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--enable-icon-mapping" hostmakedepends="pkg-config intltool librsvg icon-naming-utils" @@ -15,10 +16,3 @@ checksum=c65472b5846c67b97fe75200c5180faccd1347a04caa8390fc0ad23de75b36f6 post_install() { rm -f ${DESTDIR}/usr/share/icons/gnome/icon-theme.cache } - -gnome-icon-theme_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-initial-setup/template b/srcpkgs/gnome-initial-setup/template index 252d1303e5..679deb25e3 100644 --- a/srcpkgs/gnome-initial-setup/template +++ b/srcpkgs/gnome-initial-setup/template @@ -9,6 +9,7 @@ makedepends="NetworkManager-devel accountsservice-devel glib-devel gnome-online-accounts-devel>=3.10 gdm-devel>=3.10 libpwquality-devel mit-krb5-devel vala-devel>=0.22 network-manager-applet-devel polkit-devel ibus-devel iso-codes" +depends="iso-codes" short_desc="The GNOME initial setup" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -19,10 +20,3 @@ long_desc=" After acquiring or installing a new system there are a few essential things to set up before use. gnome-initial-setup aims to provide a simple, easy, and safe way to prepare a new system." - -gnome-initial-setup_package() { - depends="iso-codes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-js-common/template b/srcpkgs/gnome-js-common/template index c94f612b8d..f76a6cbbc4 100644 --- a/srcpkgs/gnome-js-common/template +++ b/srcpkgs/gnome-js-common/template @@ -2,6 +2,7 @@ pkgname=gnome-js-common version=0.1.2 revision=2 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool" short_desc="GNOME JavaScript common modules" @@ -10,12 +11,3 @@ license="GPL-3" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/0.1/$pkgname-$version.tar.bz2" checksum=1765be99f3d83cc57e1ec13a2bb963469b8e91b60239eeaab61d66d7744496e6 -long_desc=" - This package includes some JavaScript common modules for GNOME." - -gnome-js-common_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnome-keyring/template b/srcpkgs/gnome-keyring/template index 3db9e2ec82..8c41aec86c 100644 --- a/srcpkgs/gnome-keyring/template +++ b/srcpkgs/gnome-keyring/template @@ -7,17 +7,11 @@ configure_args="--with-pam-dir=/usr/lib/security --disable-schemas-compile" hostmakedepends="pkg-config intltool libtasn1-tools libxslt docbook-xsl" makedepends="dbus-devel libcap-ng-devel pam-devel libcap-devel libtasn1-devel libgcrypt-devel gcr-devel>=3.10" +# For setcap(8). +depends="libcap-progs dconf>=0.18 gcr>=3.10" short_desc="GNOME password and secret manager" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL, LGPL" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8 - -gnome-keyring_package() { - # For setcap(8). - depends="libcap-progs dconf>=0.18 gcr>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 79b315da9b..3b42a071e2 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -2,20 +2,14 @@ pkgname=gnome-maps version=3.10.2 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gjs-devel>=1.38 gnome-desktop-devel>=3.10 geocode-glib-devel" +depends="gjs desktop-file-utils" short_desc="GNOME maps application" maintainer="Juan RP " homepage="http://live.gnome.org/Design/Apps/Maps" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=1351967e5530c5fe455233c585362443eda1a6c4a089e6104d4b672087c74bd0 - -gnome-maps_package() { - depends="gjs desktop-file-utils" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template index 062fe8ae52..c5170c8300 100644 --- a/srcpkgs/gnome-menus/template +++ b/srcpkgs/gnome-menus/template @@ -23,9 +23,3 @@ gnome-menus-devel_package() { vmove "usr/lib/*.so" } } - -gnome-menus_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-mime-data/template b/srcpkgs/gnome-mime-data/template index 02a3d41717..7be96d5ae2 100644 --- a/srcpkgs/gnome-mime-data/template +++ b/srcpkgs/gnome-mime-data/template @@ -2,8 +2,11 @@ pkgname=gnome-mime-data version=2.18.0 revision=3 +noarch="yes" build_style=gnu-configure makedepends="intltool shared-mime-info" +depends="shared-mime-info" +conf_files="/etc/gnome-vfs-mime-magic" short_desc="Base MIME and Application database for GNOME" homepage="http://www.gnome.org" license="GPL-2" @@ -13,12 +16,3 @@ checksum=37196b5b37085bbcd45c338c36e26898fe35dd5975295f69f48028b1e8436fd7 long_desc=" $pkgname contains the base MIME and Application database for GNOME. It is meant to be accessed through the MIME functions in GnomeVFS." - -gnome-mime-data_package() { - depends="shared-mime-info" - conf_files="/etc/gnome-vfs-mime-magic" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnome-mplayer/template b/srcpkgs/gnome-mplayer/template index e4875e55be..39f31a53dd 100644 --- a/srcpkgs/gnome-mplayer/template +++ b/srcpkgs/gnome-mplayer/template @@ -10,16 +10,10 @@ makedepends="dbus-glib-devel libnotify-devel gtk+3-devel gmtk-devel libXScrnSaver-devel nautilus-devel alsa-lib-devel pulseaudio-devel libgda-devel>=5.1.2_2 libmusicbrainz-devel>=3.0.3_3 desktop-file-utils hicolor-icon-theme mplayer" +depends="mplayer desktop-file-utils hicolor-icon-theme" short_desc="A simple MPlayer GUI for GNOME" maintainer="Juan RP " license="GPL-2" homepage="http://gnome-mplayer.googlecode.com/" distfiles="http://gnome-mplayer.googlecode.com/files/${pkgname}-${version}.tar.gz" checksum=bbd914ab620341e0c074374d2079c335eaea3c93cde746ebc7357577e7b00414 - -gnome-mplayer_package() { - depends="mplayer desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 1151a300d0..d3806e822d 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -6,16 +6,10 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="python3-devel pygobject-devel>=3.10.1 dbus-python3>=1.2.0 grilo-devel gnome-desktop-devel>=3.10" +depends="py3gobject dbus-python3 desktop-file-utils" short_desc="GNOME music playing application" maintainer="Juan RP " homepage="http://live.gnome.org/Apps/Music" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=3b75643e8a6e4d9b44b2572f0ddecfa0ec32affd9172c43a4bec909d15ac9d7c - -gnome-music_package() { - depends="py3gobject dbus-python3 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-nettool/template b/srcpkgs/gnome-nettool/template index 1e3ac03227..450c75c66b 100644 --- a/srcpkgs/gnome-nettool/template +++ b/srcpkgs/gnome-nettool/template @@ -6,17 +6,10 @@ build_style=gnu-configure hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="gtk+3-devel gsettings-desktop-schemas-devel>=3.8.0 libgtop-devel hicolor-icon-theme desktop-file-utils traceroute iputils bind-utils net-tools" +depends="hicolor-icon-theme desktop-file-utils traceroute iputils bind-utils net-tools" short_desc="A Collection of GNOME3 Networking Tools" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/3.8/$pkgname-$version.tar.xz" checksum=f0a4510d9fe5eae4c91b63ade9848992b2795108e76eff7f51dc3decf7df2cb1 - -gnome-nettool_package() { - depends="hicolor-icon-theme desktop-file-utils - traceroute iputils bind-utils net-tools" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-online-accounts/template b/srcpkgs/gnome-online-accounts/template index bcd20384ca..52f721c595 100644 --- a/srcpkgs/gnome-online-accounts/template +++ b/srcpkgs/gnome-online-accounts/template @@ -12,6 +12,7 @@ makedepends=" libsoup-gnome-devel>=2.44 webkitgtk-devel>=2.1 json-glib-devel libnotify-devel rest-devel>=0.7.90 gcr-devel>=3.10 libsecret-devel mit-krb5-devel dbus-glib-devel telepathy-glib-devel" +depends="libsoup-gnome>=2.44 rest>=0.7.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme" short_desc="GNOME service to access online accounts" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -30,10 +31,3 @@ gnome-online-accounts-devel_package() { vmove usr/share/gir-1.0 } } - -gnome-online-accounts_package() { - depends="libsoup-gnome>=2.44 rest>=0.7.90 gcr>=3.10 webkitgtk>=2.1 hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-online-miners/template b/srcpkgs/gnome-online-miners/template index e74ec45e47..6158a4ffa5 100644 --- a/srcpkgs/gnome-online-miners/template +++ b/srcpkgs/gnome-online-miners/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" makedepends="libzapojit-devel>=0.0.3_3 libgdata-devel>=0.14 grilo-devel tracker-devel" +depends="libzapojit>=0.0.3_3 libgdata>=0.14" short_desc="GNOME service that crawls through your online content" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9 - -gnome-online-miners_package() { - depends="libzapojit>=0.0.3_3 libgdata>=0.14" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-photos/template b/srcpkgs/gnome-photos/template index c7036ef888..4fdeef2dc4 100644 --- a/srcpkgs/gnome-photos/template +++ b/srcpkgs/gnome-photos/template @@ -9,16 +9,10 @@ makedepends=" gtk+3-devel>=3.8 babl-devel gegl-devel exempi-devel lcms2-devel tracker-devel>=0.16_2 libexif-devel librsvg-devel grilo-devel>=0.2.7_2 gnome-online-accounts-devel>=3.10 gnome-desktop-devel>=3.10" +depends="desktop-file-utils" short_desc="Access, organize, and share your photos on GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975 - -gnome-photos_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-power-manager/template b/srcpkgs/gnome-power-manager/template index 17d9f30a93..10f57d006e 100644 --- a/srcpkgs/gnome-power-manager/template +++ b/srcpkgs/gnome-power-manager/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool gnome-doc-utils" makedepends="gtk+3-devel upower-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="GNOME power management tool" maintainer="Juan RP " homepage="http://www.gnome.org/projects/gnome-power-manager/" @@ -22,10 +23,3 @@ long_desc=" display brightness, CPU, graphics card and hard disk drive power saving, and can trigger suspend-to-RAM, hibernate or shutdown events, all integrated to other components of the GNOME desktop." - -gnome-power-manager_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-screenshot/template b/srcpkgs/gnome-screenshot/template index 8e3b3238bc..fb9f96cf13 100644 --- a/srcpkgs/gnome-screenshot/template +++ b/srcpkgs/gnome-screenshot/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils" makedepends="gtk+3-devel>=3.8 libcanberra-devel" +depends="desktop-file-utils" short_desc="A screenshot capture utility for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=9a4ed8821187e5a6923245508df4c116f28278b3089580eb2c4e6d32d178ba68 - -gnome-screenshot_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-session/template b/srcpkgs/gnome-session/template index 59ac976abb..d094c40c1b 100644 --- a/srcpkgs/gnome-session/template +++ b/srcpkgs/gnome-session/template @@ -9,17 +9,11 @@ makedepends="upower-devel json-glib-devel gtk+3-devel startup-notification-devel libXtst-devel systemd-devel gsettings-desktop-schemas-devel>=3.10 dbus-glib-devel gnome-desktop-devel>=3.10 libSM-devel" +depends="gsettings-desktop-schemas>=3.10 dconf>=0.18 alsa-plugins + hicolor-icon-theme desktop-file-utils" short_desc="GNOME session management utilities" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2, LGPL-2.1" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=f620704e07e6bbf49aa6c65897475a46f80f7ac5593606f2b6889c7cb4f6a9cc - -gnome-session_package() { - depends="gsettings-desktop-schemas>=3.10 dconf>=0.18 alsa-plugins - hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-settings-daemon/template b/srcpkgs/gnome-settings-daemon/template index 4f9f9f7f81..cdf679be01 100644 --- a/srcpkgs/gnome-settings-daemon/template +++ b/srcpkgs/gnome-settings-daemon/template @@ -12,6 +12,7 @@ makedepends="geocode-glib-devel colord-devel>=0.1.23_3 libxklavier-devel xf86-input-wacom-devel libwacom-devel>=0.7 systemd-devel librsvg-devel ibus-devel>=1.4.99 cups-devel libgudev-devel upower-devel polkit-devel libgweather-devel>=3.10 geoclue2" +depends="geoclue2 pulseaudio hicolor-icon-theme" short_desc="GNOME settings daemon" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -27,10 +28,3 @@ gnome-settings-daemon-devel_package() { vmove usr/lib/pkgconfig } } - -gnome-settings-daemon_package() { - depends="geoclue2 pulseaudio hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-shell-extensions/template b/srcpkgs/gnome-shell-extensions/template index f21ec7f873..ed16b8acb1 100644 --- a/srcpkgs/gnome-shell-extensions/template +++ b/srcpkgs/gnome-shell-extensions/template @@ -2,21 +2,15 @@ pkgname=gnome-shell-extensions version=3.10.1 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--enable-extensions=all" hostmakedepends="pkg-config intltool" makedepends="unzip libglib-devel libgtop-devel" +depends="gnome-shell>=${version} nautilus>=3.10 unzip" short_desc="Extensions for GNOME shell, including classic mode" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell/Extensions" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=9baa9ddaf4e14cab6d4d7944d8dc009378b25f995acfd0fd72843f599cb5ae43 - -gnome-shell-extensions_package() { - noarch="yes" - depends="gnome-shell>=${version} nautilus>=3.10 unzip" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-shell/template b/srcpkgs/gnome-shell/template index 9c90cc4410..1fcf7e4db2 100644 --- a/srcpkgs/gnome-shell/template +++ b/srcpkgs/gnome-shell/template @@ -13,6 +13,8 @@ makedepends=" pulseaudio-devel libgudev-devel gst-plugins-base1-devel>=1:1.2 systemd-devel caribou-devel>=0.4.12 gir-freedesktop gnome-control-center-devel>=3.10 folks-devel>=0.9.5 gnome-menus-devel>=3.8 mutter-wayland-devel glxinfo" +depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils + gir-freedesktop gnome-control-center>=3.10 mutter>=3.10.2" short_desc="GNOME core user interface" maintainer="Juan RP " homepage="http://live.gnome.org/GnomeShell" @@ -23,11 +25,3 @@ checksum=d28cedc4f7dbcbd979ef2a0b80f722ff507989fce193fe59351b1d048d17c44c post_install() { rm -rf ${DESTDIR}/usr/share/gtk-doc } - -gnome-shell_package() { - depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils - gir-freedesktop gnome-control-center>=3.10 mutter>=3.10.2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-system-log/template b/srcpkgs/gnome-system-log/template index b6cc8ac856..5663dbc53f 100644 --- a/srcpkgs/gnome-system-log/template +++ b/srcpkgs/gnome-system-log/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="gtk+3-devel>=3.8" +depends="hicolor-icon-theme desktop-file-utils" short_desc="A system log viewer for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411 - -gnome-system-log_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-system-monitor/template b/srcpkgs/gnome-system-monitor/template index de5919fd44..f0e0a962f3 100644 --- a/srcpkgs/gnome-system-monitor/template +++ b/srcpkgs/gnome-system-monitor/template @@ -7,16 +7,10 @@ configure_args="--disable-schemas-compile --enable-systemd" hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="libwnck-devel gtkmm-devel>=3.9 librsvg-devel systemd-devel libgtop-devel gnome-icon-theme>=3.10" +depends="gtkmm>=3.9 gnome-icon-theme>=3.10" short_desc="Process viewer and system resource monitor for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0 - -gnome-system-monitor_package() { - depends="gtkmm>=3.9 gnome-icon-theme>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index a9561987bc..080edd25c9 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -8,16 +8,10 @@ hostmakedepends="which pkg-config intltool itstool gnome-doc-utils" makedepends="gtk+3-devel>=3.8 vte3-devel dconf-devel>=0.18 libuuid-devel gsettings-desktop-schemas-devel>=3.10 nautilus-devel>=3.10 GConf-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="The GNOME terminal emulator application" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913 - -gnome-terminal_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-themes-standard/template b/srcpkgs/gnome-themes-standard/template index 7466178292..f37a5fad9a 100644 --- a/srcpkgs/gnome-themes-standard/template +++ b/srcpkgs/gnome-themes-standard/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool librsvg-utils" makedepends="gtk+-devel gtk+3-devel>=3.8 librsvg-devel>=2.39" +depends="gtk2-engines" short_desc="Standard GNOME themes" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -17,10 +18,3 @@ post_install() { rm -f ${DESTDIR}/${f}/*.cache done } - -gnome-themes-standard_package() { - depends="gtk2-engines" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-tweak-tool/template b/srcpkgs/gnome-tweak-tool/template index 7d37132fd6..9aa794c520 100644 --- a/srcpkgs/gnome-tweak-tool/template +++ b/srcpkgs/gnome-tweak-tool/template @@ -2,28 +2,22 @@ pkgname=gnome-tweak-tool version=3.10.1 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel pygobject-devel>=3.10 gsettings-desktop-schemas-devel>=3.10 hicolor-icon-theme desktop-file-utils GConf dconf>=0.18" +depends="python + pygobject>=3.10 + gsettings-desktop-schemas>=3.10 + dconf>=0.18 + GConf + hicolor-icon-theme + desktop-file-utils" +pycompile_module="gtweak" short_desc="GNOME3 tool to customize advanced options" maintainer="Juan RP " license="GPL-2" homepage="http://live.gnome.org/GnomeTweakTool" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec - -gnome-tweak-tool_package() { - noarch="yes" - pycompile_module="gtweak" - depends="python - pygobject>=3.10 - gsettings-desktop-schemas>=3.10 - dconf>=0.18 - GConf - hicolor-icon-theme - desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index e3d61548c3..16f1ea1cec 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -2,20 +2,14 @@ pkgname=gnome-user-docs version=3.10.2 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool itstool gnome-doc-utils" makedepends="yelp" +depends="yelp" homepage="http://www.gnome.org" short_desc="User documentation for GNOME" maintainer="Juan RP " license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=a733828428e827fa40f2a240b13447917b2d71f1dce03365ef0344c52476b4d7 - -gnome-user-docs_package() { - depends="yelp" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome-video-effects/template b/srcpkgs/gnome-video-effects/template index e7be67dc15..6beab01019 100644 --- a/srcpkgs/gnome-video-effects/template +++ b/srcpkgs/gnome-video-effects/template @@ -1,21 +1,13 @@ # Template build file for 'gnome-video-effects'. pkgname=gnome-video-effects version=0.4.0 +revision=1 +noarch="yes" build_style=gnu-configure makedepends="pkg-config intltool gstreamer-devel" -revision=1 short_desc="A collection of GStreamer effects for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/0.4/$pkgname-$version.tar.xz" checksum=8f7f674b23abab88fac1c10db8eda0cfc7bff1c39413f2959203b9755575bde7 -long_desc=" - This package contains a set of GStreamer video effects for the GNOME desktop." - -gnome-video-effects_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gnome-weather/template b/srcpkgs/gnome-weather/template index 07745ce877..03df89278b 100644 --- a/srcpkgs/gnome-weather/template +++ b/srcpkgs/gnome-weather/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--disable-schemas-compile" hostmakedepends="pkg-config intltool itstool gnome-doc-utils gobject-introspection" makedepends="gtk+3-devel>=3.8 gjs-devel>=1.38 libgweather-devel>=3.10" +depends="desktop-file-utils" short_desc="Access current weather conditions and forecasts for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=e0f2503c2cc9ced72da7728b262a767342b82852a74196db44377d18f1820fe4 - -gnome-weather_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnome/template b/srcpkgs/gnome/template index 5ff8c6ef0d..a34aa0a66a 100644 --- a/srcpkgs/gnome/template +++ b/srcpkgs/gnome/template @@ -2,6 +2,7 @@ pkgname=gnome version=3.10.0 revision=2 +noarch=yes build_style=meta makedepends=" gnome-backgrounds>=${version} @@ -66,12 +67,8 @@ makedepends=" tracker>=0.16.2_2 cantarell-fonts>=0.0.15 xdg-user-dirs-gtk" +depends="${makedepends}" short_desc="The GNOME meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL, LGPL" - -gnome_package() { - noarch="yes" - depends="${makedepends}" -} diff --git a/srcpkgs/gnote/template b/srcpkgs/gnote/template index 3be4d31dc9..33e91d2e7a 100644 --- a/srcpkgs/gnote/template +++ b/srcpkgs/gnote/template @@ -7,16 +7,10 @@ configure_args="--disable-schemas-compile --disable-static" hostmakedepends="pkg-config itstool>=1.2.0 intltool" makedepends="boost-devel libsecret-devel libxslt-devel libuuid-devel gtkmm-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="GNOME note taking application" maintainer="Juan RP " license="GPL-3" homepage="http://live.gnome.org/Gnote" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=10dedfde2f7748f67eda4f334505c7e8ff2b86286d2c9feb3c43e7261684b71b - -gnote_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template index a4447093d1..26784b2873 100644 --- a/srcpkgs/gnupg/template +++ b/srcpkgs/gnupg/template @@ -20,9 +20,3 @@ long_desc=" access modules for all kind of public key directories. GnuPG, also known as GPG, is a command line tool with features for easy integration with other applications. A wealth of frontend applications and libraries are available." - -gnupg_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gnutls/template b/srcpkgs/gnutls/template index c28160f5a0..d1147c0f9a 100644 --- a/srcpkgs/gnutls/template +++ b/srcpkgs/gnutls/template @@ -43,9 +43,3 @@ gnutls-tools_package() { vmove usr/share/man/man1 } } - -gnutls_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/go/template b/srcpkgs/go/template index 4213950d38..64abda9b2a 100644 --- a/srcpkgs/go/template +++ b/srcpkgs/go/template @@ -3,7 +3,9 @@ pkgname=go version=1.1 revision=1 wrksrc=go +nostrip=yes makedepends="ed bison" +depends="perl gawk" short_desc="The Go Programming Language" maintainer="Juan RP " homepage="http://golang.org/" @@ -96,12 +98,3 @@ do_install() { rm -f ${DESTDIR}/usr/share/go/doc/articles/wiki/get.bin } - -go_package() { - nostrip=yes - depends="perl gawk" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template index 647a102ee0..b1fda02365 100644 --- a/srcpkgs/gobject-introspection/template +++ b/srcpkgs/gobject-introspection/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-tests --disable-static" hostmakedepends="pkg-config flex" makedepends="libffi-devel libglib-devel python-devel libxml2-devel cairo-devel libtool" +depends="libtool python libgirepository-devel" +pycompile_dirs="usr/lib/${pkgname}/giscanner" short_desc="Introspection system for GObject-based libraries" maintainer="Juan RP " homepage="http://live.gnome.org/GObjectInstrospection" @@ -41,11 +43,3 @@ libgirepository-devel_package() { vmove usr/share/gir-1.0 } } - -gobject-introspection_package() { - pycompile_dirs="usr/lib/${pkgname}/giscanner" - depends="libtool python libgirepository-devel" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template index 2de98a04a9..2c9a043f1b 100644 --- a/srcpkgs/gource/template +++ b/srcpkgs/gource/template @@ -4,6 +4,10 @@ version=0.40 revision=4 build_style=gnu-configure configure_args="--enable-ttf-font-dir=/usr/share/fonts/TTF" +hostmakedepends="pkg-config" +makedepends="SDL-devel SDL_image-devel glew-devel>=1.9.0 + freetype-devel boost-devel>=1.54 glm pcre-devel freefont-ttf" +depends="freefont-ttf" short_desc="Software version control visualization" maintainer="Juan RP " license="GPL-3" @@ -11,17 +15,6 @@ homepage="https://code.google.com/p/gource/" distfiles="https://gource.googlecode.com/files/gource-${version}.tar.gz" checksum=9c890a926bb3bab8ea3e546c1357488e5a5034d1ea9402afc654cb7e00ccd112 -hostmakedepends="pkg-config" -makedepends="SDL-devel SDL_image-devel glew-devel>=1.9.0 - freetype-devel boost-devel>=1.54 glm pcre-devel freefont-ttf" - pre_configure() { sed -i "s/filesystem3/filesystem/g" src/logmill.cpp } - -gource_package() { - depends="freefont-ttf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gpart/template b/srcpkgs/gpart/template index 8d8b5b10e4..8f39df985e 100644 --- a/srcpkgs/gpart/template +++ b/srcpkgs/gpart/template @@ -10,9 +10,3 @@ license="GPL-2" homepage="https://github.com/baruch/gpart" distfiles="https://github.com/baruch/gpart/releases/download/v${version}/${pkgname}-${version}.tar.gz" checksum=4efdaf4a557bf1b3fb3379bf684772dc1c0a05c9251eec53299b9f2362ea4e50 - -gpart_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gparted/template b/srcpkgs/gparted/template index 2eef537ad4..1ec9ba23d0 100644 --- a/srcpkgs/gparted/template +++ b/srcpkgs/gparted/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--enable-libparted-dmraid --sbindir=/usr/bin" hostmakedepends="pkg-config which intltool gnome-doc-utils" makedepends="libuuid-devel libparted-devel gtkmm2-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Gnome Partition Editor" maintainer="Juan RP " homepage="http://gparted.sourceforge.net" @@ -32,10 +33,3 @@ post_install() { vinstall ${FILESDIR}/org.void.pkexec.gparted.policy 644 /usr/share/polkit-1/actions vinstall ${FILESDIR}/gparted-pkexec 755 usr/bin } - -gparted_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gperf/template b/srcpkgs/gperf/template index 3c6baec98b..aee1a47e57 100644 --- a/srcpkgs/gperf/template +++ b/srcpkgs/gperf/template @@ -23,9 +23,3 @@ long_desc=" post_install() { touch -f ${DESTDIR}/usr/share/info/dir } - -gperf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gpgme/template b/srcpkgs/gpgme/template index aa4ae0b65a..d1ec29c93c 100644 --- a/srcpkgs/gpgme/template +++ b/srcpkgs/gpgme/template @@ -5,9 +5,11 @@ revision=1 build_style=gnu-configure configure_args="--enable-fd-passing --with-gpg=/usr/bin/gpg --with-gpgsm=/usr/bin/gpgsm --with-gpgconf=/usr/bin/gpgconf - --with-g13=/usr/bin/g13" + --with-g13=/usr/bin/g13 --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr + --with-libassuan-prefix=$XBPS_CROSS_BASE/usr" hostmakedepends="gnupg" makedepends="libgpg-error-devel libassuan-devel" +depends="libassuan>=2.0.3 gnupg" short_desc="GnuPG Made Easy" maintainer="Juan RP " license="GPL-2" @@ -26,11 +28,6 @@ long_desc=" instead. This way bug fixes or improvements can be done at a central place and every application benefits from this." -if [ "$CROSS_BUILD" ]; then - configure_args+=" --with-libgpg-error-prefix=$XBPS_CROSS_BASE/usr - --with-libassuan-prefix=$XBPS_CROSS_BASE/usr" -fi - gpgme-devel_package() { depends="libgpg-error-devel libassuan-devel gpgme>=${version}" short_desc+=" - development files" @@ -41,10 +38,3 @@ gpgme-devel_package() { vmove "usr/lib/*.so" } } - -gpgme_package() { - depends="libassuan>=2.0.3 gnupg" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gpicview/template b/srcpkgs/gpicview/template index 97beeaf2d4..a565865fab 100644 --- a/srcpkgs/gpicview/template +++ b/srcpkgs/gpicview/template @@ -4,16 +4,10 @@ version=0.2.3 revision=1 build_style=gnu-configure makedepends="pkg-config intltool libjpeg-turbo-devel gtk+-devel" +depends="desktop-file-utils" short_desc="A Simple and Fast Image Viewer for X" maintainer="Juan RP " homepage="http://lxde.org/" license="GPL-2" distfiles="${DEBIAN_SITE}/main/g/${pkgname}/${pkgname}_${version}.orig.tar.xz" checksum=e1cd963e0954677efec3bc08f4318f1214d2b33c1498d402133a7ca35cec0bfd - -gpicview_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gpm/template b/srcpkgs/gpm/template index bb26d4637a..f7025bc628 100644 --- a/srcpkgs/gpm/template +++ b/srcpkgs/gpm/template @@ -6,6 +6,7 @@ build_style=gnu-configure hostmakedepends="automake libtool flex" makedepends="ncurses-devel libfl-devel" configure_args="--sbindir=/usr/bin" +systemd_services="gpm.service on" short_desc="A mouse server for the console and xterm" maintainer="Juan RP " homepage="http://www.nico.schottelius.org/software/gpm/" @@ -43,10 +44,3 @@ libgpm_package() { vmove "usr/lib/*.so.*" } } - -gpm_package() { - systemd_services="gpm.service on" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gptfdisk/template b/srcpkgs/gptfdisk/template index 046fbbd1a1..c89c05e8b6 100644 --- a/srcpkgs/gptfdisk/template +++ b/srcpkgs/gptfdisk/template @@ -21,9 +21,3 @@ do_install() { vinstall ${f}.8 644 usr/share/man/man8 done } - -gptfdisk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 92ed2306d8..887e4da9df 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -3,7 +3,9 @@ pkgname=granite version=0.1.1 revision=3 build_style=cmake -makedepends="cmake vala pkg-config gtk+3-devel libgee-devel glib-devel" +hostmakedepends="cmake vala pkg-config" +makedepends="gtk+3-devel libgee-devel glib-devel" +depends="hicolor-icon-theme" short_desc="GTK+3 extension providing commonly-used widgets" maintainer="tripledes " homepage="https://launchpad.net/granite" @@ -13,17 +15,10 @@ checksum=360a030690d3db1faedf7461fe808b37ed67de7f380532673dae2242f2e7b5e5 granite-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/vala } } - -granite_package() { - depends="hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/grantlee/template b/srcpkgs/grantlee/template index 947d3d3c9f..43e3bbeb05 100644 --- a/srcpkgs/grantlee/template +++ b/srcpkgs/grantlee/template @@ -20,9 +20,3 @@ grantlee-devel_package() { vmove "usr/lib/*.so" } } - -grantlee_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/graphite/template b/srcpkgs/graphite/template index bb3c100b4c..2bfaf88a10 100644 --- a/srcpkgs/graphite/template +++ b/srcpkgs/graphite/template @@ -24,9 +24,3 @@ graphite-devel_package() { vmove usr/share } } - -graphite_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index 70b4c173d6..8f89246688 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -41,9 +41,3 @@ graphviz-devel_package() { vmove usr/share/man/man3 } } - -graphviz_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/grep/template b/srcpkgs/grep/template index 0e3d29a0c7..796e1227ae 100644 --- a/srcpkgs/grep/template +++ b/srcpkgs/grep/template @@ -4,6 +4,7 @@ version=2.15 revision=1 build_style=gnu-configure makedepends="pcre-devel>=8.30" +conflicts="chroot-grep>=0" short_desc="The GNU grep utility" maintainer="Juan RP " license="GPL-3" @@ -14,10 +15,3 @@ checksum=bf5a834e587974c8c64e71b35b9e75cd21c7ff253c0e7fbfb0a78be794965314 post_install() { touch ${DESTDIR}/usr/share/info/dir } - -grep_package() { - conflicts="chroot-grep>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/grilo-plugins/template b/srcpkgs/grilo-plugins/template index 1f02bc9c8c..f5a0b3b82e 100644 --- a/srcpkgs/grilo-plugins/template +++ b/srcpkgs/grilo-plugins/template @@ -10,6 +10,7 @@ makedepends="grilo-devel>=0.2.6 gupnp-av-devel json-glib-devel libquvi-devel rest-devel>=0.7.90 sqlite-devel libgcrypt-devel gmime-devel tracker-devel>=0.16_2 totem-pl-parser-devel>=3.10 libgdata-devel>=0.14 gnome-online-accounts-devel>=3.10" +depends="grilo>=${version}" short_desc="Plugins for Grilo" maintainer="Juan RP " license="LGPL-2.1" @@ -26,10 +27,3 @@ long_desc=" Developers can share efforts and code by writing plugins for the framework that are application agnostic. * A flexible API that allows plugin developers to write plugins of various kinds." - -grilo-plugins_package() { - depends="grilo>=0.2.7" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/grilo/template b/srcpkgs/grilo/template index 113b73879a..09cf937261 100644 --- a/srcpkgs/grilo/template +++ b/srcpkgs/grilo/template @@ -40,9 +40,3 @@ grilo-devel_package() { vmove "usr/lib/*.so" } } - -grilo_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/groff/template b/srcpkgs/groff/template index c556f64b55..6eb9752ca9 100644 --- a/srcpkgs/groff/template +++ b/srcpkgs/groff/template @@ -54,15 +54,9 @@ do_install() { } groff-doc_package() { - short_desc="${short_desc} - documentation" + short_desco+=" - documentation" noarch=yes pkg_install() { vmove usr/share/doc } } - -groff_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/grub/template b/srcpkgs/grub/template index 4c653bb97c..0649c805f6 100644 --- a/srcpkgs/grub/template +++ b/srcpkgs/grub/template @@ -2,6 +2,11 @@ pkgname=grub version=2.00 revision=12 +hostmakedepends="flex" +makedepends="libusb-compat-devel ncurses-devel freetype-devel + liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" +depends="os-prober" +conf_files="/etc/default/grub /etc/grub.d/40_custom" short_desc="GRand Unified Bootloader 2" maintainer="Juan RP " license="GPL-3" @@ -9,10 +14,6 @@ homepage="http://www.gnu.org/software/grub/" distfiles="$GNU_SITE/grub/grub-$version.tar.xz" checksum=784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458 -hostmakedepends="flex" -makedepends="libusb-compat-devel ncurses-devel freetype-devel - liblzma-devel device-mapper-devel font-unifont-bdf fuse-devel" - do_configure() { unset CC AS LD RANLIB CPP @@ -83,22 +84,12 @@ do_install() { } if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - -grub-x86_64-efi_package() { - noarch=yes - depends="grub>=$version dosfstools efibootmgr" - short_desc+=" - x86_64 EFI support" - pkg_install() { - vmove usr/lib/grub/x86_64-efi + grub-x86_64-efi_package() { + noarch=yes + depends="grub>=$version dosfstools efibootmgr" + short_desc+=" - x86_64 EFI support" + pkg_install() { + vmove usr/lib/grub/x86_64-efi + } } -} - fi # !x86_64 - -grub_package() { - conf_files="/etc/default/grub /etc/grub.d/40_custom" - depends="os-prober" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gsasl/template b/srcpkgs/gsasl/template index 1a5acf58af..f66795ade3 100644 --- a/srcpkgs/gsasl/template +++ b/srcpkgs/gsasl/template @@ -43,9 +43,3 @@ gsasl-devel_package() { vmove usr/share/man/man3 } } - -gsasl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gsettings-desktop-schemas/template b/srcpkgs/gsettings-desktop-schemas/template index b41493f0a8..2ae182de3c 100644 --- a/srcpkgs/gsettings-desktop-schemas/template +++ b/srcpkgs/gsettings-desktop-schemas/template @@ -24,9 +24,3 @@ gsettings-desktop-schemas-devel_package() { vmove usr/share/gir-1.0 } } - -gsettings-desktop-schemas_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gsfonts/template b/srcpkgs/gsfonts/template index 570f1d9d61..40cef3377f 100644 --- a/srcpkgs/gsfonts/template +++ b/srcpkgs/gsfonts/template @@ -3,26 +3,18 @@ pkgname=gsfonts version=8.11 revision=2 wrksrc=fonts -distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-$version.tar.gz" +noarch="yes" makedepends="font-util" +depends="font-util" +font_dirs="/usr/share/fonts/Type1" short_desc="Ghostscript standard Type1 fonts" homepage="http://sourceforge.net/projects/gs-fonts/" license="GPL-2" maintainer="Juan RP " +distfiles="${SOURCEFORGE_SITE}/ghostscript/ghostscript-fonts-std-$version.tar.gz" checksum=0eb6f356119f2e49b2563210852e17f57f9dcc5755f350a69a46a0d641a0c401 -long_desc=" - This packages includes the Ghostscript standard Type1 fonts." do_install() { install -d ${DESTDIR}/usr/share/fonts/Type1 install -m644 ${wrksrc}/*.[ap]f[bm] ${DESTDIR}/usr/share/fonts/Type1 } - -gsfonts_package() { - depends="font-util" - noarch="yes" - font_dirs="/usr/share/fonts/Type1" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gsl/template b/srcpkgs/gsl/template index d092642a61..d07f907505 100644 --- a/srcpkgs/gsl/template +++ b/srcpkgs/gsl/template @@ -23,9 +23,3 @@ gsl-devel_package() { vmove "usr/lib/*.a" } } - -gsl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gssdp/template b/srcpkgs/gssdp/template index ef35331f75..011ef77f35 100644 --- a/srcpkgs/gssdp/template +++ b/srcpkgs/gssdp/template @@ -28,9 +28,3 @@ gssdp-devel_package() { vmove usr/share/vala } } - -gssdp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-ffmpeg/template b/srcpkgs/gst-ffmpeg/template index 5ea3d68efc..b89db4dd52 100644 --- a/srcpkgs/gst-ffmpeg/template +++ b/srcpkgs/gst-ffmpeg/template @@ -16,9 +16,3 @@ long_desc=" formats through the use of the FFmpeg library. The plugin contains GStreamer elements for decoding 90+ formats (AVI, MPEG, OGG, Matroska, ASF, ...), demuxing 30+ formats and colorspace conversion." - -gst-ffmpeg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index d6ed2da106..31f60858db 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -7,16 +7,10 @@ build_style=gnu-configure configure_args="--with-libav-extra-configure=--enable-runtime-cpudetect" hostmakedepends="pkg-config yasm python" makedepends="orc-devel>=0.4.18 gst-plugins-base1-devel>=${version}" +depends="orc>=0.4.18 gst-plugins-base1>=${version}" short_desc="GStreamer libav plugin" maintainer="Juan RP " license="GPL-2" homepage="http://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname}/${pkgname}-${version#*:}.tar.xz" checksum=fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676 - -gst-libav_package() { - depends="orc>=0.4.18 gst-plugins-base1>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-bad/template b/srcpkgs/gst-plugins-bad/template index 2bd4203797..5a6f0a9b60 100644 --- a/srcpkgs/gst-plugins-bad/template +++ b/srcpkgs/gst-plugins-bad/template @@ -11,6 +11,8 @@ makedepends="libpng-devel>=1.6 alsa-lib-devel celt-devel openssl-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel libvpx-devel libvdpau-devel libgsm-devel librtmp-devel" +# Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36. +depends="gst-plugins-base>=0.10.36" short_desc="GStreamer plugins from the bad set" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -38,11 +40,3 @@ gst-plugins-bad-devel_package() { vmove usr/lib/pkgconfig } } - -gst-plugins-bad_package() { - # Requires libgstfft-0.10.so.0 from gst-plugins-base-0.10.36. - depends="gst-plugins-base>=0.10.36" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 9451d0f788..f0768441ac 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -5,13 +5,6 @@ revision=1 wrksrc="gst-plugins-bad-${version#*:}" build_style=gnu-configure configure_args="--enable-experimental --disable-static" -short_desc="GStreamer plugins from the bad set (v1.x)" -maintainer="Juan RP " -license="GPL-2, LGPL-2.1" -homepage="http://gstreamer.freedesktop.org" -distfiles="$homepage/src/gst-plugins-bad/gst-plugins-bad-${version#*:}.tar.xz" -checksum=f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929 - hostmakedepends="pkg-config intltool" makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel gst-plugins-base1-devel>=${version} libdca-devel orc-devel>=0.4.18 libmms-devel @@ -19,8 +12,14 @@ makedepends="alsa-lib-devel celt-devel openssl-devel exempi-devel faad2-devel libdvdread-devel libdvdnav-devel librsvg-devel libsndfile-devel xvidcore-devel jasper-devel libmodplug-devel neon-devel libcurl-devel libvpx-devel libvdpau-devel libgsm-devel librtmp-devel libass-devel - mpg123-devel soundtouch-devel opus-devel libwebp-devel wayland-devel - libsrtp-devel" + mpg123-devel soundtouch-devel opus-devel libwebp-devel wayland-devel libsrtp-devel" +depends="gst-plugins-base1>=${version}" +short_desc="GStreamer plugins from the bad set (v1.x)" +maintainer="Juan RP " +license="GPL-2, LGPL-2.1" +homepage="http://gstreamer.freedesktop.org" +distfiles="$homepage/src/gst-plugins-bad/gst-plugins-bad-${version#*:}.tar.xz" +checksum=f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929 gst-plugins-bad1-devel_package() { depends="gst-plugins-base1-devel>=${version} ${sourcepkg}-${version}_${revision}" @@ -32,10 +31,3 @@ gst-plugins-bad1-devel_package() { vmove usr/share/gtk-doc } } - -gst-plugins-bad1_package() { - depends="gst-plugins-base1>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-base/template b/srcpkgs/gst-plugins-base/template index 1fe91b73b6..1975a9d9b4 100644 --- a/srcpkgs/gst-plugins-base/template +++ b/srcpkgs/gst-plugins-base/template @@ -85,9 +85,3 @@ gst-plugins-base-devel_package() { fi } } - -gst-plugins-base_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 2502aff851..fb0438b6e8 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -11,6 +11,7 @@ makedepends="libgudev-devel cairo-devel liboil-devel alsa-lib-devel libXv-devel libXext-devel libvisual-devel cdparanoia-devel libtheora-devel libvorbis-devel libSM-devel orc-devel>=0.4.18" +depends="orc>=0.4.18 gstreamer1>=${version}" short_desc="GStreamer Base Plug-ins (v1.x)" maintainer="Juan RP " homepage="http://gstreamer.freedesktop.org/" @@ -29,10 +30,3 @@ gst-plugins-base1-devel_package() { vmove "usr/share/gir*" } } - -gst-plugins-base1_package() { - depends="orc>=0.4.18 gstreamer1>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-good/template b/srcpkgs/gst-plugins-good/template index 48aa877655..c8e9bf77b6 100644 --- a/srcpkgs/gst-plugins-good/template +++ b/srcpkgs/gst-plugins-good/template @@ -33,9 +33,3 @@ post_install() { gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/gstreamer-0.10.schemas \ --domain ${pkgname}-0.10 ${wrksrc}/*.schemas } - -gst-plugins-good_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 0b2232fa89..965bc446bd 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -15,16 +15,10 @@ makedepends=" taglib-devel libsoup-gnome-devel gst-plugins-base1-devel>=${version} GConf-devel pulseaudio-devel orc-devel>=0.4.18 libXv-devel wavpack-devel v4l-utils-devel jack-devel speex-devel" +depends="gst-plugins-base1>=${version}" short_desc="GStreamer set of well-maintained good plug-ins (1.x)" maintainer="Juan RP " homepage="http://gstreamer.freedesktop.org/" license="LGPL-2.1" distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${version#*:}.tar.xz" checksum=660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517 - -gst-plugins-good1_package() { - depends="gst-plugins-base1>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-ugly/template b/srcpkgs/gst-plugins-ugly/template index 5b23d07330..79c351ca91 100644 --- a/srcpkgs/gst-plugins-ugly/template +++ b/srcpkgs/gst-plugins-ugly/template @@ -25,9 +25,3 @@ long_desc=" This package contains plugins from the ugly set, a set of good-quality plug-ins that might pose distribution problems." - -gst-plugins-ugly_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 492ff99c2a..f5833a1b0f 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -5,22 +5,15 @@ revision=1 wrksrc="gst-plugins-ugly-${version#*:}" build_style=gnu-configure configure_args="--enable-experimental" +# XXX add required pkgs for the amr, sid plugins. +hostmakedepends="pkg-config intltool" +makedepends="glib-devel libxml2-devel gst-plugins-base1-devel>=${version} + libcdio-devel libdvdread-devel libmad-devel x264-devel>=20131007.2245_2 + orc-devel>=0.4.18 liba52-devel libmpeg2-devel lame-devel" +depends="orc>=0.4.18 gst-plugins-base1>=${version}" short_desc="GStreamer plugins from the ugly set (1.x)" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://gstreamer.freedesktop.org" distfiles="http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${version#*:}.tar.xz" checksum=35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395 - -# XXX add required pkgs for the amr, sid plugins. -hostmakedepends="pkg-config intltool" -makedepends="glib-devel libxml2-devel gst-plugins-base1-devel>=${version} - libcdio-devel libdvdread-devel libmad-devel x264-devel>=20131007.2245_2 - orc-devel>=0.4.18 liba52-devel libmpeg2-devel lame-devel" - -gst-plugins-ugly1_package() { - depends="orc>=0.4.18 gst-plugins-base1>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gst-python/template b/srcpkgs/gst-python/template index 1931a2ebef..58125a41d5 100644 --- a/srcpkgs/gst-python/template +++ b/srcpkgs/gst-python/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config glib-devel python-devel pygobject2-devel pygtk-devel libxml2-devel gstreamer-devel gst-plugins-base-devel" +depends="pygobject2 pygtk" +pycompile_module="gst-0.10" short_desc="Python bindings for GStreamer 0.10" maintainer="Juan RP " license="LGPL-2.1" @@ -18,18 +20,10 @@ long_desc=" gst-python-devel_package() { depends="${sourcepkg}-${version}_${revision}" - short_desc="${sourcepkg} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gst-python } } - -gst-python_package() { - depends="pygobject2 pygtk" - pycompile_module="gst-0.10" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gst123/template b/srcpkgs/gst123/template index 58f54f4b90..7923854edc 100644 --- a/srcpkgs/gst123/template +++ b/srcpkgs/gst123/template @@ -3,18 +3,13 @@ pkgname=gst123 version=0.3.2 revision=1 build_style=gnu-configure -makedepends="pkg-config ncurses-devel gtk+-devel libxml2-devel +hostmakedepends="pkg-config" +makedepends="ncurses-devel gtk+-devel libxml2-devel gstreamer-devel gst-plugins-base-devel gst-plugins-good" +depends="gst-plugins-good" short_desc="GStreamer based CLI player" maintainer="Juan RP " homepage="http://space.twc.de/~stefan/gst123.php/" license="LGPL-2.1" distfiles="http://space.twc.de/~stefan/gst123/gst123-$version.tar.bz2" checksum=51033261967da4cf1beb512e156e9f647572689202a1c2aceb8cd2beb427f53d - -gst123_package() { - depends="gst-plugins-good" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template index 47e723e069..acdb3d272b 100644 --- a/srcpkgs/gstreamer-vaapi/template +++ b/srcpkgs/gstreamer-vaapi/template @@ -71,9 +71,3 @@ gstreamer-vaapi-devel_package() { vmove "usr/lib/*-0.10*.so" } } - -gstreamer-vaapi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gstreamer/template b/srcpkgs/gstreamer/template index 7b1dae6f90..b8562a6ec3 100644 --- a/srcpkgs/gstreamer/template +++ b/srcpkgs/gstreamer/template @@ -56,9 +56,3 @@ gstreamer-devel_package() { fi } } - -gstreamer_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 98d363c96d..b38f9f57ed 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -27,9 +27,3 @@ gstreamer1-devel_package() { vmove "usr/share/gir*" } } - -gstreamer1_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index ad1090d827..9fc0cdc56a 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -17,6 +17,10 @@ makedepends="shared-mime-info glib-devel libXcursor-devel libXcomposite-devel libXdamage-devel fontconfig-devel gdk-pixbuf-devel>=2.26.1_2 cairo-devel pango-devel>=1.28.0 atk-devel>=1.32.0 cups-devel>=1.6.1_9 dbus-x11" +depends="shared-mime-info dbus-x11 gdk-pixbuf>=2.26.1_2 + gtk-update-icon-cache>=${version}_${revision}" +conf_files="/etc/gtk-2.0/im-multipress.conf" +triggers="gtk-immodules" if [ "$CROSS_BUILD" ]; then # XXX needs native glib-mkenums and cups-config. @@ -81,13 +85,3 @@ gtk-update-icon-cache_package() { vinstall ${wrksrc}/docs/reference/gtk/gtk-update-icon-cache.1 644 usr/share/man/man1 } } - -gtk+_package() { - depends="shared-mime-info dbus-x11 gdk-pixbuf>=2.26.1_2 - gtk-update-icon-cache>=${version}_${revision}" - conf_files="/etc/gtk-2.0/im-multipress.conf" - triggers="gtk-immodules" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index d11ad89ca9..af59447a53 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -16,6 +16,9 @@ hostmakedepends="pkg-config glib-devel>=2.38" makedepends="libglib-devel>=2.38 atk-devel>=2.10 at-spi2-atk-devel>=2.8 libpng-devel fontconfig-devel cairo-devel pango-devel>=1.36 gdk-pixbuf-devel>=2.30 gtk+-devel colord-devel>=0.1.23_3 cups-devel" +depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10 dbus-x11" +triggers="gtk3-immodules" +conf_files="/etc/gtk-3.0/im-multipress.conf" # Package build options build_options="broadway gir wayland x11" @@ -97,12 +100,3 @@ gtk+3-demo_package() { vmove usr/share/gtk-3.0 } } - -gtk+3_package() { - triggers="gtk3-immodules" - conf_files="/etc/gtk-3.0/im-multipress.conf" - depends="gtk-update-icon-cache shared-mime-info glib>=2.38 atk>=2.10 dbus-x11" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template index 7a2d9e1fd9..a277d3e3f7 100644 --- a/srcpkgs/gtk-doc/template +++ b/srcpkgs/gtk-doc/template @@ -2,8 +2,10 @@ pkgname=gtk-doc version=1.19 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="which pkg-config itstool openjade python docbook-xsl gnome-doc-utils perl>=0" +depends="docbook-xsl gnome-doc-utils perl>=0" short_desc="Documentation tool for public library API" maintainer="Juan RP " license="GPL-2, FDL-" @@ -13,11 +15,3 @@ checksum=27df247fa828433a9390368e2088cc22f954f2ce1f255ddbd12ab6e027b12e68 long_desc=" These tools extract documentation embedded in GNOME source code, and produce pretty output via DocBook SGML." - -gtk-doc_package() { - depends="docbook-xsl gnome-doc-utils perl>=0" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtk-engine-murrine/template b/srcpkgs/gtk-engine-murrine/template index 89df5f86de..64d51757c5 100644 --- a/srcpkgs/gtk-engine-murrine/template +++ b/srcpkgs/gtk-engine-murrine/template @@ -12,9 +12,3 @@ maintainer="Steven R " homepage="http://cimitan.com/murrine/project/murrine" license="LGPL3" short_desc="GTK2 engine to make your desktop look like a murrina" - -gtk-engine-murrine_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtk-sharp/template b/srcpkgs/gtk-sharp/template index af72da7f63..405e9c80e1 100644 --- a/srcpkgs/gtk-sharp/template +++ b/srcpkgs/gtk-sharp/template @@ -2,25 +2,18 @@ pkgname=gtk-sharp version=2.99.2 revision=1 +create_srcdir=yes distfiles="https://github.com/mono/gtk-sharp/archive/${version}.tar.gz" checksum="a2f143cfa9a33f7249770b13086e9cfb9c122d8a8b91a231f9343dd91bdb3a0b" build_style=gnu-configure hostmakedepends="pkg-config autoconf automake" makedepends="mono gtk+3-devel libglade-devel libtool which" +depends="mono gtk+" maintainer="Steven R " homepage="http://www.mono-project.com/GtkSharp" license="LGPL" -short_desc="Gtk# is a Graphical User Interface Toolkit for mono and .Net" - -create_srcdir=yes +short_desc="Graphical User Interface Toolkit for mono and .Net (Gtk#)" pre_configure() { ./autogen.sh } - -gtk-sharp_package() { - depends="mono gtk+" - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/gtk-theme-config/template b/srcpkgs/gtk-theme-config/template index db53c912b6..2c40f5920c 100644 --- a/srcpkgs/gtk-theme-config/template +++ b/srcpkgs/gtk-theme-config/template @@ -3,25 +3,17 @@ pkgname=gtk-theme-config version=20130128 revision=1 build_style=gnu-makefile -make_build_args="PREFIX=/usr" -make_install_args="PREFIX=/usr" makedepends="pkg-config glib-devel vala-devel gtk+3-devel" +depends="desktop-file-utils" short_desc="Utility to set GTK Theme Preferences" maintainer="davehome " license="GPL-3" homepage="https://github.com/satya164/gtk-theme-config" - do_fetch() { local url="git://github.com/satya164/gtk-theme-config.git" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} - cd ${pkgname}-${version} && git checkout aa7d8a3dd2d98e124032b55473599086b7a0828a -} - -gtk-theme-config_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } + cd ${pkgname}-${version} + git checkout aa7d8a3dd2d98e124032b55473599086b7a0828a } diff --git a/srcpkgs/gtk-vnc/template b/srcpkgs/gtk-vnc/template index 74f8b18fd3..6f4e268251 100644 --- a/srcpkgs/gtk-vnc/template +++ b/srcpkgs/gtk-vnc/template @@ -82,9 +82,3 @@ gtk-vnc-devel_package() { vmove usr/share/gir-1.0/GtkVnc-2.0.gir } } - -gtk-vnc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtk-xfce-engine/template b/srcpkgs/gtk-xfce-engine/template index f1cb6269c1..d818660b7f 100644 --- a/srcpkgs/gtk-xfce-engine/template +++ b/srcpkgs/gtk-xfce-engine/template @@ -15,9 +15,3 @@ long_desc=" This package contains an Xfce engine for GTK2.0 which makes you able to use various GTK2.0 themes with Xfce. It also contains some ready themes, but you are of course free to design your own." - -gtk-xfce-engine_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtk2-engines/template b/srcpkgs/gtk2-engines/template index aff9041764..7d8e1278cc 100644 --- a/srcpkgs/gtk2-engines/template +++ b/srcpkgs/gtk2-engines/template @@ -12,11 +12,3 @@ homepage="http://live.gnome.org/GnomeArt" license="GPL-2" distfiles="ftp://ftp.archlinux.org/other/gtk-engines/gtk-engines-${version}.tar.gz" checksum=6c38c297c3b95d667c5159c1f379384806fedb53a828d44ac73ff54570ed185b -long_desc=" - This package contains theme engines for the GTK+2 toolkit." - -gtk2-engines_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtkaml/template b/srcpkgs/gtkaml/template index 637da18175..9052356b92 100644 --- a/srcpkgs/gtkaml/template +++ b/srcpkgs/gtkaml/template @@ -4,6 +4,7 @@ version=0.5.94 revision=2 build_style=gnu-configure makedepends="pkg-config vala-devel>=0.18 glib-devel gtk+-devel>=2.20 libxml2-devel>=2.8" +depends="pkg-config vala>=0.18" short_desc="An Application Markup Language for GTK+Vala" maintainer="pancake " homepage="http://www.gtkaml.org" @@ -12,7 +13,7 @@ distfiles="https://$pkgname.googlecode.com/files/$pkgname-$version.tar.bz2" checksum=93b7656100444b1ac226a5b09b74b86ef66d2ad391a02c8f0a536915461c0a08 libgtkaml_package() { - short_desc="${short_desc} -- runtime library" + short_desc+=" - runtime library" pkg_install() { vmove "usr/lib/*.so*" } @@ -20,16 +21,9 @@ libgtkaml_package() { gtkaml-devel_package() { depends="vala-devel>=0.18 libgtkaml>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -gtkaml_package() { - depends="pkg-config vala>=0.18" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtkdialog/template b/srcpkgs/gtkdialog/template index 77a1c95c50..fddbd6e7f1 100644 --- a/srcpkgs/gtkdialog/template +++ b/srcpkgs/gtkdialog/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure make_install_args="UPDATE_ICON_CACHE=true" makedepends="pkg-config flex gtk+-devel libglade-devel vte-devel" +depends="hicolor-icon-theme" short_desc="A small utility for fast and easy GUI building" maintainer="Juan RP " license="GPL-2" @@ -16,10 +17,3 @@ post_install() { vmkdir usr/share/doc/$pkgname cp -a examples ${DESTDIR}/usr/share/doc/$pkgname/examples } - -gtkdialog_package() { - depends="hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtkhtml/template b/srcpkgs/gtkhtml/template index 9f26c26e03..f3cd408270 100644 --- a/srcpkgs/gtkhtml/template +++ b/srcpkgs/gtkhtml/template @@ -7,6 +7,7 @@ hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel>=3.8 enchant-devel ORBit2-devel libsoup-gnome-devel>=2.40 gsettings-desktop-schemas-devel>=3.8 gnome-icon-theme gsettings-desktop-schemas>=3.6.0 iso-codes" +depends="gnome-icon-theme gsettings-desktop-schemas>=3.6.0 iso-codes" short_desc="Layout engine written in C using the GTK+ widget toolkit" maintainer="davehome " homepage="http://www.gnome.org" @@ -30,10 +31,3 @@ gtkhtml-devel_package() { vmove "usr/lib/*.so" } } - -gtkhtml_package() { - depends="gnome-icon-theme gsettings-desktop-schemas>=3.6.0 iso-codes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index 5965845c4a..7df1f8b5dc 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-documentation" hostmakedepends="pkg-config" makedepends="gtk+3-devel>=3.10 glibmm-devel>=2.37 atkmm-devel pangomm-devel" +depends="gtk+3>=3.10" short_desc="C++ bindings for The GTK+ toolkit (v2)" maintainer="Juan RP " homepage="http://gtkmm.sourceforge.net/" @@ -31,10 +32,3 @@ gtkmm-devel_package() { vmove "usr/lib/*.so" } } - -gtkmm_package() { - depends="gtk+3>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtkmm2/template b/srcpkgs/gtkmm2/template index b4fd2381a2..43e2cbe0a0 100644 --- a/srcpkgs/gtkmm2/template +++ b/srcpkgs/gtkmm2/template @@ -38,9 +38,3 @@ gtkmm2-devel_package() { vmove "usr/lib/*.so" } } - -gtkmm2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtksourceview/template b/srcpkgs/gtksourceview/template index 596c85596d..810ea1493a 100644 --- a/srcpkgs/gtksourceview/template +++ b/srcpkgs/gtksourceview/template @@ -24,9 +24,3 @@ gtksourceview-devel_package() { vmove usr/share/gtk-doc } } - -gtksourceview_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gtksourceview2/template b/srcpkgs/gtksourceview2/template index 0b3c08b832..eaca5baaaa 100644 --- a/srcpkgs/gtksourceview2/template +++ b/srcpkgs/gtksourceview2/template @@ -26,9 +26,3 @@ gtksourceview2-devel_package() { vmove usr/share/gtk-doc } } - -gtksourceview2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtksourceviewmm/template b/srcpkgs/gtksourceviewmm/template index 11d2664829..bc30bcdcea 100644 --- a/srcpkgs/gtksourceviewmm/template +++ b/srcpkgs/gtksourceviewmm/template @@ -27,9 +27,3 @@ gtksourceviewmm-devel_package() { vmove usr/lib/gtksourceviewmm-3.0 } } - -gtksourceviewmm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gtkspell/template b/srcpkgs/gtkspell/template index 2008294989..ef87e7b336 100644 --- a/srcpkgs/gtkspell/template +++ b/srcpkgs/gtkspell/template @@ -18,16 +18,10 @@ long_desc=" gtkspell-devel_package() { depends="gtk+-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc } } - -gtkspell_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gucharmap/template b/srcpkgs/gucharmap/template index 48a116348c..df6afc5804 100644 --- a/srcpkgs/gucharmap/template +++ b/srcpkgs/gucharmap/template @@ -7,6 +7,7 @@ configure_args="--disable-schemas-compile --enable-introspection" hostmakedepends="which pkg-config intltool gnome-doc-utils itstool gobject-introspection" makedepends="gtk+3-devel hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils" short_desc="GNOME Unicode Charmap" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -27,10 +28,3 @@ gucharmap-devel_package() { vmove "usr/lib/*.so" } } - -gucharmap_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/guile/template b/srcpkgs/guile/template index 60c0342012..320be58cae 100644 --- a/srcpkgs/guile/template +++ b/srcpkgs/guile/template @@ -4,6 +4,8 @@ version=2.0.9 revision=2 build_style=gnu-configure configure_args="--disable-static --disable-error-on-warning" +hostmakedepends="pkg-config texinfo" +makedepends="libltdl-devel libunistring-devel libffi-devel gc-devel ncurses-devel" short_desc="A portable, embeddable Scheme implementation written in C" maintainer="davehome " license="GPL" @@ -14,10 +16,6 @@ long_desc=" Guile is the GNU Ubiquitous Intelligent Language for Extensions, the official extension language (Scheme) for the GNU operating system." -hostmakedepends="pkg-config texinfo" -makedepends="libltdl-devel libunistring-devel libffi-devel gc-devel -ncurses-devel" - guile-devel_package() { short_desc+=" (Development files)" depends="guile" @@ -35,9 +33,3 @@ guile-docs_package() { vmove usr/share/man } } - -guile_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gupnp-av/template b/srcpkgs/gupnp-av/template index 2928a610a1..51a30285ee 100644 --- a/srcpkgs/gupnp-av/template +++ b/srcpkgs/gupnp-av/template @@ -23,9 +23,3 @@ gupnp-av-devel_package() { vmove "usr/lib/*.so" } } - -gupnp-av_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gupnp-dlna/template b/srcpkgs/gupnp-dlna/template index d631c94d72..77fdd90c92 100644 --- a/srcpkgs/gupnp-dlna/template +++ b/srcpkgs/gupnp-dlna/template @@ -27,9 +27,3 @@ gupnp-dlna-devel_package() { vmove usr/lib/pkgconfig } } - -gupnp-dlna_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gupnp-igd/template b/srcpkgs/gupnp-igd/template index 404f8f2bc4..7be4c7bc84 100644 --- a/srcpkgs/gupnp-igd/template +++ b/srcpkgs/gupnp-igd/template @@ -16,16 +16,10 @@ long_desc=" gupnp-igd-devel_package() { depends="gupnp-devel gupnp-igd>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share vmove usr/lib/pkgconfig } } - -gupnp-igd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/gupnp/template b/srcpkgs/gupnp/template index 1c9f0835ff..4bc30b7b75 100644 --- a/srcpkgs/gupnp/template +++ b/srcpkgs/gupnp/template @@ -24,9 +24,3 @@ gupnp-devel_package() { vmove "usr/lib/*.so" } } - -gupnp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index c2bb757d17..a94e43076b 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -99,9 +99,3 @@ gvfs-smb_package() { vmove usr/share/gvfs/mounts/smb.mount } } - -gvfs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/hamster-applet/template b/srcpkgs/hamster-applet/template index 642ffa89c4..cea9165949 100644 --- a/srcpkgs/hamster-applet/template +++ b/srcpkgs/hamster-applet/template @@ -2,7 +2,12 @@ pkgname=hamster-applet version=2.91.2 revision=3 +noarch="yes" build_style=waf +makedepends="pkg-config intltool gnome-doc-utils glib-devel dbus-glib-devel + docbook2x python-devel gnome-control-center pysqlite pyxdg" +depends="pygtk pyxdg dbus-python python-gconf notify-python pysqlite" +pycompile_module="hamster" short_desc="Time tracking application for individuals" maintainer="Juan RP " license="GPL-2" @@ -14,21 +19,9 @@ long_desc=" on how much time you have spent during the day on activities you choose to track." -makedepends="pkg-config intltool gnome-doc-utils glib-devel dbus-glib-devel - docbook2x python-devel gnome-control-center pysqlite pyxdg" - post_install() { mv ${DESTDIR}/etc/gconf ${DESTDIR}/usr/share # Remove panel applet that incompatible with GNOME Panel 3 rm -r ${DESTDIR}/usr/lib/{bonobo,hamster-applet,python2.7/site-packages/hamster/applet.py} } - -hamster-applet_package() { - noarch="yes" - pycompile_module="hamster" - depends="pygtk pyxdg dbus-python python-gconf notify-python pysqlite" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/handbrake/template b/srcpkgs/handbrake/template index 0f4286504a..95fc8914e0 100644 --- a/srcpkgs/handbrake/template +++ b/srcpkgs/handbrake/template @@ -9,6 +9,7 @@ makedepends="zlib-devel bzip2-devel libnotify-devel gtk+3-devel ncurses-devel dbus-glib-devel fribidi-devel libass-devel fontconfig-devel libxml2-devel libogg-devel libtheora-devel libsamplerate-devel libbluray-devel hicolor-icon-theme desktop-file-utils" +depends="gst-plugins-good" short_desc="Multithreaded video transcoder" maintainer="Juan RP " license="GPL-3" @@ -46,10 +47,3 @@ handbrake-cli_package() { vmove usr/bin/HandBrakeCLI } } - -handbrake_package() { - depends="gst-plugins-good" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template index 321bad0bb6..fe013d4cda 100644 --- a/srcpkgs/hardinfo/template +++ b/srcpkgs/hardinfo/template @@ -4,6 +4,7 @@ version=0.5.1 revision=1 hostmakedepends="pkg-config which" makedepends="gtk+-devel libsoup-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A system information and benchmark tool" maintainer="Juan RP " license="GPL-2" @@ -24,10 +25,3 @@ do_install() { vmkdir etc echo "Void Linux" > ${DESTDIR}/etc/hardinfo.distro } - -hardinfo_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template index dfccab004e..e6524fc31b 100644 --- a/srcpkgs/harfbuzz/template +++ b/srcpkgs/harfbuzz/template @@ -37,9 +37,3 @@ harfbuzz-devel_package() { vmove usr/share/gtk-doc } } - -harfbuzz_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/hdparm/template b/srcpkgs/hdparm/template index dfd3025bd4..d083ca34cd 100644 --- a/srcpkgs/hdparm/template +++ b/srcpkgs/hdparm/template @@ -13,9 +13,3 @@ checksum=2bbe92274971182192901ab220e94bd2e4896f924fa6b225d0cffd7d8c16b52a long_desc=" Get/set device parameters for Linux SATA/IDE drives. Primary use is for enabling irq-unmasking and IDE multiplemode." - -hdparm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/help2man/template b/srcpkgs/help2man/template index f8e6b33f29..08c66485bc 100644 --- a/srcpkgs/help2man/template +++ b/srcpkgs/help2man/template @@ -4,16 +4,10 @@ version=1.43.3 revision=1 build_style=gnu-configure hostmakedepends="perl perl-Locale-gettext" +depends="${hostmakedepends}" short_desc="GNU conversion tool to create man files" maintainer="Juan RP " license="GPL-3" homepage="http://www.gnu.org/software/help2man" distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.gz" checksum=67978d118980ebd9f0c60be5db129527900a7b997b9568fc795ba9bdb341d303 - -help2man_package() { - depends="${hostmakedepends}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/herbstluftwm/template b/srcpkgs/herbstluftwm/template index 75b699a25a..d2b121aae2 100644 --- a/srcpkgs/herbstluftwm/template +++ b/srcpkgs/herbstluftwm/template @@ -4,6 +4,7 @@ version=0.5.2 revision=2 hostmakedepends="pkg-config" makedepends="libXinerama-devel libglib-devel" +conf_files="/etc/xdg/${pkgname}/autostart" short_desc="A manual tiling window manager for X" maintainer="Juan RP " license="Simplified BSD" @@ -20,10 +21,3 @@ do_install() { vmkdir usr/share/bash-completion/completions mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions } - -herbstluftwm_package() { - conf_files="/etc/xdg/${pkgname}/autostart" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template index ce7f3022c6..d364410bab 100644 --- a/srcpkgs/hg-git/template +++ b/srcpkgs/hg-git/template @@ -3,20 +3,14 @@ pkgname=hg-git version=0.3.4 revision=1 wrksrc="durin42-hg-git-586b7aa96466" +noarch="yes" build_style=python-module makedepends="python python-dulwich" +depends="${makedepends}" +pycompile_module="hggit" short_desc="Hg-Git plugin for Mercurial, adding the ability to push and pull to/from Git" maintainer="Juan RP " license="GPL-2" homepage="https://bitbucket.org/durin42/hg-git/" distfiles="https://bitbucket.org/durin42/hg-git/get/${version}.tar.bz2" checksum=7931101afe1ae13b0b2196487fe79c5d8ad8f51f08b073ec2fa72ed548b62628 - -hg-git_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="hggit" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/hicolor-icon-theme/template b/srcpkgs/hicolor-icon-theme/template index 3fcfe1ad08..3dec5cfa6e 100644 --- a/srcpkgs/hicolor-icon-theme/template +++ b/srcpkgs/hicolor-icon-theme/template @@ -2,6 +2,7 @@ pkgname=hicolor-icon-theme version=0.13 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Standard icon theme called hicolor" homepage="http://icon-theme.freedesktop.org/wiki/HicolorTheme" @@ -9,10 +10,3 @@ license="GPL-2" maintainer="Juan RP " distfiles="http://icon-theme.freedesktop.org/releases/$pkgname-$version.tar.gz" checksum=a38b038915480d1ddd4e3c421562560a14d42ace0449a5acc07c50f57f9c3406 - -hicolor-icon-theme_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template index a96ce06737..1137bafdd5 100644 --- a/srcpkgs/hostapd/template +++ b/srcpkgs/hostapd/template @@ -4,6 +4,17 @@ version=2.0 revision=1 build_wrksrc=${pkgname} makedepends="pkg-config libnl3-devel openssl-devel" +conf_files=" + /etc/hostapd/hostapd.conf + /etc/hostapd/hlr_auc_gw.milenage_db + /etc/hostapd/hostapd.accept + /etc/hostapd/hostapd.deny + /etc/hostapd/hostapd.eap_user + /etc/hostapd/hostapd.radius_clients + /etc/hostapd/hostapd.sim_db + /etc/hostapd/hostapd.vlan + /etc/hostapd/hostapd.wpa_psk + /etc/hostapd/wired.conf" short_desc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator" maintainer="Juan RP " license="GPL-2" @@ -32,21 +43,3 @@ do_install() { vinstall hostapd.8 644 usr/share/man/man8 vinstall hostapd_cli.1 644 usr/share/man/man1 } - -hostapd_package() { - conf_files=" - /etc/hostapd/hostapd.conf - /etc/hostapd/hlr_auc_gw.milenage_db - /etc/hostapd/hostapd.accept - /etc/hostapd/hostapd.deny - /etc/hostapd/hostapd.eap_user - /etc/hostapd/hostapd.radius_clients - /etc/hostapd/hostapd.sim_db - /etc/hostapd/hostapd.vlan - /etc/hostapd/hostapd.wpa_psk - /etc/hostapd/wired.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template index 0c3ee5d21f..1b3757a1fe 100644 --- a/srcpkgs/hplip/template +++ b/srcpkgs/hplip/template @@ -2,6 +2,14 @@ pkgname=hplip version=3.13.11 revision=1 +#XXX: pyqt pkgs for python gui +hostmakedepends="pkg-config automake libtool" +makedepends="python-devel libxml2-python cups-devel + sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel + dbus-devel polkit-devel foomatic-db foomatic-db-engine desktop-file-utils" +depends="python foomatic-db foomatic-db-engine desktop-file-utils" +conf_files="/etc/hp/hplip.conf" +make_dirs="/var/lib/hp 0755 root root" short_desc="HP Linux Imaging and Printing" maintainer="davehome " homepage="http://hplipopensource.com/" @@ -9,12 +17,6 @@ license="GPL-2" distfiles="$SOURCEFORGE_SITE/$pkgname/$pkgname-$version.tar.gz" checksum=1ea0ed020ab54e08620fe6ea7c30e93dbb8be505f2e6994e7222a7be63ca3b34 -#XXX: pyqt pkgs for python gui -hostmakedepends="pkg-config automake libtool" -makedepends="python-devel libxml2-python cups-devel - sane-devel ghostscript-devel net-snmp-devel libusb-devel libjpeg-turbo-devel - dbus-devel polkit-devel foomatic-db foomatic-db-engine desktop-file-utils" - do_configure() { # https://bugs.archlinux.org/task/30085 - hack found in Gentoo # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip @@ -51,12 +53,3 @@ do_install() { rm -rf ${DESTDIR}/usr/share/hal rm -rf ${DESTDIR}/var } - -hplip_package() { - depends="python foomatic-db foomatic-db-engine desktop-file-utils" - conf_files="/etc/hp/hplip.conf" - make_dirs="/var/lib/hp 0755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/hsetroot/template b/srcpkgs/hsetroot/template index 61cf5587ba..b37c1b3e72 100644 --- a/srcpkgs/hsetroot/template +++ b/srcpkgs/hsetroot/template @@ -10,9 +10,3 @@ license="GPL-2" homepage="http://www.thegraveyard.org/hsetroot.php" distfiles="http://www.thegraveyard.org/files/${pkgname}-${version}.tar.gz" checksum=d6712d330b31122c077bfc712ec4e213abe1fe71ab24b9150ae2774ca3154fd7 - -hsetroot_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/htop/template b/srcpkgs/htop/template index 1a0e76761a..cc1123da37 100644 --- a/srcpkgs/htop/template +++ b/srcpkgs/htop/template @@ -15,9 +15,3 @@ checksum=ee60657b044ece0df096c053060df7abf3cce3a568ab34d260049e6a37ccd8a1 long_desc=" htop is an interactive process viewer for Linux. It is a text-mode terminal application (for console or X terminals) and requires ncurses." - -htop_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template index 73daa4d763..7480a555d3 100644 --- a/srcpkgs/hunspell/template +++ b/srcpkgs/hunspell/template @@ -34,9 +34,3 @@ hunspell-devel_package() { vmove usr/share/man/man3 } } - -hunspell_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template index 1d4b6d79bb..dfe71a0f10 100644 --- a/srcpkgs/hwids/template +++ b/srcpkgs/hwids/template @@ -2,6 +2,9 @@ pkgname=hwids version=20130512 revision=1 +noarch="yes" +create_wrksrc=yes +replaces="pciutils<3.1.9_1 usbutils<005_1" short_desc="Hardware Identification Databases" maintainer="Juan RP " homepage="https://github.com/Flameeyes/hwids" @@ -13,8 +16,6 @@ long_desc=" to require them, without having to bring in either pciutils or usbutils, that might be unnecessary for most installs." -create_wrksrc=yes - do_extract() { cd ${wrksrc} tar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version} @@ -25,11 +26,3 @@ do_install() { vmkdir usr/share/hwdata install -m644 *.ids ${DESTDIR}/usr/share/hwdata } - -hwids_package() { - noarch="yes" - replaces="pciutils<3.1.9_1 usbutils<005_1" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/hydrogen/template b/srcpkgs/hydrogen/template index 75d8fe3ece..c137257659 100644 --- a/srcpkgs/hydrogen/template +++ b/srcpkgs/hydrogen/template @@ -4,6 +4,7 @@ version=0.9.5.1 revision=1 makedepends="pkg-config scons libsndfile-devel libtar-devel libarchive-devel>=3.1.2 jack-devel qt-devel" +depends="desktop-file-utils" short_desc="Advanced drum machine" maintainer="davehome " license="GPL-2" @@ -20,10 +21,3 @@ do_build() { do_install() { scons DESTDIR=${DESTDIR} install } - -hydrogen_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template index 70d4ff24fb..0a3c809554 100644 --- a/srcpkgs/i3/template +++ b/srcpkgs/i3/template @@ -3,6 +3,11 @@ pkgname=i3 version=4.7 revision=1 build_style=gnu-makefile +hostmakedepends="which perl pkg-config asciidoc xmlto" +makedepends="pcre-devel>=8.30 yajl-devel libxcb-devel libev-devel + pango-devel startup-notification-devel>=0.12_3 xcb-util-devel>=0.3.9 + xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel" +conf_files="/etc/i3/config /etc/i3/config.keycodes" short_desc="Improved tiling window manager" maintainer="davehome " license="BSD" @@ -15,11 +20,6 @@ long_desc=" Source Software (FOSS) under the BSD license. i3 is primarily targeted at advanced users and developers." -hostmakedepends="which perl pkg-config asciidoc xmlto" -makedepends="pcre-devel>=8.30 yajl-devel libxcb-devel libev-devel - pango-devel startup-notification-devel>=0.12_3 xcb-util-devel>=0.3.9 - xcb-util-keysyms-devel>=0.3.9 xcb-util-wm-devel>=0.3.9 xcb-util-cursor-devel" - post_build() { make ${makejobs} -C man } @@ -35,10 +35,3 @@ i3-devel_package() { vmove usr/include } } - -i3_package() { - conf_files="/etc/i3/config /etc/i3/config.keycodes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/i3lock/template b/srcpkgs/i3lock/template index 64341694f9..8f551fe4db 100644 --- a/srcpkgs/i3lock/template +++ b/srcpkgs/i3lock/template @@ -2,6 +2,10 @@ pkgname=i3lock version=2.5 revision=1 +hostmakedepends="which pkg-config" +makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel + xcb-util-devel libxkbfile-devel xcb-util-image-devel xcb-util-keysyms-devel" +conf_files="/etc/pam.d/i3lock" short_desc="An improved screenlocker based upon XCB and PAM" maintainer="Juan RP " license="MIT" @@ -13,10 +17,6 @@ long_desc=" a white screen (you can configure the color/an image). You can return to your screen by entering your password." -hostmakedepends="which pkg-config" -makedepends="libev-devel cairo-devel pam-devel libxkbcommon-devel - xcb-util-devel libxkbfile-devel xcb-util-image-devel xcb-util-keysyms-devel" - do_build() { export CFLAGS="$CFLAGS -std=c99" make ${makejobs} @@ -26,10 +26,3 @@ do_install() { make DESTDIR=${DESTDIR} install vinstall i3lock.1 644 usr/share/man/man1 } - -i3lock_package() { - conf_files="/etc/pam.d/i3lock" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/i3status/template b/srcpkgs/i3status/template index 9ecc1c410f..2f4f3f9194 100644 --- a/srcpkgs/i3status/template +++ b/srcpkgs/i3status/template @@ -5,6 +5,8 @@ revision=2 build_style=gnu-makefile hostmakedepends="asciidoc pkg-config" makedepends="yajl-devel confuse-devel wireless_tools-devel alsa-lib-devel libcap-devel" +depends="libcap-progs" +conf_files="/etc/i3status.conf" short_desc="Generates status bar to use with dzen2 or xmobar" maintainer="davehome " license="BSD" @@ -28,11 +30,3 @@ do_install() { sed -i -e "s#dhclient#dhcpcd#g" ${DESTDIR}/etc/i3status.conf vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -i3status_package() { - conf_files="/etc/i3status.conf" - depends="libcap-progs" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iana-etc/template b/srcpkgs/iana-etc/template index fc02a18c0c..94808933cd 100644 --- a/srcpkgs/iana-etc/template +++ b/srcpkgs/iana-etc/template @@ -2,8 +2,8 @@ pkgname=iana-etc version=2.30 revision=2 +noarch="yes" build_style=gnu-makefile -make_build_args="STRIP=yes" short_desc="Unix /etc/services and /etc/protocols files" maintainer="Juan RP " homepage="http://sethwklein.net/iana-etc.html" @@ -13,10 +13,3 @@ checksum=b9a6874fb20012836efef75452ef2acae624022d680feeb1994d73facba3f20d long_desc=" The iana-etc package provides the Unix/Linux /etc/services and /etc/protocols files." - -iana-etc_package() { - noarch="yes" - pkg_install() { - vmove etc - } -} diff --git a/srcpkgs/ibus/template b/srcpkgs/ibus/template index 369fe194da..2be5f5034e 100644 --- a/srcpkgs/ibus/template +++ b/srcpkgs/ibus/template @@ -9,6 +9,8 @@ configure_args="--enable-ui --enable-gtk3 --disable-python hostmakedepends="pkg-config intltool gobject-introspection GConf-devel" makedepends="dconf-devel>=0.13.90 librsvg-devel gtk+-devel gtk+3-devel vala-devel libnotify-devel hicolor-icon-theme iso-codes dbus-x11 pyxdg" +depends="hicolor-icon-theme iso-codes dbus-x11 pyxdg" +triggers="gtk-immodules gtk3-immodules" short_desc="Intelligent Input Bus" maintainer="Juan RP " homepage="http://ibus.googlecode.com" @@ -31,11 +33,3 @@ ibus-devel_package() { vmove usr/share/vala } } - -ibus_package() { - triggers="gtk-immodules gtk3-immodules" - depends="hicolor-icon-theme iso-codes dbus-x11 pyxdg" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iceauth/template b/srcpkgs/iceauth/template index ba778cce54..0f135f19df 100644 --- a/srcpkgs/iceauth/template +++ b/srcpkgs/iceauth/template @@ -14,9 +14,3 @@ checksum=bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4 long_desc=" This package provides iceauth, a program to display and manipulate the authentication data used by the Inter Client Exchange protocol." - -iceauth_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/icecast/template b/srcpkgs/icecast/template index 325aea0b04..492edee2f1 100644 --- a/srcpkgs/icecast/template +++ b/srcpkgs/icecast/template @@ -1,10 +1,12 @@ # Template file for 'icecast' pkgname=icecast version=2.3.2 -build_style=gnu-configure revision=1 -makedepends="pkg-config openssl-devel libcurl-devel speex-devel +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="openssl-devel libcurl-devel speex-devel libtheora-devel libvorbis-devel libogg-devel libxslt-devel libxml2-devel" +conf_files="/etc/icecast.xml" short_desc="Free server software for streaming multimedia" maintainer="davehome " license="GPL-2" @@ -17,11 +19,3 @@ long_desc=" privately running jukebox and many things in between. It is very versatile in that new formats can be added relatively easily and supports open standards for commuincation and interaction." - -icecast_package() { - conf_files="/etc/icecast.xml" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/icon-naming-utils/template b/srcpkgs/icon-naming-utils/template index a2dd6aae6b..cb4116bb5c 100644 --- a/srcpkgs/icon-naming-utils/template +++ b/srcpkgs/icon-naming-utils/template @@ -2,8 +2,10 @@ pkgname=icon-naming-utils version=0.8.90 revision=3 +noarch="yes" build_style=gnu-configure makedepends="perl-XML-Simple" +depends="${makedepends}" short_desc="Adapts GNOME and KDE icon names to the Icon Naming Specification" homepage="http://tango.freedesktop.org/Standard_Icon_Naming_Specification" license="GPL-2" @@ -15,11 +17,3 @@ long_desc=" new naming scheme defined by the Tango project. This utility maps the icon names used by the GNOME and KDE desktops to the icon names proposed in the Icon Naming Specification." - -icon-naming-utils_package() { - depends="${makedepends}" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index f1ff73c3aa..a9a5db6c96 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -81,9 +81,3 @@ icu-libs_package() { vmove "usr/lib/*.so*" } } - -icu_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/idjc/template b/srcpkgs/idjc/template index 5930c006c3..b431beeed0 100644 --- a/srcpkgs/idjc/template +++ b/srcpkgs/idjc/template @@ -9,6 +9,8 @@ makedepends=" libflac-devel libsndfile-devel libmad-devel ffmpeg-devel>=2.1 speex-devel glib-devel pixman-devel lame-devel pygtk-devel>=2.24.0_8 libshout-idjc-devel opus-devel mutagen desktop-file-utils shared-mime-info" +depends="pygtk mutagen desktop-file-utils shared-mime-info" +pycompile_module="idjc" short_desc="Internet DJ Console" maintainer="davehome " license="GPL-2" @@ -23,11 +25,3 @@ long_desc=" pre_configure() { sed -e 's|AVCODEC_MAX_AUDIO_FRAME_SIZE|192000|g' -i c/avcodecdecode.c } - -idjc_package() { - pycompile_module="idjc" - depends="pygtk mutagen desktop-file-utils shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ifenslave/template b/srcpkgs/ifenslave/template index 2924f95043..ee0b776762 100644 --- a/srcpkgs/ifenslave/template +++ b/srcpkgs/ifenslave/template @@ -24,9 +24,3 @@ do_install() { vinstall ifenslave 755 usr/sbin vinstall ${FILESDIR}/ifenslave.8 755 usr/share/man/man8 } - -ifenslave_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iftop/template b/srcpkgs/iftop/template index df3d96e516..5fa31a838b 100644 --- a/srcpkgs/iftop/template +++ b/srcpkgs/iftop/template @@ -10,9 +10,3 @@ license="GPL-2" homepage="http://www.ex-parrot.com/pdw/iftop/" distfiles="${homepage}/download/$pkgname-$version.tar.gz" checksum=d032547c708307159ff5fd0df23ebd3cfa7799c31536fa0aea1820318a8e0eac - -iftop_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ii/template b/srcpkgs/ii/template index f95f28aa15..0056bb32b2 100644 --- a/srcpkgs/ii/template +++ b/srcpkgs/ii/template @@ -14,9 +14,3 @@ checksum=3a72ac6606d5560b625c062c71f135820e2214fed098e6d624fc40632dc7cc9c post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -ii_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/imlib2/template b/srcpkgs/imlib2/template index eea7614338..24d3b60398 100644 --- a/srcpkgs/imlib2/template +++ b/srcpkgs/imlib2/template @@ -35,9 +35,3 @@ imlib2-devel_package() { vmove usr/lib/pkgconfig } } - -imlib2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/inetutils/template b/srcpkgs/inetutils/template index 7bdbf238ae..93bf1ca6b3 100644 --- a/srcpkgs/inetutils/template +++ b/srcpkgs/inetutils/template @@ -33,9 +33,3 @@ post_install() { mv ${DESTDIR}/usr/share/man/man1/hostname.1 \ ${DESTDIR}/usr/share/man/man1/${pkgname}-hostname.1 } - -inetutils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template index 4c5d953dd6..b48591957d 100644 --- a/srcpkgs/inkscape/template +++ b/srcpkgs/inkscape/template @@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool which" makedepends=" popt-devel libpng-devel>=1.6 gsl-devel gc-devel gtkmm2-devel libxslt-devel lcms2-devel poppler-glib-devel libxslt-devel boost-devel>=1.54 libmagick-devel>=6.8.7" +depends="desktop-file-utils hicolor-icon-theme" short_desc="A vector-based drawing program" maintainer="Juan RP " homepage="http://inkscape.org/" @@ -21,10 +22,3 @@ long_desc=" pre_configure() { sed -e 's,freetype/freetype.h,freetype.h,g' -i src/libnrtype/FontFactory.h } - -inkscape_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/inputproto/template b/srcpkgs/inputproto/template index 3e8479c533..46bf438858 100644 --- a/srcpkgs/inputproto/template +++ b/srcpkgs/inputproto/template @@ -2,6 +2,7 @@ pkgname=inputproto version=2.3 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Input extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,10 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=7d26b193f6699f8e9c1e28bf026844b7ecea33dd644402523471be109152c32f - -inputproto_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/intel-gpu-tools/template b/srcpkgs/intel-gpu-tools/template index 6c5979e6f7..5441a13514 100644 --- a/srcpkgs/intel-gpu-tools/template +++ b/srcpkgs/intel-gpu-tools/template @@ -2,6 +2,10 @@ pkgname=intel-gpu-tools version=1.5 revision=1 +build_style=gnu-configure +only_for_archs="i686 x86_64" +hostmakedepends="pkg-config swig" +makedepends="python3-devel libXv-devel libXrandr-devel libpciaccess-devel libdrm-devel cairo-devel" short_desc="Tools for development and testing of the Intel DRM driver" maintainer="Juan RP " license="MIT" @@ -9,17 +13,6 @@ homepage="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" distfiles="http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${version}.tar.bz2" checksum=115475b528c78d67741ae6cbedfbfced1d471b356140e48245cbad8fdfaad1d1 -build_style=gnu-configure -only_for_archs="i686 x86_64" -hostmakedepends="pkg-config swig" -makedepends="python3-devel libXv-devel libXrandr-devel libpciaccess-devel libdrm-devel cairo-devel" - post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -intel-gpu-tools_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/intel-ucode/template b/srcpkgs/intel-ucode/template index d1c9dcf129..fbbbae512b 100644 --- a/srcpkgs/intel-ucode/template +++ b/srcpkgs/intel-ucode/template @@ -2,6 +2,8 @@ pkgname=intel-ucode version=20130906 revision=1 +noarch=yes +create_wrksrc=yes short_desc="Microcode update files for Intel CPUs" maintainer="Juan RP " license="INTEL Software License Agreement" @@ -9,8 +11,6 @@ homepage="http://downloadcenter.intel.com/SearchResult.aspx?lang=eng&keyword=%22 distfiles="http://downloadmirror.intel.com/23166/eng/microcode-${version}.tgz" checksum=7b6ba0db102581674c29a2e2b859ba51e5cfb11e6cbef9056e4ac6cde2116386 -create_wrksrc=yes - do_build() { cp ${FILESDIR}/*.c . ${CC} -Wall ${CFLAGS} -o intel-microcode2ucode intel-microcode2ucode.c @@ -22,10 +22,3 @@ do_install() { vcopy "intel-ucode/*" usr/lib/firmware/intel-ucode vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/${pkgname} } - -intel-ucode_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template index e474bca64e..61ddab372f 100644 --- a/srcpkgs/intltool/template +++ b/srcpkgs/intltool/template @@ -2,13 +2,15 @@ pkgname=intltool version=0.50.2 revision=1 -homepage="https://edge.launchpad.net/intltool" -distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz" +noarch="yes" build_style=gnu-configure makedepends="perl-XML-Parser>=2.41_1 gettext" +depends="${makedepends}" short_desc="Toolbox for internationalisation" maintainer="Juan RP " license="GPL-2" +homepage="https://edge.launchpad.net/intltool" +distfiles="http://launchpad.net/intltool/trunk/$version/+download/$pkgname-$version.tar.gz" checksum=67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406 long_desc=" The intltool collection can be used to do these things: @@ -27,11 +29,3 @@ long_desc=" scripts and does the other magic to your module. So users building from tarballs don't need intltool, only folks building from cvs. (This is modeled on gettextize.)" - -intltool_package() { - depends="${makedepends}" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/inxi/template b/srcpkgs/inxi/template index 6c28baab94..dfb1e0cb26 100644 --- a/srcpkgs/inxi/template +++ b/srcpkgs/inxi/template @@ -2,6 +2,11 @@ pkgname=inxi version=1.9.17 revision=1 +noarch="yes" +create_srcdir=yes +create_wrksrc=yes +makedepends="pciutils" +depends="${makedepends}" short_desc="A full featured system information script" maintainer="Ypnose " license="GPL-3" @@ -9,19 +14,8 @@ homepage="http://code.google.com/p/inxi/" distfiles="http://inxi.googlecode.com/svn/trunk/inxi.tar.gz" checksum=2632a2bc099d6d242a1049b38b7cc47dd09b070f78a56f4be7683513acee8e31 -create_srcdir=yes -create_wrksrc=yes - do_install() { vinstall inxi 755 usr/bin vinstall inxi.1.gz 644 usr/share/man/man1 vinstall inxi.changelog 644 usr/share/doc/$pkgname } - -inxi_package() { - depends="pciutils" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ioquake3-rpi/template b/srcpkgs/ioquake3-rpi/template index a5ee4ed9eb..4a73e69ca3 100644 --- a/srcpkgs/ioquake3-rpi/template +++ b/srcpkgs/ioquake3-rpi/template @@ -75,9 +75,3 @@ do_install() { # Install Icon File vinstall ${pkgname}/misc/quake3.png 644 usr/share/pixmaps } - -ioquake3-rpi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iotop/template b/srcpkgs/iotop/template index 3f4906ef38..5014a41566 100644 --- a/srcpkgs/iotop/template +++ b/srcpkgs/iotop/template @@ -2,20 +2,14 @@ pkgname=iotop version=0.6 revision=1 +noarch="yes" build_style=python-module makedepends="python>=2.7" +depends="${makedepends}" +pycompile_module="iotop" short_desc="View I/O usage of processes" maintainer="Juan RP " license="GPL-2" homepage="http://guichaz.free.fr/iotop" distfiles="http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2" checksum=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b - -iotop_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="iotop" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/iproute2/template b/srcpkgs/iproute2/template index 8c1a45d765..0e1ff4d216 100644 --- a/srcpkgs/iproute2/template +++ b/srcpkgs/iproute2/template @@ -4,6 +4,13 @@ version=3.11.0 revision=1 hostmakedepends="pkg-config perl flex" makedepends="libfl-devel db-devel>=5.3 iptables-devel>=1.4.18" +conf_files=" + /etc/iproute2/ematch_map + /etc/iproute2/rt_dsfield + /etc/iproute2/rt_protos + /etc/iproute2/rt_realms + /etc/iproute2/rt_scopes + /etc/iproute2/rt_tables" short_desc="IP Routing Utilities" maintainer="Juan RP " homepage="http://www.linux-foundation.org/en/Net:Iproute2" @@ -28,16 +35,3 @@ do_install() { # Remove devel manpages. rm -rf ${DESTDIR}/usr/share/man/man3 } - -iproute2_package() { - conf_files=" - /etc/iproute2/ematch_map - /etc/iproute2/rt_dsfield - /etc/iproute2/rt_protos - /etc/iproute2/rt_realms - /etc/iproute2/rt_scopes - /etc/iproute2/rt_tables" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index 4ff834a72e..af771c35dc 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -51,9 +51,3 @@ iptables-devel_package() { vmove usr/share/man/man3 } } - -iptables_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iptraf-ng/template b/srcpkgs/iptraf-ng/template index 4ca377613b..ebe1a39b69 100644 --- a/srcpkgs/iptraf-ng/template +++ b/srcpkgs/iptraf-ng/template @@ -31,8 +31,3 @@ long_desc=" utilization of the built-in raw socket interface of the Linux kernel, so it can be used on a wide variety of supported network cards." -iptraf-ng_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iputils/template b/srcpkgs/iputils/template index 35408cbecf..39ea79e92f 100644 --- a/srcpkgs/iputils/template +++ b/srcpkgs/iputils/template @@ -5,6 +5,7 @@ revision=2 patch_args="-Np1" wrksrc="${pkgname}-s${version}" makedepends="openssl-devel libcap-devel" +depends="libcap-progs" short_desc="IP Configuration Utilities (and ping)" maintainer="Juan RP " license="BSD" @@ -30,10 +31,3 @@ do_install() { ln -s tracepath.8 tracepath6.8 } - -iputils_package() { - depends="libcap-progs" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ipw2100-firmware/template b/srcpkgs/ipw2100-firmware/template index 3266603643..8e3afb8731 100644 --- a/srcpkgs/ipw2100-firmware/template +++ b/srcpkgs/ipw2100-firmware/template @@ -5,6 +5,7 @@ version=1.3 revision=3 wrksrc="${_distname}-${version}" create_wrksrc=yes +noarch="yes" short_desc="Firmware for the Intel PRO/Wireless 2100 wifi cards" homepage="http://ipw2100.sourceforge.net/" license="Custom" @@ -21,10 +22,3 @@ do_install() { install -m644 *.fw ${DESTDIR}/usr/lib/firmware vinstall LICENSE 644 usr/share/licenses/$pkgname } - -ipw2100-firmware_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ipw2200-firmware/template b/srcpkgs/ipw2200-firmware/template index 74317c96a4..e039bacd24 100644 --- a/srcpkgs/ipw2200-firmware/template +++ b/srcpkgs/ipw2200-firmware/template @@ -3,6 +3,7 @@ pkgname=ipw2200-firmware _distname=ipw2200-fw version=3.1 revision=3 +noarch="yes" wrksrc="${_distname}-${version}" short_desc="Firmware for the Intel PRO/Wireless 2200BG wifi cards" homepage="http://ipw2200.sourceforge.net/" @@ -21,10 +22,3 @@ do_install() { install -m644 *.fw ${DESTDIR}/usr/lib/firmware install -m644 LICENSE* ${DESTDIR}/usr/share/licenses/$pkgname } - -ipw2200-firmware_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ired/template b/srcpkgs/ired/template index d12f7580b7..f098b3881b 100644 --- a/srcpkgs/ired/template +++ b/srcpkgs/ired/template @@ -2,23 +2,10 @@ pkgname=ired version=0.5 revision=1 +build_style=gnu-makefile short_desc="interactive raw editor (minimalist radare)" maintainer="pancake " homepage="http://www.radare.org" license="LGPL" distfiles="http://www.radare.org/get/${pkgname}-$version.tar.gz" checksum=dce25f6b9402b78f183ecf4d94a2d44db1a6946546217d6c60c3f179bfbfff84 - -do_build() { - make ${makejobs} -} - -do_install() { - make install DESTDIR=${DESTDIR} PREFIX=/usr -} - -ired_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/irqbalance/template b/srcpkgs/irqbalance/template index c9b562aa67..21e6c333d7 100644 --- a/srcpkgs/irqbalance/template +++ b/srcpkgs/irqbalance/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libglib-devel libcap-ng-devel libnuma-devel" +systemd_services="irqbalance.service on" short_desc="Handholding your interrupts for power and performance" maintainer="Juan RP " license="GPL-2" @@ -26,10 +27,3 @@ long_desc=" post_install() { vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } - -irqbalance_package() { - systemd_services="irqbalance.service on" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/irrlicht/template b/srcpkgs/irrlicht/template index 35941dc206..fa94d10e7e 100644 --- a/srcpkgs/irrlicht/template +++ b/srcpkgs/irrlicht/template @@ -41,9 +41,3 @@ irrlicht-devel_package() { vmove "usr/lib/*.so" } } - -irrlicht_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 17e1a13901..e6c62ca38a 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static --with-proxy --with-perl=module" hostmakedepends="pkg-config perl>=5.16" makedepends="libglib-devel openssl-devel ncurses-devel" +conf_files="/etc/irssi.conf" homepage="http://www.irssi.org" short_desc="Secure and modular IRC client with text mode user interface" maintainer="Juan RP " @@ -37,16 +38,8 @@ fi # !CROSS_BUILD irssi-devel_package() { depends="perl>=5.16 glib-devel openssl-devel ncurses-devel" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include } } - -irssi_package() { - conf_files="/etc/irssi.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/isl/template b/srcpkgs/isl/template index 88a330ab57..825060bf55 100644 --- a/srcpkgs/isl/template +++ b/srcpkgs/isl/template @@ -26,9 +26,3 @@ isl-devel_package() { vmove "usr/lib/*.so" } } - -isl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/iso-codes/template b/srcpkgs/iso-codes/template index 603235b933..b49db8395a 100644 --- a/srcpkgs/iso-codes/template +++ b/srcpkgs/iso-codes/template @@ -2,6 +2,7 @@ pkgname=iso-codes version=3.41 revision=2 +noarch="yes" build_style=gnu-configure short_desc="List of country, language and currency names" maintainer="Juan RP " @@ -17,10 +18,3 @@ long_desc=" The aim of iso-codes is to create a single gettext domain iso-639 which contains the translations of language names, and one iso-3166 listing the translations of country names." - -iso-codes_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/itstool/template b/srcpkgs/itstool/template index 17777e45b1..44613b84bb 100644 --- a/srcpkgs/itstool/template +++ b/srcpkgs/itstool/template @@ -2,9 +2,11 @@ pkgname=itstool version=2.0.2 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="python" makedepends="python libxml2-python" +depends="python libxml2-python" short_desc="ITS Tool" maintainer="Juan RP " license="GPL-3" @@ -15,11 +17,3 @@ long_desc=" ITS Tool allows you to translate your XML documents with PO files, using rules from the W3C Internationalization Tag Set (ITS) to determine what to translate and how to separate it into PO file messages." - -itstool_package() { - noarch="yes" - depends="python libxml2-python" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/iw/template b/srcpkgs/iw/template index ce0ee185bd..59a303a2df 100644 --- a/srcpkgs/iw/template +++ b/srcpkgs/iw/template @@ -11,9 +11,3 @@ license="GPL-2" homepage="http://wireless.kernel.org/en/users/Documentation/iw" distfiles="http://www.kernel.org/pub/software/network/iw/iw-${version}.tar.xz" checksum=e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff - -iw_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/jack/template b/srcpkgs/jack/template index 8664d9cb24..6499f59802 100644 --- a/srcpkgs/jack/template +++ b/srcpkgs/jack/template @@ -2,6 +2,9 @@ pkgname=jack version=1.9.9.5 revision=3 +# XXX libffado (firewire) +hostmakedepends="pkg-config python" +makedepends="libsamplerate-devel readline-devel dbus-devel celt-devel" short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)" maintainer="davehome " license="GPL-2, LGPL-2.1" @@ -22,10 +25,6 @@ long_desc=" design focuses on two key areas: synchronous execution of all clients, and low latency operation." -# XXX libffado (firewire) -hostmakedepends="pkg-config python" -makedepends="libsamplerate-devel readline-devel dbus-devel celt-devel" - do_configure() { if [ "$CROSS_BUILD" ]; then export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig" @@ -65,9 +64,3 @@ jack-devel_package() { vmove usr/lib/pkgconfig } } - -jack_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/jansson/template b/srcpkgs/jansson/template index c475cc3d00..45cd7fcc71 100644 --- a/srcpkgs/jansson/template +++ b/srcpkgs/jansson/template @@ -24,9 +24,3 @@ jansson-devel_package() { vmove "usr/lib/*.so" } } - -jansson_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/jasper/template b/srcpkgs/jasper/template index fd3a5064a4..4e627fec9e 100644 --- a/srcpkgs/jasper/template +++ b/srcpkgs/jasper/template @@ -32,9 +32,3 @@ jasper-devel_package() { vmove "usr/lib/*.so" } } - -jasper_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/jbig2dec/template b/srcpkgs/jbig2dec/template index 0a00efb064..4a8ab90b2f 100644 --- a/srcpkgs/jbig2dec/template +++ b/srcpkgs/jbig2dec/template @@ -32,9 +32,3 @@ libjbig2dec_package() { vmove "usr/lib/*.so.*" } } - -jbig2dec_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/john/template b/srcpkgs/john/template index 37e7a96785..a2d1143ddc 100644 --- a/srcpkgs/john/template +++ b/srcpkgs/john/template @@ -5,6 +5,7 @@ _jumbover=5 revision=1 wrksrc=${pkgname}-${version}-jumbo-${_jumbover} makedepends="libgomp-devel openssl-devel" +conf_files="/etc/john/john.conf" short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)" maintainer="Juan RP " license="GPL-2" @@ -63,11 +64,3 @@ do_install() { ln -s john ssh2john ln -s john zip2john } - -john_package() { - conf_files="/etc/john/john.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/jre/template b/srcpkgs/jre/template index 61ff4b37dc..1b8629f97e 100644 --- a/srcpkgs/jre/template +++ b/srcpkgs/jre/template @@ -16,6 +16,10 @@ maintainer="davehome " homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html" license="oracle" only_for_archs="i686 x86_64" +nonfree=yes +depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info" +provides="java-runtime-${version}" +replaces="java-runtime>=0" do_install() { # Install desktop related items @@ -68,13 +72,3 @@ do_install() { echo "/usr/share/java/jre/lib/${_arch}" > \ ${DESTDIR}/etc/ld.so.conf.d/${pkgname}.conf } - -jre_package() { - nonfree=yes - depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info" - provides="java-runtime-${version}" - replaces="java-runtime>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/js/template b/srcpkgs/js/template index f45d5d71ec..6fa3ba4fe6 100644 --- a/srcpkgs/js/template +++ b/srcpkgs/js/template @@ -27,9 +27,3 @@ js-devel_package() { vmove usr/lib/pkgconfig } } - -js_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/json-c/template b/srcpkgs/json-c/template index 5b5731b43e..9ce1e58b84 100644 --- a/srcpkgs/json-c/template +++ b/srcpkgs/json-c/template @@ -36,9 +36,3 @@ json-c-devel_package() { vmove usr/lib/pkgconfig } } - -json-c_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/json-glib/template b/srcpkgs/json-glib/template index 3f0df01eb5..f00e85f7d4 100644 --- a/srcpkgs/json-glib/template +++ b/srcpkgs/json-glib/template @@ -29,9 +29,3 @@ json-glib-devel_package() { vmove "usr/lib/*.so" } } - -json-glib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/jsoncpp/template b/srcpkgs/jsoncpp/template index cf0312ce58..bd4724bf7e 100644 --- a/srcpkgs/jsoncpp/template +++ b/srcpkgs/jsoncpp/template @@ -34,12 +34,6 @@ post_install() { vinstall ${FILESDIR}/jsoncpp.pc 644 usr/lib/pkgconfig } -jsoncpp_package() { - pkg_install() { - vmove all - } -} - jsoncpp-devel_package() { depends="jsoncpp>=${version}" short_desc+=" - development files" diff --git a/srcpkgs/kactivities/template b/srcpkgs/kactivities/template index 90a446067d..902f079a2d 100644 --- a/srcpkgs/kactivities/template +++ b/srcpkgs/kactivities/template @@ -2,6 +2,11 @@ pkgname=kactivities version=4.11.4 revision=1 +build_style=cmake +configure_args="-DKDE4_BUILD_TESTS=OFF" +hostmakedepends="cmake automoc4 pkg-config" +makedepends="MesaLib-devel qt-devel phonon-devel kdelibs-devel>=${version} + nepomuk-core-devel>=${version} soprano-devel openssl-devel" short_desc="KDE API for using and interacting with the Activity Manager" maintainer="Juan RP " license="GPL, LGPL, FDL" @@ -9,13 +14,6 @@ homepage="https://projects.kde.org/projects/kde/kactivities" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=b1c70ddf8bf20e08b2a32ccbe014a3ebf68b1cf4e7bea6850bfc5d61aaaa1576 -build_style=cmake -configure_args="-DKDE4_BUILD_TESTS=OFF" - -hostmakedepends="cmake automoc4 pkg-config" -makedepends="MesaLib-devel qt-devel phonon-devel kdelibs-devel>=${version} - nepomuk-core-devel>=${version} soprano-devel openssl-devel" - kactivities-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" @@ -26,9 +24,3 @@ kactivities-devel_package() { vmove "usr/lib/*.so" } } - -kactivities_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kbd/template b/srcpkgs/kbd/template index 59704f9521..fd237fb636 100644 --- a/srcpkgs/kbd/template +++ b/srcpkgs/kbd/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--datadir=/usr/share/kbd --localedir=/usr/share/kbd/locale" hostmakedepends="automake libtool gettext-devel flex pkg-config" makedepends="pam-devel libfl-devel" +depends="kbd-data" short_desc="Linux keyboard utilities" maintainer="Juan RP " license="GPL-2" @@ -48,10 +49,3 @@ kbd-data_package() { vmove usr/share/kbd/unimaps } } - -kbd_package() { - depends="kbd-data" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kbproto/template b/srcpkgs/kbproto/template index d25d5c2146..275781f4f2 100644 --- a/srcpkgs/kbproto/template +++ b/srcpkgs/kbproto/template @@ -1,20 +1,12 @@ # Template build file for 'kbproto'. pkgname=kbproto version=1.0.4 -build_style=gnu-configure revision=2 +noarch="yes" +build_style=gnu-configure homepage="http://xorg.freedesktop.org" license="MIT" short_desc="KB extension headers from X.org" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=1baa29931313d0c3eb81dffd42662768cc76ce49ce94024d5fe32ef5a4e8603c -long_desc=" - This provides the KB extension headers from modular X.org X11 project." - -kbproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/kde-base-artwork/template b/srcpkgs/kde-base-artwork/template index bc32667096..543f0b7912 100644 --- a/srcpkgs/kde-base-artwork/template +++ b/srcpkgs/kde-base-artwork/template @@ -2,6 +2,7 @@ pkgname=kde-base-artwork version=4.11.4 revision=1 +noarch=yes build_style=cmake hostmakedepends="cmake automoc4 pkg-config" makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}" @@ -11,10 +12,3 @@ license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=1464aeeb41d27ad276173c499772d1029ddc07b7a83f970d98856d036d149a45 - -kde-base-artwork_package() { - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kde-baseapps/template b/srcpkgs/kde-baseapps/template index 8746c2acd9..d8137d9ba0 100644 --- a/srcpkgs/kde-baseapps/template +++ b/srcpkgs/kde-baseapps/template @@ -18,6 +18,7 @@ makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel soprano-devel libXt-devel kdelibs-devel>=${version} nepomuk-core-devel>=${version} kactivities-devel>=${version} nepomuk-widgets-devel>=${version} hicolor-icon-theme oxygen-icons" +depends="hicolor-icon-theme oxygen-icons" kde-baseapps-devel_package() { short_desc+=" - development files" @@ -26,10 +27,3 @@ kde-baseapps-devel_package() { vmove usr/include } } - -kde-baseapps_package() { - depends="hicolor-icon-theme oxygen-icons" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kde-runtime/template b/srcpkgs/kde-runtime/template index 16b44933b2..bbe7d32888 100644 --- a/srcpkgs/kde-runtime/template +++ b/srcpkgs/kde-runtime/template @@ -19,8 +19,8 @@ makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel libjpeg-turbo-devel libpng-devel exiv2-devel alsa-lib-devel samba-devel pulseaudio-devel libwebp-devel libcanberra-devel NetworkManager-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version} - kactivities-devel>=${version} nepomuk-core-devel - hicolor-icon-theme" + kactivities-devel>=${version} nepomuk-core-devel hicolor-icon-theme" +depends="hicolor-icon-theme" post_install() { rm -f ${DESTDIR}/usr/share/icons/hicolor/index.theme @@ -35,10 +35,3 @@ kde-runtime-devel_package() { vmove usr/share/apps/cmake } } - -kde-runtime_package() { - depends="hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kde-wallpapers/template b/srcpkgs/kde-wallpapers/template index ad47d6156e..4744c62482 100644 --- a/srcpkgs/kde-wallpapers/template +++ b/srcpkgs/kde-wallpapers/template @@ -2,6 +2,7 @@ pkgname=kde-wallpapers version=4.11.4 revision=1 +noarch=yes build_style=cmake hostmakedepends="cmake automoc4 pkg-config" makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version}" @@ -11,10 +12,3 @@ license="GPL, LGPL, FDL" homepage="http://www.kde.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=8c22c1c777d228dab571b7d09ef6b4d025de9e7ccfe4671c308902eeb17c2d57 - -kde-wallpapers_package() { - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kde-workspace/template b/srcpkgs/kde-workspace/template index b59942a459..7d109df588 100644 --- a/srcpkgs/kde-workspace/template +++ b/srcpkgs/kde-workspace/template @@ -25,6 +25,19 @@ makedepends="openssl-devel qt-devel phonon-devel libdbusmenu-qt-devel strigi-dev akonadi-devel kdepimlibs-devel>=${version} qjson-devel libsensors-devel wayland-devel NetworkManager-devel pciutils-devel MesaLib-devel pam-devel libusb-compat-devel libraw1394-devel python-devel kde-wallpapers>=${version} kde-base-artwork>=${version}" +depends="kde-wallpapers>=${version} kde-base-artwork>=${version}" +conf_files=" + /etc/kdm/kdmrc + /etc/ksysguarddrc + /etc/pam.d/kde-np.pam + /etc/pam.d/kde.pam + /etc/pam.d/kscreensaver.pam" +system_accounts="kdm" +kdm_homedir="/var/lib/kdm" +make_dirs=" + /etc/kde/env 0755 root root + /etc/kde/shutdown 0755 root root + /var/lib/kdm 0755 kdm kdm" pre_configure() { sed -e "s,@PKG_SYSCONFDIR@,/etc,g" -i kdm/kcm/main.cpp @@ -65,22 +78,3 @@ kde-python_package() { vmove "/usr/share/kde4/services/plasma-scriptengine*" } } - -kde-workspace_package() { - depends="kde-wallpapers>=${version} kde-base-artwork>=${version}" - conf_files=" - /etc/kdm/kdmrc - /etc/ksysguarddrc - /etc/pam.d/kde-np.pam - /etc/pam.d/kde.pam - /etc/pam.d/kscreensaver.pam" - system_accounts="kdm" - kdm_homedir="/var/lib/kdm" - make_dirs=" - /etc/kde/env 0755 root root - /etc/kde/shutdown 0755 root root - /var/lib/kdm 0755 kdm kdm" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kde/template b/srcpkgs/kde/template index f26e10525a..f56c8a43ac 100644 --- a/srcpkgs/kde/template +++ b/srcpkgs/kde/template @@ -2,6 +2,7 @@ pkgname=kde version=4.11.4 revision=1 +noarch="yes" build_style=meta makedepends=" oxygen-icons>=${version} @@ -19,12 +20,8 @@ makedepends=" phonon-backend-gstreamer udisks2 polkit-kde" +depends="${makedepends}" short_desc="The KDE meta-package for Void Linux" maintainer="Juan RP " homepage="http://www.kde.org" license="GPL, LGPL, FDL" - -kde_package() { - noarch="yes" - depends="${makedepends}" -} diff --git a/srcpkgs/kdeartwork/template b/srcpkgs/kdeartwork/template index 58e8c9c017..a9c2e2d27a 100644 --- a/srcpkgs/kdeartwork/template +++ b/srcpkgs/kdeartwork/template @@ -18,9 +18,3 @@ makedepends="MesaLib-devel openssl-devel qt-devel phonon-devel strigi-devel soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version} nepomuk-core-devel>=${version} kde-workspace-devel>=${version} libkexiv2-devel>=${version} eigen2" - -kdeartwork_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kdelibs/template b/srcpkgs/kdelibs/template index 58439d49bc..9e5fd5d193 100644 --- a/srcpkgs/kdelibs/template +++ b/srcpkgs/kdelibs/template @@ -23,6 +23,8 @@ makedepends="openssl-devel libSM-devel libXext-devel libXScrnSaver-devel libutempter-devel soprano-devel>=2.9.2_2 MesaLib-devel upower udisks2-devel shared-desktop-ontologies ca-certificates shared-mime-info media-player-info hicolor-icon-theme" +depends="docbook-xsl media-player-info shared-mime-info + shared-desktop-ontologies upower hicolor-icon-theme ca-certificates" post_install() { rm -f ${DESTDIR}/usr/share/apps/kssl/ca-bundle.crt @@ -38,12 +40,3 @@ kdelibs-devel_package() { vmove usr/lib/cmake } } - -kdelibs_package() { - depends="docbook-xsl media-player-info shared-mime-info - shared-desktop-ontologies upower hicolor-icon-theme - ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kdepim-runtime/template b/srcpkgs/kdepim-runtime/template index 240b176cf7..8a29aa4fe5 100644 --- a/srcpkgs/kdepim-runtime/template +++ b/srcpkgs/kdepim-runtime/template @@ -18,9 +18,3 @@ makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version} akonadi-devel nepomuk-core-devel>=${version} strigi-devel soprano-devel boost-devel libxml2-devel qjson-devel libkgapi-devel" - -kdepim-runtime_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kdepim/template b/srcpkgs/kdepim/template index 07c0746c9f..7cf66835e4 100644 --- a/srcpkgs/kdepim/template +++ b/srcpkgs/kdepim/template @@ -4,13 +4,6 @@ version=4.11.4 revision=1 build_style=cmake configure_args="-DKDE4_BUILD_TESTS=OFF" -short_desc="KDE PIM" -maintainer="Juan RP " -license="GPL, LGPL, FDL" -homepage="https://projects.kde.org/projects/kde/kdepimlibs" -distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" -checksum=64250635d9e63b25747919634be976c1666e78154d3ad26d5da65ee0be2f63e6 - # XXX dblatex, prison hostmakedepends="cmake automoc4 pkg-config" makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version} @@ -18,10 +11,10 @@ makedepends="openssl-devel qt-devel phonon-devel kdelibs-devel>=${version} nepomuk-widgets-devel>=${version} soprano-devel strigi-devel grantlee-devel libsasl-devel libassuan-devel gpgme-devel boost-devel MesaLib-devel kdepim-runtime>=${version}" - -kdepim_package() { - depends="kdepim-runtime>=${version}" - pkg_install() { - vmove all - } -} +depends="kdepim-runtime>=${version}" +short_desc="KDE PIM" +maintainer="Juan RP " +license="GPL, LGPL, FDL" +homepage="https://projects.kde.org/projects/kde/kdepimlibs" +distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" +checksum=64250635d9e63b25747919634be976c1666e78154d3ad26d5da65ee0be2f63e6 diff --git a/srcpkgs/kdepimlibs/template b/srcpkgs/kdepimlibs/template index 9f30a084f3..151e22bcea 100644 --- a/srcpkgs/kdepimlibs/template +++ b/srcpkgs/kdepimlibs/template @@ -16,6 +16,7 @@ hostmakedepends="cmake automoc4 pkg-config" makedepends="boost-devel nepomuk-core-devel gpgme-devel qjson-devel libical-devel kdelibs-devel>=${version} phonon-devel libxslt-devel soprano-devel libldap-devel akonadi-devel cyrus-sasl shared-mime-info" +depends="shared-mime-info" kdepimlibs-devel_package() { short_desc+=" - development files" @@ -26,10 +27,3 @@ kdepimlibs-devel_package() { vmove usr/lib/gpgmepp } } - -kdepimlibs_package() { - depends="shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kdeplasma-addons/template b/srcpkgs/kdeplasma-addons/template index 6d09e08e0d..c6bde6da6e 100644 --- a/srcpkgs/kdeplasma-addons/template +++ b/srcpkgs/kdeplasma-addons/template @@ -28,9 +28,3 @@ kdeplasma-addons-devel_package() { vmove usr/share/apps/cmake } } - -kdeplasma-addons_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kdesdk/template b/srcpkgs/kdesdk/template index 18b3874ef9..068ad9c36c 100644 --- a/srcpkgs/kdesdk/template +++ b/srcpkgs/kdesdk/template @@ -10,13 +10,6 @@ distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.t checksum=e8c076cc83d4e43d021993c4e6ca037762c69486d8fce7c2770c23f55ba13140 build_style=cmake - hostmakedepends="cmake automoc4 pkg-config" makedepends="openssl-devel qt-devel phonon-devel strigi-devel soprano-devel gettext-devel soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version}" - -kdesdk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/keepassx/template b/srcpkgs/keepassx/template index 642bb70dcb..3c7fc54fae 100644 --- a/srcpkgs/keepassx/template +++ b/srcpkgs/keepassx/template @@ -4,6 +4,7 @@ version=0.4.3 revision=1 hostmakedepends="pkg-config" makedepends="libXtst-devel qt-devel shared-mime-info" +depends="shared-mime-info" short_desc="A password manager to secure personal data" maintainer="Juan RP " license="GPL-2" @@ -20,10 +21,3 @@ do_build() { do_install() { make INSTALL_ROOT=${DESTDIR} install } - -keepassx_package() { - depends="shared-mime-info" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/kernel-libc-headers/template b/srcpkgs/kernel-libc-headers/template index d92ab69a35..e0c7233943 100644 --- a/srcpkgs/kernel-libc-headers/template +++ b/srcpkgs/kernel-libc-headers/template @@ -3,6 +3,9 @@ pkgname=kernel-libc-headers version=3.10.6 revision=1 +bootstrap=yes +nostrip=yes +noverifyrdeps=yes wrksrc=linux-${version} short_desc="The Linux API headers for userland development" license="GPL-2" @@ -10,8 +13,6 @@ homepage="http://www.kernel.org" distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz" checksum=ed4dfd9f56b7c82e9c71331bbf8d2ea01ddfddc1b6209bd3f3c8640aa24065cf -bootstrap=yes - if [ "$CHROOT_READY" ]; then hostmakedepends="perl" fi @@ -34,11 +35,3 @@ do_install() { # Remove drm headers, use libdrm. rm -rf ${DESTDIR}/usr/include/drm } - -kernel-libc-headers_package() { - nostrip=yes - noverifyrdeps=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kernel-manpages/template b/srcpkgs/kernel-manpages/template index a64d7667b3..c0a890cdc2 100644 --- a/srcpkgs/kernel-manpages/template +++ b/srcpkgs/kernel-manpages/template @@ -3,6 +3,7 @@ pkgname=kernel-manpages version=3.2.6 revision=2 +noarch="yes" wrksrc=linux-${version} makedepends="which perl xmlto" homepage="http://www.kernel.org" @@ -21,10 +22,3 @@ do_install() { vmkdir usr/share/man/man9 install -m644 Documentation/DocBook/man/*.9.gz ${DESTDIR}/usr/share/man/man9 } - -kernel-manpages_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/kernel-rpi/template b/srcpkgs/kernel-rpi/template index 8b5f9f84a5..78474406b3 100644 --- a/srcpkgs/kernel-rpi/template +++ b/srcpkgs/kernel-rpi/template @@ -12,9 +12,23 @@ license="GPL-2" short_desc="The Linux kernel and modules for the Raspberry Pi (3.10 series [git ${_githash}])" _kernver="${version}_${revision}" + +only_for_archs="armv6l" +nostrip=yes +noverifyrdeps=yes hostmakedepends="perl python kmod>=11_2 uboot-mkimage openssl which elfutils bc" makedepends="ncurses-devel" -only_for_archs="armv6l" +depends="kmod>=11_2" +triggers="kernel-hooks" +# These files could be modified when an external module is built. +mutable_files=" + /usr/lib/modules/${_kernver}/modules.dep + /usr/lib/modules/${_kernver}/modules.dep.bin + /usr/lib/modules/${_kernver}/modules.symbols + /usr/lib/modules/${_kernver}/modules.symbols.bin + /usr/lib/modules/${_kernver}/modules.alias + /usr/lib/modules/${_kernver}/modules.alias.bin + /usr/lib/modules/${_kernver}/modules.devname" do_fetch() { url="git://github.com/raspberrypi/linux.git" @@ -162,22 +176,3 @@ kernel-headers-rpi_package() { vmove usr/lib/modules/${_kernver}/build } } - -kernel-rpi_package() { - nostrip=yes - noverifyrdeps=yes - triggers="kernel-hooks" - depends="kmod>=11_2" - # These files could be modified when an external module is built. - mutable_files=" - /usr/lib/modules/${_kernver}/modules.dep - /usr/lib/modules/${_kernver}/modules.dep.bin - /usr/lib/modules/${_kernver}/modules.symbols - /usr/lib/modules/${_kernver}/modules.symbols.bin - /usr/lib/modules/${_kernver}/modules.alias - /usr/lib/modules/${_kernver}/modules.alias.bin - /usr/lib/modules/${_kernver}/modules.devname" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kernel-uml/template b/srcpkgs/kernel-uml/template index cc32cfb48c..57d210538e 100644 --- a/srcpkgs/kernel-uml/template +++ b/srcpkgs/kernel-uml/template @@ -3,6 +3,8 @@ pkgname=kernel-uml version=3.8.5 revision=1 wrksrc=linux-${version} +makedepends="perl libpcap-devel uml-utilities" +depends="uml-utilities" homepage="http://www.kernel.org" license="GPL-2" short_desc="Kernel ${version} for User Mode Linux" @@ -17,8 +19,6 @@ long_desc=" This package contains the kernel itself, as an executable program, and the associated kernel modules." -makedepends="perl libpcap-devel uml-utilities" - do_build() { make LDFLAGS= ARCH=um defconfig && make LDFLAGS= ARCH=um ${makejobs} } @@ -30,10 +30,3 @@ do_install() { mv ${DESTDIR}/usr/lib/uml/lib/modules ${DESTDIR}/usr/lib/uml rmdir ${DESTDIR}/usr/lib/uml/lib } - -kernel-uml_package() { - depends="uml-utilities" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/kexec-tools/template b/srcpkgs/kexec-tools/template index 9d7e68a902..4cd7e02a12 100644 --- a/srcpkgs/kexec-tools/template +++ b/srcpkgs/kexec-tools/template @@ -15,9 +15,3 @@ long_desc=" context of already running kernel without going through BIOS. BIOS can be very time consuming especially on the big servers with lots of peripherals. This can save a lot of time for developers who end up booting a machine numerous times." - -kexec-tools_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/keychain/template b/srcpkgs/keychain/template index f6b50165b9..4fe0ed609e 100644 --- a/srcpkgs/keychain/template +++ b/srcpkgs/keychain/template @@ -2,6 +2,7 @@ pkgname=keychain version=2.7.1 revision=2 +noarch="yes" hostmakedepends="perl" short_desc="keychain manager for ssh-agent and gpg-agent" maintainer="Juan RP " @@ -23,10 +24,3 @@ do_install() { vinstall keychain 755 usr/bin vinstall keychain.1 644 usr/share/man/man1 } - -keychain_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/keyutils/template b/srcpkgs/keyutils/template index 245e3bf39c..8b6a471468 100644 --- a/srcpkgs/keyutils/template +++ b/srcpkgs/keyutils/template @@ -2,6 +2,7 @@ pkgname=keyutils version=1.5.5 revision=2 +conf_files="/etc/request-key.conf" short_desc="Linux Key Management Utilities" maintainer="Juan RP " homepage="http://www.kernel.org" @@ -47,10 +48,3 @@ keyutils-devel_package() { vmove usr/share/man/man3 } } - -keyutils_package() { - conf_files="/etc/request-key.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kmix/template b/srcpkgs/kmix/template index 291275e1fa..048ee8f06d 100644 --- a/srcpkgs/kmix/template +++ b/srcpkgs/kmix/template @@ -16,9 +16,3 @@ hostmakedepends="cmake automoc4 pkg-config" makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel soprano-devel kdelibs-devel>=${version} kde-baseapps-devel>=${version} alsa-lib-devel pulseaudio-devel libcanberra-devel" - -kmix_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kmod/template b/srcpkgs/kmod/template index b36889ac5e..e1eecab3fc 100644 --- a/srcpkgs/kmod/template +++ b/srcpkgs/kmod/template @@ -6,6 +6,13 @@ build_style=gnu-configure configure_args="--with-zlib --with-xz" hostmakedepends="pkg-config libxslt" makedepends="zlib-devel liblzma-devel" +make_dirs=" + /etc/depmod.d 0755 root root + /etc/modprobe.d 0755 root root + /usr/lib/depmod.d 0755 root root + /usr/lib/modprobe.d 0755 root root" +provides="module-init-tools-3.17" +replaces="module-init-tools>=0" short_desc="Linux kernel module handling" maintainer="Juan RP " license="GPL-2" @@ -49,16 +56,3 @@ libkmod-devel_package() { vmove "usr/lib/*.so" } } - -kmod_package() { - make_dirs=" - /etc/depmod.d 0755 root root - /etc/modprobe.d 0755 root root - /usr/lib/depmod.d 0755 root root - /usr/lib/modprobe.d 0755 root root" - provides="module-init-tools-3.17" - replaces="module-init-tools>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kmscon/template b/srcpkgs/kmscon/template index a6c2bdea54..6e141bd4bc 100644 --- a/srcpkgs/kmscon/template +++ b/srcpkgs/kmscon/template @@ -7,6 +7,7 @@ configure_args="--enable-multi-seat --disable-static" hostmakedepends="pkg-config docbook-xsl xkeyboard-config" makedepends="MesaLib-devel pango-devel libtsm-devel libxkbcommon-devel libpciaccess-devel libudev-devel systemd-devel dbus-devel fuse-devel" +depends="xkeyboard-config" short_desc="Terminal emulator based on Kernel Mode Setting (KMS)" maintainer="Juan RP " license="MIT" @@ -22,10 +23,3 @@ post_install() { rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/lib/pkgconfig } - -kmscon_package() { - depends="xkeyboard-config" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/konsole/template b/srcpkgs/konsole/template index c49d4d0b84..0f93fc7ab2 100644 --- a/srcpkgs/konsole/template +++ b/srcpkgs/konsole/template @@ -15,9 +15,3 @@ configure_args="-DKDE4_BUILD_TESTS=OFF -DSYSCONF_INSTALL_DIR=/etc" hostmakedepends="cmake automoc4 pkg-config" makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel soprano-devel kdelibs-devel>=${version} kde-baseapps-devel>=${version}" - -konsole_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kuser/template b/srcpkgs/kuser/template index 2d355b0e6a..aa63d08282 100644 --- a/srcpkgs/kuser/template +++ b/srcpkgs/kuser/template @@ -16,10 +16,4 @@ hostmakedepends="cmake automoc4 pkg-config" makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version} nepomuk-core-devel>=${version}" - -kuser_package() { - replaces="kdeadmin>=0" - pkg_install() { - vmove all - } -} +replaces="kdeadmin>=0" diff --git a/srcpkgs/kwallet/template b/srcpkgs/kwallet/template index e965041236..e064f4e082 100644 --- a/srcpkgs/kwallet/template +++ b/srcpkgs/kwallet/template @@ -16,9 +16,3 @@ hostmakedepends="cmake automoc4 pkg-config" makedepends="glib-devel openssl-devel qt-devel phonon-devel strigi-devel soprano-devel kdelibs-devel>=${version} kdepimlibs-devel>=${version} nepomuk-core-devel>=${version}" - -kwallet_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kyua-cli/template b/srcpkgs/kyua-cli/template index f4f98472ef..8603679142 100644 --- a/srcpkgs/kyua-cli/template +++ b/srcpkgs/kyua-cli/template @@ -10,6 +10,8 @@ configure_args=" ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount" hostmakedepends="pkg-config automake libtool atf-devel doxygen" makedepends="atf-devel>=0.16 lutok-devel>=0.4 sqlite-devel kyua-testers" +depends="kyua-testers" +replaces="kyua>=0" short_desc="Kyua (automated testing framework) - Command line interface" maintainer="Juan RP " license="Modified BSD" @@ -26,11 +28,3 @@ long_desc=" pre_configure() { autoreconf -fi } - -kyua-cli_package() { - depends="kyua-testers" - replaces="kyua>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/kyua-testers/template b/srcpkgs/kyua-testers/template index 2e3a4b0c71..690f5e9747 100644 --- a/srcpkgs/kyua-testers/template +++ b/srcpkgs/kyua-testers/template @@ -10,6 +10,8 @@ configure_args=" ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount" hostmakedepends="pkg-config automake libtool atf-devel" makedepends="atf-devel" +# Needs atf-sh at least. +depends="atf" short_desc="Kyua (automated testing framework) - Testers" maintainer="Juan RP " license="BSD" @@ -31,11 +33,3 @@ long_desc=" pre_configure() { autoreconf -fi } - -kyua-testers_package() { - # Needs atf-sh at least. - depends="atf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ladish/template b/srcpkgs/ladish/template index 3343323e44..737ba586f0 100644 --- a/srcpkgs/ladish/template +++ b/srcpkgs/ladish/template @@ -7,6 +7,8 @@ configure_args="--enable-liblash --enable-pylash" makedepends="perl intltool python-devel pkg-config alsa-lib-devel jack-devel dbus-devel dbus-glib-devel libuuid-devel expat-devel glib-devel gtk+-devel flowcanvas-devel boost-devel libgnomecanvasmm-devel gtkmm2-devel" +depends="jack a2jmidid hicolor-icon-theme" +pycompile_module="lash.py" short_desc="Session management system for JACK applications" maintainer="davehome " license="GPL-2" @@ -32,11 +34,3 @@ ladish-devel_package() { vmove usr/lib/pkgconfig } } - -ladish_package() { - pycompile_module="lash.py" - depends="jack a2jmidid hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/laditools/template b/srcpkgs/laditools/template index df7a668d9b..bdec543935 100644 --- a/srcpkgs/laditools/template +++ b/srcpkgs/laditools/template @@ -3,25 +3,18 @@ pkgname=laditools version=1.0.rc2 revision=2 wrksrc="ladish-1/${pkgname}" -homepage="http://www.marcochapeau.org/software/laditools" -license="GPL-3" build_style=python-module makepends="python" +depends="ladish jack pygtk pyyaml vte" +pycompile_module="laditools" short_desc="Linux Audio Desktop Integration Tools" maintainer="davehome " +homepage="http://www.marcochapeau.org/software/laditools" +license="GPL-3" distfiles="http://ladish.org/download/ladish-1-with-deps.tar.bz2" checksum=b31b9ca69c42e4e68b5159993a1f505e137d43737430778444bc5e852adeb461 long_desc=" LADITools is a set of tools aiming to achieve the goals of the LADI project to improve desktop integration and user workflow of Linux audio system based on JACK and LASH. Those tools take advantage of the DBus interfaces recently added - to JACK and LASH to ease the configuration and use of those two great - softwares." - -laditools_package() { - pycompile_module="laditools" - depends="ladish jack pygtk pyyaml vte" - pkg_install() { - vmove usr - } -} + to JACK and LASH to ease the configuration and use of those two great softwares." diff --git a/srcpkgs/ladspa-sdk/template b/srcpkgs/ladspa-sdk/template index 22f0509abb..201e7828eb 100644 --- a/srcpkgs/ladspa-sdk/template +++ b/srcpkgs/ladspa-sdk/template @@ -2,6 +2,7 @@ pkgname=ladspa-sdk version=1.13 revision=2 +noarch=yes wrksrc=ladspa_sdk distfiles="http://www.ladspa.org/download/ladspa_sdk.tgz" makedepends="libsndfile-progs" @@ -31,7 +32,7 @@ do_install() { ladspa-sdk-docs_package() { depends="ladspa-sdk" - short_desc="${short_desc} (Documentation)" + short_desc+="- Documentation" noarch=yes pkg_install() { vmkdir usr/share/doc @@ -43,7 +44,7 @@ ladspa-sdk-docs_package() { } ladspa-sdk-example-plugins_package() { - short_desc="${short_desc} (Example plugins)" + short_desc=+" - Example plugins" pkg_install() { vmkdir usr/lib/ladspa vcopy "${wrksrc}/plugins/*.so*" usr/lib/ladspa @@ -51,16 +52,9 @@ ladspa-sdk-example-plugins_package() { } ladspa-sdk-progs_package() { - short_desc="${short_desc} (Example programs)" + short_desc+=" - Example programs" pkg_install() { vmkdir usr vcopy ${wrksrc}/bin usr } } - -ladspa-sdk_package() { - noarch=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lame/template b/srcpkgs/lame/template index b82f24a38f..f7a9d14f15 100644 --- a/srcpkgs/lame/template +++ b/srcpkgs/lame/template @@ -38,9 +38,3 @@ lame-devel_package() { vmove "usr/lib/*.a" } } - -lame_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/laptop-mode/template b/srcpkgs/laptop-mode/template index 41e467ba9c..29da70cb77 100644 --- a/srcpkgs/laptop-mode/template +++ b/srcpkgs/laptop-mode/template @@ -2,6 +2,7 @@ pkgname=laptop-mode version=1.62 revision=4 +noarch="yes" wrksrc=$pkgname-tools_$version short_desc="Laptop power saving package for Linux systems" maintainer="tripledes " @@ -9,6 +10,36 @@ license="GPL-2" homepage="http://samwel.tk/laptop_mode/" distfiles="${homepage}/tools/downloads/$pkgname-tools_$version.tar.gz" checksum=d40b3d2fb4dc120b4a427ef7dbddc9dd4d9ea0c475685538d36d3457b39158cd +conf_files=" + /etc/laptop-mode/lm-profiler.conf + /etc/laptop-mode/conf.d/lcd-brightness.conf + /etc/laptop-mode/conf.d/video-out.conf + /etc/laptop-mode/conf.d/wireless-iwl-power.conf + /etc/laptop-mode/conf.d/nmi-watchdog.conf + /etc/laptop-mode/conf.d/dpms-standby.conf + /etc/laptop-mode/conf.d/runtime-pm.conf + /etc/laptop-mode/conf.d/ethernet.conf + /etc/laptop-mode/conf.d/eee-superhe.conf + /etc/laptop-mode/conf.d/hal-polling.conf + /etc/laptop-mode/conf.d/cpufreq.conf + /etc/laptop-mode/conf.d/battery-level-polling.conf + /etc/laptop-mode/conf.d/intel-hda-powersave.conf + /etc/laptop-mode/conf.d/configuration-file-control.conf + /etc/laptop-mode/conf.d/bluetooth.conf + /etc/laptop-mode/conf.d/usb-autosuspend.conf + /etc/laptop-mode/conf.d/wireless-ipw-power.conf + /etc/laptop-mode/conf.d/start-stop-programs.conf + /etc/laptop-mode/conf.d/ac97-powersave.conf + /etc/laptop-mode/conf.d/auto-hibernate.conf + /etc/laptop-mode/conf.d/intel-sata-powermgmt.conf + /etc/laptop-mode/conf.d/wireless-power.conf + /etc/laptop-mode/conf.d/sched-smt-power-savings.conf + /etc/laptop-mode/conf.d/sched-mc-power-savings.conf + /etc/laptop-mode/conf.d/terminal-blanking.conf + /etc/laptop-mode/conf.d/exec-commands.conf + /etc/laptop-mode/laptop-mode.conf" +makedepends="acpid hdparm sdparm wireless_tools xset bluez" +depends="${makedepends}" do_install() { export DESTDIR=${XBPS_DESTDIR}/${pkgname}-${version} ACPI=force APM=disabled PMU=disabled INIT_D=none MAN_D=/usr/share/man @@ -19,40 +50,3 @@ do_install() { sed -i 's|/sbin/udevadm|/usr/bin/udevadm|g' usr/share/laptop-mode-tools/modules/hdparm $wrksrc/install.sh } - -laptop-mode_package() { - conf_files=" - /etc/laptop-mode/lm-profiler.conf - /etc/laptop-mode/conf.d/lcd-brightness.conf - /etc/laptop-mode/conf.d/video-out.conf - /etc/laptop-mode/conf.d/wireless-iwl-power.conf - /etc/laptop-mode/conf.d/nmi-watchdog.conf - /etc/laptop-mode/conf.d/dpms-standby.conf - /etc/laptop-mode/conf.d/runtime-pm.conf - /etc/laptop-mode/conf.d/ethernet.conf - /etc/laptop-mode/conf.d/eee-superhe.conf - /etc/laptop-mode/conf.d/hal-polling.conf - /etc/laptop-mode/conf.d/cpufreq.conf - /etc/laptop-mode/conf.d/battery-level-polling.conf - /etc/laptop-mode/conf.d/intel-hda-powersave.conf - /etc/laptop-mode/conf.d/configuration-file-control.conf - /etc/laptop-mode/conf.d/bluetooth.conf - /etc/laptop-mode/conf.d/usb-autosuspend.conf - /etc/laptop-mode/conf.d/wireless-ipw-power.conf - /etc/laptop-mode/conf.d/start-stop-programs.conf - /etc/laptop-mode/conf.d/ac97-powersave.conf - /etc/laptop-mode/conf.d/auto-hibernate.conf - /etc/laptop-mode/conf.d/intel-sata-powermgmt.conf - /etc/laptop-mode/conf.d/wireless-power.conf - /etc/laptop-mode/conf.d/sched-smt-power-savings.conf - /etc/laptop-mode/conf.d/sched-mc-power-savings.conf - /etc/laptop-mode/conf.d/terminal-blanking.conf - /etc/laptop-mode/conf.d/exec-commands.conf - /etc/laptop-mode/laptop-mode.conf" - noarch="yes" - depends="acpid hdparm sdparm wireless_tools xset bluez" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/latencytop/template b/srcpkgs/latencytop/template index c649736910..1f631454af 100644 --- a/srcpkgs/latencytop/template +++ b/srcpkgs/latencytop/template @@ -24,9 +24,3 @@ long_desc=" pre_install() { vmkdir usr/sbin } - -latencytop_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lbreakout2/template b/srcpkgs/lbreakout2/template index 1b5f979ef0..e0353daf4a 100644 --- a/srcpkgs/lbreakout2/template +++ b/srcpkgs/lbreakout2/template @@ -26,9 +26,3 @@ post_install() { vinstall ${FILESDIR}/lbreakout2.desktop 644 usr/share/applications vinstall ${FILESDIR}/lbreakout2.png 644 usr/share/pixmaps } - -lbreakout2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lcms/template b/srcpkgs/lcms/template index a4b3c2e3c5..cf5049a34d 100644 --- a/srcpkgs/lcms/template +++ b/srcpkgs/lcms/template @@ -16,15 +16,9 @@ checksum=80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 lcms-devel_package() { depends="libjpeg-turbo-devel tiff-devel lcms>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -lcms_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lcms2/template b/srcpkgs/lcms2/template index fe95cfbef1..6d719896de 100644 --- a/srcpkgs/lcms2/template +++ b/srcpkgs/lcms2/template @@ -36,9 +36,3 @@ lcms2-tools_package() { vmove usr/share/man } } - -lcms2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index 5898ee601b..e4b63017e2 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -6,6 +6,7 @@ wrksrc="$pkgname-$version-src" build_style=cmake hostmakedepends="cmake llvm>=3.3" makedepends="libconfig++-devel" +conf_files="/etc/ldc2.rebuild.conf /etc/ldc2.conf" maintainer="pancake " homepage="http://wiki.dlang.org/LDC" license="BSD" @@ -20,10 +21,3 @@ post_install() { mv ${DESTDIR}/etc/bash_completion.d/* \ ${DESTDIR}/usr/share/bash-completion/completions } - -ldc_package() { - conf_files="/etc/ldc2.rebuild.conf /etc/ldc2.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/less/template b/srcpkgs/less/template index 2ffdc634c1..e4cccef451 100644 --- a/srcpkgs/less/template +++ b/srcpkgs/less/template @@ -11,9 +11,3 @@ license="GPL-3" homepage="http://www.greenwoodsoftware.com/less" distfiles="${homepage}/less-${version}.tar.gz" checksum=e536c7819ede54b3d487f0ffc4c14b3620bed83734d92a81e89f62346db0fcac - -less_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/leveldb/template b/srcpkgs/leveldb/template index bbc5957683..447d3567be 100644 --- a/srcpkgs/leveldb/template +++ b/srcpkgs/leveldb/template @@ -34,15 +34,9 @@ do_install() { leveldb-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share/doc } } - -leveldb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lftp/template b/srcpkgs/lftp/template index 6abb33db86..8d80e2c165 100644 --- a/srcpkgs/lftp/template +++ b/srcpkgs/lftp/template @@ -7,6 +7,7 @@ configure_args="--with-modules --disable-rpath --without-included-regex --with-openssl i_cv_posix_fallocate_works=yes" hostmakedepends="automake libtool pkg-config" makedepends="ncurses-devel readline-devel openssl-devel expat-devel" +conf_files="/etc/lftp.conf" short_desc="Sophisticated FTP/HTTP client" maintainer="Juan RP " homepage="http://lftp.yar.ru/" @@ -17,10 +18,3 @@ checksum=61ceaefbd476061e728e2b1294c27866402237d1d6539ed9ca98769dba3c9189 pre_configure() { autoreconf -fi } - -lftp_package() { - conf_files="/etc/lftp.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lftpfs/template b/srcpkgs/lftpfs/template index 23a413237d..e4d9a693d0 100644 --- a/srcpkgs/lftpfs/template +++ b/srcpkgs/lftpfs/template @@ -2,8 +2,10 @@ pkgname=lftpfs version=0.4.3 revision=1 +noarch="yes" build_style=perl-module makedepends="perl-Fuse perl-IPC-Run lftp" +depends="${makedepends}" short_desc="Filesystem with caching based on FUSE and LFTP" maintainer="Juan RP " homepage="http://lftpfs.sourceforge.net/" @@ -27,11 +29,3 @@ post_install() { vmkdir usr mv ${DESTDIR}/usr/lib/perl5/vendor_perl/bin ${DESTDIR}/usr } - -lftpfs_package() { - depends="perl-Fuse perl-IPC-Run lftp" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lgi/template b/srcpkgs/lgi/template index 2e7491b491..19b7ae73f7 100644 --- a/srcpkgs/lgi/template +++ b/srcpkgs/lgi/template @@ -6,6 +6,7 @@ build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="libglib-devel libffi-devel lua-devel>=5.2 gobject-introspection gir-freedesktop" +depends="lua>=5.2 gir-freedesktop" short_desc="Lua binadings for gnome/gobject using gobject-introspection library" maintainer="Juan RP " license="MIT" @@ -22,10 +23,3 @@ do_install() { vinstall tools/dump-typelib.lua 755 usr/bin dump-typelib vinstall LICENSE 644 usr/share/licenses/lgi } - -lgi_package() { - depends="lua>=5.2 gir-freedesktop" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libCello/template b/srcpkgs/libCello/template index 18c877b7a1..f364fba15b 100644 --- a/srcpkgs/libCello/template +++ b/srcpkgs/libCello/template @@ -17,9 +17,3 @@ do_install() { mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/include make install DESTDIR=${DESTDIR} PREFIX=/usr } - -libCello_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libHX/template b/srcpkgs/libHX/template index afddb35998..5621f1934b 100644 --- a/srcpkgs/libHX/template +++ b/srcpkgs/libHX/template @@ -20,9 +20,3 @@ libHX-devel_package() { vmove "usr/lib/*.a" } } - -libHX_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libICE/template b/srcpkgs/libICE/template index d1736b1c63..34bdf32349 100644 --- a/srcpkgs/libICE/template +++ b/srcpkgs/libICE/template @@ -14,7 +14,7 @@ checksum=24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e libICE-devel_package() { depends="xtrans xproto libICE-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share @@ -22,9 +22,3 @@ libICE-devel_package() { vmove "usr/lib/*.a" } } - -libICE_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libIDL/template b/srcpkgs/libIDL/template index e80e89ae76..8696e0643a 100644 --- a/srcpkgs/libIDL/template +++ b/srcpkgs/libIDL/template @@ -48,9 +48,3 @@ libIDL-devel_package() { vmove "usr/lib/*.a" } } - -libIDL_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libSM/template b/srcpkgs/libSM/template index 0cb9795fc9..37558ad57b 100644 --- a/srcpkgs/libSM/template +++ b/srcpkgs/libSM/template @@ -23,9 +23,3 @@ libSM-devel_package() { vmove usr/share/doc } } - -libSM_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template index 08168e4e57..44f67e45c3 100644 --- a/srcpkgs/libX11/template +++ b/srcpkgs/libX11/template @@ -36,9 +36,3 @@ libX11-devel_package() { vmove usr/share/man } } - -libX11_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXScrnSaver/template b/srcpkgs/libXScrnSaver/template index 60cc4ba010..a4d449cd5f 100644 --- a/srcpkgs/libXScrnSaver/template +++ b/srcpkgs/libXScrnSaver/template @@ -17,7 +17,7 @@ long_desc=" libXScrnSaver-devel_package() { depends="scrnsaverproto libX11-devel libXext-devel libXScrnSaver>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" @@ -25,9 +25,3 @@ libXScrnSaver-devel_package() { vmove usr/share } } - -libXScrnSaver_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXau/template b/srcpkgs/libXau/template index 1492224410..bc12956c86 100644 --- a/srcpkgs/libXau/template +++ b/srcpkgs/libXau/template @@ -15,16 +15,10 @@ checksum=a503b3e88d29fa9c45cce1b2d1af54106c2ce21491348c394e251a071d8108ee libXau-devel_package() { depends="xproto ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/man/man3 } } - -libXau_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXaw/template b/srcpkgs/libXaw/template index dffb13ce53..14c8412145 100644 --- a/srcpkgs/libXaw/template +++ b/srcpkgs/libXaw/template @@ -27,9 +27,3 @@ libXaw-devel_package() { vmove usr/share } } - -libXaw_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXcomposite/template b/srcpkgs/libXcomposite/template index 5d382d0a17..a0aabea588 100644 --- a/srcpkgs/libXcomposite/template +++ b/srcpkgs/libXcomposite/template @@ -15,7 +15,7 @@ checksum=ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 libXcomposite-devel_package() { depends="xproto compositeproto libXfixes-devel libX11-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -23,9 +23,3 @@ libXcomposite-devel_package() { vmove usr/share } } - -libXcomposite_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXcursor/template b/srcpkgs/libXcursor/template index e5cf699999..5943c210fb 100644 --- a/srcpkgs/libXcursor/template +++ b/srcpkgs/libXcursor/template @@ -27,9 +27,3 @@ libXcursor-devel_package() { vmove usr/share } } - -libXcursor_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXdamage/template b/srcpkgs/libXdamage/template index 4a06992988..787152235b 100644 --- a/srcpkgs/libXdamage/template +++ b/srcpkgs/libXdamage/template @@ -15,16 +15,10 @@ checksum=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad libXdamage-devel_package() { depends="xproto damageproto libX11-devel libXfixes-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -libXdamage_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXdmcp/template b/srcpkgs/libXdmcp/template index 47484e26a4..cf05e633b7 100644 --- a/srcpkgs/libXdmcp/template +++ b/srcpkgs/libXdmcp/template @@ -15,15 +15,9 @@ checksum=9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e libXdmcp-devel_package() { depends="xproto libXdmcp>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -libXdmcp_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXevie/template b/srcpkgs/libXevie/template index 6097386646..2ee6697bcd 100644 --- a/srcpkgs/libXevie/template +++ b/srcpkgs/libXevie/template @@ -25,9 +25,3 @@ libXevie-devel_package() { vmove usr/share } } - -libXevie_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXext/template b/srcpkgs/libXext/template index 2f1e960368..8b08caef4f 100644 --- a/srcpkgs/libXext/template +++ b/srcpkgs/libXext/template @@ -22,9 +22,3 @@ libXext-devel_package() { vmove usr/share/man/man3 } } - -libXext_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXfixes/template b/srcpkgs/libXfixes/template index 71a9e39739..9257800902 100644 --- a/srcpkgs/libXfixes/template +++ b/srcpkgs/libXfixes/template @@ -27,9 +27,3 @@ libXfixes-devel_package() { vmove usr/share } } - -libXfixes_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXfont/template b/srcpkgs/libXfont/template index d986851d06..ab5e8d3025 100644 --- a/srcpkgs/libXfont/template +++ b/srcpkgs/libXfont/template @@ -29,9 +29,3 @@ libXfont-devel_package() { vmove "usr/lib/*.so" } } - -libXfont_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXfontcache/template b/srcpkgs/libXfontcache/template index b1f8c5aa3d..a0524b90e1 100644 --- a/srcpkgs/libXfontcache/template +++ b/srcpkgs/libXfontcache/template @@ -22,9 +22,3 @@ libXfontcache-devel_package() { vmove usr/share } } - -libXfontcache_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXft/template b/srcpkgs/libXft/template index 848aa2e3d0..ff605e3161 100644 --- a/srcpkgs/libXft/template +++ b/srcpkgs/libXft/template @@ -25,7 +25,7 @@ long_desc=" libXft-devel_package() { depends="xproto libXrender-devel fontconfig-devel freetype-devel libXft>=${version}" - short_desc="${short_desc} (development files)" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/lib*.a" @@ -33,9 +33,3 @@ libXft-devel_package() { vmove usr/share } } - -libXft_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXi/template b/srcpkgs/libXi/template index 7e0746a4d8..8a348b5c84 100644 --- a/srcpkgs/libXi/template +++ b/srcpkgs/libXi/template @@ -23,9 +23,3 @@ libXi-devel_package() { vmove "usr/lib/*.so" } } - -libXi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libXinerama/template b/srcpkgs/libXinerama/template index e126c4d567..bf57c4088e 100644 --- a/srcpkgs/libXinerama/template +++ b/srcpkgs/libXinerama/template @@ -22,9 +22,3 @@ libXinerama-devel_package() { vmove usr/share } } - -libXinerama_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXmu/template b/srcpkgs/libXmu/template index 41905dd522..e7b2e5fe05 100644 --- a/srcpkgs/libXmu/template +++ b/srcpkgs/libXmu/template @@ -29,9 +29,3 @@ libXmu-devel_package() { vmove usr/lib/pkgconfig } } - -libXmu_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXp/template b/srcpkgs/libXp/template index 58e763c5c9..bc3570fe80 100644 --- a/srcpkgs/libXp/template +++ b/srcpkgs/libXp/template @@ -23,9 +23,3 @@ libXp-devel_package() { vmove usr/share } } - -libXp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libXpm/template b/srcpkgs/libXpm/template index 77cf11e6ec..4000ee84c9 100644 --- a/srcpkgs/libXpm/template +++ b/srcpkgs/libXpm/template @@ -25,9 +25,3 @@ libXpm-devel_package() { vmove usr/lib/pkgconfig } } - -libXpm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXrandr/template b/srcpkgs/libXrandr/template index a29d029d0c..efc4112961 100644 --- a/srcpkgs/libXrandr/template +++ b/srcpkgs/libXrandr/template @@ -24,9 +24,3 @@ libXrandr-devel_package() { vmove usr/share } } - -libXrandr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXrender/template b/srcpkgs/libXrender/template index 2189dd76ae..a600e65dea 100644 --- a/srcpkgs/libXrender/template +++ b/srcpkgs/libXrender/template @@ -21,9 +21,3 @@ libXrender-devel_package() { vmove "usr/lib/*.a" } } - -libXrender_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXres/template b/srcpkgs/libXres/template index 99f56c37f5..d0efb55c6f 100644 --- a/srcpkgs/libXres/template +++ b/srcpkgs/libXres/template @@ -28,9 +28,3 @@ libXres-devel_package() { vmove usr/share } } - -libXres_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXt/template b/srcpkgs/libXt/template index 1f8431ec43..7d765e7b4c 100644 --- a/srcpkgs/libXt/template +++ b/srcpkgs/libXt/template @@ -33,9 +33,3 @@ libXt-devel_package() { vmove usr/share/doc } } - -libXt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXtst/template b/srcpkgs/libXtst/template index 85cc816f8d..8e686bd33a 100644 --- a/srcpkgs/libXtst/template +++ b/srcpkgs/libXtst/template @@ -22,9 +22,3 @@ libXtst-devel_package() { vmove usr/share } } - -libXtst_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXv/template b/srcpkgs/libXv/template index b42850bdf1..f022e3e24d 100644 --- a/srcpkgs/libXv/template +++ b/srcpkgs/libXv/template @@ -23,9 +23,3 @@ libXv-devel_package() { vmove usr/share } } - -libXv_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXvMC/template b/srcpkgs/libXvMC/template index f8c8249bed..e9b311766e 100644 --- a/srcpkgs/libXvMC/template +++ b/srcpkgs/libXvMC/template @@ -26,9 +26,3 @@ libXvMC-devel_package() { vmove usr/share/doc } } - -libXvMC_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXxf86dga/template b/srcpkgs/libXxf86dga/template index 35fe05b853..dce582547e 100644 --- a/srcpkgs/libXxf86dga/template +++ b/srcpkgs/libXxf86dga/template @@ -26,9 +26,3 @@ libXxf86dga-devel_package() { vmove usr/share } } - -libXxf86dga_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXxf86misc/template b/srcpkgs/libXxf86misc/template index 49d89c8b5b..f52d07d43b 100644 --- a/srcpkgs/libXxf86misc/template +++ b/srcpkgs/libXxf86misc/template @@ -26,9 +26,3 @@ libXxf86misc-devel_package() { vmove usr/share } } - -libXxf86misc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libXxf86vm/template b/srcpkgs/libXxf86vm/template index 4e2d3472ce..7554d3fa93 100644 --- a/srcpkgs/libXxf86vm/template +++ b/srcpkgs/libXxf86vm/template @@ -26,9 +26,3 @@ libXxf86vm-devel_package() { vmove usr/share } } - -libXxf86vm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/liba52/template b/srcpkgs/liba52/template index 2adab8524e..c22983bded 100644 --- a/srcpkgs/liba52/template +++ b/srcpkgs/liba52/template @@ -39,9 +39,3 @@ liba52-devel_package() { vmove "usr/lib/*.so" } } - -liba52_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libao/template b/srcpkgs/libao/template index 7b7020adf2..b72d7fad3c 100644 --- a/srcpkgs/libao/template +++ b/srcpkgs/libao/template @@ -4,6 +4,9 @@ version=1.1.0 revision=2 build_style=gnu-configure configure_args="--enable-alsa-mmap" +hostmakedepends="pkg-config" +makedepends="alsa-lib-devel pulseaudio-devel" +conf_files="/etc/libao.conf" homepage="http://xiph.org/ao/" short_desc="Cross-platform audio output library" maintainer="Juan RP " @@ -11,16 +14,13 @@ license="GPL-2" distfiles="http://downloads.xiph.org/releases/ao/${pkgname}-${version}.tar.gz" checksum=29de5bb9b1726ba890455ef7e562d877df87811febb0d99ee69164b88c171bd4 -hostmakedepends="pkg-config" -makedepends="alsa-lib-devel pulseaudio-devel" - post_install() { vinstall ${FILESDIR}/libao.conf 644 etc } libao-devel_package() { depends="libao>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -28,11 +28,3 @@ libao-devel_package() { vmove usr/share/aclocal } } - -libao_package() { - conf_files="/etc/libao.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/libapp/template b/srcpkgs/libapp/template index 9c91f7d484..30971f1382 100644 --- a/srcpkgs/libapp/template +++ b/srcpkgs/libapp/template @@ -9,7 +9,6 @@ homepage="https://github.com/drotiro/libapp" distfiles="${homepage}/archive/${version}.tar.gz" checksum=654604b5ead726de0ebb1932b49785a6146c59d312f4931080a04e86b7afb177 - do_fetch() { git clone git://github.com/drotiro/libapp.git ${pkgname}-${version} cd ${pkgname}-${version} @@ -26,15 +25,9 @@ do_install() { libapp-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -libapp_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template index 19424eca9b..f801d99425 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -2,6 +2,7 @@ pkgname=libarchive version=3.1.2 revision=4 +bootstrap=yes build_style=gnu-configure configure_args="--without-xml2 --without-nettle --disable-rpath" makedepends="zlib-devel bzip2-devel liblzma-devel" @@ -12,8 +13,6 @@ license="BSD" distfiles="http://www.libarchive.org/downloads/libarchive-${version}.tar.gz" checksum=eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e -bootstrap=yes - if [ -z "$CHROOT_READY" ]; then CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include" LDFLAGS+=" -L${XBPS_MASTERDIR}/usr/lib" @@ -106,9 +105,3 @@ libarchive-devel_package() { vmove usr/share } } - -libarchive_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libart/template b/srcpkgs/libart/template index 6e63f9b65b..c31fee29d8 100644 --- a/srcpkgs/libart/template +++ b/srcpkgs/libart/template @@ -35,9 +35,3 @@ libart-devel_package() { vmove "usr/lib/*.a" } } - -libart_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libass/template b/srcpkgs/libass/template index 44ad4936a1..9ac6f170a9 100644 --- a/srcpkgs/libass/template +++ b/srcpkgs/libass/template @@ -26,9 +26,3 @@ libass-devel_package() { vmove usr/lib/pkgconfig } } - -libass_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libassuan/template b/srcpkgs/libassuan/template index 085e3815a1..bd120738e0 100644 --- a/srcpkgs/libassuan/template +++ b/srcpkgs/libassuan/template @@ -29,9 +29,3 @@ libassuan-devel_package() { vmove usr/share } } - -libassuan_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libasyncns/template b/srcpkgs/libasyncns/template index 0ddf6a1884..45d173b6b6 100644 --- a/srcpkgs/libasyncns/template +++ b/srcpkgs/libasyncns/template @@ -30,9 +30,3 @@ libasyncns-devel_package() { vmove "usr/lib/*.a" } } - -libasyncns_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libatasmart/template b/srcpkgs/libatasmart/template index c1f7603036..23fb135bb3 100644 --- a/srcpkgs/libatasmart/template +++ b/srcpkgs/libatasmart/template @@ -29,9 +29,3 @@ libatasmart-devel_package() { vmove usr/share } } - -libatasmart_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libavcodec53/template b/srcpkgs/libavcodec53/template index 724cb782bb..f254c06bfb 100644 --- a/srcpkgs/libavcodec53/template +++ b/srcpkgs/libavcodec53/template @@ -58,7 +58,9 @@ do_build() { } do_install() { - make DESTDIR=${DESTDIR} install install-man + make DESTDIR=install_${pkgname} install install-man + vmkdir usr/lib + mv install_${pkgname}/libav{format,util,codec}.so.* ${DESTDIR}/usr/lib } libavformat53_package() { @@ -74,9 +76,3 @@ libavutil51_package() { vmove "usr/lib/libavutil.so.*" } } - -libavcodec53_package() { - pkg_install() { - vmove "usr/lib/libavcodec.so.*" - } -} diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template index ebff5b2843..72d0b5ac82 100644 --- a/srcpkgs/libbluray/template +++ b/srcpkgs/libbluray/template @@ -22,9 +22,3 @@ libbluray-devel_package() { vmove "usr/lib/*.so" } } - -libbluray_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libbsd/template b/srcpkgs/libbsd/template index ad21d29572..41f517a035 100644 --- a/srcpkgs/libbsd/template +++ b/srcpkgs/libbsd/template @@ -26,9 +26,3 @@ libbsd-devel_package() { vmove usr/share } } - -libbsd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libburn/template b/srcpkgs/libburn/template index 23fd629e7c..812643dd62 100644 --- a/srcpkgs/libburn/template +++ b/srcpkgs/libburn/template @@ -27,9 +27,3 @@ libburn-devel_package() { vmove usr/lib/pkgconfig } } - -libburn_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcaca/template b/srcpkgs/libcaca/template index 854477e96b..33194e9e33 100644 --- a/srcpkgs/libcaca/template +++ b/srcpkgs/libcaca/template @@ -35,9 +35,3 @@ libcaca-devel_package() { vmove usr/share/man/man1/caca-config.1 } } - -libcaca_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcanberra/template b/srcpkgs/libcanberra/template index fef3369384..501242a8c7 100644 --- a/srcpkgs/libcanberra/template +++ b/srcpkgs/libcanberra/template @@ -29,7 +29,7 @@ long_desc=" libcanberra-devel_package() { depends="gtk+-devel gtk+3-devel ${sourcepkg}-${version}_${revision}" - short_desc="${sourcepkg} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -37,9 +37,3 @@ libcanberra-devel_package() { vmove usr/share/vala } } - -libcanberra_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template index 7b6f476dfd..b59b09e9e2 100644 --- a/srcpkgs/libcap-ng/template +++ b/srcpkgs/libcap-ng/template @@ -44,22 +44,13 @@ libcap-ng-progs_package() { } } -libcap-ng_package() { - pkg_install() { - vmove usr - } -} - if [ -z "$CROSS_BUILD" ]; then - -libcap-ng-python_package() { - short_desc+=" -- python bindings" - depends="python" - pycompile_module="capng" - pkg_install() { - vmove "usr/lib/python*" + libcap-ng-python_package() { + short_desc+=" -- python bindings" + depends="python" + pycompile_module="capng" + pkg_install() { + vmove "usr/lib/python*" + } } -} - fi - diff --git a/srcpkgs/libcap/template b/srcpkgs/libcap/template index 69df46542a..e750f2c90a 100644 --- a/srcpkgs/libcap/template +++ b/srcpkgs/libcap/template @@ -52,9 +52,3 @@ libcap-progs_package() { vmove usr/share } } - -libcap_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libcddb/template b/srcpkgs/libcddb/template index 8a426d3c62..43ed390df0 100644 --- a/srcpkgs/libcddb/template +++ b/srcpkgs/libcddb/template @@ -25,9 +25,3 @@ libcddb-devel_package() { vmove "usr/lib/*.a" } } - -libcddb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcdio/template b/srcpkgs/libcdio/template index 3645dc9559..16939f3c25 100644 --- a/srcpkgs/libcdio/template +++ b/srcpkgs/libcdio/template @@ -37,9 +37,3 @@ libcdio-devel_package() { vmove usr/share } } - -libcdio_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcec/template b/srcpkgs/libcec/template index 29454a7c4f..34d5056e28 100644 --- a/srcpkgs/libcec/template +++ b/srcpkgs/libcec/template @@ -43,9 +43,3 @@ libcec-devel_package() { vmove usr/lib/pkgconfig } } - -libcec_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libcgroup/template b/srcpkgs/libcgroup/template index d97dba1de2..adc0a8d1ce 100644 --- a/srcpkgs/libcgroup/template +++ b/srcpkgs/libcgroup/template @@ -22,15 +22,9 @@ fi libcgroup-devel_package() { depends="libcgroup>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -libcgroup_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libchamplain/template b/srcpkgs/libchamplain/template index 699ee9247d..117c6d3d3f 100644 --- a/srcpkgs/libchamplain/template +++ b/srcpkgs/libchamplain/template @@ -31,9 +31,3 @@ libchamplain-devel_package() { vmove "usr/lib/*.so" } } - -libchamplain_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libconfig/template b/srcpkgs/libconfig/template index 5a67c77f1c..ef058fbd4a 100644 --- a/srcpkgs/libconfig/template +++ b/srcpkgs/libconfig/template @@ -29,7 +29,7 @@ libconfig++-devel_package() { libconfig-devel_package() { depends="libconfig>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -37,9 +37,3 @@ libconfig-devel_package() { vmove usr/share } } - -libconfig_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcprops/template b/srcpkgs/libcprops/template index aaf7123f66..a24a21cff6 100644 --- a/srcpkgs/libcprops/template +++ b/srcpkgs/libcprops/template @@ -18,16 +18,10 @@ fi libcprops-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/share } } - -libcprops_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcroco/template b/srcpkgs/libcroco/template index 258a17004e..4b2c1e8f8b 100644 --- a/srcpkgs/libcroco/template +++ b/srcpkgs/libcroco/template @@ -19,7 +19,7 @@ long_desc=" libcroco-devel_package() { depends="glib-devel libxml2-devel ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share @@ -28,9 +28,3 @@ libcroco-devel_package() { vmove "usr/bin/croco-*config" } } - -libcroco_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libcryptui/template b/srcpkgs/libcryptui/template index 4f9e6f0657..2cd3d96517 100644 --- a/srcpkgs/libcryptui/template +++ b/srcpkgs/libcryptui/template @@ -8,6 +8,7 @@ configure_args="--disable-static --disable-update-mime-database hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libSM-devel dbus-glib-devel gtk+3-devel>=3.8 gpgme-devel libnotify-devel libgnome-keyring-devel>=3.10 gnupg" +depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg" short_desc="GNOME Interface components for OpenPGP" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -29,10 +30,3 @@ libcryptui-devel_package() { vmove "usr/lib/*.so" } } - -libcryptui_package() { - depends="hicolor-icon-theme libgnome-keyring>=3.10 gnupg" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libcss/template b/srcpkgs/libcss/template index b965998a0b..d912234d69 100644 --- a/srcpkgs/libcss/template +++ b/srcpkgs/libcss/template @@ -47,9 +47,3 @@ libcss-devel_package() { vmove "usr/lib/*.a" } } - -libcss_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdaemon/template b/srcpkgs/libdaemon/template index e2bd3f87bf..6674b78609 100644 --- a/srcpkgs/libdaemon/template +++ b/srcpkgs/libdaemon/template @@ -17,16 +17,10 @@ fi libdaemon-devel_package() { depends="libdaemon-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share } } - -libdaemon_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdbusmenu-qt/template b/srcpkgs/libdbusmenu-qt/template index eb92259db6..d81c4a492e 100644 --- a/srcpkgs/libdbusmenu-qt/template +++ b/srcpkgs/libdbusmenu-qt/template @@ -20,9 +20,3 @@ libdbusmenu-qt-devel_package() { vmove usr/share/doc } } - -libdbusmenu-qt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdca/template b/srcpkgs/libdca/template index 850e031477..c0287247c1 100644 --- a/srcpkgs/libdca/template +++ b/srcpkgs/libdca/template @@ -31,9 +31,3 @@ libdca-devel_package() { vmove "usr/lib/*.so" } } - -libdca_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libdiscid/template b/srcpkgs/libdiscid/template index 9bd5b19670..e40fc8b033 100644 --- a/srcpkgs/libdiscid/template +++ b/srcpkgs/libdiscid/template @@ -24,9 +24,3 @@ libdiscid-devel_package() { vmove usr/lib/pkgconfig } } - -libdiscid_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdmapsharing/template b/srcpkgs/libdmapsharing/template index 3c4dcd2721..aff7738842 100644 --- a/srcpkgs/libdmapsharing/template +++ b/srcpkgs/libdmapsharing/template @@ -29,9 +29,3 @@ libdmapsharing-devel_package() { vmove "usr/lib/*.so" } } - -libdmapsharing_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libdmx/template b/srcpkgs/libdmx/template index f9c5084d99..d90966cf3c 100644 --- a/srcpkgs/libdmx/template +++ b/srcpkgs/libdmx/template @@ -22,9 +22,3 @@ libdmx-devel_package() { vmove usr/share } } - -libdmx_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdom/template b/srcpkgs/libdom/template index ed7bc1a2b8..dcbdb0f423 100644 --- a/srcpkgs/libdom/template +++ b/srcpkgs/libdom/template @@ -15,7 +15,6 @@ long_desc=" be suitable for use in other projects too. For further details, see the readme." - do_fetch() { local url="svn://svn.netsurf-browser.org/trunk/libdom" msg_normal " Fetching source from $url (revision ${_svnrev}) ...\n" @@ -45,9 +44,3 @@ libdom-devel_package() { vmove "usr/lib/*.a" } } - -libdom_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 88f66674d1..f514099787 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -28,9 +28,3 @@ libdrm-devel_package() { #vmove usr/share/man/man3 } } - -libdrm_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template index c07c232e51..f86d78cc0c 100644 --- a/srcpkgs/libdvbpsi/template +++ b/srcpkgs/libdvbpsi/template @@ -20,9 +20,3 @@ libdvbpsi-devel_package() { vmove "usr/lib/*.so" } } - -libdvbpsi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template index 26dc1d3fe0..ea5d8354ff 100644 --- a/srcpkgs/libdvdcss/template +++ b/srcpkgs/libdvdcss/template @@ -15,16 +15,10 @@ long_desc=" libdvdcss-devel_package() { depends="libdvdcss>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -libdvdcss_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template index 3182fb9883..411c5ee69b 100644 --- a/srcpkgs/libdvdnav/template +++ b/srcpkgs/libdvdnav/template @@ -31,9 +31,3 @@ libdvdnav-devel_package() { vmove "usr/lib/*.so" } } - -libdvdnav_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libdvdread/template b/srcpkgs/libdvdread/template index fd8a216057..0d0845335c 100644 --- a/srcpkgs/libdvdread/template +++ b/srcpkgs/libdvdread/template @@ -26,9 +26,3 @@ libdvdread-devel_package() { vmove "usr/lib/*.so" } } - -libdvdread_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libeatmydata/template b/srcpkgs/libeatmydata/template index 921139bb95..0bb526c2c6 100644 --- a/srcpkgs/libeatmydata/template +++ b/srcpkgs/libeatmydata/template @@ -9,9 +9,3 @@ license="GPL-3" homepage="http://www.flamingspork.com/projects/libeatmydata/" distfiles="http://www.flamingspork.com/projects/libeatmydata/${pkgname}-${version}.tar.gz" checksum=8a16c1ff04aeceed1891e2772728359d3368347e1807bed60fc6147d8968d5c1 - -libeatmydata_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libebml/template b/srcpkgs/libebml/template index 8c40f1f21e..f20f2a520d 100644 --- a/srcpkgs/libebml/template +++ b/srcpkgs/libebml/template @@ -28,9 +28,3 @@ libebml-devel_package() { vmove "usr/lib/*.so" } } - -libebml_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libedit/template b/srcpkgs/libedit/template index 9dbb6e4276..4d1dad3297 100644 --- a/srcpkgs/libedit/template +++ b/srcpkgs/libedit/template @@ -25,9 +25,3 @@ libedit-devel_package() { vmove usr/share/man/man3 } } - -libedit_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libee/template b/srcpkgs/libee/template index 0e9a650725..0175ca4a87 100644 --- a/srcpkgs/libee/template +++ b/srcpkgs/libee/template @@ -24,9 +24,3 @@ libee-devel_package() { vmove "usr/lib/*.so" } } - -libee_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libepc/template b/srcpkgs/libepc/template index 99bb34791e..dbe394d85b 100644 --- a/srcpkgs/libepc/template +++ b/srcpkgs/libepc/template @@ -24,16 +24,10 @@ long_desc=" libepc-devel_package() { depends="gtk+3-devel avahi-glib-libs-devel libsoup-devel libepc>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share/gtk-doc vmove usr/lib/pkgconfig } } - -libepc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/liberation-fonts-ttf/template b/srcpkgs/liberation-fonts-ttf/template index 7379e5f470..9b0bbc5b78 100644 --- a/srcpkgs/liberation-fonts-ttf/template +++ b/srcpkgs/liberation-fonts-ttf/template @@ -2,6 +2,10 @@ pkgname=liberation-fonts-ttf version=2.00.0 revision=2 +makedepends="font-util xbps-triggers>=0.58" +depends="${makedepends}" +noarch="yes" +font_dirs="/usr/share/fonts/TTF" short_desc="TrueType fonts from RedHat" maintainer="Juan RP " license="GPL-2, ${pkgname}" @@ -9,8 +13,6 @@ homepage="http://www.redhat.com/promo/fonts/" distfiles="https://fedorahosted.org/releases/l/i/liberation-fonts/${pkgname}-${version}.tar.gz" checksum=3b7214e7352b8e4990c71018031ecb0f40d6793f140d7a956d7345997c8c5100 -makedepends="font-util xbps-triggers>=0.58" - do_install() { vmkdir usr/share/fonts/TTF install -m644 *.ttf ${DESTDIR}/usr/share/fonts/TTF @@ -25,12 +27,3 @@ do_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -liberation-fonts-ttf_package() { - depends="${makedepends}" - noarch="yes" - font_dirs="/usr/share/fonts/TTF" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libesmtp/template b/srcpkgs/libesmtp/template index 956ab5a097..4ecdc37a34 100644 --- a/srcpkgs/libesmtp/template +++ b/srcpkgs/libesmtp/template @@ -14,7 +14,7 @@ checksum=d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b libesmtp-devel_package() { depends="libesmtp>=${version}" - short_desc="Manage submission of emails using SMTP protocol - development files" + short_desc+=" - development files" pkg_install() { vmove usr/bin/libesmtp-config vmove usr/include @@ -22,9 +22,3 @@ libesmtp-devel_package() { vmove "usr/lib/esmtp-plugins/*.a" } } - -libesmtp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libestr/template b/srcpkgs/libestr/template index b7417ba951..945aae4596 100644 --- a/srcpkgs/libestr/template +++ b/srcpkgs/libestr/template @@ -21,9 +21,3 @@ libestr-devel_package() { vmove "usr/lib/*.so" } } - -libestr_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libev/template b/srcpkgs/libev/template index f23e65ba6c..3ea4d7f5ac 100644 --- a/srcpkgs/libev/template +++ b/srcpkgs/libev/template @@ -22,15 +22,9 @@ post_install() { libev-devel_package() { depends="libev>=${version}" - short_desc="${short_desc} -- Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -libev_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libevdev/template b/srcpkgs/libevdev/template index c81bc7ecb5..3461f5ff18 100644 --- a/srcpkgs/libevdev/template +++ b/srcpkgs/libevdev/template @@ -22,9 +22,3 @@ libevdev-devel_package() { vmove usr/lib/pkgconfig } } - -libevdev_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libevent/template b/srcpkgs/libevent/template index 8fadd341e8..f9e30987fa 100644 --- a/srcpkgs/libevent/template +++ b/srcpkgs/libevent/template @@ -15,16 +15,10 @@ checksum=22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5 libevent-devel_package() { depends="openssl-devel libevent>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/bin vmove usr/include vmove usr/lib/pkgconfig } } - -libevent_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libewf/template b/srcpkgs/libewf/template index 678c950ee9..183eed9430 100644 --- a/srcpkgs/libewf/template +++ b/srcpkgs/libewf/template @@ -19,9 +19,3 @@ libewf-devel_package() { vmove usr/lib/pkgconfig } } - -libewf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libexif/template b/srcpkgs/libexif/template index f2bc2415b7..3511ecceb3 100644 --- a/srcpkgs/libexif/template +++ b/srcpkgs/libexif/template @@ -24,9 +24,3 @@ libexif-devel_package() { vmove usr/lib/pkgconfig } } - -libexif_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libfetch/template b/srcpkgs/libfetch/template index 714af82c48..a0646e3346 100644 --- a/srcpkgs/libfetch/template +++ b/srcpkgs/libfetch/template @@ -13,16 +13,10 @@ checksum=4e6d4541f213c9ab42ea94d49c2573f0a6f54b04f14668530960f1424b04f722 libfetch-devel_package() { depends="openssl-devel libfetch>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share vmove "usr/lib/*.a" } } - -libfetch_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libffi/template b/srcpkgs/libffi/template index 6b71943660..ddea79da09 100644 --- a/srcpkgs/libffi/template +++ b/srcpkgs/libffi/template @@ -20,7 +20,7 @@ post_install() { libffi-devel_package() { depends="libffi>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" @@ -28,9 +28,3 @@ libffi-devel_package() { vmove usr/share } } - -libffi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libfm/template b/srcpkgs/libfm/template index aa5ced9e6c..cd005d67a7 100644 --- a/srcpkgs/libfm/template +++ b/srcpkgs/libfm/template @@ -4,6 +4,12 @@ version=1.1.0 revision=2 build_style=gnu-configure configure_args="--enable-udisks --disable-static" +hostmakedepends="pkg-config intltool" +makedepends="libexif-devel dbus-glib-devel gtk+-devel menu-cache-devel vala-devel" +depends="desktop-file-utils udisks" +conf_files=" + /etc/xdg/libfm/libfm.conf + /etc/xdg/libfm/pref-apps.conf" short_desc="LXDE GLib/GIO based library" maintainer="Juan RP " homepage="http://pcmanfm.sourceforge.net/" @@ -11,10 +17,6 @@ license="GPL-2" distfiles="${SOURCEFORGE_SITE}/pcmanfm/$pkgname-$version.tar.gz" checksum=b9426e588670b53570b808c49abd1d103863614dd3622559b8c3ef1392fe0b3d -hostmakedepends="pkg-config intltool" -makedepends="libexif-devel dbus-glib-devel gtk+-devel - menu-cache-devel vala-devel" - libfm-devel_package() { depends="gtk+-devel menu-cache-devel libfm-${version}_${revision}" short_desc+=" -- development files" @@ -23,13 +25,3 @@ libfm-devel_package() { vmove usr/lib/pkgconfig } } - -libfm_package() { - conf_files=" - /etc/xdg/libfm/libfm.conf - /etc/xdg/libfm/pref-apps.conf" - depends="desktop-file-utils udisks" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgpg-error/template b/srcpkgs/libgpg-error/template index ca419b7ba3..efb0a429e1 100644 --- a/srcpkgs/libgpg-error/template +++ b/srcpkgs/libgpg-error/template @@ -24,9 +24,3 @@ libgpg-error-devel_package() { vmove "usr/lib/*.so" } } - -libgpg-error_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template index 0510dc94ae..752e15e2e0 100644 --- a/srcpkgs/libgphoto2/template +++ b/srcpkgs/libgphoto2/template @@ -39,9 +39,3 @@ libgphoto2-devel_package() { vmove usr/share/man/man3 } } - -libgphoto2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgsf/template b/srcpkgs/libgsf/template index 6b9620f259..da9641d7c8 100644 --- a/srcpkgs/libgsf/template +++ b/srcpkgs/libgsf/template @@ -24,9 +24,3 @@ libgsf-devel_package() { vmove usr/share/gir-1.0 } } - -libgsf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgsm/template b/srcpkgs/libgsm/template index d88aeeb4e4..6d62e83ca8 100644 --- a/srcpkgs/libgsm/template +++ b/srcpkgs/libgsm/template @@ -42,9 +42,3 @@ libgsm-devel_package() { vmove "usr/lib/*.a" } } - -libgsm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgssglue/template b/srcpkgs/libgssglue/template index ce46080e27..6f8933ca04 100644 --- a/srcpkgs/libgssglue/template +++ b/srcpkgs/libgssglue/template @@ -4,6 +4,7 @@ version=0.4 revision=4 build_style=gnu-configure configure_args="--disable-static ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" +conf_files="/etc/gssapi_mech.conf" short_desc="Mechanism-switch gssapi library" maintainer="Juan RP " license="BSD" @@ -23,10 +24,3 @@ libgssglue-devel_package() { vmove usr/lib/pkgconfig } } - -libgssglue_package() { - conf_files="/etc/gssapi_mech.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libgtop/template b/srcpkgs/libgtop/template index c89d0cd7e5..c4bcd2703a 100644 --- a/srcpkgs/libgtop/template +++ b/srcpkgs/libgtop/template @@ -31,9 +31,3 @@ libgtop-devel_package() { vmove usr/share/gtk-doc } } - -libgtop_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libguess/template b/srcpkgs/libguess/template index 9090f4dffa..10cfcbf328 100644 --- a/srcpkgs/libguess/template +++ b/srcpkgs/libguess/template @@ -38,9 +38,3 @@ libguess-devel_package() { vmove usr/lib/pkgconfig } } - -libguess_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template index e0e05a8bfe..bde5498234 100644 --- a/srcpkgs/libgusb/template +++ b/srcpkgs/libgusb/template @@ -21,16 +21,10 @@ long_desc=" libgusb-devel_package() { depends="libudev-devel ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share vmove usr/lib/pkgconfig } } - -libgusb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libgweather/template b/srcpkgs/libgweather/template index e686bc3eae..db9bcc80d1 100644 --- a/srcpkgs/libgweather/template +++ b/srcpkgs/libgweather/template @@ -7,6 +7,7 @@ configure_args="--disable-schemas-compile --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libxml2-devel libsoup-gnome-devel>=2.44 gtk+3-devel>=3.10 vala-devel gnome-icon-theme" +depends="libsoup-gnome>=2.44 gnome-icon-theme" short_desc="GNOME Weather information access library" maintainer="Juan RP " license="LGPL-2.1" @@ -30,10 +31,3 @@ libgweather-devel_package() { vmove usr/share/vala } } - -libgweather_package() { - depends="libsoup-gnome>=2.44 gnome-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libgxps/template b/srcpkgs/libgxps/template index d7ed680d57..1031b93b8e 100644 --- a/srcpkgs/libgxps/template +++ b/srcpkgs/libgxps/template @@ -23,9 +23,3 @@ libgxps-devel_package() { vmove usr/lib/pkgconfig } } - -libgxps_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libhubbub/template b/srcpkgs/libhubbub/template index a99677ae83..a93b8669f1 100644 --- a/srcpkgs/libhubbub/template +++ b/srcpkgs/libhubbub/template @@ -54,9 +54,3 @@ libhubbub-devel_package() { vmove "usr/lib/*.a" } } - -libhubbub_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template index 3807f9415d..e89c375a39 100644 --- a/srcpkgs/libical/template +++ b/srcpkgs/libical/template @@ -26,9 +26,3 @@ libical-devel_package() { vmove "usr/lib/*.a" } } - -libical_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libid3tag/template b/srcpkgs/libid3tag/template index a1db7a01af..6f1a440d72 100644 --- a/srcpkgs/libid3tag/template +++ b/srcpkgs/libid3tag/template @@ -28,9 +28,3 @@ libid3tag-devel_package() { vmove "usr/lib/*.a" } } - -libid3tag_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libidn/template b/srcpkgs/libidn/template index e19e3d2a4f..4863dc1dbb 100644 --- a/srcpkgs/libidn/template +++ b/srcpkgs/libidn/template @@ -24,9 +24,3 @@ libidn-devel_package() { vmove "usr/lib/*.so" } } - -libidn_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libieee1284/template b/srcpkgs/libieee1284/template index 10bcaf8eb5..30c2ac3778 100644 --- a/srcpkgs/libieee1284/template +++ b/srcpkgs/libieee1284/template @@ -17,15 +17,9 @@ long_desc=" libieee1284-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/share } } - -libieee1284_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libiodbc/template b/srcpkgs/libiodbc/template index 48bb8fd123..c6b8e2977c 100644 --- a/srcpkgs/libiodbc/template +++ b/srcpkgs/libiodbc/template @@ -29,9 +29,3 @@ libiodbc-devel_package() { vmove usr/lib/pkgconfig } } - -libiodbc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libiptcdata/template b/srcpkgs/libiptcdata/template index 820318edcf..63c4d6878e 100644 --- a/srcpkgs/libiptcdata/template +++ b/srcpkgs/libiptcdata/template @@ -18,16 +18,10 @@ long_desc=" libiptcdata-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc } } - -libiptcdata_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libisofs/template b/srcpkgs/libisofs/template index dc1c4fd25e..479119e26a 100644 --- a/srcpkgs/libisofs/template +++ b/srcpkgs/libisofs/template @@ -21,9 +21,3 @@ libisofs-devel_package() { vmove "usr/lib/*.so" } } - -libisofs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libjpeg-turbo/template b/srcpkgs/libjpeg-turbo/template index 593b2c0e1b..1a8827eec5 100644 --- a/srcpkgs/libjpeg-turbo/template +++ b/srcpkgs/libjpeg-turbo/template @@ -7,6 +7,8 @@ configure_args="--disable-static --with-jpeg8" if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then hostmakedepends="nasm" fi +provides="jpeg-8" +replaces="jpeg>=0" short_desc="Derivative of libjpeg which uses SIMD instructions" maintainer="Juan RP " license="BSD" @@ -43,11 +45,3 @@ libjpeg-turbo-tools_package() { vmove usr/share/man } } - -libjpeg-turbo_package() { - provides="jpeg-8" - replaces="jpeg>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libkexiv2/template b/srcpkgs/libkexiv2/template index e4b1a56b55..1b5f087d69 100644 --- a/srcpkgs/libkexiv2/template +++ b/srcpkgs/libkexiv2/template @@ -21,9 +21,3 @@ libkexiv2-devel_package() { vmove "usr/lib/*.so" } } - -libkexiv2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libkgapi/template b/srcpkgs/libkgapi/template index d31684a34d..350dc64a0a 100644 --- a/srcpkgs/libkgapi/template +++ b/srcpkgs/libkgapi/template @@ -23,9 +23,3 @@ libkgapi-devel_package() { vmove "usr/lib/*.so" } } - -libkgapi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libktorrent/template b/srcpkgs/libktorrent/template index 61866df82b..24d8f47945 100644 --- a/srcpkgs/libktorrent/template +++ b/srcpkgs/libktorrent/template @@ -20,9 +20,3 @@ libktorrent-devel_package() { vmove "usr/lib/*.so" } } - -libktorrent_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libldap/template b/srcpkgs/libldap/template index e680ac73e7..35f33708c1 100644 --- a/srcpkgs/libldap/template +++ b/srcpkgs/libldap/template @@ -10,6 +10,7 @@ configure_args="--enable-dynamic --enable-proctitle --with-tls --with-yielding_select=yes ac_cv_func_memcmp_working=yes" hostmakedepends="pkg-config groff automake libtool" makedepends="libsasl-devel openssl-devel" +conf_files="/etc/openldap/ldap.conf" short_desc="OpenLDAP (Lightweight Directory Access Protocol) libraries" license="OpenLDAP License v2.8 - BSD alike" maintainer="Juan RP " @@ -45,10 +46,3 @@ libldap-devel_package() { vmove usr/share/man/man3 } } - -libldap_package() { - conf_files="/etc/openldap/ldap.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/liblo/template b/srcpkgs/liblo/template index d34f764970..2ddebfb44f 100644 --- a/srcpkgs/liblo/template +++ b/srcpkgs/liblo/template @@ -21,9 +21,3 @@ liblo-devel_package() { vmove usr/lib/pkgconfig } } - -liblo_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/liblrdf/template b/srcpkgs/liblrdf/template index 5354faf010..75243b4451 100644 --- a/srcpkgs/liblrdf/template +++ b/srcpkgs/liblrdf/template @@ -18,16 +18,10 @@ pre_configure() { liblrdf-devel_package() { depends="raptor-devel liblrdf>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } - -liblrdf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmad/template b/srcpkgs/libmad/template index 428e21cc38..76bc06483f 100644 --- a/srcpkgs/libmad/template +++ b/srcpkgs/libmad/template @@ -40,16 +40,10 @@ pre_configure() { libmad-devel_package() { depends="${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } - -libmad_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmatroska/template b/srcpkgs/libmatroska/template index b202fc95e7..793ed741cf 100644 --- a/srcpkgs/libmatroska/template +++ b/srcpkgs/libmatroska/template @@ -29,9 +29,3 @@ libmatroska-devel_package() { vmove "usr/lib/*.so" } } - -libmatroska_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libmbim/template b/srcpkgs/libmbim/template index fbcedd2a67..d2699f05bb 100644 --- a/srcpkgs/libmbim/template +++ b/srcpkgs/libmbim/template @@ -23,9 +23,3 @@ libmbim-devel_package() { vmove usr/share } } - -libmbim_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmcrypt/template b/srcpkgs/libmcrypt/template index 26321d8122..73d0fbc7a7 100644 --- a/srcpkgs/libmcrypt/template +++ b/srcpkgs/libmcrypt/template @@ -28,9 +28,3 @@ libmcrypt-devel_package() { vmove usr/share } } - -libmcrypt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmicrohttpd/template b/srcpkgs/libmicrohttpd/template index 2aa81b4370..3b3a89ef39 100644 --- a/srcpkgs/libmicrohttpd/template +++ b/srcpkgs/libmicrohttpd/template @@ -21,9 +21,3 @@ libmicrohttpd-devel_package() { vmove usr/share } } - -libmicrohttpd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmikmod/template b/srcpkgs/libmikmod/template index a7a629c68c..730d40585e 100644 --- a/srcpkgs/libmikmod/template +++ b/srcpkgs/libmikmod/template @@ -22,9 +22,3 @@ libmikmod-devel_package() { vmove usr/lib/pkgconfig } } - -libmikmod_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libmms/template b/srcpkgs/libmms/template index 0e9267c94f..6250d8875b 100644 --- a/srcpkgs/libmms/template +++ b/srcpkgs/libmms/template @@ -25,9 +25,3 @@ libmms-devel_package() { vmove "usr/lib/*.so" } } - -libmms_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmng/template b/srcpkgs/libmng/template index 3d88cc39fd..fe377560ef 100644 --- a/srcpkgs/libmng/template +++ b/srcpkgs/libmng/template @@ -28,9 +28,3 @@ libmng-devel_package() { vmove "usr/lib/*.so" } } - -libmng_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libmodplug/template b/srcpkgs/libmodplug/template index 7a8c00c36b..925fdb8f30 100644 --- a/srcpkgs/libmodplug/template +++ b/srcpkgs/libmodplug/template @@ -26,9 +26,3 @@ libmodplug-devel_package() { vmove usr/lib/pkgconfig } } - -libmodplug_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmowgli/template b/srcpkgs/libmowgli/template index 851376ce44..800b65e658 100644 --- a/srcpkgs/libmowgli/template +++ b/srcpkgs/libmowgli/template @@ -23,9 +23,3 @@ libmowgli-devel_package() { vmove usr/lib/pkgconfig } } - -libmowgli_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmp4v2/template b/srcpkgs/libmp4v2/template index aac1f40314..a080cee9c4 100644 --- a/srcpkgs/libmp4v2/template +++ b/srcpkgs/libmp4v2/template @@ -14,19 +14,13 @@ checksum=0319b9a60b667cf10ee0ec7505eb7bdc0a2e21ca7a93db96ec5bd758e3428338 libmp4v2-devel_package() { depends="libmp4v2>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } -libmp4v2_package() { - pkg_install() { - vmove "usr/lib/*.so*" - } -} - mpeg4ip_package() { short_desc="MPEG-4 tools from mpeg4ip" pkg_install() { diff --git a/srcpkgs/libmpc/template b/srcpkgs/libmpc/template index 4a3a58827d..bac2315ef2 100644 --- a/srcpkgs/libmpc/template +++ b/srcpkgs/libmpc/template @@ -6,6 +6,7 @@ wrksrc="mpc-${version}" build_style=gnu-configure configure_args="EGREP=egrep" makedepends="gmp-devel mpfr-devel" +replaces="mpc-0.9_2" short_desc="C library for the arithmetic of complex numbers" maintainer="Juan RP " homepage="http://www.multiprecision.org" @@ -28,10 +29,3 @@ libmpc-devel_package() { vmove usr/share } } - -libmpc_package() { - replaces="mpc-0.9_2" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmpcdec/template b/srcpkgs/libmpcdec/template index c55f8ab00d..31de2df7d0 100644 --- a/srcpkgs/libmpcdec/template +++ b/srcpkgs/libmpcdec/template @@ -22,15 +22,9 @@ long_desc=" libmpcdec-devel_package() { depends="libmpcdec>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -libmpcdec_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmpdclient/template b/srcpkgs/libmpdclient/template index c8bd30942b..75ac1fd649 100644 --- a/srcpkgs/libmpdclient/template +++ b/srcpkgs/libmpdclient/template @@ -22,9 +22,3 @@ libmpdclient-devel_package() { vmove usr/share/vala } } - -libmpdclient_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libmpeg2/template b/srcpkgs/libmpeg2/template index 722baac7d4..8f84bee217 100644 --- a/srcpkgs/libmpeg2/template +++ b/srcpkgs/libmpeg2/template @@ -31,9 +31,3 @@ mpeg2dec_package() { vmove usr/share } } - -libmpeg2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libmtp/template b/srcpkgs/libmtp/template index b04d2941b8..71e84037ec 100644 --- a/srcpkgs/libmtp/template +++ b/srcpkgs/libmtp/template @@ -38,9 +38,3 @@ libmtp-devel_package() { vmove "usr/lib/*.so" } } - -libmtp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libmusicbrainz/template b/srcpkgs/libmusicbrainz/template index 444329beb2..d9bdbc773f 100644 --- a/srcpkgs/libmusicbrainz/template +++ b/srcpkgs/libmusicbrainz/template @@ -24,9 +24,3 @@ libmusicbrainz-devel_package() { vmove "usr/lib/*.so" } } - -libmusicbrainz_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libmusicbrainz5/template b/srcpkgs/libmusicbrainz5/template index 161c077619..b7ce073608 100644 --- a/srcpkgs/libmusicbrainz5/template +++ b/srcpkgs/libmusicbrainz5/template @@ -24,9 +24,3 @@ libmusicbrainz5-devel_package() { vmove usr/lib/pkgconfig } } - -libmusicbrainz5_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libnet/template b/srcpkgs/libnet/template index 67d8be2ba5..5af850e049 100644 --- a/srcpkgs/libnet/template +++ b/srcpkgs/libnet/template @@ -28,9 +28,3 @@ libnet-devel_package() { vmove "usr/lib/*.so" } } - -libnet_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libnfs/template b/srcpkgs/libnfs/template index 3240cd21ee..a1461b315b 100644 --- a/srcpkgs/libnfs/template +++ b/srcpkgs/libnfs/template @@ -26,9 +26,3 @@ libnfs-devel_package() { vmove "usr/lib/*.so" } } - -libnfs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libnfsidmap/template b/srcpkgs/libnfsidmap/template index 5a5b5a0593..87b2575e71 100644 --- a/srcpkgs/libnfsidmap/template +++ b/srcpkgs/libnfsidmap/template @@ -26,9 +26,3 @@ libnfsidmap-devel_package() { vmove usr/share/man/man3 } } - -libnfsidmap_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libnice/template b/srcpkgs/libnice/template index caa9bce93d..71dd8757da 100644 --- a/srcpkgs/libnice/template +++ b/srcpkgs/libnice/template @@ -33,9 +33,3 @@ libnice-devel_package() { vmove usr/share } } - -libnice_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libnl/template b/srcpkgs/libnl/template index 1ee5ace2ae..159f5b962a 100644 --- a/srcpkgs/libnl/template +++ b/srcpkgs/libnl/template @@ -24,9 +24,3 @@ libnl-devel_package() { vmove "usr/lib/*.so" } } - -libnl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libnl3/template b/srcpkgs/libnl3/template index 413c31556e..d44a572d23 100644 --- a/srcpkgs/libnl3/template +++ b/srcpkgs/libnl3/template @@ -6,6 +6,7 @@ wrksrc=libnl-${version} build_style=gnu-configure hostmakedepends="flex libtool" makedepends="libfl-devel" +conf_files="/etc/libnl/pktloc /etc/libnl/classid" short_desc="Netlink Protocol Library Suite" maintainer="Juan RP " license="LGPL-2.1" @@ -36,10 +37,3 @@ libnl3-progs_package() { vmove usr/lib/libnl } } - -libnl3_package() { - conf_files="/etc/libnl/pktloc /etc/libnl/classid" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libnotify/template b/srcpkgs/libnotify/template index 0bbe7633e6..3799561e3d 100644 --- a/srcpkgs/libnotify/template +++ b/srcpkgs/libnotify/template @@ -26,9 +26,3 @@ libnotify-devel_package() { vmove "usr/lib/*.so" } } - -libnotify_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libnsbmp/template b/srcpkgs/libnsbmp/template index 60f0d2b537..72103e0459 100644 --- a/srcpkgs/libnsbmp/template +++ b/srcpkgs/libnsbmp/template @@ -40,9 +40,3 @@ libnsbmp-devel_package() { vmove "usr/lib/*.a" } } - -libnsbmp_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libnsgif/template b/srcpkgs/libnsgif/template index 3a249defa2..88c581e6f0 100644 --- a/srcpkgs/libnsgif/template +++ b/srcpkgs/libnsgif/template @@ -39,9 +39,3 @@ libnsgif-devel_package() { vmove "usr/lib/*.a" } } - -libnsgif_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/liboauth/template b/srcpkgs/liboauth/template index e31f276a27..ffbf97c293 100644 --- a/srcpkgs/liboauth/template +++ b/srcpkgs/liboauth/template @@ -28,9 +28,3 @@ liboauth-devel_package() { vmove "usr/lib/*.a" } } - -liboauth_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libogg/template b/srcpkgs/libogg/template index 5fa12b95b7..adbd2c5bc6 100644 --- a/srcpkgs/libogg/template +++ b/srcpkgs/libogg/template @@ -24,9 +24,3 @@ libogg-devel_package() { vmove usr/share } } - -libogg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/liboil/template b/srcpkgs/liboil/template index ef0da84ed6..f9ff222c3c 100644 --- a/srcpkgs/liboil/template +++ b/srcpkgs/liboil/template @@ -29,9 +29,3 @@ liboil-devel_package() { vmove usr/share/gtk-doc } } - -liboil_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libopenal/template b/srcpkgs/libopenal/template index ab45fe0a40..2cd1dd87f8 100644 --- a/srcpkgs/libopenal/template +++ b/srcpkgs/libopenal/template @@ -25,6 +25,8 @@ long_desc=" hostmakedepends="pkg-config cmake" makedepends="alsa-lib-devel pulseaudio-devel SDL-devel ffmpeg-devel>=2.1" +# dlopen(3)d dependencies +depends="alsa-lib libpulseaudio SDL" libopenal-devel_package() { depends="${sourcepkg}>=${version}" @@ -35,11 +37,3 @@ libopenal-devel_package() { vmove "usr/lib/*.so" } } - -libopenal_package() { - # dlopen(3)d dependencies - depends="alsa-lib libpulseaudio SDL" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template index efd6ae0208..aea63506b1 100644 --- a/srcpkgs/libosinfo/template +++ b/srcpkgs/libosinfo/template @@ -27,9 +27,3 @@ libosinfo-devel_package() { vmove usr/share/vala } } - -libosinfo_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libotr/template b/srcpkgs/libotr/template index aa89431f69..233e34948c 100644 --- a/srcpkgs/libotr/template +++ b/srcpkgs/libotr/template @@ -30,9 +30,3 @@ libotr-devel_package() { vmove usr/share/aclocal } } - -libotr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libotr3/template b/srcpkgs/libotr3/template index 57fdee7709..5ff5494ba1 100644 --- a/srcpkgs/libotr3/template +++ b/srcpkgs/libotr3/template @@ -39,9 +39,3 @@ libotr3-devel_package() { vmove usr/share/aclocal } } - -libotr3_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libparserutils/template b/srcpkgs/libparserutils/template index 27ddd2ca1e..02ecf647f5 100644 --- a/srcpkgs/libparserutils/template +++ b/srcpkgs/libparserutils/template @@ -49,9 +49,3 @@ libparserutils-devel_package() { vmove "usr/lib/*.a" } } - -libparserutils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template index 6eb1776691..fae684fa6f 100644 --- a/srcpkgs/libpcap/template +++ b/srcpkgs/libpcap/template @@ -59,9 +59,3 @@ libpcap-devel_package() { vmove "usr/lib/*.so" } } - -libpcap_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libpciaccess/template b/srcpkgs/libpciaccess/template index 97fdf4493d..27eb281314 100644 --- a/srcpkgs/libpciaccess/template +++ b/srcpkgs/libpciaccess/template @@ -23,9 +23,3 @@ libpciaccess-devel_package() { vmove "usr/lib/*.so" } } - -libpciaccess_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libpeas/template b/srcpkgs/libpeas/template index 7654fbc3b2..6d92845349 100644 --- a/srcpkgs/libpeas/template +++ b/srcpkgs/libpeas/template @@ -7,6 +7,7 @@ configure_args="--without-demo --disable-demo" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="vala-devel>=0.22 libgirepository-devel gjs-devel>=1.38 gtk+3-devel libseed-devel python-devel pygobject-devel" +depends="pygobject hicolor-icon-theme gjs>=1.38" short_desc="Gobject-based plugins engine" maintainer="Juan RP " homepage="http://www.gtk.org/" @@ -39,10 +40,3 @@ libpeas-devel_package() { vmove usr/share/gtk-doc } } - -libpeas_package() { - depends="pygobject hicolor-icon-theme gjs>=1.38" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libpipeline/template b/srcpkgs/libpipeline/template index 76af918afc..5def7b752c 100644 --- a/srcpkgs/libpipeline/template +++ b/srcpkgs/libpipeline/template @@ -20,9 +20,3 @@ libpipeline-devel_package() { vmove "usr/lib/*.so" } } - -libpipeline_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index 302a92fd21..a4d381dbd3 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -37,9 +37,3 @@ libplist-devel_package() { vmove usr/lib/pkgconfig } } - -libplist_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template index e48cd5807e..c1e8838c41 100644 --- a/srcpkgs/libpng/template +++ b/srcpkgs/libpng/template @@ -36,9 +36,3 @@ libpng-progs_package() { vmove usr/bin } } - -libpng_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libproxy/template b/srcpkgs/libproxy/template index 00d861d9d1..90b417e6ea 100644 --- a/srcpkgs/libproxy/template +++ b/srcpkgs/libproxy/template @@ -42,9 +42,3 @@ libproxy-python_package() { vmove "usr/lib/python*" } } - -libproxy_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index 09fad96fc1..09f7678a92 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static --enable-pam --disable-python-bindings --with-securedir=/usr/lib/security" makedepends="cracklib-devel pam-devel" +conf_files="/etc/security/pwquality.conf" short_desc="Library for password quality checking and generating random passwords" maintainer="Juan RP " homepage="https://fedorahosted.org/libpwquality/" @@ -29,10 +30,3 @@ libpwquality-devel_package() { vmove "usr/lib/*.so" } } - -libpwquality_package() { - conf_files="/etc/security/pwquality.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libqmi/template b/srcpkgs/libqmi/template index fca4a55eea..4665ccf21d 100644 --- a/srcpkgs/libqmi/template +++ b/srcpkgs/libqmi/template @@ -23,9 +23,3 @@ libqmi-devel_package() { vmove usr/share } } - -libqmi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libquvi-scripts/template b/srcpkgs/libquvi-scripts/template index 090b83e1d0..4545cd7663 100644 --- a/srcpkgs/libquvi-scripts/template +++ b/srcpkgs/libquvi-scripts/template @@ -2,9 +2,11 @@ pkgname=libquvi-scripts version=0.4.18 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="lua" +depends="lua" short_desc="Set of (lua) scripts for libquvi" maintainer="Juan RP " license="LGPL-2.1" @@ -23,11 +25,3 @@ long_desc=" * C API is simple to use This package contains a set of plugins for use with libquvi and/or quvi." - -libquvi-scripts_package() { - depends="lua" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libquvi/template b/srcpkgs/libquvi/template index 010cad2360..2a71afd4da 100644 --- a/srcpkgs/libquvi/template +++ b/srcpkgs/libquvi/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" hostmakedepends="pkg-config" makedepends="lua-devel>=5.2 libcurl-devel libquvi-scripts>=0.4.1" +depends="libquvi-scripts>=${version}" +replaces="quvi<0.4.0" short_desc="C library that can be used to parse flash media stream URLs" maintainer="Juan RP " license="LGPL-2.1" @@ -35,11 +37,3 @@ libquvi-devel_package() { vmove usr/share } } - -libquvi_package() { - depends="libquvi-scripts>=${version}" - replaces="quvi<0.4.0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libqzeitgeist/template b/srcpkgs/libqzeitgeist/template index 876bda9dcc..c1e1b4ac24 100644 --- a/srcpkgs/libqzeitgeist/template +++ b/srcpkgs/libqzeitgeist/template @@ -21,9 +21,3 @@ libqzeitgeist-devel_package() { vmove usr/lib/pkgconfig } } - -libqzeitgeist_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libraw/template b/srcpkgs/libraw/template index 05e4075b16..1f24548a82 100644 --- a/srcpkgs/libraw/template +++ b/srcpkgs/libraw/template @@ -39,9 +39,3 @@ libraw-progs_package() { vmove usr/bin } } - -libraw_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libraw1394/template b/srcpkgs/libraw1394/template index 613cd7d0b6..a9373ca07b 100644 --- a/srcpkgs/libraw1394/template +++ b/srcpkgs/libraw1394/template @@ -28,9 +28,3 @@ libraw1394-progs_package() { vmove usr/share } } - -libraw1394_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libreoffice-bin-i18n/template b/srcpkgs/libreoffice-bin-i18n/template index 40f2b5fcf8..5635bb6d1c 100644 --- a/srcpkgs/libreoffice-bin-i18n/template +++ b/srcpkgs/libreoffice-bin-i18n/template @@ -347,7 +347,25 @@ cd74116bd82562335b957242e34ace7a94bb9e2e1f75e348fa77df241cd7ef4b 3c3da1b6845c682643750527a4be2711c231ec09dd3bc12f7cf3cc619c04d7a3 " +noarch=yes create_wrksrc=yes +depends=" + libreoffice-bin-i18n-af libreoffice-bin-i18n-am libreoffice-bin-i18n-ar libreoffice-bin-i18n-as libreoffice-bin-i18n-ast libreoffice-bin-i18n-be + libreoffice-bin-i18n-bg libreoffice-bin-i18n-bn libreoffice-bin-i18n-bn-IN libreoffice-bin-i18n-bo libreoffice-bin-i18n-br libreoffice-bin-i18n-brx libreoffice-bin-i18n-bs + libreoffice-bin-i18n-ca libreoffice-bin-i18n-ca-XV libreoffice-bin-i18n-cs libreoffice-bin-i18n-cy libreoffice-bin-i18n-da libreoffice-bin-i18n-de libreoffice-bin-i18n-dgo + libreoffice-bin-i18n-dz libreoffice-bin-i18n-el libreoffice-bin-i18n-en-GB libreoffice-bin-i18n-en-US libreoffice-bin-i18n-en-ZA libreoffice-bin-i18n-eo libreoffice-bin-i18n-es + libreoffice-bin-i18n-et libreoffice-bin-i18n-eu libreoffice-bin-i18n-fa libreoffice-bin-i18n-fi libreoffice-bin-i18n-fr libreoffice-bin-i18n-ga libreoffice-bin-i18n-gd + libreoffice-bin-i18n-gl libreoffice-bin-i18n-gu libreoffice-bin-i18n-he libreoffice-bin-i18n-hi libreoffice-bin-i18n-hr libreoffice-bin-i18n-hu libreoffice-bin-i18n-id + libreoffice-bin-i18n-is libreoffice-bin-i18n-it libreoffice-bin-i18n-ja libreoffice-bin-i18n-ka libreoffice-bin-i18n-kk libreoffice-bin-i18n-km libreoffice-bin-i18n-kn + libreoffice-bin-i18n-ko libreoffice-bin-i18n-kok libreoffice-bin-i18n-ks libreoffice-bin-i18n-ku libreoffice-bin-i18n-lb libreoffice-bin-i18n-lo libreoffice-bin-i18n-lt + libreoffice-bin-i18n-lv libreoffice-bin-i18n-mai libreoffice-bin-i18n-mk libreoffice-bin-i18n-ml libreoffice-bin-i18n-mn libreoffice-bin-i18n-mni libreoffice-bin-i18n-mr + libreoffice-bin-i18n-my libreoffice-bin-i18n-nb libreoffice-bin-i18n-ne libreoffice-bin-i18n-nl libreoffice-bin-i18n-nn libreoffice-bin-i18n-nr libreoffice-bin-i18n-nso + libreoffice-bin-i18n-oc libreoffice-bin-i18n-om libreoffice-bin-i18n-or libreoffice-bin-i18n-pa-IN libreoffice-bin-i18n-pl libreoffice-bin-i18n-pt libreoffice-bin-i18n-pt-BR + libreoffice-bin-i18n-ro libreoffice-bin-i18n-ru libreoffice-bin-i18n-rw libreoffice-bin-i18n-sa-IN libreoffice-bin-i18n-sat libreoffice-bin-i18n-sd libreoffice-bin-i18n-sh + libreoffice-bin-i18n-si libreoffice-bin-i18n-sid libreoffice-bin-i18n-sk libreoffice-bin-i18n-sl libreoffice-bin-i18n-sq libreoffice-bin-i18n-sr libreoffice-bin-i18n-ss + libreoffice-bin-i18n-st libreoffice-bin-i18n-sv libreoffice-bin-i18n-sw-TZ libreoffice-bin-i18n-ta libreoffice-bin-i18n-te libreoffice-bin-i18n-tg libreoffice-bin-i18n-th + libreoffice-bin-i18n-tn libreoffice-bin-i18n-tr libreoffice-bin-i18n-ts libreoffice-bin-i18n-tt libreoffice-bin-i18n-ug libreoffice-bin-i18n-uk libreoffice-bin-i18n-uz + libreoffice-bin-i18n-ve libreoffice-bin-i18n-vi libreoffice-bin-i18n-xh libreoffice-bin-i18n-zh-CN libreoffice-bin-i18n-zh-TW libreoffice-bin-i18n-zu" do_build() { for i in $distfiles; do @@ -373,27 +391,6 @@ do_install() { : } -# As you described me in the issue comment: https://github.com/xtraeme/xbps-packages/issues/127#issuecomment-23209002 -libreoffice-bin-i18n_package() { - depends="libreoffice-bin-i18n-af libreoffice-bin-i18n-am libreoffice-bin-i18n-ar libreoffice-bin-i18n-as libreoffice-bin-i18n-ast libreoffice-bin-i18n-be - libreoffice-bin-i18n-bg libreoffice-bin-i18n-bn libreoffice-bin-i18n-bn-IN libreoffice-bin-i18n-bo libreoffice-bin-i18n-br libreoffice-bin-i18n-brx libreoffice-bin-i18n-bs - libreoffice-bin-i18n-ca libreoffice-bin-i18n-ca-XV libreoffice-bin-i18n-cs libreoffice-bin-i18n-cy libreoffice-bin-i18n-da libreoffice-bin-i18n-de libreoffice-bin-i18n-dgo - libreoffice-bin-i18n-dz libreoffice-bin-i18n-el libreoffice-bin-i18n-en-GB libreoffice-bin-i18n-en-US libreoffice-bin-i18n-en-ZA libreoffice-bin-i18n-eo libreoffice-bin-i18n-es - libreoffice-bin-i18n-et libreoffice-bin-i18n-eu libreoffice-bin-i18n-fa libreoffice-bin-i18n-fi libreoffice-bin-i18n-fr libreoffice-bin-i18n-ga libreoffice-bin-i18n-gd - libreoffice-bin-i18n-gl libreoffice-bin-i18n-gu libreoffice-bin-i18n-he libreoffice-bin-i18n-hi libreoffice-bin-i18n-hr libreoffice-bin-i18n-hu libreoffice-bin-i18n-id - libreoffice-bin-i18n-is libreoffice-bin-i18n-it libreoffice-bin-i18n-ja libreoffice-bin-i18n-ka libreoffice-bin-i18n-kk libreoffice-bin-i18n-km libreoffice-bin-i18n-kn - libreoffice-bin-i18n-ko libreoffice-bin-i18n-kok libreoffice-bin-i18n-ks libreoffice-bin-i18n-ku libreoffice-bin-i18n-lb libreoffice-bin-i18n-lo libreoffice-bin-i18n-lt - libreoffice-bin-i18n-lv libreoffice-bin-i18n-mai libreoffice-bin-i18n-mk libreoffice-bin-i18n-ml libreoffice-bin-i18n-mn libreoffice-bin-i18n-mni libreoffice-bin-i18n-mr - libreoffice-bin-i18n-my libreoffice-bin-i18n-nb libreoffice-bin-i18n-ne libreoffice-bin-i18n-nl libreoffice-bin-i18n-nn libreoffice-bin-i18n-nr libreoffice-bin-i18n-nso - libreoffice-bin-i18n-oc libreoffice-bin-i18n-om libreoffice-bin-i18n-or libreoffice-bin-i18n-pa-IN libreoffice-bin-i18n-pl libreoffice-bin-i18n-pt libreoffice-bin-i18n-pt-BR - libreoffice-bin-i18n-ro libreoffice-bin-i18n-ru libreoffice-bin-i18n-rw libreoffice-bin-i18n-sa-IN libreoffice-bin-i18n-sat libreoffice-bin-i18n-sd libreoffice-bin-i18n-sh - libreoffice-bin-i18n-si libreoffice-bin-i18n-sid libreoffice-bin-i18n-sk libreoffice-bin-i18n-sl libreoffice-bin-i18n-sq libreoffice-bin-i18n-sr libreoffice-bin-i18n-ss - libreoffice-bin-i18n-st libreoffice-bin-i18n-sv libreoffice-bin-i18n-sw-TZ libreoffice-bin-i18n-ta libreoffice-bin-i18n-te libreoffice-bin-i18n-tg libreoffice-bin-i18n-th - libreoffice-bin-i18n-tn libreoffice-bin-i18n-tr libreoffice-bin-i18n-ts libreoffice-bin-i18n-tt libreoffice-bin-i18n-ug libreoffice-bin-i18n-uk libreoffice-bin-i18n-uz - libreoffice-bin-i18n-ve libreoffice-bin-i18n-vi libreoffice-bin-i18n-xh libreoffice-bin-i18n-zh-CN libreoffice-bin-i18n-zh-TW libreoffice-bin-i18n-zu" - noarch=yes -} - libreoffice-bin-i18n-af_package () { depends="libreoffice-bin" noarch=yes diff --git a/srcpkgs/libreoffice-bin/template b/srcpkgs/libreoffice-bin/template index 907e9bbe14..28e99580da 100644 --- a/srcpkgs/libreoffice-bin/template +++ b/srcpkgs/libreoffice-bin/template @@ -20,6 +20,8 @@ fi only_for_archs="i686 x86_64" wrksrc="LibreOffice_${version}.2_Linux_${_arch}_deb" makedepends="shared-mime-info desktop-file-utils hicolor-icon-theme" +depends="${makedepends}" +allow_unknown_shlibs=yes do_install() { cd DEBS @@ -35,11 +37,3 @@ do_install() { ln -fs /opt/libreoffice4.1/program/$a ${DESTDIR}/usr/bin/$a done } - -libreoffice-bin_package() { - depends="${makedepends}" - allow_unknown_shlibs=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/librlog/template b/srcpkgs/librlog/template index c67b317e9e..685f4c7ccf 100644 --- a/srcpkgs/librlog/template +++ b/srcpkgs/librlog/template @@ -23,9 +23,3 @@ librlog-devel_package() { vmove usr/lib/pkgconfig } } - -librlog_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/librpcsecgss/template b/srcpkgs/librpcsecgss/template index 7de0673307..8c62fb7043 100644 --- a/srcpkgs/librpcsecgss/template +++ b/srcpkgs/librpcsecgss/template @@ -25,9 +25,3 @@ librpcsecgss-devel_package() { vmove "usr/lib/*.a" } } - -librpcsecgss_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/librsvg/template b/srcpkgs/librsvg/template index 1872a86f6a..3753ad6ec8 100644 --- a/srcpkgs/librsvg/template +++ b/srcpkgs/librsvg/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-static --enable-introspection" hostmakedepends="pkg-config intltool python gobject-introspection" makedepends="libcroco-devel gtk+3-devel" +depends="gdk-pixbuf>=2.26.1_2" +triggers="gtk-pixbuf-loaders" short_desc="SVG library for GNOME" maintainer="Juan RP " homepage="http://librsvg.sourceforge.net/" @@ -39,11 +41,3 @@ librsvg-utils_package() { vmove usr/share/man/man1/rsvg-convert.1 } } - -librsvg_package() { - depends="gdk-pixbuf>=2.26.1_2" - triggers="gtk-pixbuf-loaders" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/librsync/template b/srcpkgs/librsync/template index efe0a7d2e7..b4750c8f39 100644 --- a/srcpkgs/librsync/template +++ b/srcpkgs/librsync/template @@ -13,16 +13,10 @@ license="GPL" short_desc="A free software library that implements the rsync remote-delta algorithm (rdiff)" librsync-devel_package() { - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" depends="librsync-${version}_${revision}" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -librsync_package() { - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/libsamplerate/template b/srcpkgs/libsamplerate/template index 9bc4f44159..f68be1dedd 100644 --- a/srcpkgs/libsamplerate/template +++ b/srcpkgs/libsamplerate/template @@ -24,7 +24,7 @@ long_desc=" libsamplerate-devel_package() { depends="libsndfile-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -32,9 +32,3 @@ libsamplerate-devel_package() { vmove usr/share/doc } } - -libsamplerate_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libsasl/template b/srcpkgs/libsasl/template index 6331b3a890..307679cdfb 100644 --- a/srcpkgs/libsasl/template +++ b/srcpkgs/libsasl/template @@ -42,9 +42,3 @@ libsasl-devel_package() { vmove usr/include } } - -libsasl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libseccomp/template b/srcpkgs/libseccomp/template index 0866fe67cf..86869fdeaf 100644 --- a/srcpkgs/libseccomp/template +++ b/srcpkgs/libseccomp/template @@ -29,9 +29,3 @@ libseccomp-devel_package() { vmove usr/share } } - -libseccomp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libsecret/template b/srcpkgs/libsecret/template index ea04ebb152..f185efce64 100644 --- a/srcpkgs/libsecret/template +++ b/srcpkgs/libsecret/template @@ -25,9 +25,3 @@ libsecret-devel_package() { vmove usr/share/vala } } - -libsecret_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libsexy/template b/srcpkgs/libsexy/template index d6d162d400..3947d5ac29 100644 --- a/srcpkgs/libsexy/template +++ b/srcpkgs/libsexy/template @@ -26,9 +26,3 @@ libsexy-devel_package() { vmove usr/share } } - -libsexy_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libshout-idjc/template b/srcpkgs/libshout-idjc/template index 3f3a2107a0..d61716e0cc 100644 --- a/srcpkgs/libshout-idjc/template +++ b/srcpkgs/libshout-idjc/template @@ -26,9 +26,3 @@ libshout-idjc-devel_package() { vmove "usr/lib/*.so" } } - -libshout-idjc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libsigc++/template b/srcpkgs/libsigc++/template index b6ead460a9..9185eca859 100644 --- a/srcpkgs/libsigc++/template +++ b/srcpkgs/libsigc++/template @@ -32,9 +32,3 @@ libsigc++-devel_package() { vmove "usr/lib/*.so" } } - -libsigc++_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libsmbios/template b/srcpkgs/libsmbios/template index 08f3e22a30..8437117b60 100644 --- a/srcpkgs/libsmbios/template +++ b/srcpkgs/libsmbios/template @@ -44,9 +44,3 @@ libsmbios-utils_package() { vmove usr/sbin } } - -libsmbios_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template index 36708423ca..c376a34f80 100644 --- a/srcpkgs/libsndfile/template +++ b/srcpkgs/libsndfile/template @@ -17,7 +17,7 @@ long_desc=" through one standard library interface." libsndfile-progs_package() { - short_desc+=" -- bundled cmdline apps" + short_desc+=" - bundled cmdline apps" pkg_install() { vmove usr/bin vmove usr/share/man @@ -26,7 +26,7 @@ libsndfile-progs_package() { libsndfile-devel_package() { depends="alsa-lib-devel libvorbis-devel libflac-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -34,9 +34,3 @@ libsndfile-devel_package() { vmove usr/share/doc } } - -libsndfile_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libsoup/template b/srcpkgs/libsoup/template index 292dd0f972..2b74d91209 100644 --- a/srcpkgs/libsoup/template +++ b/srcpkgs/libsoup/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libxml2-devel sqlite-devel glib-networking" +depends="glib-networking" short_desc="HTTP library implementation in C" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -43,10 +44,3 @@ libsoup-gnome_package() { vmove "usr/lib/girepository-1.0/SoupGNOME*" } } - -libsoup_package() { - depends="glib-networking" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libspectre/template b/srcpkgs/libspectre/template index e11be65a85..ab89958cb7 100644 --- a/srcpkgs/libspectre/template +++ b/srcpkgs/libspectre/template @@ -18,15 +18,9 @@ long_desc=" libspectre-devel_package() { depends="libspectre>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -libspectre_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libsrtp/template b/srcpkgs/libsrtp/template index f0117b15e6..b5303d5a16 100644 --- a/srcpkgs/libsrtp/template +++ b/srcpkgs/libsrtp/template @@ -23,14 +23,8 @@ post_install() { ln -sf libsrtp.so.0.0.0 ${DESTDIR}/usr/lib/libsrtp.so.0 } -libsrtp_package() { - pkg_install() { - vmove all - } -} - libsrtp-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index c0b851902d..16eab114ac 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -14,7 +14,6 @@ long_desc=" on client and server side. With libssh, you can remotely execute programs, transfer files, use a secure and transparent tunnel for your remote applications." - do_fetch() { git clone -b${pkgname}-${version} \ git://git.libssh.org/projects/libssh.git ${pkgname}-${version} @@ -29,9 +28,3 @@ libssh-devel_package() { vmove usr/lib/pkgconfig } } - -libssh_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libssh2/template b/srcpkgs/libssh2/template index a7bdb46ec9..bc756403c2 100644 --- a/srcpkgs/libssh2/template +++ b/srcpkgs/libssh2/template @@ -29,9 +29,3 @@ libssh2-devel_package() { vmove usr/share } } - -libssh2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libstatgrab/template b/srcpkgs/libstatgrab/template index 95e3bd1626..1d17a822b2 100644 --- a/srcpkgs/libstatgrab/template +++ b/srcpkgs/libstatgrab/template @@ -25,9 +25,3 @@ libstatgrab-devel_package() { vmove usr/share/man/man3 } } - -libstatgrab_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtaginfo/template b/srcpkgs/libtaginfo/template index c97bb1520b..4f6ca347f1 100644 --- a/srcpkgs/libtaginfo/template +++ b/srcpkgs/libtaginfo/template @@ -23,9 +23,3 @@ libtaginfo-devel_package() { vmove usr/share } } - -libtaginfo_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libtar/template b/srcpkgs/libtar/template index eebea6f17e..238e7f667b 100644 --- a/srcpkgs/libtar/template +++ b/srcpkgs/libtar/template @@ -22,9 +22,3 @@ libtar-devel_package() { vmove "usr/lib/*.a" } } - -libtar_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtasn1/template b/srcpkgs/libtasn1/template index 62e704e728..7e1aebab08 100644 --- a/srcpkgs/libtasn1/template +++ b/srcpkgs/libtasn1/template @@ -40,9 +40,3 @@ libtasn1-tools_package() { vmove usr/share } } - -libtasn1_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtheora/template b/srcpkgs/libtheora/template index e4167ca58b..234259a732 100644 --- a/srcpkgs/libtheora/template +++ b/srcpkgs/libtheora/template @@ -22,7 +22,7 @@ long_desc=" libtheora-devel_package() { depends="libogg-devel libtheora>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -30,9 +30,3 @@ libtheora-devel_package() { vmove usr/share } } - -libtheora_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtirpc/template b/srcpkgs/libtirpc/template index 7dbcaad8dc..aa727f36eb 100644 --- a/srcpkgs/libtirpc/template +++ b/srcpkgs/libtirpc/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" makedepends="mit-krb5-devel libgssglue-devel" +conf_files="/etc/netconfig" short_desc="Transport Independent RPC library (SunRPC replacement)" maintainer="Juan RP " license="BSD" @@ -13,6 +14,10 @@ homepage="http://libtirpc.sourceforge.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=45c3e21dfc23a5ba501f9dfc6671678316fdfdb8355a1ec404ae2aa2f81943a1 +post_install() { + vinstall ${wrksrc}/doc/netconfig 644 etc +} + libtirpc-devel_package() { depends="libgssglue-devel libtirpc>=${version}" short_desc+=" - development files" @@ -23,11 +28,3 @@ libtirpc-devel_package() { vmove "usr/lib/*.so" } } - -libtirpc_package() { - conf_files="/etc/netconfig" - pkg_install() { - vmove all - vinstall ${wrksrc}/doc/netconfig 644 etc - } -} diff --git a/srcpkgs/libtomcrypt/template b/srcpkgs/libtomcrypt/template index 5ecc770de7..b9e807b86c 100644 --- a/srcpkgs/libtomcrypt/template +++ b/srcpkgs/libtomcrypt/template @@ -41,9 +41,3 @@ libtomcrypt-devel_package() { vmove usr/share/man/man3 } } - -libtomcrypt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtool/template b/srcpkgs/libtool/template index 53686f35c2..86fd3e0042 100644 --- a/srcpkgs/libtool/template +++ b/srcpkgs/libtool/template @@ -2,7 +2,9 @@ pkgname=libtool version=2.4.2 revision=7 +noarch=yes hostmakedepends="perl automake help2man" +depends="tar sed" build_style=gnu-configure homepage="http://www.gnu.org/software/libtool" distfiles="http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version.tar.xz" @@ -33,11 +35,3 @@ libltdl_package() { vmove "usr/lib/libltdl.so*" } } - -libtool_package() { - noarch=yes - depends="tar sed" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtorrent/template b/srcpkgs/libtorrent/template index b71d0546b4..0398fc039f 100644 --- a/srcpkgs/libtorrent/template +++ b/srcpkgs/libtorrent/template @@ -29,16 +29,10 @@ long_desc=" libtorrent-devel_package() { depends="libtorrent>=$version" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -libtorrent_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libtsm/template b/srcpkgs/libtsm/template index b01df2a876..918a480af2 100644 --- a/srcpkgs/libtsm/template +++ b/srcpkgs/libtsm/template @@ -22,9 +22,3 @@ libtsm-devel_package() { vmove "usr/lib/*.so" } } - -libtsm_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libtxc_dxtn/template b/srcpkgs/libtxc_dxtn/template index a5ac6a08fa..30fc2e2167 100644 --- a/srcpkgs/libtxc_dxtn/template +++ b/srcpkgs/libtxc_dxtn/template @@ -11,9 +11,3 @@ license="MIT" homepage="http://dri.freedesktop.org/wiki/S3TC" distfiles="http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-${version}.tar.bz2" checksum=45290d12cdca529a3f41e7fc35c4250fc1b6d2fc16b56680f8401f6aa792ae60 - -libtxc_dxtn_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libunique/template b/srcpkgs/libunique/template index 03fc03e91f..936cf23871 100644 --- a/srcpkgs/libunique/template +++ b/srcpkgs/libunique/template @@ -33,9 +33,3 @@ libunique-devel_package() { vmove usr/share } } - -libunique_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template index 19821ea33d..a644e8d835 100644 --- a/srcpkgs/libunique1/template +++ b/srcpkgs/libunique1/template @@ -48,9 +48,3 @@ libunique1-devel_package() { vmove usr/share } } - -libunique1_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libunistring/template b/srcpkgs/libunistring/template index b9788069c0..2f784ac340 100644 --- a/srcpkgs/libunistring/template +++ b/srcpkgs/libunistring/template @@ -28,9 +28,3 @@ libunistring-docs_package() { vmove usr/share } } - -libunistring_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libunwind/template b/srcpkgs/libunwind/template index e3de42f464..71cdc845a5 100644 --- a/srcpkgs/libunwind/template +++ b/srcpkgs/libunwind/template @@ -27,9 +27,3 @@ libunwind-devel_package() { vmove usr/share } } - -libunwind_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libupnp/template b/srcpkgs/libupnp/template index 06be502b5a..d257e58303 100644 --- a/srcpkgs/libupnp/template +++ b/srcpkgs/libupnp/template @@ -27,9 +27,3 @@ libupnp-devel_package() { vmove "usr/lib/*.a" } } - -libupnp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libusb-compat/template b/srcpkgs/libusb-compat/template index 25df98040e..dcba833609 100644 --- a/srcpkgs/libusb-compat/template +++ b/srcpkgs/libusb-compat/template @@ -27,9 +27,3 @@ libusb-compat-devel_package() { vmove usr/lib/pkgconfig } } - -libusb-compat_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template index 077677ee41..56eb8dde35 100644 --- a/srcpkgs/libusb/template +++ b/srcpkgs/libusb/template @@ -21,9 +21,3 @@ libusb-devel_package() { vmove usr/lib/pkgconfig } } - -libusb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libusbx/template b/srcpkgs/libusbx/template index a193f89c5a..f781bea7bb 100644 --- a/srcpkgs/libusbx/template +++ b/srcpkgs/libusbx/template @@ -4,6 +4,8 @@ version=1.0.17 revision=1 build_style=gnu-configure makedepends="libudev-devel" +provides="libusb-${version}_${revision}" +replaces="libusb>=0" short_desc="Library that provides generic access to USB devices" maintainer="Juan RP " license="LGPL-2.1" @@ -23,11 +25,3 @@ libusbx-devel_package() { vmove usr/lib/pkgconfig } } - -libusbx_package() { - provides="libusb-${version}_${revision}" - replaces="libusb>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libutempter/template b/srcpkgs/libutempter/template index 6f450e4ca0..4327f38e46 100644 --- a/srcpkgs/libutempter/template +++ b/srcpkgs/libutempter/template @@ -15,16 +15,10 @@ long_desc=" libutempter-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/share } } - -libutempter_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libva-intel-driver/template b/srcpkgs/libva-intel-driver/template index 9a57663cd6..7b93dd2cc0 100644 --- a/srcpkgs/libva-intel-driver/template +++ b/srcpkgs/libva-intel-driver/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libva-devel>=1:1.2.0 libdrm-devel" +depends="libva>=1:1.2.0" short_desc="Video Acceleration (VA) API - Intel Graphics backend" maintainer="Juan RP " homepage="http://freedesktop.org/wiki/Software/vaapi" @@ -23,10 +24,3 @@ long_desc=" post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -libva-intel-driver_package() { - depends="libva>=1:1.2.0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libva/template b/srcpkgs/libva/template index 514cb2808b..a51454d519 100644 --- a/srcpkgs/libva/template +++ b/srcpkgs/libva/template @@ -33,9 +33,3 @@ libva-devel_package() { vmove "usr/lib/*.so" } } - -libva_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libvdpau-va-gl/template b/srcpkgs/libvdpau-va-gl/template index 7a6b41a629..7a3e93c163 100644 --- a/srcpkgs/libvdpau-va-gl/template +++ b/srcpkgs/libvdpau-va-gl/template @@ -13,9 +13,3 @@ homepage="https://github.com/i-rinat/libvdpau-va-gl" do_fetch() { git clone -b v${version} git://github.com/i-rinat/${pkgname}.git ${pkgname}-${version} } - -libvdpau-va-gl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libvdpau/template b/srcpkgs/libvdpau/template index b87f2092ff..7f51ad5428 100644 --- a/srcpkgs/libvdpau/template +++ b/srcpkgs/libvdpau/template @@ -25,9 +25,3 @@ libvdpau-devel_package() { vmove "usr/lib/*.so" } } - -libvdpau_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libvirt-glib/template b/srcpkgs/libvirt-glib/template index ce68cdc529..6eba420742 100644 --- a/srcpkgs/libvirt-glib/template +++ b/srcpkgs/libvirt-glib/template @@ -40,9 +40,3 @@ libvirt-glib-python_package() { vmove "usr/lib/python*" } } - -libvirt-glib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libvirt/template b/srcpkgs/libvirt/template index 5adb8c9255..79542bd3e0 100644 --- a/srcpkgs/libvirt/template +++ b/srcpkgs/libvirt/template @@ -22,6 +22,25 @@ makedepends="readline-devel libcap-ng-devel libnl3-devel attr-devel libpciaccess-devel avahi-libs-devel polkit-devel yajl-devel python-devel libssh2-devel libnuma-devel libcap-ng-devel fuse-devel lvm2 parted" +depends="lvm2 parted" +conf_files=" + /etc/libvirt/libvirt.conf + /etc/libvirt/libvirtd.conf + /etc/libvirt/lxc.conf + /etc/libvirt/qemu.conf + /etc/libvirt/qemu-lockd.conf + /etc/sasl2/libvirt.conf" +make_dirs=" + /var/cache/libvirt/qemu 0755 root root + /var/lib/libvirt/boot 0755 root root + /var/lib/libvirt/filesystems 0755 root root + /var/lib/libvirt/images 0755 root root + /var/lib/libvirt/network 0755 root root + /var/lib/libvirt/qemu 0755 root root + /var/lib/libvirt/lockd/files 0755 root root + /var/lib/libvirt/lxc 0755 root root + /var/lib/libvirt/dnsmasq 0755 root root + /var/lib/libvirt/uml 0755 root root" post_install() { # Move everything to /usr. @@ -56,28 +75,3 @@ libvirt-python_package() { vmove "usr/share/doc/libvirt-python*" } } - -libvirt_package() { - depends="lvm2 parted" - conf_files=" - /etc/libvirt/libvirt.conf - /etc/libvirt/libvirtd.conf - /etc/libvirt/lxc.conf - /etc/libvirt/qemu.conf - /etc/libvirt/qemu-lockd.conf - /etc/sasl2/libvirt.conf" - make_dirs=" - /var/cache/libvirt/qemu 0755 root root - /var/lib/libvirt/boot 0755 root root - /var/lib/libvirt/filesystems 0755 root root - /var/lib/libvirt/images 0755 root root - /var/lib/libvirt/network 0755 root root - /var/lib/libvirt/qemu 0755 root root - /var/lib/libvirt/lockd/files 0755 root root - /var/lib/libvirt/lxc 0755 root root - /var/lib/libvirt/dnsmasq 0755 root root - /var/lib/libvirt/uml 0755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libvisual/template b/srcpkgs/libvisual/template index 8e5b625bf6..2019f80bf9 100644 --- a/srcpkgs/libvisual/template +++ b/srcpkgs/libvisual/template @@ -37,9 +37,3 @@ libvisual-devel_package() { vmove "usr/lib/*.so" } } - -libvisual_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libvncserver/template b/srcpkgs/libvncserver/template index b43ac6d7e0..6bd53ba2f0 100644 --- a/srcpkgs/libvncserver/template +++ b/srcpkgs/libvncserver/template @@ -25,9 +25,3 @@ libvncserver-devel_package() { vmove usr/lib/pkgconfig } } - -libvncserver_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libvorbis/template b/srcpkgs/libvorbis/template index 2e8fdb0f49..c387a4946a 100644 --- a/srcpkgs/libvorbis/template +++ b/srcpkgs/libvorbis/template @@ -29,7 +29,7 @@ fi libvorbis-devel_package() { depends="libogg-devel libvorbis>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -37,9 +37,3 @@ libvorbis-devel_package() { vmove usr/share } } - -libvorbis_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libvpx/template b/srcpkgs/libvpx/template index 3f32bfe837..7dee8cb088 100644 --- a/srcpkgs/libvpx/template +++ b/srcpkgs/libvpx/template @@ -43,16 +43,10 @@ do_install() { libvpx-devel_package() { depends="libvpx>=$version" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } - -libvpx_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libwacom/template b/srcpkgs/libwacom/template index 1ef50cb972..5990c3f9b0 100644 --- a/srcpkgs/libwacom/template +++ b/srcpkgs/libwacom/template @@ -26,9 +26,3 @@ libwacom-devel_package() { vmove "usr/lib/*.so" } } - -libwacom_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libwapcaplet/template b/srcpkgs/libwapcaplet/template index 0c77fc3d73..8038f85901 100644 --- a/srcpkgs/libwapcaplet/template +++ b/srcpkgs/libwapcaplet/template @@ -40,9 +40,3 @@ libwapcaplet-devel_package() { vmove "usr/lib/*.a" } } - -libwapcaplet_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libwebp/template b/srcpkgs/libwebp/template index 80a50fbd9e..72efa4238a 100644 --- a/srcpkgs/libwebp/template +++ b/srcpkgs/libwebp/template @@ -31,9 +31,3 @@ libwebp-devel_package() { vmove "usr/lib/*.so" } } - -libwebp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libwmf/template b/srcpkgs/libwmf/template index 847e242822..7cf1b7f24f 100644 --- a/srcpkgs/libwmf/template +++ b/srcpkgs/libwmf/template @@ -9,6 +9,8 @@ configure_args="--with-gsfontdir=/usr/share/fonts/Type1 hostmakedepends="automake libtool pkg-config gsfonts freetype-devel" makedepends="zlib-devel freetype-devel libjpeg-turbo-devel libpng-devel>=1.6 expat-devel glib-devel gtk+-devel gd-devel gsfonts" +depends="gsfonts" +triggers="gtk-pixbuf-loaders" short_desc="Library for reading and converting WMF (Windows Meta Files)" maintainer="Juan RP " homepage="http://wvware.sourceforge.net/libwmf.html" @@ -34,11 +36,3 @@ libwmf-devel_package() { vmove "usr/lib/*.so" } } - -libwmf_package() { - depends="gsfonts" - triggers="gtk-pixbuf-loaders" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libwnck/template b/srcpkgs/libwnck/template index 61811f988a..2f5c4eabba 100644 --- a/srcpkgs/libwnck/template +++ b/srcpkgs/libwnck/template @@ -23,9 +23,3 @@ libwnck-devel_package() { vmove usr/share/gtk-doc } } - -libwnck_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libwnck2/template b/srcpkgs/libwnck2/template index a53aa234c1..0d2e32ae53 100644 --- a/srcpkgs/libwnck2/template +++ b/srcpkgs/libwnck2/template @@ -33,9 +33,3 @@ libwnck2-devel_package() { vmove usr/share/gtk-doc } } - -libwnck2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libx86/template b/srcpkgs/libx86/template index 37d185bccc..b8bbbc63c5 100644 --- a/srcpkgs/libx86/template +++ b/srcpkgs/libx86/template @@ -22,9 +22,3 @@ libx86-devel_package() { vmove "usr/lib/*.a" } } - -libx86_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxcb/template b/srcpkgs/libxcb/template index b44c225b66..e58143fd4d 100644 --- a/srcpkgs/libxcb/template +++ b/srcpkgs/libxcb/template @@ -31,9 +31,3 @@ libxcb-devel_package() { vmove "usr/lib/*.so" } } - -libxcb_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libxdg-basedir/template b/srcpkgs/libxdg-basedir/template index 385cbd508d..b553672e8a 100644 --- a/srcpkgs/libxdg-basedir/template +++ b/srcpkgs/libxdg-basedir/template @@ -20,9 +20,3 @@ libxdg-basedir-devel_package() { vmove "usr/lib/*.a" } } - -libxdg-basedir_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template index 169d84aebe..38e7f2dbc3 100644 --- a/srcpkgs/libxfce4ui/template +++ b/srcpkgs/libxfce4ui/template @@ -7,6 +7,7 @@ configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libxfce4util-devel xfconf-devel dbus-glib-devel libxml2-devel startup-notification-devel libSM-devel" +conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml" short_desc="Replacement of the old libxfcegui4 library" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -34,10 +35,3 @@ libxfce4ui-devel_package() { vmove usr/share/gtk-doc } } - -libxfce4ui_package() { - conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template index 5b2d69bef5..89140a74a2 100644 --- a/srcpkgs/libxfce4util/template +++ b/srcpkgs/libxfce4util/template @@ -21,9 +21,3 @@ libxfce4util-devel_package() { vmove usr/share/gtk-doc } } - -libxfce4util_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxfcegui4/template b/srcpkgs/libxfcegui4/template index 8023892239..a6e1f906e5 100644 --- a/srcpkgs/libxfcegui4/template +++ b/srcpkgs/libxfcegui4/template @@ -15,21 +15,15 @@ checksum=2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533 hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libxml2-devel libxfce4util-devel startup-notification-devel libglade-devel libxklavier-devel" +depends="hicolor-icon-theme" +conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml" libxfcegui4-devel_package() { depends="libxfce4util-devel libxfcegui4-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/gtk-doc } } - -libxfcegui4_package() { - conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml" - depends="hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxkbcommon/template b/srcpkgs/libxkbcommon/template index 182da8688d..cf23b8552e 100644 --- a/srcpkgs/libxkbcommon/template +++ b/srcpkgs/libxkbcommon/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config flex xkeyboard-config" +depends="xkeyboard-config" short_desc="Library to handle keyboard descriptions" maintainer="Juan RP " homepage="http://xkbcommon.org/" @@ -29,10 +30,3 @@ libxkbcommon-devel_package() { vmove usr/lib/pkgconfig } } - -libxkbcommon_package() { - depends="xkeyboard-config" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxkbfile/template b/srcpkgs/libxkbfile/template index db7a6ae4bf..262fdde291 100644 --- a/srcpkgs/libxkbfile/template +++ b/srcpkgs/libxkbfile/template @@ -13,16 +13,10 @@ checksum=8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a libxkbfile-devel_package() { depends="kbproto libX11-devel libxkbfile>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } - -libxkbfile_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxkbui/template b/srcpkgs/libxkbui/template index fa3543eb50..a20c2ea416 100644 --- a/srcpkgs/libxkbui/template +++ b/srcpkgs/libxkbui/template @@ -14,16 +14,10 @@ checksum=20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214 libxkbui-devel_package() { depends="libxkbui-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -libxkbui_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxklavier/template b/srcpkgs/libxklavier/template index eae1f62899..5633e6d733 100644 --- a/srcpkgs/libxklavier/template +++ b/srcpkgs/libxklavier/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config gobject-introspection" makedepends="libglib-devel libxkbfile-devel libxml2-devel>=2.7.8 libXi-devel xkeyboard-config iso-codes" +depends="xkeyboard-config iso-codes" short_desc="Library providing high-level API for X Keyboard Extension" homepage="http://freedesktop.org/wiki/Software/LibXklavier" license="LGPL-2" @@ -27,10 +28,3 @@ libxklavier-devel_package() { vmove usr/lib/pkgconfig } } - -libxklavier_package() { - depends="xkeyboard-config iso-codes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxml++/template b/srcpkgs/libxml++/template index dd00c3f7a2..de9ecb1734 100644 --- a/srcpkgs/libxml++/template +++ b/srcpkgs/libxml++/template @@ -29,16 +29,10 @@ pre_install() { libxml++-devel_package() { depends="libxml2-devel ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/libxml++-2.6/include } } - -libxml++_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template index dd3e26f04d..20d877f01b 100644 --- a/srcpkgs/libxml2/template +++ b/srcpkgs/libxml2/template @@ -50,9 +50,3 @@ libxml2-python_package() { vmove usr/share/doc/${sourcepkg}-python-${version} } } - -libxml2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libxshmfence/template b/srcpkgs/libxshmfence/template index 22d3c00633..2edf6ca2ce 100644 --- a/srcpkgs/libxshmfence/template +++ b/srcpkgs/libxshmfence/template @@ -26,9 +26,3 @@ libxshmfence-devel_package() { vmove "usr/lib/*.a" } } - -libxshmfence_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template index cf888baaba..73382889ae 100644 --- a/srcpkgs/libxslt/template +++ b/srcpkgs/libxslt/template @@ -37,7 +37,7 @@ post_install() { libxslt-devel_package() { depends="libxml2-devel libxslt-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/bin/xslt-config vmove usr/lib/xsltConf.sh @@ -50,16 +50,10 @@ libxslt-devel_package() { } libxslt-python_package() { - short_desc="${short_desc} -- python extension" + short_desc+=" - python extension" pycompile_module="libxslt.py" pkg_install() { vmove "usr/lib/python*" vmove usr/share/doc/${sourcepkg}-python-${version} } } - -libxslt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libyaml/template b/srcpkgs/libyaml/template index 3655a2e4ba..43f0db6386 100644 --- a/srcpkgs/libyaml/template +++ b/srcpkgs/libyaml/template @@ -20,16 +20,10 @@ post_install() { libyaml-devel_package() { depends="libyaml>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -libyaml_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libzapojit/template b/srcpkgs/libzapojit/template index 0192ecfc91..850abfc425 100644 --- a/srcpkgs/libzapojit/template +++ b/srcpkgs/libzapojit/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="json-glib-devel rest-devel>=0.7.90 gnome-online-accounts-devel>=3.10" +depends="rest>=0.7.90" short_desc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" maintainer="Juan RP " license="LGPL-2.1" @@ -25,10 +26,3 @@ libzapojit-devel_package() { vmove "usr/lib/*.so" } } - -libzapojit_package() { - depends="rest>=0.7.90" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/libzeitgeist/template b/srcpkgs/libzeitgeist/template index 6844960467..546fc55fd4 100644 --- a/srcpkgs/libzeitgeist/template +++ b/srcpkgs/libzeitgeist/template @@ -23,7 +23,7 @@ post_install() { libzeitgeist-devel_package() { depends="${sourcepkg}>=$version" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -31,9 +31,3 @@ libzeitgeist-devel_package() { vmove usr/share/gtk-doc } } - -libzeitgeist_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/libzip/template b/srcpkgs/libzip/template index 3434cab773..30eff533aa 100644 --- a/srcpkgs/libzip/template +++ b/srcpkgs/libzip/template @@ -12,7 +12,7 @@ checksum=a7cdb5112004db5147f330f16c0f0e732922c342b9f0cda422c45e254590b617 libzip-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/share/man/man3 vmove usr/include @@ -21,9 +21,3 @@ libzip-devel_package() { vmove usr/lib/libzip } } - -libzip_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lightdm-gtk-greeter/template b/srcpkgs/lightdm-gtk-greeter/template index 2800c0eb5a..3888c3c464 100644 --- a/srcpkgs/lightdm-gtk-greeter/template +++ b/srcpkgs/lightdm-gtk-greeter/template @@ -6,18 +6,12 @@ build_style=gnu-configure configure_args="--disable-static --with-gtk2" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel lightdm-devel>=1.8 libxklavier-devel" +depends="lightdm" +conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" +conflicts="lightdm-gtk3-greeter>=0" short_desc="Light Display Manager GTK+ Greeter (GTK+ 2.x)" maintainer="Juan RP " license="GPL-3, LGPL-3" homepage="https://launchpad.net/lightdm-gtk-greeter" distfiles="https://launchpad.net/lightdm-gtk-greeter/${version%.*}/${version}/+download/$pkgname-$version.tar.gz" checksum=1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9 - -lightdm-gtk-greeter_package() { - conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" - conflicts="lightdm-gtk3-greeter>=0" - depends="lightdm" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lightdm-gtk3-greeter/template b/srcpkgs/lightdm-gtk3-greeter/template index 5e23ce56a7..ee3c2b8771 100644 --- a/srcpkgs/lightdm-gtk3-greeter/template +++ b/srcpkgs/lightdm-gtk3-greeter/template @@ -7,18 +7,12 @@ build_style=gnu-configure configure_args="--disable-static --with-gtk3" hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel lightdm-devel>=1.8 libxklavier-devel" +depends="lightdm" +conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" +conflicts="lightdm-gtk-greeter>=0" short_desc="Light Display Manager GTK+ Greeter (GTK+ 3.x)" maintainer="Juan RP " license="GPL-3, LGPL-3" homepage="https://launchpad.net/lightdm-gtk-greeter" distfiles="https://launchpad.net/lightdm-gtk-greeter/${version%.*}/${version}/+download/${pkgname/3/}-${version}.tar.gz" checksum=1f0286ab093d50151f0efc46496aef3f8ed8c7306bbc81807a3fdcbcb2a468d9 - -lightdm-gtk3-greeter_package() { - conf_files="/etc/lightdm/lightdm-gtk-greeter.conf" - conflicts="lightdm-gtk-greeter>=0" - depends="lightdm" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lightdm/template b/srcpkgs/lightdm/template index a00563d64c..cd750fe035 100644 --- a/srcpkgs/lightdm/template +++ b/srcpkgs/lightdm/template @@ -23,6 +23,18 @@ hostmakedepends="pkg-config intltool itstool gobject-introspection which" makedepends="dbus-glib-devel libxklavier-devel libxml2-devel qt-devel gtk+3-devel libxcb-devel libXdmcp-devel pam-devel vala-devel libgcrypt-devel gnome-icon-theme dbus" +depends="gnome-icon-theme dbus accountsservice upower" +conf_files=" + /etc/lightdm/keys.conf + /etc/lightdm/lightdm.conf + /etc/lightdm/users.conf + /etc/pam.d/lightdm + /etc/pam.d/lightdm-greeter + /etc/pam.d/lightdm-autologin" +system_accounts="lightdm" +lightdm_homedir="/var/cache/lightdm" +systemd_services="lightdm.service off" +make_dirs="/var/cache/lightdm 0755 lightdm lightdm" post_install() { # Remove provided init file and use our own. @@ -63,21 +75,3 @@ lightdm-devel_package() { vmove "usr/lib/*.so" } } - -lightdm_package() { - conf_files=" - /etc/lightdm/keys.conf - /etc/lightdm/lightdm.conf - /etc/lightdm/users.conf - /etc/pam.d/lightdm - /etc/pam.d/lightdm-greeter - /etc/pam.d/lightdm-autologin" - system_accounts="lightdm" - lightdm_homedir="/var/cache/lightdm" - systemd_services="lightdm.service off" - make_dirs="/var/cache/lightdm 0755 lightdm lightdm" - depends="gnome-icon-theme dbus accountsservice upower" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lightspark/template b/srcpkgs/lightspark/template index 1cb8e62e61..2f00230e64 100644 --- a/srcpkgs/lightspark/template +++ b/srcpkgs/lightspark/template @@ -12,17 +12,11 @@ makedepends="zlib-devel pcre-devel>=8.30 libffi-devel libX11-devel MesaLib-devel ftgl-devel glew-devel>=1.9.0 libxml2-devel libxml++-devel glibmm-devel gtk+-devel libjpeg-turbo-devel pulseaudio-devel llvm>=3.2 librtmp-devel liblzma-devel libcurl-devel" +depends="hicolor-icon-theme desktop-file-utils" +conf_files="/etc/xdg/lightspark.conf" short_desc="Modern, free, open-source flash player implementation" maintainer="Juan RP " homepage="http://lightspark.github.com/" license="LGPL-3" distfiles="http://launchpad.net/lightspark/trunk/$pkgname-$version/+download/$pkgname-$version.tar.gz" checksum=70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b - -lightspark_package() { - conf_files="/etc/xdg/lightspark.conf" - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lilv/template b/srcpkgs/lilv/template index dbad656e6a..27d328276d 100644 --- a/srcpkgs/lilv/template +++ b/srcpkgs/lilv/template @@ -18,7 +18,7 @@ long_desc=" faster and have minimal dependencies." liblilv_package() { - short_desc="${short_desc} - Runtime library" + short_desc+=" - Runtime library" pkg_install() { vmove "usr/lib/*.so*" chmod 755 ${PKGDESTDIR}/usr/lib/*.so* @@ -27,7 +27,7 @@ liblilv_package() { lilv-bash-completion_package() { depends="bash-completion lilv" - short_desc="${short_desc} - Bash completion for Lilv" + short_desc+=" - Bash completion for Lilv" pkg_install() { vmove usr/etc } @@ -35,15 +35,9 @@ lilv-bash-completion_package() { lilv-devel_package() { depends="sord-devel liblilv>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -lilv_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 82c4334a1d..84f6d4eb9f 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -2,10 +2,16 @@ pkgname=linux-firmware version=20131028 revision=1 +noarch=yes short_desc="Binary firmware blobs for the Linux kernel" maintainer="Juan RP " homepage="http://www.kernel.org/" license="See /usr/share/licenses/${pkgname}" +replaces="kernel-firmware>=0 radeon-firmware>=0 iwl1000-firmware>=0 + iwl3945-firmware>=0 iwl4965-firmware>=0 iwl5000-firmware>=0 + iwl5150-firmware>=0 iwl6000-firmware>=0 rt73usb-firmware>=0 + rt2800usb>=0 rt61-firmware>=0 ar9170-firmware>=0 amd-ucode>=0" +depends="${pkgname}-network-${version}_${revision}" do_fetch() { url="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" @@ -40,15 +46,3 @@ linux-firmware-network_package() { vmove usr/lib/firmware/ti-connectivity } } - -linux-firmware_package() { - replaces="kernel-firmware>=0 radeon-firmware>=0 iwl1000-firmware>=0 - iwl3945-firmware>=0 iwl4965-firmware>=0 iwl5000-firmware>=0 - iwl5150-firmware>=0 iwl6000-firmware>=0 rt73usb-firmware>=0 - rt2800usb>=0 rt61-firmware>=0 ar9170-firmware>=0 amd-ucode>=0" - depends="${pkgname}-network-${version}_${revision}" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/linux-tools/template b/srcpkgs/linux-tools/template index 7fc89fe260..3d3e7deb63 100644 --- a/srcpkgs/linux-tools/template +++ b/srcpkgs/linux-tools/template @@ -7,6 +7,7 @@ short_desc="Linux kernel tools" hostmakedepends="flex perl asciidoc xmlto python automake libtool" makedepends="pciutils-devel libnuma-devel python-devel libglib-devel libsysfs-devel elfutils-devel libunwind-devel" +depends="cpupower>=${version} perf>=${version} usbip>=${version} x86_energy_perf_policy>=${version}" maintainer="Juan RP " license="GPL-2" homepage="http://www.kernel.org" @@ -149,10 +150,3 @@ usbip_package() { vmove usr/lib/systemd/system/usbipd.service } } - -linux-tools_package() { - depends="cpupower>=${version} perf>=${version} usbip>=${version} x86_energy_perf_policy>=${version}" - pkg_install() { - vmkdir usr - } -} diff --git a/srcpkgs/linux-user-chroot/template b/srcpkgs/linux-user-chroot/template index 289a4dc76d..946f59e327 100644 --- a/srcpkgs/linux-user-chroot/template +++ b/srcpkgs/linux-user-chroot/template @@ -15,7 +15,6 @@ long_desc=" NOTE: Only users in the wheel group can use this tool." - do_fetch() { local url="git://git.gnome.org/linux-user-chroot" msg_normal "Fetching source from $url ...\n" @@ -25,9 +24,3 @@ do_fetch() { pre_configure() { ./autogen.sh } - -linux-user-chroot_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/linux/template b/srcpkgs/linux/template index bb7a24efbb..fabeccfb88 100644 --- a/srcpkgs/linux/template +++ b/srcpkgs/linux/template @@ -10,18 +10,12 @@ license="Public domain" if [ "$XBPS_TARGET_ARCH" = "i686" -o "$XBPS_TARGET_ARCH" = "x86_64" ]; then makedepends="linux3.10 linux-firmware dracut" + depends="linux3.10" elif [ "$XBPS_TARGET_ARCH" = "armv6l" ]; then makedepends="kernel-rpi" + depends="kernel-rpi" fi -linux_package() { - if [ "$XBPS_TARGET_ARCH" = "armv6l" ]; then - depends="kernel-rpi" - else - depends="linux3.10" - fi -} - linux-headers_package() { short_desc="Linux kernel headers meta package" if [ "$XBPS_TARGET_ARCH" = "armv6l" ]; then diff --git a/srcpkgs/linux3.10/template b/srcpkgs/linux3.10/template index de997cb854..6aad6e412b 100644 --- a/srcpkgs/linux3.10/template +++ b/srcpkgs/linux3.10/template @@ -11,9 +11,25 @@ short_desc="The Linux kernel and modules (3.10 series)" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" checksum=a6c46d88deaf4f0af9038d2d23b4ed617f901c5de38f1886b865c432f22ac7cd +_kernver="${version}_${revision}" + +nostrip=yes +noverifyrdeps=yes +preserve=yes + only_for_archs="i686 x86_64" makedepends="bc perl kmod>=11_2 openssl which elfutils" -_kernver="${version}_${revision}" +depends="dracut linux-firmware kmod>=11_2" +triggers="kernel-hooks" +# These files could be modified when an external module is built. +mutable_files=" + /usr/lib/modules/${_kernver}/modules.dep + /usr/lib/modules/${_kernver}/modules.dep.bin + /usr/lib/modules/${_kernver}/modules.symbols + /usr/lib/modules/${_kernver}/modules.symbols.bin + /usr/lib/modules/${_kernver}/modules.alias + /usr/lib/modules/${_kernver}/modules.alias.bin + /usr/lib/modules/${_kernver}/modules.devname" do_configure() { # If there's a file called -dotconfig, use it to @@ -201,23 +217,3 @@ linux3.10-headers_package() { vmove usr/lib/modules/${_kernver}/build } } - -linux3.10_package() { - nostrip=yes - noverifyrdeps=yes - preserve=yes - triggers="kernel-hooks" - depends="dracut linux-firmware kmod>=11_2" - # These files could be modified when an external module is built. - mutable_files=" - /usr/lib/modules/${_kernver}/modules.dep - /usr/lib/modules/${_kernver}/modules.dep.bin - /usr/lib/modules/${_kernver}/modules.symbols - /usr/lib/modules/${_kernver}/modules.symbols.bin - /usr/lib/modules/${_kernver}/modules.alias - /usr/lib/modules/${_kernver}/modules.alias.bin - /usr/lib/modules/${_kernver}/modules.devname" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/linux3.11/template b/srcpkgs/linux3.11/template index ef3fcf8520..8beea180c8 100644 --- a/srcpkgs/linux3.11/template +++ b/srcpkgs/linux3.11/template @@ -11,9 +11,24 @@ short_desc="The Linux kernel and modules (3.11 series)" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" checksum=cb7f1b137c53446a65b257f2e52f50ced5a0314694b6fa53fddf572de7cae401 +_kernver="${version}_${revision}" + +nostrip=yes +noverifyrdeps=yes +preserve=yes only_for_archs="i686 x86_64" makedepends="bc perl kmod>=11_2 openssl which elfutils" -_kernver="${version}_${revision}" +depends="dracut linux-firmware kmod>=11_2" +triggers="kernel-hooks" +# These files could be modified when an external module is built. +mutable_files=" + /usr/lib/modules/${_kernver}/modules.dep + /usr/lib/modules/${_kernver}/modules.dep.bin + /usr/lib/modules/${_kernver}/modules.symbols + /usr/lib/modules/${_kernver}/modules.symbols.bin + /usr/lib/modules/${_kernver}/modules.alias + /usr/lib/modules/${_kernver}/modules.alias.bin + /usr/lib/modules/${_kernver}/modules.devname" do_configure() { # If there's a file called -dotconfig, use it to @@ -201,23 +216,3 @@ linux3.11-headers_package() { vmove usr/lib/modules/${_kernver}/build } } - -linux3.11_package() { - nostrip=yes - noverifyrdeps=yes - preserve=yes - triggers="kernel-hooks" - depends="dracut linux-firmware kmod>=11_2" - # These files could be modified when an external module is built. - mutable_files=" - /usr/lib/modules/${_kernver}/modules.dep - /usr/lib/modules/${_kernver}/modules.dep.bin - /usr/lib/modules/${_kernver}/modules.symbols - /usr/lib/modules/${_kernver}/modules.symbols.bin - /usr/lib/modules/${_kernver}/modules.alias - /usr/lib/modules/${_kernver}/modules.alias.bin - /usr/lib/modules/${_kernver}/modules.devname" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/linux3.12/template b/srcpkgs/linux3.12/template index 24cbecb56c..9a3f70b869 100644 --- a/srcpkgs/linux3.12/template +++ b/srcpkgs/linux3.12/template @@ -11,9 +11,24 @@ short_desc="The Linux kernel and modules (3.12 series)" distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" checksum=085c4d6663f7e85afe8ae196231f291b28187d4237e46492fa63e1726db04412 +_kernver="${version}_${revision}" + +nostrip=yes +noverifyrdeps=yes +preserve=yes only_for_archs="i686 x86_64" makedepends="bc perl kmod>=11_2 openssl which elfutils" -_kernver="${version}_${revision}" +depends="dracut linux-firmware kmod>=11_2" +triggers="kernel-hooks" +# These files could be modified when an external module is built. +mutable_files=" + /usr/lib/modules/${_kernver}/modules.dep + /usr/lib/modules/${_kernver}/modules.dep.bin + /usr/lib/modules/${_kernver}/modules.symbols + /usr/lib/modules/${_kernver}/modules.symbols.bin + /usr/lib/modules/${_kernver}/modules.alias + /usr/lib/modules/${_kernver}/modules.alias.bin + /usr/lib/modules/${_kernver}/modules.devname" do_configure() { # If there's a file called -dotconfig, use it to @@ -203,20 +218,6 @@ linux3.12-headers_package() { } linux3.12_package() { - nostrip=yes - noverifyrdeps=yes - preserve=yes - triggers="kernel-hooks" - depends="dracut linux-firmware kmod>=11_2" - # These files could be modified when an external module is built. - mutable_files=" - /usr/lib/modules/${_kernver}/modules.dep - /usr/lib/modules/${_kernver}/modules.dep.bin - /usr/lib/modules/${_kernver}/modules.symbols - /usr/lib/modules/${_kernver}/modules.symbols.bin - /usr/lib/modules/${_kernver}/modules.alias - /usr/lib/modules/${_kernver}/modules.alias.bin - /usr/lib/modules/${_kernver}/modules.devname" pkg_install() { vmove all } diff --git a/srcpkgs/linux3.2-grsec/template b/srcpkgs/linux3.2-grsec/template index 1f9fb20664..c1864ff6cb 100644 --- a/srcpkgs/linux3.2-grsec/template +++ b/srcpkgs/linux3.2-grsec/template @@ -14,9 +14,25 @@ short_desc="The Linux kernel and modules (3.2 series) (hardened kernel with grse distfiles="http://www.kernel.org/pub/linux//kernel/v3.x/linux-${version}.tar.xz" checksum=c848e595ea6f7f42cffca8e586219db8c968e2cbb875dc31e8c92be8b519e979 +_kernver="${version}-grsec_${revision}" + +nostrip=yes +noverifyrdeps=yes +preserve=yes only_for_archs="i686 x86_64" makedepends="perl kmod>=11_2 openssl which elfutils" -_kernver="${version}-grsec_${revision}" +depends="dracut linux-firmware kmod>=11_2" +triggers="kernel-hooks" +kernel_hooks_version="${_kernver}" +# These files could be modified when an external module is built. +mutable_files=" + /usr/lib/modules/${_kernver}/modules.dep + /usr/lib/modules/${_kernver}/modules.dep.bin + /usr/lib/modules/${_kernver}/modules.symbols + /usr/lib/modules/${_kernver}/modules.symbols.bin + /usr/lib/modules/${_kernver}/modules.alias + /usr/lib/modules/${_kernver}/modules.alias.bin + /usr/lib/modules/${_kernver}/modules.devname" pre_configure() { local url="http://grsecurity.net/stable/grsecurity-${_grsecurity}-${version}-${_grsecurity_date}.patch" @@ -176,24 +192,3 @@ linux3.2-grsec-headers_package() { vmove usr/lib/modules/${_kernver}/build } } - -linux3.2-grsec_package() { - nostrip=yes - noverifyrdeps=yes - preserve=yes - triggers="kernel-hooks" - kernel_hooks_version="${_kernver}" - depends="dracut linux-firmware kmod>=11_2" - # These files could be modified when an external module is built. - mutable_files=" - /usr/lib/modules/${_kernver}/modules.dep - /usr/lib/modules/${_kernver}/modules.dep.bin - /usr/lib/modules/${_kernver}/modules.symbols - /usr/lib/modules/${_kernver}/modules.symbols.bin - /usr/lib/modules/${_kernver}/modules.alias - /usr/lib/modules/${_kernver}/modules.alias.bin - /usr/lib/modules/${_kernver}/modules.devname" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template index 8805da96f4..21648a530c 100644 --- a/srcpkgs/litecoin/template +++ b/srcpkgs/litecoin/template @@ -25,9 +25,3 @@ do_install() { vinstall contrib/debian/manpages/bitcoin.conf.5 644 usr/share/man/man5/litecoin.conf.5 vinstall COPYING 644 usr/share/licenses/$pkgname } - -litecoin_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index b4aeb04be4..97a6658656 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -132,9 +132,3 @@ libllvm_package() { vmove usr/lib/libLLVM-${version}.so } } - -llvm_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lm-sensors/template b/srcpkgs/lm-sensors/template index 5ef89bf9c8..3a49e70043 100644 --- a/srcpkgs/lm-sensors/template +++ b/srcpkgs/lm-sensors/template @@ -4,6 +4,7 @@ version=3.3.4 revision=1 wrksrc="lm_sensors-${version}" hostmakedepends="which flex perl" +conf_files="/etc/sensors3.conf" short_desc="Utilities to read temperature/voltage/fan sensors" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -38,10 +39,3 @@ libsensors-devel_package() { vmove usr/share/man/man3 } } - -lm-sensors_package() { - conf_files="/etc/sensors3.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lmdb/template b/srcpkgs/lmdb/template index 04c056afcd..10c78f7175 100644 --- a/srcpkgs/lmdb/template +++ b/srcpkgs/lmdb/template @@ -32,9 +32,3 @@ lmdb-devel_package() { vmove "usr/lib/*.a" } } - -lmdb_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lockdev/template b/srcpkgs/lockdev/template index 91bf480ba9..bdb7bae68f 100644 --- a/srcpkgs/lockdev/template +++ b/srcpkgs/lockdev/template @@ -34,9 +34,3 @@ lockdev-devel_package() { vmove usr/share } } - -lockdev_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/logrotate/template b/srcpkgs/logrotate/template index e84c6ddba7..82abe602cb 100644 --- a/srcpkgs/logrotate/template +++ b/srcpkgs/logrotate/template @@ -3,6 +3,7 @@ pkgname=logrotate version=3.8.1 revision=1 makedepends="popt-devel" +conf_files="/etc/logrotate.conf" short_desc="Log file rotation and periodic maintenance" maintainer="Juan RP " homepage="https://fedorahosted.org/logrotate/" @@ -30,11 +31,3 @@ do_install() { vinstall ${FILESDIR}/logrotate.conf 644 etc vinstall ${FILESDIR}/logrotate.cron-daily 744 etc/cron.daily logrotate } - -logrotate_package() { - conf_files="/etc/logrotate.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template index 3e47a5c436..04cd4772db 100644 --- a/srcpkgs/lrzip/template +++ b/srcpkgs/lrzip/template @@ -29,9 +29,3 @@ liblrzip_package() { vmove "usr/lib/*.so.*" } } - -lrzip_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lrzsz/template b/srcpkgs/lrzsz/template index 612e8bcfe0..b925ad30b0 100644 --- a/srcpkgs/lrzsz/template +++ b/srcpkgs/lrzsz/template @@ -20,9 +20,3 @@ do_build() { do_install() { make DESTDIR=$DESTDIR install } - -lrzsz_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ls++-git/template b/srcpkgs/ls++-git/template index 61930778b5..c8134f407d 100644 --- a/srcpkgs/ls++-git/template +++ b/srcpkgs/ls++-git/template @@ -2,9 +2,12 @@ pkgname=ls++-git version=20131123 revision=1 +noarch="yes" build_style=perl-module hostmakedepends="perl>=5.18" makedepends="perl-Term-ExtendedColor" +depends="perl-Term-ExtendedColor" +conf_files="/etc/ls++.conf" short_desc="Colorized ls on steroids" maintainer="Ypnose " license="GPL-2" @@ -16,12 +19,6 @@ do_fetch() { git clone ${url} ${pkgname}-${version} } -ls++-git_package() { - depends="perl-Term-ExtendedColor" - conf_files="/etc/ls++.conf" - noarch="yes" - pkg_install() { - vinstall ${wrksrc}/ls++.conf 644 etc - vmove all - } +post_install() { + vinstall ${wrksrc}/ls++.conf 644 etc } diff --git a/srcpkgs/lsof/template b/srcpkgs/lsof/template index 53e74ec6ee..0cdaf7c2d7 100644 --- a/srcpkgs/lsof/template +++ b/srcpkgs/lsof/template @@ -35,9 +35,3 @@ do_install() { vinstall lsof.8 644 usr/share/man/man8 vinstall ${FILESDIR}/license.txt 644 usr/share/licenses/lsof } - -lsof_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ltrace/template b/srcpkgs/ltrace/template index e2062172b1..1f0936a520 100644 --- a/srcpkgs/ltrace/template +++ b/srcpkgs/ltrace/template @@ -4,6 +4,7 @@ version=0.7.3 revision=1 build_style=gnu-configure makedepends="elfutils-devel" +conf_files="/etc/ltrace.conf" short_desc="Tracks runtime library calls in dynamically linked programs" maintainer="Juan RP " homepage="http://ltrace.alioth.debian.org/" @@ -14,10 +15,3 @@ long_desc=" ltrace intercepts and records dynamic library calls which are called by an executed process and the signals received by that process. It can also intercept and print the system calls executed by the program." - -ltrace_package() { - conf_files="/etc/ltrace.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ltris/template b/srcpkgs/ltris/template index 61e32a155a..e47d7bc5e9 100644 --- a/srcpkgs/ltris/template +++ b/srcpkgs/ltris/template @@ -17,10 +17,3 @@ long_desc=" rectangular playing field and can be moved sideways or rotated by 90 degree units with the aim of building lines without gaps which then disappear (causing any block above the deleted line to fall down)." - -ltris_package() { - pkg_install() { - vmove usr - vmove var - } -} diff --git a/srcpkgs/lua/template b/srcpkgs/lua/template index 172e64b7bb..2121ba99f3 100644 --- a/srcpkgs/lua/template +++ b/srcpkgs/lua/template @@ -47,9 +47,3 @@ lua-devel_package() { vmove usr/share/doc } } - -lua_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lua51/template b/srcpkgs/lua51/template index 7e4278e6c7..da935370b7 100644 --- a/srcpkgs/lua51/template +++ b/srcpkgs/lua51/template @@ -59,9 +59,3 @@ lua51-devel_package() { vmove usr/share/doc } } - -lua51_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/luafilesystem/template b/srcpkgs/luafilesystem/template index e7fb22d75b..bc773361bc 100644 --- a/srcpkgs/luafilesystem/template +++ b/srcpkgs/luafilesystem/template @@ -3,6 +3,7 @@ pkgname=luafilesystem version=1.6.2 revision=2 makedepends="lua51-devel" +depends="lua51" short_desc="File System Library for the Lua Programming Language" maintainer="davehome " license="MIT" @@ -23,10 +24,3 @@ do_build() { do_install() { make PREFIX=${DESTDIR}/usr install } - -luafilesystem_package() { - depends="lua51" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/luakit/template b/srcpkgs/luakit/template index bbc016e9e9..4562efecd8 100644 --- a/srcpkgs/luakit/template +++ b/srcpkgs/luakit/template @@ -5,13 +5,22 @@ _patchver=r1 version=${_distver}.${_patchver} revision=1 hostmakedepends="pkg-config help2man" -makedepends="webkit-gtk-devel lua-devel luafilesystem libunique1-devel sqlite-devel desktop-file-utils LuaJIT-devel" +makedepends="webkit-gtk-devel lua-devel luafilesystem libunique1-devel sqlite-devel + desktop-file-utils LuaJIT-devel" +depends="luafilesystem" +conf_files=" + /etc/xdg/luakit/webview.lua + /etc/xdg/luakit/binds.lua + /etc/xdg/luakit/globals.lua + /etc/xdg/luakit/rc.lua + /etc/xdg/luakit/modes.lua + /etc/xdg/luakit/window.lua + /etc/xdg/luakit/theme.lua" short_desc="Fast, small, webkit based browser framework extensible by Lua" maintainer="Juan RP " license="GPL-3" homepage="http://mason-larobina.github.com/luakit" - do_fetch() { git clone -b${_distver}-${_patchver} git://github.com/mason-larobina/luakit.git ${pkgname}-${version} } @@ -29,18 +38,3 @@ do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install chmod -x ${DESTDIR}/usr/share/pixmaps/luakit.png } - -luakit_package() { - depends="luafilesystem" - conf_files=" - /etc/xdg/luakit/webview.lua - /etc/xdg/luakit/binds.lua - /etc/xdg/luakit/globals.lua - /etc/xdg/luakit/rc.lua - /etc/xdg/luakit/modes.lua - /etc/xdg/luakit/window.lua - /etc/xdg/luakit/theme.lua" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/luaposix/template b/srcpkgs/luaposix/template index 7d60761f0e..63288da9e2 100644 --- a/srcpkgs/luaposix/template +++ b/srcpkgs/luaposix/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--libdir=/usr/lib/lua/5.1 --datadir=/usr/share/lua/5.1" hostmakedepends="perl" makedepends="lua-devel" +depends="lua" short_desc="A POSIX library for Lua programming language" maintainer="davehome " license="GPL-2, LGPL-2.1" @@ -22,10 +23,3 @@ post_install() { vmkdir usr/share/$pkgname/examples vcopy "*.lua" usr/share/$pkgname/examples } - -luaposix_package() { - depends="lua" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/luasocket/template b/srcpkgs/luasocket/template index 0893bbc077..4956451e15 100644 --- a/srcpkgs/luasocket/template +++ b/srcpkgs/luasocket/template @@ -4,6 +4,7 @@ version=2.0.2 revision=2 build_style=gnu-makefile makedepends="lua51-devel" +depends="lua51" short_desc="Network support for the Lua language " maintainer="davehome " license="MIT" @@ -19,10 +20,3 @@ long_desc=" do_build() { make LUAINC=-I/usr/include/lua5.1 ${makejobs} } - -luasocket_package() { - depends="lua51" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lutok/template b/srcpkgs/lutok/template index dee7429ad9..92da2c56ee 100644 --- a/srcpkgs/lutok/template +++ b/srcpkgs/lutok/template @@ -31,9 +31,3 @@ lutok-devel_package() { vmove usr/share/doc } } - -lutok_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lv2/template b/srcpkgs/lv2/template index 89d301f736..d2b41fe02a 100644 --- a/srcpkgs/lv2/template +++ b/srcpkgs/lv2/template @@ -5,6 +5,9 @@ revision=1 build_style=waf homepage="http://lv2plug.in" makedepends="python libsndfile-devel gtk+-devel" +replaces="lv2core>=0 lv2-ui>=0" +provides="lv2core-999 lv2-ui-999" +conflicts="lv2core>=0 lv2-ui>=0" short_desc="Plugin standard for audio systems" maintainer="davehome " license="LGPL-2.1, BSD" @@ -17,12 +20,3 @@ long_desc=" post_install() { vinstall COPYING 0644 usr/share/licenses/${pkgname} } - -lv2_package() { - replaces="lv2core>=0 lv2-ui>=0" - provides="lv2core-999 lv2-ui-999" - conflicts="lv2core>=0 lv2-ui>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index c29d67bfa2..376ca24b71 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -14,6 +14,10 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes" hostmakedepends="pkg-config" makedepends="readline-devel libudev-devel>=183" +make_dirs=" + /etc/lvm/archive 0755 root root + /etc/lvm/backup 0755 root root" +conf_files="/etc/lvm/lvm.conf" short_desc="Logical Volume Manager 2 utilities" maintainer="Juan RP " homepage="http://sourceware.org/lvm2/" @@ -84,13 +88,3 @@ liblvm2app_package() { vmove "usr/lib/liblvm2app.so.*" } } - -lvm2_package() { - make_dirs=" - /etc/lvm/archive 0755 root root - /etc/lvm/backup 0755 root root" - conf_files="/etc/lvm/lvm.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lxappearance/template b/srcpkgs/lxappearance/template index a3146e9edb..ce70cf33b2 100644 --- a/srcpkgs/lxappearance/template +++ b/srcpkgs/lxappearance/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--enable-dbus" hostmakedepends="pkg-config intltool" makedepends="gtk+-devel dbus-glib-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="LXDE Theme Switcher" homepage="http://lxde.org/" license="GPL2" @@ -15,10 +16,3 @@ checksum=258069e61a1c898d1a095af25e386b3fcb79dc11024e4a0d9231a4316bfd1a2d long_desc=" LXAppearance is the standard theme switcher of LXDE. Users are able to change the theme, icons, and fonts used by applications easily." - -lxappearance_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index 324033e4b4..a856cad6f9 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -21,7 +21,7 @@ long_desc=" resource control for an application or a system." liblxc_package() { - short_desc="${short_desc} - shared library" + short_desc+=" - shared library" pkg_install() { vmove "usr/lib/*.so*" } @@ -29,15 +29,9 @@ liblxc_package() { lxc-devel_package() { depends="libcap-devel liblxc-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -lxc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lxde-common/template b/srcpkgs/lxde-common/template index 7f58a3df4f..770bf6e0ea 100644 --- a/srcpkgs/lxde-common/template +++ b/srcpkgs/lxde-common/template @@ -2,7 +2,12 @@ pkgname=lxde-common version=0.5.5 revision=1 +noarch="yes" build_style=gnu-configure +conf_files=" + /etc/xdg/pcmanfm/LXDE/pcmanfm.conf + /etc/xdg/lxsession/LXDE/config + /etc/xdg/lxsession/LXDE/autostart" short_desc="LXDE configuration data" license="GPL-2" maintainer="Juan RP " @@ -27,15 +32,3 @@ Features: - Easy-to-use, the user interface is simple, but usable enough - Desktop independent (suprise! Every component can be used without LXDE) - Standard compliant, follows the specs on freedesktop.org" - -lxde-common_package() { - conf_files=" - /etc/xdg/pcmanfm/LXDE/pcmanfm.conf - /etc/xdg/lxsession/LXDE/config - /etc/xdg/lxsession/LXDE/autostart" - noarch="yes" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/lxde-icon-theme/template b/srcpkgs/lxde-icon-theme/template index 9a9ff5e271..5594210ef7 100644 --- a/srcpkgs/lxde-icon-theme/template +++ b/srcpkgs/lxde-icon-theme/template @@ -2,20 +2,14 @@ pkgname=lxde-icon-theme version=0.5.0 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel" +depends="gtk-update-icon-cache" short_desc="LXDE default default icon theme based on nuoveXT2" homepage="http://lxde.org/" license="GPL2" maintainer="Juan RP " distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.bz2" checksum=49dc61c46c4a0ca9298f9e0866bcf7212a08ddaa71f15bfabfb0220fe1efa848 - -lxde-icon-theme_package() { - noarch="yes" - depends="gtk-update-icon-cache" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lxde/template b/srcpkgs/lxde/template index a17b2a458d..9f32132df4 100644 --- a/srcpkgs/lxde/template +++ b/srcpkgs/lxde/template @@ -2,17 +2,28 @@ pkgname=lxde version=0.5.0 revision=4 +noarch="yes" build_style=meta -makedepends="openbox pcmanfm lxde-icon-theme lxde-common lxappearance lxsession - lxterminal lxlauncher lxinput lxrandr lxpanel lxtask gpicview xdg-utils xdg-user-dirs" +makedepends=" + openbox + pcmanfm + lxde-icon-theme + lxde-common + lxappearance + lxsession + lxterminal + lxlauncher + lxinput + lxrandr + lxpanel + lxtask + gpicview + xdg-utils + xdg-user-dirs" +depends="${makedepends}" short_desc="LXDE meta-package" homepage="http://lxde.org" license="GPL-2" maintainer="Juan RP " long_desc=" This package installs all required packages for the LXDE desktop system." - -lxde_package() { - depends="${makedepends}" - noarch="yes" -} diff --git a/srcpkgs/lxdm/template b/srcpkgs/lxdm/template index 884db61dd8..a23420e59e 100644 --- a/srcpkgs/lxdm/template +++ b/srcpkgs/lxdm/template @@ -7,6 +7,19 @@ build_style=gnu-configure configure_args="--with-pam" hostmakedepends="pkg-config intltool automake libtool gettext-devel" makedepends="pam-devel gtk+-devel systemd-devel iso-codes" +depends="shadow" +conf_files=" + /etc/lxdm/LoginReady + /etc/lxdm/PostLogin + /etc/lxdm/PostLogout + /etc/lxdm/PreLogin + /etc/lxdm/PreReboot + /etc/lxdm/PreShutdown + /etc/lxdm/Xsession + /etc/lxdm/lxdm.conf + /etc/pam.d/lxdm" +system_groups="lxdm" +systemd_services="lxdm.service off" short_desc="GUI login manager for LXDE" maintainer="Juan RP " license="GPL-3" @@ -26,22 +39,3 @@ post_install() { vmkdir var/lib/lxdm echo 'GDK_CORE_DEVICE_EVENTS=true' > ${DESTDIR}/var/lib/lxdm/.pam_environment } - -lxdm_package() { - depends="shadow" - conf_files=" - /etc/lxdm/LoginReady - /etc/lxdm/PostLogin - /etc/lxdm/PostLogout - /etc/lxdm/PreLogin - /etc/lxdm/PreReboot - /etc/lxdm/PreShutdown - /etc/lxdm/Xsession - /etc/lxdm/lxdm.conf - /etc/pam.d/lxdm" - system_groups="lxdm" - systemd_services="lxdm.service off" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lxinput/template b/srcpkgs/lxinput/template index 5334f26e09..6a02aa4726 100644 --- a/srcpkgs/lxinput/template +++ b/srcpkgs/lxinput/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="LXDE Keyboad/Mouse configurator" homepage="http://lxde.org/" license="GPL2" @@ -19,10 +20,3 @@ long_desc=" * Enable/Disable beeps of keyboard input error * Swap left and right mouse buttons * Mouse acceleration and sensitivity" - -lxinput_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lxlauncher/template b/srcpkgs/lxlauncher/template index f9d5c4c09c..d97e4a27b2 100644 --- a/srcpkgs/lxlauncher/template +++ b/srcpkgs/lxlauncher/template @@ -5,6 +5,10 @@ revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel startup-notification-devel menu-cache-devel" +conf_files=" + /etc/xdg/lxlauncher/gtkrc + /etc/xdg/lxlauncher/settings.conf + /etc/xdg/menus/lxlauncher-applications.menu" short_desc="LXDE ASUS EEPC launcher" homepage="http://lxde.org/" license="GPL2" @@ -15,14 +19,3 @@ long_desc=" The LXLauncher is the optional launcher for application programs developed for the 7-10.2 screens. LXLauncher enables the LXDE desktop to be a topic oriented groupping specific application programs to one view under tabs." - -lxlauncher_package() { - conf_files=" - /etc/xdg/lxlauncher/gtkrc - /etc/xdg/lxlauncher/settings.conf - /etc/xdg/menus/lxlauncher-applications.menu" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/lxmenu-data/template b/srcpkgs/lxmenu-data/template index 237d2fa26d..7625a86bc2 100644 --- a/srcpkgs/lxmenu-data/template +++ b/srcpkgs/lxmenu-data/template @@ -2,6 +2,7 @@ pkgname=lxmenu-data version=0.1.2 revision=2 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool" short_desc="LXDE freedesktop menu required files" @@ -13,10 +14,3 @@ checksum=34c285a0430404e815263a4bb33a79eb47b168c56469be0f7ffb19730a57a045 long_desc=" This package provides files required to build freedesktop.org menu spec-compliant desktop menus for LXDE." - -lxmenu-data_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lxpanel/template b/srcpkgs/lxpanel/template index ae080cc456..684e0f0a9c 100644 --- a/srcpkgs/lxpanel/template +++ b/srcpkgs/lxpanel/template @@ -6,6 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="alsa-lib-devel gtk+-devel menu-cache-devel libwnck2-devel wireless_tools-devel lxmenu-data>=0.1.2" +depends="lxmenu-data>=0.1.2" short_desc="LXDE Standard panel" homepage="http://lxde.org/" license="GPL2" @@ -26,10 +27,3 @@ lxpanel-devel_package() { vmove usr/lib/pkgconfig } } - -lxpanel_package() { - depends="lxmenu-data>=0.1.2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lxpolkit/template b/srcpkgs/lxpolkit/template index 1fb024f104..3c4a1259ee 100644 --- a/srcpkgs/lxpolkit/template +++ b/srcpkgs/lxpolkit/template @@ -13,9 +13,3 @@ distfiles="${SOURCEFORGE_SITE}/lxde/$pkgname-$version.tar.gz" checksum=511affca8f55adc67031fb3627b9889064c685e4b983737d8deecdf4f94f008b long_desc=" LXPolkit is a simple PolicyKit authentication agent." - -lxpolkit_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lxrandr/template b/srcpkgs/lxrandr/template index 8f66a0e850..5b00698a45 100644 --- a/srcpkgs/lxrandr/template +++ b/srcpkgs/lxrandr/template @@ -5,6 +5,7 @@ build_style=gnu-configure revision=2 hostmakedepends="pkg-config intltool" makedepends="gtk+-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="LXDE Monitor configuration tool" homepage="http://lxde.org/" license="GPL2" @@ -22,10 +23,3 @@ long_desc=" is very suitable for laptop users who frequently uses projectors or external monitor and just want to get their work done without reading a lot of geek-centered manuals or command line tutorials." - -lxrandr_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lxsession/template b/srcpkgs/lxsession/template index 45d44c0305..bf3680d04d 100644 --- a/srcpkgs/lxsession/template +++ b/srcpkgs/lxsession/template @@ -5,6 +5,7 @@ revision=4 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="dbus-devel gtk+-devel upower hicolor-icon-theme" +depends="upower hicolor-icon-theme" short_desc="LXDE X11 Session Manager" homepage="http://lxde.org/" license="GPL2" @@ -25,10 +26,3 @@ long_desc=" LXSession has also a built-in lightweight Xsettings daemon, which can configure GTK+ themes, keyboard, and mouse for you on session startup." - -lxsession_package() { - depends="upower hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/lxtask/template b/srcpkgs/lxtask/template index a4431eba13..d8158aa07a 100644 --- a/srcpkgs/lxtask/template +++ b/srcpkgs/lxtask/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="LXDE Task Manager" maintainer="Juan RP " license="GPL-2" @@ -15,10 +16,3 @@ long_desc=" LXTask - lightweight and desktop-independent task manager derived from xfce4-taskmanager with all dependencies on xfce removed, new features, and some improvement of the user interface." - -lxtask_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lxterminal/template b/srcpkgs/lxterminal/template index 0bf13e3a38..9a1d32114c 100644 --- a/srcpkgs/lxterminal/template +++ b/srcpkgs/lxterminal/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel vte-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="LXDE Terminal emulator" homepage="http://lxde.org/" license="GPL2" @@ -18,10 +19,3 @@ long_desc=" In order to reduce memory usage and increase the performance, all instances of the terminal are sharing a single process." - -lxterminal_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lzip/template b/srcpkgs/lzip/template index 944b93bc7a..3323a9b75d 100644 --- a/srcpkgs/lzip/template +++ b/srcpkgs/lzip/template @@ -13,9 +13,3 @@ checksum=7ff5cc521560edb2a0a6cdf258cf3afdaeb1dbcc354d96d011d0dd7ec584cbe7 do_configure() { ./configure --prefix=/usr CXX="$CXX" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" } - -lzip_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/lzo/template b/srcpkgs/lzo/template index dd06d67b1b..6d51f747ef 100644 --- a/srcpkgs/lzo/template +++ b/srcpkgs/lzo/template @@ -27,9 +27,3 @@ lzo-devel_package() { vmove "usr/lib/*.a" } } - -lzo_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/m4/template b/srcpkgs/m4/template index 38559ccbc5..dd99d676b4 100644 --- a/srcpkgs/m4/template +++ b/srcpkgs/m4/template @@ -21,9 +21,3 @@ long_desc=" pre_configure() { sed -i -e '/gets is a/d' lib/stdio.in.h } - -m4_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mailx/template b/srcpkgs/mailx/template index 0034073cff..ccdfbc9779 100644 --- a/srcpkgs/mailx/template +++ b/srcpkgs/mailx/template @@ -5,6 +5,9 @@ revision=4 patch_args="-Np1" wrksrc="mailx-${version}" makedepends="openssl-devel mit-krb5-devel" +conf_files="/etc/mail.rc" +provides="mail-${version}" +replaces="mail>=0" short_desc="Feature-rich BSD mail(1)" homepage="http://heirloom.sourceforge.net/mailx.html" license="BSD" @@ -34,12 +37,3 @@ do_install() { ln -s mailx ${DESTDIR}/usr/bin/mail ln -s mailx.1 ${DESTDIR}/usr/share/man/man1/mail.1 } - -mailx_package() { - conf_files="/etc/mail.rc" - provides="mail-${version}" - replaces="mail>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/make/template b/srcpkgs/make/template index 8e4d8ac440..df9bbc7137 100644 --- a/srcpkgs/make/template +++ b/srcpkgs/make/template @@ -2,6 +2,7 @@ pkgname=make version=4.0 revision=1 +conflicts="chroot-make>=0" build_style=gnu-configure configure_args="--without-guile" short_desc="The GNU make system" @@ -10,10 +11,3 @@ homepage="http://www.gnu.org/software/make" license="GPL-3" distfiles="http://ftp.gnu.org/pub/gnu/make/$pkgname-$version.tar.bz2" checksum=e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb - -make_package() { - conflicts="chroot-make>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/makedepend/template b/srcpkgs/makedepend/template index 70bb862780..97b7082ac7 100644 --- a/srcpkgs/makedepend/template +++ b/srcpkgs/makedepend/template @@ -19,9 +19,3 @@ long_desc=" include, directives would be used in a compilation. Any include, directives can reference files having other include directives, and parsing will occur in these files as well." - -makedepend_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/makeself/template b/srcpkgs/makeself/template index d8302faf37..28f20939af 100644 --- a/srcpkgs/makeself/template +++ b/srcpkgs/makeself/template @@ -2,6 +2,8 @@ pkgname=makeself version=2.1.5 revision=2 +noarch="yes" +depends="tar gzip bzip2" short_desc="Make self-extractable archives on Unix" homepage="http://www.megastep.org/makeself/" license="GPL-2+" @@ -32,11 +34,3 @@ do_install() { done install -m644 *.1 ${DESTDIR}/usr/share/man/man1 } - -makeself_package() { - depends="tar gzip bzip2" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/man-db/template b/srcpkgs/man-db/template index 8a2b04edbe..3bf97a66e0 100644 --- a/srcpkgs/man-db/template +++ b/srcpkgs/man-db/template @@ -9,6 +9,8 @@ configure_args="--with-db=gdbm --with-pager=less --with-gzip=/usr/bin/gzip --without-included-regex --enable-automatic-create" hostmakedepends="pkg-config groff" makedepends="gdbm-devel zlib-devel libpipeline-devel" +depends="bzip2 gzip less groff grep coreutils" +conf_files="/etc/man_db.conf" short_desc="The on-line manual database" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -20,11 +22,3 @@ post_install() { # Install the cron daily job. vinstall ${FILESDIR}/man-db.cron-daily 744 etc/cron.daily man-db } - -man-db_package() { - conf_files="/etc/man_db.conf" - depends="bzip2 gzip less groff grep coreutils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/man-pages-posix/template b/srcpkgs/man-pages-posix/template index 3067d99290..0b97a666f4 100644 --- a/srcpkgs/man-pages-posix/template +++ b/srcpkgs/man-pages-posix/template @@ -5,6 +5,7 @@ _revver=a wrksrc="${pkgname}-${_distver}-${_revver}" version=${_distver}${_revver} revision=1 +noarch="yes" short_desc="Manual pages about POSIX systems" maintainer="Juan RP " license="POSIX-COPYRIGHT" @@ -16,10 +17,3 @@ do_install() { make all prefix=${DESTDIR}/usr vinstall POSIX-COPYRIGHT 644 usr/share/licenses/${pkgname} } - -man-pages-posix_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/man-pages/template b/srcpkgs/man-pages/template index acb8ddba38..548bea3107 100644 --- a/srcpkgs/man-pages/template +++ b/srcpkgs/man-pages/template @@ -2,6 +2,7 @@ pkgname=man-pages version=3.55 revision=1 +noarch="yes" short_desc="Linux Documentation Project (LDP) manual pages" maintainer="Juan RP " license="GPL-2" @@ -34,10 +35,3 @@ do_install() { # From attr-devel. rm -f man2/*xattr.2 } - -man-pages_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mariadb/template b/srcpkgs/mariadb/template index 4574cfac03..fbc4edaa54 100644 --- a/srcpkgs/mariadb/template +++ b/srcpkgs/mariadb/template @@ -20,6 +20,13 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DSTACK_DIRECTION=1" hostmakedepends="perl cmake bison ncurses-devel" makedepends="zlib-devel ncurses-devel openssl-devel readline-devel" +depends="shadow mariadb-client" +provides="mysql-${version}_${revision}" +replaces="mysql>=0" +conf_files="/etc/mysql/my.cnf" +systemd_services="mysqld.service on" +system_accounts="mysql" +mysqld_homedir="/var/lib/mysql" short_desc="Fast SQL database server, drop-in replacement for MySQL" maintainer="Juan RP " homepage="http://mariadb.org/" @@ -115,16 +122,3 @@ mariadb-client_package() { done } } - -mariadb_package() { - depends="shadow mariadb-client" - provides="mysql-${version}_${revision}" - replaces="mysql>=0" - conf_files="/etc/mysql/my.cnf" - systemd_services="mysqld.service on" - system_accounts="mysql" - mysqld_homedir="/var/lib/mysql" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mash/template b/srcpkgs/mash/template index c14e3967bc..68969a9257 100644 --- a/srcpkgs/mash/template +++ b/srcpkgs/mash/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--enable-introspection --disable-static" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="clutter-devel>=1.16" +depends="clutter>=1.16" short_desc="A small library for using 3D models within a Clutter scene" maintainer="Juan RP " homepage="http://www.clutter-project.org" @@ -29,10 +30,3 @@ mash-devel_package() { vmove "usr/lib/*.so" } } - -mash_package() { - depends="clutter>=1.16" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mawk/template b/srcpkgs/mawk/template index 69e8c67fe4..edc00e35de 100644 --- a/srcpkgs/mawk/template +++ b/srcpkgs/mawk/template @@ -11,9 +11,3 @@ homepage="http://invisible-island.net/mawk/mawk.html" distfiles="http://invisible-island.net/datafiles/release/${pkgname}.tar.gz" checksum=a44e2294a4ea7ac33a212cc23a681631b3af49bf3be533c6d33da9ed27d79f7d wrksrc=${pkgname}-${_vers} - -mawk_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mc/template b/srcpkgs/mc/template index 16b8546957..1b8ffb8139 100644 --- a/srcpkgs/mc/template +++ b/srcpkgs/mc/template @@ -6,6 +6,17 @@ build_style=gnu-configure configure_args="--with-screen=ncurses --without-x" hostmakedepends="pkg-config perl" makedepends="libglib-devel e2fsprogs-devel ncurses-devel libssh2-devel" +conf_files=" + /etc/mc/filehighlight.ini + /etc/mc/mc.ext + /etc/mc/mcedit.menu + /etc/mc/sfs.ini + /etc/mc/mc.keymap.default + /etc/mc/mc.menu + /etc/mc/edit.indent.rc + /etc/mc/mc.keymap + /etc/mc/mc.menu.sr + /etc/mc/mc.keymap.emac" short_desc="User-friendly file manager and visual shell" maintainer="Juan RP " license="GPL-3" @@ -13,20 +24,3 @@ homepage="http://www.ibiblio.org/mc/" #distfiles="http://www.midnight-commander.org/downloads/mc-${version}.tar.xz" distfiles="http://fossies.org/linux/misc/mc-${version}.tar.gz" checksum=a53d8ecebba9112ffbd2bf502f0f8c358bafcd0538083a4922fe4573c3bccc1c - -mc_package() { - conf_files=" - /etc/mc/filehighlight.ini - /etc/mc/mc.ext - /etc/mc/mcedit.menu - /etc/mc/sfs.ini - /etc/mc/mc.keymap.default - /etc/mc/mc.menu - /etc/mc/edit.indent.rc - /etc/mc/mc.keymap - /etc/mc/mc.menu.sr - /etc/mc/mc.keymap.emac" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mcpp/template b/srcpkgs/mcpp/template index 804adb8e8d..2f6807cfd2 100644 --- a/srcpkgs/mcpp/template +++ b/srcpkgs/mcpp/template @@ -32,7 +32,7 @@ long_desc=" * It is probably number one C/C++ preprocessor now available in the world." libmcpp_package() { - short_desc="${short_desc} - Runtime library" + short_desc+=" - Runtime library" pkg_install() { vmove "usr/lib/*.so*" } @@ -40,15 +40,9 @@ libmcpp_package() { mcpp-devel_package() { depends="mcpp>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -mcpp_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mcwm-git/template b/srcpkgs/mcwm-git/template index c710951ef4..ad241865ba 100644 --- a/srcpkgs/mcwm-git/template +++ b/srcpkgs/mcwm-git/template @@ -4,12 +4,13 @@ version=20130828 revision=1 build_style=gnu-makefile makedepends="libxcb-devel xcb-proto xcb-util-devel xcb-util-keysyms-devel xcb-util-wm-devel" +provides="mcwm-${version}" +replaces="mcwm>=0" short_desc="A minimalist stacking X window manager based on XCB" maintainer="Ypnose " license="ISC" homepage="http://hack.org/mc/projects/mcwm/" - do_fetch() { local url="git://hack.org/mcwm" msg_normal "Fetching source from $url ...\n" @@ -31,11 +32,3 @@ do_install() { vinstall scripts/mcmenu 755 usr/bin vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -mcwm-git_package() { - provides="mcwm-${version}" - replaces="mcwm>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mcwm/template b/srcpkgs/mcwm/template index 954d774565..9e22e483c6 100644 --- a/srcpkgs/mcwm/template +++ b/srcpkgs/mcwm/template @@ -29,9 +29,3 @@ do_install() { vinstall scripts/mcmenu 755 usr/bin vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -mcwm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mda-lv2/template b/srcpkgs/mda-lv2/template index 55e85564bd..7bcdc6765e 100644 --- a/srcpkgs/mda-lv2/template +++ b/srcpkgs/mda-lv2/template @@ -6,6 +6,7 @@ build_style=waf homepage="http://drobilla.net/software/mda-lv2/" distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" makedepends="pkg-config lv2 python" +depends="lv2 python" short_desc="LV2 port of the MDA plugins by Paul Kellett." maintainer="davehome " license="GPL-3" @@ -19,10 +20,3 @@ long_desc=" toggle ports (> 0.0 is on, rather than 0.5). All the plugins have been tested, and thanks to several bug fixes this collection should be more reliable than the original." - -mda-lv2_package() { - depends="lv2 python" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mdbtools/template b/srcpkgs/mdbtools/template index b3718cee5a..3a00e30145 100644 --- a/srcpkgs/mdbtools/template +++ b/srcpkgs/mdbtools/template @@ -36,9 +36,3 @@ libmdb_package() { vmove "usr/lib/*.so.*" } } - -mdbtools_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mdocml/template b/srcpkgs/mdocml/template index 65764879b0..1a2fb4de49 100644 --- a/srcpkgs/mdocml/template +++ b/srcpkgs/mdocml/template @@ -3,6 +3,8 @@ pkgname=mdocml version=1.12.1 revision=2 makedepends="db-devel>=5.3" +conflicts="groff>=0 man-db>=0" +provides="man-${version} roff-${version} apropos-${version} whatis-${version}" short_desc="mdoc macro compiler" maintainer="Juan RP " license="ISC" @@ -40,11 +42,3 @@ do_install() { # Create mandoc -> man symlink. ln -sfr ${DESTDIR}/usr/bin/mandoc ${DESTDIR}/usr/bin/man } - -mdocml_package() { - conflicts="groff>=0 man-db>=0" - provides="man-${version} roff-${version} apropos-${version} whatis-${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/media-player-info/template b/srcpkgs/media-player-info/template index 31fd1ece24..0f10bbe415 100644 --- a/srcpkgs/media-player-info/template +++ b/srcpkgs/media-player-info/template @@ -2,6 +2,7 @@ pkgname=media-player-info version=17 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="systemd-devel" @@ -11,10 +12,3 @@ maintainer="Juan RP " license="BSD" distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.gz" checksum=ceab4699e27b683dec4f985be5667b684e1502728243a1bb711590a58ee31e46 - -media-player-info_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/meld/template b/srcpkgs/meld/template index e5d95cb357..05290d7c60 100644 --- a/srcpkgs/meld/template +++ b/srcpkgs/meld/template @@ -2,11 +2,14 @@ pkgname=meld version=1.8.0 revision=1 +noarch="yes" build_style=gnu-makefile make_build_args="prefix=/usr" make_install_args="prefix=/usr" hostmakedepends="pkg-config intltool gnome-doc-utils" makedepends="pygtk pygtksourceview desktop-file-utils hicolor-icon-theme" +depends="${makedepends}" +pycompile_dirs="usr/lib/meld/meld/" short_desc="Visual diff and merge tool" maintainer="Juan RP " homepage="http://meldmerge.org/" @@ -21,12 +24,3 @@ long_desc=" Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding." - -meld_package() { - noarch="yes" - pycompile_dirs="usr/lib/meld/meld/" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/memcached/template b/srcpkgs/memcached/template index ef564e567b..b5f9e37649 100644 --- a/srcpkgs/memcached/template +++ b/srcpkgs/memcached/template @@ -14,9 +14,3 @@ makedepends="libevent-devel" post_install() { rm -rf ${DESTDIR}/usr/include } - -memcached_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/memtest86+/template b/srcpkgs/memtest86+/template index c5e045afe7..2966653c4a 100644 --- a/srcpkgs/memtest86+/template +++ b/srcpkgs/memtest86+/template @@ -22,6 +22,8 @@ long_desc=" to memtest86 available from various sources." only_for_archs="i686 x86_64" +nostrip=yes +noverifyrdeps=yes do_build() { make ${makejobs} @@ -31,11 +33,3 @@ do_install() { vinstall memtest.bin 755 boot memtest86+ vinstall ${FILESDIR}/20_memtest86+ 755 etc/grub.d } - -memtest86+_package() { - nostrip=yes - noverifyrdeps=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/menu-cache/template b/srcpkgs/menu-cache/template index c9cd1db19d..259081a400 100644 --- a/srcpkgs/menu-cache/template +++ b/srcpkgs/menu-cache/template @@ -32,9 +32,3 @@ menu-cache-devel_package() { vmove usr/lib/pkgconfig } } - -menu-cache_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template index bcda171da6..6f18bf770b 100644 --- a/srcpkgs/menumaker/template +++ b/srcpkgs/menumaker/template @@ -2,20 +2,14 @@ pkgname=menumaker version=0.99.7 revision=1 +noarch=yes build_style=gnu-configure makedepends="python-devel" +depends="python" +pycompile_dirs="/usr/lib/menumaker" short_desc="Menu generation utility" maintainer="Juan RP " license="BSD" homepage="http://menumaker.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=dc319aa063aa8ec017af3f736cc6e4f7578e145289976c109a4cb19df3b3c445 - -menumaker_package() { - noarch=yes - depends="python" - pycompile_dirs="/usr/lib/menumaker" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 3cb60ee8e9..cb39416ac5 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -5,6 +5,7 @@ revision=1 build_style=python-module hostmakedepends="python-devel" makedepends="python-devel" +pycompile_module="mercurial hgext" short_desc="Fast, lightweight source control management system" maintainer="Juan RP " license="GPL-2" @@ -18,10 +19,3 @@ post_install() { install -m644 doc/*.1 ${DESTDIR}/usr/share/man/man1 install -m644 doc/*.5 ${DESTDIR}/usr/share/man/man5 } - -mercurial_package() { - pycompile_module="mercurial hgext" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template index dfa93a9d1f..1245f60986 100644 --- a/srcpkgs/mesa-demos/template +++ b/srcpkgs/mesa-demos/template @@ -25,9 +25,3 @@ glxinfo_package() { vmove usr/bin/glxinfo } } - -mesa-demos_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mg/template b/srcpkgs/mg/template index cd3efaae55..895e5db036 100644 --- a/srcpkgs/mg/template +++ b/srcpkgs/mg/template @@ -25,9 +25,3 @@ do_install() { vinstall mg 755 usr/bin vinstall mg.1 644 usr/share/man/man1 } - -mg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template index 794356890c..b702ccbe5d 100644 --- a/srcpkgs/midori/template +++ b/srcpkgs/midori/template @@ -8,6 +8,10 @@ hostmakedepends="pkg-config intltool librsvg-utils cmake" makedepends="gtk+3-devel libxml2-devel vala-devel libzeitgeist-devel dbus-glib-devel librsvg-devel libnotify-devel libsoup-gnome-devel webkitgtk-devel sqlite-devel libunique-devel libXScrnSaver-devel gcr-devel" +depends="hicolor-icon-theme desktop-file-utils" +conf_files=" + /etc/xdg/midori/search + /etc/xdg/midori/extensions/adblock/config" short_desc="Lightweight web browser using WebKit GTK+" maintainer="Juan RP " homepage="http://twotoasts.de/index.php/midori/" @@ -24,13 +28,3 @@ long_desc=" * Custom context menu actions * User scripts and user styles support * Extensible via Javascript" - -midori_package() { - conf_files=" - /etc/xdg/midori/search - /etc/xdg/midori/extensions/adblock/config" - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mime-types/template b/srcpkgs/mime-types/template index 3dda42cdea..9b98ec7539 100644 --- a/srcpkgs/mime-types/template +++ b/srcpkgs/mime-types/template @@ -2,6 +2,9 @@ pkgname=mime-types version=9 revision=1 +noarch=yes +conf_files="/etc/mime.types" +replaces="mutt<1.5.22" short_desc="Provides a shared /etc/mime.types file" maintainer="Juan RP " license="GPL-2" @@ -12,12 +15,3 @@ checksum=b4638a734f121be30a546ed092aec16bf74e9b88ed7921fba89cf7e2c0462b5e do_install() { vinstall mime.types 644 etc } - -mime-types_package() { - conf_files="/etc/mime.types" - replaces="mutt<1.5.22" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/minecraft/template b/srcpkgs/minecraft/template index f2630b575f..17bf7d995d 100644 --- a/srcpkgs/minecraft/template +++ b/srcpkgs/minecraft/template @@ -2,6 +2,9 @@ pkgname=minecraft version=0.3 revision=2 +nonfree="yes" +noarch="yes" +depends="wmname wget" short_desc="Launcher for the famous Minecraft game" maintainer="pancake " homepage="http://www.minecraft.net/" @@ -16,16 +19,6 @@ over a blocky ocean. I's pretty. Brave players battle terrible things in The Nether, which is more scary than pretty. You can also visit a land of mushrooms if it sounds more like your cup of tea." - do_install() { vinstall ${FILESDIR}/minecraft 755 usr/bin } - -minecraft_package() { - nonfree="yes" - noarch="yes" - depends="wmname wget" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template index 3e6a11a7ab..220e30b11c 100644 --- a/srcpkgs/minetest/template +++ b/srcpkgs/minetest/template @@ -9,20 +9,13 @@ short_desc="An InfiniMiner/Minecraft inspired game" maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.minetest.org" - hostmakedepends="cmake pkg-config" makedepends=" sqlite-devel libcurl-devel lua-devel libjpeg-turbo-devel libpng-devel LuaJIT-devel freetype-devel MesaLib-devel libopenal-devel libvorbis-devel irrlicht-devel hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils" do_fetch() { git clone -b${version} git://github.com/minetest/minetest ${pkgname}-${version} } - -minetest_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mingw-w64-binutils/template b/srcpkgs/mingw-w64-binutils/template index 4e5819bdfe..48ffca74cc 100644 --- a/srcpkgs/mingw-w64-binutils/template +++ b/srcpkgs/mingw-w64-binutils/template @@ -73,9 +73,3 @@ do_install() { # The mingw-w64 faq advises to create a symlink here cd ${DESTDIR}/${_mingwprefix} && ln -sf ${_mingwtriplet} mingw } - -mingw-w64-binutils_package() { - pkg_install() { - vmove opt - } -} diff --git a/srcpkgs/mingw-w64-crt/template b/srcpkgs/mingw-w64-crt/template index ce33b65a2b..54b4daa442 100644 --- a/srcpkgs/mingw-w64-crt/template +++ b/srcpkgs/mingw-w64-crt/template @@ -62,9 +62,3 @@ do_install() { export PATH=$SAVEDPATH } - -mingw-w64-crt_package() { - pkg_install() { - vmove opt - } -} diff --git a/srcpkgs/mingw-w64-gcc/template b/srcpkgs/mingw-w64-gcc/template index 7e1c9f1c26..bc73cec3c3 100644 --- a/srcpkgs/mingw-w64-gcc/template +++ b/srcpkgs/mingw-w64-gcc/template @@ -70,9 +70,3 @@ do_install() { # Remove useless manpages rm -rf ${DESTDIR}/${_mingwprefix}/share } - -mingw-w64-gcc_package() { - pkg_install() { - vmove opt - } -} diff --git a/srcpkgs/mingw-w64-headers/template b/srcpkgs/mingw-w64-headers/template index f0e7d9cabf..5d855459e6 100644 --- a/srcpkgs/mingw-w64-headers/template +++ b/srcpkgs/mingw-w64-headers/template @@ -30,10 +30,3 @@ pre_install() { vmkdir usr/${_mingwtriplet}/usr/include ln -sfr ${DESTDIR}/usr/${_mingwtriplet}/usr/include ${DESTDIR}/usr/${_mingwtriplet}/include } - -mingw-w64-headers_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mingw-w64-libgcc/template b/srcpkgs/mingw-w64-libgcc/template index 1b166156a1..0614ac0cfd 100644 --- a/srcpkgs/mingw-w64-libgcc/template +++ b/srcpkgs/mingw-w64-libgcc/template @@ -87,9 +87,3 @@ do_install() { # Remove useless manpages rm -rf ${DESTDIR}/${_mingwprefix}/share } - -mingw-w64-libgcc_package() { - pkg_install() { - vmove opt - } -} diff --git a/srcpkgs/minicom/template b/srcpkgs/minicom/template index 51b8780890..79999ce66c 100644 --- a/srcpkgs/minicom/template +++ b/srcpkgs/minicom/template @@ -13,9 +13,3 @@ checksum=a6e7bf533c3796f3a67a7d109f328d46497c687ed13885bd1be4ce0548fc4f56 long_desc=" Minicom is a menu driven communications program. It emulates ANSI and VT102 terminals. It has a dialing directory and auto zmodem download." - -minicom_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/minitube/template b/srcpkgs/minitube/template index 2fd818e29a..a53a7f3077 100644 --- a/srcpkgs/minitube/template +++ b/srcpkgs/minitube/template @@ -4,6 +4,7 @@ version=2.1.3 revision=1 wrksrc=$pkgname makedepends="qt-devel phonon-devel desktop-file-utils hicolor-icon-theme phonon-backend-gstreamer" +depends="phonon-backend desktop-file-utils hicolor-icon-theme" short_desc="A native YouTube client in QT. Watch YouTube videos without Flash Player" maintainer="Juan RP " license="GPL-2" @@ -18,10 +19,3 @@ do_build() { do_install() { make INSTALL_ROOT=${DESTDIR} install } - -minitube_package() { - depends="phonon-backend desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/miniupnpc/template b/srcpkgs/miniupnpc/template index 4e581d83b3..9ece95a22e 100644 --- a/srcpkgs/miniupnpc/template +++ b/srcpkgs/miniupnpc/template @@ -37,9 +37,3 @@ miniupnpc-devel_package() { vmove "usr/lib/*.so" } } - -miniupnpc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/minizip/template b/srcpkgs/minizip/template index 77d790a587..ec8a9da9eb 100644 --- a/srcpkgs/minizip/template +++ b/srcpkgs/minizip/template @@ -17,14 +17,8 @@ pre_configure() { autoreconf -i } -minizip_package() { - pkg_install() { - vmove all - } -} - minizip-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include diff --git a/srcpkgs/mit-krb5/template b/srcpkgs/mit-krb5/template index 8ca539c99a..e423eb2552 100644 --- a/srcpkgs/mit-krb5/template +++ b/srcpkgs/mit-krb5/template @@ -18,6 +18,8 @@ configure_args="--disable-rpath --with-system-et --without-system-verto hostmakedepends="perl flex" makedepends="db-devel>=5.3 e2fsprogs-devel openssl-devel" +depends="mit-krb5-client>=${version}_${revision}" +conflicts="heimdal>=0" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" e2fsprogs-devel" @@ -69,11 +71,3 @@ mit-krb5-libs_package() { vmove "usr/lib/*.so.*" } } - -mit-krb5_package() { - depends="mit-krb5-client>=${version}_${revision}" - conflicts="heimdal>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mkfontdir/template b/srcpkgs/mkfontdir/template index 21a98fb3fe..2f62f02b11 100644 --- a/srcpkgs/mkfontdir/template +++ b/srcpkgs/mkfontdir/template @@ -2,8 +2,10 @@ pkgname=mkfontdir version=1.0.7 revision=1 +noarch="yes" build_style=gnu-configure makedepends="mkfontscale" +depends="${makedepends}" short_desc="X11 Font Index Generator" maintainer="Juan RP " license="MIT" @@ -14,11 +16,3 @@ long_desc=" The mkfontdir tool uses mkfontscale to create an index of X font files (such as PCF, SNF, or BDF) in a directory. The X server and font server use the generated "fonts.dir" file to find font files." - -mkfontdir_package() { - depends="${makedepends}" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mkfontscale/template b/srcpkgs/mkfontscale/template index 221f724f5d..4156d5ff8b 100644 --- a/srcpkgs/mkfontscale/template +++ b/srcpkgs/mkfontscale/template @@ -15,9 +15,3 @@ checksum=244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731 long_desc=" This package contains the mkfontscale, a program to generate legacy X11 font indices for scalable fonts." - -mkfontscale_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mksh/template b/srcpkgs/mksh/template index 779b0a190e..2906672997 100644 --- a/srcpkgs/mksh/template +++ b/srcpkgs/mksh/template @@ -2,13 +2,14 @@ pkgname=mksh version=R48b revision=2 +wrksrc=mksh +register_shell="/bin/mksh" short_desc="The MirBSD Korn Shell" maintainer="pancake " homepage="https://www.mirbsd.org/mksh.htm" license="MirOS" distfiles="https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$version.tgz" checksum="e67686187ba6dfbf99b7f6b5f841dfb5cd9f980504f8b631d7d3bfd98d345792" -wrksrc=mksh do_build() { sh ./Build.sh @@ -20,10 +21,3 @@ do_install() { vinstall lksh.1 644 usr/share/man/man1 vinstall ${FILESDIR}/TaC-mksh.txt 644 usr/share/licenses/$pkgname } - -mksh_package() { - register_shell="/bin/mksh" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mobile-broadband-provider-info/template b/srcpkgs/mobile-broadband-provider-info/template index 10b9cd28da..78c4728b74 100644 --- a/srcpkgs/mobile-broadband-provider-info/template +++ b/srcpkgs/mobile-broadband-provider-info/template @@ -2,6 +2,7 @@ pkgname=mobile-broadband-provider-info version=20120614 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Database of mobile broadband service providers" maintainer="Juan RP " @@ -14,10 +15,3 @@ long_desc=" broadband providers in different countries. Its functioning through Network Manager makes it easy for users to choose their mobile broadband service provider." - -mobile-broadband-provider-info_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mod_wsgi/template b/srcpkgs/mod_wsgi/template index 0a420ab4a7..e7aef6a741 100644 --- a/srcpkgs/mod_wsgi/template +++ b/srcpkgs/mod_wsgi/template @@ -16,9 +16,3 @@ long_desc=" module would be suitable for use in hosting high performance production web sites, as well as your average self managed personal sites running on web hosting services." - -mod_wsgi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template index 349ed90132..7cf5025db6 100644 --- a/srcpkgs/mongoose/template +++ b/srcpkgs/mongoose/template @@ -3,6 +3,7 @@ pkgname=mongoose version=3.7 revision=2 wrksrc=$pkgname +makedepends="openssl-devel" short_desc="An Easy to use Web server" maintainer="Juan RP " license="MIT" @@ -13,8 +14,6 @@ long_desc=" Mongoose is easy to use web server. It also can be used as embedded web server library to provide web interface to applications." -makedepends="openssl-devel" - do_build() { COPT="-DNO_SSL_DL -lcrypto -lssl" make linux } @@ -37,9 +36,3 @@ libmongoose_package() { vmove usr/lib } } - -mongoose_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mono/template b/srcpkgs/mono/template index 8eb7ec3674..a2c3fb07ff 100644 --- a/srcpkgs/mono/template +++ b/srcpkgs/mono/template @@ -2,21 +2,15 @@ pkgname=mono version=3.2.3 revision=1 +patch_args="-Np1" build_style=gnu-configure +# XXX: figure out how to split this up into subpkgs. hostmakedepends="libtool perl" makedepends="zlib-devel libX11-devel libgdiplus-devel" -patch_args="-Np1" +depends="libgdiplus>=0" short_desc="Free implementation of the .NET platform including runtime and compiler" maintainer="pancake " homepage="http://www.go-mono.org" license="GPL-2, LGPL-2, MPL, MITX11" distfiles="http://download.mono-project.com/sources/mono/$pkgname-$version.tar.bz2" checksum=b8c2f97d6a5232dbf5a8180e5c38d4722b81af748893649d7d9e82c5cf8ef41a - -# XXX: figure out how to split this up into subpkgs. -mono_package() { - depends="libgdiplus>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/monsterwm-git/template b/srcpkgs/monsterwm-git/template index 06b0b8f851..1d6a17c869 100644 --- a/srcpkgs/monsterwm-git/template +++ b/srcpkgs/monsterwm-git/template @@ -23,9 +23,3 @@ pre_build() { post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -monsterwm-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mosh/template b/srcpkgs/mosh/template index a276579373..fae7e21af7 100644 --- a/srcpkgs/mosh/template +++ b/srcpkgs/mosh/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="ncurses-devel protobuf-devel>=2.5.0 libutempter-devel openssl-devel perl-IO-Tty" +depends="perl-IO-Tty" short_desc="MObile SHell" maintainer="Juan RP " license="GPL-3" @@ -17,10 +18,3 @@ long_desc=" Mosh is a replacement for SSH. It's more robust and responsive, especially over Wi-Fi, cellular, and long-distance links." - -mosh_package() { - depends="perl-IO-Tty" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template index 18832b74f6..f54bd4a265 100644 --- a/srcpkgs/mousepad/template +++ b/srcpkgs/mousepad/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure makedepends="pkg-config intltool gtk+-devel libxfce4util-devel libxfcegui4-devel gtksourceview2-devel dbus-glib-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Simple text editor for Xfce based on Leafpad" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/apps/${pkgname}/0.3/${pkgname}-${version}.tar.bz2" checksum=10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d - -mousepad_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mousetweaks/template b/srcpkgs/mousetweaks/template index eabdfc3ca7..f2b0a29cf3 100644 --- a/srcpkgs/mousetweaks/template +++ b/srcpkgs/mousetweaks/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gsettings-desktop-schemas-devel>=3.10 gtk+3-devel>=3.10 libXtst-devel" +depends="gsettings-desktop-schemas>=3.10 desktop-file-utils" short_desc="Mouse accessibility enhancements for the GNOME desktop" maintainer="Juan RP " homepage="http://www.gnome.org" license="FDL, GPL-3" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=12fa50eca2e442057a1b816b4aa78d0b8a17f854cf01f4d339d82ff0172b57dd - -mousetweaks_package() { - depends="gsettings-desktop-schemas>=3.10 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mozjs17/template b/srcpkgs/mozjs17/template index 1b16c669af..6b1cdc781a 100644 --- a/srcpkgs/mozjs17/template +++ b/srcpkgs/mozjs17/template @@ -30,9 +30,3 @@ mozjs17-devel_package() { vmove usr/lib/pkgconfig } } - -mozjs17_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template index 8babd6a5e5..3d5e1fec7a 100644 --- a/srcpkgs/mpc/template +++ b/srcpkgs/mpc/template @@ -15,9 +15,3 @@ checksum=70cfa4f734a275a3c76df481ec5222872362ed8f58a4175459cae65d66acaf24 post_install() { vinstall doc/mpc-completion.bash 644 usr/share/bash-completion/completions mpc } - -mpc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index 49df9e3bba..d70563ece0 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -14,6 +14,11 @@ makedepends=" yajl-devel>=2.0.4 libogg-devel libflac-devel libsoup-devel bzip2-devel libmikmod-devel libsndfile-devel alsa-lib-devel mpg123-devel libsamplerate-devel libcdio-devel systemd-devel zziplib-devel libmpdclient-devel" +conf_files="/etc/mpd.conf" +system_accounts="mpd" +systemd_services="mpd.service on" +mpd_homedir="/var/lib/mpd" +make_dirs="/var/lib/mpd/playlists 0755 mpd mpd" short_desc="Flexible, powerful, server-side application for playing music" maintainer="Juan RP " license="GPL-3" @@ -79,14 +84,3 @@ if [ "$build_option_wavpack" ]; then else configure_args+=" --disable-wavpack" fi - -mpd_package() { - conf_files="/etc/mpd.conf" - system_accounts="mpd" - systemd_services="mpd.service on" - mpd_homedir="/var/lib/mpd" - make_dirs="/var/lib/mpd/playlists 0755 mpd mpd" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mpfr/template b/srcpkgs/mpfr/template index fb0593391f..7164e9c8f3 100644 --- a/srcpkgs/mpfr/template +++ b/srcpkgs/mpfr/template @@ -22,9 +22,3 @@ mpfr-devel_package() { vmove "usr/lib/*.so" } } - -mpfr_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mpg123/template b/srcpkgs/mpg123/template index 2d7afc8ff3..1443930522 100644 --- a/srcpkgs/mpg123/template +++ b/srcpkgs/mpg123/template @@ -7,6 +7,7 @@ configure_args="--with-module-suffix=.so --with-optimization=4 --with-default-audio=alsa --enable-ipv6=yes --enable-network=yes" hostmakedepends="pkg-config" makedepends="alsa-lib-devel libltdl-devel jack-devel pulseaudio-devel SDL-devel" +depends="mpg123-alsa>=${version}" short_desc="Fast console MPEG audio decoder/player" maintainer="davehome " homepage="http://www.mpg123.de/" @@ -72,10 +73,3 @@ mpg123-devel_package() { vmove usr/lib/pkgconfig } } - -mpg123_package() { - depends="mpg123-alsa>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mplayer/template b/srcpkgs/mplayer/template index 677ae73f87..d5e74ea048 100644 --- a/srcpkgs/mplayer/template +++ b/srcpkgs/mplayer/template @@ -36,6 +36,9 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libcdio-devel libdvdnav-devel libsysfs-devel libusb-compat-devel libass-devel sqlite-devel librsvg-devel libtheora-devel speex-devel pulseaudio-devel libmodplug-devel libva-devel v4l-utils-devel" +conf_files=" + /etc/mplayer/input.conf + /etc/mplayer/codecs.conf" pre_configure() { if [ "$XBPS_MACHINE" = "i686" ]; then @@ -55,13 +58,3 @@ post_install() { vinstall ${FILESDIR}/mplayer.desktop 644 usr/share/applications vinstall etc/mplayer256x256.png 644 usr/share/pixmaps mplayer.png } - - -mplayer_package() { - conf_files=" - /etc/mplayer/input.conf - /etc/mplayer/codecs.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template index 01f2f804fc..2bcc1aaabf 100644 --- a/srcpkgs/mpv/template +++ b/srcpkgs/mpv/template @@ -19,14 +19,8 @@ makedepends="ffmpeg-devel>=2.1 libass-devel lcms2-devel libXinerama-devel libquv mpg123-devel libXv-devel libxkbcommon-devel libva-devel libvdpau-devel alsa-lib-devel libbluray-devel libcdio-devel libdvdread-devel pulseaudio-devel MesaLib-devel harfbuzz-devel libXScrnSaver-devel jack-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" do_fetch() { git clone -b v${version} git://github.com/mpv-player/mpv.git mpv-${version} } - -mpv_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ms-sys/template b/srcpkgs/ms-sys/template index fc65b683c5..53fbfbd639 100644 --- a/srcpkgs/ms-sys/template +++ b/srcpkgs/ms-sys/template @@ -15,9 +15,3 @@ long_desc=" The program does the same as Microsoft \"fdisk /mbr\" to a hard disk or \"sys d:\" to a floppy or FAT partition except that it does not copy any system files, only the boot record is written." - -ms-sys_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/msmtp/template b/srcpkgs/msmtp/template index 669c742144..82bcc1c5e2 100644 --- a/srcpkgs/msmtp/template +++ b/srcpkgs/msmtp/template @@ -28,12 +28,6 @@ long_desc=" - LMTP support. - Support for multiple accounts." -msmtp_package() { - pkg_install() { - vmove all - } -} - # Package build options build_options="openssl gnutls idn sasl gnome" desc_option_openssl="Enable support for SSL with OpenSSL" diff --git a/srcpkgs/mtd-utils/template b/srcpkgs/mtd-utils/template index c2fb4622e8..3c49b31d1e 100644 --- a/srcpkgs/mtd-utils/template +++ b/srcpkgs/mtd-utils/template @@ -29,9 +29,3 @@ do_install() { make DESTDIR=${DESTDIR} install fi } - -mtd-utils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mtdev/template b/srcpkgs/mtdev/template index 3e7127fd2b..ea4f98b464 100644 --- a/srcpkgs/mtdev/template +++ b/srcpkgs/mtdev/template @@ -29,9 +29,3 @@ mtdev-devel_package() { vmove usr/lib/pkgconfig } } - -mtdev_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mtools/template b/srcpkgs/mtools/template index b3e932538a..c96443ca02 100644 --- a/srcpkgs/mtools/template +++ b/srcpkgs/mtools/template @@ -4,6 +4,7 @@ version=4.0.17 revision=1 build_style=gnu-configure makedepends="acl-devel" +conf_files="/etc/mtools.conf" short_desc="A collection of utilities to access MS-DOS disks" maintainer="Juan RP " license="GPL-2" @@ -20,11 +21,3 @@ long_desc=" post_install() { vinstall mtools.conf 644 etc } - -mtools_package() { - conf_files="/etc/mtools.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/mtpfs/template b/srcpkgs/mtpfs/template index bf74e4d17d..8d573607b7 100644 --- a/srcpkgs/mtpfs/template +++ b/srcpkgs/mtpfs/template @@ -11,9 +11,3 @@ license="GPL-3" homepage="http://www.adebenham.com/mtpfs/" distfiles="http://www.adebenham.com/files/mtp/mtpfs-${version}.tar.gz" checksum=1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d - -mtpfs_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mtr/template b/srcpkgs/mtr/template index a87ccef5d8..dce4647de7 100644 --- a/srcpkgs/mtr/template +++ b/srcpkgs/mtr/template @@ -17,9 +17,3 @@ create_srcdir=yes pre_configure() { ./bootstrap.sh } - -mtr_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/muffin/template b/srcpkgs/muffin/template index 3ac3abed61..df05b9be50 100644 --- a/srcpkgs/muffin/template +++ b/srcpkgs/muffin/template @@ -9,6 +9,7 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection gettext-devel intltool which gnome-doc-utils" makedepends="clutter-devel startup-notification-devel libcanberra-devel cinnamon-desktop-devel libXinerama-devel libSM-devel dconf zenity" +depends="dconf zenity" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -30,11 +31,3 @@ muffin-devel_package() { vmove usr/lib/pkgconfig } } - -muffin_package() { - depends="dconf zenity" - pkg_install() { - vmove all - } -} - diff --git a/srcpkgs/mumble/template b/srcpkgs/mumble/template index 7f95f122d5..8b6a6d1807 100644 --- a/srcpkgs/mumble/template +++ b/srcpkgs/mumble/template @@ -6,6 +6,8 @@ hostmakedepends="pkg-config" makedepends="libcap-devel Ice-devel>=3.5 protobuf-devel>=2.5.0 libXi-devel qt-devel openssl-devel speex-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel avahi-compat-libs-devel MesaLib-devel libstdc++-devel libogg-devel boost-devel" +depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme" +replaces="libmumble<=1.2.3" short_desc="Open source, low-latency, high quality voice chat for gaming" maintainer="davehome " homepage="http://mumble.sourceforge.net/" @@ -57,17 +59,9 @@ do_install() { murmur_package() { depends="mumble>=${version}" - short_desc="${short_desc} - The murmur server (for mumble)" + short_desc+=" - The murmur server (for mumble)" pkg_install() { vmove usr/bin/murmurd vmove "usr/share/man/man1/murmurd*" } } - -mumble_package() { - replaces="libmumble<=1.2.3" - depends="qt-plugin-sqlite desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mumble122/template b/srcpkgs/mumble122/template index 0d04fee3f8..c79e558501 100644 --- a/srcpkgs/mumble122/template +++ b/srcpkgs/mumble122/template @@ -6,6 +6,9 @@ hostmakedepends="pkg-config" makedepends="protobuf-devel>=2.5.0 libXi-devel qt-devel openssl-devel speex-devel jack-devel libsndfile-devel libX11-devel alsa-lib-devel pulseaudio-devel avahi-compat-libs-devel MesaLib-devel libogg-devel boost-devel" +depends="jack qt-plugin-sqlite desktop-file-utils hicolor-icon-theme" +replaces="libmumble<=1.2.3 mumble>=0" +provides="mumble-999" short_desc="Open source, low-latency, high quality voice chat for gaming" maintainer="davehome " license="BSD" @@ -55,12 +58,3 @@ do_install() { cp ${wrksrc}/man/mumble{,11x}.1 ${DESTDIR}/usr/share/man/man1 cp ${wrksrc}/icons/mumble.svg ${DESTDIR}/usr/share/icons/hicolor/scalable/apps } - -mumble122_package() { - replaces="libmumble<=1.2.3 mumble>=0" - provides="mumble-999" - depends="jack qt-plugin-sqlite desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mupdf/template b/srcpkgs/mupdf/template index 4f6aa65412..4a2190a316 100644 --- a/srcpkgs/mupdf/template +++ b/srcpkgs/mupdf/template @@ -5,6 +5,7 @@ revision=1 wrksrc="${pkgname}-${version}-source" hostmakedepends="pkg-config" makedepends="zlib-devel libcurl-devel freetype-devel libjpeg-turbo-devel jbig2dec-devel libXext-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="Lightweight PDF and XPS viewer" maintainer="Juan RP " license="GPL-3" @@ -43,10 +44,3 @@ mupdf-devel_package() { vmove usr/lib } } - -mupdf_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template index d6a26aae7a..0695b6546c 100644 --- a/srcpkgs/mupen64plus/template +++ b/srcpkgs/mupen64plus/template @@ -5,6 +5,7 @@ revision=1 wrksrc="mupen64plus-bundle-src-${version}" hostmakedepends="pkg-config which" makedepends="boost-devel SDL-devel freetype-devel glu-devel libpng-devel libsamplerate-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A Nintendo64 Emulator" maintainer="Juan RP " license="GPL" @@ -21,10 +22,3 @@ do_install() { # Remove devel files, not interested on it. rm -rf ${DESTDIR}/usr/include } - -mupen64plus_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template index 7e7380b2c3..2b23e65898 100644 --- a/srcpkgs/musl-bootstrap/template +++ b/srcpkgs/musl-bootstrap/template @@ -21,9 +21,3 @@ post_install() { vmkdir usr/bin ln -sfr ${DESTDIR}/usr/lib/musl/bin/musl-gcc ${DESTDIR}/usr/bin/musl-gcc } - -musl-bootstrap_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 04d46db9ff..33ca59b405 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -4,6 +4,7 @@ version=0.9.12 revision=1 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" +conflicts="glibc>=0" short_desc="The musl C library" maintainer="Juan RP " license="MIT" @@ -22,10 +23,3 @@ do_install() { make DESTDIR=${DESTDIR} install rm ${DESTDIR}/lib } - -musl_package() { - conflicts="glibc>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mutagen/template b/srcpkgs/mutagen/template index d60d89b511..eb563812cf 100644 --- a/srcpkgs/mutagen/template +++ b/srcpkgs/mutagen/template @@ -2,9 +2,12 @@ pkgname=mutagen version=1.21 revision=1 +noarch="yes" build_style=python-module hostmakedepends="python-devel" makedepends="python-devel" +depends="python" +pycompile_module="mutagen" short_desc="Python multimedia tagging library" maintainer="davehome " homepage="http://code.google.com/p/${pkgname}/" @@ -19,12 +22,3 @@ long_desc=" headers to accurately calculate the bitrate and length of MP3s. ID3 and APEv2 tags can be edited regardless of audio format. It can also manipulate Ogg streams on an individual packet/page level." - -mutagen_package() { - depends="python" - noarch="yes" - pycompile_module="mutagen" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mutt-kz/template b/srcpkgs/mutt-kz/template index 0aec8f1d28..d330c59d1b 100644 --- a/srcpkgs/mutt-kz/template +++ b/srcpkgs/mutt-kz/template @@ -10,7 +10,6 @@ maintainer="pancake " license="GPL-3" homepage="https://github.com/karelzak/mutt-kz/" - do_fetch() { _githead=29d1357c66ef09642fd0fa8660b3f8173639d6c2 git clone git://github.com/karelzak/mutt-kz.git ${pkgname}-${version} @@ -20,9 +19,3 @@ do_fetch() { pre_configure() { autoreconf -fi } - -mutt-kz_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 7b23671ca8..295e6061ef 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -8,6 +8,8 @@ configure_args="--enable-pop --enable-imap --enable-smtp --with-gdbm=${XBPS_CROSS_BASE}/usr mutt_cv_regex_broken=no" hostmakedepends="perl pkg-config libidn-devel" makedepends="ncurses-devel openssl-devel libidn-devel gpgme-devel mime-types" +depends="mime-types" +conf_files="/etc/Muttrc" short_desc="The Mutt Mail Client" maintainer="Jan S. " license="GPL-2" @@ -28,11 +30,3 @@ post_install() { rm ${DESTDIR}/usr/share/man/man1/{flea,muttbug}.1 vinstall contrib/gpg.rc 644 etc Muttrc.gpg.dist } - -mutt_package() { - conf_files="/etc/Muttrc" - depends="mime-types" - pkg_install(){ - vmove all - } -} diff --git a/srcpkgs/mutter-wayland/template b/srcpkgs/mutter-wayland/template index a938247d48..f86abd8773 100644 --- a/srcpkgs/mutter-wayland/template +++ b/srcpkgs/mutter-wayland/template @@ -9,6 +9,7 @@ makedepends="gtk+3-devel>=3.10 startup-notification-devel libcanberra-devel clutter-devel>=1.16.0_3 gsettings-desktop-schemas-devel>=3.10 libSM-devel dbus-glib-devel upower-devel gnome-desktop-devel>=3.10 systemd-devel pam-devel zenity desktop-file-utils" +depends="zenity>=3.8 desktop-file-utils" short_desc="GNOME Lightweight GTK+3 window manager for Wayland" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -33,10 +34,3 @@ mutter-wayland-devel_package() { vmove usr/lib/pkgconfig } } - -mutter-wayland_package() { - depends="zenity>=3.8 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 0bbc5b066d..c26c5827c1 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -10,6 +10,7 @@ makedepends=" clutter-devel>=1.16 gsettings-desktop-schemas-devel>=3.10 upower-devel gnome-desktop-devel>=3.10 zenity>=3.8.0 libICE-devel libSM-devel desktop-file-utils" +depends="zenity>=3.8 desktop-file-utils" short_desc="Lightweight GTK+3 window manager" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -29,10 +30,3 @@ mutter-devel_package() { vmove "usr/lib/*.so" } } - -mutter_package() { - depends="zenity>=3.8 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/mysql/template b/srcpkgs/mysql/template index a8fcd2ad35..2276eb5248 100644 --- a/srcpkgs/mysql/template +++ b/srcpkgs/mysql/template @@ -19,6 +19,11 @@ configure_args="-DSYSCONFDIR=/etc/mysql -DMYSQL_DATADIR=/var/lib/mysql -DSTACK_DIRECTION=1" hostmakedepends="perl cmake bison ncurses-devel" makedepends="zlib-devel ncurses-devel openssl-devel readline-devel" +depends="shadow mysql-client" +conf_files="/etc/mysql/my.cnf" +systemd_services="mysqld.service on" +system_accounts="mysql" +mysqld_homedir="/var/lib/mysql" short_desc="The world's most popular open source database" maintainer="Juan RP " homepage="https://www.mysql.com/products/community/" @@ -116,14 +121,3 @@ mysql-client_package() { done } } - -mysql_package() { - depends="shadow mysql-client" - conf_files="/etc/mysql/my.cnf" - systemd_services="mysqld.service on" - system_accounts="mysql" - mysqld_homedir="/var/lib/mysql" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nano/template b/srcpkgs/nano/template index f0e26ea204..f09bb3d21d 100644 --- a/srcpkgs/nano/template +++ b/srcpkgs/nano/template @@ -16,9 +16,3 @@ 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 9be7482a51..00293cdcf8 100644 --- a/srcpkgs/nasm/template +++ b/srcpkgs/nasm/template @@ -26,9 +26,3 @@ 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 8bad410f90..e4ef6839a4 100644 --- a/srcpkgs/nautilus-dropbox/template +++ b/srcpkgs/nautilus-dropbox/template @@ -4,6 +4,7 @@ version=1.4.0 revision=1 hostmakedepends="pkg-config" makedepends="nautilus-devel pygtk-devel python-docutils" +depends="pygtk" build_style=gnu-configure configure_args="--disable-static" short_desc="dropbox plugin for nautilus" @@ -12,10 +13,3 @@ 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 5e11628800..a979234a6a 100644 --- a/srcpkgs/nautilus-sendto/template +++ b/srcpkgs/nautilus-sendto/template @@ -21,9 +21,3 @@ 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 all - } -} diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index f5b5188ea0..bbb27635b8 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -8,6 +8,7 @@ configure_args="--disable-update-mimedb --disable-debug hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gtk+3-devel libnotify-devel libexif-devel exempi-devel libxml2-devel tracker-devel>=0.16 gnome-desktop-devel>=3.10" +depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" short_desc="The GNOME file manager" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -38,10 +39,3 @@ nautilus-devel_package() { vmove usr/share/gtk-doc } } - -nautilus_package() { - depends="hicolor-icon-theme desktop-file-utils gsettings-desktop-schemas>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ncdu/template b/srcpkgs/ncdu/template index a83c49605c..08da5a7e5b 100644 --- a/srcpkgs/ncdu/template +++ b/srcpkgs/ncdu/template @@ -14,9 +14,3 @@ 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/ncmpcpp/template b/srcpkgs/ncmpcpp/template index f1e50e6805..d8e55312fc 100644 --- a/srcpkgs/ncmpcpp/template +++ b/srcpkgs/ncmpcpp/template @@ -20,9 +20,3 @@ if [ "$CROSS_BUILD" ]; then sed -e 's,-L/usr/lib,,g' -i src/Makefile } fi - -ncmpcpp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template index d37a5b7563..7d2ecb2247 100644 --- a/srcpkgs/ncurses/template +++ b/srcpkgs/ncurses/template @@ -23,6 +23,7 @@ if [ "$CROSS_BUILD" ]; then # needs host tic(1) hostmakedepends="ncurses" fi +depends="ncurses-base>=${version}" do_configure() { mkdir ncurses-build ncursesw-build @@ -93,14 +94,6 @@ do_install() { ${DESTDIR}/usr/bin/ncurses5-config } -ncurses_package() { - depends="ncurses-base>=${version}" - pkg_install() { - vmove usr/bin - vmove usr/share/man/man1 - } -} - ncurses-libs_package() { short_desc+=" -- shared libraries" replaces="ncursesw>=0" diff --git a/srcpkgs/ne/template b/srcpkgs/ne/template index 5b895db393..75f2188917 100644 --- a/srcpkgs/ne/template +++ b/srcpkgs/ne/template @@ -26,9 +26,3 @@ do_build() { do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install } - -ne_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nemo/template b/srcpkgs/nemo/template index 325ed22212..02be48eb0e 100644 --- a/srcpkgs/nemo/template +++ b/srcpkgs/nemo/template @@ -11,6 +11,7 @@ hostmakedepends="automake libtool gnome-common pkg-config gobject-introspection makedepends="libexif-devel gvfs-devel dconf-devel exempi-devel cinnamon-desktop-devel libnotify-devel tracker-devel libxml2-devel gnome-icon-theme cinnamon-translations desktop-file-utils hicolor-icon-theme" +depends="gvfs dconf gnome-icon-theme cinnamon-translations" maintainer="Juan RP " license="GPL-3" homepage="http://cinnamon.linuxmint.com/" @@ -46,10 +47,3 @@ nemo-devel_package() { vmove usr/share/gir-1.0 } } - -nemo_package() { - depends="gvfs dconf gnome-icon-theme cinnamon-translations" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index 637ee7732b..c4fa1a5ee6 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -8,6 +8,7 @@ configure_args="--with-expat --with-ssl=openssl --enable-shared hostmakedepends="pkg-config" makedepends="expat-devel openssl-devel>=1.0.1 mit-krb5-devel libproxy-devel ca-certificates" +depends="ca-certificates" short_desc="HTTP and WebDAV client library, with a C interface" maintainer="Juan RP " homepage="http://www.webdav.org/neon/" @@ -44,10 +45,3 @@ neon-devel_package() { vmove "usr/lib/*.so" } } - -neon_package() { - depends="ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nepomuk-core/template b/srcpkgs/nepomuk-core/template index 3a97bdced2..3628448bd7 100644 --- a/srcpkgs/nepomuk-core/template +++ b/srcpkgs/nepomuk-core/template @@ -25,9 +25,3 @@ nepomuk-core-devel_package() { vmove usr/lib/cmake } } - -nepomuk-core_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nepomuk-widgets/template b/srcpkgs/nepomuk-widgets/template index aafeb4bc94..d9ec42e262 100644 --- a/srcpkgs/nepomuk-widgets/template +++ b/srcpkgs/nepomuk-widgets/template @@ -24,9 +24,3 @@ nepomuk-widgets-devel_package() { vmove usr/lib/cmake } } - -nepomuk-widgets_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/net-snmp/template b/srcpkgs/net-snmp/template index e33d41bdf8..0c7898d42a 100644 --- a/srcpkgs/net-snmp/template +++ b/srcpkgs/net-snmp/template @@ -4,6 +4,7 @@ version=5.7.1 revision=4 makedepends="bzip2-devel openssl-devel libnl-devel pciutils-devel python-devel python-distribute perl>=5.16" +depends="python perl>=5.16" short_desc="Simple Network Management Protocol (SNMP) suite" maintainer="Juan RP " homepage="http://www.net-snmp.org/" @@ -35,7 +36,7 @@ do_install() { } libnet-snmp_package() { - short_desc="${short_desc} - shared libraries" + short_desc+=" - shared libraries" pkg_install() { vmove "usr/lib/*.so*" } @@ -43,17 +44,10 @@ libnet-snmp_package() { net-snmp-devel_package() { depends="libnet-snmp>=$version" - short_desc="${short_desc} - development files" + 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 18649975a1..59ba5c2d11 100644 --- a/srcpkgs/net-tools/template +++ b/srcpkgs/net-tools/template @@ -27,9 +27,3 @@ do_install() { vmove "bin/*" usr/bin vmove "sbin/*" usr/sbin } - -net-tools_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/netbsd-rumpkernel/template b/srcpkgs/netbsd-rumpkernel/template index 69ea2a4d85..a93d500827 100644 --- a/srcpkgs/netbsd-rumpkernel/template +++ b/srcpkgs/netbsd-rumpkernel/template @@ -42,9 +42,3 @@ netbsd-rumpkernel-devel_package() { vmove "usr/lib/*.so" } } - -netbsd-rumpkernel_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/netbsd-wtf/template b/srcpkgs/netbsd-wtf/template index 57b9cdc19c..21b9c7a484 100644 --- a/srcpkgs/netbsd-wtf/template +++ b/srcpkgs/netbsd-wtf/template @@ -2,6 +2,7 @@ pkgname=netbsd-wtf version=20131125 revision=1 +noarch="yes" build_style=gnu-makefile make_build_args="DATADIR=/usr/share" make_install_args="PREFIX=/usr DATADIR=/usr/share" @@ -19,10 +20,3 @@ do_fetch() { msg_normal " Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } - -netbsd-wtf_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/netcat/template b/srcpkgs/netcat/template index b40dfc8a3f..e8ffe791c5 100644 --- a/srcpkgs/netcat/template +++ b/srcpkgs/netcat/template @@ -17,9 +17,3 @@ 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/netctl/template b/srcpkgs/netctl/template index 01478ecc89..30a9f7919b 100644 --- a/srcpkgs/netctl/template +++ b/srcpkgs/netctl/template @@ -4,6 +4,11 @@ version=1.4 revision=1 hostmakedepends="pkg-config" makedepends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd-devel" +depends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd" +noarch="yes" +make_dirs=" + /etc/netctl/interfaces 0750 root root + /etc/netctl/hooks 0750 root root" short_desc="Profile based systemd network management" maintainer="Ypnose " homepage="http://projects.archlinux.org/netctl.git/" @@ -16,14 +21,3 @@ do_install() { vinstall contrib/bash-completion 644 usr/share/bash-completion/completions/netctl vinstall contrib/zsh-completion 644 usr/share/zsh/site-functions/_netctl } - -netctl_package() { - depends="iproute2 openresolv dhcpcd wpa_supplicant dialog systemd" - noarch="yes" - make_dirs=" - /etc/netctl/interfaces 0750 root root - /etc/netctl/hooks 0750 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nethogs/template b/srcpkgs/nethogs/template index f43f3700ce..61ccf27737 100644 --- a/srcpkgs/nethogs/template +++ b/srcpkgs/nethogs/template @@ -20,9 +20,3 @@ do_install() { vinstall nethogs 755 usr/sbin vinstall nethogs.8 644 usr/share/man/man8 } - -nethogs_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/netpgp/template b/srcpkgs/netpgp/template index bfe6a052fa..e7d2e52881 100644 --- a/srcpkgs/netpgp/template +++ b/srcpkgs/netpgp/template @@ -47,9 +47,3 @@ libnetpgp-devel_package() { vmove usr/share/man/man3 } } - -netpgp_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/netsurf/template b/srcpkgs/netsurf/template index daa9e18832..c563df6bae 100644 --- a/srcpkgs/netsurf/template +++ b/srcpkgs/netsurf/template @@ -7,6 +7,7 @@ makedepends="pkg-config perl libjpeg-turbo-devel libmng-devel lcms-devel libwebp-devel libparserutils-devel libwapcaplet-devel libhubbub-devel libcss-devel libnsbmp-devel libnsgif-devel gtk+-devel libglade-devel" +depends="desktop-file-utils shared-mime-info" short_desc="Free, open source web browser written in C." maintainer="davehome " license="GPL-2, MIT" @@ -37,10 +38,3 @@ do_install() { vinstall "${wrksrc}/${pkgname}-${version}/COPYING" \ 0644 "/usr/share/licenses/${pkgname}" } - -netsurf_package() { - depends="desktop-file-utils shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nettle/template b/srcpkgs/nettle/template index 7e305a92c9..76fbfeafb6 100644 --- a/srcpkgs/nettle/template +++ b/srcpkgs/nettle/template @@ -33,9 +33,3 @@ nettle-tools_package() { vmove usr/bin } } - -nettle_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template index 15e6fa4067..e0615ee568 100644 --- a/srcpkgs/network-manager-applet/template +++ b/srcpkgs/network-manager-applet/template @@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool gobject-introspection" makedepends="GConf-devel libgnome-keyring-devel libsecret-devel NetworkManager-devel>=${version} gnome-bluetooth-devel>=3.10 libnotify-devel ModemManager-devel polkit-devel libgudev-devel iso-codes" +depends="iso-codes NetworkManager>=${version} hicolor-icon-theme" short_desc="NetworkManager panel applet for GNOME" maintainer="Juan RP " homepage="http://www.gnome.org/projects/NetworkManager/" @@ -35,10 +36,3 @@ network-manager-applet-devel_package() { vmove usr/share/gir-1.0 } } - -network-manager-applet_package() { - depends="iso-codes NetworkManager>=${version} hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/network-ups-tools/template b/srcpkgs/network-ups-tools/template index e432addedc..dbfe21281e 100644 --- a/srcpkgs/network-ups-tools/template +++ b/srcpkgs/network-ups-tools/template @@ -10,6 +10,15 @@ configure_args=" --with-systemdsystemunitdir=/lib/systemd/system" hostmakedepends="pkg-config" makedepends="avahi-libs-devel openssl-devel libusb-compat-devel systemd-devel neon-devel" +depends="shadow" +system_accounts="nut" +conf_files=" + /etc/ups/ups.conf + /etc/ups/upsd.users + /etc/ups/upsmon.conf + /etc/ups/upsd.conf + /etc/ups/upssched.conf + /etc/ups/nut.conf" short_desc="NUT provides UPS control and monitoring features" maintainer="Ypnose " license="GPL-2" @@ -27,18 +36,3 @@ post_install() { done mv ${DESTDIR}/etc/ups/upsd.users{.sample,} } - -network-ups-tools_package() { - system_accounts="nut" - depends="shadow" - conf_files=" - /etc/ups/ups.conf - /etc/ups/upsd.users - /etc/ups/upsmon.conf - /etc/ups/upsd.conf - /etc/ups/upssched.conf - /etc/ups/nut.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/neverball/template b/srcpkgs/neverball/template index 541bc2740f..7269fcb473 100644 --- a/srcpkgs/neverball/template +++ b/srcpkgs/neverball/template @@ -4,6 +4,7 @@ version=1.5.4 revision=9 makedepends="libpng-devel>=1.6 libjpeg-turbo-devel libvorbis-devel SDL_ttf-devel physfs-devel" +depends="desktop-file-utils" short_desc="Puzzle/action game similar to Super Monkey Ball" maintainer="Juan RP " homepage="http://www.neverball.org" @@ -42,10 +43,3 @@ do_install() { install -d ${DESTDIR}/usr/share/man/man6 install -m644 dist/*.6 ${DESTDIR}/usr/share/man/man6 } - -neverball_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/newlisp/template b/srcpkgs/newlisp/template index b6c88641ff..ee926fe50f 100644 --- a/srcpkgs/newlisp/template +++ b/srcpkgs/newlisp/template @@ -37,9 +37,3 @@ 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/template b/srcpkgs/nfs-utils/template index f14b3fdbc9..7ac464390b 100644 --- a/srcpkgs/nfs-utils/template +++ b/srcpkgs/nfs-utils/template @@ -14,6 +14,11 @@ makedepends="libblkid-devel libmount-devel libtirpc-devel librpcsecgss-devel>=0.19_3 libnfsidmap-devel>=0.25_3 keyutils-devel libevent-devel device-mapper-devel libcap-devel mit-krb5-devel libblkid-devel sqlite-devel rpcbind" +depends="rpcbind" +conf_files="/etc/idmapd.conf" +make_dirs=" + /var/lib/nfs/rpc_pipefs 0755 root root + /var/lib/nfs/sm 0750 root root" do_configure() { configure_args+=" --with-statduser=nobody --enable-gss --enable-nfsv4 @@ -73,14 +78,3 @@ nfs-utils-server_package() { 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 all - } -} diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index e9913bb441..7297224fec 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -2,7 +2,25 @@ pkgname=nginx version=1.4.4 revision=1 -makedepends="pcre-devel>=8.30 openssl-devel" +makedepends="pcre-devel>=8.30 openssl-devel shadow" +depends="shadow" +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" +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" short_desc="A high performance web and reverse proxy server" maintainer="Juan RP " license="Simplified BSD" @@ -58,27 +76,3 @@ 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" - 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 all - } -} diff --git a/srcpkgs/ngircd/template b/srcpkgs/ngircd/template index d3f5f768d9..0474236019 100644 --- a/srcpkgs/ngircd/template +++ b/srcpkgs/ngircd/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--enable-ipv6 --without-ident" hostmakedepends="pkg-config" makedepends="zlib-devel" +conf_files="/etc/ngircd.conf" homepage="http://ngircd.barton.de/" short_desc="Free, portable and lightweight Internet Relay Chat server" maintainer="pancake " @@ -30,10 +31,3 @@ fi post_install() { vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } - -ngircd_package() { - conf_files="/etc/ngircd.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ngrep/template b/srcpkgs/ngrep/template index 1cb81e8d78..c517a72aec 100644 --- a/srcpkgs/ngrep/template +++ b/srcpkgs/ngrep/template @@ -33,9 +33,3 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } - -ngrep_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/nilfs-utils/template b/srcpkgs/nilfs-utils/template index 1848721d09..d386f3e660 100644 --- a/srcpkgs/nilfs-utils/template +++ b/srcpkgs/nilfs-utils/template @@ -8,6 +8,7 @@ configure_args="--sbindir=/usr/bin --enable-libmount make_install_args="sbindir=/usr/bin" hostmakedepends="automake libtool" makedepends="libuuid-devel libmount-devel" +conf_files="/etc/nilfs_cleanerd.conf" short_desc="A log-structured file system for Linux - userspace utils" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -41,10 +42,3 @@ nilfs-utils-devel_package() { vmove "usr/lib/*.so" } } - -nilfs-utils_package() { - conf_files="/etc/nilfs_cleanerd.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nitrogen/template b/srcpkgs/nitrogen/template index b476364d5e..3b7939c507 100644 --- a/srcpkgs/nitrogen/template +++ b/srcpkgs/nitrogen/template @@ -11,12 +11,6 @@ distfiles="http://projects.l3ib.org/${pkgname}/files/${pkgname}-${version}.tar.g checksum=60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2 hostmakedepends="pkg-config intltool" makedepends="gtkmm2-devel libXinerama-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" LDFLAGS+="-lX11" - -nitrogen_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 909714d485..f8193e9461 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -7,6 +7,31 @@ build_style=gnu-configure configure_args="--localstatedir=/nix/var" hostmakedepends="pkg-config flex" makedepends="bzip2-devel openssl-devel sqlite-devel gc-devel curl perl-WWW-Curl perl-DBD-SQLite" +# Default configuration file. +conf_files="/etc/nix/nix.conf" +# Extra run-time dependencies. +depends="curl perl-WWW-Curl perl-DBD-SQLite" +# Create required build users/groups. +system_groups="nixbld" +for f in $(seq 10); do + system_accounts+=" nixbld${f}" + eval export nixbld\${f}_homedir="/var/empty" + eval export nixbld\${f}_groups="nixbld" +done +# Register systemd service by default. +systemd_services="nix-daemon.service on" +# Create required run-time directories. +make_dirs=" + /nix/var/log/nix/drvs 0755 root root + /nix/var/nix/profiles 0755 root root + /nix/var/nix/profiles/per-user 1777 root root + /nix/var/nix/gcroots/per-user 1777 root root + /nix/var/nix/temproots 0755 root root + /nix/var/nix/gcroots 0755 root root + /nix/var/nix/manifests 0755 root root + /nix/var/nix/userpool 0755 root root + /nix/var/nix/db 0755 root root + /nix/store 1775 root nixbld" short_desc="A purely functional package manager" maintainer="Juan RP " license="MIT" @@ -27,34 +52,3 @@ post_install() { # Install our profile.d/nix for multi-user by default. vinstall ${FILESDIR}/nix.sh 644 etc/profile.d } - -nix_package() { - # Default configuration file. - conf_files="/etc/nix/nix.conf" - # Extra run-time dependencies. - depends="curl perl-WWW-Curl perl-DBD-SQLite" - # Create required build users/groups. - system_groups="nixbld" - for f in $(seq 10); do - system_accounts+=" nixbld${f}" - eval export nixbld\${f}_homedir="/var/empty" - eval export nixbld\${f}_groups="nixbld" - done - # Register systemd service by default. - systemd_services="nix-daemon.service on" - # Create required run-time directories. - make_dirs=" - /nix/var/log/nix/drvs 0755 root root - /nix/var/nix/profiles 0755 root root - /nix/var/nix/profiles/per-user 1777 root root - /nix/var/nix/gcroots/per-user 1777 root root - /nix/var/nix/temproots 0755 root root - /nix/var/nix/gcroots 0755 root root - /nix/var/nix/manifests 0755 root root - /nix/var/nix/userpool 0755 root root - /nix/var/nix/db 0755 root root - /nix/store 1775 root nixbld" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nmap/template b/srcpkgs/nmap/template index df6f10bd24..375a14f659 100644 --- a/srcpkgs/nmap/template +++ b/srcpkgs/nmap/template @@ -70,9 +70,3 @@ nmapfe_package() { } fi #!CROSS_BUILD - -nmap_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template index 39ca836fee..f852299084 100644 --- a/srcpkgs/nodejs/template +++ b/srcpkgs/nodejs/template @@ -5,6 +5,7 @@ revision=1 wrksrc=node-v${version} hostmakedepends="which pkg-config python" makedepends="openssl-devel zlib-devel" +depends="python" short_desc="Evented I/O for V8 javascript" maintainer="davehome " license="MIT" @@ -37,10 +38,3 @@ do_install() { make LD="$CXX" DESTDIR="$DESTDIR" install vinstall LICENSE 644 usr/share/licenses/${pkgname} } - -nodejs_package() { - depends="python" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/notification-daemon/template b/srcpkgs/notification-daemon/template index f37adec17f..973bad365d 100644 --- a/srcpkgs/notification-daemon/template +++ b/srcpkgs/notification-daemon/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="libglib-devel gtk+3-devel libcanberra-devel" +depends="desktop-file-utils" +replaces="notification-daemon>=0" short_desc="Shows notification messages on the desktop" maintainer="Juan RP " homepage="http://www.galago-project.org/specs/notification/" @@ -16,11 +18,3 @@ 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 585d09fe38..f1198e4a4e 100644 --- a/srcpkgs/notify-python/template +++ b/srcpkgs/notify-python/template @@ -5,6 +5,8 @@ revision=8 patch_args="-Np1" build_style=gnu-configure makedepends="pkg-config libnotify-devel gtk+-devel dbus-glib-devel pygtk-devel" +depends="pygtk" +pycompile_module="gtk-2.0/pynotify" short_desc="Python bindings for libnotify" homepage="http://www.galago-project.org/" license="LGPL-2.1" @@ -18,11 +20,3 @@ long_desc=" getting in the user's way. $pkgname provides just the Python bindings for libnotify." - -notify-python_package() { - pycompile_module="gtk-2.0/pynotify" - depends="pygtk" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index 00f41692a7..b4f3eaa332 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -39,9 +39,3 @@ nspr-devel_package() { vmove "usr/lib/*.a" } } - -nspr_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nss-mdns/template b/srcpkgs/nss-mdns/template index 075618e25f..69367c0578 100644 --- a/srcpkgs/nss-mdns/template +++ b/srcpkgs/nss-mdns/template @@ -5,16 +5,10 @@ revision=4 build_style=gnu-configure configure_args="--enable-avahi --disable-lynx" makedepends="avahi" +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/template b/srcpkgs/nss/template index 5c64233eee..ef834e0642 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -5,6 +5,7 @@ _distver="3_15_3" revision=1 hostmakedepends="perl" makedepends="zlib-devel nspr-devel>=4.10 sqlite-devel" +depends="nspr>=4.10" short_desc="Mozilla Network Security Services" maintainer="Juan RP " homepage="http://www.mozilla.org/projects/security/pki/nss/" @@ -93,10 +94,3 @@ nss-devel_package() { vmove "usr/lib/*.chk" } } - -nss_package() { - depends="nspr>=4.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template index ad05cdf0c2..d44f5c5482 100644 --- a/srcpkgs/ntfs-3g/template +++ b/srcpkgs/ntfs-3g/template @@ -8,6 +8,8 @@ configure_args="--exec-prefix=/usr --disable-static --with-fuse=external --enable-posix-acls --enable-xattr-mappings" hostmakedepends="pkg-config" makedepends="libuuid-devel fuse-devel" +provides="ntfsprogs-${version}" +replaces="ntfsprogs>=0" short_desc="Stable Read/Write NTFS Driver in userspace" maintainer="Juan RP " homepage="http://www.tuxera.com/community/ntfs-3g-download/" @@ -29,11 +31,3 @@ ntfs-3g-devel_package() { vmove usr/lib/pkgconfig } } - -ntfs-3g_package() { - provides="ntfsprogs-${version}" - replaces="ntfsprogs>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template index 5941be2dda..a3e501165d 100644 --- a/srcpkgs/ntp/template +++ b/srcpkgs/ntp/template @@ -6,6 +6,12 @@ build_style=gnu-configure configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --with-lineeditlibs=readline" hostmakedepends="bison perl-HTML-Parser" makedepends="readline-devel openssl-devel libcap-devel" +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" short_desc="The Network Time Protocol daemon and utilities" license="BSD" maintainer="Juan RP " @@ -40,15 +46,3 @@ ntp-perl_package() { 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 all - } -} diff --git a/srcpkgs/numactl/template b/srcpkgs/numactl/template index 0a40888102..87facd90bc 100644 --- a/srcpkgs/numactl/template +++ b/srcpkgs/numactl/template @@ -35,9 +35,3 @@ libnuma-devel_package() { vmove usr/share/man/man3 } } - -numactl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nvi/template b/srcpkgs/nvi/template index 742a01afc4..e2866dcf94 100644 --- a/srcpkgs/nvi/template +++ b/srcpkgs/nvi/template @@ -24,9 +24,3 @@ post_install() { # remove cat pages. rm -rf ${DESTDIR}/usr/share/man/cat1 } - -nvi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nvidia/template b/srcpkgs/nvidia/template index f19bfe2995..3d662925d5 100644 --- a/srcpkgs/nvidia/template +++ b/srcpkgs/nvidia/template @@ -1,14 +1,20 @@ # Template file for 'nvidia' + +_desc="NVIDIA drivers for linux" + pkgname=nvidia version=331.20 revision=1 -short_desc="NVIDIA drivers for linux" maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" only_for_archs="i686 x86_64" +nonfree=yes create_wrksrc=yes +short_desc="${_desc} - Libraries and Utilities" +depends="xserver-abi-video<15 nvidia-dkms-${version}_${revision} pkg-config" +conflicts="catalyst>=0" if [ "$XBPS_MACHINE" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" @@ -146,7 +152,7 @@ do_install() { } nvidia-dkms_package() { - short_desc+=" - DKMS kernel module" + short_desc="${_desc} - DKMS kernel module" triggers="dkms" dkms_modules="nvidia ${version}" depends="dkms" @@ -159,7 +165,7 @@ nvidia-dkms_package() { } nvidia-opencl_package() { - short_desc+=" - OpenCL implementation" + short_desc="${_desc} - OpenCL implementation" provides="libOpenCL-${version}" replaces="libOpenCL>=0" nonfree=yes @@ -170,13 +176,3 @@ nvidia-opencl_package() { vmove etc/OpenCL } } - -nvidia_package() { - short_desc+=" - Libraries and Utilities" - depends="xserver-abi-video<15 nvidia-dkms-${version}_${revision} pkg-config" - conflicts="catalyst>=0" - nonfree=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/nvidia304/template b/srcpkgs/nvidia304/template index fc1f07df46..58d05d87a1 100644 --- a/srcpkgs/nvidia304/template +++ b/srcpkgs/nvidia304/template @@ -1,14 +1,21 @@ # Template file for 'nvidia304' +_desc="NVIDIA drivers for linux (304.xx series)" + pkgname=nvidia304 version=304.117 revision=1 -short_desc="NVIDIA drivers for linux (304.xx series)" maintainer="Juan RP " license="Propietary NVIDIA license" homepage="http://www.nvidia.com" +nonfree=yes create_wrksrc=yes only_for_archs="i686 x86_64" +short_desc="${_desc} - Libraries and Utilities" +depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision} pkg-config" +provides="nvidia-${version}_${revision}" +replaces="nvidia>=0" +conflicts="catalyst>=0" if [ "${XBPS_MACHINE}" = "i686" ]; then _pkg="NVIDIA-Linux-x86-${version}" @@ -139,7 +146,7 @@ do_install() { } nvidia304-dkms_package() { - short_desc+=" - DKMS kernel module" + short_desc="${_desc} - DKMS kernel module" depends="dkms" triggers="dkms" dkms_modules="nvidia ${version}" @@ -154,7 +161,7 @@ nvidia304-dkms_package() { } nvidia304-opencl_package() { - short_desc+=" - OpenCL implementation" + short_desc="${_desc} - OpenCL implementation" provides="nvidia-opencl-${version}_${revision} libOpenCL-${version}_${revision}" replaces="nvidia-openctl>=0 libOpenCL>=0" nonfree=yes @@ -165,15 +172,3 @@ nvidia304-opencl_package() { vmove etc/OpenCL } } - -nvidia304_package() { - short_desc+=" - Libraries and Utilities" - depends="xserver-abi-video<15 ${pkgname}-dkms-${version}_${revision} pkg-config" - provides="nvidia-${version}_${revision}" - replaces="nvidia>=0" - conflicts="catalyst>=0" - nonfree=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/obconf/template b/srcpkgs/obconf/template index d2f9ef5e56..4b748311e9 100644 --- a/srcpkgs/obconf/template +++ b/srcpkgs/obconf/template @@ -6,16 +6,10 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gtk+-devel libglade-devel libSM-devel imlib2-devel openbox-devel>=3.5.2 startup-notification-devel desktop-file-utils shared-mime-info" +depends="desktop-file-utils shared-mime-info" short_desc="A GTK2 based configuration tool for the Openbox windowmanager" maintainer="Juan RP " license="GPL-2" homepage="http://openbox.org/wiki/ObConf:About" distfiles="http://openbox.org/dist/obconf/obconf-${version}.tar.gz" checksum=71a3e5f4ee246a27421ba85044f09d449f8de22680944ece9c471cd46a9356b9 - -obconf_package() { - depends="desktop-file-utils shared-mime-info" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/obex-data-server/template b/srcpkgs/obex-data-server/template index 1c2f336113..258c1986e9 100644 --- a/srcpkgs/obex-data-server/template +++ b/srcpkgs/obex-data-server/template @@ -6,6 +6,11 @@ build_style=gnu-configure configure_args="--enable-bip=gdk-pixbuf --enable-system-config" makedepends="libglib-devel libusb-compat-devel dbus-glib-devel libbluetooth-devel libopenobex-devel gdk-pixbuf-devel" +conf_files=" + /etc/obex-data-server/capability.xml + /etc/obex-data-server/imaging_capabilities.xml" +replaces="obexd>=0" +conflicts="obexd>=0" short_desc="D-Bus service providing high-level OBEX functionality" maintainer="Juan RP " homepage="http://wiki.muiline.com/obex-data-server" @@ -16,15 +21,3 @@ long_desc=" $pkgname is D-Bus service providing high-level OBEX client and server side functionality (currently supports OPP, FTP, BIP profiles, Bluetooth, USB and TTY transports)." - -obex-data-server_package() { - conf_files=" - /etc/obex-data-server/capability.xml - /etc/obex-data-server/imaging_capabilities.xml" - replaces="obexd>=0" - conflicts="obexd>=0" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/objfw/template b/srcpkgs/objfw/template index e2f4ce4de9..ea8c68dd53 100644 --- a/srcpkgs/objfw/template +++ b/srcpkgs/objfw/template @@ -22,9 +22,3 @@ objfw-devel_package() { vmove "usr/lib/*.so" } } - -objfw_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ocaml-camomile/template b/srcpkgs/ocaml-camomile/template index 95691288e6..e414c91658 100644 --- a/srcpkgs/ocaml-camomile/template +++ b/srcpkgs/ocaml-camomile/template @@ -19,9 +19,3 @@ do_install() { sed -e "s|ocamlfind install|ocamlfind install -destdir '${DESTDIR}$(ocamlfind printconf destdir)'|" -i Makefile make install } - -ocaml-camomile_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ocaml-findlib/template b/srcpkgs/ocaml-findlib/template index 860fc4ab4e..f237ba2263 100644 --- a/srcpkgs/ocaml-findlib/template +++ b/srcpkgs/ocaml-findlib/template @@ -25,10 +25,3 @@ do_build() { do_install() { make prefix=${DESTDIR} install } - - -ocaml-findlib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ocaml-lidl/template b/srcpkgs/ocaml-lidl/template index 9396c5f0c4..62be29f3f6 100644 --- a/srcpkgs/ocaml-lidl/template +++ b/srcpkgs/ocaml-lidl/template @@ -38,9 +38,3 @@ archive(native) = "com.cmxa" archive(byte,mt_vm) = "com.cma" EOF } - -ocaml-lidl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ocaml/template b/srcpkgs/ocaml/template index f314d192ed..d75dbf15e0 100644 --- a/srcpkgs/ocaml/template +++ b/srcpkgs/ocaml/template @@ -56,9 +56,3 @@ ocaml-compiler-libs_package() { rm -f ${PKGDESTDIR}/usr/lib/ocaml/compiler-libs/typing/outcometree.{cmi,mli} } } - -ocaml_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/omxplayer/template b/srcpkgs/omxplayer/template index 8620e22562..5d3f061641 100644 --- a/srcpkgs/omxplayer/template +++ b/srcpkgs/omxplayer/template @@ -13,6 +13,7 @@ only_for_archs="armv6l" build_style=gnu-makefile hostmakedepends="pkg-config" makedepends="rpi-firmware>=20130913 pcre-devel boost-devel freetype-devel ffmpeg-devel>=2.1 dbus-devel" +depends="rpi-firmware>=20130913 freefont-ttf" do_fetch() { local url="git://github.com/popcornmix/omxplayer.git" @@ -31,10 +32,3 @@ pre_build() { do_build() { make CC="$CC" CXX="$CXX" LD="$LD" ${makejobs} } - -omxplayer_package() { - depends="rpi-firmware>=20130913 freefont-ttf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/openbox/template b/srcpkgs/openbox/template index a5be3edb21..17534bc342 100644 --- a/srcpkgs/openbox/template +++ b/srcpkgs/openbox/template @@ -7,6 +7,11 @@ configure_args="--enable-startup-notification" hostmakedepends="pkg-config" makedepends="startup-notification-devel libxml2-devel libXrandr-devel libXcursor-devel>=1.1.14_2 libXinerama-devel libSM-devel imlib2-devel pango-devel" +conf_files=" + /etc/xdg/openbox/menu.xml + /etc/xdg/openbox/rc.xml + /etc/xdg/openbox/environment + /etc/xdg/openbox/autostart" short_desc="Standards compliant, fast, light-weight, extensible window manager" maintainer="Juan RP " license="GPL-2" @@ -77,14 +82,3 @@ libopenbox_package() { vmove "usr/lib/*.so.*" } } - -openbox_package() { - conf_files=" - /etc/xdg/openbox/menu.xml - /etc/xdg/openbox/rc.xml - /etc/xdg/openbox/environment - /etc/xdg/openbox/autostart" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/opencl-headers/template b/srcpkgs/opencl-headers/template index e232b43ca3..6e862d6327 100644 --- a/srcpkgs/opencl-headers/template +++ b/srcpkgs/opencl-headers/template @@ -4,6 +4,7 @@ _openclver=1.2 _distver=20121114 version=${_openclver}.${_distver} revision=1 +noarch="yes" short_desc="OpenCL (Open Computing Language) header files" maintainer="Juan RP " license="MIT" @@ -17,10 +18,3 @@ do_install() { vmkdir usr/include/CL install -m644 *.h *.hpp ${DESTDIR}/usr/include/CL } - -opencl-headers_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/openjade/template b/srcpkgs/openjade/template index ecd446fa9e..8623c0f9fc 100644 --- a/srcpkgs/openjade/template +++ b/srcpkgs/openjade/template @@ -8,6 +8,8 @@ configure_args=" --enable-splibdir=/usr/lib" revision=2 makedepends="perl opensp-devel" +depends="xmlcatmgr" +sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --" short_desc="SGML/XML parser toolkit and DSSSL engine, successor to "jade"" maintainer="Juan RP " homepage="http://openjade.sourceforge.net/" @@ -34,11 +36,3 @@ post_install() { rm -f ${DESTDIR}/usr/lib/*.a } - -openjade_package() { - sgml_entries="CATALOG /usr/share/sgml/openjade/catalog --" - depends="xmlcatmgr" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/openmpi/template b/srcpkgs/openmpi/template index 1cb4109ee4..aec70e12ea 100644 --- a/srcpkgs/openmpi/template +++ b/srcpkgs/openmpi/template @@ -4,6 +4,10 @@ version=1.4.1 revision=4 build_style=gnu-configure makedepends="zlib-devel libgomp-devel" +conf_files=" + /etc/openmpi-default-hostfile + /etc/openmpi-mca-params.conf + /etc/openmpi-totalview.tcl" short_desc="A High Performance Message Passing Library" homepage="http://www.open-mpi.org/" license="Custom" @@ -19,21 +23,10 @@ long_desc=" openmpi-devel_package() { depends="libstdc++-devel zlib-devel openmpi>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/share/man/man3 } } - -openmpi_package() { - conf_files=" - /etc/openmpi-default-hostfile - /etc/openmpi-mca-params.conf - /etc/openmpi-totalview.tcl" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/openmsx/template b/srcpkgs/openmsx/template index aea3ae4b2f..306f217fa0 100644 --- a/srcpkgs/openmsx/template +++ b/srcpkgs/openmsx/template @@ -26,9 +26,3 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } - -openmsx_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template index 1bf4186927..dfb9e298c8 100644 --- a/srcpkgs/openobex/template +++ b/srcpkgs/openobex/template @@ -37,9 +37,3 @@ libopenobex-devel_package() { vmove "usr/lib/*.a" } } - -openobex_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template index bc439dadc7..966d04051c 100644 --- a/srcpkgs/openresolv/template +++ b/srcpkgs/openresolv/template @@ -2,6 +2,7 @@ pkgname=openresolv version=3.5.5 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --libexecdir=/usr/lib/resolvconf" @@ -16,10 +17,3 @@ makedepends="systemd" do_install() { make DESTDIR=$DESTDIR install } - -openresolv_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/opensmtpd/template b/srcpkgs/opensmtpd/template index ac534c2646..529a30d9ac 100644 --- a/srcpkgs/opensmtpd/template +++ b/srcpkgs/opensmtpd/template @@ -10,6 +10,13 @@ configure_args="--sysconfdir=/etc/smtpd --sbindir=/usr/bin --with-ca-file=/etc/ssl/certs/ca-certificates.crt" hostmakedepends="pkg-config bison" makedepends="zlib-devel openssl-devel libevent-devel db-devel ca-certificates" +depends="ca-certificates" +conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases" +system_accounts="smtpd smtpq" +systemd_services="smtpd.socket on" +smtpq_homedir="/var/spool/mail" +provides="smtp-forwarder-0_1 smtp-server-0_1" +replaces="smtp-forwarder>=0 smtp-server>=0" short_desc="Free implementation of the server-side SMTP protocol" maintainer="Juan RP " license="BSD, ISC, MIT" @@ -31,16 +38,3 @@ post_install() { vinstall ${FILESDIR}/smtpd.socket 644 usr/lib/systemd/system vinstall /dev/null 644 etc/smtpd aliases } - -opensmtpd_package() { - depends="ca-certificates" - conf_files="/etc/smtpd/smtpd.conf /etc/smtpd/aliases" - system_accounts="smtpd smtpq" - systemd_services="smtpd.socket on" - smtpq_homedir="/var/spool/mail" - provides="smtp-forwarder-0_1 smtp-server-0_1" - replaces="smtp-forwarder>=0 smtp-server>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template index c256d4c030..4edfe473dd 100644 --- a/srcpkgs/opensonic/template +++ b/srcpkgs/opensonic/template @@ -2,9 +2,10 @@ pkgname=opensonic version=0.1.4 revision=2 +wrksrc="opensnc-src-${version}" hostmakedepends="cmake" makedepends="allegro4-devel libpng-devel libvorbis-devel desktop-file-utils" -wrksrc="opensnc-src-${version}" +depends="desktop-file-utils" short_desc="Open-source game based on the Sonic the Hedgehog universe" maintainer="Juan RP " license="GPL-2" @@ -27,10 +28,3 @@ do_install() { vinstall ${FILESDIR}/opensonic.sh 755 usr/bin opensonic vinstall ${FILESDIR}/opensonic.desktop 644 usr/share/applications } - -opensonic_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/opensp/template b/srcpkgs/opensp/template index e40d819ccd..e0f74b6893 100644 --- a/srcpkgs/opensp/template +++ b/srcpkgs/opensp/template @@ -6,6 +6,8 @@ wrksrc="OpenSP-${version}" build_style=gnu-configure configure_args="--enable-http --enable-default-catalog=/usr/share/sgml/catalog" makedepends="xmlto docbook-xsl xmlcatmgr" +depends="xmlcatmgr" +sgml_entries="CATALOG /usr/share/OpenSP/catalog --" short_desc="SGML parser, successor to sp" maintainer="Juan RP " homepage="http://openjade.sourceforge.net/" @@ -29,17 +31,9 @@ post_install() { opensp-devel_package() { depends="libstdc++-devel opensp>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -opensp_package() { - sgml_entries="CATALOG /usr/share/OpenSP/catalog --" - depends="xmlcatmgr" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template index ad7bae140f..97546bd250 100644 --- a/srcpkgs/openssh/template +++ b/srcpkgs/openssh/template @@ -1,4 +1,6 @@ # Template file for 'openssh' +_desc="The OpenSSH implementation of SSH protocol" + pkgname=openssh version=6.4p1 revision=1 @@ -10,7 +12,9 @@ configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh --with-pid-dir=/run --with-pam LD=$CC" hostmakedepends="perl" makedepends="zlib-devel openssl-devel pam-devel mit-krb5-devel" -short_desc="The OpenSSH implementation of SSH protocol" +short_desc="${_desc} - client" +replaces="openssh-client<6.1p1" +conf_files="/etc/ssh/moduli /etc/ssh/ssh_config" maintainer="Juan RP " homepage="http://www.openssh.org" license="BSD" @@ -45,7 +49,7 @@ openssh-server_package() { conf_files="/etc/ssh/sshd_config /etc/pam.d/sshd" make_dirs="/var/chroot/ssh 0755 root root" depends="openssh>=$version" - short_desc+=" - server" + short_desc="${_desc} - server" pkg_install() { vmove usr/libexec/sftp-server vmove etc/ssh/sshd_config @@ -60,12 +64,3 @@ openssh-server_package() { ${PKGDESTDIR}/usr/lib/systemd/system } } - -openssh_package() { - short_desc+=" - client" - replaces="openssh-client<6.1p1" - conf_files="/etc/ssh/moduli /etc/ssh/ssh_config" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 833ce2b629..f8bb5873ed 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -3,7 +3,7 @@ pkgname=openssl _openssl_version=1.0.1 version=${_openssl_version}e revision=5 -makedepends="zlib-devel" +bootstrap=yes short_desc="Secure Socket Layer and cryptographic library - runtime utilities" maintainer="Juan RP " license="BSD" @@ -11,12 +11,19 @@ homepage="http://www.openssl.org/" distfiles="https://www.openssl.org/source/$pkgname-$version.tar.gz" checksum=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 -bootstrap=yes - if [ "$CHROOT_READY" ]; then hostmakedepends="perl" fi +depends="perl" +makedepends="zlib-devel" + +conf_files="/etc/ssl/openssl.cnf" +make_dirs=" + /etc/ssl/certs 0755 root root + /etc/ssl/private 0750 root root" + + do_configure() { local _opts @@ -81,17 +88,6 @@ openssl-devel_package() { } } -openssl_package() { - depends="perl" - conf_files="/etc/ssl/openssl.cnf" - make_dirs=" - /etc/ssl/certs 0755 root root - /etc/ssl/private 0750 root root" - pkg_install() { - vmove all - } -} - libssl_package() { short_desc="Secure Sockets Layer and Cryptographic library" pkg_install() { diff --git a/srcpkgs/openvpn/template b/srcpkgs/openvpn/template index bf55eb59fe..78f5dea782 100644 --- a/srcpkgs/openvpn/template +++ b/srcpkgs/openvpn/template @@ -19,9 +19,3 @@ post_install() { rm -rf ${DESTDIR}/usr/include } - -openvpn_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template index 3fed34de07..2b2df7a904 100644 --- a/srcpkgs/oprofile/template +++ b/srcpkgs/oprofile/template @@ -5,7 +5,11 @@ revision=2 build_style=gnu-configure configure_args="--with-x --enable-gui=qt4 --disable-static" hostmakedepends="pkg-config" -makedepends="popt-devel binutils-devel icu-devel qt-devel" +makedepends="popt-devel binutils-devel icu-devel qt-devel shadow" +depends="shadow" +system_accounts="oprofile" +oprofile_homedir="/var/lib/oprofile" +make_dirs="/var/lib/oprofile 0750 oprofile oprofile" short_desc="Transparent low-overhead system-wide profiler for Linux" maintainer="Juan RP " license="GPL-2" @@ -29,13 +33,3 @@ oprofile-qt4-gui_package() { vmove usr/bin/oprof_start } } - -oprofile_package() { - depends="shadow" - system_accounts="oprofile" - oprofile_homedir="/var/lib/oprofile" - make_dirs="/var/lib/oprofile 0750 oprofile oprofile" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/optipng/template b/srcpkgs/optipng/template index 536040b8da..f0d7043b56 100644 --- a/srcpkgs/optipng/template +++ b/srcpkgs/optipng/template @@ -22,9 +22,3 @@ do_build() { do_install() { make LD="$CC" DESTDIR=$DESTDIR install } - -optipng_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/opus-tools/template b/srcpkgs/opus-tools/template index f022e0a4a5..cd097de7f4 100644 --- a/srcpkgs/opus-tools/template +++ b/srcpkgs/opus-tools/template @@ -15,9 +15,3 @@ checksum=cc86dbc2a4d76da7e1ed9afee85448c8f798c465a5412233f178783220f3a2c1 post_install() { vinstall COPYING 644 usr/share/licenses/opus } - -opus-tools_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/opus/template b/srcpkgs/opus/template index 5c0c7311b2..0ca7c01e23 100644 --- a/srcpkgs/opus/template +++ b/srcpkgs/opus/template @@ -26,9 +26,3 @@ opus-devel_package() { vmove usr/share/aclocal } } - -opus_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/opusfile/template b/srcpkgs/opusfile/template index 357824e5ca..eaa4f2bded 100644 --- a/srcpkgs/opusfile/template +++ b/srcpkgs/opusfile/template @@ -20,16 +20,10 @@ post_install() { opusfile-devel_package() { depends="libogg-devel openssl-devel opus-devel ${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -opusfile_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template index c4ac7af571..ec777dd33e 100644 --- a/srcpkgs/orage/template +++ b/srcpkgs/orage/template @@ -6,16 +6,10 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool flex" makedepends="libical-devel libnotify-devel gtk+-devel dbus-glib-devel popt-devel xfce4-panel-devel libxfce4util-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Simple calendar application for Xfce" maintainer="Juan RP " homepage="http://www.xfce.org/projects/orage/" license="GPL-2" distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2" checksum=9a5805c8a70de0cae67ae1a6282463bbd059d6a4d080f93ffb13f92aaacdbf2e - -orage_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template index c31a5fb4e9..a51728b4d6 100644 --- a/srcpkgs/orc/template +++ b/srcpkgs/orc/template @@ -35,9 +35,3 @@ orc-devel_package() { vmove usr/share/gtk-doc } } - -orc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/os-prober/template b/srcpkgs/os-prober/template index 7710b82bba..1e51d09538 100644 --- a/srcpkgs/os-prober/template +++ b/srcpkgs/os-prober/template @@ -2,6 +2,7 @@ pkgname=os-prober version=1.63 revision=3 +make_dirs="/var/lib/os-prober 0755 root root" short_desc="Utility to detect other OSes on a set of drives" maintainer="Juan RP " homepage="http://packages.debian.org/sid/os-prober" @@ -26,10 +27,3 @@ do_install() { done vinstall os-probes/mounted/powerpc/20macosx 755 usr/lib/os-probes/mounted } - -os-prober_package() { - make_dirs="/var/lib/os-prober 0755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/oxygen-icons/template b/srcpkgs/oxygen-icons/template index 2ef3a555ad..910a55ef98 100644 --- a/srcpkgs/oxygen-icons/template +++ b/srcpkgs/oxygen-icons/template @@ -2,6 +2,7 @@ pkgname=oxygen-icons version=4.11.4 revision=1 +noarch="yes" build_style=cmake hostmakedepends="cmake automoc4" short_desc="The Oxygen Icon Theme for KDE" @@ -10,10 +11,3 @@ license="GPL-3" homepage="http://www.${pkgname}.org" distfiles="http://download.kde.org/stable/${version}/src/${pkgname}-${version}.tar.xz" checksum=f85bf4438ebd82c38b74c3c552001b41beab105afd0b97cb6b6a96ebbbb0bef0 - -oxygen-icons_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template index e6942ced36..e7c3ac3f53 100644 --- a/srcpkgs/p11-kit/template +++ b/srcpkgs/p11-kit/template @@ -19,6 +19,7 @@ long_desc=" hostmakedepends="pkg-config" makedepends="libtasn1-devel libffi-devel" +conf_files="/etc/pkcs11/pkcs11.conf" post_install() { mv ${DESTDIR}/etc/pkcs11/pkcs11.conf.example ${DESTDIR}/etc/pkcs11/pkcs11.conf @@ -34,10 +35,3 @@ p11-kit-devel_package() { vmove usr/share } } - -p11-kit_package() { - conf_files="/etc/pkcs11/pkcs11.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template index f119dc76a8..163e683e19 100644 --- a/srcpkgs/p7zip/template +++ b/srcpkgs/p7zip/template @@ -32,9 +32,3 @@ do_install() { sed "s|${DESTDIR}/usr|/usr|g" -i ${DESTDIR}/usr/bin/7z{,a,r} } - -p7zip_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pam/template b/srcpkgs/pam/template index ea898298bd..c7dcb08ab4 100644 --- a/srcpkgs/pam/template +++ b/srcpkgs/pam/template @@ -7,6 +7,18 @@ build_style=gnu-configure configure_args="--libdir=/usr/lib --sbindir=/usr/sbin --docdir=/usr/share/doc/pam --disable-nis" hostmakedepends="flex" makedepends="libfl-devel cracklib-devel db-devel>=5.3" +depends="cracklib" +conf_files=" + /etc/environment + /etc/security/access.conf + /etc/security/group.conf + /etc/security/limits.conf + /etc/security/namespace.conf + /etc/security/pam_env.conf + /etc/security/time.conf" +makedirs=" + /etc/security/limits.d 0755 root root + /etc/security/namespace.d 0755 root root" short_desc="A flexible mechanism for authenticating users" maintainer="Juan RP " homepage="http://www.kernel.org/pub/linux/libs/pam/" @@ -59,21 +71,3 @@ pam-userdb_package() { vmove usr/share/man/man8/pam_userdb.8 } } - -pam_package() { - conf_files=" - /etc/environment - /etc/security/access.conf - /etc/security/group.conf - /etc/security/limits.conf - /etc/security/namespace.conf - /etc/security/pam_env.conf - /etc/security/time.conf" - makedirs=" - /etc/security/limits.d 0755 root root - /etc/security/namespace.d 0755 root root" - depends="cracklib" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pango/template b/srcpkgs/pango/template index dc7e371ddf..26c1f2b4fc 100644 --- a/srcpkgs/pango/template +++ b/srcpkgs/pango/template @@ -7,6 +7,8 @@ configure_args="--with-included-modules=basic-fc" hostmakedepends="pkg-config glib-devel" # XXX Add missing dependency libthai. makedepends="libglib-devel>=2.38 cairo-devel libXft-devel harfbuzz-devel>=0.9.9" +depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91" +triggers="pango-modules" short_desc="Library for layout and rendering of text" maintainer="Juan RP " homepage="http://www.pango.org/" @@ -50,11 +52,3 @@ pango-devel_package() { vmove usr/share/gtk-doc } } - -pango_package() { - depends="libharfbuzz>=0.9.9 fontconfig>=2.10.91" - triggers="pango-modules" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template index 7bfb2dd524..d38306162f 100644 --- a/srcpkgs/pangomm/template +++ b/srcpkgs/pangomm/template @@ -20,16 +20,10 @@ long_desc=" pangomm-devel_package() { depends="glibmm-devel cairomm-devel pango-devel pangomm>=${version}" - short_desc="C++ bindings for the pango library -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/pango*" } } - -pangomm_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pangox-compat/template b/srcpkgs/pangox-compat/template index c66e1f2cdf..b7956a55a4 100644 --- a/srcpkgs/pangox-compat/template +++ b/srcpkgs/pangox-compat/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" makedepends="pango-devel" +replaces="pango<1.32" short_desc="Library for layout and rendering of text (pangox compat library)" maintainer="Juan RP " homepage="http://www.pango.org/" @@ -25,10 +26,3 @@ pangox-compat-devel_package() { vmove usr/lib/pkgconfig } } - -pangox-compat_package() { - replaces="pango<1.32" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/papyon/template b/srcpkgs/papyon/template index 35c9fd4f47..1cfcd825b5 100644 --- a/srcpkgs/papyon/template +++ b/srcpkgs/papyon/template @@ -2,8 +2,11 @@ pkgname=papyon version=0.5.6 revision=2 +noarch="yes" build_style=python-module makedepends="farstream-devel gst-python-devel pygobject pyopenssl pycrypto" +depends="gst-python farstream pygobject pyopenssl pycrypto" +pycompile_module="papyon tests" short_desc="MSN library purely written in Python" homepage="http://www.freedesktop.org/wiki/Software/papyon" license="GPL-2" @@ -27,12 +30,3 @@ long_desc=" used to support deltas in the AddressBook later) - Very solid and extensible architecture - Solid networking through a new sublibrary : gnet" - -papyon_package() { - noarch="yes" - pycompile_module="papyon tests" - depends="gst-python farstream pygobject pyopenssl pycrypto" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/parallel/template b/srcpkgs/parallel/template index 0ed30e018a..7ebfc93af3 100644 --- a/srcpkgs/parallel/template +++ b/srcpkgs/parallel/template @@ -2,19 +2,13 @@ pkgname=parallel version=20130522 revision=2 +noarch="yes" build_style=gnu-configure hostmakedepends="perl" +depends="perl" short_desc="A shell tool for executing jobs in parallel" maintainer="graysky " license="GPL-3" homepage="http://www.gnu.org/software/parallel" distfiles="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$version.tar.bz2" checksum=e9ea6fa2644e8504a85a518edb246783f2ccace58f21d101712b28bf781d7d2b - -parallel_package() { - noarch="yes" - depends="perl" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/parted/template b/srcpkgs/parted/template index 425cd34bfd..94d523a756 100644 --- a/srcpkgs/parted/template +++ b/srcpkgs/parted/template @@ -18,7 +18,7 @@ long_desc=" operating systems, reorganising disk usage, and copying data to new hard disks." libparted_package() { - short_desc="${short_desc} - shared library" + short_desc+=" - shared library" pkg_install() { vmove "usr/lib/*.so*" } @@ -26,16 +26,10 @@ libparted_package() { libparted-devel_package() { depends="libparted-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -parted_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/patch/template b/srcpkgs/patch/template index 16168f5edf..084d83e720 100644 --- a/srcpkgs/patch/template +++ b/srcpkgs/patch/template @@ -4,18 +4,12 @@ version=2.7.1 revision=3 build_style=gnu-configure makedepends="attr-devel ed" +# Required by patch -e functionality. +depends="ed" +conflicts="chroot-patch>=0" short_desc="Patch files using diff output" maintainer="Juan RP " homepage="http://www.gnu.org/software/patch/patch.html" license="GPL-3" distfiles="http://ftp.gnu.org/gnu/patch/patch-$version.tar.bz2" checksum=aae676de9e95051f425af4507fcc9a019941a2a1f78405e7dbd40bccf786aa11 - -patch_package() { - # Required by patch -e functionality. - depends="ed" - conflicts="chroot-patch>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/patchage/template b/srcpkgs/patchage/template index afe33cac85..2e85e07bad 100644 --- a/srcpkgs/patchage/template +++ b/srcpkgs/patchage/template @@ -8,6 +8,7 @@ makedepends="pkg-config python dbus-devel dbus-glib-devel gtkmm2-devel libgnomecanvasmm-devel libglade-devel libglademm-devel flowcanvas-devel alsa-lib-devel jack-devel raul-devel boost-devel graphviz jack hicolor-icon-theme" +depends="graphviz jack hicolor-icon-theme" short_desc="Modular patch bay for audio and MIDI based on JACK and ALSA." maintainer="davehome " license="GPL-2" @@ -15,12 +16,4 @@ homepage="http://drobilla.net/software/patchage/" distfiles="http://download.drobilla.net/${pkgname}-${version}.tar.bz2" checksum=9bb9d1ba0205c0ad95c6dbecba56c513ff706f1057348d33ff7567bc9cbd89d2 long_desc=" - Patchage is a modular patch bay for audio and MIDI systems based on JACK and - ALSA." - -patchage_package() { - depends="graphviz jack hicolor-icon-theme" - pkg_install() { - vmove usr - } -} + Patchage is a modular patch bay for audio and MIDI systems based on JACK and ALSA." diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template index 6163af9256..f813e03daa 100644 --- a/srcpkgs/patchelf/template +++ b/srcpkgs/patchelf/template @@ -16,9 +16,3 @@ long_desc=" * Change the dynamic loader (ELF interpreter) of executables * Change the RPATH of executables and libraries * Shrink the RPATH of executables and libraries" - -patchelf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template index e728fe0335..cfef5cd007 100644 --- a/srcpkgs/pavucontrol/template +++ b/srcpkgs/pavucontrol/template @@ -16,9 +16,3 @@ long_desc=" tool (mixer) for the PulseAudio sound server. In contrast to classic mixer tools this one allows you to control both the volume of hardware devices and of each playback stream separately." - -pavucontrol_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pbzip2/template b/srcpkgs/pbzip2/template index 23e77b03d0..63fdf7e83b 100644 --- a/srcpkgs/pbzip2/template +++ b/srcpkgs/pbzip2/template @@ -23,9 +23,3 @@ post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -pbzip2_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pcc-libs/template b/srcpkgs/pcc-libs/template index 99c7dd13f4..60c5604032 100644 --- a/srcpkgs/pcc-libs/template +++ b/srcpkgs/pcc-libs/template @@ -26,9 +26,3 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } - -pcc-libs_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pcc/template b/srcpkgs/pcc/template index c9e04758ea..5e988dd5e2 100644 --- a/srcpkgs/pcc/template +++ b/srcpkgs/pcc/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure configure_args="--enable-tls" makedepends="flex pcc-libs" +depends="pcc-libs" short_desc="Portable C Compiler" homepage="http://pcc.ludd.ltu.se/" license="Custom (BSD-like)" @@ -23,10 +24,3 @@ post_install() { mv ${DESTDIR}/usr/share/man/man1/cpp.1 \ ${DESTDIR}/usr/share/man/man1/pcc-cpp.1 } - -pcc_package() { - depends="pcc-libs" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pciutils/template b/srcpkgs/pciutils/template index 176b4a277b..c936580f3f 100644 --- a/srcpkgs/pciutils/template +++ b/srcpkgs/pciutils/template @@ -4,6 +4,7 @@ version=3.2.0 revision=3 hostmakedepends="pkg-config which" makedepends="hwids zlib-devel libkmod-devel" +depends="hwids" short_desc="PCI bus related utilities" maintainer="Juan RP " license="GPL-2" @@ -50,10 +51,3 @@ pciutils-devel_package() { vmove usr/share/man/man7 } } - -pciutils_package() { - depends="hwids" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pcmanfm/template b/srcpkgs/pcmanfm/template index 86d2dd3061..d7ef20b9dd 100644 --- a/srcpkgs/pcmanfm/template +++ b/srcpkgs/pcmanfm/template @@ -5,6 +5,8 @@ revision=2 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libfm-devel>=1.1.0" +depends="libfm>=1.1.0 desktop-file-utils" +conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf" short_desc="LXDE file manager" maintainer="Juan RP " homepage="http://pcmanfm.sourceforge.net/" @@ -17,11 +19,3 @@ post_install() { ln -sf /etc/xdg/pcmanfm/default/pcmanfm.conf \ ${DESTDIR}/usr/share/lxde/pcmanfm/pcmanfm.conf } - -pcmanfm_package() { - conf_files="/etc/xdg/pcmanfm/default/pcmanfm.conf" - depends="libfm>=1.1.0 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pcre/template b/srcpkgs/pcre/template index d42c9ea0b9..c4185b5a2c 100644 --- a/srcpkgs/pcre/template +++ b/srcpkgs/pcre/template @@ -6,7 +6,6 @@ build_style=gnu-configure configure_args="--enable-utf8 --enable-unicode-properties --with-pic --enable-pcregrep-libz --enable-pcregrep-libbz2 --enable-newline-is-anycrlf --enable-pcretest-libreadline --enable-jit --enable-static" -hostmakedepends="libtool automake" makedepends="zlib-devel bzip2-devel readline-devel" short_desc="Perl Compatible Regular Expressions" maintainer="Juan RP " @@ -16,9 +15,12 @@ license="BSD" distfiles="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2" checksum=b6043ae1ff2720be665ffa28dc22b7c637cdde96f389a116c0c3020caeae583f -pre_configure() { - autoreconf -fi -} +if [ "$CROSS_BUILD" ]; then + hostmakedepends="automake libtool" + pre_configure() { + autoreconf -fi + } +fi libpcrecpp_package() { short_desc+=" - C++ shared libraries" @@ -50,9 +52,3 @@ pcre-devel_package() { vmove usr/share/doc } } - -pcre_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pcsxr/template b/srcpkgs/pcsxr/template index 0b05b343a6..f09fafac16 100644 --- a/srcpkgs/pcsxr/template +++ b/srcpkgs/pcsxr/template @@ -7,6 +7,7 @@ build_style=gnu-configure configure_args="--enable-libcdio --enable-opengl" hostmakedepends="pkg-config automake libtool intltool gettext-devel nasm" makedepends="libXv-devel libcdio-devel SDL-devel gtk+3-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A Sony PlayStation (PSX) emulator based on the PCSX-df project" maintainer="Juan RP " license="GPL" @@ -18,10 +19,3 @@ pre_configure() { autoreconf -fi intltoolize -f } - -pcsxr_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pekwm/template b/srcpkgs/pekwm/template index a758b9580e..45ffd55740 100644 --- a/srcpkgs/pekwm/template +++ b/srcpkgs/pekwm/template @@ -13,22 +13,16 @@ checksum=8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00 hostmakedepends="pkg-config" makedepends="libjpeg-turbo-devel libpng-devel>=1.6 libXinerama-devel libXft-devel libXrender-devel fontconfig-devel libXpm-devel libXrandr-devel" - -pekwm_package() { - conf_files=" - /etc/pekwm/vars - /etc/pekwm/mouse - /etc/pekwm/menu - /etc/pekwm/start - /etc/pekwm/keys - /etc/pekwm/autoproperties_typerules - /etc/pekwm/config - /etc/pekwm/autoproperties - /etc/pekwm/mouse_system - /etc/pekwm/mouse_sloppy - /etc/pekwm/mouse_click - /etc/pekwm/config_system" - pkg_install() { - vmove all - } -} +conf_files=" + /etc/pekwm/vars + /etc/pekwm/mouse + /etc/pekwm/menu + /etc/pekwm/start + /etc/pekwm/keys + /etc/pekwm/autoproperties_typerules + /etc/pekwm/config + /etc/pekwm/autoproperties + /etc/pekwm/mouse_system + /etc/pekwm/mouse_sloppy + /etc/pekwm/mouse_click + /etc/pekwm/config_system" diff --git a/srcpkgs/pelican/template b/srcpkgs/pelican/template index 1acb50be64..f568e309f6 100644 --- a/srcpkgs/pelican/template +++ b/srcpkgs/pelican/template @@ -9,18 +9,11 @@ hostmakedepends="python-distribute" makedepends="python-devel python-feedgenerator python-jinja python-Pygments python-docutils python-blinker python-Unidecode python-Markdown" +depends="${makedepends}" +pycompile_module="pelican" short_desc="Static site generator, written in Python" maintainer="Juan RP " homepage="https://github.com/getpelican/pelican" license="AGPL-3" distfiles="https://github.com/getpelican/pelican/archive/${version}.tar.gz" checksum=d7e2f83a0168ab9b3fd7c7380abbe58f0a95088221e1ecc0a610d72902d39cd8 - -pelican_package() { - noarch="yes" - pycompile_module="pelican" - depends="${makedepends}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pen/template b/srcpkgs/pen/template index 05c791f0ec..c443fb3916 100644 --- a/srcpkgs/pen/template +++ b/srcpkgs/pen/template @@ -16,9 +16,3 @@ long_desc=" outside and automatically detects servers that are down and distributes clients among the available servers. This gives high availability and scalable performance." - -pen_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/perl-Archive-Zip/template b/srcpkgs/perl-Archive-Zip/template index 6454e765a8..0cee6f616b 100644 --- a/srcpkgs/perl-Archive-Zip/template +++ b/srcpkgs/perl-Archive-Zip/template @@ -5,17 +5,11 @@ revision=2 wrksrc="Archive-Zip-${version}" build_style=perl-module makedepends="perl>=5.18" +noarch="yes" +depends="${makedepends}" short_desc="Provide a perl interface to ZIP archive files" maintainer="pancake " license="GPL, PerlArtistic" homepage="http://search.cpan.org/dist/Archive-Zip/" distfiles="http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Archive-Zip-${version}.tar.gz" checksum=f8b472ff77b7238e423bcb351968accc562f9d20700fbf2d8ed2a65fa0fa6318 - -perl-Archive-Zip_package() { - noarch="yes" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/perl-Crypt-Blowfish/template b/srcpkgs/perl-Crypt-Blowfish/template index 53cfb2bf34..9ba5fdc7ae 100644 --- a/srcpkgs/perl-Crypt-Blowfish/template +++ b/srcpkgs/perl-Crypt-Blowfish/template @@ -6,16 +6,10 @@ wrksrc="Crypt-Blowfish-${version}" build_style=perl-module hostmakedepends="perl>=5.18" makedepends="${hostmakedepends}" +depends="${makedepends}" short_desc="Crypt::Blowfish - Blowfish cryptography algorithm interface" maintainer="Juan RP / s/""/"INSTALLDIRS=site"/' \ - -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ - -i ${DESTDIR}/usr/share/perl5/core_perl/CPAN/FirstTime.pm - - ### CPANPLUS Settings ### - # Set CPANPLUS default config to use the site directories. - sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ - -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ - -i ${DESTDIR}/usr/share/perl5/core_perl/CPANPLUS/Config.pm - - # Remove all pod files *except* those under - # /usr/share/perl5/core_perl/pod/ (FS#16488) - rm -f ${DESTDIR}/usr/share/perl5/core_perl/*.pod - for d in ${DESTDIR}/usr/share/perl5/core_perl/*; do - if [ -d $d -a $(basename $d) != "pod" ]; then - find $d -name *.pod -delete - fi - done - find ${DESTDIR}/usr/lib -name *.pod -delete - find ${DESTDIR} -name .packlist -delete - - # Make a symlink so that libperl.so is accesible. - cd ${DESTDIR}/usr/lib && \ - ln -sf ./perl5/core_perl/CORE/libperl.so libperl.so -} - -perl_package() { - provides=" +provides=" perl-Archive-Extract-0.68_1 perl-Archive-Tar-1.90_1 perl-Attribute-Handlers-0.94_1 @@ -264,11 +147,122 @@ perl-threads-1.86_1 perl-threads-shared-1.43_1 perl-version-0.9902_1 " - for f in ${provides}; do - replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0" - done +for f in ${provides}; do + replaces+=" $($XBPS_UHELPER_CMD getpkgname ${f})>=0" +done - pkg_install() { - vmove all - } +# Before updating this package to a new major version, run ${FILESDIR}/provides.pl +# against ${wrksrc} to find the list of built in packages. +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" perl>=${version}" +fi + +do_configure() { + local _args="-Dusethreads -Duseshrplib + -Dprefix=/usr -Dvendorprefix=/usr + -Dprivlib=/usr/share/perl5/core_perl + -Darchlib=/usr/lib/perl5/core_perl + -Dsitelib=/usr/share/perl5/site_perl + -Dsitearch=/usr/lib/perl5/site_perl + -Dvendorlib=/usr/share/perl5/vendor_perl + -Dvendorarch=/usr/lib/perl5/vendor_perl + -Dscriptdir=/usr/bin -Dvendorscript=/usr/bin + -Dinc_version_list=none -Dman1ext=1p -Dman3ext=3p + -Dman1dir=/usr/share/man/man1 + -Dman3dir=/usr/share/man/man3" + + if [ "$CROSS_BUILD" ]; then + # Copy target files + if [ ! -d $FILESDIR/$XBPS_CROSS_TRIPLET ]; then + msg_error "$pkgver: cannot be cross built for $XBPS_CROSS_TRIPLET, contact $maintainer.\n" + fi + cp -f ${FILESDIR}/${XBPS_CROSS_TRIPLET}/* . + cp -f ${FILESDIR}/Configure.cross . + + # substitute some required strings in generated config.sh + sed -e "s|@@PERL_VERSION@@|${version}|g" \ + -e "s|@@PERL_SUBVERSION@@|${version##*.}|g" \ + -i config.sh + + sh ./Configure.cross + perl -Ilib make_patchnum.pl + else + ./Configure -des ${_args} -Dcccdlflags="-fPIC" -Doptimize="$CFLAGS" + fi +} + +do_build() { + if [ "$CROSS_BUILD" ]; then + export HOST_PERL=/usr/bin/perl + export PERL_TO_USE=$HOST_PERL + export HOST_PERL_LIBS=/usr/lib/perl5/core_perl + export LIB=$XBPS_CROSS_BASE/usr/lib + export INCLUDE=$XBPS_CROSS_BASE/usr/include + + make SHRPLDFLAGS='-shared -Wl,-soname,libperl.so' \ + CROSS_PERL=$HOST_PERL libperl.so ${makejobs} + + cp -fr $HOST_PERL_LIBS/auto/* lib/auto/ + mkdir -p lib/$XBPS_CROSS_TRIPLET + make extensions CROSS_PERL=$HOST_PERL \ + INST_ARCHLIB=$wrksrc/lib/$XBPS_CROSS_TRIPLET \ + ${makejobs} + else + make ${makejobs} + fi +} + +do_install() { + if [ "$CROSS_BUILD" ]; then + export HOST_PERL=/usr/bin/perl + export PERL_TO_USE=$HOST_PERL + export HOST_PERL_LIBS=/usr/lib/perl5/core_perl + export LIB=$XBPS_CROSS_BASE/usr/lib + export INCLUDE=$XBPS_CROSS_BASE/usr/include + + cp -fr $HOST_PERL_LIBS/auto/* lib/auto/ + make CROSS_PERL=$HOST_PERL DESTDIR=$DESTDIR install + find lib/auto -name .exists -o -name '*.bs' | xargs rm -f + vmkdir usr/lib/perl5/core_perl/auto + cp -fr lib/$XBPS_CROSS_TRIPLET/auto/* \ + ${DESTDIR}/usr/lib/perl5/core_perl/auto/ + find ${DESTDIR} -name .exists |xargs rm -f + rm -rf ${DESTDIR}/usr/share/perl5/core_perl/$XBPS_CROSS_TRIPLET + else + # We use the same defaults than Arch Linux. + make DESTDIR=${DESTDIR} install + fi + + # Set proper perms to shared libs. + find ${DESTDIR} -type f -name \*.so -exec chmod 644 {} \; + + # Make a link from perl${version} to perl. + ln -sf /usr/bin/perl${version} ${DESTDIR}/usr/bin/perl + + ### CPAN Settings ### + # Set CPAN default config to use the site directories. + sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \ + -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \ + -i ${DESTDIR}/usr/share/perl5/core_perl/CPAN/FirstTime.pm + + ### CPANPLUS Settings ### + # Set CPANPLUS default config to use the site directories. + sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \ + -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \ + -i ${DESTDIR}/usr/share/perl5/core_perl/CPANPLUS/Config.pm + + # Remove all pod files *except* those under + # /usr/share/perl5/core_perl/pod/ (FS#16488) + rm -f ${DESTDIR}/usr/share/perl5/core_perl/*.pod + for d in ${DESTDIR}/usr/share/perl5/core_perl/*; do + if [ -d $d -a $(basename $d) != "pod" ]; then + find $d -name *.pod -delete + fi + done + find ${DESTDIR}/usr/lib -name *.pod -delete + find ${DESTDIR} -name .packlist -delete + + # Make a symlink so that libperl.so is accesible. + cd ${DESTDIR}/usr/lib && \ + ln -sf ./perl5/core_perl/CORE/libperl.so libperl.so } diff --git a/srcpkgs/phonon-backend-gstreamer/template b/srcpkgs/phonon-backend-gstreamer/template index a249309098..095ab4d198 100644 --- a/srcpkgs/phonon-backend-gstreamer/template +++ b/srcpkgs/phonon-backend-gstreamer/template @@ -6,18 +6,12 @@ build_style=cmake hostmakedepends="cmake automoc4 pkg-config" makedepends="openssl-devel MesaLib-devel qt-devel phonon-devel gst-plugins-base-devel gst-plugins-good gst-ffmpeg" +depends="desktop-file-utils hicolor-icon-theme gst-plugins-good gst-ffmpeg" +provides="phonon-backend-0_1" +replaces="phonon-backend>=0" short_desc="Phonon GStreamer backend" maintainer="Juan RP " license="LGPL-2.1" homepage="http://phonon.kde.org/" distfiles="http://download.kde.org/stable/phonon/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz" checksum=55e273f113e309f2fc3f316baf4b220562cc8fb37b25193ac257ff1eae7aaf58 - -phonon-backend-gstreamer_package() { - provides="phonon-backend-0_1" - replaces="phonon-backend>=0" - depends="desktop-file-utils hicolor-icon-theme gst-plugins-good gst-ffmpeg" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template index bacac984d7..9b8773ed25 100644 --- a/srcpkgs/phonon/template +++ b/srcpkgs/phonon/template @@ -29,9 +29,3 @@ phonon-devel_package() { vmove usr/share/qt } } - -phonon_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/phoronix-test-suite/template b/srcpkgs/phoronix-test-suite/template index 81c9bf8e2c..ffdf9cd5da 100644 --- a/srcpkgs/phoronix-test-suite/template +++ b/srcpkgs/phoronix-test-suite/template @@ -3,7 +3,9 @@ pkgname=phoronix-test-suite version=4.8.5 revision=1 wrksrc="${pkgname}" +noarch="yes" makedepends="php" +depends="php" short_desc="The most comprehensive testing and benchmarking platform available for Linux" maintainer="Juan RP " license="GPL-3" @@ -17,11 +19,3 @@ do_install() { vmkdir usr/share/${pkgname}/pts-core vcopy "pts-core/*" usr/share/${pkgname}/pts-core } - -phoronix-test-suite_package() { - noarch="yes" - depends="php" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/phorward/template b/srcpkgs/phorward/template index 40c7f35cea..582f770c41 100644 --- a/srcpkgs/phorward/template +++ b/srcpkgs/phorward/template @@ -37,9 +37,3 @@ phorward-docs_package() { vmove usr/share/man } } - -phorward_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/php/template b/srcpkgs/php/template index e6f6e9ee98..13445053b6 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -13,6 +13,7 @@ makedepends="postgresql-libs-devel libldap-devel libvpx-devel sqlite-devel libcurl-devel libxslt-devel openssl-devel bzip2-devel zlib-devel db-devel gmp-devel gdbm-devel freetype-devel systemd-devel apache-devel readline-devel libmysqlclient-devel" +conf_files="/etc/php/php.ini" distfiles="http://www.php.net/distributions/php-${version}.tar.bz2" checksum=a9b7d291199d7e6b90ef1d78eb791d738944d66856e76bde9463ce2645b0e4a4 @@ -163,13 +164,6 @@ do_install() { rm -f ${DESTDIR}/usr/lib/php/modules/*.a } -php_package() { - conf_files="/etc/php/php.ini" - pkg_install() { - vmove all - } -} - php-devel_package() { short_desc+=" - development files" pkg_install() { diff --git a/srcpkgs/physfs/template b/srcpkgs/physfs/template index 99a7c78211..439c6e19c0 100644 --- a/srcpkgs/physfs/template +++ b/srcpkgs/physfs/template @@ -26,9 +26,3 @@ physfs-devel_package() { vmove usr/include } } - -physfs_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pidgin-gpg/template b/srcpkgs/pidgin-gpg/template index 51f69448c5..295634dd9b 100644 --- a/srcpkgs/pidgin-gpg/template +++ b/srcpkgs/pidgin-gpg/template @@ -11,9 +11,3 @@ license="GPL-3" homepage="http://github.com/segler-alex/Pidgin-GPG" distfiles="http://github.com/downloads/segler-alex/Pidgin-GPG/${pkgname}-${version}.tar.gz" checksum=736681cb25da31eb8ced96055d4150d649fe6ef6e523b6f65846c3446ac09a96 - -pidgin-gpg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pidgin-otr/template b/srcpkgs/pidgin-otr/template index 5a3e0870de..9ffc04b8a4 100644 --- a/srcpkgs/pidgin-otr/template +++ b/srcpkgs/pidgin-otr/template @@ -11,9 +11,3 @@ license="GPL-2" homepage="http://www.cypherpunks.ca/otr/" distfiles="http://www.cypherpunks.ca/otr/${pkgname}-${version}.tar.gz" checksum=d56b3f092dbe9ee6597641c7d2dd294884dc04ba47aaf4ec571cd54977df4691 - -pidgin-otr_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pidgin/template b/srcpkgs/pidgin/template index 9ecf9724e0..3c27919bb4 100644 --- a/srcpkgs/pidgin/template +++ b/srcpkgs/pidgin/template @@ -24,6 +24,7 @@ makedepends="libglib-devel gtk+-devel libXext-devel libxml2-devel GConf-devel gst-plugins-base-devel libidn-devel python-devel avahi-glib-libs-devel dbus-glib-devel NetworkManager-devel nss-devel libsasl-devel libXext-devel libSM-devel" +depends="cyrus-sasl-modules" pre_configure() { # Create this to make configure happy. @@ -104,10 +105,3 @@ pidgin-devel_package() { vmove usr/share/man/man3/Pidgin.3p } } - -pidgin_package() { - depends="cyrus-sasl-modules" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pigz/template b/srcpkgs/pigz/template index 30ef36b801..2ef24d8c28 100644 --- a/srcpkgs/pigz/template +++ b/srcpkgs/pigz/template @@ -19,9 +19,3 @@ do_install() { vinstall pigz 755 usr/bin vinstall pigz.1 644 usr/share/man/man1 } - -pigz_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pingus/template b/srcpkgs/pingus/template index edafc91e9c..2603aa8bc2 100644 --- a/srcpkgs/pingus/template +++ b/srcpkgs/pingus/template @@ -19,9 +19,3 @@ do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install vinstall ${FILESDIR}/pingus.desktop 644 usr/share/applications } - -pingus_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pixman/template b/srcpkgs/pixman/template index 6db38d183f..0af990ccb0 100644 --- a/srcpkgs/pixman/template +++ b/srcpkgs/pixman/template @@ -26,9 +26,3 @@ pixman-devel_package() { vmove "usr/lib/*.so" } } - -pixman_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pixz/template b/srcpkgs/pixz/template index f3fe74c745..26ad3a1e79 100644 --- a/srcpkgs/pixz/template +++ b/srcpkgs/pixz/template @@ -22,9 +22,3 @@ do_install() { vinstall pixz 755 usr/bin vinstall pixz.1 644 usr/share/man/man1 } - -pixz_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pkg-config/template b/srcpkgs/pkg-config/template index 23d2b6446f..48b6a0b9f5 100644 --- a/srcpkgs/pkg-config/template +++ b/srcpkgs/pkg-config/template @@ -21,9 +21,3 @@ if [ "$CROSS_BUILD" ]; then ac_cv_func_posix_getgrgid_r=yes ac_cv_func_posix_getgrgid_r=yes" fi - -pkg-config_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template index 7fa3bf2150..f5ce63b5f0 100644 --- a/srcpkgs/poedit/template +++ b/srcpkgs/poedit/template @@ -11,9 +11,3 @@ license="GPL-3" homepage="http://www.poedit.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=24535cac22c8f7fb4f995710f6638ebc26825056076a04210ee66e19d65c0f78 - -poedit_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/polarssl/template b/srcpkgs/polarssl/template index add8dc9f7e..52a97d80e6 100644 --- a/srcpkgs/polarssl/template +++ b/srcpkgs/polarssl/template @@ -28,9 +28,3 @@ polarssl-devel_package() { vmove "usr/lib/*.so" } } - -polarssl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/polipo/template b/srcpkgs/polipo/template index 21ccc0782c..ca03463e4b 100644 --- a/srcpkgs/polipo/template +++ b/srcpkgs/polipo/template @@ -2,6 +2,7 @@ pkgname=polipo version=1.0.4.1 revision=2 +systemd_services="polipo.service on" short_desc="A small and fast caching web proxy" maintainer="Juan RP " license="GPL-2" @@ -30,10 +31,3 @@ do_install() { # systemd service vinstall ${FILESDIR}/polipo.service 644 usr/lib/systemd/system } - -polipo_package() { - systemd_services="polipo.service on" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/polkit-gnome/template b/srcpkgs/polkit-gnome/template index 623f96a691..5806dd2aec 100644 --- a/srcpkgs/polkit-gnome/template +++ b/srcpkgs/polkit-gnome/template @@ -20,9 +20,3 @@ long_desc=" method) for unprivileged (desktop) applications. This package contains the glue to integrate with the GNOME desktop." - -polkit-gnome_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/polkit-kde/template b/srcpkgs/polkit-kde/template index ab43c8f1db..cbb4da96f2 100644 --- a/srcpkgs/polkit-kde/template +++ b/srcpkgs/polkit-kde/template @@ -3,6 +3,8 @@ pkgname=polkit-kde version=0.99.0 revision=1 build_style=cmake +hostmakedepends="cmake automoc4" +makedepends="qt-devel phonon-devel polkit-qt-devel kdelibs-devel" wrksrc="${pkgname}-agent-1-${version}" short_desc="Daemon providing a polkit authentication UI for KDE" maintainer="Juan RP " @@ -10,12 +12,3 @@ homepage="https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1" license="GPL-2" distfiles="http://download.kde.org/stable/apps/KDE4.x/admin/${pkgname}-agent-1-${version}.tar.bz2" checksum=e371ff2698431decc825bb146d638de432f5fffd09046e225270c30dbac1b467 - -hostmakedepends="cmake automoc4" -makedepends="qt-devel phonon-devel polkit-qt-devel kdelibs-devel" - -polkit-kde_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/polkit-qt/template b/srcpkgs/polkit-qt/template index d9ee229cbf..192a11f71f 100644 --- a/srcpkgs/polkit-qt/template +++ b/srcpkgs/polkit-qt/template @@ -25,16 +25,10 @@ long_desc=" polkit-qt-devel_package() { depends="qt-devel polkit-devel polkit-qt>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/lib/cmake } } - -polkit-qt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/polkit/template b/srcpkgs/polkit/template index 919d143e84..e9c424659b 100644 --- a/srcpkgs/polkit/template +++ b/srcpkgs/polkit/template @@ -14,6 +14,8 @@ checksum=d695f43cba4748a822fbe864dd32c4887c5da1c71694a47693ace5e88fcf6af6 hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" makedepends="glib-devel expat-devel pam-devel systemd-devel js-devel shadow" +depends="shadow" +system_accounts="polkitd" pre_configure() { # Drop requirement of /sys/fs/cgroup/systemd test in configure... WTF. @@ -35,11 +37,3 @@ polkit-devel_package() { vmove "usr/lib/*.so" } } - -polkit_package() { - system_accounts="polkitd" - depends="shadow" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/polysh/template b/srcpkgs/polysh/template index a3507ee0e2..ecc38a42e7 100644 --- a/srcpkgs/polysh/template +++ b/srcpkgs/polysh/template @@ -2,7 +2,11 @@ pkgname=polysh version=0.4 revision=2 +noarch="yes" build_style=python-module +makedepends="python-devel" +depends="python>=2.7<3.0 openssh" +pycompile_module="polysh" short_desc="Execute a command in multiple remote shells at once" maintainer="Juan RP " license="GPL-3" @@ -12,14 +16,3 @@ checksum=0456c25c664dad80ebf7bf748a1661fddf5fbea0a3788328621029c4d0b8b04f long_desc=" Polysh is a tool to aggregate several remote shells into one. It is used to launch an interactive remote shell on many machines at once." - -makedepends="python-devel" - -polysh_package() { - noarch="yes" - pycompile_module="polysh" - depends="python>=2.7<3.0 openssh" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/poppler-qt4/template b/srcpkgs/poppler-qt4/template index 5cd9e76c71..98837702cd 100644 --- a/srcpkgs/poppler-qt4/template +++ b/srcpkgs/poppler-qt4/template @@ -12,6 +12,7 @@ configure_args="--enable-zlib --enable-libcurl --enable-libjpeg hostmakedepends="pkg-config" makedepends="libpng-devel>=1.5.10 tiff-devel lcms2-devel libcurl-devel fontconfig-devel cairo-devel qt-devel>=4.8.2_2" +depends="poppler-data qt>=4.8.2_2" short_desc="PDF rendering library - QT bindings" maintainer="Juan RP " license="GPL-2" @@ -45,10 +46,3 @@ poppler-qt4-devel_package() { rm -rf ${DESTDIR}/usr/include } } - -poppler-qt4_package() { - depends="poppler-data qt>=4.8.2_2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index a67105adf3..feeb5e767a 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -8,6 +8,7 @@ configure_args="--enable-zlib --enable-libcurl --enable-libjpeg --enable-xpdf-headers --disable-poppler-qt4 --disable-gtk-test" hostmakedepends="pkg-config poppler-data" makedepends="libpng-devel>=1.6 glib-devel cairo-devel tiff-devel lcms2-devel libcurl-devel" +depends="poppler-data" short_desc="PDF rendering library" maintainer="Juan RP " license="GPL-2" @@ -113,10 +114,3 @@ poppler-utils_package() { vmove usr/share/man } } - -poppler_package() { - depends="poppler-data" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/popt/template b/srcpkgs/popt/template index e824492e6e..7dc194c804 100644 --- a/srcpkgs/popt/template +++ b/srcpkgs/popt/template @@ -13,16 +13,10 @@ checksum=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 popt-devel_package() { depends="popt>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/man/man3 } } - -popt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/portaudio/template b/srcpkgs/portaudio/template index e79ec561fb..f88ce32004 100644 --- a/srcpkgs/portaudio/template +++ b/srcpkgs/portaudio/template @@ -23,7 +23,7 @@ makedepends="alsa-lib-devel jack-devel" portaudio-devel_package() { depends="portaudio>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove "usr/include/*.h" vmove usr/lib/pkgconfig/portaudio-2.0.pc @@ -31,7 +31,7 @@ portaudio-devel_package() { } portaudiocpp_package() { - short_desc="${short_desc} - C++ Bindings" + short_desc+=" - C++ Bindings" pkg_install() { vmove "usr/lib/libportaudiocpp.so*" } @@ -39,16 +39,10 @@ portaudiocpp_package() { portaudiocpp-devel_package() { depends="portaudiocpp>=${version} portaudio-devel>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include/portaudiocpp vmove usr/lib/pkgconfig/portaudiocpp.pc vmove "usr/lib/libportaudiocpp.a*" } } - -portaudio_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template index b44ea08f08..26bfaadc03 100644 --- a/srcpkgs/postfix/template +++ b/srcpkgs/postfix/template @@ -11,13 +11,49 @@ checksum=f1a735a5a9ffeac8fca59046c437c3b76e7f923fb4249db2a55b2bff0306ddd4 hostmakedepends="perl" makedepends="openssl-devel db-devel>=5.3 pcre-devel>=8.30 libsasl-devel - libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel sqlite-devel" + libldap-devel libmysqlclient-devel>=5.5.27 postgresql-libs-devel + sqlite-devel shadow" if [ "$CROSS_BUILD" ]; then # XXX postfix-install needs native binaries. hostmakedepends+=" ${pkgname}>=2.10.2" fi +conf_files=" + /etc/postfix/access + /etc/postfix/aliases + /etc/postfix/canonical + /etc/postfix/generic + /etc/postfix/header_checks + /etc/postfix/main.cf + /etc/postfix/master.cf + /etc/postfix/relocated + /etc/postfix/transport + /etc/postfix/virtual" +depends="shadow" +systemd_services="postfix.service true" +system_accounts="postfix" +postfix_homedir="/var/spool/postfix" +system_groups="postdrop" +provides="smtp-server-0_1" +replaces="smtp-server>=0" +make_dirs=" + /var/lib/postfix 0750 postfix root + /var/spool/postfix/active 0750 postfix root + /var/spool/postfix/bounce 0750 postfix root + /var/spool/postfix/corrupt 0750 postfix root + /var/spool/postfix/defer 0750 postfix root + /var/spool/postfix/deferred 0750 postfix root + /var/spool/postfix/flush 0750 postfix root + /var/spool/postfix/hold 0750 postfix root + /var/spool/postfix/incoming 0750 postfix root + /var/spool/postfix/private 0750 postfix root + /var/spool/postfix/maildrop 0750 postfix postdrop + /var/spool/postfix/public 0750 postfix postdrop + /var/spool/postfix/pid 0750 root root + /var/spool/postfix/saved 0750 postfix root + /var/spool/postfix/trace 0750 postfix root" + do_build() { sed -e "s,\(/usr/include/db.h\),${XBPS_CROSS_BASE}/\1,g" -i makedefs @@ -71,43 +107,3 @@ do_install() { # systemd. vinstall ${FILESDIR}/postfix.service 644 usr/lib/systemd/system } - -postfix_package() { - conf_files=" - /etc/postfix/access - /etc/postfix/aliases - /etc/postfix/canonical - /etc/postfix/generic - /etc/postfix/header_checks - /etc/postfix/main.cf - /etc/postfix/master.cf - /etc/postfix/relocated - /etc/postfix/transport - /etc/postfix/virtual" - depends="shadow" - systemd_services="postfix.service true" - system_accounts="postfix" - postfix_homedir="/var/spool/postfix" - system_groups="postdrop" - provides="smtp-server-0_1" - replaces="smtp-server>=0" - make_dirs=" - /var/lib/postfix 0750 postfix root - /var/spool/postfix/active 0750 postfix root - /var/spool/postfix/bounce 0750 postfix root - /var/spool/postfix/corrupt 0750 postfix root - /var/spool/postfix/defer 0750 postfix root - /var/spool/postfix/deferred 0750 postfix root - /var/spool/postfix/flush 0750 postfix root - /var/spool/postfix/hold 0750 postfix root - /var/spool/postfix/incoming 0750 postfix root - /var/spool/postfix/private 0750 postfix root - /var/spool/postfix/maildrop 0750 postfix postdrop - /var/spool/postfix/public 0750 postfix postdrop - /var/spool/postfix/pid 0750 root root - /var/spool/postfix/saved 0750 postfix root - /var/spool/postfix/trace 0750 postfix root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template index d74221cd82..af6ea03816 100644 --- a/srcpkgs/postgresql/template +++ b/srcpkgs/postgresql/template @@ -22,7 +22,18 @@ long_desc=" hostmakedepends="flex" makedepends="libfl-devel readline-devel openssl-devel perl>=5.16 - tcl-devel>=8.6 python-devel libxml2-devel libxslt-devel pam-devel" + tcl-devel>=8.6 python-devel libxml2-devel libxslt-devel pam-devel shadow" +depends="shadow" +conf_files=" + /etc/default/${pkgname} + /etc/pam.d/${pkgname} + /etc/${pkgname}/${pkgname}.conf" +systemd_services="${pkgname}.service on" +# Create 'postgres' user for the server. +system_accounts="postgres" +postgres_homedir="/var/lib/${pkgname}" +postgres_shell="/bin/sh" +postgres_descr="PostgreSQL database server user" if [ "$CROSS_BUILD" ]; then CPPFLAGS="-I$XBPS_CROSS_BASE/usr/include/libxml2" @@ -144,20 +155,3 @@ postgresql-client_package() { ${PKGDESTDIR}/usr/share/postgresql } } - -postgresql_package() { - conf_files=" - /etc/default/${pkgname} - /etc/pam.d/${pkgname} - /etc/${pkgname}/${pkgname}.conf" - systemd_services="${pkgname}.service on" - # Create 'postgres' user for the server. - system_accounts="postgres" - postgres_homedir="/var/lib/${pkgname}" - postgres_shell="/bin/sh" - postgres_descr="PostgreSQL database server user" - depends="shadow" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/potrace/template b/srcpkgs/potrace/template index 5242f3893f..0809f8a7cf 100644 --- a/srcpkgs/potrace/template +++ b/srcpkgs/potrace/template @@ -36,9 +36,3 @@ potrace-devel_package() { vmove "usr/lib/*.a" } } - -potrace_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/powertop/template b/srcpkgs/powertop/template index 35769f6e69..0b68a85e67 100644 --- a/srcpkgs/powertop/template +++ b/srcpkgs/powertop/template @@ -11,9 +11,3 @@ license="GPL-2" homepage="https://01.org/powertop/" distfiles="http://01.org/powertop/sites/default/files/downloads/${pkgname}-${version}.tar.gz" checksum=8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b - -powertop_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ppl/template b/srcpkgs/ppl/template index 70777ff4e1..27f1058dd8 100644 --- a/srcpkgs/ppl/template +++ b/srcpkgs/ppl/template @@ -33,9 +33,3 @@ ppl-devel_package() { vmove "usr/lib/*.a" } } - -ppl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ppp/template b/srcpkgs/ppp/template index 365ccb4ced..361386ffc8 100644 --- a/srcpkgs/ppp/template +++ b/srcpkgs/ppp/template @@ -15,6 +15,12 @@ long_desc=" CFLAGS="-D_GNU_SOURCE" makedepends="libpcap-devel" +conf_files=" + /etc/ppp/ip-up + /etc/ppp/chap-secrets + /etc/ppp/options + /etc/ppp/ip-down + /etc/ppp/pap-secrets" do_configure() { # Custom CFLAGS. @@ -85,16 +91,3 @@ ppp-devel_package() { vmove usr/include } } - -ppp_package() { - conf_files=" - /etc/ppp/ip-up - /etc/ppp/chap-secrets - /etc/ppp/options - /etc/ppp/ip-down - /etc/ppp/pap-secrets" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/prelink/template b/srcpkgs/prelink/template index 6c8dcb03a6..a8f0a785d6 100644 --- a/srcpkgs/prelink/template +++ b/srcpkgs/prelink/template @@ -16,9 +16,3 @@ long_desc=" POSIX-compliant operating systems, principally Linux (because it modifies ELF executables). It is intended to speed up a system by reducing the time a program needs to begin." - -prelink_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/presentproto/template b/srcpkgs/presentproto/template index 1dbb684888..feaa9ea8a8 100644 --- a/srcpkgs/presentproto/template +++ b/srcpkgs/presentproto/template @@ -2,6 +2,7 @@ pkgname=presentproto version=1.0 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Present extension headers from X.org" maintainer="Juan RP " @@ -9,10 +10,3 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=812c7d48721f909a0f7a2cb1e91f6eead76159a36c4712f4579ca587552839ce - -presentproto_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/primus/template b/srcpkgs/primus/template index bc693d8fad..bf68a045a3 100644 --- a/srcpkgs/primus/template +++ b/srcpkgs/primus/template @@ -25,9 +25,3 @@ do_install() { vinstall primusrun.1 644 usr/share/man/man1 vinstall LICENSE.txt 644 usr/share/licenses/$pkgname LICENSE } - -primus_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/printproto/template b/srcpkgs/printproto/template index f06c307ffb..a09a2796c9 100644 --- a/srcpkgs/printproto/template +++ b/srcpkgs/printproto/template @@ -2,6 +2,7 @@ pkgname=printproto version=1.0.4 revision=3 +noarch="yes" build_style=gnu-configure short_desc="Print extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=f059a93188e7143dbb6cc55e31ccf81b976776aa3023bfa57f47501fd1bfd3be -long_desc=" - Definitions needed by the X Print server, library, and clients." - -printproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/procps-ng/template b/srcpkgs/procps-ng/template index c75117591f..34d4369afc 100644 --- a/srcpkgs/procps-ng/template +++ b/srcpkgs/procps-ng/template @@ -9,6 +9,7 @@ configure_args="--exec-prefix=/ --bindir=/usr/bin --sbindir=/usr/sbin ac_cv_func_strtod=yes ac_cv_func_mmap_fixed_mapped=yes" hostmakedepends="pkg-config" makedepends="ncurses-devel systemd-devel" +conflicts="coreutils<8.21_3" short_desc="Utilities for monitoring your system and its processes" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -26,10 +27,3 @@ post_install() { ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig rm -f ${DESTDIR}/usr/lib/*.so } - -procps-ng_package() { - conflicts="coreutils<8.21_3" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/profile-cleaner/template b/srcpkgs/profile-cleaner/template index fa7cf5c6c4..7763163d3d 100644 --- a/srcpkgs/profile-cleaner/template +++ b/srcpkgs/profile-cleaner/template @@ -2,9 +2,11 @@ pkgname=profile-cleaner version=2.25 revision=1 +noarch="yes" build_style=gnu-makefile short_desc="Reduces profile size by cleaning their sqlite databases" makedepends="sqlite bc parallel findutils" +depends="sqlite bc parallel findutils" maintainer="graysky " license="MIT" homepage="https://github.com/graysky2/profile-cleaner" @@ -14,11 +16,3 @@ checksum=6fa00d24253910bb460d4b60969d65079efbf9208286e6c641d722f9874412f6 post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -profile-cleaner_package() { - noarch="yes" - depends="sqlite bc parallel findutils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/profile-sync-daemon/template b/srcpkgs/profile-sync-daemon/template index a1e2fd89d8..becd9bcf11 100644 --- a/srcpkgs/profile-sync-daemon/template +++ b/srcpkgs/profile-sync-daemon/template @@ -2,6 +2,10 @@ pkgname=profile-sync-daemon version=5.44 revision=1 +noarch="yes" +conf_files="/etc/psd.conf" +makedepends="rsync" +depends="${makedepends}" short_desc="Syncs browser profiles to tmpfs" maintainer="graysky " license="MIT" @@ -16,12 +20,3 @@ do_install() { make DESTDIR="$DESTDIR" install-systemd-all install -Dm644 MIT "$DESTDIR/usr/share/licenses/$pkgname/LICENSE" } - -profile-sync-daemon_package() { - noarch="yes" - conf_files="/etc/psd.conf" - depends="rsync" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/proot/template b/srcpkgs/proot/template index 54362270d6..38e6bf3d7f 100644 --- a/srcpkgs/proot/template +++ b/srcpkgs/proot/template @@ -23,9 +23,3 @@ do_install() { vinstall src/proot 755 usr/bin vinstall doc/proot.1 644 usr/share/man/man1 } - -proot_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/proplib/template b/srcpkgs/proplib/template index 77c942a8bb..35b15e3985 100644 --- a/srcpkgs/proplib/template +++ b/srcpkgs/proplib/template @@ -21,9 +21,3 @@ proplib-devel_package() { vmove usr/lib/pkgconfig } } - -proplib_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/protobuf-vala/template b/srcpkgs/protobuf-vala/template index 3a70959fcd..e888ae479c 100644 --- a/srcpkgs/protobuf-vala/template +++ b/srcpkgs/protobuf-vala/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config libgee08-devel protobuf-devel vala-devel" +depends="pkg-config glib-devel" short_desc="A plugin for the Google protocol buffer compiler to generate Vala code" maintainer="pancake " license="GPL-3" @@ -15,15 +16,8 @@ checksum=c12547813fa22ee2b15967f17146b08e2a4d90800810fe63730332aea6777c48 disable_parallel_build=yes libprotobuf-vala_package() { - short_desc="${short_desc} -- shared library" + short_desc+=" - shared library" pkg_install() { vmove "usr/lib/*.so*" } } - -protobuf-vala_package() { - depends="pkg-config glib-devel" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/protobuf/template b/srcpkgs/protobuf/template index dfc5b14af9..76ae30269f 100644 --- a/srcpkgs/protobuf/template +++ b/srcpkgs/protobuf/template @@ -32,9 +32,3 @@ protobuf-lite_package() { vmove "usr/lib/libprotobuf-lite.so*" } } - -protobuf_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/psmisc/template b/srcpkgs/psmisc/template index 8a24b5b901..37c429170a 100644 --- a/srcpkgs/psmisc/template +++ b/srcpkgs/psmisc/template @@ -3,6 +3,9 @@ pkgname=psmisc version=22.20 revision=1 build_style=gnu-configure +configure_args="ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_realloc_0_nonnull=yes + ac_cv_func_memcmp_working=yes" makedepends="ncurses-devel" short_desc="Small set of utilities that use the linux proc filesystem" maintainer="Juan RP " @@ -10,13 +13,3 @@ homepage="http://psmisc.sourceforge.net/index.html" license="GPL-2" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=b17224e2385f6a799ffebba27eb7870771d42555e86814ef56b6d7e955765514 - -configure_args="ac_cv_func_malloc_0_nonnull=yes - ac_cv_func_realloc_0_nonnull=yes - ac_cv_func_memcmp_working=yes" - -psmisc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index a1d642f3dd..1a1b058475 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -14,6 +14,12 @@ makedepends="zlib-devel libltdl-devel glib-devel libudev-devel speex-devel libXi libsamplerate-devel json-c-devel>=0.11_2 orc-devel jack-devel fftw-devel systemd-devel webrtc-audio-processing-devel sbc-devel libcap-progs libxcb-devel libXtst-devel libSM-devel rtkit" +depends="rtkit" +conf_files=" + /etc/pulse/system.pa + /etc/pulse/daemon.conf + /etc/pulse/client.conf + /etc/pulse/default.pa" short_desc="A featureful, general-purpose sound server" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/PulseAudio" @@ -75,15 +81,3 @@ pulseaudio-devel_package() { vmove usr/share/vala } } - -pulseaudio_package() { - depends="rtkit" - conf_files=" - /etc/pulse/system.pa - /etc/pulse/daemon.conf - /etc/pulse/client.conf - /etc/pulse/default.pa" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/putty/template b/srcpkgs/putty/template index 71c7627177..34bdb2bb96 100644 --- a/srcpkgs/putty/template +++ b/srcpkgs/putty/template @@ -11,9 +11,3 @@ license="MIT" homepage="http://www.chiark.greenend.org.uk/~sgtatham/putty/" distfiles="http://the.earth.li/~sgtatham/putty/latest/putty-${version}.tar.gz" checksum=81e8eaaf31be7d9a46b4f3fb80d1d9540776f142cd89d0a11f2f8082dc68f8b5 - -putty_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/py2cairo/template b/srcpkgs/py2cairo/template index 535ced8862..99afada837 100644 --- a/srcpkgs/py2cairo/template +++ b/srcpkgs/py2cairo/template @@ -5,6 +5,9 @@ revision=2 build_style=waf hostmakedepends="pkg-config which" makedepends="cairo-devel python-devel" +depends="python" +replaces="pycairo<1.10" +pycompile_module="cairo" short_desc="Python2 bindings for the cairo graphics library" homepage="http://cairographics.org/pycairo/" license="LGPL-3" @@ -21,12 +24,3 @@ py2cairo-devel_package() { vmove usr/lib/pkgconfig } } - -py2cairo_package() { - replaces="pycairo<1.10" - depends="python" - pycompile_module="cairo" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pyatspi/template b/srcpkgs/pyatspi/template index 10c65cb9af..cc238337a8 100644 --- a/srcpkgs/pyatspi/template +++ b/srcpkgs/pyatspi/template @@ -2,21 +2,15 @@ pkgname=pyatspi version=2.10.0 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" makedepends="at-spi2-core-devel>=2.10 pygobject-devel>=3.10" +depends="at-spi2-core>=2.10 pygobject>=3.10" +pycompile_module="pyatspi" short_desc="Python bindings for AT-SPI" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=42f89ddb9a236448503573e4cd1ddb174e233e005316de9acdb957eb1aa9ad84 - -pyatspi_package() { - noarch="yes" - pycompile_module="pyatspi" - depends="at-spi2-core>=2.10 pygobject>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pycairo/template b/srcpkgs/pycairo/template index 783c85f140..09c84dd796 100644 --- a/srcpkgs/pycairo/template +++ b/srcpkgs/pycairo/template @@ -20,9 +20,3 @@ pycairo-devel_package() { vmove usr/lib/pkgconfig } } - -pycairo_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pycrypto/template b/srcpkgs/pycrypto/template index a8c39f3dd4..f476e8db11 100644 --- a/srcpkgs/pycrypto/template +++ b/srcpkgs/pycrypto/template @@ -5,6 +5,7 @@ revision=1 build_style=python-module hostmakedepends="python" makedepends="gmp-devel python-devel" +pycompile_module="Crypto" short_desc="The Python Cryptography Toolkit" maintainer="Juan RP " homepage="https://www.dlitz.net/software/pycrypto/" @@ -22,10 +23,3 @@ pre_build() { fi CC= CFLAGS= ./configure ${configure_args} } - -pycrypto_package() { - pycompile_module="Crypto" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pycups/template b/srcpkgs/pycups/template index 8b6ffa27e3..fd187a5f77 100644 --- a/srcpkgs/pycups/template +++ b/srcpkgs/pycups/template @@ -11,9 +11,3 @@ homepage="http://cyberelk.net/tim/software/pycups/" license="GPL-2" distfiles="http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=7cad7d676d6e4b759d07ecefe2519cb438a7d074e67b4103efdeff8247cc51ab - -pycups_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pycurl/template b/srcpkgs/pycurl/template index 01f2959daa..e6ae622ae5 100644 --- a/srcpkgs/pycurl/template +++ b/srcpkgs/pycurl/template @@ -4,6 +4,7 @@ version=7.19.0 revision=3 build_style=python-module makedepends="openssl-devel libcurl-devel python-devel" +pycompile_module="curl" short_desc="Python interface to the CURL library" homepage="http://pycurl.sourceforge.net/" license="LGPL-2.1/MIT" @@ -14,10 +15,3 @@ long_desc=" PycURL is a Python interface to libcurl. PycURL can be used to fetch objects identified by a URL from a Python program, similar to the urllib Python module. PycURL is mature, very fast, and supports a lot of features." - -pycurl_package() { - pycompile_module="curl" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pygobject/template b/srcpkgs/pygobject/template index d77ce1ede4..66cb61b367 100644 --- a/srcpkgs/pygobject/template +++ b/srcpkgs/pygobject/template @@ -4,6 +4,8 @@ version=3.10.2 revision=1 hostmakedepends="which pkg-config gobject-introspection>=1.38" makedepends="py2cairo-devel>=1.10.0_2 pycairo-devel>=1.10.0_3 libglib-devel" +depends="py2cairo>=1.10.0_2" +pycompile_module="gi pygtkcompat" short_desc="Python bindings for GObject" homepage="http://www.pygtk.org/" license="LGPL-2.1" @@ -67,8 +69,6 @@ pygobject-devel_package() { } pygobject_package() { - pycompile_module="gi pygtkcompat" - depends="py2cairo>=1.10.0_2" pkg_install() { rm -rf ${DESTDIR}/python3 vmove all diff --git a/srcpkgs/pygobject2/template b/srcpkgs/pygobject2/template index b7a778c077..ae3bfd817d 100644 --- a/srcpkgs/pygobject2/template +++ b/srcpkgs/pygobject2/template @@ -7,6 +7,9 @@ build_style=gnu-configure configure_args="--disable-introspection" hostmakedepends="pkg-config" makedepends="libffi-devel libglib-devel cairo-devel python-devel py2cairo-devel" +depends="cairo python py2cairo" +pycompile_module="glib gobject gtk-2.0 pygtk" +replaces="pygobject<3.0.0" short_desc="Python bindings for GObject (GLib 2.x)" homepage="http://www.pygtk.org/" license="LGPL-2.1" @@ -25,12 +28,3 @@ pygobject2-devel_package() { vmove usr/share } } - -pygobject2_package() { - depends="cairo python py2cairo" - pycompile_module="glib gobject gtk-2.0 pygtk" - replaces="pygobject<3.0.0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template index 9e84e6a935..bf1fc560f2 100644 --- a/srcpkgs/pygtk/template +++ b/srcpkgs/pygtk/template @@ -6,6 +6,8 @@ build_style=gnu-configure # XXX: missing python-numpy build dep hostmakedepends="pkg-config" makedepends="python-devel gtk+-devel libxml2-devel pygobject2-devel>=2.28.6_6" +depends="python pygobject2 py2cairo" +pycompile_module="gtk-2.0/gtk" short_desc="Python bindings for the GTK+ toolkit" homepage="http://www.pygtk.org" license="LGPL-2.1" @@ -29,11 +31,3 @@ pygtk-devel_package() { vmove usr/lib/pygtk } } - -pygtk_package() { - depends="python pygobject2 py2cairo" - pycompile_module="gtk-2.0/gtk" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pygtksourceview/template b/srcpkgs/pygtksourceview/template index d4f75e3de0..b526556aa3 100644 --- a/srcpkgs/pygtksourceview/template +++ b/srcpkgs/pygtksourceview/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--disable-static --disable-docs" makedepends="pkg-config intltool gtksourceview2-devel>=2.10.5_2 pygtk-devel" +depends="pygtk" short_desc="Python bindings for gtksourceview2" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -17,10 +18,3 @@ long_desc=" highlighting and other features typical of a source editor. This package contains the python bindings for gtksourceview (GTK+2)." - -pygtksourceview_package() { - depends="pygtk" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pyopenssl/template b/srcpkgs/pyopenssl/template index da83afcdc5..0d223d7bb4 100644 --- a/srcpkgs/pyopenssl/template +++ b/srcpkgs/pyopenssl/template @@ -5,6 +5,7 @@ revision=3 wrksrc="pyOpenSSL-${version}" build_style=python-module makedepends="openssl-devel python-devel" +pycompile_module="OpenSSL" short_desc="Python interface to the OpenSSL library" maintainer="Juan RP " homepage="https://launchpad.net/pyopenssl" @@ -15,10 +16,3 @@ long_desc=" Includes: SSL Context objects, SSL Connection objects, using Python sockets as transport layer. The Connection object wraps all the socket methods and can therefore be used interchangeably." - -pyopenssl_package() { - pycompile_module="OpenSSL" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pypy/template b/srcpkgs/pypy/template index 2db5372f0b..e0eb494b56 100644 --- a/srcpkgs/pypy/template +++ b/srcpkgs/pypy/template @@ -19,9 +19,3 @@ do_install() { mkdir -p ${DESTDIR}/usr/bin cp -f pypy-c ${DESTDIR}/usr/bin } - -pypy_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pysmbc/template b/srcpkgs/pysmbc/template index aa8c91559d..1b71b1b5d2 100644 --- a/srcpkgs/pysmbc/template +++ b/srcpkgs/pysmbc/template @@ -11,9 +11,3 @@ homepage="http://pypi.python.org/pypi/pysmbc/" license="GPL-2" distfiles="http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=479fbb70d97fb64208d95975dc745f06f75661f954a8cbb988fe8b5bce4f379b - -pysmbc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pysqlite/template b/srcpkgs/pysqlite/template index 45c1f5d1e1..97b9b96d9a 100644 --- a/srcpkgs/pysqlite/template +++ b/srcpkgs/pysqlite/template @@ -4,6 +4,7 @@ version=2.6.0 revision=3 build_style=python-module makedepends="sqlite-devel python-devel" +pycompile_module="pysqlite2" short_desc="DB-API 2.0 interface for SQLite databases" homepage="https://code.google.com/p/pysqlite/" license="MIT" @@ -16,10 +17,3 @@ long_desc=" post_install() { rm -r ${DESTDIR}/usr/pysqlite* } - -pysqlite_package() { - pycompile_module="pysqlite2" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template index b73d76f024..42d945e7ce 100644 --- a/srcpkgs/python-Markdown/template +++ b/srcpkgs/python-Markdown/template @@ -6,18 +6,12 @@ wrksrc="Markdown-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="markdown" +depends="python>=2.7" short_desc="Python implementation of John Gruber's Markdown" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/Markdown" license="BSD" distfiles="http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz" checksum=f8b9a1efceab71afe9336a7c456fde36bfb0f505fb664ebb7f3dd44eddab44b6 - -python-Markdown_package() { - noarch="yes" - pycompile_module="markdown" - depends="python>=2.7" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-MarkupSafe/template b/srcpkgs/python-MarkupSafe/template index d73162aa29..cd54431999 100644 --- a/srcpkgs/python-MarkupSafe/template +++ b/srcpkgs/python-MarkupSafe/template @@ -6,16 +6,10 @@ wrksrc="MarkupSafe-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +pycompile_module="markupsafe" short_desc="Implements a XML/HTML/XHTML Markup safe string for Python" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/MarkupSafe" license="MIT" distfiles="http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${version}.tar.gz" checksum=339ec04d20ad9cdccbfe9f38dce6182cc504ce789e5d0f9647eaa752f0f95300 - -python-MarkupSafe_package() { - pycompile_module="markupsafe" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-Pygments/template b/srcpkgs/python-Pygments/template index 06911ccfd4..daed40dbda 100644 --- a/srcpkgs/python-Pygments/template +++ b/srcpkgs/python-Pygments/template @@ -5,18 +5,12 @@ revision=1 wrksrc="Pygments-${version}" build_style=python-module makedepends="python-devel python-distribute" +noarch="yes" +pycompile_module="pygments" +depends="python>=2.7 python-distribute" short_desc="Python syntax highlighter" maintainer="Juan RP " homepage="http://pygments.org/" license="BSD" distfiles="http://pypi.python.org/packages/source/P/Pygments/Pygments-${version}.tar.gz" checksum=799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0 - -python-Pygments_package() { - noarch="yes" - pycompile_module="pygments" - depends="python>=2.7 python-distribute" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-Unidecode/template b/srcpkgs/python-Unidecode/template index d97ace9bbe..dc753efd95 100644 --- a/srcpkgs/python-Unidecode/template +++ b/srcpkgs/python-Unidecode/template @@ -6,18 +6,12 @@ wrksrc="Unidecode-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="unidecode" +depends="python>=2.7" short_desc="Python ASCII transliterations of Unicode text" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/Unidecode" license="GPL" distfiles="https://pypi.python.org/packages/source/U/Unidecode/Unidecode-${version}.tar.gz" checksum="ca58bf0ce984a20ad3a5d7fdbb7e773d8d1e5fd1570951e47c1908eed8fe0442" - -python-Unidecode_package() { - noarch="yes" - pycompile_module="unidecode" - depends="python>=2.7" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-audioread/template b/srcpkgs/python-audioread/template index ec5183458b..d22bc1a4d3 100644 --- a/srcpkgs/python-audioread/template +++ b/srcpkgs/python-audioread/template @@ -2,22 +2,16 @@ pkgname=python-audioread version=1.0.1 revision=1 +noarch="yes" distfiles="https://github.com/sampsyo/audioread/archive/v${version}.tar.gz" checksum="0e6d0f13bdb8e462a84722050f02538eade9e5c6d8da94aa7cdfa2552af15df6" build_style=python-module hostmakedepends="python-devel python-distribute" makedepends="python-devel" +depends="python>=2.7 gst-python" +pycompile_module="audioread" wrksrc="audioread-${version}" maintainer="Steven R " homepage="https://github.com/sampsyo/audioread" license="MIT" short_desc="Cross-library (GStreamer + Core Audio + MAD + FFmpeg) audio decoding for Python" - -python-audioread_package() { - noarch="yes" - depends="python>=2.7 gst-python" - pycompile_module="audioread" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-babel/template b/srcpkgs/python-babel/template index ea9241580a..22664c19fb 100644 --- a/srcpkgs/python-babel/template +++ b/srcpkgs/python-babel/template @@ -2,20 +2,14 @@ pkgname=python-babel version=0.9.6 revision=2 +noarch=yes wrksrc="Babel-${version}" build_style=python-module makedepends="python-devel python-distribute" +pycompile_module="babel" short_desc="A collection of tools for internationalizing Python applications" maintainer="Juan RP " homepage="http://babel.edgewall.org/" license="BSD" distfiles="http://ftp.edgewall.com/pub/babel/Babel-${version}.tar.gz" checksum=4a3a085ecf1fcd2736573538ffa114f1f4331b3bbbdd69381e6e172c49c9750f - -python-babel_package() { - noarch=yes - pycompile_module="babel" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-blinker/template b/srcpkgs/python-blinker/template index 11fe58fefe..9ee7900e9f 100644 --- a/srcpkgs/python-blinker/template +++ b/srcpkgs/python-blinker/template @@ -6,18 +6,12 @@ wrksrc="blinker-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +depends="python>=2.7" +noarch="yes" +pycompile_module="blinker" short_desc="Fast, simple object-to-object and broadcast signaling for Python" maintainer="Juan RP " homepage="http://discorporate.us/projects/Blinker/" license="MIT" distfiles="http://pypi.python.org/packages/source/b/blinker/blinker-${version}.tar.gz" checksum=7062c05e9f724e2208835e335df5ffdc169004fe372ca91fb6408cd0f8e3aa85 - -python-blinker_package() { - noarch="yes" - pycompile_module="blinker" - depends="python>=2.7" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-decorator/template b/srcpkgs/python-decorator/template index dd9c3b379e..ff46270c43 100644 --- a/srcpkgs/python-decorator/template +++ b/srcpkgs/python-decorator/template @@ -5,20 +5,12 @@ revision=1 wrksrc="decorator-${version}" build_style=python-module makedepends="python-devel" +noarch="yes" +depends="python" +pycompile_module="decorator.py" short_desc="Python Decorator module" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/decorator" license="BSD" distfiles="http://pypi.python.org/packages/source/d/decorator/decorator-$version.tar.gz" checksum=c878e3c9a4015893fddcc7a145017bd54bd51cda0eb234cab6a20fa02540cb1f -long_desc=" - This package contains $pkgname: a Python Decorator module." - -python-decorator_package() { - noarch="yes" - depends="python" - pycompile_module="decorator.py" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-distribute/template b/srcpkgs/python-distribute/template index 78c8a3a6a5..1dddc7afea 100644 --- a/srcpkgs/python-distribute/template +++ b/srcpkgs/python-distribute/template @@ -5,20 +5,12 @@ revision=1 wrksrc="distribute-${version}" build_style=python-module makedepends="python-devel" +noarch="yes" +depends="python" +pycompile_module="pkg_resources.py easy_install.py site.py setuptools" short_desc="A collection of extensions to the Python distutils" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/distribute" license="PSF" distfiles="http://pypi.python.org/packages/source/d/distribute/distribute-$version.tar.gz" checksum=a42e897551aeb7600708f4aa6a0c02acb4458613976234b7d4fad7ae841a8d63 -long_desc=" - Extensions to the python-distutils for large or complex distributions." - -python-distribute_package() { - noarch="yes" - depends="python" - pycompile_module="pkg_resources.py easy_install.py site.py setuptools" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-distutils-extra/template b/srcpkgs/python-distutils-extra/template index bffe3c7fc3..55afdb7cfc 100644 --- a/srcpkgs/python-distutils-extra/template +++ b/srcpkgs/python-distutils-extra/template @@ -4,6 +4,9 @@ version=2.37 revision=1 build_style=python-module makedepends="python-distribute intltool" +depends="python python-distribute" +noarch="yes" +pycompile_module="DistUtilsExtra" short_desc="Enhancements to the Python build system" maintainer="davehome " homepage="https://launchpad.net/python-distutils-extra" @@ -15,12 +18,3 @@ long_desc=" Enables you to easily integrate gettext support, themed icons and scrollkeeper-based documentation into Python's distutils." - -python-distutils-extra_package() { - depends="python python-distribute" - noarch="yes" - pycompile_module="DistUtilsExtra" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template index 3b44f8e47d..ed63ca4cf4 100644 --- a/srcpkgs/python-docutils/template +++ b/srcpkgs/python-docutils/template @@ -5,18 +5,12 @@ wrksrc="docutils-${version}" revision=1 build_style=python-module makedepends="python" +depends="${makedepends}" +noarch="yes" +pycompile_module="docutils" short_desc="Text processing system to convert to various formats" maintainer="pancake " homepage="http://docutils.sourceforge.net" license="GPL-3" distfiles="${SOURCEFORGE_SITE}/docutils/docutils-${version}.tar.gz" checksum=370624e61b6773da2f2fb17cc2a4eaea4bb596c3585d13f75ff193c1c738603e - -python-docutils_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="docutils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-dulwich/template b/srcpkgs/python-dulwich/template index 19fcaabf3c..4788a77e50 100644 --- a/srcpkgs/python-dulwich/template +++ b/srcpkgs/python-dulwich/template @@ -5,16 +5,10 @@ revision=1 wrksrc="dulwich-${version}" build_style=python-module makedepends="python-devel" +pycompile_module="dulwich" short_desc="Python implementation of the Git file formats and protocols" maintainer="Juan RP " homepage="http://samba.org/~jelmer/dulwich/" license="GPL-2" distfiles="http://samba.org/~jelmer/dulwich/dulwich-${version}.tar.gz" checksum=546d2840199500dc270da5bda456df68de4d1733f8b184bf425c5e560f988b6a - -python-dulwich_package() { - pycompile_module="dulwich" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-ecdsa/template b/srcpkgs/python-ecdsa/template index 219f4ac59b..fb0401f30b 100644 --- a/srcpkgs/python-ecdsa/template +++ b/srcpkgs/python-ecdsa/template @@ -6,17 +6,11 @@ wrksrc="${pkgname/python-/}-${version}" build_style=python-module hostmakedepends="python" makedepends="python-devel python-setuptools" +noarch="yes" +pycompile_module="ecdsa" short_desc="Python Implementation of ECDSA" maintainer="Juan RP " homepage="https://github.com/warner/python-ecdsa" license="MIT" distfiles="http://pypi.python.org/packages/source/e/ecdsa/ecdsa-$version.tar.gz" checksum=67dae9e1af2b0fd71bc9a378654f7dc89211c1c5aee71e160f8cfce1fa6d6980 - -python-ecdsa_package() { - noarch="yes" - pycompile_module="ecdsa" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-efl/template b/srcpkgs/python-efl/template index c220ab336e..396892feda 100644 --- a/srcpkgs/python-efl/template +++ b/srcpkgs/python-efl/template @@ -5,20 +5,14 @@ revision=1 build_style=python-module hostmakedepends="pkg-config" makedepends="efl-devel>=${version} elementary-devel>=${version} dbus-python-devel" +depends="dbus-python" +pycompile_modules="evas efl edje emotion ecore elementary e_dbus" +for f in evas ecore edje elementary e_dbus; do + replaces+="python-${f}>=0 python-${f}-devel>=0 " +done homepage="http://enlightenment.org" short_desc="Python2 bindings for Enlightenment Foundation Libraries" maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/bindings/python/${pkgname}-${version}.tar.gz" checksum=8f883c325e30ee3eb2fa38822fa353a22207441b385f4e167cf9c1cf855638f7 - -python-efl_package() { - depends="dbus-python" - pycompile_modules="evas efl edje emotion ecore elementary e_dbus" - for f in evas ecore edje elementary e_dbus; do - replaces+="python-${f}>=0 python-${f}-devel>=0 " - done - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-feedgenerator/template b/srcpkgs/python-feedgenerator/template index 053a2c9f0b..d2273c50e5 100644 --- a/srcpkgs/python-feedgenerator/template +++ b/srcpkgs/python-feedgenerator/template @@ -6,18 +6,12 @@ wrksrc="feedgenerator-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="feedgenerator" +depends="python>=2.7 python-pytz python-six" short_desc="Python Standalone version of django.utils.feedgenerator" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/feedgenerator" license="MIT" distfiles="http://pypi.python.org/packages/source/f/feedgenerator/feedgenerator-${version}.tar.gz" checksum=7bc7dae02d5ca37f305311ca1696f2945625b08db70056b35f18727894bc5a3e - -python-feedgenerator_package() { - noarch="yes" - pycompile_module="feedgenerator" - depends="python>=2.7 python-pytz python-six" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-gconf/template b/srcpkgs/python-gconf/template index e92ab28bc9..6c7155a807 100644 --- a/srcpkgs/python-gconf/template +++ b/srcpkgs/python-gconf/template @@ -9,6 +9,8 @@ configure_args="--enable-gconf --disable-gnome --disable-gnomeui --disable-pyvfsmodule --disable-bonobo_activation --disable-bonobo --disable-bonoboui" makedepends="pkg-config python-devel pygobject2-devel pygtk-devel GConf-devel" +pycompile_dirs="usr/share/pygtk/2.0" +depends="pygobject2 pygtk" short_desc="Python bindings for interacting with GConf" maintainer="Juan RP " license="GPL-2" @@ -22,11 +24,3 @@ long_desc=" post_install() { rm -rf ${DESTDIR}/usr/lib/pkgconfig } - -python-gconf_package() { - pycompile_dirs="usr/share/pygtk/2.0" - depends="pygobject2 pygtk" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-httplib2/template b/srcpkgs/python-httplib2/template index fdfd613460..fc4a7f699d 100644 --- a/srcpkgs/python-httplib2/template +++ b/srcpkgs/python-httplib2/template @@ -24,11 +24,5 @@ long_desc=" * Unit Tested" makedepends="python-devel python-distribute openssl-devel" - -python-httplib2_package() { - noarch="yes" - pycompile_module="httplib2" - pkg_install() { - vmove usr - } -} +noarch="yes" +pycompile_module="httplib2" diff --git a/srcpkgs/python-imaging/template b/srcpkgs/python-imaging/template index b85d3ef319..947624aeb8 100644 --- a/srcpkgs/python-imaging/template +++ b/srcpkgs/python-imaging/template @@ -5,6 +5,7 @@ revision=2 wrksrc="Imaging-${version}" build_style=python-module makedepends="python-devel libjpeg-turbo-devel freetype-devel lcms-devel" +pycompile_module="PIL" short_desc="PIL. Provides image processing capabilities for python" maintainer="Juan RP " license="PIL" @@ -15,10 +16,3 @@ checksum=895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 post_install() { vinstall README 644 usr/share/licenses/${pkgname}/LICENSE } - -python-imaging_package() { - pycompile_module="PIL" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-inotify/template b/srcpkgs/python-inotify/template index cc1a6b2674..56ed6ffc30 100644 --- a/srcpkgs/python-inotify/template +++ b/srcpkgs/python-inotify/template @@ -5,6 +5,9 @@ revision=1 build_style=python-module hostmakedepends="python" makedepends="python-devel" +noarch=yes +pycompile_module="pyinotify.py" +depends="python" short_desc="Python module used for monitoring filesystems events on Linux platforms with inotify" maintainer="Juan RP " homepage="http://github.com/seb-m/pyinotify" @@ -13,12 +16,3 @@ license="MIT" do_fetch() { git clone -b ${version} git://github.com/seb-m/pyinotify ${pkgname}-${version} } - -python-inotify_package() { - noarch=yes - pycompile_module="pyinotify.py" - depends="python" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-isodate/template b/srcpkgs/python-isodate/template index a664d3bb02..b87ddeddd8 100644 --- a/srcpkgs/python-isodate/template +++ b/srcpkgs/python-isodate/template @@ -5,6 +5,9 @@ revision=1 wrksrc="isodate-${version}" build_style=python-module makedepends="python-devel" +noarch="yes" +pycompile_module="isodate" +depends="python>=2.7<3.0" short_desc="An ISO 8601 date/time/duration parser and formater" maintainer="Juan RP " license="BSD" @@ -15,12 +18,3 @@ long_desc=" This module implements ISO 8601 date, time and duration parsing. The implementation follows ISO8601:2004 standard, and implements only date/time representations mentioned in the standard." - -python-isodate_package() { - noarch="yes" - pycompile_module="isodate" - depends="python>=2.7<3.0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-jinja/template b/srcpkgs/python-jinja/template index 1686c5657a..8f8ab65ba9 100644 --- a/srcpkgs/python-jinja/template +++ b/srcpkgs/python-jinja/template @@ -5,6 +5,9 @@ revision=1 wrksrc="Jinja2-${version}" build_style=python-module makedepends="python python-MarkupSafe python-distribute" +depends="${makedepends}" +noarch="yes" +pycompile_module="jinja2" short_desc="Modern and designer friendly templating language for Python" maintainer="Juan RP " homepage="http://jinja.pocoo.org/" @@ -22,12 +25,3 @@ long_desc=" * easy to debug. Line numbers of exceptions directly point to the correct line in the template. * configurable syntax" - -python-jinja_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="jinja2" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-lockfile/template b/srcpkgs/python-lockfile/template index 9b6e0eb44e..b25b0febd8 100644 --- a/srcpkgs/python-lockfile/template +++ b/srcpkgs/python-lockfile/template @@ -5,18 +5,12 @@ wrksrc="lockfile-${version}" revision=1 build_style=python-module makedepends="python" +depends="${makedepends}" +noarch="yes" +pycompile_module="lockfile" short_desc="Platform-independent file locking module for python" maintainer="Juan RP " homepage="http://code.google.com/p/pylockfile/" license="MIT" distfiles="https://pypi.python.org/packages/source/l/lockfile/lockfile-${version}.tar.gz" checksum=23da589c91f59cb7c644d5ce5df539d448341bd479917d6dde973f82e2719147 - -python-lockfile_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="lockfile" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-lxml/template b/srcpkgs/python-lxml/template index 78122223fb..73ec8a290e 100644 --- a/srcpkgs/python-lxml/template +++ b/srcpkgs/python-lxml/template @@ -5,6 +5,7 @@ revision=1 wrksrc="lxml-${version}" build_style=python-module makedepends="python-devel libxslt-devel" +pycompile_module="lxml" short_desc="Python binding for the libxml2 and libxslt libraries" maintainer="Juan RP " license="BSD" @@ -16,10 +17,3 @@ long_desc=" libxslt. It is unique in that it combines the speed and XML feature completeness of these libraries with the simplicity of a native Python API, mostly compatible but superior to the well-known ElementTree API." - -python-lxml_package() { - pycompile_module="lxml" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-munkres/template b/srcpkgs/python-munkres/template index 37f6bd9827..6a77fd819e 100644 --- a/srcpkgs/python-munkres/template +++ b/srcpkgs/python-munkres/template @@ -7,17 +7,11 @@ checksum="c78f803b9b776bfb20a25c9c7bb44adbf0f9202c2024d51aa5969d21e560208d" build_style=python-module hostmakedepends="python-devel" makedepends="python-distribute" +noarch="yes" +depends="python>=2.7" +pycompile_module="munkres" wrksrc="munkres-${version}" maintainer="Steven R " homepage="http://bmc.github.com/munkres/" license="BSD" short_desc="Algorithm for the Assignment Problem" - -python-munkres_package() { - noarch="yes" - depends="python>=2.7" - pycompile_module="munkres" - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/python-musicbrainzngs/template b/srcpkgs/python-musicbrainzngs/template index 3bafcedebe..96a69b7791 100644 --- a/srcpkgs/python-musicbrainzngs/template +++ b/srcpkgs/python-musicbrainzngs/template @@ -7,17 +7,11 @@ checksum="1a1b7c3cce851c491d5ad71b501bbed2bd653098e33565a0534050d4b922265a" build_style=python-module hostmakedepends="python-devel" makedepends="python-distribute" +noarch="yes" +depends="python>=2.7" +pycompile_module="musicbrainzngs" wrksrc="musicbrainzngs-${version}" maintainer="Steven R " homepage="https://github.com/alastair/python-musicbrainz-ngs" license="BSD" short_desc="Python bindings for the Musicbrainz NGS webservice interface" - -python-musicbrainzngs_package() { - noarch="yes" - depends="python>=2.7" - pycompile_module="musicbrainzngs" - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/python-pam/template b/srcpkgs/python-pam/template index 7cdbc50e4b..ca7d52a3f8 100644 --- a/srcpkgs/python-pam/template +++ b/srcpkgs/python-pam/template @@ -6,18 +6,12 @@ wrksrc="${pkgname/python-}-${version}" build_style=python-module hostmakedepends="python python-distribute" makedepends="python-devel pam-devel" +noarch=yes +pycompile_module="pam.py" +depends="python pam" short_desc="Python module for PAM authentication" maintainer="Juan RP " homepage="http://atlee.ca/software/pam/" license="MIT" distfiles="http://pypi.python.org/packages/source/p/pam/${pkgname/python-/}-${version}.tar.gz" checksum=35e88575afc37a2a5f96e20b22fa55d3e3213370d4ce640af1597c2a1dde226b - -python-pam_package() { - noarch=yes - pycompile_module="pam.py" - depends="python pam" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-paramiko/template b/srcpkgs/python-paramiko/template index 035fc3ca39..fa13c43639 100644 --- a/srcpkgs/python-paramiko/template +++ b/srcpkgs/python-paramiko/template @@ -6,18 +6,12 @@ wrksrc="${pkgname/python-/}-${version}" build_style=python-module hostmakedepends="python" makedepends="python-devel python-ecdsa pycrypto" +noarch="yes" +pycompile_module="paramiko" +depends="python python-ecdsa pycrypto" short_desc="Python module that implements the SSH2 protocol" maintainer="Juan RP " homepage="https://github.com/paramiko/paramiko" license="MIT" distfiles="http://pypi.python.org/packages/source/p/paramiko/paramiko-$version.tar.gz" checksum=cc0c0549f611ccc1358a0e1c760e00074990adba723d4d647a2637a1fadbdd71 - -python-paramiko_package() { - noarch="yes" - pycompile_module="paramiko" - depends="python python-ecdsa pycrypto" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-parsing/template b/srcpkgs/python-parsing/template index 8d4712d809..67c091e05b 100644 --- a/srcpkgs/python-parsing/template +++ b/srcpkgs/python-parsing/template @@ -5,6 +5,9 @@ revision=2 wrksrc="pyparsing-${version}" build_style=python-module makedepends="python-devel" +noarch="yes" +pycompile_module="pyparsing.py" +depends="python>=2.7<3.0" short_desc="General parsing module for Python" maintainer="Juan RP " license="MIT" @@ -16,12 +19,3 @@ long_desc=" simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions. The pyparsing module provides a library of classes that client code uses to construct the grammar directly in Python code." - -python-parsing_package() { - noarch="yes" - pycompile_module="pyparsing.py" - depends="python>=2.7<3.0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-pexpect/template b/srcpkgs/python-pexpect/template index 94dffe1e95..85938796c2 100644 --- a/srcpkgs/python-pexpect/template +++ b/srcpkgs/python-pexpect/template @@ -6,18 +6,12 @@ wrksrc="${pkgname/python-}-${version}" build_style=python-module hostmakedepends="python" makedepends="python-devel" +noarch=yes +pycompile_module="screen.py pxssh.py ANSI.py FSM.py fdpexpect.py pyexpect" +depends="python" short_desc="Python module for spawning child applications and controlling them" maintainer="Juan RP " homepage="http://pexpect.readthedocs.org/en/latest/" license="MIT" distfiles="http://pypi.python.org/packages/source/p/${pkgname/python-/}/${pkgname/python-/}-${version}.tar.gz" checksum=1d6cee0fa5ab212f9ddac9852bab0df5fff11a173ed1bfde9346d5c8aa42d14c - -python-pexpect_package() { - noarch=yes - pycompile_module="screen.py pxssh.py ANSI.py FSM.py fdpexpect.py pyexpect" - depends="python" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-pip/template b/srcpkgs/python-pip/template index 21a5a4132a..33f729f31a 100644 --- a/srcpkgs/python-pip/template +++ b/srcpkgs/python-pip/template @@ -6,18 +6,12 @@ wrksrc="pip-${version}" build_style=python-module hostmakedepends="python python-setuptools" makedepends="python-devel" +noarch="yes" +depends="python python-setuptools" +pycompile_module="pip" short_desc="An easy_install replacement for installing pypi python packages" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/pip" license="PSF" distfiles="http://pypi.python.org/packages/source/p/pip/pip-$version.tar.gz" checksum=4e7a06554711a624c35d0c646f63674b7f6bfc7f80221bf1eb1f631bd890d04e - -python-pip_package() { - noarch="yes" - depends="python python-setuptools" - pycompile_module="pip" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-psutil/template b/srcpkgs/python-psutil/template index 863d1095dd..772d7ba2e8 100644 --- a/srcpkgs/python-psutil/template +++ b/srcpkgs/python-psutil/template @@ -7,16 +7,10 @@ checksum="508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45" build_style=python-module hostmakedepends="python-devel python-distribute" makedepends="python-devel" +depends="python>=2.7" +pycompile_module="psutil" wrksrc="psutil-${version}" maintainer="Steven R " homepage="http://code.google.com/p/psutil/" license="BSD" short_desc="A cross-platform process and system utilities module for Python" - -python-psutil_package() { - depends="python>=2.7" - pycompile_module="psutil" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-pyacoustid/template b/srcpkgs/python-pyacoustid/template index 1b8b8f624b..de19d9ec86 100644 --- a/srcpkgs/python-pyacoustid/template +++ b/srcpkgs/python-pyacoustid/template @@ -7,17 +7,11 @@ checksum="31900428e7b344dca0c2da594b387e88620c319298e3a6400a968078194407d4" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="pyacoustid" +depends="python>=2.7" maintainer="Steven R " homepage="https://github.com/sampsyo/pyacoustid" license="MIT" short_desc="Bindings for Chromaprint acoustic fingerprinting and the Acoustid API" wrksrc="pyacoustid-${version}" - -python-pyacoustid_package() { - noarch="yes" - pycompile_module="pyacoustid" - depends="python>=2.7" - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/python-pylastfp/template b/srcpkgs/python-pylastfp/template index 3acbd9d5ae..9ae505ac13 100644 --- a/srcpkgs/python-pylastfp/template +++ b/srcpkgs/python-pylastfp/template @@ -7,16 +7,10 @@ checksum="5f9a32e532ab62e5663298b4b3b1db86f5466404f111ccaa9030c23ffee140f7" build_style=python-module hostmakedepends="python-devel python-distribute" makedepends="python-devel libsamplerate-devel fftw-devel" +depends="python>=2.7 gst-python" +pycompile_module="pylastfp" wrksrc="pylastfp-${version}" maintainer="Steven R " homepage="https://github.com/sampsyo/pylastfp" license="GPL" short_desc="Python interface to Last.fm's acoustic fingerprinting library (called fplib) and its related API services" - -python-pylastfp_package() { - depends="python>=2.7 gst-python" - pycompile_module="pylastfp" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template index 2fd0ca5b09..5f453c1a99 100644 --- a/srcpkgs/python-pytz/template +++ b/srcpkgs/python-pytz/template @@ -6,18 +6,12 @@ wrksrc="pytz-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="pytz" +depends="python>=2.7" short_desc="Python timezone library" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/pytz" license="BSD" distfiles="http://pypi.python.org/packages/source/p/pytz/pytz-${version}.tar.gz" checksum=f075a63a330eae21b040a5148b8c4b64d7696a017de5ec62dc1604191efa791c - -python-pytz_package() { - noarch="yes" - pycompile_module="pytz" - depends="python>=2.7" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-rdflib/template b/srcpkgs/python-rdflib/template index 076bd98909..b28c8d3773 100644 --- a/srcpkgs/python-rdflib/template +++ b/srcpkgs/python-rdflib/template @@ -5,6 +5,9 @@ revision=1 wrksrc="rdflib-${version}" build_style=python-module makedepends="python-devel python-distribute python-isodate" +noarch="yes" +pycompile_module="rdflib" +depends="python>=2.7<3.0 python-isodate" short_desc="Python library for working with RDF" maintainer="Juan RP " license="BSD" @@ -20,12 +23,3 @@ long_desc=" The library presents a Graph interface which can be backed by any one of a number of Store implementations." - -python-rdflib_package() { - noarch="yes" - pycompile_module="rdflib" - depends="python>=2.7<3.0 python-isodate" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-requests/template b/srcpkgs/python-requests/template index 0ae663dd16..adad476522 100644 --- a/srcpkgs/python-requests/template +++ b/srcpkgs/python-requests/template @@ -7,17 +7,11 @@ checksum="a57307f3a5f35ec9e1254aaf3e0484063ee3ee6b5f123fb35c5b2673492efa71" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="requests" +depends="python>=2.7" wrksrc="requests-${version}" maintainer="Steven R " homepage="http://docs.python-requests.org/en/latest/" license="Apache-2.0" short_desc="Python HTTP for Humans." - -python-requests_package() { - noarch="yes" - pycompile_module="requests" - depends="python>=2.7" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-setproctitle/template b/srcpkgs/python-setproctitle/template index 25c98144e0..d9b9aa2994 100644 --- a/srcpkgs/python-setproctitle/template +++ b/srcpkgs/python-setproctitle/template @@ -5,6 +5,8 @@ revision=1 wrksrc="setproctitle-${version}" build_style=python-module makedepends="python-devel" +depends="python" +pycompile_module="setproctitle" short_desc="A library to allow customization of the process title" maintainer="davehome " homepage="http://code.google.com/p/py-setproctitle/" @@ -23,11 +25,3 @@ long_desc=" The procedure is hardly portable across different systems. PostgreSQL provides a good multi-platform implementation: this module is a Python wrapper around PostgreSQL code." - -python-setproctitle_package() { - depends="python" - pycompile_module="setproctitle" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-setuptools/template b/srcpkgs/python-setuptools/template index 9f590b4141..c73d7695be 100644 --- a/srcpkgs/python-setuptools/template +++ b/srcpkgs/python-setuptools/template @@ -5,20 +5,14 @@ revision=2 wrksrc="setuptools-${version}" build_style=python-module makedepends="python-devel" +noarch="yes" +depends="python" +pycompile_module="easy_install.py pkg_resources.py _markerlib setuptools" +provides="python-distribute-${version}_1" +replaces="python-distribute>=0" short_desc="Easily download, build, install, upgrade, and uninstall Python packages" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/setuptools" license="PSF" distfiles="http://pypi.python.org/packages/source/s/setuptools/setuptools-$version.tar.gz" checksum=56dde93a410389fc6cb86e9c115249a3414f8982c96d99aeac43a7717dd05b5e - -python-setuptools_package() { - noarch="yes" - depends="python" - pycompile_module="easy_install.py pkg_resources.py _markerlib setuptools" - provides="python-distribute-${version}_1" - replaces="python-distribute>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/python-simplejson/template b/srcpkgs/python-simplejson/template index 6f837dcfa4..8890e495fc 100644 --- a/srcpkgs/python-simplejson/template +++ b/srcpkgs/python-simplejson/template @@ -4,21 +4,14 @@ version=2.5.2 revision=2 build_style=python-module makedepends="python-devel" +pycompile_module="simplejson" short_desc="Simple, fast, extensible JSON encoder/decoder for Python" maintainer="Juan RP " homepage="http://undefined.org/python/#simplejson" license="MIT" - do_fetch() { local url="git://github.com/simplejson/simplejson.git" git clone $url $pkgname-$version cd $pkgname-$version && git checkout v${version} } - -python-simplejson_package() { - pycompile_module="simplejson" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-six/template b/srcpkgs/python-six/template index 92b45b34b9..2ccb441961 100644 --- a/srcpkgs/python-six/template +++ b/srcpkgs/python-six/template @@ -6,18 +6,12 @@ wrksrc="six-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="six.py" +depends="python>=2.7" short_desc="Python 2 and 3 compatibility utilities" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/six" license="MIT" distfiles="http://pypi.python.org/packages/source/s/six/six-${version}.tar.gz" checksum=4a86d87623f75811524f30832e092914d65af7ff2eb1d403e01ec235b0e19cb3 - -python-six_package() { - noarch="yes" - pycompile_module="six.py" - depends="python>=2.7" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-sqlalchemy/template b/srcpkgs/python-sqlalchemy/template index 9e15cea56a..a408102aec 100644 --- a/srcpkgs/python-sqlalchemy/template +++ b/srcpkgs/python-sqlalchemy/template @@ -6,6 +6,7 @@ wrksrc="SQLAlchemy-${version}" build_style=python-module hostmakedepends="python-devel" makedepends="python-devel" +pycompile_module="sqlalchemy" short_desc="The Python SQL Toolkit and Object Relational Mapper" maintainer="Juan RP " homepage="http://www.sqlalchemy.org/" @@ -19,10 +20,3 @@ long_desc=" It provides a full suite of well known enterprise-level persistence patterns, designed for efficient and high-performing database access, adapted into a simple and Pythonic domain language." - -python-sqlalchemy_package() { - pycompile_module="sqlalchemy" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-tempita/template b/srcpkgs/python-tempita/template index 970bb9814f..e6497ced3b 100644 --- a/srcpkgs/python-tempita/template +++ b/srcpkgs/python-tempita/template @@ -5,20 +5,12 @@ revision=1 wrksrc="Tempita-${version}" build_style=python-module makedepends="python-distribute" +noarch="yes" +pycompile_module="tempita" +depends="python" short_desc="A lightweight unicode templating language" maintainer="Juan RP " homepage="http://pythonpaste.org/tempita/" license="MIT" distfiles="http://pypi.python.org/packages/source/T/Tempita/Tempita-$version.tar.gz" checksum=0ebe6938ca7401db79bac279849fffcb5752029150bcb6f3c3edbe7aa9a077d8 -long_desc=" - This package contains $pkgname: $short_desc." - -python-tempita_package() { - noarch="yes" - pycompile_module="tempita" - depends="python" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-termcolor/template b/srcpkgs/python-termcolor/template index df6194034c..8f2c03b514 100644 --- a/srcpkgs/python-termcolor/template +++ b/srcpkgs/python-termcolor/template @@ -6,18 +6,12 @@ wrksrc="termcolor-${version}" build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +noarch="yes" +pycompile_module="termcolor" +depends="python>=2.7" short_desc="Python ANSII Color formatting for output in terminal" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/termcolor" license="MIT" distfiles="http://pypi.python.org/packages/source/t/termcolor/termcolor-${version}.tar.gz" checksum=1d6d69ce66211143803fbc56652b41d73b4a400a2891d7bf7a1cdf4c02de613b - -python-termcolor_package() { - noarch="yes" - pycompile_module="termcolor" - depends="python>=2.7" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python-urwid/template b/srcpkgs/python-urwid/template index 92574dc2d1..189e4b1cad 100644 --- a/srcpkgs/python-urwid/template +++ b/srcpkgs/python-urwid/template @@ -5,6 +5,7 @@ revision=1 wrksrc="urwid-${version}" build_style=python-module makedepends="python-devel" +pycompile_module="urwid" short_desc="Console user interface library for Python" maintainer="Juan RP " homepage="http://excess.org/urwid/" @@ -28,10 +29,3 @@ long_desc=" Buttons, check boxes and radio boxes Customizable layout for all widgets Easy interface for creating HTML screen shots" - -python-urwid_package() { - pycompile_module="urwid" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/python/template b/srcpkgs/python/template index c1d9ce9112..071f0dd238 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -13,6 +13,7 @@ checksum=1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel openssl-devel expat-devel sqlite-devel bzip2-devel zlib-devel" +pycompile_dirs="usr/lib/python2.7" configure_args=" --with-threads --enable-ipv6 --with-signal-module --enable-shared @@ -50,6 +51,8 @@ do_build() { do_install() { export PATH="$PATH:$wrksrc/hostpython" make DESTDIR=${DESTDIR} altinstall + ln -sf /usr/bin/python2.7 ${DESTDIR}/usr/bin/python2 + ln -sf /usr/bin/python2.7 ${DESTDIR}/usr/bin/python } post_install() { @@ -59,15 +62,6 @@ post_install() { rm -rf ${DESTDIR}/usr/lib/python2.7/test } -python_package() { - pycompile_dirs="usr/lib/python2.7" - pkg_install() { - vmove all - ln -sf /usr/bin/python2.7 ${PKGDESTDIR}/usr/bin/python2 - ln -sf /usr/bin/python2.7 ${PKGDESTDIR}/usr/bin/python - } -} - python-devel_package() { depends="python>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 8992bc26bb..f7032363b3 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -63,9 +63,3 @@ python3-devel_package() { ${DESTDIR}/usr/include/python3.3m } } - -python3_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/pyxdg/template b/srcpkgs/pyxdg/template index 8e758d3cb1..8df82633cb 100644 --- a/srcpkgs/pyxdg/template +++ b/srcpkgs/pyxdg/template @@ -4,6 +4,9 @@ version=0.23 revision=1 build_style=python-module makedepends="python-devel" +noarch="yes" +pycompile_module="xdg" +depends="python>=2.7<3.0" short_desc="Python library to access freedesktop.org standards" maintainer="Juan RP " license="LGPL-2.1" @@ -21,11 +24,3 @@ long_desc=" Recent File Spec 0.2 Shared-MIME-Database Specification 0.13 " -pyxdg_package() { - noarch="yes" - pycompile_module="xdg" - depends="python>=2.7<3.0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/pyyaml/template b/srcpkgs/pyyaml/template index 7c4a03c83a..82b7573259 100644 --- a/srcpkgs/pyyaml/template +++ b/srcpkgs/pyyaml/template @@ -5,6 +5,7 @@ revision=1 wrksrc="PyYAML-${version}" build_style=python-module makedepends="libyaml-devel python-devel" +pycompile_module="pyyaml" short_desc="YAML parser and emitter for Python." maintainer="davehome " homepage="http://pyyaml.org/wiki/PyYAML" @@ -27,10 +28,3 @@ long_desc=" is provided. - both pure-Python and fast LibYAML-based parsers and emitters. - relatively sensible error messages." - -pyyaml_package() { - pycompile_module="pyyaml" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qca/template b/srcpkgs/qca/template index 0b3621cb36..36aea75be2 100644 --- a/srcpkgs/qca/template +++ b/srcpkgs/qca/template @@ -7,6 +7,7 @@ configure_args="--prefix=/usr --disable-tests --release --no-separate-debug-info --certstore-path=/etc/ssl/certs/ca-certificates.crt" hostmakedepends="which" makedepends="qt-devel ca-certificates" +depends="ca-certificates" short_desc="Qt Cryptographic Architecture" maintainer="Juan RP " license="LGPL-2.1" @@ -26,10 +27,3 @@ qca-devel_package() { vmove usr/share/qt } } - -qca_package() { - depends="ca-certificates" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template index 222c1ecb78..74c68db28e 100644 --- a/srcpkgs/qemu-user-static/template +++ b/srcpkgs/qemu-user-static/template @@ -34,9 +34,3 @@ do_install() { mv ${f} ${f}-static done } - -qemu-user-static_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 42734fb36b..b93d529d63 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -15,12 +15,18 @@ license="GPL-2, LGPL-2.1" distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" checksum=31f333a85f2d14c605a77679904a9668eaeb1b6dc7da53a1665230f46bc21314 +nostrip=yes hostmakedepends="pkg-config perl python automake libtool flex" makedepends="attr-devel libpng-devel>=1.6 libjpeg-turbo-devel pixman-devel libuuid-devel libX11-devel alsa-lib-devel gnutls-devel>=3.1.5 SDL-devel libsasl-devel libglib-devel ncurses-devel libseccomp-devel>=2.1.0 nss-devel libcurl-devel xfsprogs-devel libcap-ng-devel libcap-devel vde2-devel libbluetooth-devel libssh2-devel libusbx-devel pulseaudio-devel" +depends="libusb>=1.0.15" +conf_files="/etc/qemu/target-x86_64.conf" +replaces="qemu-kvm>=0" +provides="qemu-kvm-${version}" +conflicts="qemu-kvm>=0" post_install() { vinstall ${FILESDIR}/65-kvm.rules 644 usr/lib/udev/rules.d @@ -45,15 +51,3 @@ libcacard_package() { vmove "usr/lib/*.so.*" } } - -qemu_package() { - nostrip=yes - conf_files="/etc/qemu/target-x86_64.conf" - replaces="qemu-kvm>=0" - provides="qemu-kvm-${version}" - conflicts="qemu-kvm>=0" - depends="libusb>=1.0.15" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/qimageblitz/template b/srcpkgs/qimageblitz/template index 200f46789a..0568f2786c 100644 --- a/srcpkgs/qimageblitz/template +++ b/srcpkgs/qimageblitz/template @@ -21,9 +21,3 @@ qimageblitz-devel_package() { vmove "usr/lib/*.so" } } - -qimageblitz_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/qjackctl/template b/srcpkgs/qjackctl/template index a381ffbb87..2f1de45693 100644 --- a/srcpkgs/qjackctl/template +++ b/srcpkgs/qjackctl/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-jack-version" makedepends="pkg-config libX11-devel qt-devel jack-devel" +depends="desktop-file-utils hicolor-icon-theme jack" short_desc="JACK Audio Connection Kit - Qt GUI Interface" maintainer="davehome " license="GPL-2" @@ -22,10 +23,3 @@ long_desc=" are properly saved between sessions, and a way control of the status of the audio server daemon. With time, this primordial interface has become richer by including a enhanced patchbay and connection control features." - -qjackctl_package() { - depends="desktop-file-utils hicolor-icon-theme jack" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qjson/template b/srcpkgs/qjson/template index 8f9aad8263..6d89ba56fe 100644 --- a/srcpkgs/qjson/template +++ b/srcpkgs/qjson/template @@ -10,7 +10,6 @@ maintainer="Juan RP " license="GPL-2" homepage="http://qjson.sourceforge.net" - do_fetch() { git clone -b${version} git://github.com/flavio/qjson.git ${pkgname}-${version} } @@ -25,9 +24,3 @@ qjson-devel_package() { vmove usr/lib/pkgconfig } } - -qjson_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/qoauth/template b/srcpkgs/qoauth/template index f41aeef8ca..c42e79ca85 100644 --- a/srcpkgs/qoauth/template +++ b/srcpkgs/qoauth/template @@ -31,9 +31,3 @@ qoauth-devel_package() { vmove usr/share/qt } } - -qoauth_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index ad7b1ba026..65ef72f398 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -20,7 +20,7 @@ long_desc=" of a PDF file to learn more about how they work." libqpdf_package() { - short_desc="${short_desc} -- shared library" + short_desc+=" - shared library" pkg_install() { vmove "usr/lib/*.so*" } @@ -28,15 +28,9 @@ libqpdf_package() { libqpdf-devel_package() { depends="libqpdf>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -qpdf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qrencode/template b/srcpkgs/qrencode/template index 6aabc4b256..687d8d03ea 100644 --- a/srcpkgs/qrencode/template +++ b/srcpkgs/qrencode/template @@ -28,9 +28,3 @@ libqrencode_package() { vmove "usr/lib/*.so.*" } } - -qrencode_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qsynth/template b/srcpkgs/qsynth/template index 679c82f351..0c2c6e1d49 100644 --- a/srcpkgs/qsynth/template +++ b/srcpkgs/qsynth/template @@ -4,6 +4,7 @@ version=0.3.6 revision=1 build_style=gnu-configure makedepends="pkg-config qt-devel jack-devel fluidsynth-devel desktop-file-utils hicolor-icon-theme" +depends="jack desktop-file-utils hicolor-icon-theme" short_desc="Qt GUI Interface for FluidSynth" maintainer="davehome " license="GPL-2" @@ -17,10 +18,3 @@ long_desc=" command line softsynth but for the moment it wraps the excellent FluidSynth. FluidSynth is a command line software synthesiser based on the Soundfont specification." - -qsynth_package() { - depends="jack desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qt/template b/srcpkgs/qt/template index 267f6559ab..2b7269dd60 100644 --- a/srcpkgs/qt/template +++ b/srcpkgs/qt/template @@ -164,9 +164,3 @@ qt-qtconfig_package() { vmove "usr/share/qt/translations/qtconfig*" } } - -qt_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template index 1045b7a094..38a9d56cf8 100644 --- a/srcpkgs/qtractor/template +++ b/srcpkgs/qtractor/template @@ -8,16 +8,10 @@ makedepends="pkg-config jack-devel alsa-lib-devel libsndfile-devel libvorbis-devel libmad-devel libsamplerate-devel qt-devel lv2 liblo-devel rubberband-devel vamp-plugin-sdk-devel ladspa-sdk dssi-devel lilv-devel suil-devel serd-devel sord-devel sratom-devel" +depends="jack dssi lv2 desktop-file-utils hicolor-icon-theme" short_desc="Audio/MIDI multi-track sequencer application written in C++/Qt4" maintainer="davehome " license="GPL-2" homepage="http://qtractor.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=09708652b2b8b12dbc28a9ec1e0f2d105ee0cb4ed29b8d33c477f4455be1600d - -qtractor_package() { - depends="jack dssi lv2 desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/quvi/template b/srcpkgs/quvi/template index 3d0f46c701..52b24952f6 100644 --- a/srcpkgs/quvi/template +++ b/srcpkgs/quvi/template @@ -22,9 +22,3 @@ long_desc=" * Easy to extend: uses lua for scripting * Supports 40+ websites * C API is simple to use" - -quvi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/r2-bindings-git/template b/srcpkgs/r2-bindings-git/template index 2ba09d3f69..60f18e253d 100644 --- a/srcpkgs/r2-bindings-git/template +++ b/srcpkgs/r2-bindings-git/template @@ -16,6 +16,11 @@ long_desc=" makedepends="pkg-config swig>=2.0.7 valabind-git>=${version} python-devel radare2-devel-git>=${version}" +replaces="r2-bindings>=0" +provides="r2-bindings-9999" +depends="radare2-git>=${version} python>=2.7.3" +pycompile_module="r2" +noverifyrdeps=yes do_fetch() { local url="git://github.com/radare/radare2" @@ -37,15 +42,3 @@ do_install() { cd r2-bindings make DESTDIR=${DESTDIR} install } - - -r2-bindings-git_package() { - replaces="r2-bindings>=0" - provides="r2-bindings-9999" - depends="radare2-git>=${version} python>=2.7.3" - pycompile_module="r2" - noverifyrdeps=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/r2-bindings/template b/srcpkgs/r2-bindings/template index c506f2c681..fa81332991 100644 --- a/srcpkgs/r2-bindings/template +++ b/srcpkgs/r2-bindings/template @@ -19,6 +19,9 @@ long_desc=" makedepends="pkg-config swig>=2.0.7 valabind>=0.7.2 python-devel radare2-devel>=${version}" +pycompile_module="r2" +depends="radare2-devel-${version}*" +noverifyrdeps=1 do_configure() { cd r2-bindings @@ -34,12 +37,3 @@ do_install() { cd r2-bindings make DESTDIR=${DESTDIR} install } - -r2-bindings_package() { - pycompile_module="r2" - depends="radare2-devel-${version}*" - noverifyrdeps=1 - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/radare2-git/template b/srcpkgs/radare2-git/template index d723b45e8a..8262060e04 100644 --- a/srcpkgs/radare2-git/template +++ b/srcpkgs/radare2-git/template @@ -8,7 +8,6 @@ maintainer="pancake " license="LGPL-3" homepage="http://radare.org" - do_fetch() { local url="git://github.com/radare/radare2" msg_normal "Fetching source from $url ...\n" @@ -19,7 +18,7 @@ radare2-devel-git_package() { replaces="radare2-devel>=0" provides="radare2-devel-9999" depends="radare2-git>=$version" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" @@ -27,9 +26,3 @@ radare2-devel-git_package() { vmove usr/lib/pkgconfig } } - -radare2-git_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/radare2/template b/srcpkgs/radare2/template index 9b1ee1c218..20f21d2a9c 100644 --- a/srcpkgs/radare2/template +++ b/srcpkgs/radare2/template @@ -20,9 +20,3 @@ radare2-devel_package() { vmove "usr/lib/*.so" } } - -radare2_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/randrproto/template b/srcpkgs/randrproto/template index 45b102222b..4714c94b7e 100644 --- a/srcpkgs/randrproto/template +++ b/srcpkgs/randrproto/template @@ -2,6 +2,7 @@ pkgname=randrproto version=1.4.0 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Randr extension headers from modular X.org" maintainer="Juan RP " @@ -9,12 +10,3 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=85c42e8c66a55318ddaf2ce5727beacb25cb1f8555229f778cd1da86478209cf -long_desc=" - This provides the Randr extension headers from X.org X11 project." - -randrproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ranger/template b/srcpkgs/ranger/template index 179ec5243c..7b59ee686b 100644 --- a/srcpkgs/ranger/template +++ b/srcpkgs/ranger/template @@ -5,18 +5,12 @@ revision=1 build_style=python-module hostmakedepends="python" makedepends="python-devel" +noarch="yes" +depends="python" +pycompile_module="$pkgname" short_desc="File manager with an ncurses frontend written in Python" maintainer="Juan RP " license="GPL-3" homepage="http://ranger.nongnu.org" distfiles="http://ranger.nongnu.org/${pkgname}-${version}.tar.gz" checksum=ccb230a5d2d71ca11612b5af1ca515f9d490b51b1546678828e306252677db5e - -ranger_package() { - noarch="yes" - depends="python" - pycompile_module="$pkgname" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/raptor/template b/srcpkgs/raptor/template index 96d3013a5d..5047c2a713 100644 --- a/srcpkgs/raptor/template +++ b/srcpkgs/raptor/template @@ -40,9 +40,3 @@ raptor-devel_package() { vmove usr/share/man/man3 } } - -raptor_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rarian/template b/srcpkgs/rarian/template index 894ec9607b..5cb7815201 100644 --- a/srcpkgs/rarian/template +++ b/srcpkgs/rarian/template @@ -4,6 +4,7 @@ version=0.8.1 build_style=gnu-configure revision=4 hostmakedepends="pkg-config libxslt" +depends="bash" short_desc="Documentation metadata library" homepage="http://rarian.freedesktop.org/" license="LGPL-2.1" @@ -27,11 +28,3 @@ rarian-devel_package() { vmove usr/lib/pkgconfig } } - -rarian_package() { - depends="bash" - pkg_install() { - vmove usr - vmove var - } -} diff --git a/srcpkgs/rasqal/template b/srcpkgs/rasqal/template index c93314900d..ece16a1820 100644 --- a/srcpkgs/rasqal/template +++ b/srcpkgs/rasqal/template @@ -41,9 +41,3 @@ rasqal-devel_package() { vmove usr/share/man/man3 } } - -rasqal_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/raul/template b/srcpkgs/raul/template index 42bf6566d7..70496f1428 100644 --- a/srcpkgs/raul/template +++ b/srcpkgs/raul/template @@ -16,15 +16,9 @@ long_desc=" raul-devel_package() { depends="libglib-devel raul>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -raul_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rawtherapee/template b/srcpkgs/rawtherapee/template index db0301d2aa..0e72d034f9 100644 --- a/srcpkgs/rawtherapee/template +++ b/srcpkgs/rawtherapee/template @@ -5,6 +5,7 @@ revision=3 build_style=cmake makedepends="cmake pkg-config libpng-devel>=1.6 gtkmm2-devel lcms2-devel libiptcdata-devel libgomp-devel mercurial" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Free RAW converter and digital photo processing software" maintainer="Juan RP " homepage="http://rawtherapee.com/" @@ -22,10 +23,3 @@ long_desc=" processing is done in 16 bit/channel mode. Different to other RAW converters it can use EAHD as demosaicing algorithm. The raw loading engine of RawTherapee is based on dcraw." - -rawtherapee_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/razor-qt/template b/srcpkgs/razor-qt/template index daa499c2c4..1c71fcfff9 100644 --- a/srcpkgs/razor-qt/template +++ b/srcpkgs/razor-qt/template @@ -21,26 +21,19 @@ makedepends="cmake pkg-config qt-devel polkit-qt-devel>=0.103.0_2 libudev-devel libXrender-devel libXcomposite-devel libXcursor-devel libXdamage-devel libstatgrab-devel libsensors-devel pulseaudio-devel alsa-lib-devel lightdm-devel openbox upower udisks oxygen-icons" +depends="openbox upower udisks oxygen-icons" +conf_files=" + /etc/razor/session.conf + /etc/razor/razor.conf + /etc/razor/windowmanagers.conf + /etc/razor/razor-panel + /etc/razor/razor-panel/panel.conf + /etc/razor/desktop.conf" razor-qt-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -razor-qt_package() { - conf_files=" - /etc/razor/session.conf - /etc/razor/razor.conf - /etc/razor/windowmanagers.conf - /etc/razor/razor-panel - /etc/razor/razor-panel/panel.conf - /etc/razor/desktop.conf" - depends="openbox upower udisks oxygen-icons" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/rdesktop/template b/srcpkgs/rdesktop/template index 902ea1b781..4604eae5f7 100644 --- a/srcpkgs/rdesktop/template +++ b/srcpkgs/rdesktop/template @@ -13,9 +13,3 @@ license="GPL-3" homepage="http://www.rdesktop.org/" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=76cc834b89c34d8332f3cb3889483b2ae4d4e8118eeb45a8967c77dd18228246 - -rdesktop_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rdis-git/template b/srcpkgs/rdis-git/template index 5ef2ec7c0b..cff4d35ea2 100644 --- a/srcpkgs/rdis-git/template +++ b/srcpkgs/rdis-git/template @@ -9,7 +9,6 @@ maintainer="pancake " license="GPL-3" homepage="http://rainbowsandpwnies.com/rdis/" - do_fetch() { git clone git://github.com/endeav0r/rdis.git ${pkgname}-${version} } @@ -21,9 +20,3 @@ do_build() { do_install() { vinstall src/rdis 755 usr/bin } - -rdis-git_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/re2/template b/srcpkgs/re2/template index f7f4ef3eb3..8203e734d9 100644 --- a/srcpkgs/re2/template +++ b/srcpkgs/re2/template @@ -12,14 +12,8 @@ homepage="https://code.google.com/p/re2/" checksum=a95d83ed8203817587f7cc368b6f7199d8a4b1558372c306b07201058b92e1fe distfiles="https://${pkgname}.googlecode.com/files/${pkgname}-${version}.tgz" -re2_package() { - pkg_install() { - vmove all - } -} - re2-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include diff --git a/srcpkgs/readline/template b/srcpkgs/readline/template index a1edbbec80..fb86f67c65 100644 --- a/srcpkgs/readline/template +++ b/srcpkgs/readline/template @@ -48,9 +48,3 @@ readline-devel_package() { vmove "usr/lib/*.a" } } - -readline_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/recode/template b/srcpkgs/recode/template index a9eab7c41f..4cc9969680 100644 --- a/srcpkgs/recode/template +++ b/srcpkgs/recode/template @@ -45,9 +45,3 @@ recode-devel_package() { vmove "usr/lib/*.a" } } - -recode_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/recordproto/template b/srcpkgs/recordproto/template index 63ffd3e3eb..17e38dcb3b 100644 --- a/srcpkgs/recordproto/template +++ b/srcpkgs/recordproto/template @@ -2,6 +2,7 @@ pkgname=recordproto version=1.14 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Record extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,13 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=1bd2375bd2bdaa3ea90aa0a70cf1657a2d61877b6eb7e3fe3e6f1d289e69d067 -long_desc=" - This provides the Record extension headers from modular X.org X11 - project." - -recordproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/redland/template b/srcpkgs/redland/template index 17c9e1f8fc..fdb977d937 100644 --- a/srcpkgs/redland/template +++ b/srcpkgs/redland/template @@ -1,4 +1,6 @@ # Template file for 'redland' +_desc="Redland Resource Description Framework (RDF)" + pkgname=redland version=1.0.16 revision=3 @@ -8,8 +10,8 @@ configure_args="--disable-static --enable-release --with-raptor=system hostmakedepends="pkg-config perl" makedepends="libltdl-devel db-devel rasqal-devel libmysqlclient-devel postgresql-libs-devel sqlite-devel unixodbc-devel" -short_desc="Redland Resource Description Framework (RDF)" maintainer="Juan RP " +short_desc="${_desc} - Utilities" license="GPL-2, LGPL-2.1" homepage="http://librdf.org" distfiles="http://librdf.org/dist/source/redland-${version}.tar.gz" @@ -22,35 +24,35 @@ long_desc=" their applications as well as for RDF developers to experiment with the technology." librdf_package() { - short_desc+=" - library" + short_desc="${_desc} - library" pkg_install() { vmove "usr/lib/*.so.*" } } redland-storage-mysql_package() { - short_desc+=" - MySQL storage backend" + short_desc="${_desc} - MySQL storage backend" pkg_install() { vmove usr/lib/redland/librdf_storage_mysql.so } } redland-storage-pgsql_package() { - short_desc+=" - PostgreSQL storage backend" + short_desc="${_desc} - PostgreSQL storage backend" pkg_install() { vmove usr/lib/redland/librdf_storage_postgresql.so } } redland-storage-sqlite_package() { - short_desc+=" - SQLite storage backend" + short_desc="${_desc} - SQLite storage backend" pkg_install() { vmove usr/lib/redland/librdf_storage_sqlite.so } } redland-storage-virtuoso_package() { - short_desc+=" - virtuoso storage backend" + short_desc="${_desc} - virtuoso storage backend" pkg_install() { vmove usr/lib/redland/librdf_storage_virtuoso.so } @@ -58,7 +60,7 @@ redland-storage-virtuoso_package() { redland-devel_package() { depends="db-devel rasqal-devel librdf-${version}_${revision}" - short_desc+=" - development files" + short_desc="${_desc} - development files" pkg_install() { vmove usr/bin/redland-config vmove usr/share/man/man1/redland-config.1 @@ -69,10 +71,3 @@ redland-devel_package() { vmove usr/share/man/man3 } } - -redland_package() { - short_desc+=" - Utilities" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/redshift/template b/srcpkgs/redshift/template index 90b887350a..52d7560c7c 100644 --- a/srcpkgs/redshift/template +++ b/srcpkgs/redshift/template @@ -30,9 +30,3 @@ redshift-gtk_package() { vmove usr/share/icons } } - -redshift_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/reminiscence/template b/srcpkgs/reminiscence/template index cd9139f007..5e8970b760 100644 --- a/srcpkgs/reminiscence/template +++ b/srcpkgs/reminiscence/template @@ -20,9 +20,3 @@ do_install() { vinstall rs 755 usr/bin vinstall README 644 usr/share/doc/${pkgname} } - -reminiscence_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/renderproto/template b/srcpkgs/renderproto/template index df7fa008a8..e9f02e362b 100644 --- a/srcpkgs/renderproto/template +++ b/srcpkgs/renderproto/template @@ -2,6 +2,7 @@ pkgname=renderproto version=0.11.1 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Render extension headers from modular X.org" maintainer="Juan RP " @@ -9,10 +10,3 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537 - -renderproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/resourceproto/template b/srcpkgs/resourceproto/template index 75d9daf011..b8e551ab92 100644 --- a/srcpkgs/resourceproto/template +++ b/srcpkgs/resourceproto/template @@ -2,6 +2,7 @@ pkgname=resourceproto version=1.2.0 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Resource extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=3c66003a6bdeb0f70932a9ed3cf57cc554234154378d301e0c5cfa189d8f6818 -long_desc=" - This provides the Resource extension headers from X.org." - -resourceproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rest/template b/srcpkgs/rest/template index 9c27b471fa..5b2403d170 100644 --- a/srcpkgs/rest/template +++ b/srcpkgs/rest/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config gobject-introspection" makedepends="libglib-devel libsoup-gnome-devel>=2.44 libxml2-devel" +depends="libsoup-gnome>=2.44" short_desc="RESTful library" maintainer="Juan RP " license="GPL-2" @@ -29,10 +30,3 @@ rest-devel_package() { vmove "usr/lib/*.so" } } - -rest_package() { - depends="libsoup-gnome>=2.44" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rfkill/template b/srcpkgs/rfkill/template index d5c140ea56..e506cf213a 100644 --- a/srcpkgs/rfkill/template +++ b/srcpkgs/rfkill/template @@ -9,9 +9,3 @@ license="Public domain" homepage="http://wireless.kernel.org/en/users/Documentation/rfkill" distfiles="https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$version.tar.bz2" checksum=3e160cca504a53679f2b3254f31c53a4fb38a021bc50fed8eb57a436d33dfa07 - -rfkill_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rgb/template b/srcpkgs/rgb/template index 1108174daf..5aa43941f1 100644 --- a/srcpkgs/rgb/template +++ b/srcpkgs/rgb/template @@ -11,9 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=162111c0192c8f78e99a6ee9a3df5eb149251c5800896c993399da005ec7fe95 - -rgb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index db9882ae83..b8e7f75dde 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -14,6 +14,7 @@ makedepends="gtk+3-devel libsoup-gnome-devel>=2.44 totem-pl-parser-devel>=3.10 webkitgtk-devel>=2.1 grilo-devel gst-plugins-base1-devel>=1:1.2 clutter-gtk-devel>=1.4.4_2 python3-devel pygobject-devel libdmapsharing-devel>=2.9.17 desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="GNOME integrated music management application, inspired by Apple's iTunes" maintainer="davehome " license="GPL-2" @@ -57,10 +58,3 @@ rhythmbox-devel_package() { vmove "usr/lib/*.so" } } - -rhythmbox_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ristretto/template b/srcpkgs/ristretto/template index 3d0438a560..8c24b5553a 100644 --- a/srcpkgs/ristretto/template +++ b/srcpkgs/ristretto/template @@ -6,6 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libexif-devel xfconf-devel dbus-glib-devel libxfce4ui-devel exo-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Picture-viewer for the Xfce desktop environment" maintainer="Juan RP " license="GPL-2" @@ -15,10 +16,3 @@ checksum=2b6816de298e9a0d9b95662664690713c4123a9ac813a27bdde4727a03472d79 long_desc=" Ristretto is a fast and lightweight picture-viewer for the Xfce desktop environment." - -ristretto_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rox/template b/srcpkgs/rox/template index 0022b877b9..6dd5602ddd 100644 --- a/srcpkgs/rox/template +++ b/srcpkgs/rox/template @@ -5,6 +5,7 @@ revision=1 wrksrc="rox-filer-${version}" hostmakedepends="pkg-config librsvg" makedepends="gtk+-devel libxml2-devel libSM-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A small and fast file manager which can optionally manage the desktop background and panels" maintainer="Juan RP " license="GPL-2" @@ -31,10 +32,3 @@ do_install() { vinstall ${FILESDIR}/rox.svg 644 usr/share/pixmaps vinstall rox.png 644 usr/share/pixmaps } - -rox_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/roxterm/template b/srcpkgs/roxterm/template index 1e20df890a..03840b145a 100644 --- a/srcpkgs/roxterm/template +++ b/srcpkgs/roxterm/template @@ -5,6 +5,7 @@ revision=1 hostmakedepends="python-lockfile pkg-config docbook-xsl xmlto libtool" makedepends="dbus-glib-devel libSM-devel vte3-devel libmagick-devel librsvg-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Tabbed, VTE-based terminal emulator" maintainer="Juan RP " license="GPL-3" @@ -24,10 +25,3 @@ do_build() { do_install() { python2 mscript.py install --destdir=${DESTDIR} } - -roxterm_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rpcbind/template b/srcpkgs/rpcbind/template index 29a1fe744e..c1486575a4 100644 --- a/srcpkgs/rpcbind/template +++ b/srcpkgs/rpcbind/template @@ -5,7 +5,10 @@ revision=1 build_style=gnu-configure configure_args="--enable-warmstarts --with-statedir=/run --with-rpcuser=rpc" hostmakedepends="pkg-config" -makedepends="libtirpc-devel" +makedepends="libtirpc-devel shadow" +depends="shadow" +systemd_services="${pkgname}.service on" +system_accounts="rpc" short_desc="Converts RPC program numbers into universal addresses" maintainer="Juan RP " homepage="http://rpcbind.sourceforge.net" @@ -26,12 +29,3 @@ post_install() { vinstall man/rpcinfo.8 644 usr/share/man/man8 vinstall ${FILESDIR}/${pkgname}.service 644 usr/lib/systemd/system } - -rpcbind_package() { - depends="shadow" - systemd_services="${pkgname}.service on" - system_accounts="rpc" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rpi-base-files/template b/srcpkgs/rpi-base-files/template index 2cc2384080..479a0e04a4 100644 --- a/srcpkgs/rpi-base-files/template +++ b/srcpkgs/rpi-base-files/template @@ -10,6 +10,10 @@ license="Public domain" # XXX only for rpi only_for_archs="armv6l" makedepends="ntp?ntp-daemon dhcpcd openssh-server" +depends="${makedepends}" +# enable dhcpcd and sshd by default. +systemd_services="dhcpcd.service on sshd.service on" +replaces="base-system<0.77" do_install() { # Load the audio module by default. @@ -20,13 +24,3 @@ do_install() { echo 'SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"' > \ ${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules } - -rpi-base-files_package() { - # enable dhcpcd and sshd by default. - systemd_services="dhcpcd.service on sshd.service on" - replaces="base-system<0.77" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rpi-firmware-pcfiles/template b/srcpkgs/rpi-firmware-pcfiles/template index b01b92ceef..e627629599 100644 --- a/srcpkgs/rpi-firmware-pcfiles/template +++ b/srcpkgs/rpi-firmware-pcfiles/template @@ -7,18 +7,12 @@ short_desc="Raspberry Pi pkg-config files for GLESv2/EGL" maintainer="Juan RP " license="Public domain" +noarch=yes makedepends="rpi-firmware" +depends="rpi-firmware" +conflicts="MesaLib-devel>=0" do_install() { vmkdir usr/lib/pkgconfig install -m644 ${FILESDIR}/*.pc ${DESTDIR}/usr/lib/pkgconfig } - -rpi-firmware-pcfiles_package() { - noarch=yes - depends="rpi-firmware" - conflicts="MesaLib-devel>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rpi-firmware/template b/srcpkgs/rpi-firmware/template index 2d1695151a..bf10b35cda 100644 --- a/srcpkgs/rpi-firmware/template +++ b/srcpkgs/rpi-firmware/template @@ -7,6 +7,8 @@ short_desc="Firmware files for the Raspberry Pi (git ${_githash})" maintainer="Juan RP " license="Propietary - see /usr/share/licences/${pkgname}/" homepage="https://github.com/raspberrypi/firmware" +conf_files="/boot/cmdline.txt /boot/config.txt" +noarch="yes" do_fetch() { local url="git://github.com/raspberrypi/firmware.git" @@ -37,11 +39,3 @@ do_install() { vinstall ${FILESDIR}/cmdline.txt 644 boot vinstall ${FILESDIR}/config.txt 644 boot } - -rpi-firmware_package() { - conf_files="/boot/cmdline.txt /boot/config.txt" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rpmextract/template b/srcpkgs/rpmextract/template index 125dde9f2a..34a31fb7fb 100644 --- a/srcpkgs/rpmextract/template +++ b/srcpkgs/rpmextract/template @@ -6,17 +6,10 @@ short_desc="Script to convert or extract RPM archives (contains rpm2cpio)" maintainer="Ypnose " license="GPL" homepage="http://www.archlinux.org" - +depends="bash bsdtar coreutils" +noarch="yes" do_install() { vinstall ${FILESDIR}/rpm2cpio 755 usr/bin vinstall ${FILESDIR}/rpmextract 755 usr/bin } - -rpmextract_package() { - depends="bash bsdtar coreutils" - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rsnapshot/template b/srcpkgs/rsnapshot/template index c13637ec37..e2023d00e0 100644 --- a/srcpkgs/rsnapshot/template +++ b/srcpkgs/rsnapshot/template @@ -5,6 +5,9 @@ revision=1 build_style=gnu-configure hostmakedepends="perl" makedepends="perl-Lchown rsync openssh" +depends="perl perl-Lchown rsync openssh" +conf_files="/etc/${pkgname}.conf" +noarch="yes" short_desc="A remote filesystem snapshot utility" maintainer="Juan RP " license="GPL-2" @@ -12,19 +15,6 @@ homepage="http://www.rsnapshot.org" distfiles="http://www.rsnapshot.org/downloads/${pkgname}-${version}.tar.gz" checksum=94b6c77e40628935f42a191bdc28ad93b1f132fde456ee76ee87763f1eddc75e -pre_build() { - sed -i 's:/usr/bin/pod2man:/usr/lib/perl5/core_perl/bin/pod2man:' Makefile -} - post_install() { mv ${DESTDIR}/etc/rsnapshot.conf.default ${DESTDIR}/etc/rsnapshot.conf } - -rsnapshot_package() { - depends="perl perl-Lchown rsync openssh" - conf_files="/etc/${pkgname}.conf" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rsync/template b/srcpkgs/rsync/template index d96bea2c7b..3b2f2c5446 100644 --- a/srcpkgs/rsync/template +++ b/srcpkgs/rsync/template @@ -21,9 +21,3 @@ long_desc=" sets of files are present at one of the ends of the link beforehand. At first glance this may seem impossible because the calculation of diffs between two files normally requires local access to both files." - -rsync_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rsyslog/template b/srcpkgs/rsyslog/template index 72e0e57752..196fe261cf 100644 --- a/srcpkgs/rsyslog/template +++ b/srcpkgs/rsyslog/template @@ -16,6 +16,11 @@ hostmakedepends="pkg-config" makedepends="json-c-devel gnutls-devel>=3.1.5 postgresql-libs-devel libmysqlclient-devel>=5.5.27 mit-krb5-devel libestr-devel>=0.1.9 libee-devel>=0.4.1 systemd-devel" +conf_files="/etc/rsyslog.conf" +systemd_services="rsyslog.service on" +provides="syslog-daemon-0" +replaces="syslog-daemon>=0" +make_dirs="/etc/rsyslog.d 0755 root root" short_desc="An Enhanced multi-threaded syslog daemon" maintainer="Juan RP " license="GPL-3" @@ -88,14 +93,3 @@ rsyslog-postgresql_package() { vmove usr/lib/rsyslog/ompgsql.so } } - -rsyslog_package() { - conf_files="/etc/rsyslog.conf" - systemd_services="rsyslog.service on" - provides="syslog-daemon-0" - replaces="syslog-daemon>=0" - make_dirs="/etc/rsyslog.d 0755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rtkit/template b/srcpkgs/rtkit/template index c28fefd1b7..db06d06210 100644 --- a/srcpkgs/rtkit/template +++ b/srcpkgs/rtkit/template @@ -13,6 +13,9 @@ checksum=68859108cff6410901502b58365eb7607da37110a06b837762f771735f58acd0 hostmakedepends="pkg-config" makedepends="dbus-devel libcap-devel shadow" +depends="shadow" +system_accounts="rtkit" +rtkit_homedir="/proc" post_install() { # DBus configuration @@ -20,12 +23,3 @@ post_install() { # ControlGroup is obsolete since systemd>=205. sed -e '/^ControlGroup.*/d' -i ${DESTDIR}/usr/lib/systemd/system/rtkit-daemon.service } - -rtkit_package() { - depends="shadow" - system_accounts="rtkit" - rtkit_homedir="/proc" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rtmpdump/template b/srcpkgs/rtmpdump/template index 4ada33ef45..689171f033 100644 --- a/srcpkgs/rtmpdump/template +++ b/srcpkgs/rtmpdump/template @@ -23,7 +23,7 @@ do_install() { } librtmp_package() { - short_desc="${short_desc} -- shared library" + short_desc+=" - shared library" pkg_install() { vmove "usr/lib/*.so*" } @@ -31,16 +31,10 @@ librtmp_package() { librtmp-devel_package() { depends="openssl-devel librtmp>=$version" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -rtmpdump_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rtorrent/template b/srcpkgs/rtorrent/template index 917eec02ea..b5daae9bef 100644 --- a/srcpkgs/rtorrent/template +++ b/srcpkgs/rtorrent/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-debug" hostmakedepends="automake pkg-config" makedepends="libcurl-devel libsigc++-devel libtorrent-devel>=0.13.2 ncurses-devel" +depends="libtorrent>=0.13.2" short_desc="Ncurses BitTorrent client based on libTorrent" maintainer="Juan RP " homepage="http://libtorrent.rakshasa.no" @@ -22,10 +23,3 @@ pre_configure() { sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac autoreconf -fi } - -rtorrent_package() { - depends="libtorrent>=0.13.2" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rubberband/template b/srcpkgs/rubberband/template index 1bfa04d635..ef8e862dfb 100644 --- a/srcpkgs/rubberband/template +++ b/srcpkgs/rubberband/template @@ -4,6 +4,7 @@ version=1.6.0 revision=3 build_style=gnu-configure makedepends="pkg-config ladspa-sdk libsamplerate-devel vamp-plugin-sdk-devel fftw-devel" +depends="libvamp-plugin-sdk" short_desc="Time-stretching and pitch-shifting audio library" maintainer="davehome " license="GPL-2" @@ -17,7 +18,7 @@ long_desc=" of one another." librubberband_package() { - short_desc="${short_desc} - Runtime libraries" + short_desc+=" - Runtime libraries" pkg_install() { vmove "usr/lib/*.so*" vmove usr/lib/vamp @@ -27,17 +28,10 @@ librubberband_package() { rubberband-devel_package() { depends="librubberband>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } - -rubberband_package() { - depends="libvamp-plugin-sdk" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index 549518520b..1fcd727750 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -94,9 +94,3 @@ ruby-ri_package() { vmove "usr/share/man/man1/ri*" } } - -ruby_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/run-parts/template b/srcpkgs/run-parts/template index d447425349..6bf2a42bbe 100644 --- a/srcpkgs/run-parts/template +++ b/srcpkgs/run-parts/template @@ -22,9 +22,3 @@ do_install() { vinstall run-parts 755 usr/bin vinstall run-parts.8 644 usr/share/man/man8 } - -run-parts_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index 78b9d16c52..7eee06c689 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -38,9 +38,3 @@ post_install() { cd ${DESTDIR}/usr chrpath -d bin/* lib/*.so lib/rustc/*/lib/*.so } - -rust_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template index cca54740fe..b6cc384974 100644 --- a/srcpkgs/rxvt-unicode/template +++ b/srcpkgs/rxvt-unicode/template @@ -57,9 +57,3 @@ if [ "$build_option_startup_notification" ]; then else configure_args+=" --disable-startup-notification" fi - -rxvt-unicode_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/rygel/template b/srcpkgs/rygel/template index 50066f5745..4b88b16a59 100644 --- a/srcpkgs/rygel/template +++ b/srcpkgs/rygel/template @@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool" makedepends="sqlite-devel vala-devel>=0.22 gtk+3-devel>=3.8 libsoup-devel>=2.44 libgee08-devel>=0.12 gupnp-av-devel>=0.12.1 gupnp-dlna-devel>=0.10 tracker-devel>=0.16_2" +depends="hicolor-icon-theme desktop-file-utils" +conf_files="/etc/rygel.conf" short_desc="GNOME home media solution" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -34,11 +36,3 @@ librygel_package() { vmove "usr/lib/*.so.*" } } - -rygel_package() { - depends="hicolor-icon-theme desktop-file-utils" - conf_files="/etc/rygel.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/s-nail/template b/srcpkgs/s-nail/template index d1c33fe40f..9a45577b65 100644 --- a/srcpkgs/s-nail/template +++ b/srcpkgs/s-nail/template @@ -4,6 +4,9 @@ version=14.5.1 _version="14_5_1" revision=2 makedepends="openssl-devel libidn-devel" +conf_files="/etc/mail.rc" +provides="mail-${version}" +replaces="mail>=0" short_desc="Mail processing system with a command syntax reminiscent of ed" maintainer="Ypnose " license="BSD" @@ -21,12 +24,3 @@ do_install() { make DESTDIR=$DESTDIR packager-install vinstall COPYING 644 usr/share/licenses/${pkgname} } - -s-nail_package() { - conf_files="/etc/mail.rc" - provides="mail-${version}" - replaces="mail>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 3ceccdd76e..bd19cdd2bd 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -19,6 +19,7 @@ homepage="http://www.samba.org" distfiles="http://us1.samba.org/samba/ftp/stable/$pkgname-$version.tar.gz" checksum=6b960abee66058a9390be036ae42efc463790b2cf4c53f842660fa36a3dc979e +conf_files="/etc/pam.d/samba" hostmakedepends="pkg-config perl python-devel" makedepends="readline-devel libcap-devel popt-devel e2fsprogs-devel mit-krb5-devel>=1.10.1 libldap-devel pam-devel acl-devel avahi-libs-devel @@ -114,10 +115,3 @@ samba-devel_package() { vmove usr/lib/libsmbclient.so } } - -samba_package() { - conf_files="/etc/pam.d/samba" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template index ff532822db..b28293345f 100644 --- a/srcpkgs/sane/template +++ b/srcpkgs/sane/template @@ -8,6 +8,86 @@ configure_args="--disable-locking --enable-avahi --with-docdir=/usr/share/doc/sa --disable-latex --enable-libusb_1_0 --enable-pthread" makedepends="pkg-config avahi-libs-devel libjpeg-turbo-devel tiff-devel libgphoto2-devel v4l-utils-devel libusb-devel net-snmp-devel libieee1284-devel" +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" short_desc="Scanner Access Now Easy" maintainer="Juan RP " homepage="http://www.sane-project.org/" @@ -33,7 +113,7 @@ post_install() { } libsane_package() { - short_desc="${short_desc} - runtime shared library" + short_desc+=" - runtime shared library" pkg_install() { vmove "usr/lib/libsane.so*" } @@ -41,7 +121,7 @@ libsane_package() { sane-devel_package() { depends="libsane>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/bin/sane-config @@ -49,90 +129,3 @@ sane-devel_package() { 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/sbc/template b/srcpkgs/sbc/template index f4fdfcac20..cc68e3a520 100644 --- a/srcpkgs/sbc/template +++ b/srcpkgs/sbc/template @@ -21,9 +21,3 @@ sbc-devel_package() { vmove usr/lib/pkgconfig } } - -sbc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/scons/template b/srcpkgs/scons/template index 9dca873c20..d5000df2f7 100644 --- a/srcpkgs/scons/template +++ b/srcpkgs/scons/template @@ -4,6 +4,9 @@ version=2.3.0 revision=1 build_style=python-module hostmakedepends="python" +depends="python" +noarch="yes" +pycompile_module="SCons" make_install_args="--standard-lib --install-data=/usr/share" short_desc="A software construction tool" maintainer="davehome " @@ -18,12 +21,3 @@ long_desc=" SCons is implemented as a Python script and set of modules, and SCons configuration files are actually executed as Python scripts. This gives SCons many powerful capabilities not found in other software build tools." - -scons_package() { - depends="python" - noarch="yes" - pycompile_module="SCons" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/screen/template b/srcpkgs/screen/template index 6f00a8d5b7..ea368492c2 100644 --- a/srcpkgs/screen/template +++ b/srcpkgs/screen/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--with-sys-screenrc=/etc/screenrc -enable-pam --enable-colors256 --enable-locale -with-socket-dir=/run/screens --with-pty-group=5" makedepends="pam-devel ncurses-devel" +conf_files="/etc/screenrc /etc/skel/.screenrc" short_desc="The GNU screen utility" maintainer="davehome " homepage="http://www.gnu.org/s/screen/" @@ -35,10 +36,3 @@ post_install() { vinstall etc/screenrc 0644 etc vinstall etc/etcscreenrc 0644 etc/skel .screenrc } - -screen_package() { - conf_files="/etc/screenrc /etc/skel/.screenrc" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/scrnsaverproto/template b/srcpkgs/scrnsaverproto/template index 799b6f185e..02e9817079 100644 --- a/srcpkgs/scrnsaverproto/template +++ b/srcpkgs/scrnsaverproto/template @@ -2,6 +2,7 @@ pkgname=scrnsaverproto version=1.2.0 revision=3 +noarch="yes" build_style=gnu-configure short_desc="ScrnSaver extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,10 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=deaf0a3212617e0dab353a3c3a66e0a1f2398306eca0fd882ac15996b0e44d99 - -scrnsaverproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/scrot/template b/srcpkgs/scrot/template index 4ce5c0361d..b15ce3da0a 100644 --- a/srcpkgs/scrot/template +++ b/srcpkgs/scrot/template @@ -14,9 +14,3 @@ 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 8b7114e7b0..cf7b78ff45 100644 --- a/srcpkgs/scrypt/template +++ b/srcpkgs/scrypt/template @@ -15,9 +15,3 @@ 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 1cd7034819..928a9ce6b8 100644 --- a/srcpkgs/scummvm/template +++ b/srcpkgs/scummvm/template @@ -37,9 +37,3 @@ 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/template b/srcpkgs/sdb/template index bb518294ae..99bf40ec94 100644 --- a/srcpkgs/sdb/template +++ b/srcpkgs/sdb/template @@ -35,9 +35,3 @@ sdb-devel_package() { vmove "usr/lib/*.a" } } - -sdb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/sdlmame/template b/srcpkgs/sdlmame/template index ee9351da2b..5945eb342c 100644 --- a/srcpkgs/sdlmame/template +++ b/srcpkgs/sdlmame/template @@ -15,6 +15,8 @@ checksum=78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 makedepends="unzip perl pkg-config SDL-devel>=1.2.15_4 SDL_ttf-devel libXinerama-devel gtk+-devel GConf-devel alsa-lib-devel python liberation-fonts-ttf" +depends="liberation-fonts-ttf" +nonfree="yes" do_extract() { # mame source code is double-zipped to save space. @@ -71,11 +73,3 @@ 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 714efbba36..5f6d761c6f 100644 --- a/srcpkgs/sdparm/template +++ b/srcpkgs/sdparm/template @@ -24,9 +24,3 @@ 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 e8e5ab3045..1ac4b10199 100644 --- a/srcpkgs/seahorse-nautilus/template +++ b/srcpkgs/seahorse-nautilus/template @@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool gnome-doc-utils" makedepends="gtk+3-devel>=3.8 nautilus-devel>=3.10 libnotify-devel gpgme-devel libcryptui-devel>=3.10 gcr-devel>=3.10 libgnome-keyring-devel>=3.10 gnupg" +depends="gnupg desktop-file-utils" short_desc="A Nautilus plugin for OpenPGP file encryption/decryption" maintainer="Juan RP " homepage="http://www.gnome.org/projects/seahorse/" @@ -29,10 +30,3 @@ 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 all - } -} diff --git a/srcpkgs/seahorse-sharing/template b/srcpkgs/seahorse-sharing/template index 1ad6a4fc1b..e0e985c0d9 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 - gnupg" + gpgme-devel libsoup-devel>=2.40 avahi-glib-libs-devel libSM-devel gnupg" +depends="gnupg" short_desc="Sharing of PGP public keys via DNS-SD and HKP" maintainer="Juan RP " homepage="http://www.gnome.org/projects/seahorse/" @@ -27,10 +27,3 @@ 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 d39c518331..0b665172eb 100644 --- a/srcpkgs/seahorse/template +++ b/srcpkgs/seahorse/template @@ -9,6 +9,7 @@ hostmakedepends="which pkg-config intltool gnome-doc-utils itstool" makedepends="gtk+3-devel>=3.8 gcr-devel>=3.10 libsecret-devel gpgme-devel libldap-devel libsoup-devel avahi-glib-libs-devel openssh>=6.1p1" +depends="hicolor-icon-theme desktop-file-utils gcr>=3.10 openssh>=6.1p1" short_desc="Encryption Made Easy" maintainer="Juan RP " homepage="http://projects.gnome.org/seahorse/" @@ -27,10 +28,3 @@ 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.10 openssh>=6.1p1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sed/template b/srcpkgs/sed/template index c90b64d58e..afe23ccc57 100644 --- a/srcpkgs/sed/template +++ b/srcpkgs/sed/template @@ -5,6 +5,7 @@ revision=3 build_style=gnu-configure configure_args="--enable-acl" makedepends="acl-devel" +conflicts="chroot-sed>=0" short_desc="The GNU stream editor" maintainer="Juan RP " license="GPL-3" @@ -16,10 +17,3 @@ if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_func_aclsort=yes" LDFLAGS="-L${XBPS_CROSS_BASE}/lib -lacl" fi - -sed_package() { - conflicts="chroot-sed>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/seed/template b/srcpkgs/seed/template index 27bd5a788e..cd51f4d592 100644 --- a/srcpkgs/seed/template +++ b/srcpkgs/seed/template @@ -7,6 +7,7 @@ configure_args="--disable-static" makedepends="pkg-config intltool readline-devel gobject-introspection libsoup-devel webkitgtk-devel sqlite-devel dbus-glib-devel gir-freedesktop gnome-js-common" +depends="gir-freedesktop gnome-js-common" short_desc="GObject JavaScript bindings for the webkit engine - Interpreter" maintainer="Juan RP " homepage="http://live.gnome.org/Seed/" @@ -39,10 +40,3 @@ libseed_package() { vmove usr/share/seed-gtk3 } } - -seed_package() { - depends="gir-freedesktop gnome-js-common" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/serd/template b/srcpkgs/serd/template index fce94ae4ea..b08b07977e 100644 --- a/srcpkgs/serd/template +++ b/srcpkgs/serd/template @@ -21,7 +21,7 @@ long_desc=" serd-devel_package() { depends="libserd>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -29,14 +29,8 @@ serd-devel_package() { } libserd_package() { - short_desc="${short_desc} - Runtime library" + short_desc+=" - Runtime library" pkg_install() { vmove "usr/lib/*.so*" } } - -serd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/serf/template b/srcpkgs/serf/template index 67c187ce52..2fa30b949d 100644 --- a/srcpkgs/serf/template +++ b/srcpkgs/serf/template @@ -30,9 +30,3 @@ serf-devel_package() { vmove "usr/lib/*.a" } } - -serf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/sessreg/template b/srcpkgs/sessreg/template index 775959ae02..39850c3cbd 100644 --- a/srcpkgs/sessreg/template +++ b/srcpkgs/sessreg/template @@ -14,9 +14,3 @@ 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 72b0a78d71..36c8f5e84e 100644 --- a/srcpkgs/setxkbmap/template +++ b/srcpkgs/setxkbmap/template @@ -14,9 +14,3 @@ 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 4d39816ff7..deb793b702 100644 --- a/srcpkgs/sexy-python/template +++ b/srcpkgs/sexy-python/template @@ -5,18 +5,10 @@ revision=4 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libsexy-devel pygtk-devel" +depends="pygtk" 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/template b/srcpkgs/sg3_utils/template index 3ac5090cc7..7927debd77 100644 --- a/srcpkgs/sg3_utils/template +++ b/srcpkgs/sg3_utils/template @@ -13,7 +13,7 @@ distfiles="http://sg.danny.cz/sg/p/$pkgname-$version.tgz" checksum=385e73a3acc961efd50a610db9c737f14ccc98ba8488e54355be1f08417e08af libsgutils_package() { - short_desc="${short_desc} --- shared library" + short_desc+=" - shared library" replaces="sg3_utils<1.31" pkg_install() { vmove "usr/lib/*.so*" @@ -22,14 +22,8 @@ libsgutils_package() { sg3_utils-devel_package() { depends="libsgutils>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include } } - -sg3_utils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/shadow/template b/srcpkgs/shadow/template index 81e56aed76..3961aa8d94 100644 --- a/srcpkgs/shadow/template +++ b/srcpkgs/shadow/template @@ -7,6 +7,23 @@ configure_args="--bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib --enable-shared --disable-static --with-libpam --without-selinux --with-acl --with-attr" makedepends="acl-devel pam-devel" +depends="pam" +conf_files=" + /etc/pam.d/usermod + /etc/pam.d/userdel + /etc/pam.d/useradd + /etc/pam.d/passwd + /etc/pam.d/newusers + /etc/pam.d/groupmod + /etc/pam.d/groupmems + /etc/pam.d/groupdel + /etc/pam.d/groupadd + /etc/pam.d/chpasswd + /etc/pam.d/chgpasswd + /etc/pam.d/chage + /etc/pam.d/other + /etc/defaults/useradd + /etc/login.defs" short_desc="Shadow password file utilities" maintainer="Juan RP " license="BSD" @@ -76,26 +93,3 @@ post_install() { vinstall $FILESDIR/LICENSE 644 usr/share/licenses/shadow } - -shadow_package() { - conf_files=" - /etc/pam.d/usermod - /etc/pam.d/userdel - /etc/pam.d/useradd - /etc/pam.d/passwd - /etc/pam.d/newusers - /etc/pam.d/groupmod - /etc/pam.d/groupmems - /etc/pam.d/groupdel - /etc/pam.d/groupadd - /etc/pam.d/chpasswd - /etc/pam.d/chgpasswd - /etc/pam.d/chage - /etc/pam.d/other - /etc/defaults/useradd - /etc/login.defs" - depends="pam" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/shared-color-profiles/template b/srcpkgs/shared-color-profiles/template index 1690184463..9fb31f403f 100644 --- a/srcpkgs/shared-color-profiles/template +++ b/srcpkgs/shared-color-profiles/template @@ -2,6 +2,7 @@ pkgname=shared-color-profiles version=0.1.5 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Color profiles from contributors for color calibration" maintainer="Juan RP " @@ -15,10 +16,3 @@ 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 e716b362b6..4177d404c6 100644 --- a/srcpkgs/shared-color-targets/template +++ b/srcpkgs/shared-color-targets/template @@ -2,6 +2,7 @@ pkgname=shared-color-targets version=0.1.1 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Shared color targets for creating color profiles" maintainer="Juan RP " @@ -12,10 +13,3 @@ 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-desktop-ontologies/template b/srcpkgs/shared-desktop-ontologies/template index 1ebb9e6f96..9eac752304 100644 --- a/srcpkgs/shared-desktop-ontologies/template +++ b/srcpkgs/shared-desktop-ontologies/template @@ -2,6 +2,7 @@ pkgname=shared-desktop-ontologies version=0.11.0 revision=1 +noarch=yes build_style=cmake hostmakedepends="cmake" short_desc="Provide RDF vocabularies for the Semantic Desktop" @@ -10,10 +11,3 @@ license="GPL-2" homepage="http://sourceforge.net/apps/trac/oscaf/" distfiles="${SOURCEFORGE_SITE}/oscaf/${pkgname}-${version}.tar.bz2" checksum=82afe6c24cf574f242c1fa85a5daff8c3631cc9b4cbcb80379dce6f364b4bbd4 - -shared-desktop-ontologies_package() { - noarch=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/shared-mime-info/template b/srcpkgs/shared-mime-info/template index 5015727821..e22c103cbc 100644 --- a/srcpkgs/shared-mime-info/template +++ b/srcpkgs/shared-mime-info/template @@ -26,9 +26,3 @@ long_desc=" update-mime-database command used to extend it." disable_parallel_build=yes - -shared-mime-info_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index ab40e26efd..0a012f844d 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -10,6 +10,7 @@ makedepends="vala-devel>=0.22 libgee08-devel libraw-devel>=0.15 libgphoto2-devel libgexiv2-devel>=0.6.0 libunique-devel rest-devel sqlite-devel gtk+3-devel webkitgtk-devel libgudev-devel json-glib-devel gst-plugins-base1-devel" +depends="hicolor-icon-theme desktop-file-utils libgexiv2>=0.6.0" short_desc="Open source photo manager for GNOME" maintainer="Juan RP " license="LGPL-2.1" @@ -21,10 +22,3 @@ 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 all - } -} diff --git a/srcpkgs/sic-git/template b/srcpkgs/sic-git/template index 2a9b7a89af..2f805c015e 100644 --- a/srcpkgs/sic-git/template +++ b/srcpkgs/sic-git/template @@ -19,9 +19,3 @@ post_install() { vinstall LICENSE 644 usr/share/licenses/sic vinstall README 644 usr/share/doc/sic } - -sic-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/silc-client/template b/srcpkgs/silc-client/template index 1326fc3795..49ccbd1a10 100644 --- a/srcpkgs/silc-client/template +++ b/srcpkgs/silc-client/template @@ -7,6 +7,7 @@ configure_args="--enable-debug --enable-ipv6 --disable-optimizations ac_cv_func_pthread_rwlock_init=set ac_cv_func_epoll_wait=set" makedepends="silc-toolkit-devel ncurses-devel pcre-devel glib-devel" hostmakedepends="pkg-config" +conf_files="/etc/silc.conf" short_desc="Secure Internet Live Conferencing client" maintainer="Ypnose " license="GPL" @@ -29,10 +30,3 @@ else rm -rf ${DESTDIR}/usr/share/silc/scripts } fi - -silc-client_package() { - conf_files="/etc/silc.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/silc-toolkit/template b/srcpkgs/silc-toolkit/template index 05622aac1d..8e24edcaba 100644 --- a/srcpkgs/silc-toolkit/template +++ b/srcpkgs/silc-toolkit/template @@ -31,9 +31,3 @@ silc-toolkit-devel_package() { vmove usr/share/doc } } - -silc-toolkit_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/silc/template b/srcpkgs/silc/template index 20e66a8faa..6fc4674b95 100644 --- a/srcpkgs/silc/template +++ b/srcpkgs/silc/template @@ -13,9 +13,3 @@ homepage="http://www.silcnet.org/" distfiles="http://www.silcnet.org/download/server/sources/$pkgname-server-$version.tar.gz" checksum=fcb278f22cea61ba6e3d6e49af9de50111f5c8565408054d828af262fc0fe293 wrksrc="$pkgname-server-$version" - -silc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/simple-scan/template b/srcpkgs/simple-scan/template index b1073fe23c..b911a6dd54 100644 --- a/srcpkgs/simple-scan/template +++ b/srcpkgs/simple-scan/template @@ -7,6 +7,7 @@ configure_args="--disable-schemas-compile" hostmakedepends="pkg-config itstool intltool" makedepends="colord-devel>=0.1.23_3 gtk+3-devel>=3.6.0_3 sqlite-devel dconf-devel sane-devel libgudev-devel" +depends="hicolor-icon-theme sane" short_desc="Simple scanning utility" maintainer="Juan RP " license="GPL-3" @@ -19,10 +20,3 @@ 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 all - } -} diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index aa670125f9..b3538ed470 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -24,7 +24,10 @@ long_desc=" # XXX no multiarch for now. only_for_archs="i686" +nonfree="yes" +nostrip="yes" makedepends="qt>=4.8.4_4 hicolor-icon-theme desktop-file-utils" +depends="${makedepends}" do_install() { # Executable @@ -54,12 +57,3 @@ 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 8196bc626e..0c15c8922b 100644 --- a/srcpkgs/skypetab-ng/template +++ b/srcpkgs/skypetab-ng/template @@ -4,6 +4,7 @@ version=20130719 revision=1 hostmakedepends="pkg-config" makedepends="libX11-devel qt-devel" +depends="skype" short_desc="A program that adds tabs to Skype for Linux" maintainer="davehome " homepage="http://keks-n.net/skypetab" @@ -36,10 +37,3 @@ 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 4f4ec8558f..205e850c37 100644 --- a/srcpkgs/slim/template +++ b/srcpkgs/slim/template @@ -6,6 +6,8 @@ build_style=cmake configure_args="-DUSE_PAM=yes -DUSE_CONSOLEKIT=no" hostmakedepends="cmake pkg-config" makedepends="libpng-devel>=1.6 libjpeg-turbo-devel libXrandr-devel libXmu-devel libXft-devel pam-devel" +conf_files="/etc/slim.conf /etc/pam.d/slim" +systemd_services="slim.service off" short_desc="Desktop-independent graphical login manager for X11" maintainer="Juan RP " license="GPL-2" @@ -22,11 +24,3 @@ post_install() { sed -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt01|' \ -e 's|/var/run/slim.lock|/var/lock/slim.lock|' -i ${DESTDIR}/etc/slim.conf } - -slim_package() { - conf_files="/etc/slim.conf /etc/pam.d/slim" - systemd_services="slim.service off" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sloccount/template b/srcpkgs/sloccount/template index 320c2050ab..bb0763e1f6 100644 --- a/srcpkgs/sloccount/template +++ b/srcpkgs/sloccount/template @@ -3,6 +3,7 @@ pkgname=sloccount version=2.26 revision=1 hostmakedepends="flex" +depends="perl" short_desc="Tool to count physical source lines of code in many languages" maintainer="pancake " license="GPL-2" @@ -21,10 +22,3 @@ 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 7ab2115b6c..ececfca3f4 100644 --- a/srcpkgs/slock/template +++ b/srcpkgs/slock/template @@ -26,9 +26,3 @@ do_install() { make PREFIX=/usr DESTDIR=$DESTDIR install vinstall LICENSE 644 usr/share/licenses/$pkgname } - -slock_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/smali/template b/srcpkgs/smali/template index 3b2c6fc0d6..3b36758b18 100644 --- a/srcpkgs/smali/template +++ b/srcpkgs/smali/template @@ -19,9 +19,3 @@ do_install() { vinstall ${FILESDIR}/smali 755 usr/bin vinstall ${FILESDIR}/baksmali 755 usr/bin } - -smali_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/smartmontools/template b/srcpkgs/smartmontools/template index 594e95841c..bdebd2eb85 100644 --- a/srcpkgs/smartmontools/template +++ b/srcpkgs/smartmontools/template @@ -7,6 +7,9 @@ configure_args="--enable-drivedb --with-libcap-ng=yes --with-systemdsystemunitdir=/usr/lib/systemd/system --with-drivedbdir=/var/db/${pkgname}" makedepends="libcap-ng-devel" +conf_files="/etc/smartd.conf" +mutable_files="/var/db/smartmontools/drivedb.h" +systemd_services="smartd.service on" short_desc="S.M.A.R.T Monitoring Tools" maintainer="Juan RP " license="GPL-2" @@ -19,12 +22,3 @@ long_desc=" and Reporting Technology System (SMART) built into most modern ATA and SCSI harddisks. In many cases, these utilities will provide advanced warning of disk degradation and failure." - -smartmontools_package() { - conf_files="/etc/smartd.conf" - mutable_files="/var/db/smartmontools/drivedb.h" - systemd_services="smartd.service on" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template index 39520f47f7..d79df5c4cb 100644 --- a/srcpkgs/smpeg/template +++ b/srcpkgs/smpeg/template @@ -24,7 +24,7 @@ post_install() { smpeg-devel_package() { depends="SDL-devel smpeg>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/bin vmove usr/include @@ -32,9 +32,3 @@ smpeg-devel_package() { vmove usr/share } } - -smpeg_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/smplayer/template b/srcpkgs/smplayer/template index caa755c3f3..0fbeb8a7c7 100644 --- a/srcpkgs/smplayer/template +++ b/srcpkgs/smplayer/template @@ -3,6 +3,7 @@ pkgname=smplayer version=0.8.5 revision=1 makedepends="mplayer qt-devel hicolor-icon-theme desktop-file-utils" +depends="mplayer hicolor-icon-theme desktop-file-utils" short_desc="A complete front-end for MPlayer" maintainer="Juan RP " license="GPL-2" @@ -18,10 +19,3 @@ do_build() { do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install } - -smplayer_package() { - depends="mplayer hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/smproxy/template b/srcpkgs/smproxy/template index 97341b8bdc..6a5ee08eab 100644 --- a/srcpkgs/smproxy/template +++ b/srcpkgs/smproxy/template @@ -14,9 +14,3 @@ 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/smu-git/template b/srcpkgs/smu-git/template index 6c87452226..3a38505e1c 100644 --- a/srcpkgs/smu-git/template +++ b/srcpkgs/smu-git/template @@ -18,9 +18,3 @@ do_fetch() { post_install() { vinstall LICENSE 644 usr/share/licenses/smu } - -smu-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template index 9666e58844..1b4a2040b1 100644 --- a/srcpkgs/snapper/template +++ b/srcpkgs/snapper/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-zypp --with-conf=/etc/conf.d" hostmakedepends="pkg-config automake libtool libxml2-devel libxslt docbook-xsl" makedepends="zlib-devel boost-devel>=1.54 dbus-devel libxml2-devel pam-devel" +conf_files="/etc/conf.d/snapper" short_desc="Tool for Linux filesystem snapshot management" maintainer="Juan RP " license="GPL-2" @@ -47,10 +48,3 @@ snapper-devel_package() { vmove "usr/lib/*.so" } } - -snapper_package() { - conf_files="/etc/conf.d/snapper" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/snappy/template b/srcpkgs/snappy/template index af9b725b31..15e1dd0d45 100644 --- a/srcpkgs/snappy/template +++ b/srcpkgs/snappy/template @@ -20,9 +20,3 @@ snappy-devel_package() { vmove "usr/lib/*.so" } } - -snappy_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/socat/template b/srcpkgs/socat/template index 5932a7ffe5..5740c95a84 100644 --- a/srcpkgs/socat/template +++ b/srcpkgs/socat/template @@ -19,9 +19,3 @@ 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/soprano/template b/srcpkgs/soprano/template index 2da09b2e80..7b784e5374 100644 --- a/srcpkgs/soprano/template +++ b/srcpkgs/soprano/template @@ -6,6 +6,7 @@ build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=OFF -DSOPRANO_DISABLE_CLUCENE_INDEX=ON" hostmakedepends="cmake pkg-config" makedepends="qt-devel raptor-devel redland-devel libiodbc-devel virtuoso-base" +depends="virtuoso-base" short_desc="Highly usable object-oriented C++/Qt4 framework for RDF data" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -22,10 +23,3 @@ soprano-devel_package() { vmove usr/share/soprano/cmake } } - -soprano_package() { - depends="virtuoso-base" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/sord/template b/srcpkgs/sord/template index 71833d645d..99fbfe931a 100644 --- a/srcpkgs/sord/template +++ b/srcpkgs/sord/template @@ -15,7 +15,7 @@ long_desc=" sord-devel_package() { depends="serd-devel libsord>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -23,14 +23,8 @@ sord-devel_package() { } libsord_package() { - short_desc="${short_desc} - Runtime library" + 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 de5ffeaf53..1afd70bd71 100644 --- a/srcpkgs/sound-juicer/template +++ b/srcpkgs/sound-juicer/template @@ -9,6 +9,7 @@ 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 gst-plugins-good1" short_desc="CD ripping tool using GTK+ and GStreamer" +depends="hicolor-icon-theme desktop-file-utils gst-plugins-good1" maintainer="Juan RP " homepage="http://burtonini.com/blog/computers/sound-juicer" license="GPL-2" @@ -23,10 +24,3 @@ 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 c3237b09ad..b12226cbd4 100644 --- a/srcpkgs/sound-theme-freedesktop/template +++ b/srcpkgs/sound-theme-freedesktop/template @@ -2,6 +2,7 @@ pkgname=sound-theme-freedesktop version=0.7 revision=2 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool" short_desc="Freedesktop sound theme" @@ -14,10 +15,3 @@ 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." - -sound-theme-freedesktop_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/soundtouch/template b/srcpkgs/soundtouch/template index 161988faef..f5d1a31859 100644 --- a/srcpkgs/soundtouch/template +++ b/srcpkgs/soundtouch/template @@ -33,16 +33,10 @@ post_install() { soundtouch-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + 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/source-highlight/template b/srcpkgs/source-highlight/template index 86fc37d57f..a53d029b55 100644 --- a/srcpkgs/source-highlight/template +++ b/srcpkgs/source-highlight/template @@ -40,9 +40,3 @@ source-highlight-devel_package() { vmove "usr/lib/*.so" } } - -source-highlight_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/spacefm/template b/srcpkgs/spacefm/template index f6ed795d17..11d11705bb 100644 --- a/srcpkgs/spacefm/template +++ b/srcpkgs/spacefm/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel startup-notification-devel libudev-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Multi-panel tabbed file manager" maintainer="Juan RP " license="GPL-3" homepage="http://ignorantguru.github.com/spacefm/" distfiles="https://github.com/IgnorantGuru/spacefm/raw/pkg/${version}/spacefm-${version}.tar.xz" checksum=a47861b395ee991bc56e367238f2c3070c308a2b635be1099b0a6d2eda0f1795 - -spacefm_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template index 556567442b..61ef9edf16 100644 --- a/srcpkgs/speech-dispatcher/template +++ b/srcpkgs/speech-dispatcher/template @@ -10,35 +10,29 @@ homepage="http://devel.freebsoft.org/speechd" checksum=0a6ce544cfbac8592a8ea08e3ab24c389153904ea51c6fd68756cea52de9efa2 distfiles="http://devel.freebsoft.org/pub/projects/speechd/${pkgname}-${version}.tar.gz" makedepends="intltool libltdl-devel pkg-config glib-devel dotconf-devel" - -speech-dispatcher_package() { - conf_files=" - /etc/speech-dispatcher/speechd.conf - /etc/speech-dispatcher/clients/emacs.conf - /etc/speech-dispatcher/clients/gnome-speech.conf - /etc/speech-dispatcher/modules/ibmtts.conf - /etc/speech-dispatcher/modules/espeak-mbrola-generic.conf - /etc/speech-dispatcher/modules/ivona.conf - /etc/speech-dispatcher/modules/festival.conf - /etc/speech-dispatcher/modules/swift-generic.conf - /etc/speech-dispatcher/modules/espeak-generic.conf - /etc/speech-dispatcher/modules/flite.conf - /etc/speech-dispatcher/modules/llia_phon-generic.conf - /etc/speech-dispatcher/modules/dtk-generic.conf - /etc/speech-dispatcher/modules/epos-generic.conf - /etc/speech-dispatcher/modules/espeak.conf - /etc/speech-dispatcher/modules/cicero.conf" - pkg_install() { - vmove all - } -} +conf_files=" + /etc/speech-dispatcher/speechd.conf + /etc/speech-dispatcher/clients/emacs.conf + /etc/speech-dispatcher/clients/gnome-speech.conf + /etc/speech-dispatcher/modules/ibmtts.conf + /etc/speech-dispatcher/modules/espeak-mbrola-generic.conf + /etc/speech-dispatcher/modules/ivona.conf + /etc/speech-dispatcher/modules/festival.conf + /etc/speech-dispatcher/modules/swift-generic.conf + /etc/speech-dispatcher/modules/espeak-generic.conf + /etc/speech-dispatcher/modules/flite.conf + /etc/speech-dispatcher/modules/llia_phon-generic.conf + /etc/speech-dispatcher/modules/dtk-generic.conf + /etc/speech-dispatcher/modules/epos-generic.conf + /etc/speech-dispatcher/modules/espeak.conf + /etc/speech-dispatcher/modules/cicero.conf" speech-dispatcher-devel_package() { - short_desc="${short_desc} -- development files" + short_desc+=" - development files" depends="${sourcepkg}-${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } -} \ No newline at end of file +} diff --git a/srcpkgs/speex/template b/srcpkgs/speex/template index 2dc3917a33..f532953ef7 100644 --- a/srcpkgs/speex/template +++ b/srcpkgs/speex/template @@ -39,9 +39,3 @@ speex-devel_package() { vmove usr/share/aclocal } } - -speex_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 9941fa0ca8..ed11596047 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -10,6 +10,7 @@ hostmakedepends="pkg-config intltool gobject-introspection" makedepends="dbus-glib-devel vala-devel pixman-devel celt051-devel openssl-devel libsasl-devel gtk+3-devel pulseaudio-devel libjpeg-turbo-devel polkit-devel hwids" +depends="hwids" homepage="http://spice-space.org" license="LGPL-2.1" short_desc="GTK+2/3 SPICE widget" @@ -30,10 +31,3 @@ spice-gtk-devel_package() { vmove usr/share/gtk-doc } } - -spice-gtk_package() { - depends="hwids" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/spice-protocol/template b/srcpkgs/spice-protocol/template index a95ba1dca6..fb332755e3 100644 --- a/srcpkgs/spice-protocol/template +++ b/srcpkgs/spice-protocol/template @@ -2,6 +2,7 @@ pkgname=spice-protocol version=0.12.6 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--datarootdir=/usr/lib" short_desc="Spice Protocol headers" @@ -10,10 +11,3 @@ homepage="http://www.spicespace.org/" license="BSD" distfiles="http://www.spicespace.org/download/releases/$pkgname-$version.tar.bz2" checksum=9d4745602eb2ab1d1c1ab98b4babf587574870993b4faefe354ac57bb5e8259b - -spice-protocol_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/spice-vdagent/template b/srcpkgs/spice-vdagent/template index c83e1f69ac..4d695bb7c9 100644 --- a/srcpkgs/spice-vdagent/template +++ b/srcpkgs/spice-vdagent/template @@ -8,6 +8,8 @@ hostmakedepends="pkg-config" makedepends="libglib-devel dbus-devel libXfixes-devel libXrandr-devel libXinerama-devel libpciaccess-devel spice-protocol>=0.12.6 systemd-devel desktop-file-utils" +depends="dbus" +systemd_services="spice-vdagentd.service on" short_desc="Spice agent for Linux" homepage="http://spice-space.org/" license="GPL-3" @@ -27,11 +29,3 @@ long_desc=" post_install() { rm -rf ${DESTDIR}/var } - -spice-vdagent_package() { - systemd_services="spice-vdagentd.service on" - depends="dbus" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/spice/template b/srcpkgs/spice/template index 0fd8c44476..5621a1c1e7 100644 --- a/srcpkgs/spice/template +++ b/srcpkgs/spice/template @@ -25,9 +25,3 @@ spice-devel_package() { vmove "usr/lib/*.so" } } - -spice_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/splint/template b/srcpkgs/splint/template index eb72be1a6c..3ec9291e24 100644 --- a/srcpkgs/splint/template +++ b/srcpkgs/splint/template @@ -18,9 +18,3 @@ 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 6679f4877d..08e7f1e968 100644 --- a/srcpkgs/sqlalchemy-migrate/template +++ b/srcpkgs/sqlalchemy-migrate/template @@ -4,6 +4,9 @@ version=0.7.2 revision=2 build_style=python-module makedepends="python-distribute" +noarch="yes" +pycompile_module="migrate" +depends="python python-sqlalchemy python-decorator python-tempita" short_desc="SQLAlchemy Schema Migration Tools" maintainer="Juan RP " homepage="https://code.google.com/p/sqlalchemy-migrate/" @@ -14,12 +17,3 @@ 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/sqlite/template b/srcpkgs/sqlite/template index 393e88ecca..7e92040a8c 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -32,9 +32,3 @@ sqlite-devel_package() { vmove "usr/lib/*.so" } } - -sqlite_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template index 1b34109e36..ab63db47d3 100644 --- a/srcpkgs/squashfs-tools/template +++ b/srcpkgs/squashfs-tools/template @@ -34,9 +34,3 @@ 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/template b/srcpkgs/sratom/template index bf837f65b2..70bceabe4b 100644 --- a/srcpkgs/sratom/template +++ b/srcpkgs/sratom/template @@ -16,15 +16,9 @@ long_desc=" sratom-devel_package() { depends="serd-devel>=0.18.0 sord-devel lv2 sratom>=${version}" - short_desc="${short_desc} - Development files" + 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 ee560e7a54..b4fef3a0e4 100644 --- a/srcpkgs/sshfs-fuse/template +++ b/srcpkgs/sshfs-fuse/template @@ -4,6 +4,7 @@ version=2.3 revision=2 build_style=gnu-configure makedepends="pkg-config glib-devel fuse-devel openssh>=6.1p1" +depends="openssh>=6.1p1" short_desc="FUSE client based on the SSH File Transfer Protocol" maintainer="Juan RP " homepage="http://fuse.sourceforge.net/sshfs.html" @@ -15,10 +16,3 @@ 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 31501a9016..77d5053fd8 100644 --- a/srcpkgs/st/template +++ b/srcpkgs/st/template @@ -3,6 +3,7 @@ pkgname=st version=0.4 revision=1 makedepends="pkg-config libX11-devel libXinerama-devel libXft-devel terminus-font" +depends="terminus-font" short_desc="simple terminal implementation for X" maintainer="pancake " license="MIT" @@ -19,10 +20,3 @@ 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/template b/srcpkgs/startup-notification/template index 3dd3f9f6fc..e8374f55a3 100644 --- a/srcpkgs/startup-notification/template +++ b/srcpkgs/startup-notification/template @@ -26,9 +26,3 @@ startup-notification-devel_package() { vmove usr/lib/pkgconfig } } - -startup-notification_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/steam/template b/srcpkgs/steam/template index 596185bad1..15241b4a73 100644 --- a/srcpkgs/steam/template +++ b/srcpkgs/steam/template @@ -7,6 +7,8 @@ version=1.0.0.45 revision=1 wrksrc=steam makedepends="hicolor-icon-theme desktop-file-utils liberation-fonts-ttf" +depends="${makedepends}" +nonfree="yes" short_desc="Digital distribution client bootstrap package - Valve's steam client" maintainer="Juan RP " license="Propietary license" @@ -25,11 +27,3 @@ do_install() { # Ignore steamdeps. ln -sf /bin/true ${DESTDIR}/usr/bin/steamdeps } - -steam_package() { - depends="${makedepends}" - nonfree="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/strace/template b/srcpkgs/strace/template index 1dee1f5953..a78caeff9f 100644 --- a/srcpkgs/strace/template +++ b/srcpkgs/strace/template @@ -12,9 +12,3 @@ checksum=f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215e1d7f8 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/template b/srcpkgs/strigi/template index 79a9fe1c43..906105a466 100644 --- a/srcpkgs/strigi/template +++ b/srcpkgs/strigi/template @@ -30,9 +30,3 @@ strigi-devel_package() { vmove usr/lib/cmake } } - -strigi_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template index 6369840c25..d8ebaa5ba2 100644 --- a/srcpkgs/sublime-text3/template +++ b/srcpkgs/sublime-text3/template @@ -11,6 +11,8 @@ short_desc="Sophisticated text editor for code, markup and prose" wrksrc="sublime_text_3" only_for_archs="x86_64" +nonfree="yes" +depends="libpng gtk+ hicolor-icon-theme desktop-file-utils" do_install() { vmkdir "usr/bin" @@ -23,11 +25,3 @@ do_install() { ln -s /usr/share/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3 sed -i 's:Exec=/opt/sublime_text/:Exec=/usr/share/sublime_text/:' ${DESTDIR}/usr/share/applications/sublime_text.desktop } - -sublime-text3_package() { - nonfree="yes" - depends="libpng gtk+ hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/subversion/template b/srcpkgs/subversion/template index ca0c0cb5ec..f081e96dc3 100644 --- a/srcpkgs/subversion/template +++ b/srcpkgs/subversion/template @@ -14,6 +14,7 @@ makedepends="db-devel>=5.3 perl>=5.18 python-devel swig apr-util-devel libldap-devel serf-devel gdbm-devel expat-devel apr-devel libuuid-devel sqlite-devel libsasl-devel dbus-devel libgnome-keyring-devel glib-devel qt-devel kdelibs-devel apache-devel ca-certificates" +depends="ca-certificates" do_configure() { ./configure ${configure_args} \ @@ -115,10 +116,3 @@ subversion-perl_package() { vmove usr/share/man/man3 } } - -subversion_package() { - depends="ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sudo/template b/srcpkgs/sudo/template index 9944e671b9..6ca11f4473 100644 --- a/srcpkgs/sudo/template +++ b/srcpkgs/sudo/template @@ -7,6 +7,7 @@ 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,10 +23,3 @@ 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 all - } -} diff --git a/srcpkgs/suil/template b/srcpkgs/suil/template index aeb0ff9245..2b16724c6e 100644 --- a/srcpkgs/suil/template +++ b/srcpkgs/suil/template @@ -27,15 +27,9 @@ long_desc=" suil-devel_package() { depends="suil>=${version}" - short_desc="${short_desc} - Development files" + 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 7fa67a8ed7..1c812e0b3e 100644 --- a/srcpkgs/surf/template +++ b/srcpkgs/surf/template @@ -12,9 +12,3 @@ license="MIT" homepage="http://surf.suckless.org" distfiles="http://dl.suckless.org/surf/$pkgname-$version.tar.gz" checksum=fdc1ccfaee5c4f008eeb8fe5f9200d3ad71296e8d7af52bdd6a771f111866805 - -surf_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sushi/template b/srcpkgs/sushi/template index 98faf92b02..3ba69542be 100644 --- a/srcpkgs/sushi/template +++ b/srcpkgs/sushi/template @@ -14,9 +14,3 @@ license="GPL-2" maintainer="Juan RP " distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8 - -sushi_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/swh-lv2/template b/srcpkgs/swh-lv2/template index e68c0af318..9d46b32511 100644 --- a/srcpkgs/swh-lv2/template +++ b/srcpkgs/swh-lv2/template @@ -17,9 +17,3 @@ long_desc=" 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 0111490cec..b1d7abe58d 100644 --- a/srcpkgs/swig/template +++ b/srcpkgs/swig/template @@ -17,9 +17,3 @@ 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/sxhkd-git/template b/srcpkgs/sxhkd-git/template index d5802275c0..f8572120a1 100644 --- a/srcpkgs/sxhkd-git/template +++ b/srcpkgs/sxhkd-git/template @@ -22,9 +22,3 @@ pre_build() { post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -sxhkd-git_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sxiv-git/template b/srcpkgs/sxiv-git/template index 3658d097a4..69b1030795 100644 --- a/srcpkgs/sxiv-git/template +++ b/srcpkgs/sxiv-git/template @@ -3,7 +3,8 @@ pkgname=sxiv-git version=20131230 revision=1 build_style=gnu-makefile -makedepends="libX11-devel imlib2-devel giflib-devel" +makedepends="libX11-devel imlib2-devel giflib-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="Simple X Image Viewer" maintainer="Ypnose " license="GPL-2" @@ -22,10 +23,3 @@ pre_build() { post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -sxiv-git_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sylpheed/template b/srcpkgs/sylpheed/template index 090b7415ed..d4add20c92 100644 --- a/srcpkgs/sylpheed/template +++ b/srcpkgs/sylpheed/template @@ -33,9 +33,3 @@ 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 02edd0a5e2..1cc735d430 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -56,9 +56,3 @@ synergy-gui_package() { vmove usr/share/applications } } - -synergy_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/sysfsutils/template b/srcpkgs/sysfsutils/template index ef947e1ba7..e151001385 100644 --- a/srcpkgs/sysfsutils/template +++ b/srcpkgs/sysfsutils/template @@ -28,9 +28,3 @@ libsysfs-devel_package() { vmove "usr/lib/*.a" } } - -sysfsutils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template index c4f4b63763..c2bd2e2ccc 100644 --- a/srcpkgs/syslinux/template +++ b/srcpkgs/syslinux/template @@ -20,9 +20,3 @@ 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 bf015f2ac3..ed38628330 100644 --- a/srcpkgs/sysprof/template +++ b/srcpkgs/sysprof/template @@ -18,9 +18,3 @@ long_desc=" Load and Save profiles Fast, no-nonsense graphical user interface Command line tool included" - -sysprof_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/system-config-printer/template b/srcpkgs/system-config-printer/template index cf86c08c23..8137295bc6 100644 --- a/srcpkgs/system-config-printer/template +++ b/srcpkgs/system-config-printer/template @@ -10,19 +10,13 @@ hostmakedepends="pkg-config intltool xmlto desktop-file-utils" makedepends="gtk+3-devel cups-devel libusbx-devel systemd-devel pycups dbus-python notify-python pycurl pysmbc pygobject gir-freedesktop gnome-keyring" +depends="python pycups dbus-python notify-python pycurl pysmbc pygobject + gir-freedesktop gnome-keyring" +pycompile_module="cupshelpers" +pycompile_dirs="/usr/share/system-config-printer" short_desc="A CUPS printer configuration tool and status applet" maintainer="Juan RP " license="GPL-2" homepage="http://cyberelk.net/tim/software/system-config-printer/" distfiles="http://cyberelk.net/tim/data/${pkgname}/${version%*.*}/${pkgname}-${version}.tar.xz" checksum=4e22413f3581fc1cf38af648573fa90bb7783a2c3b8be3aadf47beda101e04f8 - -system-config-printer_package() { - pycompile_module="cupshelpers" - pycompile_dirs="/usr/share/system-config-printer" - depends="python pycups dbus-python notify-python pycurl pysmbc pygobject - gir-freedesktop gnome-keyring" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 0b87122d1d..a0347e4d19 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -23,6 +23,20 @@ hostmakedepends="which pkg-config automake gettext-devel intltool gperf libxslt docbook-xsl libtool libgcrypt-devel" makedepends="acl-devel dbus-devel>=1.6.10_2 libcap-devel libkmod-devel liblzma-devel cryptsetup-devel libblkid-devel libgcrypt-devel pam-devel" +depends="xbps-triggers>=0.64 dbus kbd libcap-progs shadow" +# Create systemd-journal (gid 24) system group. +system_groups="systemd-journal:24" +replaces="nss-myhostname>=0 systemd-analyze>0" +conf_files=" + /etc/hostname + /etc/vconsole.conf + /etc/locale.conf + /etc/systemd/system.conf + /etc/systemd/user.conf + /etc/systemd/journald.conf + /etc/systemd/logind.conf + /etc/systemd/bootchart.conf + /etc/udev/udev.conf" pre_configure() { autoreconf -fi @@ -146,23 +160,3 @@ systemd-libs_package() { vmove "usr/lib/libsystemd*.so.*" } } - -systemd_package() { - # Create systemd-journal (gid 24) system group. - system_groups="systemd-journal:24" - replaces="nss-myhostname>=0 systemd-analyze>0" - conf_files=" - /etc/hostname - /etc/vconsole.conf - /etc/locale.conf - /etc/systemd/system.conf - /etc/systemd/user.conf - /etc/systemd/journald.conf - /etc/systemd/logind.conf - /etc/systemd/bootchart.conf - /etc/udev/udev.conf" - depends="xbps-triggers>=0.64 dbus kbd libcap-progs shadow" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template index acb8c88cdc..d6742888c9 100644 --- a/srcpkgs/t1lib/template +++ b/srcpkgs/t1lib/template @@ -32,9 +32,3 @@ t1lib-devel_package() { vmove "usr/lib/*.a" } } - -t1lib_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tabbed-git/template b/srcpkgs/tabbed-git/template index 002ff032cb..f1d14ed2b9 100644 --- a/srcpkgs/tabbed-git/template +++ b/srcpkgs/tabbed-git/template @@ -5,6 +5,8 @@ revision=1 build_style=gnu-makefile make_build_args="INCS=-I. LIBS=-lX11" makedepends="libX11-devel" +provides="tabbed-${version}" +replaces="tabbed>=0" short_desc="Simple generic tabbed fronted to xembed aware applications" maintainer="Ypnose " license="MIT" @@ -26,11 +28,3 @@ pre_build() { post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -tabbed-git_package() { - provides="tabbed-${version}" - replaces="tabbed>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tabbed/template b/srcpkgs/tabbed/template index 429092b007..f0a5afc6a5 100644 --- a/srcpkgs/tabbed/template +++ b/srcpkgs/tabbed/template @@ -7,6 +7,8 @@ distfiles="http://dl.suckless.org/tools/$pkgname-$version.tar.gz" build_style=gnu-makefile make_build_args="INCS=-I. LIBS=-lX11" makedepends="libX11-devel" +provides="tabbed-${version}" +replaces="tabbed>=0" short_desc="Tab interface for application supporting Xembed" maintainer="Ypnose " license="MIT" @@ -24,11 +26,3 @@ pre_build() { post_install() { vinstall LICENSE 644 usr/share/licenses/$pkgname } - -tabbed_package() { - provides="tabbed-${version}" - replaces="tabbed>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/taglib-sharp/template b/srcpkgs/taglib-sharp/template index 18d696d889..7c141e2343 100644 --- a/srcpkgs/taglib-sharp/template +++ b/srcpkgs/taglib-sharp/template @@ -18,9 +18,3 @@ wrksrc="taglib-sharp-taglib-sharp-${version}" pre_configure() { ./autogen.sh } - -taglib-sharp_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template index 34edf57f1e..1404de8e9f 100644 --- a/srcpkgs/taglib/template +++ b/srcpkgs/taglib/template @@ -27,9 +27,3 @@ taglib-devel_package() { vmove "usr/lib/*.so" } } - -taglib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index 03bc2f356a..d5ccbbc11a 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -38,9 +38,3 @@ talloc-devel_package() { vmove usr/share/man/man3 } } - -talloc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template index 0714c287e6..8484d124f8 100644 --- a/srcpkgs/tar/template +++ b/srcpkgs/tar/template @@ -3,16 +3,10 @@ pkgname=tar version=1.27.1 revision=1 build_style=gnu-configure +conflicts="chroot-tar>=0" short_desc="The GNU tape archiver with remote magnetic tape support" maintainer="Juan RP " homepage="http://www.gnu.org/software/tar/" license="GPL-3" distfiles="http://ftp.gnu.org/gnu/tar/$pkgname-$version.tar.xz" checksum=574210bccbcf9eec889f73234a63ad6863f5b8644ac1f3d7f13871372295b7c7 - -tar_package() { - conflicts="chroot-tar>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/task/template b/srcpkgs/task/template index 5878452ea6..67ea0d29fb 100644 --- a/srcpkgs/task/template +++ b/srcpkgs/task/template @@ -11,9 +11,3 @@ homepage="http://taskwarrior.org/projects/taskwarrior" distfiles="http://www.taskwarrior.org/download/${pkgname}-${version}.tar.gz" checksum=39e25dd285e6bc8474337a5868cb2ec55675978fa1f08c802e6da58b4181ee14 short_desc="a command-line todo list manager" - -task_package() { - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/tcc/template b/srcpkgs/tcc/template index a48432d6ac..a5f25bd568 100644 --- a/srcpkgs/tcc/template +++ b/srcpkgs/tcc/template @@ -10,9 +10,3 @@ homepage="http://bellard.org/tcc/" license="LGPL-2.1" distfiles="${NONGNU_SITE}/tinycc/tcc-$version.tar.bz2" checksum=521e701ae436c302545c3f973a9c9b7e2694769c71d9be10f70a2460705b6d71 - -tcc_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tcl/template b/srcpkgs/tcl/template index 607a853e86..1ebf5e3249 100644 --- a/srcpkgs/tcl/template +++ b/srcpkgs/tcl/template @@ -45,9 +45,3 @@ tcl-devel_package() { vmove usr/share/man/mann } } - -tcl_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tcp_wrappers/template b/srcpkgs/tcp_wrappers/template index f04bf9ad6d..201ee41136 100644 --- a/srcpkgs/tcp_wrappers/template +++ b/srcpkgs/tcp_wrappers/template @@ -30,7 +30,7 @@ pre_install() { tcp_wrappers-devel_package() { depends="tcp_wrappers-libs>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" @@ -39,7 +39,7 @@ tcp_wrappers-devel_package() { } tcp_wrappers-libs_package() { - short_desc="${short_desc} -- shared libraries" + short_desc+=" - shared libraries" conf_files="/etc/hosts.allow /etc/hosts.deny" pkg_install() { vmove "usr/lib/*.so*" @@ -47,9 +47,3 @@ tcp_wrappers-libs_package() { vmove etc } } - -tcp_wrappers_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template index 96155ea4df..3a59a38d51 100644 --- a/srcpkgs/tcpdump/template +++ b/srcpkgs/tcpdump/template @@ -15,9 +15,3 @@ checksum=14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96 if [ "$CROSS_BUILD" ]; then configure_args+=" ac_cv_linux_vers=$(uname -r 2>&1 | sed -n -e '$s/.* //' -e '$s/\..*//p') td_cv_buggygetaddrinfo=no" fi - -tcpdump_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 2cc0e22ca2..458ec8f046 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -46,9 +46,3 @@ libtdb_package() { vmove "usr/lib/*.so*" } } - -tdb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/telepathy-butterfly/template b/srcpkgs/telepathy-butterfly/template index 29796832ec..8bbabb278a 100644 --- a/srcpkgs/telepathy-butterfly/template +++ b/srcpkgs/telepathy-butterfly/template @@ -4,6 +4,9 @@ version=0.5.15 revision=2 build_style=gnu-configure makedepends="python papyon telepathy-python" +depends="${makedepends}" +noarch="yes" +pycompile_module="butterfly" short_desc="A MSN connection manager for Telepathy" homepage="http://telepathy.freedesktop.org" license="GPL-2" @@ -15,12 +18,3 @@ long_desc=" including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications." - -telepathy-butterfly_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="butterfly" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template index 39bcab5f27..a772c62e9a 100644 --- a/srcpkgs/telepathy-farstream/template +++ b/srcpkgs/telepathy-farstream/template @@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool libxslt" makedepends="vala-devel gobject-introspection dbus-glib-devel telepathy-glib-devel>=0.19.9 farstream-devel>=0.2.0 python-devel pygobject2-devel gst-python-devel" +replaces="telepathy-farsight>=0" short_desc="Telepathy library that uses Farstream to handle Call channels" maintainer="Juan RP " license="LGPL-2.1" @@ -31,10 +32,3 @@ telepathy-farstream-devel_package() { vmove usr/share/gir-1.0 } } - -telepathy-farstream_package() { - replaces="telepathy-farsight>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template index d4be66afca..9533fb6f5d 100644 --- a/srcpkgs/telepathy-gabble/template +++ b/srcpkgs/telepathy-gabble/template @@ -9,6 +9,7 @@ hostmakedepends="python pkg-config libxslt" makedepends="glib-devel dbus-glib-devel libxml2-devel sqlite-devel gnutls-devel>=3.1.5 telepathy-glib-devel>=0.21 libsoup-devel libnice-devel ca-certificates" +depends="telepathy-glib>=0.21 ca-certificates" short_desc="A Jabber/XMPP connection manager for Telepathy" maintainer="Juan RP " license="LGPL-2.1" @@ -20,10 +21,3 @@ long_desc=" including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications." - -telepathy-gabble_package() { - depends="telepathy-glib>=0.21 ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template index 40af3c1ea5..cbe79c1e28 100644 --- a/srcpkgs/telepathy-glib/template +++ b/srcpkgs/telepathy-glib/template @@ -30,9 +30,3 @@ telepathy-glib-devel_package() { vmove "usr/lib/*.so" } } - -telepathy-glib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/telepathy-haze/template b/srcpkgs/telepathy-haze/template index 88330f3a5e..d34be56814 100644 --- a/srcpkgs/telepathy-haze/template +++ b/srcpkgs/telepathy-haze/template @@ -11,9 +11,3 @@ license="LGPL-2.1" homepage="http://telepathy.freedesktop.org" distfiles="${homepage}/releases/$pkgname/$pkgname-$version.tar.gz" checksum=3e76049c05f2cd5900c5c0c1cfebdf7ae79eec987a599f1090946673c5b8f9c9 - -telepathy-haze_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template index a08aa60f27..a3a4cd42a1 100644 --- a/srcpkgs/telepathy-idle/template +++ b/srcpkgs/telepathy-idle/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config python libxslt" makedepends="openssl-devel dbus-glib-devel telepathy-glib-devel>=0.22" +depends="telepathy-glib>=0.22" short_desc="An IRC connection manager for Telepathy" maintainer="Juan RP " license="LGPL-2.1" @@ -16,10 +17,3 @@ long_desc=" including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications." - -telepathy-idle_package() { - depends="telepathy-glib>=0.22" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template index 75f0f4bbf8..729084a439 100644 --- a/srcpkgs/telepathy-logger/template +++ b/srcpkgs/telepathy-logger/template @@ -20,7 +20,7 @@ long_desc=" telepathy-logger-devel_package() { depends="libxml2-devel telepathy-glib-devel ${sourcepkg}-${version}_${revision}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -28,9 +28,3 @@ telepathy-logger-devel_package() { vmove usr/share/gtk-doc } } - -telepathy-logger_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template index c0d1294f56..1f76fc0da9 100644 --- a/srcpkgs/telepathy-mission-control/template +++ b/srcpkgs/telepathy-mission-control/template @@ -9,6 +9,7 @@ configure_args="--disable-static --enable-gnome-keyring hostmakedepends="pkg-config python-devel intltool libxslt glib-devel" makedepends="libglib-devel telepathy-glib-devel>=0.22 NetworkManager-devel upower-devel libgnome-keyring-devel>=3.10" +depends="telepathy-glib>=0.22" short_desc="Telepathy component providing abstraction for details of connection managers" maintainer="Juan RP " license="LGPL-2.1" @@ -30,10 +31,3 @@ telepathy-mission-control-devel_package() { vmove "usr/lib/*.so" } } - -telepathy-mission-control_package() { - depends="telepathy-glib>=0.22" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template index 6498c4ff5a..66e5fd7cc2 100644 --- a/srcpkgs/telepathy-python/template +++ b/srcpkgs/telepathy-python/template @@ -5,6 +5,9 @@ revision=3 build_style=gnu-configure hostmakedepends="libxslt" makedepends="python dbus-python" +depends="python dbus-python" +noarch="yes" +pycompile_module="telepathy" short_desc="Python libraries for use in Telepathy clients and connection managers" homepage="http://telepathy.freedesktop.org" license="LGPL-2.1" @@ -16,12 +19,3 @@ long_desc=" including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications." - -telepathy-python_package() { - depends="python dbus-python" - noarch="yes" - pycompile_module="telepathy" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template index 0ba3b77c97..b107148df0 100644 --- a/srcpkgs/telepathy-salut/template +++ b/srcpkgs/telepathy-salut/template @@ -8,6 +8,7 @@ configure_args="--disable-tests --disable-plugins --with-tls=openssl hostmakedepends="pkg-config xmldiff" makedepends="glib-devel avahi-glib-libs-devel libsoup-devel telepathy-glib-devel openssl-devel libuuid-devel sqlite-devel" +depends="avahi" short_desc="A link-local XMPP connection manager for Telepathy" maintainer="Juan RP " homepage="http://telepathy.freedesktop.org" @@ -19,10 +20,3 @@ long_desc=" including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications." - -telepathy-salut_package() { - depends="avahi" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/terminology/template b/srcpkgs/terminology/template index f20f55e880..69022e029b 100644 --- a/srcpkgs/terminology/template +++ b/srcpkgs/terminology/template @@ -4,6 +4,7 @@ version=0.4.0 revision=2 hostmakedepends="pkg-config efl>=1.8" makedepends="efl-devel>=1.8.1 elementary-devel>=1.8 desktop-file-utils xdg-utils" +depends="xdg-utils" build_style=gnu-configure homepage="http://enlightenment.org" short_desc="Enlightenment's terminal emulator" @@ -11,10 +12,3 @@ maintainer="Juan RP " license="BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=1e833a74f1311be2d80b2334d210d2c0099a521e61703c49f4f6a95c13cd1c6d - -terminology_package() { - depends="xdg-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template index 453c856b3e..5841ae64f6 100644 --- a/srcpkgs/terminus-font/template +++ b/srcpkgs/terminus-font/template @@ -10,6 +10,9 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz" checksum=f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7 makedepends="perl bdftopcf font-util xbps-triggers>=0.58" +depends="font-util xbps-triggers>=0.58" +noarch="yes" +font_dirs="/usr/share/fonts/X11/misc" do_configure() { sh ./configure --prefix=/usr --x11dir=/usr/share/fonts/X11/misc \ @@ -25,12 +28,3 @@ do_install() { vinstall OFL.TXT 644 usr/share/licenses/${pkgname} LICENSE } - -terminus-font_package() { - depends="font-util xbps-triggers>=0.58" - noarch="yes" - font_dirs="/usr/share/fonts/X11/misc" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template index 4c2681ed67..b7116149b9 100644 --- a/srcpkgs/testdisk/template +++ b/srcpkgs/testdisk/template @@ -6,16 +6,10 @@ build_style=gnu-configure configure_args="--without-ewf --enable-sudo" makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel openssl-devel ntfs-3g-devel>=2013.1.13 ncurses-devel sudo" +depends="sudo" short_desc="Powerful free data recovery software" maintainer="Juan RP " license="GPL-2" homepage="http://www.cgsecurity.org/" distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2" checksum=a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c - -testdisk_package() { - depends="sudo" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template index 46df18a358..6bfc3aeb22 100644 --- a/srcpkgs/texinfo/template +++ b/srcpkgs/texinfo/template @@ -4,6 +4,8 @@ version=4.13a revision=10 wrksrc="$pkgname-4.13" makedepends="ncurses-devel" +conflicts="chroot-texinfo>=0" +depends="gzip" short_desc="The GNU Documentation System" maintainer="Juan RP " license="GPL-3" @@ -34,11 +36,3 @@ do_install() { # Compress manually info files. gzip -9 ${DESTDIR}/usr/share/info/* } - -texinfo_package() { - conflicts="chroot-texinfo>=0" - depends="gzip" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tftp-hpa/template b/srcpkgs/tftp-hpa/template index 5b861acff2..5547226100 100644 --- a/srcpkgs/tftp-hpa/template +++ b/srcpkgs/tftp-hpa/template @@ -14,9 +14,3 @@ hostmakedepends="autoconf" do_install() { make INSTALLROOT=${DESTDIR} install } - -tftp-hpa_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template index ed7cdf1abb..1b6806da15 100644 --- a/srcpkgs/thttpd/template +++ b/srcpkgs/thttpd/template @@ -38,9 +38,3 @@ do_install() { mv ${DESTDIR}/usr/share/man/man1/htpasswd.1 \ ${DESTDIR}/usr/share/man/man1/thttpd-htpasswd.1 } - -thttpd_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template index 6e1aab5e76..af4badd734 100644 --- a/srcpkgs/thunar-volman/template +++ b/srcpkgs/thunar-volman/template @@ -6,6 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libgudev-devel libnotify-devel libxfce4util-devel libxfce4ui-devel xfconf-devel exo-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Thunar Volume Manager" maintainer="Juan RP " license="GPL-2" @@ -19,10 +20,3 @@ long_desc=" plug in your digital camera, it will automatically launch your preferred photo application and import the new pictures from the camera into your photo collection." - -thunar-volman_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/thunderbird-i18n/template b/srcpkgs/thunderbird-i18n/template index c692546e62..eda2cd91d1 100644 --- a/srcpkgs/thunderbird-i18n/template +++ b/srcpkgs/thunderbird-i18n/template @@ -7,9 +7,15 @@ short_desc="Thunderbird language packs" maintainer="Ypnose " license="MPL-2.1" +noarch=yes create_wrksrc=yes create_srcdir=yes +depends="thunderbird>=${version}" +for f in ${_LANG_PACKS}; do + depends+=" thunderbird-i18n-${f}>=${version}" +done + _LANG_PACKS="ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW" @@ -688,14 +694,3 @@ thunderbird-i18n-zh-TW_package() { usr/lib/thunderbird/extensions langpack-zh-TW@thunderbird.mozilla.org.xpi } } - -thunderbird-i18n_package() { - depends="thunderbird>=${version}" - for f in ${_LANG_PACKS}; do - depends+=" thunderbird-i18n-${f}>=${version}" - done - noarch=yes - pkg_install() { - vmkdir usr - } -} diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 10cf612367..00f2724e64 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -16,6 +16,7 @@ makedepends="python-devel libjpeg-turbo-devel hunspell-devel gtk+-devel libevent-devel libnotify-devel libvpx-devel GConf-devel startup-notification-devel dbus-glib-devel alsa-lib-devel hunspell-devel wireless_tools-devel libXScrnSaver-devel libSM-devel libXt-devel" +depends="desktop-file-utils hicolor-icon-theme" do_build() { cp -f ${FILESDIR}/mozconfig .mozconfig @@ -42,10 +43,3 @@ do_install() { # We don't want the development stuff rm -r ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl} } - -thunderbird_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tiff/template b/srcpkgs/tiff/template index bf46d922b5..933d1c7fd1 100644 --- a/srcpkgs/tiff/template +++ b/srcpkgs/tiff/template @@ -21,7 +21,7 @@ fi tiff-devel_package() { depends="zlib-devel libjpeg-turbo-devel tiff>=$version" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig @@ -30,9 +30,3 @@ tiff-devel_package() { vmove usr/share/doc } } - -tiff_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template index 0095627609..3c0e899572 100644 --- a/srcpkgs/tig/template +++ b/srcpkgs/tig/template @@ -6,6 +6,7 @@ build_style=gnu-configure make_install_args="install-doc-man" hostmakedepends="xmlto asciidoc" makedepends="ncurses-devel git" +depends="git" short_desc="Text-mode interface for Git" maintainer="Juan RP " license="GPL-2" @@ -27,10 +28,3 @@ post_install() { vinstall contrib/tig-completion.bash 644 \ usr/share/bash-completion/completions tig } - -tig_package() { - depends="git" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/time/template b/srcpkgs/time/template index f264c8c167..8f233620d7 100644 --- a/srcpkgs/time/template +++ b/srcpkgs/time/template @@ -19,9 +19,3 @@ long_desc=" do_install() { make exec_prefix="${DESTDIR}/usr" infodir="${DESTDIR}/usr/share/info" install } - -time_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template index 951e740e2a..4c10558ed4 100644 --- a/srcpkgs/tinc/template +++ b/srcpkgs/tinc/template @@ -14,9 +14,3 @@ checksum=4739dd1ec11070ea14aefa0e78e55957d343714a3c29815dd5487fc0a22c5c2c post_install() { vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system } - -tinc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tint2/template b/srcpkgs/tint2/template index e469b3c9c1..424dc3f0b8 100644 --- a/srcpkgs/tint2/template +++ b/srcpkgs/tint2/template @@ -5,16 +5,10 @@ revision=2 build_style=cmake hostmakedepends="cmake pkg-config" makedepends="libXdamage-devel libXcomposite-devel libXinerama-devel libXrandr-devel gtk+-devel imlib2-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A basic, good-looking task manager for WMs" maintainer="Juan RP " license="GPL-2" homepage="http://code.google.com/p/tint2/" distfiles="http://$pkgname.googlecode.com/files/$pkgname-${version}.tar.bz2" checksum=fe106e6a6057d2631abddde9f82d3fd4fb1985c4fb93f10d3886417a9e22471d - -tint2_package() { - depends="desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template index b1102efec6..33b8f4d4f5 100644 --- a/srcpkgs/tinyxml/template +++ b/srcpkgs/tinyxml/template @@ -35,14 +35,8 @@ do_install() { tinyxml-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include usr } } - -tinyxml_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tiv/template b/srcpkgs/tiv/template index 6bf675cfc1..51ccabd46d 100644 --- a/srcpkgs/tiv/template +++ b/srcpkgs/tiv/template @@ -14,9 +14,3 @@ checksum=4aeae8b132ff507084ed1365652dda96ee245e003a4b409d3a304ce0871802f3 pre_install() { vmkdir usr/bin } - -tiv_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tk/template b/srcpkgs/tk/template index 61e195e1cd..6d80ac74fe 100644 --- a/srcpkgs/tk/template +++ b/srcpkgs/tk/template @@ -53,9 +53,3 @@ tk-devel_package() { vmove usr/share/man/mann } } - -tk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tlp/template b/srcpkgs/tlp/template index 82b0ce8933..96e01f41c0 100644 --- a/srcpkgs/tlp/template +++ b/srcpkgs/tlp/template @@ -3,12 +3,15 @@ pkgname=tlp version=0.3.10.1 revision=1 makedepends="hdparm bash iw rfkill ethtool upower" +depends="${makedepends}" +conf_files="/etc/default/tlp" +conflicts="laptop-mode>=0" +noarch="yes" short_desc="Advanced power management tool for Linux" maintainer="Juan RP " license="GPL-2" homepage="http://linrunner.de/en/tlp/docs/tlp-linux-advanced-power-management.html" - do_fetch() { git clone -b${version} git://github.com/linrunner/TLP.git tlp-${version} } @@ -39,13 +42,3 @@ do_install() { rm -rf ${DESTDIR}/etc/init.d ${DESTDIR}/usr/lib/pm-utils } - -tlp_package() { - conf_files="/etc/default/tlp" - conflicts="laptop-mode>=0" - depends="${makedepends}" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template index 21a0c90caa..c6d1429e5b 100644 --- a/srcpkgs/tmux/template +++ b/srcpkgs/tmux/template @@ -17,9 +17,3 @@ long_desc=" created, accessed, and controlled from a single screen. tmux may be detached from a screen and continue running in the background, then later reattached." - -tmux_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template index cb62044bdd..792a8d6699 100644 --- a/srcpkgs/tor/template +++ b/srcpkgs/tor/template @@ -4,6 +4,12 @@ version=0.2.3.25 revision=1 build_style=gnu-configure makedepends="zlib-devel openssl-devel libevent-devel ca-certificates tsocks" +depends="shadow ca-certificates tsocks" +conf_files="/etc/tor/tor-tsocks.conf /etc/tor/torrc" +system_accounts="tor" +tor_homedir="/var/lib/tor" +systemd_services="tor.service on" +make_dirs="/var/lib/tor 0700 tor tor" short_desc="Anonymity Online" maintainer="Juan RP " license="BSD" @@ -25,16 +31,3 @@ post_install() { # Install systemd service. vinstall ${FILESDIR}/tor.service 644 usr/lib/systemd/system } - -tor_package() { - depends="shadow ca-certificates tsocks" - conf_files="/etc/tor/tor-tsocks.conf /etc/tor/torrc" - system_accounts="tor" - tor_homedir="/var/lib/tor" - systemd_services="tor.service on" - make_dirs="/var/lib/tor 0700 tor tor" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/torsocks/template b/srcpkgs/torsocks/template index db79399fb4..dcdb50fa20 100644 --- a/srcpkgs/torsocks/template +++ b/srcpkgs/torsocks/template @@ -5,6 +5,7 @@ revision=3 build_style=gnu-configure configure_args="--disable-static --enable-oldmethod --datarootdir=/usr/share/${pkgname}" +conf_files="/etc/torsocks.conf" short_desc="A transparent socks proxy for use with tor" maintainer="Juan RP " license="GPL-3" @@ -15,11 +16,3 @@ long_desc=" Torsocks allows you to use most socks-friendly applications in a safe way with Tor. It ensures that DNS requests are handled safely and explicitly rejects UDP traffic from the application you're using." - -torsocks_package() { - conf_files="/etc/torsocks.conf" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template index 35420903e7..40c0f74ea7 100644 --- a/srcpkgs/totem-pl-parser/template +++ b/srcpkgs/totem-pl-parser/template @@ -7,6 +7,7 @@ build_style=gnu-configure configure_args="--disable-static --enable-libarchive --enable-libgcrypt" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="libsoup-gnome-devel>=2.44 gmime-devel libarchive-devel>=3.1.2 libgcrypt-devel" +depends="libsoup-gnome>=2.44" short_desc="Totem playlist parser library" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -26,10 +27,3 @@ totem-pl-parser-devel_package() { vmove "usr/lib/*.so" } } - -totem-pl-parser_package() { - depends="libsoup-gnome>=2.44" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index c1a850cca6..e2fe3da449 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -23,6 +23,8 @@ makedepends="gnutls-devel gst-plugins-base1-devel>=1:1.2 totem-pl-parser-devel>= libpeas-devel>=1.9 libXtst-devel grilo-devel>=0.2.7 libepc-devel vala-devel>=0.22 gst-plugins-bad1-devel>=1:1.2 gsettings-desktop-schemas-devel>=3.10 nautilus-devel>=3.10 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2" +depends="grilo-plugins>=0.2.9 hicolor-icon-theme desktop-file-utils + gst-libav>=1:1.2 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2" # XXX xulrunner plugin. # XXX reenable python plugin if pylint pkg exists. @@ -55,11 +57,3 @@ totem-mozilla-plugin_package() { vmove usr/lib/mozilla } } - -totem_package() { - depends="grilo-plugins>=0.2.9 hicolor-icon-theme desktop-file-utils - gst-libav>=1:1.2 gst-plugins-ugly1>=1:1.2 gst-plugins-good1>=1:1.2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template index 5f3cd81239..4785911d5a 100644 --- a/srcpkgs/traceroute/template +++ b/srcpkgs/traceroute/template @@ -23,9 +23,3 @@ do_install() { vinstall traceroute/traceroute 755 usr/bin vinstall traceroute/traceroute.8 644 usr/share/man/man8 } - -traceroute_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template index a83046c73d..afd2bf1c28 100644 --- a/srcpkgs/tracker/template +++ b/srcpkgs/tracker/template @@ -47,9 +47,3 @@ libtracker_package() { vmove usr/lib/girepository-1.0 } } - -tracker_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template index 4e79172347..0f03cc563f 100644 --- a/srcpkgs/transmission/template +++ b/srcpkgs/transmission/template @@ -48,9 +48,3 @@ transmission-qt_package() { vinstall ${wrksrc}/qt/transmission-qt.desktop 644 usr/share/applications } } - -transmission_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template index bcc8f33858..5fa8310a60 100644 --- a/srcpkgs/tree/template +++ b/srcpkgs/tree/template @@ -21,9 +21,3 @@ do_install() { make MANDIR=${DESTDIR}/usr/share/man/man1 \ BINDIR=${DESTDIR}/usr/bin install } - -tree_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tsocks/template b/srcpkgs/tsocks/template index 3da317c290..b713b5c477 100644 --- a/srcpkgs/tsocks/template +++ b/srcpkgs/tsocks/template @@ -30,9 +30,3 @@ post_install() { vmkdir usr/share/examples/tsocks install -m644 *.example ${DESTDIR}/usr/share/examples/tsocks } - -tsocks_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tty-clock-git/template b/srcpkgs/tty-clock-git/template index 67c2bfa4cc..9c18dcd178 100644 --- a/srcpkgs/tty-clock-git/template +++ b/srcpkgs/tty-clock-git/template @@ -9,7 +9,6 @@ maintainer="Ypnose " license="GPL" homepage="https://github.com/xorg62/tty-clock" - do_fetch() { local url="git://github.com/xorg62/tty-clock" msg_normal "Fetching source from $url ...\n" @@ -23,9 +22,3 @@ do_build() { do_install() { make INSTALLPATH=/usr/bin/ DESTDIR=${DESTDIR} install } - -tty-clock-git_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template index 683c354a52..965d34d90e 100644 --- a/srcpkgs/tumbler/template +++ b/srcpkgs/tumbler/template @@ -24,9 +24,3 @@ tumbler-devel_package() { vmove usr/share/gtk-doc } } - -tumbler_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index ee3ba5a476..3e0b16ea88 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -17,9 +17,3 @@ checksum=36a8d19fcff0e54475f709bc4d83cfea5f782ee546086ee9e16d2b1aa23ca32f post_install() { mv ${DESTDIR}/usr/README.txt ${DESTDIR}/usr/share/doc/${pkgname} } - -turbovnc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template index 70c10e9598..ce0bf9e335 100644 --- a/srcpkgs/tzdata/template +++ b/srcpkgs/tzdata/template @@ -4,6 +4,7 @@ wrksrc=${pkgname} create_wrksrc=yes version=2013i revision=1 +noarch="yes" homepage="http://www.iana.org/time-zones" short_desc="Time zone and daylight-saving time data" maintainer="Juan RP " @@ -29,10 +30,3 @@ do_install() { zic -y ./yearistype -d ${DESTDIR}/usr/share/zoneinfo -p America/New_York install -m444 -t ${DESTDIR}/usr/share/zoneinfo iso3166.tab zone.tab } - -tzdata_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/uboot-mkimage/template b/srcpkgs/uboot-mkimage/template index f049f07776..20cafc5083 100644 --- a/srcpkgs/uboot-mkimage/template +++ b/srcpkgs/uboot-mkimage/template @@ -22,9 +22,3 @@ do_install() { vinstall tools/mkimage 755 usr/bin vinstall doc/mkimage.1 644 usr/share/man/man1 } - -uboot-mkimage_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/ucl/template b/srcpkgs/ucl/template index f6392a30f6..98f006fe7d 100644 --- a/srcpkgs/ucl/template +++ b/srcpkgs/ucl/template @@ -9,9 +9,3 @@ homepage="http://www.oberhumer.com/opensource/ucl/" license="GPL-2" distfiles="http://www.oberhumer.com/opensource/ucl/download/ucl-${version}.tar.gz" checksum=b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 - -ucl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/udevil/template b/srcpkgs/udevil/template index 6b810ed73f..0b7d1a29e3 100644 --- a/srcpkgs/udevil/template +++ b/srcpkgs/udevil/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="libglib-devel libudev-devel" +conf_files="/etc/udevil/udevil.conf" short_desc="CLI which mounts and unmounts removable devices without a password" maintainer="Juan RP " license="GPL-3" @@ -19,10 +20,3 @@ post_install() { # make udevil setuid. chmod 4755 ${DESTDIR}/usr/bin/udevil } - -udevil_package() { - conf_files="/etc/udevil/udevil.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/udis86/template b/srcpkgs/udis86/template index 4d5ab2ba53..62f4692d93 100644 --- a/srcpkgs/udis86/template +++ b/srcpkgs/udis86/template @@ -11,16 +11,10 @@ distfiles=${SOURCEFORGE_SITE}/udis86/${pkgname}-${version}.tar.gz checksum=6128d266abcabed6077fdeebd2fbb7fb48eb599efbdae98922de2f6acd82ce3a udis86-devel_package() { - short_desc="${short_desc} - development files" + short_desc+=" - development files" depends="${sourcepkg}>=${version}" pkg_install() { vmove usr/include vmove usr/lib } } - -udis86_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/udisks/template b/srcpkgs/udisks/template index 3fe76c4b17..0f53d02262 100644 --- a/srcpkgs/udisks/template +++ b/srcpkgs/udisks/template @@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool libxslt docbook-xsl glib-devel" makedepends="libglib-devel device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel dbus-glib-devel libgudev-devel>=183 sg3_utils-devel" +make_dirs="/var/lib/udisks 0750 root root" short_desc="Disk Management Service" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/udisks" @@ -39,10 +40,3 @@ post_install() { echo "SystemdService=udisks.service" \ >> ${DESTDIR}/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service } - -udisks_package() { - make_dirs="/var/lib/udisks 0750 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/udisks2/template b/srcpkgs/udisks2/template index e368a38fea..3912e7e103 100644 --- a/srcpkgs/udisks2/template +++ b/srcpkgs/udisks2/template @@ -9,6 +9,7 @@ configure_args="--disable-static --with-udevdir=/usr/lib/udev hostmakedepends="pkg-config intltool gobject-introspection libxslt docbook-xsl" makedepends="acl-devel device-mapper-devel liblvm2app-devel libparted-devel libatasmart-devel polkit-devel libgudev-devel sg3_utils-devel systemd-devel" +make_dirs="/var/lib/udisks2 0750 root root" short_desc="Disk Management Service, version 2" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/udisks" @@ -27,10 +28,3 @@ udisks2-devel_package() { vmove usr/share/gtk-doc } } - -udisks2_package() { - make_dirs="/var/lib/udisks2 0750 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template index 58f66f01d7..544492bc4b 100644 --- a/srcpkgs/ufw/template +++ b/srcpkgs/ufw/template @@ -4,6 +4,10 @@ version=0.33 revision=1 build_style=python-module makedepends="iptables python" +depends="${makedepends}" +conf_files="/etc/default/ufw /etc/ufw/ufw.conf" +noarch="yes" +pycompile_module="ufw" short_desc="Uncomplicated Firewall" maintainer="Juan RP " homepage="https://launchpad.net/ufw" @@ -19,14 +23,3 @@ post_install() { vinstall ${FILESDIR}/ufw.service 644 usr/lib/systemd/system vmove "lib/*" usr/lib } - -ufw_package() { - depends="${makedepends}" - conf_files="/etc/default/ufw /etc/ufw/ufw.conf" - noarch="yes" - pycompile_module="ufw" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/uml-utilities/template b/srcpkgs/uml-utilities/template index 03990b473b..244fab3fa7 100644 --- a/srcpkgs/uml-utilities/template +++ b/srcpkgs/uml-utilities/template @@ -23,9 +23,3 @@ long_desc=" pre_build() { sed -i -e "s|lib64|lib|" Makefile } - -uml-utilities_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/unicc/template b/srcpkgs/unicc/template index 94e542315c..5fdede7468 100644 --- a/srcpkgs/unicc/template +++ b/srcpkgs/unicc/template @@ -2,6 +2,7 @@ pkgname=unicc version=1.0.0 revision=1 +wrksrc="${pkgname}-${version}-source" build_style=gnu-configure configure_args="--with-trace" makedepends="phorward-devel" @@ -11,11 +12,3 @@ homepage="http://www.phorward-software.com" license="BSD" distfiles="${homepage}/products/${pkgname}/${pkgname}-${version}-source.tar.gz" checksum=1a9166e8b78b5e6ee7764fd878b2d8c8e4314683358192942149641b030b0d97 - -wrksrc="${pkgname}-${version}-source" - -unicc_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/unixodbc/template b/srcpkgs/unixodbc/template index b3cc8e26ed..858bb5290c 100644 --- a/srcpkgs/unixodbc/template +++ b/srcpkgs/unixodbc/template @@ -5,6 +5,7 @@ revision=1 wrksrc="unixODBC-${version}" build_style=gnu-configure makedepends="libltdl-devel readline-devel" +conf_files="/etc/odbcinst.ini /etc/odbc.ini" short_desc="Basic ODBC tools" maintainer="Juan RP " license="GPL-2, LGPL-2.1" @@ -27,10 +28,3 @@ unixodbc-devel_package() { vmove "usr/lib/*.so" } } - -unixodbc_package() { - conf_files="/etc/odbcinst.ini /etc/odbc.ini" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/unrar/template b/srcpkgs/unrar/template index c414a1d33f..40153d34ba 100644 --- a/srcpkgs/unrar/template +++ b/srcpkgs/unrar/template @@ -3,6 +3,7 @@ pkgname=unrar version=4.2.4 revision=1 wrksrc=unrar +nonfree="yes" homepage="http://www.rarlab.com/rar" distfiles="${homepage}/unrarsrc-${version}.tar.gz" short_desc="Unarchiver for .rar files (non-free version)" @@ -22,10 +23,3 @@ do_install() { vinstall unrar 755 usr/bin vinstall license.txt 644 usr/share/licenses/unrar } - -unrar_package() { - nonfree="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/unzip/template b/srcpkgs/unzip/template index 0f92ced5e1..64a7a6ccbf 100644 --- a/srcpkgs/unzip/template +++ b/srcpkgs/unzip/template @@ -29,9 +29,3 @@ do_install() { vmkdir usr/share mv ${DESTDIR}/usr/man ${DESTDIR}/usr/share } - -unzip_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index a586a32e64..3296704db7 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -8,6 +8,8 @@ configure_args="--disable-static --with-backend=linux --with-systemdsystemunitdir=/usr/lib/systemd/system" hostmakedepends="pkg-config intltool libxslt docbook-xsl gobject-introspection" makedepends="libusb-devel libgudev-devel dbus-glib-devel polkit-devel systemd-devel" +conf_files="/etc/UPower/UPower.conf" +make_dirs="/var/lib/upower 0755 root root" short_desc="Abstraction for enumerating power devices" maintainer="Juan RP " license="GPL-2" @@ -29,11 +31,3 @@ upower-devel_package() { vmove "usr/lib/*.so" } } - -upower_package() { - conf_files="/etc/UPower/UPower.conf" - make_dirs="/var/lib/upower 0755 root root" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/upx/template b/srcpkgs/upx/template index 951674c764..d37e0453e9 100644 --- a/srcpkgs/upx/template +++ b/srcpkgs/upx/template @@ -13,16 +13,11 @@ checksum=c6d873925ef0d5422b9320c7075ef9be5981a6f99418469ce067becd68de65eb do_build() { make ${makejobs} all - cd doc && make upx.1 + cd doc + make upx.1 } do_install() { vinstall src/upx.out 755 usr/bin upx vinstall doc/upx.1 644 usr/share/man/man1 } - -upx_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/urlgrabber/template b/srcpkgs/urlgrabber/template index 8081c36722..cfce11e12e 100644 --- a/srcpkgs/urlgrabber/template +++ b/srcpkgs/urlgrabber/template @@ -4,6 +4,9 @@ version=3.9.1 revision=2 build_style=python-module makedepends="python pycurl" +depends="${makedepends}" +noarch="yes" +pycompile_module="urlgrabber" short_desc="A high-level cross-protocol url-grabber and Python library" homepage="http://urlgrabber.baseurl.org/" license="LGPL-2.1" @@ -18,12 +21,3 @@ long_desc=" protocol-independant file-access. Best of all, urlgrabber takes care of all those pesky file-fetching details, and lets you focus on whatever it is that your program is written to do!" - -urlgrabber_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="urlgrabber" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/usbutils/template b/srcpkgs/usbutils/template index 96276479f2..91e51ab9d0 100644 --- a/srcpkgs/usbutils/template +++ b/srcpkgs/usbutils/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--datadir=/usr/share/hwdata --disable-zlib" hostmakedepends="pkg-config which hwids" makedepends="libusb-devel" +depends="hwids" homepage="http://linux-usb.sourceforge.net/" short_desc="Linux USB utilities" maintainer="Juan RP " @@ -24,10 +25,3 @@ post_install() { # Remove update-usbids.sh - handled by hwids rm -f ${DESTDIR}/usr/sbin/update-usbids.sh } - -usbutils_package() { - depends="hwids" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template index 8b519ae41d..e0e5d126b3 100644 --- a/srcpkgs/util-linux/template +++ b/srcpkgs/util-linux/template @@ -11,6 +11,20 @@ checksum=30add9a8869cef9e5a76755214f074689b6294cea63f4569711faeb099aecc06 hostmakedepends="pkg-config" makedepends="zlib-devel ncurses-devel pam-devel>=1.1.6_3 libcap-ng-devel" +depends="coreutils shadow>=4.1.5.1_3" +# Create uuidd system account for uuidd. +system_accounts="uuidd" +uuidd_homedir="/run/uuidd" +systemd_services="uuidd.socket on" +conf_files=" + /etc/pam.d/chfn + /etc/pam.d/chsh + /etc/pam.d/su + /etc/pam.d/su-l + /etc/pam.d/login" +conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14" +replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" +provides="eject-${version}" if [ "$CROSS_BUILD" ]; then hostmakedepends+=" libtool" @@ -109,23 +123,3 @@ libuuid-devel_package() { vmove usr/share/man/man3 } } - -util-linux_package() { - # Create uuidd system account for uuidd. - system_accounts="uuidd" - uuidd_homedir="/run/uuidd" - systemd_services="uuidd.socket on" - conf_files=" - /etc/pam.d/chfn - /etc/pam.d/chsh - /etc/pam.d/su - /etc/pam.d/su-l - /etc/pam.d/login" - conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14" - replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3" - provides="eject-${version}" - depends="coreutils shadow>=4.1.5.1_3" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template index 658ec1bd1c..4a6a13f4e3 100644 --- a/srcpkgs/uwsgi/template +++ b/srcpkgs/uwsgi/template @@ -4,6 +4,7 @@ version=1.2.4 revision=2 build_style=python-module makedepends="sqlite-devel python-devel python-distribute libxml2-devel" +pycompile_module="uwsgidecorators.py" short_desc="Fast, self-healing application container server" maintainer="Juan RP " license="GPL-2" @@ -21,10 +22,3 @@ long_desc=" It uses the uwsgi (all lowercase, already included by default in the Nginx and Cherokee releases) protocol for all the networking/interprocess communications, but it can speak other protocols as well (http, fastcgi, mongrel2...)" - -uwsgi_package() { - pycompile_module="uwsgidecorators.py" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/v4l-utils/template b/srcpkgs/v4l-utils/template index 27a3b277aa..f558b308cc 100644 --- a/srcpkgs/v4l-utils/template +++ b/srcpkgs/v4l-utils/template @@ -6,6 +6,8 @@ build_style=gnu-configure configure_args="--with-udevdir=/usr/lib/udev" hostmakedepends="which pkg-config" makedepends="libjpeg-turbo-devel libsysfs-devel qt-devel" +depends="sysfsutils" +conf_files="/etc/rc_maps.cfg" short_desc="Userspace tools and libraries for Video 4 Linux" maintainer="Juan RP " homepage="http://freshmeat.net/projects/libv4l" @@ -36,11 +38,3 @@ qv4l2_package() { vmove usr/share/icons } } - -v4l-utils_package() { - depends="sysfsutils" - conf_files="/etc/rc_maps.cfg" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/v8/template b/srcpkgs/v8/template index f81070bcb0..7226926307 100644 --- a/srcpkgs/v8/template +++ b/srcpkgs/v8/template @@ -88,9 +88,3 @@ libv8_package() { vmove usr/lib/libv8.so.${_sonamever} } } - -v8_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template index b89d6c3034..4ac41eb104 100644 --- a/srcpkgs/vala/template +++ b/srcpkgs/vala/template @@ -36,9 +36,3 @@ vala-devel_package() { vmove usr/share/devhelp } } - -vala_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/valabind-git/template b/srcpkgs/valabind-git/template index df6727d9af..c1aa9294a0 100644 --- a/srcpkgs/valabind-git/template +++ b/srcpkgs/valabind-git/template @@ -5,6 +5,9 @@ revision=1 build_style=gnu-makefile hostmakedepends="pkg-config vala-devel>=0.18" makedepends="vala-devel>=0.18 libglib-devel" +replaces="valabind>=0" +provides="valabind-9999" +depends="glib-devel vala-devel>=0.18" short_desc="Tool to transform vala source files to swig, GIR or GEAR (git snapshot)" maintainer="Juan RP " license="LGPL-3" @@ -20,18 +23,8 @@ long_desc=" It can also generate bindings for C++ and v8-GearBox." - do_fetch() { local url="git://github.com/radare/valabind" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } - -valabind-git_package() { - replaces="valabind>=0" - provides="valabind-9999" - depends="glib-devel vala-devel>=0.18" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/valabind/template b/srcpkgs/valabind/template index 23550fddbf..b668bd14a6 100644 --- a/srcpkgs/valabind/template +++ b/srcpkgs/valabind/template @@ -20,10 +20,3 @@ long_desc=" written in vala or C with a vapi interface. It can also generate bindings for C++ and v8-GearBox." - -valabind_package() { - depends="vala-devel>=0.20" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/valadoc-git/template b/srcpkgs/valadoc-git/template index 5c9251333f..620f377c84 100644 --- a/srcpkgs/valadoc-git/template +++ b/srcpkgs/valadoc-git/template @@ -5,12 +5,13 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config libtool automake which" makedepends="libglib-devel vala-devel>=0.20 libgee08-devel graphviz-devel" +replaces="valadoc>=0" +provides="valadoc-20130328" short_desc="Documentation tool for the vala project" maintainer="pancake " license="LGPL-3" homepage="https://live.gnome.org/Valadoc" - do_fetch() { local url="git://git.gnome.org/valadoc" msg_normal "Fetching source from $url ...\n" @@ -20,11 +21,3 @@ do_fetch() { pre_configure() { ./autogen.sh } - -valadoc-git_package() { - replaces="valadoc>=0" - provides="valadoc-20130328" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template index 8cb24c8f94..a67197af9e 100644 --- a/srcpkgs/valgrind/template +++ b/srcpkgs/valgrind/template @@ -7,6 +7,7 @@ build_style=gnu-configure configure_args="--enable-tls --with-mpicc=/dev/null" hostmakedepends="perl pkg-config" makedepends="libgomp-devel" +depends="perl glibc>=2.18<2.19 glibc-dbg>=2.18<2.19" short_desc="Tool for finding memory management bugs in programs" maintainer="Juan RP " homepage="http://valgrind.org/" @@ -24,10 +25,3 @@ valgrind-devel_package() { vmove usr/share/doc } } - -valgrind_package() { - depends="perl glibc>=2.18<2.19 glibc-dbg>=2.18<2.19" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/vamp-plugin-sdk/template b/srcpkgs/vamp-plugin-sdk/template index 7f547e8f89..246665af0f 100644 --- a/srcpkgs/vamp-plugin-sdk/template +++ b/srcpkgs/vamp-plugin-sdk/template @@ -20,7 +20,7 @@ post_install() { } libvamp-plugin-sdk_package() { - short_desc="${short_desc} - Runtime libraries" + short_desc+=" - Runtime libraries" pkg_install() { vmove "usr/lib/*.so*" } @@ -28,16 +28,10 @@ libvamp-plugin-sdk_package() { vamp-plugin-sdk-devel_package() { depends="libsndfile-devel libvamp-plugin-sdk>=${version}" - short_desc="${short_desc} - Development files" + short_desc+=" - Development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" vmove usr/lib/pkgconfig } } - -vamp-plugin-sdk_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vanitygen/template b/srcpkgs/vanitygen/template index aada56c889..29035740f9 100644 --- a/srcpkgs/vanitygen/template +++ b/srcpkgs/vanitygen/template @@ -19,9 +19,3 @@ do_install() { vinstall vanitygen 755 usr/bin vinstall keyconv 755 usr/bin } - -vanitygen_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/varnish/template b/srcpkgs/varnish/template index 82a2cec98b..b64ad75d69 100644 --- a/srcpkgs/varnish/template +++ b/srcpkgs/varnish/template @@ -5,6 +5,9 @@ revision=3 build_style=gnu-configure configure_args="--disable-static" makedepends="pkg-config pcre-devel readline-devel" +conf_files="/etc/varnish/default.vcl" +systemd_services="varnish.service on" +make_dirs="/var/varnish 750 nobody nogroup" short_desc="A fast caching HTTP reverse proxy" maintainer="Juan RP " license="Simplified BSD" @@ -27,7 +30,7 @@ post_install() { } libvarnishapi_package() { - short_desc="${short_desc} -- API runtime library" + short_desc+=" - API runtime library" pkg_install() { vmove "usr/lib/*.so*" } @@ -35,20 +38,10 @@ libvarnishapi_package() { libvarnishapi-devel_package() { depends="libvarnishapi>=${version}" - short_desc="${short_desc} -- API development files" + short_desc+=" - API development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove usr/share/man/man3 } } - -varnish_package() { - conf_files="/etc/varnish/default.vcl" - systemd_services="varnish.service on" - make_dirs="/var/varnish 750 nobody nogroup" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/vbetool/template b/srcpkgs/vbetool/template index 077336e363..224c8c1550 100644 --- a/srcpkgs/vbetool/template +++ b/srcpkgs/vbetool/template @@ -5,6 +5,7 @@ revision=3 build_style=gnu-configure make_build_args="LIBS=-lpci" makedepends="zlib-devel libx86-devel pciutils-devel" +depends="pciutils" short_desc="Run real-mode video BIOS code to alter hardware state" homepage="http://www.codon.org.uk/~mjg59/vbetool/" license="GPL-2" @@ -15,10 +16,3 @@ long_desc=" vbetool uses lrmi in order to run code from the video BIOS. Currently, it is able to alter DPMS states, save/restore video card state and attempt to initialize the video card from scratch." - -vbetool_package() { - depends="pciutils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vde2/template b/srcpkgs/vde2/template index 4d2c90b930..97c929cbb3 100644 --- a/srcpkgs/vde2/template +++ b/srcpkgs/vde2/template @@ -6,6 +6,12 @@ build_style=gnu-configure configure_args="--disable-static --enable-experimental --disable-python --enable-kernel-switch" makedepends="libpcap-devel openssl-devel" +conf_files=" + /etc/vdecmd + /etc/libvdemgmt/asyncrecv.rc + /etc/libvdemgmt/closemachine.rc + /etc/libvdemgmt/openmachine.rc + /etc/libvdemgmt/sendcmd.rc" short_desc="Virtual Distributed Ethernet" maintainer="Juan RP " license="GPL-2, LGPL-2.1, BSD" @@ -23,7 +29,7 @@ post_install() { } libvde2_package() { - short_desc="${short_desc} -- runtime libraries" + short_desc+=" - runtime libraries" pkg_install() { vmove "usr/lib/*.so*" } @@ -31,22 +37,9 @@ libvde2_package() { vde2-devel_package() { depends="libvde2-${version}_${revision}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -vde2_package() { - conf_files=" - /etc/vdecmd - /etc/libvdemgmt/asyncrecv.rc - /etc/libvdemgmt/closemachine.rc - /etc/libvdemgmt/openmachine.rc - /etc/libvdemgmt/sendcmd.rc" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/vdpau-video/template b/srcpkgs/vdpau-video/template index 4ef2995e9b..c06a8ee3d5 100644 --- a/srcpkgs/vdpau-video/template +++ b/srcpkgs/vdpau-video/template @@ -10,11 +10,3 @@ license="GPL-2" homepage="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/" distfiles="${homepage}/$pkgname-$version.tar.gz" checksum=28f66adc7d87a513a765dd79fda469e895b76692173d2aa79a26f4a618f91266 -long_desc=" - vdpau-video consists in a VDPAU-based backend for VA-API." - -vdpau-video_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vdpauinfo/template b/srcpkgs/vdpauinfo/template index 6fe7348ad9..dd56491dcb 100644 --- a/srcpkgs/vdpauinfo/template +++ b/srcpkgs/vdpauinfo/template @@ -11,9 +11,3 @@ license="MIT" homepage="http://cgit.freedesktop.org/~aplattner/vdpauinfo" distfiles="http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${version}.tar.gz" checksum=b0c856a6933e306f3f783717a29124c7d145d6027a3175e197249696f5d5019f - -vdpauinfo_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/vice/template b/srcpkgs/vice/template index 3099663143..6e00b6f99b 100644 --- a/srcpkgs/vice/template +++ b/srcpkgs/vice/template @@ -24,9 +24,3 @@ if [ "$build_option_pulseaudio" ]; then else configure_args+=" --without-pulse" fi - -vice_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/vicious/template b/srcpkgs/vicious/template index 5be89eb8a1..946d76c015 100644 --- a/srcpkgs/vicious/template +++ b/srcpkgs/vicious/template @@ -3,6 +3,8 @@ pkgname=vicious version=2.1.2 revision=1 makedepends="lua-devel>=5.2" +noarch="yes" +depends="lua>=5.2" distfiles="http://git.sysphere.org/vicious/snapshot/vicious-${version}.tar.xz" checksum="42075ba024d6912064dd4c0e5ed888006f7fbcc70448560ea2b6c5298e0e5a9d" maintainer="Steven R " @@ -21,11 +23,3 @@ do_install() { install -m644 widgets/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/widgets" install -m644 contrib/*.lua "${DESTDIR}/usr/share/lua/5.2/${pkgname}/contrib" } - -vicious_package() { - noarch="yes" - depends="lua>=5.2" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/videoproto/template b/srcpkgs/videoproto/template index 8e9d8b15b7..7fa587952c 100644 --- a/srcpkgs/videoproto/template +++ b/srcpkgs/videoproto/template @@ -2,6 +2,7 @@ pkgname=videoproto version=2.3.0 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Video extension headers from modular X.org X11" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=4f2bc94e5a1b60d6f35a9a2589ca98949e8841997f6a9acf4e85f46c1f34045f -long_desc=" - Video extension headers from modular X.org X11 project." - -videoproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/viewnior/template b/srcpkgs/viewnior/template index bf7ffc16c2..60324a848d 100644 --- a/srcpkgs/viewnior/template +++ b/srcpkgs/viewnior/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="The Elegant Image Viewer" maintainer="Juan RP " license="GPL-3" @@ -25,10 +26,3 @@ long_desc=" Configurable mouse actions" LDFLAGS="-lm" - -viewnior_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 1e7e36c5da..dd9619d064 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -5,14 +5,13 @@ _patchver=016 version=${_distver}.${_patchver} revision=1 hostmakedepends="mercurial pkg-config" -makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel - desktop-file-utils hicolor-icon-theme" +makedepends="ncurses-devel acl-devel libXt-devel gtk+-devel desktop-file-utils hicolor-icon-theme" +depends="vim-common>=$version" short_desc="Vim editor (vi clone)" maintainer="Juan RP " homepage="http://www.vim.org" license="GPL-2" - do_fetch() { local url="http://code.google.com/p/vim/" hg clone -u v${_distver/./-}-${_patchver} ${url} ${pkgname}-${version} @@ -112,10 +111,3 @@ gvim_package() { vinstall ${FILESDIR}/gvim.desktop 644 usr/share/applications } } - -vim_package() { - depends="vim-common>=$version" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vinagre/template b/srcpkgs/vinagre/template index a83f197731..3ccac001df 100644 --- a/srcpkgs/vinagre/template +++ b/srcpkgs/vinagre/template @@ -8,6 +8,7 @@ hostmakedepends="pkg-config intltool itstool gnome-doc-utils" makedepends="libxml2-devel libsecret-devel avahi-ui-libs-devel spice-devel avahi-glib-libs-devel telepathy-glib-devel vte3-devel gtk-vnc-devel openssh>=6.1p1 gnome-icon-theme" +depends="openssh>=6.1p1 gnome-icon-theme desktop-file-utils hicolor-icon-theme" short_desc="VNC client for the GNOME desktop" maintainer="Juan RP " homepage="http://projects.gnome.org/vinagre" @@ -22,10 +23,3 @@ long_desc=" You can browse your network for VNC servers, we like avahi You don't need to supply the password on every connection, we like GNOME Keyring " - -vinagre_package() { - depends="openssh>=6.1p1 gnome-icon-theme desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/vino/template b/srcpkgs/vino/template index 9aad0dfb45..835e684d3c 100644 --- a/srcpkgs/vino/template +++ b/srcpkgs/vino/template @@ -9,16 +9,10 @@ makedepends="libjpeg-turbo-devel gtk+3-devel>=3.10 libnotify-devel avahi-glib-libs-devel dbus-glib-devel telepathy-glib-devel libsoup-devel>=2.44 libXtst-devel NetworkManager-devel libsecret-devel gnutls-devel>=3.1.5 libSM-devel desktop-file-utils" +depends="libsoup>=2.44 desktop-file-utils" short_desc="VNC server for the GNOME desktop" maintainer="Juan RP " homepage="http://www.gnome.org" license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46 - -vino_package() { - depends="libsoup>=2.44 desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/virt-manager/template b/srcpkgs/virt-manager/template index f15fda246d..59a57fa5f5 100644 --- a/srcpkgs/virt-manager/template +++ b/srcpkgs/virt-manager/template @@ -12,6 +12,10 @@ distfiles="http://virt-manager.et.redhat.com/download/sources/$pkgname/$pkgname- checksum=dc8c553beeb15bb30cd5517b2105bcc47cf482b03523e522733c52b0e5df0fc0 makedepends="pkg-config intltool GConf-devel" +noarch="yes" +pycompile_dirs="/usr/share/virt-manager" +depends="dbus-python pygtk libvirt-python virtinst gtk2-vnc-python + python-gconf netcat libxml2-python" post_install() { # Set-up schema file in correct location @@ -20,13 +24,3 @@ post_install() { ${DESTDIR}/etc/gconf/schemas/*.schemas rm -rf ${DESTDIR}/etc/gconf } - -virt-manager_package() { - noarch="yes" - pycompile_dirs="/usr/share/virt-manager" - depends="dbus-python pygtk libvirt-python virtinst gtk2-vnc-python - python-gconf netcat libxml2-python" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/virtinst/template b/srcpkgs/virtinst/template index 2b0e00006e..646cde8ad3 100644 --- a/srcpkgs/virtinst/template +++ b/srcpkgs/virtinst/template @@ -5,6 +5,9 @@ revision=1 noarch=yes build_style=python-module makedepends="python libvirt-python urlgrabber" +depends="${makedepends}" +noarch="yes" +pycompile_module="virtinst virtconv" short_desc="Virtual Machine Installation module" maintainer="Juan RP " homepage="http://virt-manager.et.redhat.com" @@ -17,12 +20,3 @@ long_desc=" machines. It supports both paravirt guests (for which only FC and RHEL guests are currently supported) as well as fully virtualized guests. It uses libvirt (http://www.libvirt.org) for starting things." - -virtinst_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="virtinst virtconv" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/virtualbox-ose/template b/srcpkgs/virtualbox-ose/template index ff32c72a67..dcd7b02840 100644 --- a/srcpkgs/virtualbox-ose/template +++ b/srcpkgs/virtualbox-ose/template @@ -19,12 +19,19 @@ makedepends="openssl-devel libcurl-devel libpng-devel>=1.6 libvpx-devel alsa-lib-devel pulseaudio-devel SDL-devel qt-devel libXcursor-devel libXinerama-devel libXcomposite-devel libIDL-devel libglib-devel pam-devel python-devel libxslt-devel libcap-devel xorg-server-devel>=1.14 - device-mapper-devel docbook-xsl" + device-mapper-devel docbook-xsl shadow" if [ "$XBPS_MACHINE" = "x86_64" ]; then makedepends+=" gcc-c++-multilib" fi +depends=" + virtualbox-ose-dkms-${version}_${revision} + hicolor-icon-theme + desktop-file-utils + shadow" +system_groups="vboxusers" + do_configure() { # Use our path for dri drivers. sed -e 's,/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri,/usr/lib/xorg/modules/drivers,g' \ @@ -181,15 +188,3 @@ virtualbox-ose-guest-dkms_package() { usr/lib/udev/rules.d 60-virtualbox-ose-guest-dkms.rules } } - -virtualbox-ose_package() { - depends=" - virtualbox-ose-dkms-${version}_${revision} - hicolor-icon-theme - desktop-file-utils - shadow" - system_groups="vboxusers" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 8b1d4a766a..2268f0f2c7 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -26,6 +26,7 @@ makedepends="videoproto libudev-devel>=183 libpng-devel>=1.6 libupnp-devel libcdio-devel libdvdnav-devel libsysfs-devel libmtp-devel>=1.1.4 sqlite-devel libtheora-devel speex-devel pulseaudio-devel libxml2-devel opus-devel libbluray-devel faad2-devel jack-devel libSM-devel freefont-ttf" +depends="freefont-ttf hicolor-icon-theme desktop-file-utils" if [ "$XBPS_TARGET_MACHINE" = "i686" ] || [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then configure_args+=" --enable-vdpau --enable-libva" @@ -137,10 +138,3 @@ vlc-devel_package() { vmove "usr/lib/*.so" } } - -vlc_package() { - depends="freefont-ttf hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template index 210da0d792..3cf6f68bac 100644 --- a/srcpkgs/void-artwork/template +++ b/srcpkgs/void-artwork/template @@ -2,25 +2,16 @@ pkgname=void-artwork version=20130603 revision=1 -short_desc="Void GNU/Linux artwork" +noarch=yes +short_desc="Void Linux artwork" maintainer="xtraeme and davehome" license="Public domain" homepage="http://code.google.com/p/xbps" long_desc=" - $pkgname contains artwork images for Void GNU/Linux: splash images, - logos, etc." - -noarch=yes + $pkgname contains artwork images for Void GNU/Linux: splash images, logos, etc" do_install() { vinstall ${FILESDIR}/splash.png 644 usr/share/void-artwork vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork } - -void-artwork_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/void-mklive/template b/srcpkgs/void-mklive/template index 9f723024c1..90ae280794 100644 --- a/srcpkgs/void-mklive/template +++ b/srcpkgs/void-mklive/template @@ -8,20 +8,14 @@ license="Simplified BSD" homepage="https://www.voidlinux.eu" only_for_archs="i686 x86_64" +noarch="yes" build_style=gnu-makefile make_install_args="PREFIX=/usr" makedepends="dracut>=027 grub-x86_64-efi squashfs-tools syslinux>=5 dosfstools xorriso xbps>=0.25 parted" +depends="${makedepends}" do_fetch() { local url="git://github.com/voidlinux/void-mklive" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } - -void-mklive_package() { - noarch="yes" - depends="${makedepends}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/volumeicon/template b/srcpkgs/volumeicon/template index b4009c688b..075bab841d 100644 --- a/srcpkgs/volumeicon/template +++ b/srcpkgs/volumeicon/template @@ -20,9 +20,3 @@ long_desc=" Configurable external mixer Volume Slider Hotkey support" - -volumeicon_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vorbis-tools/template b/srcpkgs/vorbis-tools/template index cbb4fa7147..b978f0e2a5 100644 --- a/srcpkgs/vorbis-tools/template +++ b/srcpkgs/vorbis-tools/template @@ -11,9 +11,3 @@ homepage="http://www.vorbis.com/" distfiles="http://downloads.xiph.org/releases/vorbis/${pkgname}-${version}.tar.gz" checksum=a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc short_desc="Tools for Vorbis-Codecs e.g. oggenc and oggdec" - -vorbis-tools_package() { - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/vte/template b/srcpkgs/vte/template index f35be6ea77..54161b32b0 100644 --- a/srcpkgs/vte/template +++ b/srcpkgs/vte/template @@ -33,9 +33,3 @@ vte-devel_package() { vmove usr/share/gtk-doc } } - -vte_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 1ff16b56b2..6c4bb6b39b 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -8,6 +8,7 @@ configure_args="--with-gtk=3.0 --enable-introspection --disable-gnome-pty-helper --disable-static" hostmakedepends="pkg-config intltool gobject-introspection" makedepends="gtk+3-devel ncurses-devel vte" +depends="vte" short_desc="Terminal widget with improved accessibility and I18N support" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -29,10 +30,3 @@ vte3-devel_package() { vmove usr/share/gtk-doc } } - -vte3_package() { - depends="vte" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/w3m/template b/srcpkgs/w3m/template index b35ee535aa..72a63dbb24 100644 --- a/srcpkgs/w3m/template +++ b/srcpkgs/w3m/template @@ -25,9 +25,3 @@ pre_build() { sed -e 's,./mktable$(EXT),./host-mktable$(EXT),g' -i Makefile fi } - -w3m_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/warsow-data/template b/srcpkgs/warsow-data/template index 3c1621d062..c25eda2dfb 100644 --- a/srcpkgs/warsow-data/template +++ b/srcpkgs/warsow-data/template @@ -2,6 +2,7 @@ pkgname=warsow-data version=1.02 revision=1 +noarch="yes" wrksrc="warsow_${version}" short_desc="Warsow FPS data files" maintainer="Juan RP " @@ -19,10 +20,3 @@ do_install() { vcopy "basewsw/*" usr/share/warsow/basewsw vinstall docs/license.txt 644 usr/share/licenses/warsow } - -warsow-data_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/warsow/template b/srcpkgs/warsow/template index 9dfb189142..8288ec3f73 100644 --- a/srcpkgs/warsow/template +++ b/srcpkgs/warsow/template @@ -7,6 +7,8 @@ makedepends="pkg-config libcurl-devel libvorbis-devel libtheora-devel libjpeg-turbo-devel libpng-devel>=1.6 SDL-devel libopenal-devel MesaLib-devel libXext-devel libXinerama-devel libXrandr-devel libXxf86vm-devel libXxf86dga-devel>=1.1.3 fontconfig-devel" +# libopenal is dlopen(3)ed at runtime. +depends="desktop-file-utils warsow-data>=1.0 libopenal" short_desc="Free online multiplayer competitive FPS based on the Qfusion engine" maintainer="Juan RP " license="GPL-2" @@ -30,11 +32,3 @@ do_install() { vinstall ${FILESDIR}/warsow.desktop 644 usr/share/applications vinstall ${FILESDIR}/warsow.png 644 usr/share/pixmaps } - -warsow_package() { - # libopenal is dlopen(3)ed at runtime. - depends="desktop-file-utils warsow-data>=1.0 libopenal" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index 472819bd9e..5b90fbd5c8 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -16,16 +16,10 @@ makedepends=" physfs-devel qt-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="3D realtime strategy game on a future Earth" maintainer="Juan RP " license="GPL-2" homepage="http://wz2100.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" checksum=c937a2e2c7afdad00b00767636234bbec4d8b18efb008073445439d32edb76cf - -warzone2100_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wavpack/template b/srcpkgs/wavpack/template index 5c71cb5218..b87a0081de 100644 --- a/srcpkgs/wavpack/template +++ b/srcpkgs/wavpack/template @@ -37,9 +37,3 @@ wavpack-devel_package() { vmove "usr/lib/*.so" } } - -wavpack_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template index b34ba2b442..551b2b5d81 100644 --- a/srcpkgs/wayland/template +++ b/srcpkgs/wayland/template @@ -35,9 +35,3 @@ wayland-devel_package() { vmove "usr/lib/*.so" } } - -wayland_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/webkit-gtk/template b/srcpkgs/webkit-gtk/template index bdcfc186d6..0b573300fd 100644 --- a/srcpkgs/webkit-gtk/template +++ b/srcpkgs/webkit-gtk/template @@ -28,9 +28,3 @@ webkit-gtk-devel_package() { vmove usr/share/gir-1.0 } } - -webkit-gtk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index 4694002d01..b22e2df86f 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -31,9 +31,3 @@ webkitgtk-devel_package() { vmove "usr/lib/*.so" } } - -webkitgtk_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/webrtc-audio-processing/template b/srcpkgs/webrtc-audio-processing/template index fd05169b6f..cc31aeb67d 100644 --- a/srcpkgs/webrtc-audio-processing/template +++ b/srcpkgs/webrtc-audio-processing/template @@ -23,16 +23,10 @@ post_install() { webrtc-audio-processing-devel_package() { depends="${sourcepkg}>=${version}" - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.a" } } - -webrtc-audio-processing_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index f09fe82306..f2408592de 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -74,9 +74,3 @@ weechat-lua_package() { vmove usr/lib/weechat/plugins/lua.so } } - -weechat_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/weston/template b/srcpkgs/weston/template index 4cf2bcb4d0..f7b98656aa 100644 --- a/srcpkgs/weston/template +++ b/srcpkgs/weston/template @@ -15,6 +15,8 @@ makedepends="libpng-devel>=1.6 wayland-devel libxkbcommon-devel libxcb-devel>=1.10 xcb-util-keysyms-devel pixman-devel pango-devel cairo-devel>=1.12.14_5 mtdev-devel libwebp-devel poppler-glib-devel pam-devel systemd-devel libunwind-devel lcms2-devel libudev-devel libdrm-devel" +# cairo built with gles2 option. +depends="cairo>=1.12.14_5" case "$XBPS_TARGET_MACHINE" in armv6l) # Assume RPi for now. @@ -40,11 +42,3 @@ post_install() { rm -rf ${DESTDIR}/usr/include rm -rf ${DESTDIR}/usr/lib/pkgconfig } - -weston_package() { - # cairo built with gles2 option. - depends="cairo>=1.12.14_5" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wget/template b/srcpkgs/wget/template index 3461631b44..839a579361 100644 --- a/srcpkgs/wget/template +++ b/srcpkgs/wget/template @@ -13,6 +13,8 @@ checksum=f3a6898e3a765bb94435b04a6668db9e5d19b3e90e0c69a503a2773ae936c269 hostmakedepends="perl" makedepends="openssl-devel libidn-devel ca-certificates" +depends="ca-certificates" +conf_files="/etc/wgetrc" if [ "$CROSS_BUILD" ]; then configure_args+=" --with-libssl-prefix=$XBPS_CROSS_BASE" @@ -22,11 +24,3 @@ post_install() { echo "ca_certificate=/etc/ssl/certs/ca-certificates.crt" \ >> ${DESTDIR}/etc/wgetrc } - -wget_package() { - conf_files="/etc/wgetrc" - depends="ca-certificates" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wgetpaste/template b/srcpkgs/wgetpaste/template index 782e2fef18..233eea1158 100644 --- a/srcpkgs/wgetpaste/template +++ b/srcpkgs/wgetpaste/template @@ -3,6 +3,8 @@ pkgname=wgetpaste version=2.22 revision=1 makedepends="bash wget" +depends="${makedepends}" +noarch="yes" short_desc="A script that automates pasting to a number of pastebin services" maintainer="Juan RP " homepage="http://wgetpaste.zlin.dk/" @@ -16,11 +18,3 @@ do_install() { vinstall ${FILESDIR}/${pkgname}.example 644 \ usr/share/examples/${pkgname} ${pkgname}.conf.example } - -wgetpaste_package() { - depends="${makedepends}" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/which/template b/srcpkgs/which/template index 12ec03bff8..6d7df0b0cc 100644 --- a/srcpkgs/which/template +++ b/srcpkgs/which/template @@ -9,9 +9,3 @@ homepage="http://www.xs4all.nl/~carlo17/which/" license="GPL-3" distfiles="http://www.xs4all.nl/~carlo17/which/which-$version.tar.gz" checksum=d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8 - -which_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template index 28841ead7c..0851c30cce 100644 --- a/srcpkgs/whois/template +++ b/srcpkgs/whois/template @@ -21,9 +21,3 @@ do_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -whois_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wicd/template b/srcpkgs/wicd/template index 036422a53c..c20f988fd4 100644 --- a/srcpkgs/wicd/template +++ b/srcpkgs/wicd/template @@ -2,8 +2,17 @@ pkgname=wicd version=1.7.2.4 revision=3 +noarch=yes makedepends="dhcpcd wpa_supplicant wireless_tools ethtool dbus-glib dbus-python rfkill pygobject2 python-urwid>=0.9.9 python-distribute python-babel" +depends="dbus-glib dhcpcd ethtool net-tools dbus-python pygobject2 python-urwid + rfkill wireless_tools wpa_supplicant" +pycompile_module="wicd" +pycompile_dirs="usr/lib/wicd usr/share/wicd" +conf_files=" + /etc/dbus-1/system.d/wicd.conf + /etc/wicd/encryption/templates/active" +systemd_services="wicd.service on" short_desc="Open source wired and wireless network manager" maintainer="Juan RP " homepage="http://wicd.sourceforge.net" @@ -68,18 +77,3 @@ wicd-gtk_package() { vmove usr/share/man/nl/man1/wicd-client.1 } } - -wicd_package() { - noarch=yes - depends="dbus-glib dhcpcd ethtool net-tools dbus-python pygobject2 python-urwid - rfkill wireless_tools wpa_supplicant" - pycompile_module="wicd" - pycompile_dirs="usr/lib/wicd usr/share/wicd" - conf_files=" - /etc/dbus-1/system.d/wicd.conf - /etc/wicd/encryption/templates/active" - systemd_services="wicd.service on" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wifi-firmware/template b/srcpkgs/wifi-firmware/template index 36747b8a47..334ec38cb3 100644 --- a/srcpkgs/wifi-firmware/template +++ b/srcpkgs/wifi-firmware/template @@ -4,6 +4,8 @@ version=1.2 revision=2 build_style=meta makedepends="ipw2100-firmware ipw2200-firmware zd1211-firmware" +depends="${makedepends}" +noarch="yes" short_desc="WiFi firmware meta-package" homepage="http://kernel.org/" license="Custom" @@ -11,8 +13,3 @@ maintainer="Juan RP " long_desc=" This is the wifi-firmware meta-package for installing the required firmware files for some WiFi drivers in the Linux kernel." - -wifi-firmware_package() { - depends="${makedepends}" - noarch="yes" -} diff --git a/srcpkgs/wine-gecko/template b/srcpkgs/wine-gecko/template index 6ff1e8f8fe..760dff779e 100644 --- a/srcpkgs/wine-gecko/template +++ b/srcpkgs/wine-gecko/template @@ -22,6 +22,7 @@ long_desc=" # XXX there's no support for multilib pkgs yet, so restrict it to x86 for now. only_for_archs="i686" create_wrksrc=yes +depends="wine" do_extract() { # This is to avoid re-downloading it everytime this template is @@ -37,10 +38,3 @@ do_install() { mv -v "wine_gecko-${version}-${gecko_arch}.msi" \ "${DESTDIR}/usr/share/wine/gecko" } - -wine-gecko_package() { - depends="wine" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/wine-mono/template b/srcpkgs/wine-mono/template index 14a18059af..fc0630ac99 100644 --- a/srcpkgs/wine-mono/template +++ b/srcpkgs/wine-mono/template @@ -14,6 +14,7 @@ long_desc=" noarch=yes create_wrksrc=yes +depends="wine" do_extract() { # This is to avoid re-downloading it everytime this template is @@ -27,11 +28,3 @@ do_install() { mkdir -pv "${DESTDIR}/usr/share/wine/mono" mv -v "${pkgname}-${version}.msi" "${DESTDIR}/usr/share/wine/mono" } - -wine-mono_package() { - noarch="yes" - depends="wine" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index 6d59434be1..e33e312086 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -28,6 +28,8 @@ makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel cups-devel dbus-devel" makedepends+=" desktop-file-utils hicolor-icon-theme liberation-fonts-ttf fontconfig" +depends="libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf" +replaces="wine-unstable>=0" # Otherwise, throws a nasty warning. pre_configure() { @@ -52,11 +54,3 @@ wine-devel_package() { vmove "usr/lib/*.so" } } - -wine_package() { - depends="libOSMesa desktop-file-utils hicolor-icon-theme liberation-fonts-ttf" - replaces="wine-unstable>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wineasio/template b/srcpkgs/wineasio/template index 39838e56b7..b6ac1196f6 100644 --- a/srcpkgs/wineasio/template +++ b/srcpkgs/wineasio/template @@ -1,4 +1,8 @@ # Template file for 'wineasio' +nonfree="yes" +only_for_archs=i686 +wrksrc=${pkgname} + pkgname=wineasio version="0.9.2" revision=1 @@ -6,6 +10,7 @@ homepage="http://sourceforge.net/projects/wineasio" distfiles="${SOURCEFORGE_SITE}/wineasio/${pkgname}-${version}.tar.gz" checksum=9fbc2d10a4cec307dc0558bed82b887c864424d16da40a80f1d80f907d92af0b makedepends="wine>=1.6 wine-devel>=1.6 jack-devel" +depends="jack" short_desc="JACK driver for WINE to provide Windows Apps with ASIO support" maintainer="davehome " license="LGPL" @@ -13,10 +18,6 @@ long_desc=" WineASIO provides an ASIO to JACK driver for WINE. ASIO is the most common Windows low-latency driver, so is commonly used in audio workstation programs." -only_for_archs=i686 - -wrksrc=${pkgname} - do_build() { local url="http://redthumb.info.tm/asio.h" msg_normal " Fetching ${url} ...\n" @@ -28,11 +29,3 @@ do_build() { do_install() { vinstall wineasio.dll.so 755 usr/lib/wine } - -wineasio_package() { - nonfree="yes" - depends="jack" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/winusb/template b/srcpkgs/winusb/template index 03cbec1b45..5359f0fec2 100644 --- a/srcpkgs/winusb/template +++ b/srcpkgs/winusb/template @@ -6,15 +6,9 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="wxGTK-devel ntfs-3g parted grub-x86_64-efi desktop-file-utils hicolor-icon-theme" short_desc="Simple tool that enable you to create your own usb stick windows installer" +depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi" maintainer="Juan RP " license="GPL-3" homepage="http://en.congelli.eu/prog_info_winusb.html" distfiles="http://en.congelli.eu/directdl/winusb/winusb-${version}.tar.gz" checksum=7bd8d2e63651134bd4173dcf358708fb9e6de1677c088e67d45995a1d5066bc9 - -winusb_package() { - depends="desktop-file-utils hicolor-icon-theme parted ntfs-3g grub-x86_64-efi" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/wireless_tools/template b/srcpkgs/wireless_tools/template index 0671205771..ae5a8427a5 100644 --- a/srcpkgs/wireless_tools/template +++ b/srcpkgs/wireless_tools/template @@ -28,9 +28,3 @@ wireless_tools-devel_package() { vmove usr/include } } - -wireless_tools_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/wmfs/template b/srcpkgs/wmfs/template index 5f38dcd3ad..407b180e4e 100644 --- a/srcpkgs/wmfs/template +++ b/srcpkgs/wmfs/template @@ -4,7 +4,9 @@ version=201104 revision=3 build_style=configure configure_args="--prefix /usr --man-prefix /usr/share/man --xdg-config-dir /etc/xdg" -makedepends="pkg-config libXft-devel libXrender-devel fontconfig-devel libXinerama-devel libXrandr-devel imlib2-devel" +hostmakedepends="pkg-config" +makedepends="libXft-devel libXrender-devel fontconfig-devel libXinerama-devel libXrandr-devel imlib2-devel" +conf_files="/etc/xdg/wmfs/wmfsrc" short_desc="Window Manager From Scratch" maintainer="Juan RP " license="BSD" @@ -22,11 +24,3 @@ long_desc=" post_install() { vinstall COPYING 644 usr/share/licenses/wmfs } - -wmfs_package() { - conf_files="/etc/xdg/wmfs/wmfsrc" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/wmname/template b/srcpkgs/wmname/template index 02b3146690..2824b14ad0 100644 --- a/srcpkgs/wmname/template +++ b/srcpkgs/wmname/template @@ -13,9 +13,3 @@ checksum=559ad188b2913167dcbb37ecfbb7ed474a7ec4bbcb0129d8d5d08cb9208d02c5 do_install() { make install DESTDIR=${DESTDIR} PREFIX=/usr } - -wmname_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/wok/template b/srcpkgs/wok/template index 6d5e522041..d6e5b9dfe9 100644 --- a/srcpkgs/wok/template +++ b/srcpkgs/wok/template @@ -6,18 +6,12 @@ create_srcdir=yes build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel python-jinja pyyaml python-docutils python-Markdown python-Pygments" +noarch="yes" +pycompile_module="wok" +depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments" short_desc="A simple static site generator in python" maintainer="Juan RP " homepage="https://github.com/mythmon/wok" license="MIT" distfiles="https://github.com/mythmon/wok/archive/v${version}.tar.gz" checksum=e5c5d24dbda05d396e5d22aeac05ce40bf4f362da9ca04a82c04c80ebade12b8 - -wok_package() { - noarch="yes" - pycompile_module="wok" - depends="python>=2.7 python-jinja pyyaml python-docutils python-Markdown python-Pygments" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index d0ac6532d7..db25c4123a 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -12,6 +12,7 @@ checksum=2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 hostmakedepends="pkg-config" makedepends="libnl3-devel openssl-devel dbus-devel readline-devel" +conf_files="/etc/wpa_supplicant.conf" do_build() { sed -i 's|/usr/local|$(PREFIX)|g' Makefile @@ -50,10 +51,3 @@ do_install() { sed -e 's,wpa_supplicant@wlan0.service,wpa_supplicant@%i.service,' -i \ ${DESTDIR}/usr/lib/systemd/system/wpa_supplicant@.service } - -wpa_supplicant_package() { - conf_files="/etc/wpa_supplicant.conf" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wv/template b/srcpkgs/wv/template index f755ccb403..720b056cd6 100644 --- a/srcpkgs/wv/template +++ b/srcpkgs/wv/template @@ -34,9 +34,3 @@ wv-devel_package() { vmove usr/lib/pkgconfig } } - -wv_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wxGTK/template b/srcpkgs/wxGTK/template index aef102aa15..cb093e540c 100644 --- a/srcpkgs/wxGTK/template +++ b/srcpkgs/wxGTK/template @@ -45,9 +45,3 @@ wxGTK-devel_package() { vmove usr/bin } } - -wxGTK_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/wxPython/template b/srcpkgs/wxPython/template index f49a51c320..5939af83b7 100644 --- a/srcpkgs/wxPython/template +++ b/srcpkgs/wxPython/template @@ -7,6 +7,8 @@ hostmakedepends="pkg-config" makedepends="zlib-devel libpng-devel libjpeg-turbo-devel libXpm-devel tiff-devel expat-devel libX11-devel libXinerama-devel GConf-devel cairo-devel gtk+-devel MesaLib-devel glu-devel wxGTK-devel python-devel" +depends="python" +pycompile_module="wx-2.8-gtk2-unicode" short_desc="The wxWidgets GUI toolkit library (Python Bindings)" maintainer="davehome " homepage="http://www.wxwidgets.org/" @@ -45,11 +47,3 @@ wxPython-devel_package() { vmove usr/include } } - -wxPython_package() { - depends="python" - pycompile_module="wx-2.8-gtk2-unicode" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/x11perf/template b/srcpkgs/x11perf/template index 6f1148f05f..e51e4808dd 100644 --- a/srcpkgs/x11perf/template +++ b/srcpkgs/x11perf/template @@ -14,9 +14,3 @@ checksum=a1fd752abd3496568614c2f2209d21452bdd5b8c9a5c14a5705725bd8c298e12 long_desc=" The x11perf program runs one or more performance tests and reports how fast an X server can execute the tests." - -x11perf_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template index 47d94b63b2..ce5ac9def6 100644 --- a/srcpkgs/x264/template +++ b/srcpkgs/x264/template @@ -45,9 +45,3 @@ x264-devel_package() { vmove "usr/lib/*.so" } } - -x264_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template index 680786b776..c12e4be731 100644 --- a/srcpkgs/xapian-core/template +++ b/srcpkgs/xapian-core/template @@ -39,9 +39,3 @@ libxapian_package() { vmove "usr/lib/*.so*" } } - -xapian-core_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index d89a71c1ca..e87b2ab20e 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -27,14 +27,8 @@ post_install() { xar-devel_package() { depends="xar>=$version" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include } } - -xar_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xarchiver/template b/srcpkgs/xarchiver/template index be08cde30a..f409060b6b 100644 --- a/srcpkgs/xarchiver/template +++ b/srcpkgs/xarchiver/template @@ -5,6 +5,7 @@ revision=3 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel xdg-utils desktop-file-utils hicolor-icon-theme" +depends="xdg-utils desktop-file-utils hicolor-icon-theme" short_desc="GTK+2 lightweight desktop independent archive manager" homepage="http://xarchiver.sourceforge.net/" license="GPL-2" @@ -18,10 +19,3 @@ long_desc=" line rather than API calls. Xarchiver has been designed from the ground up to be fast and easy-to-use. Its user interface is clean and intuitive, and does not include any confusing or useless options." - -xarchiver_package() { - depends="xdg-utils desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xauth/template b/srcpkgs/xauth/template index c54a685a77..119c275eec 100644 --- a/srcpkgs/xauth/template +++ b/srcpkgs/xauth/template @@ -14,9 +14,3 @@ checksum=a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7 long_desc=" This package provides xauth, a program to display and manipulate the authentication data used by the X11 clients." - -xauth_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xbacklight/template b/srcpkgs/xbacklight/template index c0dffec439..e71de6ed84 100644 --- a/srcpkgs/xbacklight/template +++ b/srcpkgs/xbacklight/template @@ -15,9 +15,3 @@ long_desc=" Xbacklight is used to adjust the backlight brightness where supported. It finds all outputs on the X server supporting backlight brightness control and changes them all in the same way." - -xbacklight_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xbitmaps/template b/srcpkgs/xbitmaps/template index 2a57af5d00..892d9d27aa 100644 --- a/srcpkgs/xbitmaps/template +++ b/srcpkgs/xbitmaps/template @@ -2,6 +2,7 @@ pkgname=xbitmaps version=1.0.1 revision=3 +noarch="yes" build_style=gnu-configure short_desc="Common X11 bitmaps" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/data/$pkgname-$version.tar.bz2" checksum=5aa5be594e77f772b85d39f0c25f61a61c7f6fa02ba940e614c5ee386deeb867 -long_desc=" - This package contains the common X11 bitmaps for direct inclusion in C." - -xbitmaps_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template index cecfe43855..2ae74f2854 100644 --- a/srcpkgs/xbmc/template +++ b/srcpkgs/xbmc/template @@ -27,8 +27,10 @@ makedepends=" libbluetooth-devel yajl-devel libplist-devel librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel systemd-devel libcec-devel" - makedepends+=" udisks2 upower hicolor-icon-theme desktop-file-utils glxinfo" +# The following dependencies are dlopen(3)ed. +depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist" +depends+=" glxinfo udisks2 upower hicolor-icon-theme desktop-file-utils" pre_configure() { . /etc/profile.d/jre.sh @@ -68,12 +70,3 @@ do_install() { rm -f ${DESTDIR}/usr/share/icons/hicolor/icon-theme.cache } - -xbmc_package() { - # The following dependencies are dlopen(3)ed. - depends="libbluray libmad libogg libcurl libflac libmodplug libass libmpeg2 lame librtmp libnfs libplist" - depends+=" glxinfo udisks2 upower hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template index bff365d3b1..292da5f145 100644 --- a/srcpkgs/xbps-git/template +++ b/srcpkgs/xbps-git/template @@ -6,6 +6,10 @@ build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-debug --enable-static --enable-tests" hostmakedepends="which pkg-config" makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel atf-devel" +depends="xbps-triggers libxbps-git-${version}_${revision}" +provides="xbps-${version}" +replaces="xbps>=0 xbps-devel>=0" +conf_files="/etc/xbps/xbps.conf" short_desc="The XBPS package system (development branch)" maintainer="Juan RP " homepage="http://www.voidlinux.eu/xbps" @@ -58,13 +62,3 @@ xbps-tests-git_package() { vmove usr/tests } } - -xbps-git_package() { - provides="xbps-${version}" - replaces="xbps>=0 xbps-devel>=0" - conf_files="/etc/xbps/xbps.conf" - depends="xbps-triggers libxbps-git-${version}_${revision}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xbps-src-utils/template b/srcpkgs/xbps-src-utils/template index 9b5111f98c..60beb819a6 100644 --- a/srcpkgs/xbps-src-utils/template +++ b/srcpkgs/xbps-src-utils/template @@ -33,9 +33,3 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } - -xbps-src-utils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index 859a1f7281..4d9389cd9f 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -2,6 +2,7 @@ pkgname=xbps-triggers version=0.73 revision=1 +noarch=yes bootstrap=yes short_desc="The XBPS triggers for Void Linux" maintainer="Juan RP " @@ -21,10 +22,3 @@ do_install() { cd ${DESTDIR}/var/db/xbps ln -sf ../../../${_triggersdir} triggers } - -xbps-triggers_package() { - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index adf4298abe..87c6c5dfcc 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -3,6 +3,9 @@ pkgname=xbps version=0.27 revision=4 bootstrap=yes +depends="xbps-triggers" +conf_files="/etc/xbps/xbps.conf" +replaces="xbps>=0" build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-static --enable-debug" makedepends="zlib-devel openssl-devel libarchive-devel>=3.1.2 confuse-devel" @@ -19,13 +22,13 @@ else makedepends+=" atf-devel" configure_args+=" --enable-tests" -xbps-tests_package() { - short_desc+=" - Kyua testsuite" - replaces="xbps<0.16.3_2 xbps-tests>=0" - pkg_install() { - vmove usr/tests + xbps-tests_package() { + short_desc+=" - Kyua testsuite" + replaces="xbps<0.16.3_2 xbps-tests>=0" + pkg_install() { + vmove usr/tests + } } -} fi @@ -61,12 +64,3 @@ xbps-static_package() { vmove "usr/sbin/*.static" } } - -xbps_package() { - depends="xbps-triggers" - conf_files="/etc/xbps/xbps.conf" - replaces="xbps>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xcalib/template b/srcpkgs/xcalib/template index 8790bdd38d..994f04d6ad 100644 --- a/srcpkgs/xcalib/template +++ b/srcpkgs/xcalib/template @@ -17,9 +17,3 @@ do_install() { vinstall "$file" 644 usr/share/xcalib done } - -xcalib_package() { - pkg_install() { - vmove all - } -} \ No newline at end of file diff --git a/srcpkgs/xcb-proto/template b/srcpkgs/xcb-proto/template index 2fc81660b6..1cc003c647 100644 --- a/srcpkgs/xcb-proto/template +++ b/srcpkgs/xcb-proto/template @@ -5,18 +5,12 @@ revision=1 build_style=gnu-configure hostmakedepends="python" makedepends="libxml2" +depends="python" +noarch="yes" +pycompile_module="xcbgen" short_desc="XML-XCB (X C Bindings) protocol descriptions" maintainer="Juan RP " homepage="http://xcb.freedesktop.org" license="MIT" distfiles="http://xcb.freedesktop.org/dist/$pkgname-$version.tar.bz2" checksum=7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05 - -xcb-proto_package() { - depends="python" - noarch="yes" - pycompile_module="xcbgen" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xcb-util-cursor/template b/srcpkgs/xcb-util-cursor/template index 0ad73ee571..ad5068c04f 100644 --- a/srcpkgs/xcb-util-cursor/template +++ b/srcpkgs/xcb-util-cursor/template @@ -22,9 +22,3 @@ xcb-util-cursor-devel_package() { vmove "usr/lib/*.so" } } - -xcb-util-cursor_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xcb-util-image/template b/srcpkgs/xcb-util-image/template index 3158c41fae..634bddb4c2 100644 --- a/srcpkgs/xcb-util-image/template +++ b/srcpkgs/xcb-util-image/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9" +replaces="xcb-util<0.3.9" short_desc="Utility libraries for XC Binding - Port of Xlib's XImage and XShmImage functions" maintainer="Juan RP " homepage="http://xcb.freedesktop.org" @@ -17,16 +18,9 @@ long_desc=" xcb-util-image-devel_package() { depends="libxcb-devel xcb-util-image>=${version}" - short_desc="${sourcepkg} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -xcb-util-image_package() { - replaces="xcb-util<0.3.9" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xcb-util-keysyms/template b/srcpkgs/xcb-util-keysyms/template index c57046c53d..306cc9ac4e 100644 --- a/srcpkgs/xcb-util-keysyms/template +++ b/srcpkgs/xcb-util-keysyms/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9" +replaces="xcb-util<0.3.9" short_desc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes" maintainer="Juan RP " homepage="http://xcb.freedesktop.org" @@ -18,16 +19,9 @@ long_desc=" xcb-util-keysyms-devel_package() { depends="libxcb-devel xcb-util-keysyms>=${version}" - short_desc="${sourcepkg} -- development files" + short_desco+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -xcb-util-keysyms_package() { - replaces="xcb-util<0.3.9" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xcb-util-renderutil/template b/srcpkgs/xcb-util-renderutil/template index c71eaa1977..438eb1e66a 100644 --- a/srcpkgs/xcb-util-renderutil/template +++ b/srcpkgs/xcb-util-renderutil/template @@ -22,9 +22,3 @@ xcb-util-renderutil-devel_package() { vmove "usr/lib/*.so" } } - -xcb-util-renderutil_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template index dd0218f830..dc69496196 100644 --- a/srcpkgs/xcb-util-wm/template +++ b/srcpkgs/xcb-util-wm/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config" makedepends="libxcb-devel>=1.8 xcb-util-devel>=0.3.9" +replaces="xcb-util<0.3.9" short_desc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM" maintainer="Juan RP " homepage="http://xcb.freedesktop.org" @@ -17,16 +18,9 @@ long_desc=" xcb-util-wm-devel_package() { depends="libxcb-devel xcb-util-wm>=${version}" - short_desc="${sourcepkg} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig } } - -xcb-util-wm_package() { - replaces="xcb-util<0.3.9" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xcb-util/template b/srcpkgs/xcb-util/template index 9ff00b71b4..8ffa6b8f51 100644 --- a/srcpkgs/xcb-util/template +++ b/srcpkgs/xcb-util/template @@ -28,9 +28,3 @@ xcb-util-devel_package() { vmove usr/lib/pkgconfig } } - -xcb-util_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xclip/template b/srcpkgs/xclip/template index 79fbd8a620..daef775f5c 100644 --- a/srcpkgs/xclip/template +++ b/srcpkgs/xclip/template @@ -10,9 +10,3 @@ maintainer="Steven R " homepage="http://sourceforge.net/projects/xclip/" license="GPLv2" short_desc="Command line interface to the X11 clipboard" - -xclip_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xcmiscproto/template b/srcpkgs/xcmiscproto/template index eb9f715f64..9509750fde 100644 --- a/srcpkgs/xcmiscproto/template +++ b/srcpkgs/xcmiscproto/template @@ -2,6 +2,7 @@ pkgname=xcmiscproto version=1.2.0 revision=2 +noarch="yes" build_style=gnu-configure short_desc="XCMisc extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=de17c06b7005c5e9ab469e324e76c5c3b8baa2dfc3c1dc7e93438c197facf68e -long_desc=" - This provides the XCMisc extension headers from modular X.org project." - -xcmiscproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xcmsdb/template b/srcpkgs/xcmsdb/template index 5306cba82a..d4deb19a05 100644 --- a/srcpkgs/xcmsdb/template +++ b/srcpkgs/xcmsdb/template @@ -15,9 +15,3 @@ long_desc=" $pkgname is used to load, query, or remove Device Color Characterization data stored in properties on the root window of the screen as specified in section 7, Device Color Characterization, of the ICCCM." - -xcmsdb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xcursorgen/template b/srcpkgs/xcursorgen/template index 793aecc795..153544721c 100644 --- a/srcpkgs/xcursorgen/template +++ b/srcpkgs/xcursorgen/template @@ -11,11 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=de2adb2f44ffee906024e53322aeb728d46061e6ca8e6f5a7e0da2c00d6f5f1d -long_desc=" - $pkgname creates an X cursor file from a collection of PNG images." - -xcursorgen_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xdelta3/template b/srcpkgs/xdelta3/template index 6851d21cda..3a400ad5a4 100644 --- a/srcpkgs/xdelta3/template +++ b/srcpkgs/xdelta3/template @@ -14,9 +14,3 @@ long_desc=" Xdelta is a tool and library for differential compression. Xdelta release version 3 supports VCDIFF encoding and decoding. Supports compressing 64 bit files on Windows, Linux, etc." - -xdelta3_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xdg-user-dirs-gtk/template b/srcpkgs/xdg-user-dirs-gtk/template index b834a09d84..4b3d8818e0 100644 --- a/srcpkgs/xdg-user-dirs-gtk/template +++ b/srcpkgs/xdg-user-dirs-gtk/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel xdg-user-dirs" +depends="xdg-user-dirs" short_desc="GTK+ tool to help manage user directories" maintainer="Juan RP " license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/0.10/$pkgname-$version.tar.xz" checksum=739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e - -xdg-user-dirs-gtk_package() { - depends="xdg-user-dirs" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xdg-user-dirs/template b/srcpkgs/xdg-user-dirs/template index bef7c04f50..5392d34ae7 100644 --- a/srcpkgs/xdg-user-dirs/template +++ b/srcpkgs/xdg-user-dirs/template @@ -4,6 +4,9 @@ version=0.15 revision=1 build_style=gnu-configure hostmakedepends="libxslt docbook-xsl" +conf_files=" + /etc/xdg/user-dirs.conf + /etc/xdg/user-dirs.defaults" short_desc="Tool to help manage user directories" maintainer="Juan RP " license="GPL-2" @@ -14,12 +17,3 @@ long_desc=" $pkgname is a tool to help manage well known user directories like the desktop folder and the music folder. It also handles localization (i.e. translation) of the filenames." - -xdg-user-dirs_package() { - conf_files=" - /etc/xdg/user-dirs.conf - /etc/xdg/user-dirs.defaults" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template index c5bfc2f24f..8652eb5f47 100644 --- a/srcpkgs/xdg-utils/template +++ b/srcpkgs/xdg-utils/template @@ -2,6 +2,7 @@ pkgname=xdg-utils version=1.0.2 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Tools to assist applications with various desktop integration tasks" homepage="http://portland.freedesktop.org/" @@ -9,34 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="http://portland.freedesktop.org/download/$pkgname-$version.tgz" checksum=21aeb7d16b2529b8d3975118f59eec09953e09f9a68d718159e98c90474b01ac -long_desc=" - The xdg-utils package is a set of simple scripts that provide basic - desktop integration functions for any Free Desktop, such as Linux. - - They are intended to provide a set of defacto standards. This means that: - - * Third party software developers can rely on these xdg-utils for - all of their simple integration needs. - - * Developers of desktop environments can make sure that their - environments are well supported. - - If a desktop developer wants to be certain that their environment - functions with all third party software, then can simply make sure - that these utilities work properly in their environment. This will - hopefully mean that 'third tier' window managers such as XFCE and - Blackbox can reach full parity with Gnome and KDE in terms of third - party ISV support. - - * Distribution vendors can provide custom versions of these utilities - - If a distribution vendor wishes to have unusual systems, they can - provide custom scripts, and the third party software should still - continue to work." - -xdg-utils_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xdot/template b/srcpkgs/xdot/template index d1fa3933da..0f242dc2a9 100644 --- a/srcpkgs/xdot/template +++ b/srcpkgs/xdot/template @@ -4,23 +4,16 @@ version=20130128 revision=1 build_style=python-module makedepends="graphviz pygtk python-distribute xbps-triggers>=0.46" +depends="${makedepends}" +noarch="yes" +pycompile_module="xdot.py" short_desc="Interactive viewer for Graphviz dot files" maintainer="Juan RP " license="GPL-3" homepage="https://code.google.com/p/jrfonseca/wiki/XDot" - do_fetch() { local url="https://code.google.com/p/jrfonseca.xdot" msg_normal "Fetching source from $url ...\n" git clone ${url} xdot-${version} } - -xdot_package() { - depends="${makedepends}" - noarch="yes" - pycompile_module="xdot.py" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xdpyinfo/template b/srcpkgs/xdpyinfo/template index a328230aac..08b9abbcd8 100644 --- a/srcpkgs/xdpyinfo/template +++ b/srcpkgs/xdpyinfo/template @@ -13,11 +13,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=fe5bad498ecfbf21f9a2a18eee5ece9de5d52f68878f250db8f575c9b872b5ce -long_desc=" - This package provides xdpyinfo, a display information utility for X." - -xdpyinfo_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xdriinfo/template b/srcpkgs/xdriinfo/template index 8cf8b731d3..a3cb8e53f7 100644 --- a/srcpkgs/xdriinfo/template +++ b/srcpkgs/xdriinfo/template @@ -15,9 +15,3 @@ long_desc=" The xdriinfo utility prints an XML description of a DRI driver. The driver can be specified directly by driver name or indirectly by screen number. No X connection is needed if the driver name is explicitly specified." - -xdriinfo_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template index fd14da15f0..9aa6e52ca9 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -25,6 +25,24 @@ if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then makedepends+=" gcc-multilib" fi +depends="iproute2 bridge-utils xen-hypervisor" + +make_dirs=" + /var/lib/xenstored 755 root root + /var/lib/xen/xenpaging 755 root root + /var/xen/dump 755 root root + /etc/xen/auto 755 root root" +conf_files=" + /etc/default/xendomains + /etc/default/xencommons + /etc/xen/xl.conf" +nostrip_files=" + openbios-ppc + openbios-sparc32 + openbios-sparc64 + palcode-clipper" +pycompile_module="xen grub" + do_configure() { unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS ./configure ${configure_args} @@ -125,25 +143,3 @@ xen-libs_package() { vmove "usr/lib/*.so.*" } } - -xen_package() { - make_dirs=" - /var/lib/xenstored 755 root root - /var/lib/xen/xenpaging 755 root root - /var/xen/dump 755 root root - /etc/xen/auto 755 root root" - conf_files=" - /etc/default/xendomains - /etc/default/xencommons - /etc/xen/xl.conf" - nostrip_files=" - openbios-ppc - openbios-sparc32 - openbios-sparc64 - palcode-clipper" - pycompile_module="xen grub" - depends="iproute2 bridge-utils xen-hypervisor" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xen4.2/template b/srcpkgs/xen4.2/template index 48f9f58896..b9343db312 100644 --- a/srcpkgs/xen4.2/template +++ b/srcpkgs/xen4.2/template @@ -26,6 +26,26 @@ if [ "${XBPS_MACHINE}" = "x86_64" ]; then makedepends+=" gcc-multilib" fi +depends="iproute2 bridge-utils xen-hypervisor" + +make_dirs=" + /var/lib/xenstored 755 root root + /var/lib/xen/xenpaging 755 root root + /var/xen/dump 755 root root + /etc/xen/auto 755 root root" +conf_files=" + /etc/default/xendomains + /etc/default/xencommons + /etc/xen/xl.conf" +nostrip_files=" + openbios-ppc + openbios-sparc32 + openbios-sparc64 + palcode-clipper" +pycompile_module="xen grub" +provides="xen-${version}_${revision}" +replaces="xen>=0" + do_configure() { unset CC LD AR AS RANLIB CPP CFLAGS CPPFLAGS LDFLAGS ./configure ${configure_args} @@ -124,27 +144,3 @@ xen4.2-libs_package() { vmove "usr/lib/*.so.*" } } - -xen4.2_package() { - make_dirs=" - /var/lib/xenstored 755 root root - /var/lib/xen/xenpaging 755 root root - /var/xen/dump 755 root root - /etc/xen/auto 755 root root" - conf_files=" - /etc/default/xendomains - /etc/default/xencommons - /etc/xen/xl.conf" - nostrip_files=" - openbios-ppc - openbios-sparc32 - openbios-sparc64 - palcode-clipper" - pycompile_module="xen grub" - depends="iproute2 bridge-utils xen-hypervisor" - provides="xen-${version}_${revision}" - replaces="xen>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xev/template b/srcpkgs/xev/template index 3ae8592339..853fc6543b 100644 --- a/srcpkgs/xev/template +++ b/srcpkgs/xev/template @@ -16,9 +16,3 @@ long_desc=" to an existing window) and then asks the X server to send it events whenever anything happens to the window (such as it being moved, resized, typed in, clicked in, etc cetera)." - -xev_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xextproto/template b/srcpkgs/xextproto/template index 1d319ce79b..88f6ca6251 100644 --- a/srcpkgs/xextproto/template +++ b/srcpkgs/xextproto/template @@ -2,6 +2,7 @@ pkgname=xextproto version=7.3.0 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="xmlto" short_desc="XExt extension headers from X.org" @@ -10,10 +11,3 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 - -xextproto_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template index ee2ec8b258..c5bf0693db 100644 --- a/srcpkgs/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14 mtdev-devel" +depends="xserver-abi-input-19_1" short_desc="Xorg event device input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -20,10 +21,3 @@ xf86-input-evdev-devel_package() { vmove usr/lib/pkgconfig } } - -xf86-input-evdev_package() { - depends="xserver-abi-input-19_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template index 2bb3a5991d..e66c2b5aa0 100644 --- a/srcpkgs/xf86-input-joystick/template +++ b/srcpkgs/xf86-input-joystick/template @@ -5,6 +5,7 @@ revision=3 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14" +depends="xserver-abi-input-19_1" short_desc="Joystick Input driver for Xorg" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -23,10 +24,3 @@ xf86-input-joystick-devel_package() { vmove usr/lib/pkgconfig } } - -xf86-input-joystick_package() { - depends="xserver-abi-input-19_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index 7d5b1cd37e..eb021b2e04 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -6,6 +6,7 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libX11-devel libXtst-devel mtdev-devel pixman-devel libpciaccess-devel xorg-server-devel>=1.14" +depends="xserver-abi-input-19_1" short_desc="Xorg synaptics touchpad input driver" maintainer="Juan RP " homepage="http://www.x.org/" @@ -20,10 +21,3 @@ xf86-input-synaptics-devel_package() { vmove usr/lib/pkgconfig } } - -xf86-input-synaptics_package() { - depends="xserver-abi-input-19_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template index 5035b319c9..6d0216d4c7 100644 --- a/srcpkgs/xf86-input-vmmouse/template +++ b/srcpkgs/xf86-input-vmmouse/template @@ -5,6 +5,7 @@ revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14" +depends="xserver-abi-input-19_1" short_desc="Xorg VMware virtual mouse input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -16,10 +17,3 @@ post_install() { # Remove HAL stuff, it's obsolete. rm -rf ${DESTDIR}/usr/{lib,share}/hal } - -xf86-input-vmmouse_package() { - depends="xserver-abi-input-19_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index 76e6ebf2bc..009f4a630e 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--with-xorg-conf-dir=/etc/X11/xorg.conf.d" hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14 libXrandr-devel libXinerama-devel libXi-devel" +depends="xserver-abi-input-19_1" short_desc="Xorg Wacom tablet input driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -24,10 +25,3 @@ xf86-input-wacom-devel_package() { vmove usr/lib/pkgconfig } } - -xf86-input-wacom_package() { - depends="xserver-abi-input-19_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index 9d6621bb0a..92da787cdb 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -8,17 +8,11 @@ hostmakedepends="pkg-config" makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel>=9.0.2 glamor-egl-devel xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1 mesa-ati-dri" +replaces="xf86-video-ati>=0" short_desc="Xorg ATI Radeon video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4 - -xf86-video-ati_package() { - replaces="xf86-video-ati>=0" - depends="xserver-abi-video-14_1 mesa-ati-dri" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index 9d9f0e1859..6b0d9c780f 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg Cirrus Logic video driver" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7 - -xf86-video-cirrus_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-fbdev/template b/srcpkgs/xf86-video-fbdev/template index 1c3e401d79..856a1cbbb4 100644 --- a/srcpkgs/xf86-video-fbdev/template +++ b/srcpkgs/xf86-video-fbdev/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg framebuffer video driver" homepage="http://xorg.freedesktop.org" license="MIT" @@ -15,10 +16,3 @@ checksum=9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b if [ "$CROSS_BUILD" ]; then CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" fi - -xf86-video-fbdev_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-fbturbo-git/template b/srcpkgs/xf86-video-fbturbo-git/template index 82b0c4d05a..be5d450d64 100644 --- a/srcpkgs/xf86-video-fbturbo-git/template +++ b/srcpkgs/xf86-video-fbturbo-git/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config xorg-util-macros xorg-server-devel" makedepends="libXrandr-devel xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg DDX driver for Allwinner A10/A13 and other ARM devices" homepage="http://github.com/ssvb/xf86-video-fbturbo" license="MIT, GPL" @@ -20,10 +21,3 @@ pre_configure() { cp /usr/include/xorg/dri2.h src autoreconf -fi } - -xf86-video-fbturbo-git_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template index d826892ae4..e796f8108c 100644 --- a/srcpkgs/xf86-video-geode/template +++ b/srcpkgs/xf86-video-geode/template @@ -3,20 +3,13 @@ pkgname=xf86-video-geode version=2.11.14 revision=3 build_style=gnu-configure +# This is x86 specific. +only_for_archs=i686 +makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg AMD Geode GX/LX video driver" maintainer="Juan RP " distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" homepage="http://xorg.freedesktop.org/" license="MIT" checksum=4c750b46c932934faa008919922f5ac8a572afcfe265ac8d7c203b8167a0cfcc - -# This is x86 specific. -only_for_archs=i686 -makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.14" - -xf86-video-geode_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 41a74a80bd..b70becd485 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -7,6 +7,8 @@ configure_args="--with-default-accel=sna --enable-kms-only --enable-sna" makedepends="pkg-config dri2proto>=2.6 libudev-devel>=183 libdrm-devel libpciaccess-devel libXext-devel libXfixes-devel libXv-devel libXvMC-devel xcb-util-devel>=0.3.9 MesaLib-devel xorg-server-devel>=1.14" +depends="xserver-abi-video>=14_1 mesa-intel-dri" +only_for_archs="i686 x86_64" short_desc="Xorg DDX Intel video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -14,15 +16,6 @@ license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc -only_for_archs="i686 x86_64" - post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -xf86-video-intel_package() { - depends="xserver-abi-video>=14_1 mesa-intel-dri" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template index 98d52710e0..0478ca3273 100644 --- a/srcpkgs/xf86-video-modesetting/template +++ b/srcpkgs/xf86-video-modesetting/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="X.org generic modesetting video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca - -xf86-video-modesetting_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index 71fe79952c..b988c8129f 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1 mesa-nouveau-dri" short_desc="Xorg opensource NVIDIA video driver" maintainer="Juan RP " homepage="http://nouveau.freedesktop.org/wiki/" license="GPL-2" distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${version}.tar.bz2" checksum=c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d - -xf86-video-nouveau_package() { - depends="xserver-abi-video-14_1 mesa-nouveau-dri" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template index 38ba061efb..862cfd9cb0 100644 --- a/srcpkgs/xf86-video-openchrome/template +++ b/srcpkgs/xf86-video-openchrome/template @@ -7,16 +7,10 @@ build_style=gnu-configure hostmakedepends="pkg-config" makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel MesaLib-devel xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg VIA Unichromes video driver" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7 - -xf86-video-openchrome_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index 1b6ac6b3ee..a3c06a4569 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -4,6 +4,7 @@ version=0.9.6 revision=3 build_style=gnu-configure makedepends="pkg-config xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg SiS USB video driver" homepage="http://xorg.freedesktop.org/" license="Custom" @@ -14,10 +15,3 @@ checksum=73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046 long_desc=" This is the video driver for SiS (Silicon Integrated Systems) video chips that are connected via a Net2280-based USB dongle for the Xorg X11 server." - -xf86-video-sisusb_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index d50252743b..1fa4b2081a 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -6,6 +6,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1" short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" license="MIT" @@ -16,10 +17,3 @@ checksum=ce8b75e5a40e9dae76f2ac9e2880f7f73a848653ca2eed5880f52dc2c0d3aef8 if [ "$CROSS_BUILD" ]; then CFLAGS="-I$XBPS_CROSS_BASE/usr/include/xorg" fi - -xf86-video-vesa_package() { - depends="xserver-abi-video-14_1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index cd3c32be87..e114cdc9d5 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -7,6 +7,7 @@ build_style=gnu-configure configure_args="--enable-vmwarectrl-client" hostmakedepends="automake libtool pkg-config xorg-util-macros" makedepends="libdrm-devel MesaLib-devel>=10.0.0_2 xorg-server-devel>=1.14" +depends="xserver-abi-video-14_1 mesa-vmwgfx-dri" short_desc="Modular Xorg VMware virtual video driver" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -17,10 +18,3 @@ checksum=802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d pre_configure() { autoreconf -fi } - -xf86-video-vmware_package() { - depends="xserver-abi-video-14_1 mesa-vmwgfx-dri" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xf86bigfontproto/template b/srcpkgs/xf86bigfontproto/template index 0647dfb597..b48262f41c 100644 --- a/srcpkgs/xf86bigfontproto/template +++ b/srcpkgs/xf86bigfontproto/template @@ -2,6 +2,7 @@ pkgname=xf86bigfontproto version=1.2.0 revision=2 +noarch="yes" build_style=gnu-configure short_desc="XF86BigFont extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=ba9220e2c4475f5ed2ddaa7287426b30089e4d29bd58d35fad57ba5ea43e1648 -long_desc=" - This provides the XF86BigFont extension headers from modular X.org X11 project." - -xf86bigfontproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xf86dgaproto/template b/srcpkgs/xf86dgaproto/template index 4110639540..f316b86f7c 100644 --- a/srcpkgs/xf86dgaproto/template +++ b/srcpkgs/xf86dgaproto/template @@ -2,6 +2,7 @@ pkgname=xf86dgaproto version=2.1 revision=2 +noarch="yes" build_style=gnu-configure short_desc="XF86DGA extension headers" homepage="http://xorg.freedesktop.org" @@ -9,12 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=ac5ef65108e1f2146286e53080975683dae49fc94680042e04bd1e2010e99050 -long_desc=" - This package provides the XF86DGA extension headers from modular X.org." - -xf86dgaproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xf86driproto/template b/srcpkgs/xf86driproto/template index e38e83db88..7b38480189 100644 --- a/srcpkgs/xf86driproto/template +++ b/srcpkgs/xf86driproto/template @@ -2,6 +2,7 @@ pkgname=xf86driproto version=2.1.1 revision=1 +noarch="yes" build_style=gnu-configure short_desc="XF86DRI extension headers from modular X.org" maintainer="Juan RP " @@ -9,21 +10,3 @@ homepage="${XORG_HOME}" license="MIT" distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=9c4b8d7221cb6dc4309269ccc008a22753698ae9245a398a59df35f1404d661f -long_desc=" - This provides the XF86DRI extension headers from modular X.org X11 - project. - - The headers contain the types and functions that define the interface - between a DRI (direct rendering infrastructure) driver and driver - loader." - -post_install() { - vinstall COPYING 644 usr/share/licenses/${pkgname} -} - -xf86driproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xf86miscproto/template b/srcpkgs/xf86miscproto/template index 02e5d1d750..cfa8621fc9 100644 --- a/srcpkgs/xf86miscproto/template +++ b/srcpkgs/xf86miscproto/template @@ -2,6 +2,7 @@ pkgname=xf86miscproto version=0.9.2 revision=2 +noarch="yes" build_style=gnu-configure short_desc="XF86Misc extension headers from modular X.org" homepage="http://xorg.freedesktop.org" @@ -9,13 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=aaab4cbf19c73ded4785ba69cdd7ae23aaf103c7040559283f85fc1237dad6e6 -long_desc=" - This provides the XF86Misc extension headers from modular X.org X11 - project." - -xf86miscproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xf86vidmodeproto/template b/srcpkgs/xf86vidmodeproto/template index 5bc437a880..808fbbfe21 100644 --- a/srcpkgs/xf86vidmodeproto/template +++ b/srcpkgs/xf86vidmodeproto/template @@ -2,6 +2,7 @@ pkgname=xf86vidmodeproto version=2.3 revision=2 +noarch="yes" build_style=gnu-configure short_desc="XF86VidMode extension headers from modular X.org" homepage="http://xorg.freedesktop.org" @@ -9,13 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=8f704613a5407b31c594d05cf8e053f2b05777172a44e7cd2abd8090bd2ac247 -long_desc=" - This provides the XF86VidMode extension headers from modular X.org X11 - project." - -xf86vidmodeproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template index 4f6716d669..ecab164abb 100644 --- a/srcpkgs/xfburn/template +++ b/srcpkgs/xfburn/template @@ -7,6 +7,7 @@ configure_args="--enable-gstreamer --enable-dbus --disable-hal" depends="desktop-file-utils hicolor-icon-theme" makedepends="intltool pkg-config libburn-devel libisofs-devel gtk+-devel libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel" +depends="desktop-file-utils hicolor-icon-theme" short_desc="CD-burner application for Xfce Desktop Environment" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/applications/xfburn" @@ -23,10 +24,3 @@ long_desc=" pre_configure() { sed -i '1 i#include ' xfburn/xfburn-settings.h } - -xfburn_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfce-utils/template b/srcpkgs/xfce-utils/template index 595a566c3b..d6ab002a72 100644 --- a/srcpkgs/xfce-utils/template +++ b/srcpkgs/xfce-utils/template @@ -7,18 +7,10 @@ hostmakedepends="pkg-config intltool" makedepends="libxfce4ui-devel libxfce4util-devel gtk+-devel dbus-glib-devel" # xfconf-perl is required by the xfconf-migration script. makedepends+=" xfconf-perl hicolor-icon-theme desktop-file-utils" +depends="xfconf-perl hicolor-icon-theme desktop-file-utils" short_desc="Utilities for the Xfce Desktop Environment" maintainer="Juan RP " homepage="http://www.xfce.org/" license="GPL-2" distfiles="http://archive.se.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2" checksum=a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5 -long_desc=" - This package includes utilities for the Xfce Desktop Environment." - -xfce-utils_package() { - depends="xfconf-perl hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template index c90f1d8245..73d74df7d8 100644 --- a/srcpkgs/xfce4-appfinder/template +++ b/srcpkgs/xfce4-appfinder/template @@ -6,18 +6,10 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Appfinder for the Xfce Desktop Environment" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2" checksum=65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77 -long_desc=" - xfce-appfinder shows system wide installed applications." - -xfce4-appfinder_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template index 2ccae3ac13..657d0439ce 100644 --- a/srcpkgs/xfce4-dev-tools/template +++ b/srcpkgs/xfce4-dev-tools/template @@ -2,20 +2,14 @@ pkgname=xfce4-dev-tools version=4.10.0 revision=1 +noarch=yes build_style=gnu-configure hostmakedepends="automake libtool gtk-doc intltool pkg-config" makedepends="libglib-devel" +depends="${hostmakedepends}" short_desc="Xfce developer tools" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" checksum=f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8 - -xfce4-dev-tools_package() { - depends="${hostmakedepends}" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-mixer/template b/srcpkgs/xfce4-mixer/template index 8d8977d9cf..8ddda0c8c8 100644 --- a/srcpkgs/xfce4-mixer/template +++ b/srcpkgs/xfce4-mixer/template @@ -7,17 +7,9 @@ makedepends="pkg-config intltool gtk+-devel gstreamer-devel gst-plugins-base-devel libxfce4util-devel libxfce4ui-devel xfconf-devel xfce4-panel-devel libunique1-devel" short_desc="Sound mixer for the Xfce Desktop Environment" +depends="desktop-file-utils hicolor-icon-theme" maintainer="Juan RP " homepage="http://www.xfce.org/" license="GPL-2" distfiles="http://archive.se.xfce.org/src/apps/$pkgname/4.10/$pkgname-$version.tar.bz2" checksum=a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade -long_desc=" - This package includes a sound mixer for the XFce Desktop Environment." - -xfce4-mixer_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template index be287e04f6..df9b17e229 100644 --- a/srcpkgs/xfce4-notifyd/template +++ b/srcpkgs/xfce4-notifyd/template @@ -5,6 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="libnotify-devel libxfce4util-devel libxfce4ui-devel hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils" +provides="notification-daemon-${version}" +conflicts="notification-daemon>=0" +replaces="notification-daemon>=0" short_desc="Simple, visually-appealing notification daemon for Xfce" homepage="http://goodies.xfce.org/projects/applications/xfce4-notifyd" license="GPL-2" @@ -14,13 +18,3 @@ checksum=dd40f64c9db22b0b971e81e8e74a4ab6afe6d0bb819ab5d0badee89e13faa63b long_desc=" Xfce4-notifyd is a simple, visually-appealing notification daemon for Xfce that implements the Freedesktop.org Desktop Notifications Specification." - -xfce4-notifyd_package() { - provides="notification-daemon-${version}" - conflicts="notification-daemon>=0" - replaces="notification-daemon>=0" - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template index 80cdcc9f28..f8ededdfb9 100644 --- a/srcpkgs/xfce4-panel/template +++ b/srcpkgs/xfce4-panel/template @@ -23,9 +23,3 @@ xfce4-panel-devel_package() { vmove usr/share/gtk-doc } } - -xfce4-panel_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index b398e29a94..73a3732303 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -9,18 +9,10 @@ hostmakedepends="pkg-config intltool" makedepends="libxfce4ui-devel libxfce4util-devel xfconf-devel libnotify-devel gtk+-devel libXrandr-devel dbus-glib-devel xfce4-panel-devel NetworkManager-devel" makedepends+=" upower udisks hicolor-icon-theme desktop-file-utils" +depends="upower udisks hicolor-icon-theme desktop-file-utils" short_desc="Xfce power manager" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/xfce/xfce4-power-manager/1.2/$pkgname-$version.tar.bz2" checksum=d7fb98a540284b62f4201527de17d4b24123f9d26c9f49131dd497c8387184e9 -long_desc=" - $pkgname is the power manager for the Xfce desktop environment." - -xfce4-power-manager_package() { - depends="upower udisks hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template index 5d5a979054..a48f555414 100644 --- a/srcpkgs/xfce4-screenshooter/template +++ b/srcpkgs/xfce4-screenshooter/template @@ -6,16 +6,10 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libxfce4ui-devel xfce4-panel-devel exo-devel libsoup-devel desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" short_desc="Plugin that makes screenshots for the Xfce panel" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/applications/xfce4-screenshooter" license="GPL-2" distfiles="http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$version.tar.bz2" checksum=40419892bd28989315eed053c159bba0f4264ed8c6c6738806024e481eab9492 - -xfce4-screenshooter_package() { - depends="desktop-file-utils hicolor-icon-theme" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template index 5f3ef8e988..5c2a790bce 100644 --- a/srcpkgs/xfce4-sensors-plugin/template +++ b/srcpkgs/xfce4-sensors-plugin/template @@ -6,6 +6,7 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="libsensors-devel libxfce4ui-devel xfce4-panel-devel libnotify-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="XFCE sensors plugin" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" @@ -17,10 +18,3 @@ long_desc=" Linux and requires libsensors to display your mainboard sensors and fan speeds. Furthermore, it supports hddtemp to surveil your hard disk’s temperature values." - -xfce4-sensors-plugin_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template index 4875faba2c..162fd707ef 100644 --- a/srcpkgs/xfce4-session/template +++ b/srcpkgs/xfce4-session/template @@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool xfce4-dev-tools gettext-devel" makedepends="libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel xfce4-panel-devel systemd-devel polkit-devel desktop-file-utils libgnome-keyring-devel libSM-devel iceauth upower udisks hicolor-icon-theme" +depends="upower hicolor-icon-theme desktop-file-utils" +conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" short_desc="The session manager for the XFCE desktop environment" maintainer="Juan RP " license="GPL-2" @@ -28,11 +30,3 @@ xfce4-session-devel_package() { vmove "usr/lib/*.so" } } - -xfce4-session_package() { - depends="upower hicolor-icon-theme desktop-file-utils" - conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index 812caaffc6..d1bf86df02 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -6,17 +6,11 @@ build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="dbus-glib-devel exo-devel vte-devel gtk+-devel libxfce4ui-devel hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils" +replaces="Terminal>=0" short_desc="A modern terminal emulator primarly for the Xfce desktop environment" maintainer="Juan RP " homepage="http://www.xfce.org" license="GPL-2" distfiles="http://archive.se.xfce.org/src/apps/${pkgname}/0.6/${pkgname}-${version}.tar.bz2" checksum=912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08 - -xfce4-terminal_package() { - replaces="Terminal>=0" - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template index 4953c24cb3..1123289e87 100644 --- a/srcpkgs/xfce4-weather-plugin/template +++ b/srcpkgs/xfce4-weather-plugin/template @@ -5,6 +5,7 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="gtk+-devel libxfce4ui-devel xfce4-panel-devel libxml2-devel" +depends="hicolor-icon-theme" short_desc="XFCE panel plagin to show temperature and weather" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" @@ -14,10 +15,3 @@ checksum=a03a001065afdd8a167a44b96885d70013290b88d82e7deec45a2d294411077d long_desc=" This panel plugin shows the current temperature and weather condition, using weather data provided by xoap.weather.com." - -xfce4-weather-plugin_package() { - depends="hicolor-icon-theme" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template index 4aa9cdbf9b..07c7efc11a 100644 --- a/srcpkgs/xfce4/template +++ b/srcpkgs/xfce4/template @@ -9,12 +9,9 @@ makedepends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0 Thunar>=1.4.0 thunar-volman>=0.8.0 exo>=0.8.0 orage>=4.8.3_1 ristretto>=0.6.0 gtk-xfce-engine>=3.0.0 notification-daemon>=0.2.2_1 tumbler>=0.1.25 xdg-user-dirs-gtk" +depends="${makedepends}" +noarch="yes" short_desc="The XFCE desktop environment meta package" maintainer="Juan RP " license="GPL-2, LGPL-2.1, BSD" homepage="http://xfce.org" - -xfce4_package() { - noarch="yes" - depends="${makedepends}" -} diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template index be0a44e997..4bb06586df 100644 --- a/srcpkgs/xfconf/template +++ b/srcpkgs/xfconf/template @@ -27,6 +27,12 @@ else configure_args+=" --disable-perl-bindings" fi +if [ "$build_option_perl" ]; then + replaces="xfconf-perl>=0" + provides="xfconf-perl-${version}" + depends="perl-Glib>=1.242_1" +fi + xfconf-devel_package() { depends="dbus-glib-devel xfconf>=$version" short_desc+=" - development files" @@ -36,14 +42,3 @@ xfconf-devel_package() { vmove usr/share/gtk-doc } } - -xfconf_package() { - if [ "$build_option_perl" ]; then - replaces="xfconf-perl>=0" - provides="xfconf-perl-${version}" - depends="perl-Glib>=1.242_1" - fi - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfd/template b/srcpkgs/xfd/template index 2c1cf57c28..dfb88d2489 100644 --- a/srcpkgs/xfd/template +++ b/srcpkgs/xfd/template @@ -12,14 +12,8 @@ maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759 long_desc=" - The xfd utility creates a window containing the name of the font being + The xfd utility creates a window containing the name of the font being displayed, a row of command buttons, several lines of text for display- ing character metrics, and a grid containing one glyph per cell. The characters are shown in increasing order from left to right, top to bottom." - -xfd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template index a88e5730fb..159a41b4c4 100644 --- a/srcpkgs/xfdesktop/template +++ b/srcpkgs/xfdesktop/template @@ -7,18 +7,10 @@ makedepends="pkg-config intltool" makedepends="xfconf-devel libxfce4ui-devel exo-devel gtk+-devel libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel Thunar-devel dbus-glib-devel" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Desktop manager for the XFce Desktop Environment" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/xfce/xfdesktop/4.10/$pkgname-$version.tar.bz2" checksum=897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b -long_desc=" - This package includes a desktop manager for the XFce Desktop Environment." - -xfdesktop_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfe/template b/srcpkgs/xfe/template index 11bad9e91f..2c39bb7267 100644 --- a/srcpkgs/xfe/template +++ b/srcpkgs/xfe/template @@ -5,16 +5,10 @@ revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool" makedepends="startup-notification-devel libpng-devel fox-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="The X File Explorer" maintainer="Juan RP " license="GPL-2" homepage="http://roland65.free.fr/xfe/" distfiles="${SOURCEFORGE_SITE}/xfe/xfe-${version}.tar.gz" checksum=4dbb2e24b18a63d78afd0219232f05cd7401370750e2db5f8fa70a6fef022abd - -xfe_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xfontsel/template b/srcpkgs/xfontsel/template index 7e68225590..579940e6b7 100644 --- a/srcpkgs/xfontsel/template +++ b/srcpkgs/xfontsel/template @@ -11,12 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf -long_desc=" - This package provides xfontsel, a program to query and display - X11 fonts." - -xfontsel_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index a78bda621c..7ed83db87b 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -3,6 +3,7 @@ pkgname=xfsprogs version=3.1.11 revision=1 makedepends="libuuid-devel libblkid-devel readline-devel" +replaces="xfsprogs-libs>=0" short_desc="Utilities for managing the XFS filesystem" maintainer="Juan RP " license="LGPL-2.1" @@ -40,10 +41,3 @@ xfsprogs-devel_package() { vmove usr/share/man/man3 } } - -xfsprogs_package() { - replaces="xfsprogs-libs>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfwm4-themes/template b/srcpkgs/xfwm4-themes/template index e6fcd8ca27..6b785074fd 100644 --- a/srcpkgs/xfwm4-themes/template +++ b/srcpkgs/xfwm4-themes/template @@ -2,6 +2,7 @@ pkgname=xfwm4-themes version=4.10.0 revision=1 +noarch="yes" build_style=gnu-configure short_desc="Themes for the XFCE window manager" maintainer="Juan RP " @@ -9,12 +10,3 @@ license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/art/$pkgname/4.10/$pkgname-$version.tar.bz2" checksum=3214d5f00e9703b5e8c9e7c3287d606dedec7285ceb4d5db332e93ada66fd575 -long_desc=" - xfwm4-themes is a collection of themes for the XFCE window manager." - -xfwm4-themes_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template index 84b4300da4..9fd72aaa99 100644 --- a/srcpkgs/xfwm4/template +++ b/srcpkgs/xfwm4/template @@ -8,16 +8,10 @@ makedepends="libxfce4ui-devel gtk+-devel libxfce4util-devel xfconf-devel startup-notification-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel libXrender-devel dbus-glib-devel libwnck2-devel hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils" short_desc="Next generation window manager for Xfce" maintainer="Juan RP " license="GPL-2" homepage="http://xfce.org" distfiles="http://archive.se.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2" checksum=380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740 - -xfwm4_package() { - depends="hicolor-icon-theme desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xgamma/template b/srcpkgs/xgamma/template index 41aa15bc5f..d66c2d568e 100644 --- a/srcpkgs/xgamma/template +++ b/srcpkgs/xgamma/template @@ -14,9 +14,3 @@ checksum=7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16 long_desc=" This package provides xgamma, a program to alter the gamma correction of the monitor." - -xgamma_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xhost/template b/srcpkgs/xhost/template index c661229e41..27aa0dc379 100644 --- a/srcpkgs/xhost/template +++ b/srcpkgs/xhost/template @@ -11,9 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=a6f5b922df0a7be5d3ba43f525fa8e69c539c738418f013a0b7adaa423a89dc2 - -xhost_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template index 5e82c38dce..3600d9655e 100644 --- a/srcpkgs/xine-lib/template +++ b/srcpkgs/xine-lib/template @@ -47,9 +47,3 @@ xine-lib-devel_package() { vmove "usr/lib/*.so" } } - -xine-lib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xineramaproto/template b/srcpkgs/xineramaproto/template index 65a4a412e2..df2eb38335 100644 --- a/srcpkgs/xineramaproto/template +++ b/srcpkgs/xineramaproto/template @@ -2,6 +2,7 @@ pkgname=xineramaproto version=1.2 revision=2 +noarch="yes" build_style=gnu-configure short_desc="Xinerama extension headers from X.org" homepage="http://xorg.freedesktop.org" @@ -9,13 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=58e88087ceec7201d918f94d6b1247325adca2a9903fed11291b412427a7ba64 -long_desc=" - This provides the Xinerama extension headers from modular X.org X11 - project." - -xineramaproto_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template index 019d535fcf..54662d3540 100644 --- a/srcpkgs/xinit/template +++ b/srcpkgs/xinit/template @@ -6,6 +6,11 @@ build_style=gnu-configure configure_args="--with-xinitdir=/etc/X11/xinit" hostmakedepends="pkg-config" makedepends="libX11-devel" +conf_files=" + /etc/X11/xinit/xinitrc + /etc/X11/xinit/xserverrc + /etc/skel/.xinitrc + /etc/skel/.xsession" short_desc="X init program" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -26,14 +31,3 @@ post_install() { vinstall ${FILESDIR}/xserverrc 644 etc/X11/xinit vinstall COPYING 644 usr/share/licenses/${pkgname} } - -xinit_package() { - conf_files=" - /etc/X11/xinit/xinitrc - /etc/X11/xinit/xserverrc - /etc/skel/.xinitrc - /etc/skel/.xsession" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xinput/template b/srcpkgs/xinput/template index b355f6d736..0f453e00a3 100644 --- a/srcpkgs/xinput/template +++ b/srcpkgs/xinput/template @@ -14,9 +14,3 @@ checksum=b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f long_desc=" xinput is a utility to list available input devices, query information about a device and change input device settings." - -xinput_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xkbcomp/template b/srcpkgs/xkbcomp/template index 3a3658335b..c84c72d05a 100644 --- a/srcpkgs/xkbcomp/template +++ b/srcpkgs/xkbcomp/template @@ -17,9 +17,3 @@ long_desc=" post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } - -xkbcomp_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xkbevd/template b/srcpkgs/xkbevd/template index ea3c031901..4a9b2d3a7c 100644 --- a/srcpkgs/xkbevd/template +++ b/srcpkgs/xkbevd/template @@ -14,9 +14,3 @@ checksum=cd62946c9feb3eb2fe0baef1ce5c0f4ab14148099264ecbce6e039b17880eb63 long_desc=" $pkgname event daemon listens for specified XKB events and executes requested commands if they occur." - -xkbevd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xkbutils/template b/srcpkgs/xkbutils/template index 3088d390b2..2e31adac36 100644 --- a/srcpkgs/xkbutils/template +++ b/srcpkgs/xkbutils/template @@ -14,9 +14,3 @@ checksum=e409af0730788aa94ee22711750792546465a8f4729a0084d31a32c3ef0849bd long_desc=" The xkbutils package provides some XKB related utilities for XKB-capable X servers." - -xkbutils_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index 5a57b4754e..6b09545697 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -2,21 +2,15 @@ pkgname=xkeyboard-config version=2.10.1 revision=1 +noarch="yes" build_style=gnu-configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" hostmakedepends="pkg-config libxslt intltool" makedepends="libX11-devel xkbcomp" +depends="xkbcomp" short_desc="X Keyboard Configuration Database" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/XKeyboardConfig" license="MIT" distfiles="http://xorg.freedesktop.org/releases/individual/data/$pkgname/$pkgname-$version.tar.bz2" checksum=7d58064d86bb0155a3acc4ca35097dab4dfef334cdd0555fb5965ebca1fca18b - -xkeyboard-config_package() { - depends="xkbcomp" - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xkill/template b/srcpkgs/xkill/template index 75505aec47..048105300a 100644 --- a/srcpkgs/xkill/template +++ b/srcpkgs/xkill/template @@ -15,9 +15,3 @@ long_desc=" Xkill is a utility for forcing the X server to close connections to clients. This program is very dangerous, but is useful for aborting programs that have displayed undesired windows on a user's screen." - -xkill_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xlsatoms/template b/srcpkgs/xlsatoms/template index be3b2d3638..369d080b32 100644 --- a/srcpkgs/xlsatoms/template +++ b/srcpkgs/xlsatoms/template @@ -15,9 +15,3 @@ long_desc=" $pkgname lists the interned atoms. By default, all atoms starting from 1 (the lowest atom value defined by the protocol) are listed until unknown atom is found." - -xlsatoms_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xmag/template b/srcpkgs/xmag/template index babf79f56a..23bb293fc8 100644 --- a/srcpkgs/xmag/template +++ b/srcpkgs/xmag/template @@ -11,9 +11,3 @@ license="MIT" homepage="http://xorg.freedesktop.org/" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6 - -xmag_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xmlcatmgr/template b/srcpkgs/xmlcatmgr/template index f6450e6b89..2d179beec6 100644 --- a/srcpkgs/xmlcatmgr/template +++ b/srcpkgs/xmlcatmgr/template @@ -3,6 +3,11 @@ pkgname=xmlcatmgr version=2.2 revision=2 build_style=gnu-configure +conf_files=" + /etc/sgml/catalog + /etc/xml/catalog + /usr/share/sgml/catalog + /usr/share/xml/catalog" short_desc="XML and SGML catalog manager" maintainer="Juan RP " homepage="http://xmlcatmgr.sourceforge.net" @@ -20,8 +25,8 @@ long_desc=" local files or URIs. This allows you to tell the parser where to look for entities without having to modify the original document source." -if [ -n "$CROSS_BUILD" ]; then - makedepends="xmlcatmgr" +if [ "$CROSS_BUILD" ]; then + hostmakedepends="xmlcatmgr" fi pre_install() { @@ -50,15 +55,3 @@ post_install() { install -Dm644 catalog.xml ${DESTDIR}/usr/share/xml/catalog install -Dm644 catalog.etc.xml ${DESTDIR}/etc/xml/catalog } - -xmlcatmgr_package() { - conf_files=" - /etc/sgml/catalog - /etc/xml/catalog - /usr/share/sgml/catalog - /usr/share/xml/catalog" - pkg_install() { - vmove etc - vmove usr - } -} diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template index eb369c858d..5512194209 100644 --- a/srcpkgs/xmldiff/template +++ b/srcpkgs/xmldiff/template @@ -4,6 +4,8 @@ version=0.6.10 revision=2 build_style=python-module makedepends="python-devel libxslt openjade" +depends="libxslt openjade" +pycompile_module="xmldiff" short_desc="Python classes to diff XML files" homepage="http://www.logilab.org/project/xmldiff/" license="GPL-2" @@ -17,11 +19,3 @@ post_install() { vmkdir usr/share/man/man1 install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1 } - -xmldiff_package() { - pycompile_module="xmldiff" - depends="libxslt openjade" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xmlto/template b/srcpkgs/xmlto/template index 8c0559fe1c..633bc65e83 100644 --- a/srcpkgs/xmlto/template +++ b/srcpkgs/xmlto/template @@ -6,6 +6,7 @@ homepage="http://cyberelk.net/tim/software/xmlto/" distfiles="https://fedorahosted.org/releases/x/m/xmlto/xmlto-$version.tar.bz2" build_style=gnu-configure makedepends="libxslt docbook-xsl>=1.77.1_2" +depends="${makedepends}" short_desc="Tool to help transform XML documents into other formats" maintainer="Juan RP " license="GPL-2" @@ -19,10 +20,3 @@ post_install() { # Requires bash! sed -i "s|^#!/bin/sh|#!/bin/bash|" ${DESTDIR}/usr/bin/xmlto } - -xmlto_package() { - depends="${makedepends}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xmodmap/template b/srcpkgs/xmodmap/template index fbaa04b380..07559d7d74 100644 --- a/srcpkgs/xmodmap/template +++ b/srcpkgs/xmodmap/template @@ -11,9 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3 - -xmodmap_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template index 3abf623229..ab5111e803 100644 --- a/srcpkgs/xnoise/template +++ b/srcpkgs/xnoise/template @@ -7,6 +7,7 @@ hostmakedepends="pkg-config intltool" makedepends="gtk+3-devel libtaginfo-devel>=0.1.6 sqlite-devel>=3.8.0_3 libnotify-devel libsoup-devel gst-plugins-base1-devel gst-plugins-good1 desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1" short_desc="Media player for GTK+ with a slick GUI" maintainer="Juan RP " license="GPL-2" @@ -31,10 +32,3 @@ xnoise-devel_package() { vmove usr/share/vala } } - -xnoise_package() { - depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xombrero/template b/srcpkgs/xombrero/template index 1159c11375..208ab47be0 100644 --- a/srcpkgs/xombrero/template +++ b/srcpkgs/xombrero/template @@ -4,6 +4,7 @@ version=1.6.3 revision=1 hostmakedepends="pkg-config perl groff" makedepends="libbsd-devel gtk+3-devel gnutls-devel webkitgtk-devel desktop-file-utils" +depends="desktop-file-utils" short_desc="A minimalists web browser, vi-like but with traditional web browser behavior" maintainer="Juan RP " license="ISC" @@ -27,10 +28,3 @@ do_install() { make -C linux PREFIX=/usr DESTDIR=${DESTDIR} install vinstall xombrero.conf 644 etc/skel .xombrero.conf } - -xombrero_package() { - depends="desktop-file-utils" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xonotic-data-low/template b/srcpkgs/xonotic-data-low/template index c086b1c791..f12d09d600 100644 --- a/srcpkgs/xonotic-data-low/template +++ b/srcpkgs/xonotic-data-low/template @@ -7,6 +7,9 @@ homepage="http://xonotic.org" license="GPL-2, GPL-3" distfiles="http://dl.xonotic.org/xonotic-${version}-low.zip" makedepends="unzip" +noarch="yes" +replaces="xonotic-data>=0" +provides="xonotic-data-${version}" short_desc="A free, fast-paced crossplatform FPS (LQ data files)" maintainer="Juan RP " checksum=35a0e3c299ded3ee0e0b60cba94fed0ea844055972bb2e0a770497018a21711b @@ -22,12 +25,3 @@ do_install() { cp -a data ${DESTDIR}/usr/share/xonotic vinstall key_0.d0pk 644 usr/share/xonotic } - -xonotic-data-low_package() { - noarch="yes" - replaces="xonotic-data>=0" - provides="xonotic-data-${version}" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template index e59c893e93..5164422e8c 100644 --- a/srcpkgs/xonotic-data/template +++ b/srcpkgs/xonotic-data/template @@ -7,6 +7,8 @@ homepage="http://xonotic.org" license="GPL-2, GPL-3" distfiles="http://dl.xonotic.org/xonotic-${version}.zip" makedepends="unzip" +noarch="yes" +replaces="xonotic-data>=0" short_desc="A free, fast-paced crossplatform first-person shooter (data files)" maintainer="Juan RP " checksum=21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6 @@ -16,11 +18,3 @@ do_install() { cp -a data ${DESTDIR}/usr/share/xonotic vinstall key_0.d0pk 644 usr/share/xonotic } - -xonotic-data_package() { - noarch="yes" - replaces="xonotic-data>=0" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xonotic/template b/srcpkgs/xonotic/template index 7b568e4b0a..e59134d101 100644 --- a/srcpkgs/xonotic/template +++ b/srcpkgs/xonotic/template @@ -14,6 +14,7 @@ hostmakedepends="unzip automake libtool" makedepends="gmp-devel MesaLib-devel SDL-devel libcurl-devel alsa-lib-devel libmodplug-devel libvorbis-devel libXpm-devel libjpeg-turbo-devel xonotic-data>=${version}" +depends="desktop-file-utils xonotic-data>=${version}" do_build() { make ${makejobs} -C source/darkplaces CPUOPTIMIZATIONS="${CFLAGS}" \ @@ -48,10 +49,3 @@ do_install() { # Remove devel stuff rm -rf $DESTDIR/usr/include $DESTDIR/usr/lib/pkgconfig $DESTDIR/usr/lib/*.a } - -xonotic_package() { - depends="desktop-file-utils xonotic-data>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template index 99275de1f4..66dea87a81 100644 --- a/srcpkgs/xorg-apps/template +++ b/srcpkgs/xorg-apps/template @@ -11,6 +11,9 @@ makedepends="iceauth>=1.0.4 sessreg>=1.0.6 setxkbmap>=1.2.0 smproxy>=1.0.4 xlsatoms>=1.1.0 xlsclients>=1.1.1 xmodmap>=1.0.5 xpr>=1.0.3 xprop>=1.2.0 xrandr>=1.3.4 xrdb>=1.0.7 xrefresh>=1.0.4 xset>=1.2.1 xsetroot>=1.1.0 xvinfo>=1.1.1 xwd>=1.0.4 xwininfo>=1.1.1 xwud>=1.0.3 xinit>=1.1.1" +depends="${makedepends}" +noarch="yes" +replaces="xorg-server-utils>=0" short_desc="X.org applications" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -18,9 +21,3 @@ maintainer="Juan RP " long_desc=" This is the Xorg applications meta-package for installing various applications from the modular Xorg project." - -xorg-apps_package() { - depends="${makedepends}" - noarch="yes" - replaces="xorg-server-utils>=0" -} diff --git a/srcpkgs/xorg-fonts/template b/srcpkgs/xorg-fonts/template index 0a321ba111..a9841c856a 100644 --- a/srcpkgs/xorg-fonts/template +++ b/srcpkgs/xorg-fonts/template @@ -12,6 +12,8 @@ makedepends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3 font-daewoo-misc>=1.0.3 font-dec-misc>=1.0.3 font-ibm-type1>=1.0.3 font-isas-misc>=1.0.3 font-jis-misc>=1.0.3 font-misc-misc>=1.1.2 font-mutt-misc>=1.0.3 dejavu-fonts-ttf" +depends="${makedepends}" +noarch="yes" short_desc="Modular Xorg Fonts" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -19,8 +21,3 @@ maintainer="Juan RP " long_desc=" This is the modular Xorg font meta-package for installing the various font packages from the modular Xorg project." - -xorg-fonts_package() { - depends="${makedepends}" - noarch="yes" -} diff --git a/srcpkgs/xorg-input-drivers/template b/srcpkgs/xorg-input-drivers/template index 04e3ef153f..2034b5f89d 100644 --- a/srcpkgs/xorg-input-drivers/template +++ b/srcpkgs/xorg-input-drivers/template @@ -5,6 +5,8 @@ revision=2 build_style=meta makedepends="xf86-input-evdev>=2.5.0 xf86-input-synaptics>=1.3.0 xf86-input-vmmouse>=12.6.10 xf86-input-wacom>=0.14.0" +depends="${makedepends}" +noarch="yes" short_desc="X.org input drivers meta-package" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -12,8 +14,3 @@ maintainer="Juan RP " long_desc=" This is the Xorg meta-package for installing the various X.org xserver input drivers from the modular Xorg X11 project." - -xorg-input-drivers_package() { - depends="${makedepends}" - noarch="yes" -} diff --git a/srcpkgs/xorg-minimal/template b/srcpkgs/xorg-minimal/template index 72dbf7d7ae..c3e6fc419c 100644 --- a/srcpkgs/xorg-minimal/template +++ b/srcpkgs/xorg-minimal/template @@ -4,6 +4,8 @@ version=1.0 revision=1 build_style=meta makedepends="xorg-server xauth xinit xf86-input-evdev" +depends="${makedepends}" +noarch="yes" short_desc="Xorg meta-package including xorg-xserver and needed tools" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -11,8 +13,3 @@ maintainer="Ypnose " long_desc=" This is the modular Xorg server meta-package for installing X server and needed packages like xauth, xinit and evdev driver." - -xorg-minimal_package() { - depends="${makedepends}" - noarch="yes" -} diff --git a/srcpkgs/xorg-server/template b/srcpkgs/xorg-server/template index ab4b6837ec..cec2e2cc5d 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -27,6 +27,9 @@ makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0 libXfont-devel libXmu-devel libXrender-devel libXfixes-devel libXi-devel libXaw-devel libdrm-devel libXtst-devel libXres-devel libxkbui-devel libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel xkeyboard-config" +# See hw/xfree86/common/xf86Module.h. Only care for the major version. +depends="xkeyboard-config" +provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1" # Package build options build_options="opengl" @@ -57,7 +60,7 @@ post_install() { mv ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx.so \ ${DESTDIR}/usr/lib/xorg/modules/extensions/libglx-xorg.so fi -} + xorg-server-xnest_package() { short_desc="A nested X server that runs as an X application" @@ -100,12 +103,3 @@ xorg-server-devel_package() { vmove usr/share/aclocal } } - -xorg-server_package() { - # See hw/xfree86/common/xf86Module.h. Only care for the major version. - provides="xserver-abi-extension-7_1 xserver-abi-input-19_1 xserver-abi-video-14_1" - depends="xkeyboard-config" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template index cca05d1e05..bbda9a41f6 100644 --- a/srcpkgs/xorg-util-macros/template +++ b/srcpkgs/xorg-util-macros/template @@ -3,6 +3,7 @@ pkgname=xorg-util-macros version=1.18.0 revision=1 wrksrc="${pkgname/xorg-/}-${version}" +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" short_desc="Xorg autotool macros" @@ -11,10 +12,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/util/util-macros-$version.tar.bz2" checksum=e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b - -xorg-util-macros_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template index 7f63c2dcfb..64a48112d2 100644 --- a/srcpkgs/xorg-video-drivers/template +++ b/srcpkgs/xorg-video-drivers/template @@ -3,15 +3,11 @@ pkgname=xorg-video-drivers version=7.6 revision=10 build_style=meta +makedepends="xf86-video-ati>=7.0 xf86-video-intel>=2.20.13 + xf86-video-vesa>=1:2.3.2 xf86-video-nouveau>=1.0.4 + xf86-video-modesetting>=0.6.0" +depends="${makedepends}" short_desc="X.org video drivers meta-package" maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public domain" - -makedepends="xf86-video-ati>=7.0 xf86-video-intel>=2.20.13 - xf86-video-vesa>=1:2.3.2 xf86-video-nouveau>=1.0.4 - xf86-video-modesetting>=0.6.0" - -xorg-video-drivers_package() { - depends="${makedepends}" -} diff --git a/srcpkgs/xorg/template b/srcpkgs/xorg/template index 152b934e50..0c4de104ce 100644 --- a/srcpkgs/xorg/template +++ b/srcpkgs/xorg/template @@ -5,6 +5,8 @@ revision=2 build_style=meta makedepends="xorg-fonts>=7.6 xorg-server>=1.9.3 xorg-apps>=7.6 xorg-input-drivers>=7.6 xorg-video-drivers>=7.6" +depends="${makedepends}" +noarch="yes" short_desc="X.org meta-package" maintainer="Juan RP " homepage="http://xorg.freedesktop.org" @@ -12,8 +14,3 @@ license="MIT" long_desc=" This is the Xorg meta-package for installing the various X.org meta-packages (server, clients, fonts, etc) from the X.org project." - -xorg_package() { - noarch="yes" - depends="${makedepends}" -} diff --git a/srcpkgs/xorriso/template b/srcpkgs/xorriso/template index a3d2dc3b9e..757b4921e1 100644 --- a/srcpkgs/xorriso/template +++ b/srcpkgs/xorriso/template @@ -10,9 +10,3 @@ license="GPL-3" homepage="https://www.gnu.org/software/xorriso" distfiles="https://www.gnu.org/software/xorriso/xorriso-$version.tar.gz" checksum=9d64173bf9cc94ee7baf152a234ebadb28cbd0b6e7f714715dacf976e75e7d73 - -xorriso_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template index 514945a613..7a445330b5 100644 --- a/srcpkgs/xournal/template +++ b/srcpkgs/xournal/template @@ -7,6 +7,7 @@ make_install_args="desktop-install" hostmakedepends="autoconf automake pkg-config" makedepends="gtk+-devel libgnomecanvas-devel>=2.30.3_1 poppler-glib-devel zlib-devel ghostscript-devel" makedepends+=" hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils ghostscript" short_desc="Xournal: GPL Notetaking, sketching, and journal-keeping." maintainer="davehome " homepage="http://xournal.sourceforge.net/" @@ -24,10 +25,3 @@ long_desc=" overall functionality. Supports PDF import and export." - -xournal_package() { - depends="hicolor-icon-theme desktop-file-utils ghostscript" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xplanet/template b/srcpkgs/xplanet/template index 159ff39295..f9d1028454 100644 --- a/srcpkgs/xplanet/template +++ b/srcpkgs/xplanet/template @@ -12,9 +12,3 @@ license="GPL-2" homepage="http://xplanet.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=44fb742bb93e5661ea8b11ccabcc12896693e051f3dd5083c9227224c416b442 - -xplanet_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xpr/template b/srcpkgs/xpr/template index ea99def26a..c1513a9fde 100644 --- a/srcpkgs/xpr/template +++ b/srcpkgs/xpr/template @@ -16,9 +16,3 @@ long_desc=" it for output on PostScript printers, the Digital LN03 or LA100, the IBM PP3812 page printer, the HP LaserJet (or other PCL printers), or the HP PaintJet." - -xpr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xprop/template b/srcpkgs/xprop/template index 036667a133..6044376932 100644 --- a/srcpkgs/xprop/template +++ b/srcpkgs/xprop/template @@ -14,9 +14,3 @@ checksum=07907a189099b8a000406b5ca6c5346df238a9e1fe3b32dc59f48fe0ad12f1a3 long_desc=" This package provides xprop, a property displayer for X. This is from the modular X.org X11 project." - -xprop_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xproto/template b/srcpkgs/xproto/template index 7199918899..5408f1f33d 100644 --- a/srcpkgs/xproto/template +++ b/srcpkgs/xproto/template @@ -2,6 +2,7 @@ pkgname=xproto version=7.0.25 revision=1 +noarch="yes" build_style=gnu-configure short_desc="X protocol and ancillary headers from Xorg X11" homepage="http://xorg.freedesktop.org" @@ -9,10 +10,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=92247485dc4ffc3611384ba84136591923da857212a7dc29f4ad7797e13909fe - -xproto_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xrandr/template b/srcpkgs/xrandr/template index db899d670f..cf60f416da 100644 --- a/srcpkgs/xrandr/template +++ b/srcpkgs/xrandr/template @@ -11,9 +11,3 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50 - -xrandr_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template index 1681eaafce..b403b790eb 100644 --- a/srcpkgs/xrdb/template +++ b/srcpkgs/xrdb/template @@ -11,9 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b - -xrdb_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template index 4fff6c6ea9..1ec29f185b 100644 --- a/srcpkgs/xrefresh/template +++ b/srcpkgs/xrefresh/template @@ -12,11 +12,4 @@ maintainer="Juan RP " distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=069502eb485ea128a0bebf94302d5cbb271ad9d31ae51691abd6d64914ff9d7b long_desc=" - This package contains xrefresh, a program to repaint all or part - off a screen." - -xrefresh_package() { - pkg_install() { - vmove usr - } -} + This package contains xrefresh, a program to repaint all or part off a screen." diff --git a/srcpkgs/xsel/template b/srcpkgs/xsel/template index 7f255aa0a6..0f87fc5f48 100644 --- a/srcpkgs/xsel/template +++ b/srcpkgs/xsel/template @@ -11,9 +11,3 @@ maintainer="Steven R " homepage="http://www.vergenet.net/~conrad/software/xsel/" license="Custom" short_desc="Command-line program for getting and setting the contents of the X selection" - -xsel_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template index 8062e5f2c1..35577cb414 100644 --- a/srcpkgs/xset/template +++ b/srcpkgs/xset/template @@ -16,9 +16,3 @@ long_desc=" the X11 display and environment, such as the bell, key clicks, DPMS, font paths, keyboard LEDs, mouse pointer, pixel colors, keyboard autorepeat, and screen saver." - -xset_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xsetmode/template b/srcpkgs/xsetmode/template index ba411e0dd4..15636acf31 100644 --- a/srcpkgs/xsetmode/template +++ b/srcpkgs/xsetmode/template @@ -14,9 +14,3 @@ checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa long_desc=" The xsetmode program is used to switch XInput devices between absolute and relative positioning." - -xsetmode_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xsetroot/template b/srcpkgs/xsetroot/template index b635095d59..d592b8845a 100644 --- a/srcpkgs/xsetroot/template +++ b/srcpkgs/xsetroot/template @@ -14,9 +14,3 @@ checksum=88f13e949e7aea126239e5c9b3fe7bb7c2ecf70c70774ae41218789d9cfe5fad long_desc=" The xsetroot program is used to tailor the appearance of the background window of the X server." - -xsetroot_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xstow/template b/srcpkgs/xstow/template index 6b0a3ee7cc..43b1cfeb74 100644 --- a/srcpkgs/xstow/template +++ b/srcpkgs/xstow/template @@ -15,9 +15,3 @@ long_desc=" software packages, keeping them separate (/usr/local/stow/emacs vs. /usr/local/stow/perl, for example) while making them appear to be installed in the same place (/usr/local)." - -xstow_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template index 6fa38ab844..fa4a1d2dfb 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -18,9 +18,3 @@ homepage="http://invisible-island.net/xterm/" license="MIT/X11" distfiles="ftp://invisible-island.net/xterm/$pkgname-$version.tgz" checksum=81ae4e5efc9d5d3911a39c8ef2e2f883954764ac85ddfebeffa25c8ce7531ebf - -xterm_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xtrans/template b/srcpkgs/xtrans/template index 187c7f5eb3..ade76b78bb 100644 --- a/srcpkgs/xtrans/template +++ b/srcpkgs/xtrans/template @@ -2,6 +2,7 @@ pkgname=xtrans version=1.3.2 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config" short_desc="Network API translation layer to insulate X" @@ -10,10 +11,3 @@ license="MIT" maintainer="Juan RP " distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" checksum=94177c89b74f594bcddc6a12825e9b464e17ab1977de671d25f67a4ea922cb87 - -xtrans_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/xvidcore/template b/srcpkgs/xvidcore/template index 55acf1494a..8d6982bb52 100644 --- a/srcpkgs/xvidcore/template +++ b/srcpkgs/xvidcore/template @@ -28,15 +28,9 @@ post_install() { xvidcore-devel_package() { depends="xvidcore>=${version}" - short_desc="${short_desc} -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove "usr/lib/*.a" } } - -xvidcore_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template index a872c62823..67e1d2d547 100644 --- a/srcpkgs/xvinfo/template +++ b/srcpkgs/xvinfo/template @@ -14,9 +14,3 @@ checksum=60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985 long_desc=" This package provides xvinfo, a program to query the capability of the video adaptor accessible through the X-Video extension." - -xvinfo_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xwd/template b/srcpkgs/xwd/template index c189a964cb..eea0737aa9 100644 --- a/srcpkgs/xwd/template +++ b/srcpkgs/xwd/template @@ -16,9 +16,3 @@ long_desc=" store window images in a specially formatted dump file. This file can then be read by various other X utilities for redisplay, printing, editing, formatting, archiving, image processing, etc." - -xwd_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xwininfo/template b/srcpkgs/xwininfo/template index 5b35ca9646..7856f2b974 100644 --- a/srcpkgs/xwininfo/template +++ b/srcpkgs/xwininfo/template @@ -14,9 +14,3 @@ checksum=645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d long_desc=" This package provides xwininfo, a program to query the X server for information about windows." - -xwininfo_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xwud/template b/srcpkgs/xwud/template index ec21013d69..e6fc7f989f 100644 --- a/srcpkgs/xwud/template +++ b/srcpkgs/xwud/template @@ -15,9 +15,3 @@ long_desc=" Xwud is an X Window System image undumping utility. Xwud allows X users to display in a window an image saved in a specially formatted dump file, such as produced by xwd(1)." - -xwud_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/xz/template b/srcpkgs/xz/template index ffc7b697ce..b11c41c7f1 100644 --- a/srcpkgs/xz/template +++ b/srcpkgs/xz/template @@ -3,6 +3,7 @@ pkgname=xz version=5.0.5 revision=2 bootstrap=yes +replaces="chroot-xz>=0" build_style=gnu-configure short_desc="The XZ utilities" maintainer="Juan RP " @@ -30,10 +31,3 @@ liblzma-devel_package() { vmove usr/lib/pkgconfig } } - -xz_package() { - replaces="chroot-xz>=0" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/yajl/template b/srcpkgs/yajl/template index d4b79b87cd..960c9a3d78 100644 --- a/srcpkgs/yajl/template +++ b/srcpkgs/yajl/template @@ -13,7 +13,6 @@ long_desc=" YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. YAJL is released under the ISC license." - do_fetch() { git clone -b${version} git://github.com/lloyd/yajl.git yajl-${version} } @@ -33,9 +32,3 @@ yajl-devel_package() { vmove usr/include } } - -yajl_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/yasm/template b/srcpkgs/yasm/template index c5aec3cb94..ece1ace53b 100644 --- a/srcpkgs/yasm/template +++ b/srcpkgs/yasm/template @@ -22,9 +22,3 @@ post_install() { rm -rf ${DESTDIR}/usr/lib rm -rf ${DESTDIR}/usr/include } - -yasm_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/yelp-xsl/template b/srcpkgs/yelp-xsl/template index 9490c82825..cbcac81bcb 100644 --- a/srcpkgs/yelp-xsl/template +++ b/srcpkgs/yelp-xsl/template @@ -2,6 +2,7 @@ pkgname=yelp-xsl version=3.10.1 revision=1 +noarch="yes" build_style=gnu-configure hostmakedepends="pkg-config intltool itstool libxslt" makedepends="libxslt-devel" @@ -11,10 +12,3 @@ license="GPL-2" homepage="http://www.gnome.org" distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz" checksum=59c6dee3999121f6ffd33a9c5228316b75bc22e3bd68fff310beb4eeff245887 - -yelp-xsl_package() { - noarch="yes" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/yelp/template b/srcpkgs/yelp/template index 09a5304a2f..39b36e4218 100644 --- a/srcpkgs/yelp/template +++ b/srcpkgs/yelp/template @@ -8,6 +8,8 @@ hostmakedepends="pkg-config intltool itstool" makedepends="bzip2-devel liblzma-devel sqlite-devel libgpg-error-devel libgcrypt-devel libxslt-devel libsoup-devel>=2.44 webkitgtk-devel>=2.1 yelp-xsl>=${version}" +depends="libsoup>=2.44 webkitgtk>=2.1 dconf>=0.18 hicolor-icon-theme + desktop-file-utils yelp-xsl>=${version}" short_desc="Help browser for GNOME desktop" maintainer="Juan RP " homepage="http://www.gnome.org" @@ -24,10 +26,3 @@ yelp-devel_package() { vmove "usr/lib/*.so" } } - -yelp_package() { - depends="libsoup>=2.44 webkitgtk>=2.1 dconf>=0.18 hicolor-icon-theme desktop-file-utils yelp-xsl>=${version}" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/youtube-dl/template b/srcpkgs/youtube-dl/template index 2811beda1e..135d611423 100644 --- a/srcpkgs/youtube-dl/template +++ b/srcpkgs/youtube-dl/template @@ -4,6 +4,8 @@ version=2013.12.23.4 revision=1 wrksrc="${pkgname}" makedepends="python" +depends="python" +noarch="yes" short_desc="Tool to download youtube videos" maintainer="pancake " license="Public Domain" @@ -16,11 +18,3 @@ do_install() { vinstall ${pkgname}.1 644 usr/share/man/man1 vinstall ${pkgname}.bash-completion 644 usr/share/bash-completion/completions ${pkgname} } - -youtube-dl_package() { - noarch="yes" - depends="python" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/zd1211-firmware/template b/srcpkgs/zd1211-firmware/template index 2d48680250..f55a257b87 100644 --- a/srcpkgs/zd1211-firmware/template +++ b/srcpkgs/zd1211-firmware/template @@ -3,6 +3,7 @@ pkgname=zd1211-firmware version=1.4 revision=3 wrksrc=${pkgname} +noarch="yes" short_desc="Firmware for the Zydas 1211 wifi cards" maintainer="Juan RP " homepage="http://zd1211.wiki.sourceforge.net/" @@ -14,10 +15,3 @@ do_install() { vmkdir usr/lib/firmware/zd1211 install -m644 zd1211* ${DESTDIR}/usr/lib/firmware/zd1211 } - -zd1211-firmware_package() { - noarch="yes" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zeitgeist/template b/srcpkgs/zeitgeist/template index 5278cdcc9b..cb87881505 100644 --- a/srcpkgs/zeitgeist/template +++ b/srcpkgs/zeitgeist/template @@ -8,6 +8,8 @@ makedepends=" json-glib-devel>=0.16.2 gtk+3-devel telepathy-glib-devel pygobject-devel>=3.10 vala-devel dbus-devel raptor xapian-core-devel python-rdflib" +depends="python>=2.7<3 dbus-python pygobject>=3.10" +pycompile_module="zeitgeist" short_desc="logs the users’ activities and events" maintainer="Juan RP " homepage="http://zeitgeist-project.com" @@ -44,11 +46,3 @@ zeitgeist-devel_package() { vmove usr/share/gir-1.0 } } - -zeitgeist_package() { - pycompile_module="zeitgeist" - depends="python>=2.7<3 dbus-python pygobject>=3.10" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/zenity/template b/srcpkgs/zenity/template index 1f50f76474..5c1d2acd5f 100644 --- a/srcpkgs/zenity/template +++ b/srcpkgs/zenity/template @@ -16,9 +16,3 @@ long_desc=" which allows you to display dialog boxes from the command line and shell scripts. If you understand, things are just as they are. If you don't understand, things are just as they are." - -zenity_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zerofree/template b/srcpkgs/zerofree/template index 35b708819b..b85ca5c0a6 100644 --- a/srcpkgs/zerofree/template +++ b/srcpkgs/zerofree/template @@ -2,6 +2,7 @@ pkgname=zerofree version=1.0.3 revision=2 +makedepends="e2fsprogs-devel" short_desc="A tool to zero free blocks in an ext2 filesystem" maintainer="Juan RP " license="GPL-2" @@ -12,8 +13,6 @@ long_desc=" zerofree is a tool to zero free blocks in an ext2 filesystems; ext3 and ext4 filesystems are also supported." -makedepends="e2fsprogs-devel" - do_build() { make } @@ -21,9 +20,3 @@ do_build() { do_install() { vinstall zerofree 755 usr/sbin } - -zerofree_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template index 4aecf085e8..a76980cfb8 100644 --- a/srcpkgs/zeroinstall-injector/template +++ b/srcpkgs/zeroinstall-injector/template @@ -2,9 +2,12 @@ pkgname=zeroinstall-injector version=2.3.3 revision=2 +noarch=yes wrksrc="0install-${version}" build_style=python-module makedepends="python gnupg dbus-python pygtk desktop-file-utils hicolor-icon-theme xdg-utils" +depends="${makedepends}" +pycompile_module="zeroinstall" short_desc="A cross-distribution software installation system" maintainer="Juan RP " license="LGPL-2.1" @@ -15,12 +18,3 @@ checksum=80fbd8cd6144f1bda32415201c8978297a3ac95304e7fc73c1cc02eb8d1aca5e pre_configure() { sed -i "s|man/|share/&|" setup.py } - -zeroinstall-injector_package() { - pycompile_module="zeroinstall" - depends="${makedepends}" - noarch=yes - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/zeromq/template b/srcpkgs/zeromq/template index 0f1ab8e8b1..c9995a266c 100644 --- a/srcpkgs/zeromq/template +++ b/srcpkgs/zeromq/template @@ -27,9 +27,3 @@ zeromq-devel_package() { vmove "usr/lib/*.so" } } - -zeromq_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/zip/template b/srcpkgs/zip/template index a9cf8f712b..1ce1ca12f4 100644 --- a/srcpkgs/zip/template +++ b/srcpkgs/zip/template @@ -17,9 +17,3 @@ long_desc=" PKZIP 2.04g (Phil Katz ZIP) for MSDOS systems. There is a companion to zip called unzip (of course) which you should be able to find the same place you got zip." - -zip_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zisofs-tools/template b/srcpkgs/zisofs-tools/template index 49acd429c7..bd198fc741 100644 --- a/srcpkgs/zisofs-tools/template +++ b/srcpkgs/zisofs-tools/template @@ -21,9 +21,3 @@ long_desc=" do_install() { make INSTALLROOT=${DESTDIR} install } - -zisofs-tools_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index 2231e36d4b..8fdd28b00f 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -30,9 +30,3 @@ zlib-devel_package() { vmove usr/share } } - -zlib_package() { - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/zlib32/template b/srcpkgs/zlib32/template index ed5dc74fd5..a887db4dbe 100644 --- a/srcpkgs/zlib32/template +++ b/srcpkgs/zlib32/template @@ -21,6 +21,9 @@ long_desc=" This package installs the 32 bit libraries for x86_64 systems." only_for_archs=x86_64 +nostrip=yes +noverifyrdeps=yes +depends="glibc32" do_install() { for f in ${distfiles}; do @@ -35,17 +38,8 @@ do_install() { zlib32-devel_package() { depends="glibc32-devel zlib32>=${version}" nostrip=yes - short_desc="${short_desc} - development files" + short_desc+=" - development files" pkg_install() { vmove usr/lib32/libz.a } } - -zlib32_package() { - depends="glibc32" - nostrip=yes - noverifyrdeps=yes - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zope.interface/template b/srcpkgs/zope.interface/template index 0557b34b46..35439e7ba0 100644 --- a/srcpkgs/zope.interface/template +++ b/srcpkgs/zope.interface/template @@ -5,16 +5,10 @@ revision=2 build_style=python-module hostmakedepends="python-distribute" makedepends="python-devel" +pycompile_module="zope/interface" short_desc="zope.interface package from Zope 3" maintainer="Juan RP " homepage="http://pypi.python.org/pypi/zope.interface" license="ZPL" distfiles="http://pypi.python.org/packages/source/z/${pkgname}/${pkgname}-${version}.tar.gz" checksum=b9f4b92c91ac4defbf0269ec891c3528110224259019b009a24d50e0ebebe9c9 - -zope.interface_package() { - pycompile_module="zope/interface" - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zsh/template b/srcpkgs/zsh/template index 1d636be666..0ff80185d5 100644 --- a/srcpkgs/zsh/template +++ b/srcpkgs/zsh/template @@ -14,6 +14,7 @@ configure_args="--enable-etcdir=/etc/zsh --enable-zshenv=/etc/zsh/zshenv --enable-multibyte --enable-cap --with-tcsetpgrp" hostmakedepends="pcre-devel>=8.30" makedepends="gdbm-devel pcre-devel>=8.30 libcap-devel ncurses-devel" +register_shell="/bin/zsh" short_desc="The Z SHell" maintainer="Juan RP " homepage="http://www.zsh.org" @@ -38,10 +39,3 @@ pre_configure() { post_install() { vinstall LICENCE 644 usr/share/licenses/zsh } - -zsh_package() { - register_shell="/bin/zsh" - pkg_install() { - vmove all - } -} diff --git a/srcpkgs/zsync/template b/srcpkgs/zsync/template index cba332e9e2..c8fdf8e4b3 100644 --- a/srcpkgs/zsync/template +++ b/srcpkgs/zsync/template @@ -18,9 +18,3 @@ long_desc=" a control file (.zsync file) that describes the file to be downloaded, which it uses to determine the blocks to fetch. This file is created once on the server (and not for each request) and sits next to actual file to download." - -zsync_package() { - pkg_install() { - vmove usr - } -} diff --git a/srcpkgs/zziplib/template b/srcpkgs/zziplib/template index a4dd82b815..02c8d3f79c 100644 --- a/srcpkgs/zziplib/template +++ b/srcpkgs/zziplib/template @@ -29,9 +29,3 @@ zziplib-devel_package() { vmove usr/share } } - -zziplib_package() { - pkg_install() { - vmove usr - } -}