From e85691880ca2c8aff3b93b6f4ad52b1a05a21191 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 12 Apr 2013 09:01:46 +0200 Subject: [PATCH] Convert package to the new template format (C-W range). --- srcpkgs/Cython/template | 12 +- srcpkgs/GConf/GConf-devel.template | 18 -- srcpkgs/GConf/template | 31 +++- srcpkgs/ISOEnts/template | 19 ++- srcpkgs/Ice/Ice-devel.template | 12 -- srcpkgs/Ice/libIce.template | 10 -- srcpkgs/Ice/template | 24 ++- srcpkgs/ImageMagick/libmagick-devel.template | 17 -- srcpkgs/ImageMagick/libmagick-perl.template | 12 -- srcpkgs/ImageMagick/libmagick.template | 15 -- srcpkgs/ImageMagick/template | 69 ++++++-- srcpkgs/LuaJIT/LuaJIT-devel.template | 15 -- srcpkgs/LuaJIT/template | 24 ++- srcpkgs/MesaLib/MesaLib-devel.template | 15 -- srcpkgs/MesaLib/libEGL.template | 8 - srcpkgs/MesaLib/libGL.template | 10 -- srcpkgs/MesaLib/libGLES.template | 8 - srcpkgs/MesaLib/libOSMesa.template | 8 - srcpkgs/MesaLib/libOpenVG.template | 8 - srcpkgs/MesaLib/libgbm.template | 9 - srcpkgs/MesaLib/libglapi.template | 8 - srcpkgs/MesaLib/libwayland-egl.template | 8 - srcpkgs/MesaLib/mesa-ati-dri.template | 13 -- srcpkgs/MesaLib/mesa-intel-dri.template | 7 - srcpkgs/MesaLib/mesa-nouveau-dri.template | 11 -- srcpkgs/MesaLib/mesa-swraster-dri.template | 11 -- srcpkgs/MesaLib/mesa-vmwgfx-dri.template | 9 - srcpkgs/MesaLib/template | 154 +++++++++++++++++- srcpkgs/MoinMoin/template | 13 +- .../NetworkManager-devel.template | 11 -- srcpkgs/NetworkManager/libnm.template | 9 - srcpkgs/NetworkManager/template | 45 +++-- srcpkgs/ORBit2/ORBit2-devel.template | 18 -- srcpkgs/ORBit2/libORBit2.template | 15 -- srcpkgs/ORBit2/template | 36 +++- srcpkgs/Pyrex/template | 15 +- srcpkgs/SDL/SDL-devel.template | 25 --- srcpkgs/SDL/template | 76 ++++++++- srcpkgs/SDL/template.options | 47 ------ srcpkgs/SDL_image/SDL_image-devel.template | 13 -- srcpkgs/SDL_image/template | 22 ++- srcpkgs/SDL_mixer/SDL_mixer-devel.template | 13 -- srcpkgs/SDL_mixer/template | 22 ++- srcpkgs/SDL_net/SDL_net-devel.template | 14 -- srcpkgs/SDL_net/template | 21 ++- srcpkgs/SDL_sound/SDL_sound-devel.template | 12 -- srcpkgs/SDL_sound/template | 26 ++- srcpkgs/SDL_ttf/SDL_ttf-devel.template | 13 -- srcpkgs/SDL_ttf/template | 21 ++- srcpkgs/Thunar/Thunar-devel.template | 11 -- srcpkgs/Thunar/template | 24 ++- srcpkgs/Twisted/template | 12 +- .../WindowMaker/WindowMaker-devel.template | 10 -- srcpkgs/WindowMaker/template | 34 ++-- 54 files changed, 587 insertions(+), 556 deletions(-) delete mode 100644 srcpkgs/GConf/GConf-devel.template delete mode 100644 srcpkgs/Ice/Ice-devel.template delete mode 100644 srcpkgs/Ice/libIce.template delete mode 100644 srcpkgs/ImageMagick/libmagick-devel.template delete mode 100644 srcpkgs/ImageMagick/libmagick-perl.template delete mode 100644 srcpkgs/ImageMagick/libmagick.template delete mode 100644 srcpkgs/LuaJIT/LuaJIT-devel.template delete mode 100644 srcpkgs/MesaLib/MesaLib-devel.template delete mode 100644 srcpkgs/MesaLib/libEGL.template delete mode 100644 srcpkgs/MesaLib/libGL.template delete mode 100644 srcpkgs/MesaLib/libGLES.template delete mode 100644 srcpkgs/MesaLib/libOSMesa.template delete mode 100644 srcpkgs/MesaLib/libOpenVG.template delete mode 100644 srcpkgs/MesaLib/libgbm.template delete mode 100644 srcpkgs/MesaLib/libglapi.template delete mode 100644 srcpkgs/MesaLib/libwayland-egl.template delete mode 100644 srcpkgs/MesaLib/mesa-ati-dri.template delete mode 100644 srcpkgs/MesaLib/mesa-intel-dri.template delete mode 100644 srcpkgs/MesaLib/mesa-nouveau-dri.template delete mode 100644 srcpkgs/MesaLib/mesa-swraster-dri.template delete mode 100644 srcpkgs/MesaLib/mesa-vmwgfx-dri.template delete mode 100644 srcpkgs/NetworkManager/NetworkManager-devel.template delete mode 100644 srcpkgs/NetworkManager/libnm.template delete mode 100644 srcpkgs/ORBit2/ORBit2-devel.template delete mode 100644 srcpkgs/ORBit2/libORBit2.template delete mode 100644 srcpkgs/SDL/SDL-devel.template delete mode 100644 srcpkgs/SDL/template.options delete mode 100644 srcpkgs/SDL_image/SDL_image-devel.template delete mode 100644 srcpkgs/SDL_mixer/SDL_mixer-devel.template delete mode 100644 srcpkgs/SDL_net/SDL_net-devel.template delete mode 100644 srcpkgs/SDL_sound/SDL_sound-devel.template delete mode 100644 srcpkgs/SDL_ttf/SDL_ttf-devel.template delete mode 100644 srcpkgs/Thunar/Thunar-devel.template delete mode 100644 srcpkgs/WindowMaker/WindowMaker-devel.template diff --git a/srcpkgs/Cython/template b/srcpkgs/Cython/template index a8993bbcd56..4f6b49f9f41 100644 --- a/srcpkgs/Cython/template +++ b/srcpkgs/Cython/template @@ -3,12 +3,18 @@ pkgname=Cython version=0.17.3 revision=1 build_style=python-module -pycompile_module="pyximport Cython cython.py" -makedepends="python-devel" -fulldepends="Pyrex" +makedepends="python-devel Pyrex" short_desc="C-Extensions for Python" maintainer="Juan RP " homepage="http://cython.org" license="Apache-2.0" distfiles="http://www.cython.org/release/${pkgname}-${version}.tar.gz" checksum=2c9f2c2af9aa0519588bf941c9961a59bb8f57ee7f798db878494d1a21c07ece + +Cython_package() { + depends="Pyrex" + pycompile_module="pyximport Cython cython.py" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/GConf/GConf-devel.template b/srcpkgs/GConf/GConf-devel.template deleted file mode 100644 index fa6ebcd6966..00000000000 --- a/srcpkgs/GConf/GConf-devel.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'GConf-devel'. -# -noarch=yes -depends="glib-devel dbus-devel GConf>=${version}" -short_desc="${sourcepkg} development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gir-1.0 usr/share - vmove usr/share/sgml usr/share - vmove usr/share/aclocal usr/share - vmove usr/share/gtk-doc usr/share - - # Install gconf-merge-schema - vinstall ${FILESDIR}/gconf-merge-schema.sh \ - 755 usr/bin gconf-merge-schema -} diff --git a/srcpkgs/GConf/template b/srcpkgs/GConf/template index da6402eff8b..5643468e300 100644 --- a/srcpkgs/GConf/template +++ b/srcpkgs/GConf/template @@ -1,12 +1,12 @@ # Template file for 'GConf' pkgname=GConf version=3.2.6 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-openldap --enable-gtk --enable-defaults-service --disable-orbit --enable-gsettings-backend --disable-static" -makedepends="pkg-config intltool gobject-introspection gtk+3-devel - dbus-glib-devel polkit-devel libxml2-devel" +hostmakedepends="pkg-config intltool gobject-introspection" +makedepends="gtk+3-devel dbus-glib-devel polkit-devel libxml2-devel" short_desc="A process-transparent configuration system" maintainer="Juan RP " homepage="http://projects.gnome.org/gconf" @@ -14,9 +14,6 @@ license="GPL-2" distfiles="${GNOME_SITE}/GConf/3.2/GConf-${version}.tar.xz" checksum=1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c -conf_files="/etc/gconf/2/path" -subpackages="${pkgname}-devel" - post_install() { # Create GCONF_SCHEMAS_DIR vmkdir usr/share/gconf/schemas @@ -27,3 +24,25 @@ post_install() { touch -f ${DESTDIR}/etc/gconf/gconf.xml.${d}/.empty_on_purpose done } + +GConf-devel_package() { + depends="glib-devel dbus-devel GConf>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + vmove usr/share/sgml usr/share + vmove usr/share/aclocal usr/share + vmove usr/share/gtk-doc usr/share + # Install gconf-merge-schema + vinstall ${FILESDIR}/gconf-merge-schema.sh 755 usr/bin gconf-merge-schema + } +} + +GConf_package() { + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/ISOEnts/template b/srcpkgs/ISOEnts/template index 75e9cbacaa0..5a1042c4df1 100644 --- a/srcpkgs/ISOEnts/template +++ b/srcpkgs/ISOEnts/template @@ -1,14 +1,14 @@ # Template file for 'ISOEnts' pkgname=ISOEnts version=1986 -distfiles="http://www.oasis-open.org/cover/${pkgname}.zip" -makedepends="bsdtar" -fulldepends="xmlcatmgr" revision=1 +noextract=yes +hostmakedepends="bsdtar xmlcatmgr" short_desc="Character entity sets from ISO 8879:1986 (SGML)" maintainer="Juan RP " homepage="http://www.oasis-open.org" license="Public domain" +distfiles="http://www.oasis-open.org/cover/${pkgname}.zip" checksum=dce4359a3996ed2fd33ad5eaa11a9bcfc24b5b06992e24295132b06db19a99b2 long_desc=" Nineteen ISO 8879:1986 character entity sets used by many DTDs: @@ -32,11 +32,6 @@ long_desc=" Publishing Russian Cyrillic" -noarch=yes -noextract=yes - -export sgml_entries="CATALOG /usr/share/sgml/iso8879/catalog --" - do_install() { local dir=${DESTDIR}/usr/share/sgml/iso8879 @@ -44,3 +39,11 @@ do_install() { bsdtar xf ${XBPS_SRCDISTDIR}/${pkgname}.zip -C ${dir} install -m644 ${FILESDIR}/catalog ${dir} } + +ISOEnts_package() { + noarch="yes" + sgml_entries="CATALOG /usr/share/sgml/iso8879/catalog --" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/Ice/Ice-devel.template b/srcpkgs/Ice/Ice-devel.template deleted file mode 100644 index 841ed559c13..00000000000 --- a/srcpkgs/Ice/Ice-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'Ice-devel'. -# -noarch=yes -depends="libIce>=$version Ice>=$version" -short_desc="${short_desc} (Development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/Ice/libIce.template b/srcpkgs/Ice/libIce.template deleted file mode 100644 index f47cfd86fa3..00000000000 --- a/srcpkgs/Ice/libIce.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libIce'. -# -short_desc="${short_desc} Runtime libraries" -long_desc="${long_desc} - - This package contains the Ice runtime libraries." - -do_install() { - vmove usr/lib usr -} diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 8699cc90160..12e931209c9 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,10 +1,9 @@ # Template file for 'Ice' pkgname=Ice version=3.4.2 -revision=7 +revision=8 build_wrksrc=cpp homepage="http://www.zeroc.com" -subpackages="lib$pkgname $pkgname-devel" # XXX: other language bindings makedepends="mcpp-devel db-devel expat-devel openssl-devel" short_desc="The Internet Communications Engine (Ice)" @@ -51,3 +50,24 @@ do_install() { # remove unused cruft rm -f ${DESTDIR}/usr/lib/*.class } + +libIce_package() { + short_desc+=" - Runtime libraries" + pkg_install() { + vmove usr/lib + } +} + +Ice-devel_package() { + depends="libIce>=$version Ice>=$version" + short_desc+=" - Development files" + pkg_install() { + vmove usr/include usr + } +} + +Ice_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/ImageMagick/libmagick-devel.template b/srcpkgs/ImageMagick/libmagick-devel.template deleted file mode 100644 index 302d63ab817..00000000000 --- a/srcpkgs/ImageMagick/libmagick-devel.template +++ /dev/null @@ -1,17 +0,0 @@ -# Template file for 'libmagick-devel'. -# -noarch=yes -depends="libmagick>=${version}" -short_desc="ImageMagick low-level image manipulation development files" -long_desc="${long_desc} - - This package contains headers and other related development files - with MagickCore." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/bin/*-config" usr/bin - vmove usr/share/doc usr/share - vmove "usr/share/man/man1/*-config.1" usr/share/man/man1 -} diff --git a/srcpkgs/ImageMagick/libmagick-perl.template b/srcpkgs/ImageMagick/libmagick-perl.template deleted file mode 100644 index e5f45967386..00000000000 --- a/srcpkgs/ImageMagick/libmagick-perl.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libmagick-perl'. -# -depends="perl>=5.16" -short_desc="ImageMagick perl library bindings" -long_desc="${long_desc} - - This package contains the perl bindings for libmagick." - -do_install() { - vmove usr/lib/perl5 usr/lib - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/ImageMagick/libmagick.template b/srcpkgs/ImageMagick/libmagick.template deleted file mode 100644 index 13bf2a92b39..00000000000 --- a/srcpkgs/ImageMagick/libmagick.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'libmagick'. -# -short_desc="ImageMagick low-level image manipulation libraries" -long_desc="${long_desc} - - This package contains the C libraries needed to run executables - that make use of MagickCore." - -replaces="ImageMagick<6.5.9" - -do_install() { - vmove "usr/lib/libMagick*.so*" usr/lib - vmove "usr/lib/ImageMagick*" usr/lib - vmove "usr/share/ImageMagick*" usr/share -} diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 8df1afb1e70..838604714b4 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -3,7 +3,7 @@ pkgname=ImageMagick _majorver=6.8.0 _patchver=7 version=${_majorver}.${_patchver} -revision=2 +revision=3 wrksrc=${pkgname}-${_majorver}-${_patchver} build_style=gnu-configure configure_args="--without-jp2 --without-autotrace --with-wmf=yes @@ -18,23 +18,7 @@ license="${pkgname}, MIT" distfiles="http://ftp.nluug.nl/${pkgname}/${pkgname}-${_majorver}-${_patchver}.tar.xz" checksum=e15672c8c11148bcfcd95885e1cd7a5575d4a6984bdf0a3a1c718a2a6ad37435 -conf_files=" -/etc/ImageMagick/coder.xml -/etc/ImageMagick/colors.xml -/etc/ImageMagick/delegates.xml -/etc/ImageMagick/log.xml -/etc/ImageMagick/magic.xml -/etc/ImageMagick/mime.xml -/etc/ImageMagick/policy.xml -/etc/ImageMagick/sRGB.icc -/etc/ImageMagick/thresholds.xml -/etc/ImageMagick/type.xml -/etc/ImageMagick/type-dejavu.xml -/etc/ImageMagick/type-ghostscript.xml -/etc/ImageMagick/type-windows.xml" - keep_libtool_archives=yes -subpackages="libmagick libmagick-devel libmagick-perl" makedepends="pkg-config perl>=5.16 libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel lcms2-devel freetype-devel libwebp-devel>=0.2.0 fontconfig-devel libXext-devel @@ -46,3 +30,54 @@ post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} vinstall NOTICE 644 usr/share/licenses/${pkgname} } + +libmagick_package() { + short_desc="ImageMagick low-level image manipulation libraries" + replaces="ImageMagick<6.5.9" + pkg_install() { + vmove "usr/lib/libMagick*.so*" + vmove "usr/lib/ImageMagick*" + vmove "usr/share/ImageMagick*" + } +} + +libmagick-devel_package() { + depends="libmagick>=${version}" + short_desc="ImageMagick low-level image manipulation development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/bin/*-config" + vmove usr/share/doc + vmove "usr/share/man/man1/*-config.1" + } +} + +libmagick-perl_package() { + depends="perl>=5.16" + short_desc="ImageMagick perl library bindings" + pkg_install() { + vmove usr/lib/perl5 + vmove usr/share/man/man3 + } +} + +ImageMagick_package() { + conf_files=" + /etc/ImageMagick/coder.xml + /etc/ImageMagick/colors.xml + /etc/ImageMagick/delegates.xml + /etc/ImageMagick/log.xml + /etc/ImageMagick/magic.xml + /etc/ImageMagick/mime.xml + /etc/ImageMagick/policy.xml + /etc/ImageMagick/sRGB.icc + /etc/ImageMagick/thresholds.xml + /etc/ImageMagick/type.xml + /etc/ImageMagick/type-dejavu.xml + /etc/ImageMagick/type-ghostscript.xml + /etc/ImageMagick/type-windows.xml" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/LuaJIT/LuaJIT-devel.template b/srcpkgs/LuaJIT/LuaJIT-devel.template deleted file mode 100644 index 53be85eff0e..00000000000 --- a/srcpkgs/LuaJIT/LuaJIT-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'lua-devel'. -# -depends="LuaJIT" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() -{ - vmove usr/share/luajit-$version usr/share - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*" usr/lib -} diff --git a/srcpkgs/LuaJIT/template b/srcpkgs/LuaJIT/template index d128e291999..7eb8de1292c 100644 --- a/srcpkgs/LuaJIT/template +++ b/srcpkgs/LuaJIT/template @@ -1,24 +1,40 @@ # Template file for 'LuaJIT' pkgname=LuaJIT version=2.0.0 -distfiles="http://luajit.org/download/$pkgname-$version.tar.gz" revision=1 short_desc="a Just-In-Time Compiler for Lua" maintainer="pancake " homepage="http://www.luajit.org" license="MIT" +distfiles="http://luajit.org/download/$pkgname-$version.tar.gz" checksum=deaed645c4a093c5fb250c30c9933c9131ee05c94b13262d58f6e0b60b338c15 long_desc=" LuaJIT is a Just-In-Time Compiler (JIT) for the Lua programming language. Lua is a powerful, dynamic and light-weight programming language. It may be embedded or used as a general-purpose, stand-alone language." -subpackages="LuaJIT-devel" - do_build() { make PREFIX=/usr ${makejobs} } do_install() { - make DPREFIX=${DESTDIR}/usr DESTDIR=${DESTDIR} INSTALL_SHARE=${DESTDIR}/usr/share PREFIX=/usr install + make DPREFIX=${DESTDIR}/usr DESTDIR=${DESTDIR} \ + INSTALL_SHARE=${DESTDIR}/usr/share PREFIX=/usr install +} + +LuaJIT-devel_package() { + depends="LuaJIT>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/share/luajit-$version + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*" + } +} + +LuaJIT_package() { + pkg_install() { + vmove usr + } } diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template deleted file mode 100644 index acb16fd2bf5..00000000000 --- a/srcpkgs/MesaLib/MesaLib-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'MesaLib-devel'. -# -noarch=yes -depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel - libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel - libGL-${version}_${revision} libOpenVG-${version}_${revision} - libGLES-${version}_${revision} libEGL-${version}_${revision} - libOSMesa-${version}_${revision} libgbm-${version}_${revision} - libwayland-egl-${version}_${revision} ${sourcepkg}-${version}_${revision}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/MesaLib/libEGL.template b/srcpkgs/MesaLib/libEGL.template deleted file mode 100644 index 12ed6f9b94d..00000000000 --- a/srcpkgs/MesaLib/libEGL.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libEGL'. -# -short_desc="Free implementation of the EGL API - runtime" -replaces="MesaLib<7.11_2" - -do_install() { - vmove "usr/lib/libEGL*.so*" usr/lib -} diff --git a/srcpkgs/MesaLib/libGL.template b/srcpkgs/MesaLib/libGL.template deleted file mode 100644 index 1a53f5d24a6..00000000000 --- a/srcpkgs/MesaLib/libGL.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libGL'. -# -short_desc="Free implementation of the OpenGL API - GLX runtime" -replaces="MesaLib<7.11_2" - -do_install() { - vmove "usr/lib/libGL.so*" usr/lib - rm -f ${DESTDIR}/usr/lib/libGL.so{,.1} - mv ${DESTDIR}/usr/lib/libGL.so.1.2.0 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2.0 -} diff --git a/srcpkgs/MesaLib/libGLES.template b/srcpkgs/MesaLib/libGLES.template deleted file mode 100644 index 6d62a73607c..00000000000 --- a/srcpkgs/MesaLib/libGLES.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libGLES'. -# -short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API" -replaces="MesaLib<7.11_2" - -do_install() { - vmove "usr/lib/libGLES*.so*" usr/lib -} diff --git a/srcpkgs/MesaLib/libOSMesa.template b/srcpkgs/MesaLib/libOSMesa.template deleted file mode 100644 index bc2be6a380a..00000000000 --- a/srcpkgs/MesaLib/libOSMesa.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libOSMesa'. -# -short_desc="Mesa Off-Screen interface library" -replaces="MesaLib<7.11_2" - -do_install() { - vmove "usr/lib/libOSMesa.so*" usr/lib -} diff --git a/srcpkgs/MesaLib/libOpenVG.template b/srcpkgs/MesaLib/libOpenVG.template deleted file mode 100644 index 50ce64cca2b..00000000000 --- a/srcpkgs/MesaLib/libOpenVG.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libOpenVG'. -# -short_desc="Free implementation of the OpenVG API - runtime" -replaces="MesaLib<7.11_2" - -do_install() { - vmove "usr/lib/libOpenVG.so*" usr/lib -} diff --git a/srcpkgs/MesaLib/libgbm.template b/srcpkgs/MesaLib/libgbm.template deleted file mode 100644 index 3db9a2c031a..00000000000 --- a/srcpkgs/MesaLib/libgbm.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libgbm'. -# -short_desc="generic buffer management API -- runtime" -replaces="MesaLib<9.0.2" - -do_install() { - vmove "usr/lib/libgbm.so*" usr/lib - vmove usr/lib/gbm/gbm_gallium_drm.so usr/lib/gbm -} diff --git a/srcpkgs/MesaLib/libglapi.template b/srcpkgs/MesaLib/libglapi.template deleted file mode 100644 index 1cd515703ac..00000000000 --- a/srcpkgs/MesaLib/libglapi.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libglapi'. -# -short_desc="Free implementation of the GL API - shared library" -replaces="MesaLib<7.11_2" - -do_install() { - vmove "usr/lib/libglapi.so*" usr/lib -} diff --git a/srcpkgs/MesaLib/libwayland-egl.template b/srcpkgs/MesaLib/libwayland-egl.template deleted file mode 100644 index dbb6a643b47..00000000000 --- a/srcpkgs/MesaLib/libwayland-egl.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libwayland-egl'. -# -short_desc="Free implementation of the EGL API - wayland runtime" - -do_install() { - vmove "usr/lib/libwayland-egl.*" usr/lib - vmove usr/lib/egl usr/lib -} diff --git a/srcpkgs/MesaLib/mesa-ati-dri.template b/srcpkgs/MesaLib/mesa-ati-dri.template deleted file mode 100644 index bd50028353a..00000000000 --- a/srcpkgs/MesaLib/mesa-ati-dri.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'mesa-ati-dri'. -# -short_desc="Mesa DRI drivers for ATI GPUs" -replaces="MesaLib<9.0.2" - -do_install() { - vmove "usr/lib/libXvMCr[36]00.so*" usr/lib - vmove "usr/lib/vdpau/libvdpau_r[36]00.so*" usr/lib/vdpau - #vmove "usr/lib/vdpau/libvdpau_radeon*.so*" usr/lib/vdpau - vmove "usr/lib/xorg/modules/dri/radeon*" usr/lib/xorg/modules/dri - vmove "usr/lib/xorg/modules/dri/r[236]00*" usr/lib/xorg/modules/dri - vmove "usr/lib/gallium-pipe/pipe_r[36]00.so" usr/lib/gallium-pipe -} diff --git a/srcpkgs/MesaLib/mesa-intel-dri.template b/srcpkgs/MesaLib/mesa-intel-dri.template deleted file mode 100644 index 29538ae9dec..00000000000 --- a/srcpkgs/MesaLib/mesa-intel-dri.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'mesa-intel-dri'. -# -short_desc="Mesa DRI drivers for Intel GPUs" - -do_install() { - vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*" usr/lib/xorg/modules/dri -} diff --git a/srcpkgs/MesaLib/mesa-nouveau-dri.template b/srcpkgs/MesaLib/mesa-nouveau-dri.template deleted file mode 100644 index bb2eb6d848f..00000000000 --- a/srcpkgs/MesaLib/mesa-nouveau-dri.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'mesa-nouveau-dri'. -# -short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)" -replaces="MesaLib<9.0.2" - -do_install() { - vmove "usr/lib/libXvMCnouveau.so*" usr/lib - vmove "usr/lib/vdpau/libvdpau_nouveau.so*" usr/lib/vdpau - vmove "usr/lib/xorg/modules/dri/nouveau*" usr/lib/xorg/modules/dri - vmove usr/lib/gallium-pipe/pipe_nouveau.so usr/lib/gallium-pipe -} diff --git a/srcpkgs/MesaLib/mesa-swraster-dri.template b/srcpkgs/MesaLib/mesa-swraster-dri.template deleted file mode 100644 index 3bef3f50a73..00000000000 --- a/srcpkgs/MesaLib/mesa-swraster-dri.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'mesa-swraster-dri'. -# -short_desc="Mesa DRI drivers for the Software Rasterizer" -replaces="MesaLib<9.0.2" - -do_install() { - vmove "usr/lib/libXvMCsoftpipe.so*" usr/lib - vmove "usr/lib/vdpau/libvdpau_softpipe.so*" usr/lib/vdpau - vmove "usr/lib/xorg/modules/dri/swrast*" usr/lib/xorg/modules/dri - vmove "usr/lib/gallium-pipe/pipe_swrast.so" usr/lib/gallium-pipe -} diff --git a/srcpkgs/MesaLib/mesa-vmwgfx-dri.template b/srcpkgs/MesaLib/mesa-vmwgfx-dri.template deleted file mode 100644 index 8fd0a4a8ae7..00000000000 --- a/srcpkgs/MesaLib/mesa-vmwgfx-dri.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'mesa-vmwgfx-dri'. -# -short_desc="Mesa DRI drivers for VMware" -replaces="MesaLib<9.0.2" - -do_install() { - vmove "usr/lib/xorg/modules/dri/vmwgfx*" usr/lib/xorg/modules/dri - vmove usr/lib/gallium-pipe/pipe_vmwgfx.so usr/lib/gallium-pipe -} diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index acd87fb7d26..214378f3203 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -1,7 +1,7 @@ # Template build file for 'MesaLib'. pkgname=MesaLib version=9.1.1 -revision=2 +revision=3 wrksrc="Mesa-${version}" build_style=gnu-configure configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl @@ -18,18 +18,156 @@ license="MIT, LGPL-2.1" distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2" checksum=3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb -conf_files="/etc/drirc" -depends="mesa-swraster-dri-${version}_${revision}" - makedepends="automake libtool flex pkg-config 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 llvm>=3.2" -subpackages="libgbm libEGL libglapi libGLES libGL libOpenVG libOSMesa - MesaLib-devel mesa-ati-dri mesa-intel-dri mesa-nouveau-dri mesa-swraster-dri - mesa-vmwgfx-dri libwayland-egl" - pre_configure() { ./autogen.sh } + +post_install() { + rm -f ${DESTDIR}/usr/lib/libGL.so{,.1} + mv ${DESTDIR}/usr/lib/libGL.so.1.2.0 ${DESTDIR}/usr/lib/libGL-mesa.so.1.2.0 +} + +libgbm_package() { + short_desc="generic buffer management API -- runtime" + replaces="MesaLib<9.0.2" + pkg_install() { + vmove "usr/lib/libgbm.so*" + vmove usr/lib/gbm/gbm_gallium_drm.so + } +} + +libEGL_package() { + short_desc="Free implementation of the EGL API - runtime" + replaces="MesaLib<7.11_2" + pkg_install() { + vmove "usr/lib/libEGL*.so*" + } +} + +libglapi_package() { + short_desc="Free implementation of the GL API - shared library" + replaces="MesaLib<7.11_2" + pkg_install() { + vmove "usr/lib/libglapi.so*" + } +} + +libGLES_package() { + short_desc="Free implementation of the OpenGL|ES 1.x and 2.x API" + replaces="MesaLib<7.11_2" + pkg_install() { + vmove "usr/lib/libGLES*.so*" + } +} + +libGL_package() { + short_desc="Free implementation of the OpenGL API - GLX runtime" + replaces="MesaLib<7.11_2" + pkg_install() { + vmove "usr/lib/libGL*.so*" + } +} + +libOpenVG_package() { + short_desc="Free implementation of the OpenVG API - runtime" + replaces="MesaLib<7.11_2" + pkg_install() { + vmove "usr/lib/libOpenVG.so*" + } +} + +libOSMesa_package() { + short_desc="Mesa Off-Screen interface library" + replaces="MesaLib<7.11_2" + pkg_install() { + vmove "usr/lib/libOSMesa.so*" + } +} + +MesaLib-devel_package() { + depends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel + libXfixes-devel libX11-devel libxcb-devel libdrm-devel>=2.4.39 expat-devel + libGL-${version}_${revision} libOpenVG-${version}_${revision} + libGLES-${version}_${revision} libEGL-${version}_${revision} + libOSMesa-${version}_${revision} libgbm-${version}_${revision} + libwayland-egl-${version}_${revision} + ${sourcepkg}-${version}_${revision}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +mesa-ati-dri_package() { + short_desc="Mesa DRI drivers for ATI GPUs" + replaces="MesaLib<9.0.2" + pkg_install() { + vmove "usr/lib/libXvMCr[36]00.so*" + vmove "usr/lib/vdpau/libvdpau_r[36]00.so*" + #vmove "usr/lib/vdpau/libvdpau_radeon*.so*" + vmove "usr/lib/xorg/modules/dri/radeon*" + vmove "usr/lib/xorg/modules/dri/r[236]00*" + vmove "usr/lib/gallium-pipe/pipe_r[36]00.so" + } +} + +mesa-intel-dri_package() { + short_desc="Mesa DRI drivers for Intel GPUs" + pkg_install() { + vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*" + } +} + +mesa-nouveau-dri_package() { + short_desc="Mesa DRI drivers for NVIDIA GPUs (nouveau dri)" + replaces="MesaLib<9.0.2" + pkg_install() { + vmove "usr/lib/libXvMCnouveau.so*" + vmove "usr/lib/vdpau/libvdpau_nouveau.so*" + vmove "usr/lib/xorg/modules/dri/nouveau*" + vmove usr/lib/gallium-pipe/pipe_nouveau.so + } +} + +mesa-swraster-dri_package() { + short_desc="Mesa DRI drivers for the Software Rasterizer" + replaces="MesaLib<9.0.2" + pkg_install() { + vmove "usr/lib/libXvMCsoftpipe.so*" + vmove "usr/lib/vdpau/libvdpau_softpipe.so*" + vmove "usr/lib/xorg/modules/dri/swrast*" + vmove "usr/lib/gallium-pipe/pipe_swrast.so" + } +} + +mesa-vmwgfx-dri_package() { + short_desc="Mesa DRI drivers for VMware" + replaces="MesaLib<9.0.2" + pkg_install() { + vmove "usr/lib/xorg/modules/dri/vmwgfx*" + vmove usr/lib/gallium-pipe/pipe_vmwgfx.so + } +} + +libwayland-egl_package() { + short_desc="Free implementation of the EGL API - wayland runtime" + pkg_install() { + vmove "usr/lib/libwayland-egl.*" + vmove usr/lib/egl + } +} + +MesaLib_package() { + conf_files="/etc/drirc" + depends="mesa-swraster-dri-${version}_${revision}" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/MoinMoin/template b/srcpkgs/MoinMoin/template index d31c13047ac..b73468543e3 100644 --- a/srcpkgs/MoinMoin/template +++ b/srcpkgs/MoinMoin/template @@ -2,11 +2,9 @@ pkgname=MoinMoin version=1.9.4 revision=1 -noarch=yes wrksrc=moin-${version} build_style=python-module -fulldepends="python" -pycompile_module="$pkgname jabberbot" +makedepends="python" short_desc="MoinMoin, a Python clone of WikiWiki" maintainer="Juan RP " homepage="http://moinmo.in" @@ -18,3 +16,12 @@ 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/NetworkManager/NetworkManager-devel.template b/srcpkgs/NetworkManager/NetworkManager-devel.template deleted file mode 100644 index 15b93c61109..00000000000 --- a/srcpkgs/NetworkManager/NetworkManager-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'NetworkManager-devel'. -# -noarch=yes -depends="dbus-glib-devel libnm-${version}_${revision}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gir-1.0 usr/share -} diff --git a/srcpkgs/NetworkManager/libnm.template b/srcpkgs/NetworkManager/libnm.template deleted file mode 100644 index e6329f40579..00000000000 --- a/srcpkgs/NetworkManager/libnm.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libnm'. -# -replaces="NetworkManager<0.9.1.90_1" -short_desc="${short_desc} - shared libraries" - -do_install() { - vmove "usr/lib/*.so*" usr/lib - vmove "usr/lib/girepository-*" usr/lib -} diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 4b0d99939d2..ad845658304 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -12,12 +12,8 @@ configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no --with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 --enable-modify-system" makedepends="pkg-config intltool gobject-introspection libuuid-devel nss-devel dbus-glib-devel libgudev-devel wireless_tools-devel libnl3-devel - polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel" -fulldepends="dbus>=0 iproute2 dhcpcd>=5.5.4_1 wpa_supplicant - mobile-broadband-provider-info" -systemd_services="${pkgname}.service on" -conf_files="/etc/${pkgname}/${pkgname}.conf" -subpackages="$pkgname-devel libnm" + polkit-devel ppp-devel iptables-devel libsoup-devel systemd-devel + dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant mobile-broadband-provider-info" short_desc="Network Management daemon" maintainer="Juan RP " homepage="http://www.gnome.org/projects/NetworkManager/" @@ -25,13 +21,40 @@ license="GPL-2" distfiles="${GNOME_SITE}/$pkgname/0.9/$pkgname-$version.tar.xz" checksum=c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b -make_dirs=" -/etc/NetworkManager/dispatcher.d 0755 root root -/etc/NetworkManager/system-connections 0755 root root -/var/lib/NetworkManager 0700 root root" - post_install() { # Install config file. vinstall ${FILESDIR}/${pkgname}.conf 644 etc/${pkgname} rm -rf ${DESTDIR}/etc/init.d } + +libnm_package() { + replaces="NetworkManager<0.9.1.90_1" + short_desc="${short_desc} - shared libraries" + pkg_install() { + vmove "usr/lib/*.so*" + vmove "usr/lib/girepository-*" + } +} + +NetworkManager-devel_package() { + depends="dbus-glib-devel libnm-${version}_${revision}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gir-1.0 + } +} + +NetworkManager_package() { + make_dirs=" + /etc/NetworkManager/dispatcher.d 0755 root root + /etc/NetworkManager/system-connections 0755 root root + /var/lib/NetworkManager 0700 root root" + depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant mobile-broadband-provider-info" + conf_files="/etc/${pkgname}/${pkgname}.conf" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/ORBit2/ORBit2-devel.template b/srcpkgs/ORBit2/ORBit2-devel.template deleted file mode 100644 index 315fa28e50b..00000000000 --- a/srcpkgs/ORBit2/ORBit2-devel.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'ORBit2-devel'. -# -depends="glib-devel libIDL-devel libORBit2" -short_desc="${short_desc} (Development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() -{ - vmove "usr/lib/*.a" usr/lib - vmkdir usr/lib/orbit-2.0 - vmove "usr/lib/orbit-2.0/*.a" usr/lib/orbit-2.0 - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/idl usr/share - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/ORBit2/libORBit2.template b/srcpkgs/ORBit2/libORBit2.template deleted file mode 100644 index 37fba65832f..00000000000 --- a/srcpkgs/ORBit2/libORBit2.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'libORBit2'. -# -short_desc="${short_desc} (Runtime library)" -long_desc="${long_desc} - - This package contains the ORBit2 runtime libraries." - -do_install() -{ - vmove "usr/lib/*.so*" usr/lib - vmkdir usr/lib/orbit-2.0 - vmove "usr/lib/orbit-2.0/*.so*" usr/lib/orbit-2.0 -} - - diff --git a/srcpkgs/ORBit2/template b/srcpkgs/ORBit2/template index 6d27c56620d..0ec28143f31 100644 --- a/srcpkgs/ORBit2/template +++ b/srcpkgs/ORBit2/template @@ -1,14 +1,15 @@ # Template file for 'ORBit2' pkgname=ORBit2 version=2.14.19 +revision=2 build_style=gnu-configure -homepage="http://projects.gnome.org/ORBit2/" -distfiles="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/2.14/${pkgname}-${version}.tar.bz2" -makedepends="pkg-config glib-devel libIDL-devel" -revision=1 +hostmakedepends="pkg-config" +makedepends="glib-devel libIDL-devel" short_desc="Thin/fast CORBA ORB" maintainer="davehome " license="GPL-2, LGPL-2.1" +homepage="http://projects.gnome.org/ORBit2/" +distfiles="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/2.14/${pkgname}-${version}.tar.bz2" checksum=55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550 long_desc=" ORBit2 is a CORBA 2.4-compliant Object Request Broker (ORB) featuring mature C, @@ -21,4 +22,29 @@ long_desc=" Solaris, HP-UX, ...), and Windows. ORBit2 is developed and released as open source software under GPL/LGPL." -subpackages="lib$pkgname $pkgname-devel" +libORBit2_package() { + short_desc="${short_desc} -- Runtime library" + pkg_install() { + vmove "usr/lib/*.so*" + vmove "usr/lib/orbit-2.0/*.so*" + } +} + +ORBit2-devel_package() { + depends="glib-devel libIDL-devel libORBit2>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove "usr/lib/*.a" + vmove "usr/lib/orbit-2.0/*.a" + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/idl + vmove usr/share/aclocal + } +} + +ORBit2_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/Pyrex/template b/srcpkgs/Pyrex/template index a2fc61a5d16..96ef9778a96 100644 --- a/srcpkgs/Pyrex/template +++ b/srcpkgs/Pyrex/template @@ -2,19 +2,22 @@ pkgname=Pyrex version=0.9.9 revision=2 -#distfiles="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/Pyrex-$version.tar.gz" -distfiles="http://code.enthought.com/src/$pkgname-$version.tar.gz" build_style=python-module -fulldepends="python" +makedepends="python" short_desc="Language for writing Python extension modules" maintainer="Juan RP " homepage="http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex" license="Apache-2.0" +distfiles="http://code.enthought.com/src/$pkgname-$version.tar.gz" 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." -noarch=yes -pycompile_module="$pkgname" - +Pyrex_package() { + noarch="yes" + pycompile_module="Pyrex" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/SDL/SDL-devel.template b/srcpkgs/SDL/SDL-devel.template deleted file mode 100644 index 558c991fd69..00000000000 --- a/srcpkgs/SDL/SDL-devel.template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'SDL-devel'. -# -depends="alsa-lib-devel SDL>=${version}" - -if [ "$build_option_x11" ]; then - depends="${depends} libXrandr-devel" -fi - -if [ "$build_option_opengl" ]; then - depends="${depends} glu-devel" -fi - -if [ "$build_option_pulseaudio" ]; then - depends="${depends} pulseaudio-devel" -fi - -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/bin usr - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib - vmove usr/share usr -} diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template index 29c35160542..e3e1de8cd00 100644 --- a/srcpkgs/SDL/template +++ b/srcpkgs/SDL/template @@ -8,7 +8,6 @@ configure_args="--enable-alsa --disable-esd --disable-rpath --enable-clock_gettime --disable-nas --disable-arts --disable-x11-shared --disable-alsa-shared --disable-pulseaudio-shared --disable-video-dga --disable-osmesa-shared" -subpackages="SDL-devel" short_desc="Simple Directmedia Layer" maintainer="Juan RP " homepage="http://www.libsdl.org/" @@ -24,3 +23,78 @@ long_desc=" hostmakedepends="pkg-config nasm" makedepends="alsa-lib-devel" + +# Package build options +build_options="x11 opengl aalib pulseaudio" + +desc_option_x11="Enable support for X11 video output" +desc_option_opengl="Enable support for OpenGL support" +desc_option_aalib="Enable support for aalib video output" +desc_option_pulseaudio="Enable support for pulseaudio autio output" + +build_options_default="x11" + +if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + # Enable OpenGL and pulseaudio on x86. + build_options_default+=" opengl pulseaudio" +fi + +if [ "$build_option_x11" ]; then + configure_args+=" --enable-video-x11-xrandr --enable-video-x11-vm --enable-video-x11-xv" + makedepends+=" libXrandr-devel" +else + configure_args+=" --without-x" +fi + +if [ "$build_option_opengl" ]; then + configure_args+=" --enable-video-opengl" + makedepends+=" glu-devel" +else + configure_args+=" --disable-video-opengl" +fi + +if [ "$build_option_aalib" ]; then + configure_args+=" --enable-video-aalib" + makedepends+=" aalib-devel" +else + configure_args+=" --disable-video-aalib" +fi + +if [ "$build_option_pulseaudio" ]; then + configure_args+=" --enable-pulseaudio" + makedepends+=" pulseaudio-devel" +else + configure_args+=" --disable-pulseaudio" +fi + +SDL-devel_package() { + short_desc="${short_desc} -- development files" + depends="alsa-lib-devel SDL>=${version}" + if [ "$build_option_x11" ]; then + depends+=" libXrandr-devel" + fi + if [ "$build_option_opengl" ]; then + depends+=" glu-devel" + fi + if [ "$build_option_pulseaudio" ]; then + depends+=" pulseaudio-devel" + fi + + pkg_install() { + vmove usr/bin + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + 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/SDL/template.options b/srcpkgs/SDL/template.options deleted file mode 100644 index 31c83739e75..00000000000 --- a/srcpkgs/SDL/template.options +++ /dev/null @@ -1,47 +0,0 @@ -# Package build options -build_options="x11 opengl aalib pulseaudio" - -desc_option_x11="Enable support for X11 video output" -desc_option_opengl="Enable support for OpenGL support" -desc_option_aalib="Enable support for aalib video output" -desc_option_pulseaudio="Enable support for pulseaudio autio output" - -build_options_default="x11" - -if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - # Enable OpenGL and pulseaudio on x86. - build_options_default="${build_options_default} opengl pulseaudio" -fi - -do_options() { - if [ "$build_option_x11" ]; then - configure_args="${configure_args} --enable-video-x11-xrandr - --enable-video-x11-vm --enable-video-x11-xv" - makedepends="${makedepends} libXrandr-devel" - else - configure_args="${configure_args} --without-x" - fi - - if [ "$build_option_opengl" ]; then - configure_args="${configure_args} --enable-video-opengl" - makedepends="${makedepends} glu-devel" - # libGL.so.1 is dynamically loaded with dlopen. - depends="${depends} libGL" - else - configure_args="${configure_args} --disable-video-opengl" - fi - - if [ "$build_option_aalib" ]; then - configure_args="${configure_args} --enable-video-aalib" - makedepends="${makedepends} aalib-devel" - else - configure_args="${configure_args} --disable-video-aalib" - fi - - if [ "$build_option_pulseaudio" ]; then - configure_args="${configure_args} --enable-pulseaudio" - makedepends="${makedepends} pulseaudio-devel" - else - configure_args="${configure_args} --disable-pulseaudio" - fi -} diff --git a/srcpkgs/SDL_image/SDL_image-devel.template b/srcpkgs/SDL_image/SDL_image-devel.template deleted file mode 100644 index 3e2270c5cb9..00000000000 --- a/srcpkgs/SDL_image/SDL_image-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'SDL_image-devel'. -# -noarch=yes -depends="SDL-devel ${sourcepkg}>=${version}" -short_desc="${short_desc} - development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/SDL_image/template b/srcpkgs/SDL_image/template index 891dd108ce0..ba25f1ec8fe 100644 --- a/srcpkgs/SDL_image/template +++ b/srcpkgs/SDL_image/template @@ -1,13 +1,10 @@ # Template file for 'SDL_image' pkgname=SDL_image version=1.2.12 -revision=7 +revision=8 build_style=gnu-configure configure_args="--disable-static" -# The following are dlopen(3)ed at runtime. -depends="libpng>=1.5.10 tiff libjpeg-turbo libwebp>=0.2.0" makedepends="tiff-devel SDL-devel libwebp-devel>=0.2.0" -subpackages="${pkgname}-devel" short_desc="Load images as SDL surfaces" maintainer="Juan RP " license="BSD" @@ -18,3 +15,20 @@ checksum=0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +SDL_image-devel_package() { + depends="SDL-devel ${sourcepkg}>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +SDL_image_package() { + # The following are dlopen(3)ed at runtime. + depends="libpng>=1.5.10 tiff libjpeg-turbo libwebp>=0.2.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/SDL_mixer/SDL_mixer-devel.template b/srcpkgs/SDL_mixer/SDL_mixer-devel.template deleted file mode 100644 index e125aed8687..00000000000 --- a/srcpkgs/SDL_mixer/SDL_mixer-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'SDL_mixer-devel'. -# -noarch=yes -depends="${sourcepkg}>=${version}" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/SDL_mixer/template b/srcpkgs/SDL_mixer/template index a89861733ec..3bc14bb9df9 100644 --- a/srcpkgs/SDL_mixer/template +++ b/srcpkgs/SDL_mixer/template @@ -1,14 +1,11 @@ # Template file for 'SDL_mixer' pkgname=SDL_mixer version=1.2.12 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-static" -# The following deps are dlopen(3)ed at runtime. -depends="libvorbis libmikmod smpeg libflac" makedepends="SDL-devel libvorbis-devel libmikmod-devel>=3.2.0 libflac-devel smpeg-devel fluidsynth-devel" -subpackages="${pkgname}-devel" short_desc="Multi-channel audio mixer library" maintainer="Juan RP " license="BSD" @@ -31,3 +28,20 @@ pre_configure() { post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +SDL_mixer-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc="${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/SDL_net-devel.template b/srcpkgs/SDL_net/SDL_net-devel.template deleted file mode 100644 index 023cad8ef3a..00000000000 --- a/srcpkgs/SDL_net/SDL_net-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'SDL_net-devel'. -# -depends="SDL-devel SDL_net-${version}_${revision}" -short_desc="${sourcepkg} development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/SDL_net/template b/srcpkgs/SDL_net/template index 7fa3740bb9b..9cc34e67e22 100644 --- a/srcpkgs/SDL_net/template +++ b/srcpkgs/SDL_net/template @@ -1,9 +1,10 @@ # Template file for 'SDL_net' pkgname=SDL_net version=1.2.8 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static" +makedepends="SDL-devel" short_desc="Small sample cross-platform networking library for SDL" maintainer="Juan RP " license="BSD" @@ -14,9 +15,21 @@ long_desc=" This is a small sample cross-platform networking library which is supplementary to the SDL (Simple DirectMedia Layer) library." -makedepends="SDL-devel" -subpackages="$pkgname-devel" - post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +SDL_net-devel_package() { + depends="SDL-devel SDL_net>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +SDL_net_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/SDL_sound/SDL_sound-devel.template b/srcpkgs/SDL_sound/SDL_sound-devel.template deleted file mode 100644 index 3972e8522f7..00000000000 --- a/srcpkgs/SDL_sound/SDL_sound-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'SDL_sound-devel'. -# -noarch=yes -depends="SDL_sound>=${version}" -short_desc="${short_desc} -- development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr -} diff --git a/srcpkgs/SDL_sound/template b/srcpkgs/SDL_sound/template index d9fdabbced2..583c98e3699 100644 --- a/srcpkgs/SDL_sound/template +++ b/srcpkgs/SDL_sound/template @@ -1,12 +1,12 @@ # Template file for 'SDL_sound' -pkgname="SDL_sound" -version="1.0.3" -revision="2" -build_style="gnu-configure" +pkgname=SDL_sound +version=1.0.3 +revision=3 +build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config SDL-devel libmikmod-devel>=3.2.0 libvorbis-devel +hostmakedepends="pkg-config" +makedepends="SDL-devel libmikmod-devel>=3.2.0 libvorbis-devel libflac-devel speex-devel smpeg-devel" -subpackages="${pkgname}-devel" short_desc="A library to decode several popular sound file formats, such as .WAV and .MP3" maintainer="Juan RP " homepage="http://icculus.org/SDL_sound/" @@ -23,3 +23,17 @@ long_desc=" SDL_sound can decode a whole sound file and hand back a single pointer to the whole waveform. SDL_sound can also handle sample rate, audio format, and channel conversion on-the-fly and behind-the-scenes, if the programmer desires." + +SDL_sound-devel_package() { + depends="SDL_sound>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include usr + } +} + +SDL_sound_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/SDL_ttf/SDL_ttf-devel.template b/srcpkgs/SDL_ttf/SDL_ttf-devel.template deleted file mode 100644 index 59d4a3df04c..00000000000 --- a/srcpkgs/SDL_ttf/SDL_ttf-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'SDL_ttf-devel'. -# -noarch=yes -depends="freetype-devel SDL-devel ${sourcepkg}>=${version}" -short_desc="${short_desc} (development files)" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/SDL_ttf/template b/srcpkgs/SDL_ttf/template index 2585b519cfd..2c2aed2f4d0 100644 --- a/srcpkgs/SDL_ttf/template +++ b/srcpkgs/SDL_ttf/template @@ -1,11 +1,11 @@ # Template file for 'SDL_ttf' pkgname=SDL_ttf version=2.0.11 -revision=2 -subpackages="${pkgname}-devel" +revision=3 build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config freetype-devel SDL-devel MesaLib-devel" +hostmakedepends="pkg-config" +makedepends="freetype-devel SDL-devel MesaLib-devel" short_desc="Use TrueType fonts in your SDL applications" maintainer="Juan RP " license="LGPL-2.1" @@ -19,3 +19,18 @@ long_desc=" without having to code a font rendering routine themselves. With the power of outline fonts and antialiasing, high quality text output can be obtained without much effort." + +SDL_ttf-devel_package() { + depends="freetype-devel SDL-devel ${sourcepkg}>=${version}" + short_desc+=" -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +SDL_ttf_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/Thunar/Thunar-devel.template b/srcpkgs/Thunar/Thunar-devel.template deleted file mode 100644 index 0274f9185a0..00000000000 --- a/srcpkgs/Thunar/Thunar-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'Thunar-devel'. -# -noarch=yes -depends="glib-devel gtk+-devel Thunar>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 3d3ee7a96db..ed49dd23c0e 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,7 +1,7 @@ # Template file for 'Thunar' pkgname=Thunar version=1.6.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-gio-unix --enable-dbus --enable-gudev --enable-exif --enable-pcre --disable-static --enable-notifications" @@ -12,9 +12,25 @@ license="GPL-2, LGPL-2.1" distfiles="http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-${version}.tar.bz2" checksum=7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85 -subpackages="${pkgname}-devel" -depends="gvfs hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool pcre-devel>=8.30 glib-devel>=2.32.3_2 +hostmakedepends="pkg-config intltool" +makedepends="pcre-devel>=8.30 glib-devel>=2.32.3_2 libgudev-devel libnotify-devel libxfce4util-devel libxfce4ui-devel gtk+-devel dbus-glib-devel libexif-devel exo-devel>=0.10.2 xfce4-panel-devel startup-notification-devel systemd-devel" + +Thunar-devel_package() { + depends="glib-devel gtk+-devel Thunar>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + } +} + +Thunar_package() { + depends="gvfs hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/Twisted/template b/srcpkgs/Twisted/template index d603f9b88c3..11918713c0c 100644 --- a/srcpkgs/Twisted/template +++ b/srcpkgs/Twisted/template @@ -3,12 +3,18 @@ pkgname=Twisted version=12.3.0 revision=2 build_style=python-module -pycompile_module="twisted" -makedepends="python-devel" -fulldepends="zope.interface>=4.0.1 pycrypto pyopenssl" +makedepends="python-devel zope.interface>=4.0.1 pycrypto pyopenssl" short_desc="Event-driven networking engine written in Python" maintainer="Juan RP " homepage="http://twistedmatrix.com/" license="MIT" distfiles="http://twistedmatrix.com/Releases/Twisted/${version%.*}/Twisted-${version}.tar.bz2" checksum=d4d1afcfa7ca40a7da26832cba653851eb147a06bd3f7f6fae89af3d5cd295c6 + +Twisted_package() { + depends="zope.interface>=4.0.1 pycrypto pyopenssl" + pycompile_module="twisted" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/WindowMaker/WindowMaker-devel.template b/srcpkgs/WindowMaker/WindowMaker-devel.template deleted file mode 100644 index 428871dec83..00000000000 --- a/srcpkgs/WindowMaker/WindowMaker-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'WindowMaker-devel'. -# -noarch=yes -depends="${sourcepkg}>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/WindowMaker/template b/srcpkgs/WindowMaker/template index 64fabf7a426..222a4bcd9bd 100644 --- a/srcpkgs/WindowMaker/template +++ b/srcpkgs/WindowMaker/template @@ -1,7 +1,7 @@ # Template file for 'WindowMaker' pkgname=WindowMaker version=0.95.4 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-xinerama --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep --enable-usermenu --enable-modelock @@ -16,17 +16,29 @@ homepage="http://www.windowmaker.org/" distfiles="http://windowmaker.org/pub/source/release/${pkgname}-${version}.tar.gz" checksum=2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45 -subpackages="${pkgname}-devel" - -conf_files=" -/etc/WindowMaker -/etc/WindowMaker/WindowMaker -/etc/WindowMaker/WMRootMenu -/etc/WindowMaker/WMWindowAttributes -/etc/WindowMaker/WMState -/etc/WindowMaker/WMGLOBA" - post_install() { vinstall COPYING.WTFPL 644 usr/share/licenses/${pkgname} vinstall ${FILESDIR}/wmaker.desktop 644 usr/share/xsessions } + +WindowMaker-devel_package() { + depends="${sourcepkg}>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + } +} + +WindowMaker_package() { + conf_files=" + /etc/WindowMaker + /etc/WindowMaker/WindowMaker + /etc/WindowMaker/WMRootMenu + /etc/WindowMaker/WMWindowAttributes + /etc/WindowMaker/WMState + /etc/WindowMaker/WMGLOBA" + pkg_install() { + vmove usr + } +}