diff --git a/srcpkgs/x11perf/template b/srcpkgs/x11perf/template index c9b87c25278..6f1148f05ff 100644 --- a/srcpkgs/x11perf/template +++ b/srcpkgs/x11perf/template @@ -1,16 +1,22 @@ # Template build file for 'x11perf'. pkgname=x11perf version=1.5.2 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libXext-devel libXft-devel libXmu-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libXext-devel libXft-devel libXmu-devel" short_desc="X11 server performance test program" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" 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 38b8025137c..bae02a1a94c 100644 --- a/srcpkgs/x264/template +++ b/srcpkgs/x264/template @@ -4,7 +4,6 @@ _snap_date=20120126 _snap_rev=2245 version="${_snap_date}.${_snap_rev}" revision=3 -subpackages="x264-devel" wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable" hostmakedepends="yasm" short_desc="Free library for encoding H264/AVC video streams" @@ -37,3 +36,19 @@ do_install() { # Set version as 0.120.0 in pkg-config file. sed -i -e "s|0.120.x|0.120.0|g" ${DESTDIR}/usr/lib/pkgconfig/x264.pc } + +x264-devel_package() { + depends="x264>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + } +} + +x264_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/x264/x264-devel.template b/srcpkgs/x264/x264-devel.template deleted file mode 100644 index d443c2f30ee..00000000000 --- a/srcpkgs/x264/x264-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'x264-devel'. -# -depends="x264>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove "usr/lib/*.a" usr/lib -} diff --git a/srcpkgs/xapian-core/libxapian.template b/srcpkgs/xapian-core/libxapian.template deleted file mode 100644 index 69b30d24645..00000000000 --- a/srcpkgs/xapian-core/libxapian.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'libxapian'. -# -short_desc="${short_desc} -- runtime library" -long_desc="${long_desc} - - This package contains the runtime libraries." - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/xapian-core/template b/srcpkgs/xapian-core/template index 10fc0ac2ad0..af3d3715578 100644 --- a/srcpkgs/xapian-core/template +++ b/srcpkgs/xapian-core/template @@ -1,11 +1,10 @@ # Template file for 'xapian-core' pkgname=xapian-core version=1.2.12 -revision=1 +revision=2 build_style=gnu-configure makedepends="libuuid-devel" configure_args="--disable-static" -subpackages="${pkgname}-devel libxapian" short_desc="Open source search engine" maintainer="Juan RP " homepage="http://www.xapian.org/" @@ -19,3 +18,30 @@ long_desc=" # xapian-config needs the .la keep_libtool_archives=yes + +xapian-core-devel_package() { + depends="libxapian>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/share/doc + vmove usr/share/aclocal + vmove usr/lib/cmake + vmove "usr/lib/*.la" + vmove usr/bin/xapian-config + vmove usr/share/man/man1/xapian-config.1 + } +} + +libxapian_package() { + short_desc="${short_desc} -- runtime library" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +xapian-core_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xapian-core/xapian-core-devel.template b/srcpkgs/xapian-core/xapian-core-devel.template deleted file mode 100644 index f3c17812381..00000000000 --- a/srcpkgs/xapian-core/xapian-core-devel.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'xapian-core-devel'. -# -noarch=yes -depends="libxapian>=${version}" -short_desc="${short_desc} -- development files" -long_desc="${long_desc} - - This package contains files for development, headers, static libs, etc." - -do_install() { - vmove usr/include usr - vmove usr/share/doc usr/share - vmove usr/share/aclocal usr/share - vmove usr/lib/cmake usr/lib - vmove "usr/lib/*.la" usr/lib - vmove usr/bin/xapian-config usr/bin - vmove usr/share/man/man1/xapian-config.1 usr/share/man/man1 -} diff --git a/srcpkgs/xar/template b/srcpkgs/xar/template index b25c5fadbd9..d89a71c1ca8 100644 --- a/srcpkgs/xar/template +++ b/srcpkgs/xar/template @@ -1,8 +1,7 @@ # Template file for 'xar' pkgname=xar version=1.5.2 -revision=1 -subpackages="xar-devel" +revision=2 build_style=gnu-configure configure_args="--disable-static" makedepends="acl-devel libxml2-devel openssl-devel" @@ -25,3 +24,17 @@ long_desc=" post_install() { vinstall LICENSE 644 usr/share/licenses/xar } + +xar-devel_package() { + depends="xar>=$version" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + } +} + +xar_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xar/xar-devel.template b/srcpkgs/xar/xar-devel.template deleted file mode 100644 index 7f0117b21c1..00000000000 --- a/srcpkgs/xar/xar-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'xar-devel'. -# -noarch=yes -depends="xar>=$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/xarchiver/template b/srcpkgs/xarchiver/template index 872be1e5948..be08cde30a8 100644 --- a/srcpkgs/xarchiver/template +++ b/srcpkgs/xarchiver/template @@ -2,14 +2,14 @@ pkgname=xarchiver version=0.5.2 revision=3 -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" build_style=gnu-configure -makedepends="pkg-config intltool glib-devel pango-devel gdk-pixbuf-devel gtk+-devel" -fulldepends="xdg-utils desktop-file-utils hicolor-icon-theme" +hostmakedepends="pkg-config intltool" +makedepends="gtk+-devel 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" maintainer="Juan RP " +distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" checksum=cea932ff9d505969201fd502470bbebbc5726ab3d6765e142fc8295aa677ad2a long_desc=" Xarchiver is a lightweight desktop independent archive manager built with @@ -19,6 +19,9 @@ long_desc=" 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 947785e2ef4..5216d073c18 100644 --- a/srcpkgs/xauth/template +++ b/srcpkgs/xauth/template @@ -2,13 +2,14 @@ pkgname=xauth version=1.0.6 revision=2 -homepage="http://xorg.freedesktop.org/" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" build_style=gnu-configure -makedepends="pkg-config xtrans libXau-devel libXext-devel libXmu-devel" +hostmakedepends="pkg-config" +makedepends="xtrans libXau-devel libXext-devel libXmu-devel" short_desc="X authentication utility" maintainer="Juan RP " license="MIT" +homepage="http://xorg.freedesktop.org/" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=a686406951f0ed6be45bc26182a1423e2cdffad2d492b33ff3fbf72f7bcb6b0b long_desc=" This package provides xauth, a program to display and manipulate the @@ -16,3 +17,8 @@ long_desc=" This is from the modular X.org X11 project." +xauth_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xbacklight/template b/srcpkgs/xbacklight/template index c44240785a4..c0dffec4395 100644 --- a/srcpkgs/xbacklight/template +++ b/srcpkgs/xbacklight/template @@ -1,19 +1,23 @@ # Template build file for 'xbacklight'. pkgname=xbacklight version=1.1.2 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libXrandr-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXrandr-devel" short_desc="Adjust backlight brightness using RandR extension" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=af2f02d09de8a19848e3f3b322320141bceebf9d4097b7bd505457a1bd936509 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. - - This is from the modular X.org X11 project." + 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 1637170e76b..2a57af5d003 100644 --- a/srcpkgs/xbitmaps/template +++ b/srcpkgs/xbitmaps/template @@ -1,17 +1,20 @@ # Template build file for 'xbitmaps'. pkgname=xbitmaps version=1.0.1 -distfiles="${XORG_SITE}/data/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 short_desc="Common X11 bitmaps" homepage="http://xorg.freedesktop.org" 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. + This package contains the common X11 bitmaps for direct inclusion in C." - This is from the modular X.org project." - -noarch=yes +xbitmaps_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template index 09eb228d87d..ad8e340bf5c 100644 --- a/srcpkgs/xbmc/template +++ b/srcpkgs/xbmc/template @@ -12,10 +12,6 @@ checksum=29e3f36e1884913088f786179a4c925f52e46e9ba7bf8f24e35e934177c01ec3 disable_debug=yes broken_as_needed=yes -# The following dependencies are dlopen(3)ed. -depends="libbluray libmad libogg libcurl libflac libmodplug libass - libmpeg2 lame librtmp libnfs libplist" - # XXX add support for webserver (microhttpd), afp and libcec. fulldepends="udisks upower hicolor-icon-theme desktop-file-utils mesa-demos" @@ -62,3 +58,14 @@ 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 + udisks upower hicolor-icon-theme desktop-file-utils + mesa-demos" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xbps-git/libxbps-devel-git.template b/srcpkgs/xbps-git/libxbps-devel-git.template deleted file mode 100644 index 9c0b54f597a..00000000000 --- a/srcpkgs/xbps-git/libxbps-devel-git.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'libxbps'. -# -short_desc="${short_desc} - runtime library (development files)" -depends="zlib-devel proplib-devel confuse-devel libfetch-devel - libarchive-devel libxbps>=${version}" -provides="libxbps-devel-${version}" -replaces="libxbps-devel>=0" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/xbps-git/libxbps-git.template b/srcpkgs/xbps-git/libxbps-git.template deleted file mode 100644 index cb2c4f1d426..00000000000 --- a/srcpkgs/xbps-git/libxbps-git.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'libxbps'. -# -short_desc="${short_desc} - runtime library" -provides="libxbps-${version}" -replaces="libxbps>=0 xbps-devel>=0" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template index 7cc93749970..280c33fa6ec 100644 --- a/srcpkgs/xbps-git/template +++ b/srcpkgs/xbps-git/template @@ -12,18 +12,65 @@ license="Simplified BSD" nofetch=yes noextract=yes -provides="xbps-${version}" -replaces="xbps>=0 xbps-devel>=0" -conf_files="/etc/xbps/xbps.conf" -subpackages="libxbps-git libxbps-devel-git xbps-static-git xbps-tests-git" - do_fetch() { local url="git://github.com/xtraeme/xbps" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } -depends="xbps-triggers libxbps-git-${version}_${revision}" hostmakedepends="which pkg-config" makedepends="zlib-devel proplib-devel openssl-devel libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel" + +libxbps-git_package() { + short_desc="${short_desc} - runtime library" + provides="libxbps-${version}" + replaces="libxbps>=0 xbps-devel>=0" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +libxbps-devel-git_package() { + short_desc="${short_desc} - runtime library (development files)" + depends="zlib-devel proplib-devel confuse-devel libfetch-devel + libarchive-devel libxbps>=${version}" + provides="libxbps-devel-${version}" + replaces="libxbps-devel>=0" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} + +xbps-static-git_package() { + provides="xbps-static-${version}" + replaces="xbps-static>=0 xbps-devel-static>=0" + depends="xbps-triggers" + short_desc+=" -- static binaries" + pkg_install() { + vmove "usr/sbin/*.static" + } +} + +xbps-tests-git_package() { + short_desc="${short_desc} - Kyua testsuite" + depends="libxbps>=${version}" + provides="xbps-tests-${version}" + replaces="xbps-tests>=0" + pkg_install() { + 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 etc + vmove usr + } +} diff --git a/srcpkgs/xbps-git/xbps-static-git.template b/srcpkgs/xbps-git/xbps-static-git.template deleted file mode 100644 index d813c33610a..00000000000 --- a/srcpkgs/xbps-git/xbps-static-git.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'xbps-devel-static'. -# -provides="xbps-static-${version}" -replaces="xbps-static>=0 xbps-devel-static>=0" -depends="xbps-triggers" -short_desc="${sourcepkg} static binaries" - -do_install() { - vmove "usr/sbin/*.static" usr/sbin -} diff --git a/srcpkgs/xbps-git/xbps-tests-git.template b/srcpkgs/xbps-git/xbps-tests-git.template deleted file mode 100644 index 72e84c942bb..00000000000 --- a/srcpkgs/xbps-git/xbps-tests-git.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'xbps-tests'. -# -short_desc="${short_desc} - Kyua testsuite" -depends="libxbps>=${version}" -provides="xbps-tests-${version}" -replaces="xbps-tests>=0" - -do_install() { - vmove usr/tests usr -} diff --git a/srcpkgs/xbps-src-utils/template b/srcpkgs/xbps-src-utils/template index 159db2d7c42..833af618897 100644 --- a/srcpkgs/xbps-src-utils/template +++ b/srcpkgs/xbps-src-utils/template @@ -3,9 +3,8 @@ pkgname=xbps-src-utils version=20130321 revision=1 homepage="https://github.com/davehome/xbps-src-utils" -depends="libxbps>=0.21" hostmakedepends="pkg-config flex" -makedepends="libfl-devel libxbps-devel>=0.21" +makedepends="libxbps-devel>=0.21" short_desc="Various tools for xbps-src in C (like repo-checkvers)" maintainer="davehome " license="Simplified BSD" @@ -20,6 +19,10 @@ long_desc=" nofetch=yes noextract=yes +if [ "$CROSS_BUILD" ]; then + makedepends+=" libfl-devel" +fi + do_fetch() { local url="git://github.com/davehome/xbps-src-utils.git" msg_normal " Fetching source from $url ...\n" @@ -40,3 +43,10 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install } + +xbps-src-utils_package() { + depends="libxbps>=0.21" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xbps-src/template b/srcpkgs/xbps-src/template index 87c70f84819..e0385807c7f 100644 --- a/srcpkgs/xbps-src/template +++ b/srcpkgs/xbps-src/template @@ -5,7 +5,6 @@ revision=1 build_style=gnu-makefile make_build_args="PREFIX=/usr ETCDIR=/etc/xbps" make_install_args="PREFIX=/usr ETCDIR=/etc/xbps" -conf_files="/etc/xbps/xbps-src.conf" short_desc="The XBPS package system - binary package builder" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" @@ -13,11 +12,18 @@ license="GPL-2" nofetch=yes noextract=yes -depends="bash xbps-triggers>=0.54 fakeroot" -replaces="xbps-src-git>=0" do_fetch() { local url="git://github.com/xtraeme/xbps-src" msg_normal "Fetching source from $url ...\n" git clone ${url} ${pkgname}-${version} } + +xbps-src_package() { + conf_files="/etc/xbps/xbps-src.conf" + replaces="xbps-src-git>=0" + depends="bash xbps-triggers>=0.54 fakeroot" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xbps/libxbps-devel.template b/srcpkgs/xbps/libxbps-devel.template deleted file mode 100644 index 8f61e92b98b..00000000000 --- a/srcpkgs/xbps/libxbps-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libxbps-devel'. -# -short_desc="${short_desc} - runtime library (development files)" -depends="zlib-devel proplib-devel confuse-devel libfetch-devel - libarchive-devel libxbps>=${version}" -replaces="xbps-static<0.16.3_2 libxbps-devel>=0" - -do_install() { - vmove usr/include usr - vmove "usr/lib/*.a" usr/lib - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/xbps/libxbps.template b/srcpkgs/xbps/libxbps.template deleted file mode 100644 index 2c2e7e9cfc8..00000000000 --- a/srcpkgs/xbps/libxbps.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'libxbps'. -# -short_desc="${short_desc} - runtime library" -replaces="xbps<0.16.3_2 libxbps>=0" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template index 31f858fb909..588e3bcc884 100644 --- a/srcpkgs/xbps/template +++ b/srcpkgs/xbps/template @@ -5,16 +5,59 @@ revision=4 build_style=configure configure_args="--prefix=/ --exec-prefix=/usr --sbindir=/usr/sbin --enable-static --enable-debug --enable-tests" -depends="xbps-triggers" hostmakedepends="which pkg-config" makedepends="zlib-devel proplib-devel>=0.6.3 openssl-devel libfetch-devel libarchive-devel>=3.1.2 confuse-devel atf-devel" -conf_files="/etc/xbps/xbps.conf" -subpackages="libxbps libxbps-devel xbps-static xbps-tests" -replaces="xbps>=0" short_desc="The XBPS package system utilities" maintainer="Juan RP " homepage="http://code.google.com/p/xbps" license="Simplified BSD" distfiles="http://xbps.googlecode.com/files/xbps-$version.tar.gz" checksum=717cd34e0ee42215e23d32e00098d64493488a247b631384fa233f12e647f6ca + +libxbps_package() { + short_desc="${short_desc} - runtime library" + replaces="xbps<0.16.3_2 libxbps>=0" + pkg_install() { + vmove "usr/lib/*.so*" + } +} + +libxbps-devel_package() { + short_desc="${short_desc} - runtime library (development files)" + depends="zlib-devel proplib-devel confuse-devel libfetch-devel + libarchive-devel libxbps>=${version}" + replaces="xbps-static<0.16.3_2 libxbps-devel>=0" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove usr/lib/pkgconfig + } +} + +xbps-static_package() { + depends="xbps-triggers" + short_desc="${short_desc} - static binaries" + replaces="xbps-static>=0" + pkg_install() { + vmove "usr/sbin/*.static" + } +} + +xbps-tests_package() { + short_desc="${short_desc} - Kyua testsuite" + replaces="xbps<0.16.3_2 xbps-tests>=0" + pkg_install() { + vmove usr/tests + } +} + +xbps_package() { + depends="xbps-triggers" + conf_files="/etc/xbps/xbps.conf" + replaces="xbps>=0" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xbps/xbps-static.template b/srcpkgs/xbps/xbps-static.template deleted file mode 100644 index 60ed68bfe5a..00000000000 --- a/srcpkgs/xbps/xbps-static.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'xbps-static'. -# -depends="xbps-triggers" -short_desc="${short_desc} - static binaries" -replaces="xbps-static>=0" - -do_install() { - vmove "usr/sbin/*.static" usr/sbin -} diff --git a/srcpkgs/xbps/xbps-tests.template b/srcpkgs/xbps/xbps-tests.template deleted file mode 100644 index 987c409b2de..00000000000 --- a/srcpkgs/xbps/xbps-tests.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'xbps-tests'. -# -short_desc="${short_desc} - Kyua testsuite" -replaces="xbps<0.16.3_2 xbps-tests>=0" - -do_install() { - vmove usr/tests usr -} diff --git a/srcpkgs/xcb-util-image/template b/srcpkgs/xcb-util-image/template index f1fadf4f7d1..3158c41fae3 100644 --- a/srcpkgs/xcb-util-image/template +++ b/srcpkgs/xcb-util-image/template @@ -1,10 +1,11 @@ # Template build for 'xcb-util-image'. pkgname=xcb-util-image version=0.3.9 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9" +hostmakedepends="pkg-config" +makedepends="libxcb-devel>=1.8 xcb-util-devel>=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" @@ -14,5 +15,18 @@ checksum=d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df long_desc=" This package provides a port of Xlib's XImage and XShmImage functions for XCB." -subpackages="$pkgname-devel" -replaces="xcb-util<0.3.9" +xcb-util-image-devel_package() { + depends="libxcb-devel xcb-util-image>=${version}" + short_desc="${sourcepkg} -- 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-image/xcb-util-image-devel.template b/srcpkgs/xcb-util-image/xcb-util-image-devel.template deleted file mode 100644 index 291c82404b5..00000000000 --- a/srcpkgs/xcb-util-image/xcb-util-image-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'xcb-util-image-devel'. -# -noarch=yes -depends="libxcb-devel xcb-util-image>=${version}" -short_desc="${sourcepkg} -- 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/xcb-util-keysyms/template b/srcpkgs/xcb-util-keysyms/template index a915a854a97..c57046c53d4 100644 --- a/srcpkgs/xcb-util-keysyms/template +++ b/srcpkgs/xcb-util-keysyms/template @@ -1,10 +1,11 @@ # Template build for 'xcb-util-keysyms'. pkgname=xcb-util-keysyms version=0.3.9 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9" +hostmakedepends="pkg-config" +makedepends="libxcb-devel>=1.8 xcb-util-devel>=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" @@ -15,5 +16,18 @@ long_desc=" This package provides a port for Standard X key constants and conversion to/from keycodes for XCB." -subpackages="$pkgname-devel" -replaces="xcb-util<0.3.9" +xcb-util-keysyms-devel_package() { + depends="libxcb-devel xcb-util-keysyms>=${version}" + short_desc="${sourcepkg} -- 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-keysyms/xcb-util-keysyms-devel.template b/srcpkgs/xcb-util-keysyms/xcb-util-keysyms-devel.template deleted file mode 100644 index 739be68d43c..00000000000 --- a/srcpkgs/xcb-util-keysyms/xcb-util-keysyms-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'xcb-util-keysyms-devel'. -# -noarch=yes -depends="libxcb-devel xcb-util-keysyms>=${version}" -short_desc="${sourcepkg} -- 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/xcb-util-wm/template b/srcpkgs/xcb-util-wm/template index c84b4b979e0..dd0218f830d 100644 --- a/srcpkgs/xcb-util-wm/template +++ b/srcpkgs/xcb-util-wm/template @@ -1,10 +1,11 @@ # Template build for 'xcb-util-wm'. pkgname=xcb-util-wm version=0.3.9 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-static" -makedepends="pkg-config libxcb-devel>=1.8 xcb-util-devel>=0.3.9" +hostmakedepends="pkg-config" +makedepends="libxcb-devel>=1.8 xcb-util-devel>=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" @@ -14,5 +15,18 @@ checksum=038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030 long_desc=" This package provides client and window-manager helpers for ICCCM for XCB." -subpackages="$pkgname-devel" -replaces="xcb-util<0.3.9" +xcb-util-wm-devel_package() { + depends="libxcb-devel xcb-util-wm>=${version}" + short_desc="${sourcepkg} -- 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-wm/xcb-util-wm-devel.template b/srcpkgs/xcb-util-wm/xcb-util-wm-devel.template deleted file mode 100644 index 2ff8d707688..00000000000 --- a/srcpkgs/xcb-util-wm/xcb-util-wm-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'xcb-util-wm-devel'. -# -noarch=yes -depends="libxcb-devel xcb-util-wm>=${version}" -short_desc="${sourcepkg} -- 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/xcmiscproto/template b/srcpkgs/xcmiscproto/template index 84df2e745a0..eb9f715f641 100644 --- a/srcpkgs/xcmiscproto/template +++ b/srcpkgs/xcmiscproto/template @@ -1,15 +1,20 @@ # Template build file for 'xcmiscproto'. pkgname=xcmiscproto version=1.2.0 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="XCMisc extension headers from X.org" homepage="http://xorg.freedesktop.org" 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." -noarch=yes +xcmiscproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xcmsdb/template b/srcpkgs/xcmsdb/template index c5c6521ac49..5306cba82ad 100644 --- a/srcpkgs/xcmsdb/template +++ b/srcpkgs/xcmsdb/template @@ -1,17 +1,23 @@ # Template build file for 'xcmsdb'. pkgname=xcmsdb version=1.0.3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Device Color Characterization utility for X" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=b237d060f1eed71fa2bfe089b7fb04508299e1a49091a7d7b0e536f8344d5a80 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 389111be463..0a4327a03ee 100644 --- a/srcpkgs/xcursorgen/template +++ b/srcpkgs/xcursorgen/template @@ -3,7 +3,8 @@ pkgname=xcursorgen version=1.0.4 revision=3 build_style=gnu-configure -makedepends="pkg-config libX11-devel libXcursor-devel libXrender-devel libXfixes-devel libpng-devel>=1.5.10" +hostmakedepends="pkg-config" +makedepends="libX11-devel libXcursor-devel libXrender-devel libXfixes-devel libpng-devel>=1.5.10" short_desc="X cursor generator" homepage="http://xorg.freedesktop.org" license="MIT" @@ -12,3 +13,9 @@ 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 d8ee0b18728..a23a8b4dbc9 100644 --- a/srcpkgs/xdelta3/template +++ b/srcpkgs/xdelta3/template @@ -14,3 +14,9 @@ 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 95d5bda1349..b834a09d842 100644 --- a/srcpkgs/xdg-user-dirs-gtk/template +++ b/srcpkgs/xdg-user-dirs-gtk/template @@ -3,11 +3,18 @@ pkgname=xdg-user-dirs-gtk version=0.10 revision=1 build_style=gnu-configure -makedepends="pkg-config intltool gtk+3-devel" -fulldepends="xdg-user-dirs" +hostmakedepends="pkg-config intltool" +makedepends="gtk+3-devel 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 b53f42f850b..8ec6e1224a7 100644 --- a/srcpkgs/xdg-user-dirs/template +++ b/srcpkgs/xdg-user-dirs/template @@ -1,20 +1,25 @@ # Template file for 'xdg-user-dirs' pkgname=xdg-user-dirs version=0.14 -homepage="http://www.freedesktop.org/wiki/Software/xdg-user-dirs" -distfiles="http://user-dirs.freedesktop.org/releases/$pkgname-$version.tar.gz" -build_style=gnu-configure revision=1 +build_style=gnu-configure short_desc="Tool to help manage user directories" maintainer="Juan RP " license="GPL-2" +homepage="http://www.freedesktop.org/wiki/Software/xdg-user-dirs" +distfiles="http://user-dirs.freedesktop.org/releases/$pkgname-$version.tar.gz" checksum=5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255 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." -conf_files=" -/etc/xdg/user-dirs.conf -/etc/xdg/user-dirs.defaults" - +xdg-user-dirs_package() { + conf_files=" + /etc/xdg/user-dirs.conf + /etc/xdg/user-dirs.defaults" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xdg-utils/template b/srcpkgs/xdg-utils/template index 86d6738a868..c5bfc2f24f1 100644 --- a/srcpkgs/xdg-utils/template +++ b/srcpkgs/xdg-utils/template @@ -1,13 +1,13 @@ # Template file for 'xdg-utils' pkgname=xdg-utils version=1.0.2 -distfiles="http://portland.freedesktop.org/download/$pkgname-$version.tgz" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="Tools to assist applications with various desktop integration tasks" homepage="http://portland.freedesktop.org/" 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 @@ -34,4 +34,9 @@ long_desc=" provide custom scripts, and the third party software should still continue to work." -noarch=yes +xdg-utils_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xdot/template b/srcpkgs/xdot/template index c9cbc35b29b..65f8b35a076 100644 --- a/srcpkgs/xdot/template +++ b/srcpkgs/xdot/template @@ -3,19 +3,26 @@ pkgname=xdot version=20130128 revision=1 build_style=python-module -fulldepends="graphviz pygtk python-distribute xbps-triggers>=0.46" +makedepends="graphviz pygtk python-distribute xbps-triggers>=0.46" short_desc="Interactive viewer for Graphviz dot files" maintainer="Juan RP " license="GPL-3" homepage="https://code.google.com/p/jrfonseca/wiki/XDot" -noarch=yes nofetch=yes noextract=yes -pycompile_module="xdot.py" 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 54d3b303a02..a328230aaca 100644 --- a/srcpkgs/xdpyinfo/template +++ b/srcpkgs/xdpyinfo/template @@ -1,19 +1,23 @@ # Template build file for 'xdpyinfo'. pkgname=xdpyinfo version=1.2.0 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config libXext-devel libXtst-devel libXxf86vm-devel +hostmakedepends="pkg-config" +makedepends="libXext-devel libXtst-devel libXxf86vm-devel libXxf86misc-devel libXrender-devel libXcomposite-devel libXinerama-devel libdmx-devel" short_desc="Display information utility for X" homepage="http://xorg.freedesktop.org" 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. - - This is from the modular X.org X11 project." + 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 cbd0bcfed8c..8cf8b731d30 100644 --- a/srcpkgs/xdriinfo/template +++ b/srcpkgs/xdriinfo/template @@ -2,17 +2,22 @@ pkgname=xdriinfo version=1.0.4 revision=3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" build_style=gnu-configure -makedepends="pkg-config libX11-devel MesaLib-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel MesaLib-devel" short_desc="X.org DRI information utility" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c 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 a5f603fad7b..1f4b30c598c 100644 --- a/srcpkgs/xen/template +++ b/srcpkgs/xen/template @@ -3,16 +3,11 @@ pkgname=xen version=4.1.2 wrksrc=xen-${version} revision=2 -broken_as_needed=yes -nostrip=yes -pycompile_module="xen grub" -subpackages="xen-devel" -depends="iproute2 bridge-utils" makedepends="which lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.1.5 libbluetooth-devel pciutils-devel libX11-devel libXext-devel SDL-devel MesaLib-devel ncurses-devel liblzma-devel python-devel dev86 acpica-utils wget git" if [ "${XBPS_MACHINE}" = "x86_64" ]; then - makedepends="${makedepends} gcc-multilib" + makedepends+=" gcc-multilib" fi short_desc="Xen Hypervisor and Utilities" maintainer="Juan RP " @@ -24,24 +19,7 @@ long_desc=" This package provides the official Xen Hypervisor and related utilities for starting/stopping/accessing unprivileged domains (domUs)." -make_dirs=" -/var/run/xenstored 755 root root -/var/run/xend/boot 755 root root -/var/lib/xenstored 755 root root -/var/lib/xen/xenpaging 755 root root -/var/xen/dump 755 root root -/var/log/xen 755 root root -/var/lock/subsys 755 root root -/etc/xen/auto 755 root root" - -conf_files=" -/etc/default/xendomains -/etc/default/xencommons -/etc/xen/xm-config.xml -/etc/xen/xl.conf -/etc/xen/xend-config.sxp -/etc/xen/xend-pci-quirks.sxp -/etc/xen/xend-pci-permissive.sxp" +broken_as_needed=yes do_build() { install -d ${DESTDIR} @@ -70,3 +48,39 @@ do_install() { mv ${DESTDIR}/etc/xen/xmexample* ${DESTDIR}/usr/share/examples/xen mv ${DESTDIR}/etc/xen/cpupool ${DESTDIR}/usr/share/examples/xen } + +xen-devel_package() { + depends="xen" + short_desc="${sourcepkg} development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/lib*.*a" + } +} + +xen_package() { + make_dirs=" + /var/run/xenstored 755 root root + /var/run/xend/boot 755 root root + /var/lib/xenstored 755 root root + /var/lib/xen/xenpaging 755 root root + /var/xen/dump 755 root root + /var/log/xen 755 root root + /var/lock/subsys 755 root root + /etc/xen/auto 755 root root" + conf_files=" + /etc/default/xendomains + /etc/default/xencommons + /etc/xen/xm-config.xml + /etc/xen/xl.conf + /etc/xen/xend-config.sxp + /etc/xen/xend-pci-quirks.sxp + /etc/xen/xend-pci-permissive.sxp" + pycompile_module="xen grub" + depends="iproute2 bridge-utils" + nostrip=yes + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xen/xen-devel.template b/srcpkgs/xen/xen-devel.template deleted file mode 100644 index 3ead5a28488..00000000000 --- a/srcpkgs/xen/xen-devel.template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'xen-devel'. -# -depends="xen" -short_desc="${sourcepkg} 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/lib*.*a" usr/lib -} diff --git a/srcpkgs/xev/template b/srcpkgs/xev/template index 41f39431f5d..3ae8592339d 100644 --- a/srcpkgs/xev/template +++ b/srcpkgs/xev/template @@ -1,20 +1,24 @@ # Template build file for 'xev'. pkgname=xev version=1.1.0 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Display X events" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=3859c268edb26ad0484281a244a567ef2f70ba5f91f4b5dfd37799255ccf01c6 long_desc=" Xev is an X11 debugging tool. Xev creates a window (or can attach 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). - - This is the version of xev maintained by Xorg." + resized, typed in, clicked in, etc cetera)." +xev_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-input-evdev/template b/srcpkgs/xf86-input-evdev/template index 73554118af9..b83476f64ab 100644 --- a/srcpkgs/xf86-input-evdev/template +++ b/srcpkgs/xf86-input-evdev/template @@ -3,8 +3,6 @@ pkgname=xf86-input-evdev version=2.8.0 revision=1 build_style=gnu-configure -subpackages="${pkgname}-devel" -depends="xserver-abi-input>=18<19" hostmakedepends="pkg-config" makedepends="xorg-server-devel>=1.13.3_3 mtdev-devel" short_desc="Xorg event device input driver" @@ -13,3 +11,19 @@ homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=2f5b4403955f8e82603acff7f8f21a67e89a7c0230e1506c6924c4b9dd8f0e57 + +xf86-input-evdev-devel_package() { + depends="xorg-server-devel ${sourcepkg}>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +xf86-input-evdev_package() { + depends="xserver-abi-input>=18<19" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template b/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template deleted file mode 100644 index db660c8f836..00000000000 --- a/srcpkgs/xf86-input-evdev/xf86-input-evdev-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'xf86-input-evdev-devel'. -# -depends="xorg-server-devel ${sourcepkg}>=${version}" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/xf86-input-joystick/template b/srcpkgs/xf86-input-joystick/template index 85e7643f129..e8b1802703e 100644 --- a/srcpkgs/xf86-input-joystick/template +++ b/srcpkgs/xf86-input-joystick/template @@ -1,10 +1,8 @@ # Template build file for 'xf86-input-joystick'. pkgname=xf86-input-joystick version=1.6.2 -revision=1 +revision=2 build_style=gnu-configure -subpackages="${pkgname}-devel" -depends="xserver-abi-input>=18<19" makedepends="xorg-server-devel>=1.13.1" short_desc="Joystick Input driver for Xorg" maintainer="Juan RP " @@ -16,3 +14,19 @@ checksum=ee3b86ed72f3b5befdeed39909320f4b6970401cfbcc2cc0dfd8fb1c1576150d post_install() { vinstall ${FILESDIR}/50-joystick.conf 644 etc/X11/xorg.conf.d } + +xf86-input-joystick-devel_package() { + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +xf86-input-joystick_package() { + depends="xserver-abi-input>=18<19" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template b/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template deleted file mode 100644 index 57577afcc22..00000000000 --- a/srcpkgs/xf86-input-joystick/xf86-input-joystick-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'xf86-input-joystick-devel'. -# -short_desc="${short_desc} -- development files" -noarch=yes - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/xf86-input-synaptics/template b/srcpkgs/xf86-input-synaptics/template index 7c4ffb0af83..88ee6ef4977 100644 --- a/srcpkgs/xf86-input-synaptics/template +++ b/srcpkgs/xf86-input-synaptics/template @@ -1,10 +1,8 @@ # Template build file for 'xf86-input-synaptics'. pkgname=xf86-input-synaptics version=1.6.3 -revision=1 +revision=2 build_style=gnu-configure -subpackages="${pkgname}-devel" -depends="xserver-abi-input>=18<19" makedepends="pkg-config libX11-devel libXtst-devel mtdev-devel pixman-devel libpciaccess-devel xorg-server-devel>=1.13.1" short_desc="Xorg synaptics touchpad input driver" @@ -13,3 +11,18 @@ homepage="http://www.x.org/" license="MIT" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=b40c9dbd5f743ff1eb2ac81a23b9676df72e76ed3fa6408de3f8a3a260248604 + +xf86-input-synaptics-devel_package() { + short_desc="${sourcepkg} development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +xf86-input-synaptics_package() { + depends="xserver-abi-input>=18<19" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template b/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template deleted file mode 100644 index 208a41113fd..00000000000 --- a/srcpkgs/xf86-input-synaptics/xf86-input-synaptics-devel.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'xf86-input-synaptics-devel'. -# -noarch=yes -short_desc="${sourcepkg} 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/xf86-input-vmmouse/template b/srcpkgs/xf86-input-vmmouse/template index 07592a7af3a..758814b031f 100644 --- a/srcpkgs/xf86-input-vmmouse/template +++ b/srcpkgs/xf86-input-vmmouse/template @@ -3,7 +3,6 @@ pkgname=xf86-input-vmmouse version=13.0.0 revision=1 build_style=gnu-configure -depends="xserver-abi-input>=18<19" makedepends="xorg-server-devel>=1.13.1" short_desc="Xorg VMware virtual mouse input driver" maintainer="Juan RP " @@ -16,3 +15,10 @@ post_install() { # Remove HAL stuff, it's obsolete. rm -rf ${DESTDIR}/usr/{lib,share}/hal } + +xf86-input-vmmouse_package() { + depends="xserver-abi-input>=18<19" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-input-wacom/template b/srcpkgs/xf86-input-wacom/template index 487ca5938c8..00f781447e6 100644 --- a/srcpkgs/xf86-input-wacom/template +++ b/srcpkgs/xf86-input-wacom/template @@ -1,10 +1,8 @@ # Template build file for 'xf86-input-wacom'. pkgname=xf86-input-wacom version=0.19.0 -revision=1 +revision=2 build_style=gnu-configure -subpackages="${pkgname}-devel" -depends="xserver-abi-input>=18<19" makedepends="xorg-server-devel>=1.13.1 libXrandr-devel libXinerama-devel libXi-devel" short_desc="Xorg Wacom tablet input driver" maintainer="Juan RP " @@ -16,3 +14,18 @@ checksum=a3d8f3ee2e8f896a577e67cb4fb36c384b1405c33c4b528268a06b2f73847bd2 post_install() { vinstall ${FILESDIR}/70-wacom.rules 644 usr/lib/udev/rules.d } + +xf86-input-wacom-devel_package() { + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +xf86-input-wacom_package() { + depends="xserver-abi-input>=18<19" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-input-wacom/xf86-input-wacom-devel.template b/srcpkgs/xf86-input-wacom/xf86-input-wacom-devel.template deleted file mode 100644 index 75a95c96d9a..00000000000 --- a/srcpkgs/xf86-input-wacom/xf86-input-wacom-devel.template +++ /dev/null @@ -1,9 +0,0 @@ -# Template file for 'xf86-input-wacom-devel'. -# -short_desc="${short_desc} -- development files" -noarch=yes - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib -} diff --git a/srcpkgs/xf86-video-ati/template b/srcpkgs/xf86-video-ati/template index 3bf18bb35c5..f94453a3e18 100644 --- a/srcpkgs/xf86-video-ati/template +++ b/srcpkgs/xf86-video-ati/template @@ -3,8 +3,6 @@ pkgname=xf86-video-ati version=7.1.0 revision=1 build_style=gnu-configure -replaces="${pkgname}>=0" -depends="xserver-abi-video>=13<14 mesa-ati-dri" makedepends="pkg-config xf86driproto libudev-devel>=183 libpciaccess-devel libdrm-devel pixman-devel MesaLib-devel>=9.0.2 xorg-server-devel>=1.13<1.14" short_desc="Xorg ATI Radeon video driver" @@ -13,3 +11,11 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd + +xf86-video-ati_package() { + replaces="xf86-video-ati>=0" + depends="xserver-abi-video>=13<14 mesa-ati-dri" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template index 81143166482..997ecc52402 100644 --- a/srcpkgs/xf86-video-cirrus/template +++ b/srcpkgs/xf86-video-cirrus/template @@ -3,7 +3,6 @@ pkgname=xf86-video-cirrus version=1.5.1 revision=2 build_style=gnu-configure -depends="xserver-abi-video>=13<14" makedepends="pkg-config xorg-server-devel>=1.13<1.14" short_desc="Xorg Cirrus Logic video driver" homepage="http://xorg.freedesktop.org" @@ -13,3 +12,10 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557 long_desc=" This is the X11 video driver for Cirrus Logic video cards." + +xf86-video-cirrus_package() { + depends="xserver-abi-video>=13<14" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-geode/template b/srcpkgs/xf86-video-geode/template index 105fdd63476..77b7c27ed8e 100644 --- a/srcpkgs/xf86-video-geode/template +++ b/srcpkgs/xf86-video-geode/template @@ -14,6 +14,11 @@ long_desc=" # This is x86 specific. only_for_archs=i686 - -depends="xserver-abi-video>=13<14" makedepends="pkg-config libXv-devel libXrandr-devel xorg-server-devel>=1.13<1.14" + +xf86-video-geode_package() { + depends="xserver-abi-video>=13<14" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-intel/template b/srcpkgs/xf86-video-intel/template index 811044a90fd..f8824d57ece 100644 --- a/srcpkgs/xf86-video-intel/template +++ b/srcpkgs/xf86-video-intel/template @@ -4,7 +4,6 @@ version=2.21.6 revision=1 build_style=gnu-configure configure_args="--with-default-accel=sna --enable-kms-only --enable-sna" -depends="xserver-abi-video>=13<14 mesa-intel-dri" 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.13<1.14" @@ -18,3 +17,10 @@ checksum=c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9 post_install() { vinstall COPYING 644 usr/share/licenses/${pkgname} } + +xf86-video-intel_package() { + depends="xserver-abi-video>=13<14 mesa-intel-dri" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-modesetting/template b/srcpkgs/xf86-video-modesetting/template index 738498f898c..93c71baa822 100644 --- a/srcpkgs/xf86-video-modesetting/template +++ b/srcpkgs/xf86-video-modesetting/template @@ -3,7 +3,6 @@ pkgname=xf86-video-modesetting version=0.7.0 revision=1 build_style=gnu-configure -depends="xserver-abi-video>=13<14" hostmakedepends="pkg-config" makedepends="libdrm-devel>=2.4.37 xorg-server-devel>=1.13<1.14" short_desc="X.org generic modesetting video driver" @@ -12,3 +11,10 @@ homepage="http://xorg.freedesktop.org/" license="MIT" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=2bc55f776eaee7b4e13df13238d36c4facf1cdca095a11519baf2376f5c996ac + +xf86-video-modesetting_package() { + depends="xserver-abi-video>=13<14" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-nouveau/template b/srcpkgs/xf86-video-nouveau/template index bf5a3a7e4f0..8d2c940a613 100644 --- a/srcpkgs/xf86-video-nouveau/template +++ b/srcpkgs/xf86-video-nouveau/template @@ -3,7 +3,6 @@ pkgname=xf86-video-nouveau version=1.0.7 revision=1 build_style=gnu-configure -depends="xserver-abi-video>=13<14 mesa-nouveau-dri" hostmakedepends="pkg-config" makedepends="libudev-devel>=183 libdrm-devel xorg-server-devel>=1.13<1.14" short_desc="Xorg opensource NVIDIA video driver" @@ -12,3 +11,10 @@ homepage="http://nouveau.freedesktop.org/wiki/" license="GPL-2" distfiles="http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${version}.tar.bz2" checksum=d187c658e1823ca829c941f3f601f8e7220d427e079c3e52b94ecff45bc2e131 + +xf86-video-nouveau_package() { + depends="xserver-abi-video>=13<14 mesa-nouveau-dri" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-openchrome/template b/srcpkgs/xf86-video-openchrome/template index 5134362ddfe..77b6f5ac7a8 100644 --- a/srcpkgs/xf86-video-openchrome/template +++ b/srcpkgs/xf86-video-openchrome/template @@ -4,7 +4,6 @@ version=0.3.1 revision=2 only_for_archs=i686 build_style=gnu-configure -depends="xserver-abi-video>=13<14" hostmakedepends="pkg-config" makedepends="libdrm-devel libX11-devel libXext-devel libXv-devel libXvMC-devel MesaLib-devel xorg-server-devel>=1.13<1.14" @@ -16,3 +15,10 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" checksum=eb459a86e20fa090577315a0d9964bf3f94abc5241c5408453f326eaf8915ce7 long_desc=" This is the X11 video driver for VIA Unichromes video cards." + +xf86-video-openchrome_package() { + depends="xserver-abi-video>=13<14" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-qxl/template b/srcpkgs/xf86-video-qxl/template index 75900ccf2af..422fbe8b900 100644 --- a/srcpkgs/xf86-video-qxl/template +++ b/srcpkgs/xf86-video-qxl/template @@ -4,7 +4,6 @@ version=0.1.0 revision=3 build_style=gnu-configure configure_args="--enable-xspice=yes" -depends="xserver-abi-video>=13<14 spice>=0.12" makedepends="pkg-config xf86dgaproto spice-protocol>=0.12.2 spice-devel>=0.12 xorg-server-devel>=1.13<1.14" short_desc="Modular Xorg QXL virtual video driver" @@ -15,3 +14,10 @@ distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=5ca3c1039fc195e73fa68558d0d7ee2b97cf10f4e7474ca533732a5d39ebbce5 long_desc=" This is the QXL virtual video driver for the modular Xorg server." + +xf86-video-qxl_package() { + depends="xserver-abi-video>=13<14 spice>=0.12" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-sisusb/template b/srcpkgs/xf86-video-sisusb/template index afd1e0074fa..a94d8bb820c 100644 --- a/srcpkgs/xf86-video-sisusb/template +++ b/srcpkgs/xf86-video-sisusb/template @@ -3,7 +3,6 @@ pkgname=xf86-video-sisusb version=0.9.6 revision=2 build_style=gnu-configure -depends="xserver-abi-video>=13<14" makedepends="pkg-config xorg-server-devel>=1.13<1.14" short_desc="Xorg SiS USB video driver" homepage="http://xorg.freedesktop.org/" @@ -15,3 +14,10 @@ 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>=13<14" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-vesa/template b/srcpkgs/xf86-video-vesa/template index 92e582859fc..cbcb14b8976 100644 --- a/srcpkgs/xf86-video-vesa/template +++ b/srcpkgs/xf86-video-vesa/template @@ -5,7 +5,6 @@ version="2:${_distver}" wrksrc="${pkgname}-${_distver}" revision=4 build_style=gnu-configure -depends="xserver-abi-video>=13<14" makedepends="automake pkg-config xorg-util-macros xorg-server-devel>=1.13<1.14" short_desc="Xorg VESA video driver" homepage="http://xorg.freedesktop.org" @@ -15,3 +14,10 @@ distfiles="${XORG_SITE}/driver/${pkgname}-${_distver}.tar.bz2" checksum=144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3 long_desc=" This is the X11 video driver for Generic VESA video cards." + +xf86-video-vesa_package() { + depends="xserver-abi-video>=13<14" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86-video-vmware/template b/srcpkgs/xf86-video-vmware/template index 099d0f5a836..fbb12838022 100644 --- a/srcpkgs/xf86-video-vmware/template +++ b/srcpkgs/xf86-video-vmware/template @@ -4,7 +4,6 @@ version=13.0.0 revision=1 build_style=gnu-configure configure_args="--enable-vmwarectrl-client" -depends="xserver-abi-video>=13<14 mesa-vmwgfx-dri" makedepends="pkg-config libdrm-devel MesaLib-devel>=9.0.1 xorg-server-devel>=1.13<1.14" short_desc="Modular Xorg VMware virtual video driver" @@ -13,3 +12,10 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2" checksum=44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6 + +xf86-video-vmware_package() { + depends="xserver-abi-video>=13<14 mesa-vmwgfx-dri" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86bigfontproto/template b/srcpkgs/xf86bigfontproto/template index df59b09f827..0647dfb597b 100644 --- a/srcpkgs/xf86bigfontproto/template +++ b/srcpkgs/xf86bigfontproto/template @@ -1,15 +1,20 @@ # Template build file for 'xf86bigfontproto'. pkgname=xf86bigfontproto version=1.2.0 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="XF86BigFont extension headers from X.org" homepage="http://xorg.freedesktop.org" 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." -noarch=yes +xf86bigfontproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86dgaproto/template b/srcpkgs/xf86dgaproto/template index 723bdabd2e3..41106395401 100644 --- a/srcpkgs/xf86dgaproto/template +++ b/srcpkgs/xf86dgaproto/template @@ -1,15 +1,20 @@ # Template build file for 'xf86dgaproto'. pkgname=xf86dgaproto version=2.1 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="XF86DGA extension headers" homepage="http://xorg.freedesktop.org" 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." -noarch=yes +xf86dgaproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86driproto/template b/srcpkgs/xf86driproto/template index d3a5ef3e27d..e38e83db885 100644 --- a/srcpkgs/xf86driproto/template +++ b/srcpkgs/xf86driproto/template @@ -1,13 +1,13 @@ # Template build file for 'xf86driproto'. pkgname=xf86driproto version=2.1.1 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=1 +build_style=gnu-configure short_desc="XF86DRI extension headers from modular X.org" maintainer="Juan RP " 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 @@ -17,9 +17,13 @@ long_desc=" between a DRI (direct rendering infrastructure) driver and driver loader." -noarch=yes - -post_install() -{ +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 a3f3696015c..02e5d1d7501 100644 --- a/srcpkgs/xf86miscproto/template +++ b/srcpkgs/xf86miscproto/template @@ -1,16 +1,21 @@ # Template build file for 'xf86miscproto'. pkgname=xf86miscproto version=0.9.2 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="XF86Misc extension headers from modular X.org" homepage="http://xorg.freedesktop.org" 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." -noarch=yes +xf86miscproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xf86vidmodeproto/template b/srcpkgs/xf86vidmodeproto/template index c887d4fb864..5bc437a8806 100644 --- a/srcpkgs/xf86vidmodeproto/template +++ b/srcpkgs/xf86vidmodeproto/template @@ -1,16 +1,21 @@ # Template build file for 'xf86vidmodeproto'. pkgname=xf86vidmodeproto version=2.3 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="XF86VidMode extension headers from modular X.org" homepage="http://xorg.freedesktop.org" 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." -noarch=yes +xf86vidmodeproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfburn/template b/srcpkgs/xfburn/template index b424fef3fdb..7c569723d52 100644 --- a/srcpkgs/xfburn/template +++ b/srcpkgs/xfburn/template @@ -6,8 +6,7 @@ build_style=gnu-configure 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" - + libxfcegui4-devel>=4.10.0_2 exo-devel gst-plugins-base-devel" short_desc="CD-burner application for Xfce Desktop Environment" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/applications/xfburn" @@ -24,3 +23,10 @@ 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 fd11eab1c8b..579afc57111 100644 --- a/srcpkgs/xfce-utils/template +++ b/srcpkgs/xfce-utils/template @@ -1,21 +1,24 @@ # Template file for 'xfce-utils' pkgname=xfce-utils version=4.8.2 -distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=1 -makedepends="pkg-config intltool libxfce4ui-devel libxfce4util-devel gtk+-devel dbus-glib-devel" -fulldepends="xfconf-perl hicolor-icon-theme desktop-file-utils" +build_style=gnu-configure +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" short_desc="Utilities for the Xfce Desktop Environment" maintainer="Juan RP " homepage="http://www.xfce.org/" license="GPL-2" +distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$version.tar.bz2" checksum=a12b708b0cd19ffa07afb2ab2cd1bf9377ff7fbbfbe16d7493a5bb973bcb0aa5 long_desc=" This package includes utilities for the Xfce Desktop Environment." - - - - -# xfconf-perl is required by the xfconf-migration script. +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 847518cb0ab..9f607ac2da0 100644 --- a/srcpkgs/xfce4-appfinder/template +++ b/srcpkgs/xfce4-appfinder/template @@ -1,19 +1,22 @@ # Template file for 'xfce4-appfinder' pkgname=xfce4-appfinder version=4.10.0 -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2" -build_style=gnu-configure -depends="desktop-file-utils hicolor-icon-theme" -makedepends="pkg-config intltool gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel" revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool" +makedepends="gtk+-devel garcon-devel libxfce4util-devel libxfce4ui-devel xfconf-devel" short_desc="Appfinder for the Xfce Desktop Environment" maintainer="Juan RP " license="GPL-2" +homepage="http://xfce.org" +distfiles="http://archive.xfce.org/src/xfce/xfce4-appfinder/4.10/$pkgname-$version.tar.bz2" checksum=042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439 long_desc=" xfce-appfinder shows system wide installed applications." - - - +xfce4-appfinder_package() { + depends="desktop-file-utils hicolor-icon-theme" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfce4-mixer/template b/srcpkgs/xfce4-mixer/template index 328e8dc1391..393a897692b 100644 --- a/srcpkgs/xfce4-mixer/template +++ b/srcpkgs/xfce4-mixer/template @@ -3,7 +3,6 @@ pkgname=xfce4-mixer version=4.10.0 revision=1 build_style=gnu-configure -depends="desktop-file-utils hicolor-icon-theme" makedepends="pkg-config intltool gtk+-devel gstreamer-devel gst-plugins-base-devel libxfce4util-devel libxfce4ui-devel xfconf-devel xfce4-panel-devel libunique1-devel" @@ -15,3 +14,10 @@ distfiles="http://archive.xfce.org/src/apps/$pkgname/4.10/$pkgname-$version.tar. 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 9cc24297f73..e947bfd1fb3 100644 --- a/srcpkgs/xfce4-notifyd/template +++ b/srcpkgs/xfce4-notifyd/template @@ -2,24 +2,25 @@ pkgname=xfce4-notifyd version=0.2.2 revision=2 -distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2" build_style=gnu-configure -depends="hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool libxfce4util-devel libxfce4ui-devel" +hostmakedepends="pkg-config intltool" +makedepends="libxfce4util-devel libxfce4ui-devel" short_desc="Simple, visually-appealing notification daemon for Xfce" homepage="http://goodies.xfce.org/projects/applications/xfce4-notifyd" license="GPL-2" maintainer="Juan RP " +distfiles="http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$version.tar.bz2" checksum=b66e68dfc2164bcf479acd3c7e8b6f83065d23aef988535e2db3506d06a39168 long_desc=" Xfce4-notifyd is a simple, visually-appealing notification daemon for Xfce that implements the Freedesktop.org Desktop Notifications Specification." -provides="notification-daemon-${version}" -conflicts="notification-daemon>=0" -replaces="notification-daemon>=0" - - - - - +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 usr + } +} diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template index be18e5730ae..93dbcbeaaad 100644 --- a/srcpkgs/xfce4-panel/template +++ b/srcpkgs/xfce4-panel/template @@ -1,21 +1,33 @@ # Template:wq file for 'xfce4-panel' pkgname=xfce4-panel version=4.10.0 -distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$version.tar.bz2" +revision=2 build_style=gnu-configure configure_args="--disable-static" -depends="hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool libxfce4util-devel libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel>=2.30.6_1 garcon-devel exo-devel" -revision=1 +makedepends="pkg-config intltool" +makedepends="libxfce4util-devel libxfce4ui-devel gtk+-devel xfconf-devel + dbus-glib-devel libwnck2-devel>=2.30.6_1 garcon-devel exo-devel" short_desc="Next generation panel for Xfce" maintainer="Juan RP " homepage="http://www.xfce.org/" license="GPL-2" +distfiles="http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$version.tar.bz2" checksum=3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9 long_desc=" This package includes the panel for the Xfce desktop environment." +xfce4-panel-devel_package() { + depends="libglib-devel gtk+-devel libxfce4util-devel xfce4-panel>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + } +} -subpackages="$pkgname-devel" - - +xfce4-panel_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfce4-panel/xfce4-panel-devel.template b/srcpkgs/xfce4-panel/xfce4-panel-devel.template deleted file mode 100644 index ab112d65cd1..00000000000 --- a/srcpkgs/xfce4-panel/xfce4-panel-devel.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'xfce4-panel-devel'. -# -depends="glib-devel gtk+-devel libxfce4util-devel xfce4-panel>=4.10.0" -short_desc="${short_desc} - 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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index 63279caf94a..7cdb3530fba 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -1,21 +1,26 @@ # Template file for 'xfce4-power-manager' pkgname=xfce4-power-manager version=1.2.0 -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/xfce/xfce4-power-manager/1.2/$pkgname-$version.tar.bz2" +revision=1 build_style=gnu-configure configure_args="--enable-polkit --enable-dpms --disable-debug --enable-network-manager --disable-static" -depends="upower udisks hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool libxfce4ui-devel libxfce4util-devel xfconf-devel libnotify-devel gtk+-devel libXrandr-devel dbus-glib-devel xfce4-panel-devel NetworkManager-devel" -revision=1 +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" short_desc="Xfce power manager" maintainer="Juan RP " license="GPL-2" +homepage="http://xfce.org" +distfiles="http://archive.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-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template index cf83028a85b..0c73aaa1155 100644 --- a/srcpkgs/xfce4-sensors-plugin/template +++ b/srcpkgs/xfce4-sensors-plugin/template @@ -4,9 +4,8 @@ version=1.2.5 revision=1 build_style=gnu-configure configure_args="--disable-static" - -makedepends="pkg-config intltool libsensors-devel libxfce4ui-devel xfce4-panel-devel libnotify-devel" -depends="hicolor-icon-theme desktop-file-utils" +hostmakedepends="pkg-config intltool" +makedepends="libsensors-devel libxfce4ui-devel xfce4-panel-devel libnotify-devel" short_desc="XFCE sensors plugin" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin" @@ -18,3 +17,10 @@ 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 86cebb28153..4dad0ee2077 100644 --- a/srcpkgs/xfce4-session/template +++ b/srcpkgs/xfce4-session/template @@ -1,13 +1,12 @@ # Template file for 'xfce4-session' pkgname=xfce4-session version=4.10.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-static --enable-libgnome-keyring" -depends="upower udisks hicolor-icon-theme desktop-file-utils" makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel xfconf-devel dbus-glib-devel libwnck2-devel xfce4-panel-devel - ConsoleKit-devel libgnome-keyring-devel iceauth" + libgnome-keyring-devel iceauth" short_desc="Xfce session manager" maintainer="Juan RP " license="GPL-2" @@ -17,5 +16,20 @@ checksum=bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce long_desc=" xfce4-session is the session manager for the Xfce desktop environment." -conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" -subpackages="$pkgname-devel" +xfce4-session-devel_package() { + depends="libxfce4ui-devel xfconf-devel ${sourcepkg}>=${version}" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + } +} + +xfce4-session_package() { + depends="upower udisks hicolor-icon-theme desktop-file-utils" + conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xfce4-session/xfce4-session-devel.template b/srcpkgs/xfce4-session/xfce4-session-devel.template deleted file mode 100644 index bc116226323..00000000000 --- a/srcpkgs/xfce4-session/xfce4-session-devel.template +++ /dev/null @@ -1,15 +0,0 @@ -# Template file for 'xfce4-session-devel'. -# -depends="libxfce4ui-devel xfconf-devel xfce4-session>=4.10.0" -short_desc="${short_desc} - 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/xfce4-settings/template b/srcpkgs/xfce4-settings/template index ee00928cf2e..c69f3f7fce9 100644 --- a/srcpkgs/xfce4-settings/template +++ b/srcpkgs/xfce4-settings/template @@ -2,20 +2,27 @@ pkgname=xfce4-settings version=4.10.0 revision=1 -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/xfce/xfce4-settings/4.10/$pkgname-$version.tar.bz2" build_style=gnu-configure configure_args="--enable-sound-settings --enable-pluggable-dialogs" -depends="desktop-file-utils gnome-icon-theme" -makedepends="pkg-config intltool libxfce4ui-devel gtk+-devel xfconf-devel libXi-devel libXcursor-devel exo-devel libXrandr-devel libxklavier-devel libnotify-devel dbus-devel libcanberra-devel garcon-devel" +hostmakedepends="pkg-config intltool" +makedepends="libxfce4ui-devel gtk+-devel xfconf-devel libXi-devel libXcursor-devel + exo-devel libXrandr-devel libxklavier-devel libnotify-devel dbus-devel + libcanberra-devel garcon-devel" short_desc="Xfce settings manager" maintainer="Juan RP " homepage="http://www.xfce.org/" license="GPL-2" +homepage="http://xfce.org" +distfiles="http://archive.xfce.org/src/xfce/xfce4-settings/4.10/$pkgname-$version.tar.bz2" checksum=0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e long_desc=" ${pkgname} is the settings manager for the Xfce desktop environment." -conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" - - +xfce4-settings_package() { + conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" + depends="desktop-file-utils gnome-icon-theme" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xfce4-terminal/template b/srcpkgs/xfce4-terminal/template index d173fbcbcb2..f5c69141984 100644 --- a/srcpkgs/xfce4-terminal/template +++ b/srcpkgs/xfce4-terminal/template @@ -10,7 +10,13 @@ license="GPL-2" distfiles="http://archive.xfce.org/src/apps/${pkgname}/0.6/${pkgname}-${version}.tar.bz2" checksum=61346427e55af79e86511572bfabb2e025cb13720879226ea1b98a92f0bcd4c8 -depends="hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool dbus-glib-devel exo-devel - vte-devel gtk+-devel libxfce4ui-devel" -replaces="Terminal>=0" +hostmakedepends="pkg-config intltool" +makedepends="dbus-glib-devel exo-devel vte-devel gtk+-devel libxfce4ui-devel" + +xfce4-terminal_package() { + replaces="Terminal>=0" + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template index 9c8d26d5703..59831a984ba 100644 --- a/srcpkgs/xfce4-weather-plugin/template +++ b/srcpkgs/xfce4-weather-plugin/template @@ -3,9 +3,8 @@ pkgname=xfce4-weather-plugin version=0.8.1 revision=1 build_style=gnu-configure -makedepends="pkg-config intltool gtk+-devel libxfce4ui-devel xfce4-panel-devel libxml2-devel" -fulldepends="hicolor-icon-theme" - +hostmakedepends="pkg-config intltool" +makedepends="gtk+-devel libxfce4ui-devel xfce4-panel-devel libxml2-devel" short_desc="XFCE panel plagin to show temperature and weather" maintainer="Juan RP " homepage="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" @@ -15,3 +14,10 @@ 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 0bd13c9db3f..7d2204d6c84 100644 --- a/srcpkgs/xfce4/template +++ b/srcpkgs/xfce4/template @@ -2,9 +2,8 @@ pkgname=xfce4 version=4.10.0 revision=3 -noarch=yes build_style=meta-template -depends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0 +makedepends="xfce4-appfinder>=4.10.0 xfce4-mixer>=4.8.0_3 xfce4-panel>=4.10.0 xfce4-session>=4.10.0 xfce4-settings>=4.10.0 xfconf>=4.10.0 xfdesktop>=4.10.0 xfwm4>=4.10.0 xfwm4-themes>=4.10.0 xfce4-power-manager>=1.2.0 xfce4-terminal Thunar>=1.4.0 thunar-volman>=0.8.0 exo>=0.8.0 orage>=4.8.3_1 ristretto>=0.6.0 @@ -14,3 +13,8 @@ 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 bde61eaf371..1b3e2dfdc72 100644 --- a/srcpkgs/xfconf/template +++ b/srcpkgs/xfconf/template @@ -1,17 +1,45 @@ # Template file for 'xfconf' pkgname=xfconf version=4.10.0 -revision=1 -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/xfce/xfconf/4.10/$pkgname-$version.tar.bz2" +revision=2 build_style=gnu-configure -subpackages="$pkgname-devel $pkgname-perl" -makedepends="pkg-config intltool>=0.50.2_1 perl>=5.16 perl-ExtUtils-Depends perl-ExtUtils-PkgConfig perl-Glib>=1.242_1 dbus-glib-devel libxfce4util-devel" +hostmakedepends="pkg-config intltool>=0.50.2_1 perl>=5.16" +makedepends="perl-ExtUtils-Depends perl-ExtUtils-PkgConfig + perl-Glib>=1.242_1 dbus-glib-devel libxfce4util-devel" short_desc="Xfce hierarchical (tree-like) configuration system" maintainer="Juan RP " license="GPL-2, LGPL-2.1" +homepage="http://xfce.org" +distfiles="http://archive.xfce.org/src/xfce/xfconf/4.10/$pkgname-$version.tar.bz2" checksum=175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576 long_desc=" Xfconf is a hierarchical (tree-like) configuration system where the immediate child nodes of the root are called channels. All settings beneath the channel nodes are called properties." + +xfconf-devel_package() { + depends="dbus-glib-devel xfconf>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/gtk-doc + } +} + +xfconf-perl_package() { + depends="perl-Glib>=1.242_1" + short_desc="${short_desc} - perl bindings" + pkg_install() { + vmove usr/lib/perl5 usr/lib + vmove usr/share/man usr/share + find ${PKGDESTDIR}/usr/lib/perl5 -type f \ + -name perllocal.pod -o -name .packlist|xargs rm -f + } +} + +xfconf_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfconf/xfconf-devel.template b/srcpkgs/xfconf/xfconf-devel.template deleted file mode 100644 index 3cdb3702974..00000000000 --- a/srcpkgs/xfconf/xfconf-devel.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'xfconf-devel'. -# -noarch=yes -depends="dbus-glib-devel xfconf>=$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 - vmove usr/share/gtk-doc usr/share -} diff --git a/srcpkgs/xfconf/xfconf-perl.template b/srcpkgs/xfconf/xfconf-perl.template deleted file mode 100644 index 46cc4a39640..00000000000 --- a/srcpkgs/xfconf/xfconf-perl.template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'xfconf-perl'. -# -depends="perl-Glib>=1.242_1" -short_desc="${short_desc} - perl bindings" -long_desc="${long_desc} - - This package contains the Perl bindings." - -do_install() { - vmove usr/lib/perl5 usr/lib - vmove usr/share/man usr/share - find ${DESTDIR}/usr/lib/perl5 -type f \ - -name perllocal.pod -o -name .packlist|xargs rm -f -} diff --git a/srcpkgs/xfd/template b/srcpkgs/xfd/template index 58cbe9fdbe6..e13b9be0590 100644 --- a/srcpkgs/xfd/template +++ b/srcpkgs/xfd/template @@ -1,22 +1,25 @@ # Template build file for 'xfd'. pkgname=xfd version=1.1.1 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=2 build_style=gnu-configure -makedepends="pkg-config libXaw-devel freetype-devel libXft-devel" -fulldepends="glibc libXft libXaw" -revision=1 +hostmakedepends="pkg-config" +makedepends="libXaw-devel freetype-devel libXft-devel" short_desc="Display all the characters in an X font" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=3fbef0d5ed6dc088017df156e748d187b2d1aaedc3de7ea96e505ea6d1af7b73 long_desc=" 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. + bottom." - This is the version of xfd maintained by Xorg." - +xfd_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template index 454e1d58e9c..176603d6b24 100644 --- a/srcpkgs/xfdesktop/template +++ b/srcpkgs/xfdesktop/template @@ -1,19 +1,24 @@ # Template file for 'xfdesktop' pkgname=xfdesktop version=4.10.0 -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/xfce/xfdesktop/4.10/$pkgname-$version.tar.bz2" -build_style=gnu-configure -depends="hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool xfconf-devel libxfce4ui-devel exo-devel gtk+-devel libxfce4util-devel libnotify-devel libwnck2-devel garcon-devel Thunar-devel dbus-glib-devel" revision=1 +build_style=gnu-configure +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" short_desc="Desktop manager for the XFce Desktop Environment" maintainer="Juan RP " license="GPL-2" +homepage="http://xfce.org" +distfiles="http://archive.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/xfontsel/template b/srcpkgs/xfontsel/template index 7b3493ea846..0f6494e4794 100644 --- a/srcpkgs/xfontsel/template +++ b/srcpkgs/xfontsel/template @@ -1,19 +1,22 @@ # Template build file for 'xfontsel'. pkgname=xfontsel version=1.0.4 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=2 build_style=gnu-configure -makedepends="pkg-config libXaw-devel" -fulldepends="glibc libXaw" -revision=1 +hostmakedepends="pkg-config" +makedepends="libXaw-devel" short_desc="X font selector" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=25491e9b7762607299f8a7099c97452d9b83e92266f8b0579b380ca01e5a5f7e long_desc=" This package provides xfontsel, a program to query and display - X11 fonts. + X11 fonts." - This is from the modular X.org X11 project." - +xfontsel_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfsprogs/template b/srcpkgs/xfsprogs/template index 752e2892923..61e8e606f0d 100644 --- a/srcpkgs/xfsprogs/template +++ b/srcpkgs/xfsprogs/template @@ -1,7 +1,7 @@ # Template file for 'xfsprogs' pkgname=xfsprogs version=3.1.10 -revision=1 +revision=2 makedepends="libuuid-devel libblkid-devel readline-devel" short_desc="Utilities for managing the XFS filesystem" maintainer="Juan RP " @@ -10,9 +10,6 @@ homepage="http://oss.sgi.com/projects/xfs/" distfiles="ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${version}.tar.gz" checksum=9ec8dc77bf3bc114c3ba89f87316a32e3097efb3e7fc44df23421614bb21aa6c -replaces="xfsprogs-libs>=0" -subpackages="${pkgname}-devel" - do_configure() { export DEBUG=-DNDEBUG ./configure ${CONFIGURE_SHARED_ARGS} \ @@ -34,3 +31,19 @@ do_install() { vmove "sbin/*" usr/sbin vmove "lib/*" usr/lib } + +xfsprogs-devel_package() { + depends="libuuid-devel xfsprogs>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove usr/share/man/man3 + } +} + +xfsprogs_package() { + replaces="xfsprogs-libs>=0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xfsprogs/xfsprogs-devel.template b/srcpkgs/xfsprogs/xfsprogs-devel.template deleted file mode 100644 index 0d695fb31d8..00000000000 --- a/srcpkgs/xfsprogs/xfsprogs-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'xfsprogs-devel'. -# -noarch=yes -depends="libuuid-devel xfsprogs>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - vmove usr/include usr - vmove usr/share/man/man3 usr/share/man -} diff --git a/srcpkgs/xfwm4-themes/template b/srcpkgs/xfwm4-themes/template index 82d798dbc14..0fb33a607d5 100644 --- a/srcpkgs/xfwm4-themes/template +++ b/srcpkgs/xfwm4-themes/template @@ -1,15 +1,20 @@ # Template file for 'xfwm4-themes' pkgname=xfwm4-themes version=4.10.0 -noarch=yes -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/art/$pkgname/4.10/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=1 +build_style=gnu-configure short_desc="Themes for the XFCE window manager" maintainer="Juan RP " license="GPL-2" +homepage="http://xfce.org" +distfiles="http://archive.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 8da8d9adcb3..3fde09dd5f5 100644 --- a/srcpkgs/xfwm4/template +++ b/srcpkgs/xfwm4/template @@ -1,20 +1,26 @@ # Template file for 'xfwm4' pkgname=xfwm4 version=4.10.0 -homepage="http://xfce.org" -distfiles="http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2" -build_style=gnu-configure -depends="hicolor-icon-theme desktop-file-utils" -makedepends="pkg-config intltool 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" revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config intltool" +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" short_desc="Next generation window manager for Xfce" maintainer="Juan RP " license="GPL-2" +homepage="http://xfce.org" +distfiles="http://archive.xfce.org/src/xfce/xfwm4/4.10/xfwm4-$version.tar.bz2" checksum=492357bf48121ebffabf2bf0d3b84213d19bf81087321175d687c8a68efe1f9c long_desc=" xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce." - - - +xfwm4_package() { + depends="hicolor-icon-theme desktop-file-utils" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xgamma/template b/srcpkgs/xgamma/template index adf25bbb31e..41aa15bc5f8 100644 --- a/srcpkgs/xgamma/template +++ b/srcpkgs/xgamma/template @@ -1,18 +1,22 @@ # Template build file for 'xgamma'. pkgname=xgamma version=1.0.4 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config libX11-devel libXxf86vm-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel libXxf86vm-devel" short_desc="Alter gamma correction" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=7dc8334882a060bcc90042bceac5132dd87d5acc8d043b16311ef2134aea8e16 long_desc=" This package provides xgamma, a program to alter the gamma correction of - the monitor. - - This is from the modular X.org X11 project." + the monitor." +xgamma_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xhost/template b/srcpkgs/xhost/template index 478ead7dada..be060ba95d8 100644 --- a/srcpkgs/xhost/template +++ b/srcpkgs/xhost/template @@ -1,17 +1,21 @@ # Template build file for 'xhost'. pkgname=xhost version=1.0.4 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config libX11-devel libXmu-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel libXmu-devel" short_desc="Server access control program for X" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=5e02c06caeb7a258f3621bf11459a7820cfeaf9bf269c1f8da86d7071346a594 long_desc=" - This package provides xhost, the server access control program for X. - - This is from the modular X.org X11 project." + This package provides xhost, the server access control program for X." +xhost_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xineramaproto/template b/srcpkgs/xineramaproto/template index 818d62c25cb..65a4a412e25 100644 --- a/srcpkgs/xineramaproto/template +++ b/srcpkgs/xineramaproto/template @@ -1,16 +1,21 @@ # Template build file for 'xineramaproto'. pkgname=xineramaproto version=1.2 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="Xinerama extension headers from X.org" homepage="http://xorg.freedesktop.org" 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." -noarch=yes +xineramaproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xinit/template b/srcpkgs/xinit/template index 0b41f43524a..4ea2b502cd2 100644 --- a/srcpkgs/xinit/template +++ b/srcpkgs/xinit/template @@ -4,7 +4,8 @@ version=1.3.2 revision=3 build_style=gnu-configure configure_args="--with-xinitdir=/etc/X11/xinit" -makedepends="pkg-config libX11-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="X init program" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -15,12 +16,6 @@ long_desc=" This package provides xinit and startx, utilities for starting the X Window System server." -conf_files=" - /etc/X11/xinit/xinitrc - /etc/X11/xinit/xserverrc - /etc/skel/.xinitrc - /etc/skel/.xsession" - pre_configure() { sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp } @@ -31,3 +26,15 @@ 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 etc + vmove usr + } +} diff --git a/srcpkgs/xinput/template b/srcpkgs/xinput/template index 505d9c1ffd7..829bd19bc81 100644 --- a/srcpkgs/xinput/template +++ b/srcpkgs/xinput/template @@ -1,16 +1,22 @@ # Template build file for 'xinput'. pkgname=xinput version=1.6.0 -homepage="http://www.x.org" -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure -makedepends="pkg-config libXext-devel libXi-devel libXrandr-devel libXinerama-devel" revision=1 +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libXext-devel libXi-devel libXrandr-devel libXinerama-devel" short_desc="Utility to configure and test X input devices" maintainer="Juan RP " license="MIT" +homepage="http://www.x.org" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=4ab007d952c76665603bcb82ceb15fd3929d10faf0580fc4873ac16f5f63847e 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 c84c72d05a6..3a3658335b9 100644 --- a/srcpkgs/xkbcomp/template +++ b/srcpkgs/xkbcomp/template @@ -17,3 +17,9 @@ 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 b63ee601dd6..ea3c0319016 100644 --- a/srcpkgs/xkbevd/template +++ b/srcpkgs/xkbevd/template @@ -1,16 +1,22 @@ # Template build file for 'xkbevd'. pkgname=xkbevd version=1.1.2 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libxkbfile-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libxkbfile-devel" short_desc="XKBD Event Daemon" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" 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 0dab599f84e..3088d390b22 100644 --- a/srcpkgs/xkbutils/template +++ b/srcpkgs/xkbutils/template @@ -1,16 +1,22 @@ # Template build file for 'xkbutils'. pkgname=xkbutils version=1.0.3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libXaw-devel inputproto" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXaw-devel inputproto" short_desc="XKBD Utilities" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" 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 db71f5b6d2d..603fb171625 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -2,14 +2,21 @@ pkgname=xkeyboard-config version=2.8 revision=1 -noarch=yes build_style=gnu-configure configure_args="--with-xkb-rules-symlink=xfree86,xorg --enable-compat-rules" -makedepends="pkg-config libxslt intltool libX11-devel" -fulldepends="xkbcomp" +hostmakedepends="pkg-config libxslt intltool" +makedepends="libX11-devel 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=4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae + +xkeyboard-config_package() { + depends="xkbcomp" + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xkill/template b/srcpkgs/xkill/template index 1a27abe89a0..75505aec478 100644 --- a/srcpkgs/xkill/template +++ b/srcpkgs/xkill/template @@ -1,17 +1,23 @@ # Template build file for 'xkill'. pkgname=xkill version=1.0.3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libXmu-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXmu-devel" short_desc="Kill a client by its X resource" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=bd8307272a648ca76a266e5c1111384c8ed9367c6a8f1a5be844a5b5300881a9 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 fa40a7bfe60..be3b2d36388 100644 --- a/srcpkgs/xlsatoms/template +++ b/srcpkgs/xlsatoms/template @@ -1,17 +1,23 @@ # Template build file for 'xlsatoms'. pkgname=xlsatoms version=1.1.0 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libxcb-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libxcb-devel" short_desc="List interned atoms defined on the X server" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=4a017ada25140a71034fc0026500ebe24b81f2d185a4b2ef733de683b79dcb0d 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/xlsclients/template b/srcpkgs/xlsclients/template index 7ad2b49a222..5286e533b23 100644 --- a/srcpkgs/xlsclients/template +++ b/srcpkgs/xlsclients/template @@ -3,7 +3,8 @@ pkgname=xlsclients version=1.1.2 revision=1 build_style=gnu-configure -makedepends="pkg-config libxcb-devel" +hostmakedepends="pkg-config" +makedepends="libxcb-devel" short_desc="X client listing utility" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" @@ -13,3 +14,9 @@ checksum=1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1 long_desc=" This package provides xlsclients, a program to list client applications running on a display." + +xlsclients_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xlsfonts/template b/srcpkgs/xlsfonts/template index 4e4c095542a..a4c42fa67f2 100644 --- a/srcpkgs/xlsfonts/template +++ b/srcpkgs/xlsfonts/template @@ -1,16 +1,21 @@ # Template build file for 'xlsfonts'. pkgname=xlsfonts version=1.0.2 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -makedepends="pkg-config libX11-devel" -fulldepends="glibc libX11" -revision=2 +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Server font list displayer for X" homepage="http://xorg.freedesktop.org" license="MIT" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" maintainer="Juan RP " checksum=cc6e519b783b082a2fe4cd06ea5b3693ee6bdb23f4b36e7a72753c524ef5111c long_desc=" Utility to list the fonts available on an X server." +xlsfonts_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xmldiff/template b/srcpkgs/xmldiff/template index c6a9164375a..eb369c858d0 100644 --- a/srcpkgs/xmldiff/template +++ b/srcpkgs/xmldiff/template @@ -2,23 +2,26 @@ pkgname=xmldiff version=0.6.10 revision=2 -distfiles="http://ftp.logilab.org/pub/$pkgname/$pkgname-$version.tar.gz" build_style=python-module -depends="libxslt openjade" -makedepends="python-devel" +makedepends="python-devel libxslt openjade" short_desc="Python classes to diff XML files" homepage="http://www.logilab.org/project/xmldiff/" license="GPL-2" +distfiles="http://ftp.logilab.org/pub/$pkgname/$pkgname-$version.tar.gz" checksum=83aba252df2f760c8bf008b9c5d3080911eab2d2b39c371d3b47f67abf4b4ec5 long_desc=" A python tool that figures out the differences between two similar XML files, in the same way the diff(1) utility does it." -pycompile_module="${pkgname}" - - -post_install() -{ +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/xmodmap/template b/srcpkgs/xmodmap/template index 4b14b2cf1e7..ec06a795b43 100644 --- a/srcpkgs/xmodmap/template +++ b/srcpkgs/xmodmap/template @@ -1,17 +1,21 @@ # Template build file for 'xmodmap'. pkgname=xmodmap version=1.0.7 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -makedepends="pkg-config libX11-devel" -revision=2 +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="X modmap program" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5 long_desc=" - The xmodmap tool is used to modify keymaps and pointer button mappings in X. - - This is from modular Xorg X11." + The xmodmap tool is used to modify keymaps and pointer button mappings in X." +xmodmap_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xnoise/libxnoise.template b/srcpkgs/xnoise/libxnoise.template deleted file mode 100644 index 2b26b7a3e4a..00000000000 --- a/srcpkgs/xnoise/libxnoise.template +++ /dev/null @@ -1,7 +0,0 @@ -# Template file for 'libxnoise'. -# -short_desc="${short_desc} - shared library" - -do_install() { - vmove "usr/lib/libxnoise.so*" usr/lib -} diff --git a/srcpkgs/xnoise/template b/srcpkgs/xnoise/template index a181a8bf7d6..f6d6d7da356 100644 --- a/srcpkgs/xnoise/template +++ b/srcpkgs/xnoise/template @@ -1,10 +1,8 @@ # Template file for 'xnoise'. pkgname=xnoise version=0.2.17 -revision=1 +revision=2 build_style=gnu-configure -subpackages="libxnoise xnoise-devel" -depends="desktop-file-utils hicolor-icon-theme" makedepends="pkg-config intltool gtk+3-devel libtaginfo-devel sqlite-devel libnotify-devel libsoup-devel gst-plugins-base1-devel" short_desc="Media player for GTK+ with a slick GUI" @@ -19,3 +17,26 @@ long_desc=" without being removed (right side of window). This gives you the possibility to queue any track in any order, regardless if they are on the same album. Tracks or groups of tracks can be reordered at any time via drag and drop." + +libxnoise_package() { + short_desc="${short_desc} - shared library" + pkg_install() { + vmove "usr/lib/libxnoise.so*" + } +} + +xnoise-devel_package() { + depends="libxnoise>=$version" + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/vala + } +} + +xnoise_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xnoise/xnoise-devel.template b/srcpkgs/xnoise/xnoise-devel.template deleted file mode 100644 index 8b12e8c6848..00000000000 --- a/srcpkgs/xnoise/xnoise-devel.template +++ /dev/null @@ -1,11 +0,0 @@ -# Template file for 'xnoise-devel'. -# -noarch=yes -depends="libxnoise>=$version" -short_desc="${short_desc} - development files" - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/vala usr/share -} diff --git a/srcpkgs/xonotic-data-low/template b/srcpkgs/xonotic-data-low/template index 204d13834a6..e8a688016ee 100644 --- a/srcpkgs/xonotic-data-low/template +++ b/srcpkgs/xonotic-data-low/template @@ -1,13 +1,12 @@ # Template file for 'xonotic-data-low' pkgname=xonotic-data-low version=0.6.0 -noarch=yes +revision=1 wrksrc="Xonotic" homepage="http://xonotic.org" license="GPL-2, GPL-3" distfiles="http://dl.xonotic.org/xonotic-${version}-low.zip" makedepends="unzip" -revision=1 short_desc="A free, fast-paced crossplatform FPS (LQ data files)" maintainer="Juan RP " checksum=66b94b28d5013d53f757db431c97e1e55d0ef55dc959f14dd2b82ed9613d16ef @@ -20,12 +19,17 @@ long_desc=" This build has smaller file size and has better support for opensource/legacy drivers, but the textures take slightly longer while loading the game." -provides="xonotic-data-9999" -replaces="xonotic-data>=0" - - do_install() { vmkdir usr/share/xonotic 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-9999" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xonotic-data/template b/srcpkgs/xonotic-data/template index a63367c73ec..4f9e6362f78 100644 --- a/srcpkgs/xonotic-data/template +++ b/srcpkgs/xonotic-data/template @@ -2,7 +2,6 @@ pkgname=xonotic-data version=0.6.0 revision=1 -noarch=yes wrksrc="Xonotic" homepage="http://xonotic.org" license="GPL-2, GPL-3" @@ -11,16 +10,17 @@ makedepends="unzip" short_desc="A free, fast-paced crossplatform first-person shooter (data files)" maintainer="Juan RP " checksum=e8a7dbfdea1ba6250ddf363f01899411f22e518526fae4f0b4f90d622fab3819 -long_desc=" - Xonotic is $short_desc. - - This package contains the data files." - -replaces="xonotic-data>=0" - do_install() { vmkdir usr/share/xonotic 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 aebe36d0a5b..7c138996b18 100644 --- a/srcpkgs/xonotic/template +++ b/srcpkgs/xonotic/template @@ -6,7 +6,6 @@ wrksrc="Xonotic" homepage="http://xonotic.org" license="GPL-2, GPL-3" distfiles="http://dl.xonotic.org/xonotic-${version}-source.zip" -depends="desktop-file-utils xonotic-data>=0.6.0" makedepends="unzip gmp-devel MesaLib-devel SDL-devel libcurl-devel alsa-lib-devel libmodplug-devel libvorbis-devel libXpm-devel libjpeg-turbo-devel" short_desc="A free, fast-paced crossplatform first-person shooter" @@ -45,3 +44,10 @@ 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>=0.6.0" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xorg-apps/template b/srcpkgs/xorg-apps/template index f5803977bd7..39f9c5f1c0d 100644 --- a/srcpkgs/xorg-apps/template +++ b/srcpkgs/xorg-apps/template @@ -1,9 +1,16 @@ # Template file for 'xorg-server-utils' pkgname=xorg-apps version=7.6 -build_style=meta-template -fulldepends="iceauth>=1.0.4 sessreg>=1.0.6 setxkbmap>=1.2.0 smproxy>=1.0.4 x11perf>=1.5.2 xauth>=1.0.5 xbacklight>=1.1.2 xcmsdb>=1.0.3 xcursorgen>=1.0.4 xdpyinfo>=1.2.0 xdriinfo>=1.0.4 xev>=1.1.0 xgamma>=1.0.4 xhost>=1.0.4 xinput>=1.5.3 xkbcomp>=1.2.0 xkbevd>=1.1.2 xkbutils>=1.0.3 xkill>=1.0.3 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" revision=2 +build_style=meta-template +# xinit is not in xorg-7.5 app directory?!! +makedepends="iceauth>=1.0.4 sessreg>=1.0.6 setxkbmap>=1.2.0 smproxy>=1.0.4 + x11perf>=1.5.2 xauth>=1.0.5 xbacklight>=1.1.2 xcmsdb>=1.0.3 xcursorgen>=1.0.4 + xdpyinfo>=1.2.0 xdriinfo>=1.0.4 xev>=1.1.0 xgamma>=1.0.4 xhost>=1.0.4 + xinput>=1.5.3 xkbcomp>=1.2.0 xkbevd>=1.1.2 xkbutils>=1.0.3 xkill>=1.0.3 + 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" short_desc="X.org applications" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -12,7 +19,8 @@ long_desc=" This is the Xorg applications meta-package for installing various applications from the modular Xorg project." -replaces="xorg-server-utils>=0" -noarch=yes - -# xinit is not in xorg-7.5 app directory?!! +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 5fc7d069fd9..a0b70bee40c 100644 --- a/srcpkgs/xorg-fonts/template +++ b/srcpkgs/xorg-fonts/template @@ -1,9 +1,17 @@ # Template file for 'xorg-fonts' pkgname=xorg-fonts version=7.6 -build_style=meta-template -fulldepends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3 font-adobe-utopia-100dpi>=1.0.4 font-adobe-utopia-75dpi>=1.0.4 font-adobe-utopia-type1>=1.0.4 font-bh-100dpi>=1.0.3 font-bh-75dpi>=1.0.3 font-bh-lucidatypewriter-100dpi>=1.0.3 font-bh-lucidatypewriter-75dpi>=1.0.3 font-bh-ttf>=1.0.3 font-bh-type1>=1.0.3 font-bitstream-100dpi>=1.0.3 font-bitstream-75dpi>=1.0.3 font-bitstream-type1>=1.0.3 font-cursor-misc>=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" revision=2 +build_style=meta-template +makedepends="encodings>=1.0.4 font-adobe-100dpi>=1.0.3 font-adobe-75dpi>=1.0.3 + font-adobe-utopia-100dpi>=1.0.4 font-adobe-utopia-75dpi>=1.0.4 + font-adobe-utopia-type1>=1.0.4 font-bh-100dpi>=1.0.3 font-bh-75dpi>=1.0.3 + font-bh-lucidatypewriter-100dpi>=1.0.3 font-bh-lucidatypewriter-75dpi>=1.0.3 + font-bh-ttf>=1.0.3 font-bh-type1>=1.0.3 font-bitstream-100dpi>=1.0.3 + font-bitstream-75dpi>=1.0.3 font-bitstream-type1>=1.0.3 font-cursor-misc>=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" short_desc="Modular Xorg Fonts" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -12,4 +20,7 @@ long_desc=" This is the modular Xorg font meta-package for installing the various font packages from the modular Xorg project." -noarch=yes +xorg-fonts_package() { + depends="${makedepends}" + noarch="yes" +} diff --git a/srcpkgs/xorg-input-drivers/template b/srcpkgs/xorg-input-drivers/template index 437260f2010..997671dabcd 100644 --- a/srcpkgs/xorg-input-drivers/template +++ b/srcpkgs/xorg-input-drivers/template @@ -2,9 +2,9 @@ pkgname=xorg-input-drivers version=7.6 revision=2 -noarch=yes build_style=meta-template -fulldepends="xf86-input-evdev>=2.5.0 xf86-input-synaptics>=1.3.0 xf86-input-vmmouse>=12.6.10 xf86-input-wacom>=0.14.0" +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" short_desc="X.org input drivers meta-package" homepage="http://xorg.freedesktop.org/" license="MIT" @@ -12,3 +12,8 @@ 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-server/template b/srcpkgs/xorg-server/template index 98f778044f6..cea6e1554f1 100644 --- a/srcpkgs/xorg-server/template +++ b/srcpkgs/xorg-server/template @@ -19,21 +19,19 @@ license="MIT/X11, BSD" distfiles="${XORG_SITE}/xserver/${pkgname}-${version}.tar.bz2" checksum=c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762 -subpackages="${pkgname}-xnest ${pkgname}-xephyr ${pkgname}-xvfb ${pkgname}-devel" -fulldepends="xkeyboard-config" - -# See hw/xfree86/common/xf86Module.h. Only care for the major version. -provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13" - hostmakedepends="pkg-config perl flex" -makedepends="libfl-devel damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22 +makedepends="damageproto inputproto>=2.2 glproto>=1.4.15 xproto>=7.0.22 dri2proto>=2.1 xf86driproto randrproto videoproto compositeproto scrnsaverproto resourceproto>=1.2.0 xineramaproto xcmiscproto bigreqsproto libudev-devel>=183 openssl-devel libX11-devel libXext-devel libdmx-devel libpciaccess-devel 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" + libxkbfile-devel libXxf86dga-devel libXv-devel pixman-devel xkeyboard-config" + +if [ "$CROSS_BUILD" ]; then + makedepends+=" libfl-devel" +fi post_install() { vinstall ${FILESDIR}/11-quirks.conf 644 etc/X11/xorg.conf.d @@ -49,3 +47,55 @@ post_install() { ${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" + pkg_install() { + vmove usr/bin/Xnest + vmove usr/share/man/man1/Xnest.1 + } +} + +xorg-server-xephyr_package() { + short_desc="X server outputting to a window on a pre-existing X display" + pkg_install() { + vmove usr/bin/Xephyr + vmove usr/share/man/man1/Xephyr.1 + } +} + +xorg-server-xvfb_package() { + short_desc="Virtual framebuffer X server" + pkg_install() { + vmove usr/bin/Xvfb + vmove usr/share/man/man1/Xvfb.1 + } +} + +xorg-server-devel_package() { + depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto + videoproto compositeproto scrnsaverproto resourceproto xineramaproto + libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel + libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel + libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel + libdrm-devel>=2.4.34" + if [ "$build_option_opengl" ]; then + depends+=" MesaLib-devel" + fi + short_desc="${short_desc} - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove usr/share/aclocal + } +} + +xorg-server_package() { + # See hw/xfree86/common/xf86Module.h. Only care for the major version. + provides="xserver-abi-extension-7 xserver-abi-input-18 xserver-abi-video-13" + depends="xkeyboard-config" + pkg_install() { + vmove etc + vmove usr + } +} diff --git a/srcpkgs/xorg-server/template.options b/srcpkgs/xorg-server/template.options deleted file mode 100644 index 79c9cae44d7..00000000000 --- a/srcpkgs/xorg-server/template.options +++ /dev/null @@ -1,17 +0,0 @@ -# Package build options -build_options="opengl" -desc_option_opengl="Enable support for OpenGL/GLX and DRI" - -# Enable gl by default on x86. -if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - build_options_default="opengl" -fi - -do_options() { - if [ "$build_option_opengl" ]; then - configure_args="${configure_args} --enable-dri --enable-dri2 --enable-glx-tls --enable-glx" - makedepends="${makedepends} MesaLib-devel" - else - configure_args="${configure_args} --disable-dri --disable-dri2 --disable-glx" - fi -} diff --git a/srcpkgs/xorg-server/xorg-server-devel.template b/srcpkgs/xorg-server/xorg-server-devel.template deleted file mode 100644 index 9fceaf5392f..00000000000 --- a/srcpkgs/xorg-server/xorg-server-devel.template +++ /dev/null @@ -1,20 +0,0 @@ -# Template file for 'xorg-server-devel'. -# -depends="libudev-devel dri2proto>=2.1 glproto xf86driproto randrproto - videoproto compositeproto scrnsaverproto resourceproto xineramaproto - libdmx-devel libXext-devel libX11-devel libpciaccess-devel libXfont-devel - libXau-devel pixman-devel libXdmcp-devel libXmu-devel libXrender-devel - libXfixes-devel libXi-devel libXaw-devel libXt-devel libXpm-devel - libdrm-devel>=2.4.34" - -short_desc="${short_desc} - development files" - -if [ "$build_option_opengl" ]; then - depends="${depends} MesaLib-devel" -fi - -do_install() { - vmove usr/include usr - vmove usr/lib/pkgconfig usr/lib - vmove usr/share/aclocal usr/share -} diff --git a/srcpkgs/xorg-server/xorg-server-xephyr.template b/srcpkgs/xorg-server/xorg-server-xephyr.template deleted file mode 100644 index 6782f3f7932..00000000000 --- a/srcpkgs/xorg-server/xorg-server-xephyr.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'xorg-server-xephyr'. -# -short_desc="X server outputting to a window on a pre-existing X display" - -do_install() { - vmove usr/bin/Xephyr usr/bin - vmove usr/share/man/man1/Xephyr.1 usr/share/man/man1 -} diff --git a/srcpkgs/xorg-server/xorg-server-xnest.template b/srcpkgs/xorg-server/xorg-server-xnest.template deleted file mode 100644 index aaa1aafb11f..00000000000 --- a/srcpkgs/xorg-server/xorg-server-xnest.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'xorg-server-xnest'. -# -short_desc="A nested X server that runs as an X application" - -do_install() { - vmove usr/bin/Xnest usr/bin - vmove usr/share/man/man1/Xnest.1 usr/share/man/man1 -} diff --git a/srcpkgs/xorg-server/xorg-server-xvfb.template b/srcpkgs/xorg-server/xorg-server-xvfb.template deleted file mode 100644 index 6a88f34c515..00000000000 --- a/srcpkgs/xorg-server/xorg-server-xvfb.template +++ /dev/null @@ -1,8 +0,0 @@ -# Template file for 'xorg-server-xvfb'. -# -short_desc="Virtual framebuffer X server" - -do_install() { - vmove usr/bin/Xvfb usr/bin - vmove usr/share/man/man1/Xvfb.1 usr/share/man/man1 -} diff --git a/srcpkgs/xorg-util-macros/template b/srcpkgs/xorg-util-macros/template index 5ef66ad1be3..8c068a414c2 100644 --- a/srcpkgs/xorg-util-macros/template +++ b/srcpkgs/xorg-util-macros/template @@ -2,7 +2,6 @@ pkgname=xorg-util-macros version=1.15.0 revision=3 -noarch=yes build_style=gnu-configure hostmakedepends="pkg-config" short_desc="Xorg autotool macros" @@ -15,3 +14,10 @@ checksum=b31c6d39014e537ff95609661a4f8258f7c4a4f3b8bdfdad3d69bdd5cb80f40e long_desc=" This package contains the autoconf/automake macros shared by the various modular Xorg components." + +xorg-util-macros_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xorg-video-drivers/template b/srcpkgs/xorg-video-drivers/template index 1dcf63abe88..fabc2465437 100644 --- a/srcpkgs/xorg-video-drivers/template +++ b/srcpkgs/xorg-video-drivers/template @@ -8,6 +8,10 @@ maintainer="Juan RP " homepage="http://www.voidlinux.eu" license="Public domain" -depends="xf86-video-ati>=7.0 xf86-video-intel>=2.20.13 +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 4a3ef39dd23..6de0a0c73d2 100644 --- a/srcpkgs/xorg/template +++ b/srcpkgs/xorg/template @@ -1,10 +1,9 @@ # Template file for 'xorg' pkgname=xorg version=7.6 -noarch=yes revision=2 build_style=meta-template -depends="xorg-fonts>=7.6 xorg-server>=1.9.3 xorg-apps>=7.6 +makedepends="xorg-fonts>=7.6 xorg-server>=1.9.3 xorg-apps>=7.6 xorg-input-drivers>=7.6 xorg-video-drivers>=7.6" short_desc="X.org meta-package" maintainer="Juan RP " @@ -13,3 +12,8 @@ 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 d586bfd2956..d26bf5ebc00 100644 --- a/srcpkgs/xorriso/template +++ b/srcpkgs/xorriso/template @@ -10,3 +10,9 @@ license="GPL-3" homepage="https://www.gnu.org/software/xorriso" distfiles="https://www.gnu.org/software/xorriso/xorriso-$version.tar.gz" checksum=a02c1b91b809986c060a8b33561812bcd66082c6ce785e7c8b4beb938848f4da + +xorriso_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template index b1ad3f19bdf..514945a613a 100644 --- a/srcpkgs/xournal/template +++ b/srcpkgs/xournal/template @@ -2,16 +2,16 @@ pkgname=xournal version=0.4.7 revision=1 -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" build_style=gnu-configure make_install_args="desktop-install" -makedepends="autoconf automake pkg-config gtk+-devel -libgnomecanvas-devel>=2.30.3_1 poppler-glib-devel zlib-devel ghostscript-devel" -fulldepends="hicolor-icon-theme desktop-file-utils ghostscript" +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" short_desc="Xournal: GPL Notetaking, sketching, and journal-keeping." maintainer="davehome " homepage="http://xournal.sourceforge.net/" license="GPL-2" +distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" checksum=d1ceb9c3a0b0172f7c2389bfe188a13cdc9f9f4c3ddc30095d635edf1367ac89 long_desc=" Xournal is an application for notetaking, sketching, keeping a journal using @@ -25,9 +25,9 @@ long_desc=" Supports PDF import and export." - - -#pre_configure() { -# sed -i -e "s|lX11|lX11 -lm -lz|" src/Makefile.am -# ./autogen.sh -#} +xournal_package() { + depends="hicolor-icon-theme desktop-file-utils ghostscript" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xpr/template b/srcpkgs/xpr/template index dfebb85cb54..ea99def26a1 100644 --- a/srcpkgs/xpr/template +++ b/srcpkgs/xpr/template @@ -1,14 +1,15 @@ # Template build file for 'xpr'. pkgname=xpr version=1.0.3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libXmu-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXmu-devel" short_desc="Print an X window dump" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=2878d6b04ef81ec415fa81313565bee521bf94132127615b9d717d5a489b937d long_desc=" xpr takes as input a window dump file produced by xwd(1) and formats @@ -16,3 +17,8 @@ long_desc=" 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 fae8136abf3..036667a1334 100644 --- a/srcpkgs/xprop/template +++ b/srcpkgs/xprop/template @@ -1,16 +1,22 @@ # Template build file for 'xprop'. pkgname=xprop version=1.2.1 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=1 -makedepends="pkg-config libX11-devel libXmu-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXmu-devel" short_desc="Property displayer for X" maintainer="Juan RP " homepage="${XORG_HOME}" license="MIT" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" 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 c2f09004bfc..26b6f7246ce 100644 --- a/srcpkgs/xproto/template +++ b/srcpkgs/xproto/template @@ -1,15 +1,20 @@ # Template build file for 'xproto'. pkgname=xproto version=7.0.23 -distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 +build_style=gnu-configure short_desc="X protocol and ancillary headers from Xorg X11" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/proto/$pkgname-$version.tar.bz2" checksum=ade04a0949ebe4e3ef34bb2183b1ae8e08f6f9c7571729c9db38212742ac939e long_desc=" X protocol and ancillary headers from modular Xorg X11." -noarch=yes +xproto_package() { + noarch="yes" + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xrandr/template b/srcpkgs/xrandr/template index f28bb927358..9299b821399 100644 --- a/srcpkgs/xrandr/template +++ b/srcpkgs/xrandr/template @@ -11,3 +11,9 @@ homepage="http://xorg.freedesktop.org" license="MIT" distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=a76b004abe6fd7606eba9ad161ac6391fe5c665708cc5fb7c7ea7d36459d9693 + +xrandr_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template index 60a6875c68d..8badb4b8d89 100644 --- a/srcpkgs/xrdb/template +++ b/srcpkgs/xrdb/template @@ -1,17 +1,21 @@ # Template build file for 'xrdb'. pkgname=xrdb version=1.0.9 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config libX11-devel libXmu-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel libXmu-devel" short_desc="X server resource database utility" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7 long_desc=" - xrdb is a program to query a modify the resource database of a X server. - - This is from the modular X.org X11 project." + xrdb is a program to query a modify the resource database of a X server." +xrdb_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xrefresh/template b/srcpkgs/xrefresh/template index 552839a87ca..4fff6c6ea9b 100644 --- a/srcpkgs/xrefresh/template +++ b/srcpkgs/xrefresh/template @@ -1,19 +1,22 @@ # Template build file for 'xrefresh'. pkgname=xrefresh version=1.0.4 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -depends="libX11" -makedepends="pkg-config libX11-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="X refresher" homepage="http://xorg.freedesktop.org" license="MIT" 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. - - This is from the modular X.org X11 project." + off a screen." +xrefresh_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xset/template b/srcpkgs/xset/template index 64ee93e5d6b..8062e5f2c12 100644 --- a/srcpkgs/xset/template +++ b/srcpkgs/xset/template @@ -1,14 +1,15 @@ # Template build file for 'xset'. pkgname=xset version=1.2.2 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libXmu-devel libX11-devel libXext-devel libXxf86misc-devel libXfontcache-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libXmu-devel libXext-devel libXxf86misc-devel libXfontcache-devel" short_desc="X11 user preferences utility" maintainer="Juan RP " homepage="http://xorg.freedesktop.org/" license="MIT" +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=61371c140030b8b05075a1378b34a4d7c438ed9159496a95f10782c6f4aec1e8 long_desc=" The xset program is used to set various user preference options of @@ -16,4 +17,8 @@ long_desc=" 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 f67e59824d8..ba411e0dd4f 100644 --- a/srcpkgs/xsetmode/template +++ b/srcpkgs/xsetmode/template @@ -1,18 +1,22 @@ # Template build file for 'xsetmode'. pkgname=xsetmode version=1.0.0 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" -build_style=gnu-configure revision=2 -makedepends="pkg-config libX11-devel libXi-devel" +build_style=gnu-configure +hostmakedepends="pkg-config" +makedepends="libX11-devel libXi-devel" short_desc="Switch mode of XInput devices" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa long_desc=" The xsetmode program is used to switch XInput devices between absolute - and relative positioning. - - This is from the modular X.org X11 project." + and relative positioning." +xsetmode_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xsetroot/template b/srcpkgs/xsetroot/template index d44e745a6bf..d05300aa7b9 100644 --- a/srcpkgs/xsetroot/template +++ b/srcpkgs/xsetroot/template @@ -1,18 +1,22 @@ # Template build file for 'xsetroot'. pkgname=xsetroot version=1.1.0 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config xbitmaps libXmu-devel libXrender-devel libXfixes-devel libXcursor-devel" +hostmakedepends="pkg-config xbitmaps" +makedepends="libXmu-devel libXrender-devel libXfixes-devel libXcursor-devel" short_desc="X root window parameter setting program" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=88f13e949e7aea126239e5c9b3fe7bb7c2ecf70c70774ae41218789d9cfe5fad long_desc=" The xsetroot program is used to tailor the appearance of the background - window of the X server. - - This is from the modular X.org X11 project." + window of the X server." +xsetroot_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xstow/template b/srcpkgs/xstow/template index 43b1cfeb744..6b0a3ee7cc3 100644 --- a/srcpkgs/xstow/template +++ b/srcpkgs/xstow/template @@ -15,3 +15,9 @@ 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 63ea0e64d13..f65db9662b1 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -18,3 +18,9 @@ homepage="http://invisible-island.net/xterm/" license="MIT/X11" distfiles="ftp://invisible-island.net/xterm/$pkgname-$version.tgz" checksum=aaa1d9fab8da3010dced60b4fd41be5ec27c37ea5d5a0c1d5d8693b51ee75533 + +xterm_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xtrans/template b/srcpkgs/xtrans/template index 1df9413d63a..983be2bfd4d 100644 --- a/srcpkgs/xtrans/template +++ b/srcpkgs/xtrans/template @@ -1,22 +1,22 @@ # Template build file for 'xtrans'. pkgname=xtrans version=1.2.5 -revision=2 -distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure short_desc="Network API translation layer to insulate X" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/lib/$pkgname-$version.tar.bz2" checksum=cc71a391f4da8176e5daeeac1ddf5137ba5e8d2263cb93a49f9e2a9976b90899 long_desc=" Network API translation layer to insulate X applications and libraries from OS network vageries. This is from the modular X.org X11 project." -noarch=yes -post_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${DESTDIR}/usr/share/pkgconfig ${DESTDIR}/usr/lib +xtrans_package() { + noarch="yes" + pkg_install() { + vmove usr + } } diff --git a/srcpkgs/xvidcore/template b/srcpkgs/xvidcore/template index 65957e482b6..55acf1494af 100644 --- a/srcpkgs/xvidcore/template +++ b/srcpkgs/xvidcore/template @@ -17,8 +17,6 @@ long_desc=" it's an open source project which is developed and maintained by lots of people from all over the world." -subpackages="$pkgname-devel" - post_install() { # Fix dynamic libraries cd ${DESTDIR}/usr/lib @@ -27,3 +25,18 @@ post_install() { ln -sf ${mylib} libxvidcore.so chmod 755 ${DESTDIR}/usr/lib/libxvidcore.so.* } + +xvidcore-devel_package() { + depends="xvidcore>=${version}" + short_desc="${short_desc} -- development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + } +} + +xvidcore_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xvidcore/xvidcore-devel.template b/srcpkgs/xvidcore/xvidcore-devel.template deleted file mode 100644 index 631045147a2..00000000000 --- a/srcpkgs/xvidcore/xvidcore-devel.template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'xvidcore-devel'. -# -depends="xvidcore>=${version}" -short_desc="${short_desc} -- development files" - -do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/xvinfo/template b/srcpkgs/xvinfo/template index 69e34ceeacd..a872c62823b 100644 --- a/srcpkgs/xvinfo/template +++ b/srcpkgs/xvinfo/template @@ -1,18 +1,22 @@ # Template build file for 'xvinfo'. pkgname=xvinfo version=1.1.1 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config libX11-devel libXv-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel libXv-devel" short_desc="Query X-Video capabilities" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=60c74aa190bcf1e244f6f1576dc43869018a8ed5ba319703a5c198d3466a3985 long_desc=" This package provides xvinfo, a program to query the capability of the - video adaptor accessible through the X-Video extension. - - This is from the modular X.org X11 project." + 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 a0491710a24..c189a964cb8 100644 --- a/srcpkgs/xwd/template +++ b/srcpkgs/xwd/template @@ -1,15 +1,15 @@ # Template build file for 'xwd'. pkgname=xwd version=1.0.4 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -depends="libX11" -makedepends="pkg-config libX11-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Dump an image of an X window" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=b7a6c889911a0ab52f9f92a83658abb81e213969ad4e6c73c11c9274a438b01e long_desc=" Xwd is an X Window System window dumping utility. Xwd allows X users to @@ -17,3 +17,8 @@ long_desc=" 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 438a93747c0..5b35ca96463 100644 --- a/srcpkgs/xwininfo/template +++ b/srcpkgs/xwininfo/template @@ -1,18 +1,22 @@ # Template build file for 'xwininfo'. pkgname=xwininfo version=1.1.1 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -makedepends="pkg-config libX11-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Query information about X windows" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=645a57be4870fb6aba459e7dc96f4d8eaafa3b31bbcd42c997ac4cb021a2343d long_desc=" This package provides xwininfo, a program to query the X server for - information about windows. - - This is from the modular X.org X11 project." + information about windows." +xwininfo_package() { + pkg_install() { + vmove usr + } +} diff --git a/srcpkgs/xwud/template b/srcpkgs/xwud/template index 701a891183b..ec21013d69f 100644 --- a/srcpkgs/xwud/template +++ b/srcpkgs/xwud/template @@ -1,18 +1,23 @@ # Template build file for 'xwud'. pkgname=xwud version=1.0.3 -distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" +revision=3 build_style=gnu-configure -revision=2 -depends="libX11" -makedepends="pkg-config libX11-devel" +hostmakedepends="pkg-config" +makedepends="libX11-devel" short_desc="Image displayer for X" homepage="http://xorg.freedesktop.org" license="MIT" maintainer="Juan RP " +distfiles="${XORG_SITE}/app/$pkgname-$version.tar.bz2" checksum=88fdeae05cc3bcc35dfbf0df1606bc4ed4a420edb1abf96aececbc1bd7332c43 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 + } +}