From 3f428a8cc2a796fbf4896cf991ec02da94355aaf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 14 Apr 2013 15:09:59 +0200
Subject: [PATCH] Convert packages to new template format (t).
---
srcpkgs/t1lib/libt1.template | 12 ------
srcpkgs/t1lib/t1lib-devel.template | 14 -------
srcpkgs/t1lib/template | 26 ++++++++++--
srcpkgs/taglib/taglib-devel.template | 14 -------
srcpkgs/taglib/template | 20 +++++++--
srcpkgs/tar/template | 8 +++-
srcpkgs/tcc/template | 6 +++
.../tcp_wrappers/tcp_wrappers-devel.template | 19 ---------
.../tcp_wrappers/tcp_wrappers-libs.template | 18 --------
srcpkgs/tcp_wrappers/template | 35 +++++++++++++---
srcpkgs/tcpdump/template | 8 +++-
srcpkgs/telepathy-butterfly/template | 15 ++++---
.../telepathy-farstream-devel.template | 16 -------
srcpkgs/telepathy-farstream/template | 25 ++++++++---
srcpkgs/telepathy-gabble/template | 12 ++++--
.../telepathy-glib-devel.template | 17 --------
srcpkgs/telepathy-glib/template | 21 +++++++++-
srcpkgs/telepathy-idle/template | 6 +++
.../telepathy-logger-devel.template | 11 -----
srcpkgs/telepathy-logger/template | 18 +++++++-
.../telepathy-mission-control-devel.template | 11 -----
srcpkgs/telepathy-mission-control/template | 17 +++++++-
srcpkgs/telepathy-python/template | 17 +++++---
srcpkgs/telepathy-salut/template | 16 ++++---
srcpkgs/terminus-font/template | 14 +++++--
srcpkgs/testdisk/template | 10 ++++-
srcpkgs/texinfo/template | 10 ++++-
srcpkgs/tftp-hpa/template | 13 +++++-
srcpkgs/thunar-volman/template | 20 +++++----
srcpkgs/thunderbird/template | 8 +++-
srcpkgs/tig/template | 10 ++++-
srcpkgs/time/template | 32 +++++++-------
srcpkgs/tinc/template | 6 +++
srcpkgs/tinyxml/template | 15 ++++++-
srcpkgs/tinyxml/tinyxml-devel.template | 8 ----
srcpkgs/tiv/template | 6 +++
srcpkgs/tmux/template | 6 +++
srcpkgs/tor/template | 22 ++++++----
srcpkgs/torsocks/template | 9 +++-
srcpkgs/totem-pl-parser/template | 19 ++++++++-
.../totem-pl-parser-devel.template | 12 ------
srcpkgs/totem/libtotem.template | 9 ----
srcpkgs/totem/template | 41 +++++++++++++++---
srcpkgs/totem/totem-devel.template | 11 -----
srcpkgs/totem/totem-mozilla-plugin.template | 13 ------
srcpkgs/traceroute/template | 6 +++
srcpkgs/tracker/libtracker.template | 9 ----
srcpkgs/tracker/template | 29 ++++++++++++-
srcpkgs/tracker/tracker-devel.template | 12 ------
srcpkgs/transmission/template | 42 +++++++++++++++++--
.../transmission/transmission-gtk.template | 12 ------
srcpkgs/transmission/transmission-qt.template | 11 -----
srcpkgs/tree/template | 8 +++-
srcpkgs/tsocks/template | 12 ++++--
srcpkgs/tumbler/template | 19 ++++++++-
srcpkgs/tumbler/tumbler-devel.template | 11 -----
srcpkgs/tzdata/template | 8 +++-
57 files changed, 507 insertions(+), 348 deletions(-)
delete mode 100644 srcpkgs/t1lib/libt1.template
delete mode 100644 srcpkgs/t1lib/t1lib-devel.template
delete mode 100644 srcpkgs/taglib/taglib-devel.template
delete mode 100644 srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
delete mode 100644 srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
delete mode 100644 srcpkgs/telepathy-farstream/telepathy-farstream-devel.template
delete mode 100644 srcpkgs/telepathy-glib/telepathy-glib-devel.template
delete mode 100644 srcpkgs/telepathy-logger/telepathy-logger-devel.template
delete mode 100644 srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
delete mode 100644 srcpkgs/tinyxml/tinyxml-devel.template
delete mode 100644 srcpkgs/totem-pl-parser/totem-pl-parser-devel.template
delete mode 100644 srcpkgs/totem/libtotem.template
delete mode 100644 srcpkgs/totem/totem-devel.template
delete mode 100644 srcpkgs/totem/totem-mozilla-plugin.template
delete mode 100644 srcpkgs/tracker/libtracker.template
delete mode 100644 srcpkgs/tracker/tracker-devel.template
delete mode 100644 srcpkgs/transmission/transmission-gtk.template
delete mode 100644 srcpkgs/transmission/transmission-qt.template
delete mode 100644 srcpkgs/tumbler/tumbler-devel.template
diff --git a/srcpkgs/t1lib/libt1.template b/srcpkgs/t1lib/libt1.template
deleted file mode 100644
index 7fb73ce754..0000000000
--- a/srcpkgs/t1lib/libt1.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'libt1'.
-#
-short_desc="${short_desc} - runtime libraries"
-long_desc="${long_desc}
-
- This package contains the runtime libraries."
-
-
-do_install()
-{
- vmove "usr/lib/*.so*" usr/lib
-}
diff --git a/srcpkgs/t1lib/t1lib-devel.template b/srcpkgs/t1lib/t1lib-devel.template
deleted file mode 100644
index 2e98e405c3..0000000000
--- a/srcpkgs/t1lib/t1lib-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 't1lib-devel'.
-#
-depends="libXaw-devel libt1"
-short_desc="Development files for the DjVu image format"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
- vmove usr/include usr
- vmove "usr/lib/*.a" usr/lib
-}
diff --git a/srcpkgs/t1lib/template b/srcpkgs/t1lib/template
index 77698938c8..acb8c88cdc 100644
--- a/srcpkgs/t1lib/template
+++ b/srcpkgs/t1lib/template
@@ -1,15 +1,15 @@
# Template file for 't1lib'
pkgname=t1lib
version=5.1.2
-homepage="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
-distfiles="http://www.ibiblio.org/pub/Linux/libs/graphics/$pkgname-$version.tar.gz"
+revision=1
build_style=gnu-configure
make_build_target="without_doc"
-revision=2
makedepends="libXaw-devel"
short_desc="Rasterizer library for Adobe Type 1 fonts"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
+homepage="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
+distfiles="http://www.ibiblio.org/pub/Linux/libs/graphics/$pkgname-$version.tar.gz"
checksum=821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59
long_desc="
Rasterizer library for Adobe Type 1 Fonts. Supports rotation and transformation,
@@ -17,6 +17,24 @@ long_desc="
for X11 are provided. AFM-files can be generated from Type 1, font files and
font subsetting is also easily possible. Includes Composite Character support."
-subpackages="libt1 ${pkgname}-devel"
+libt1_package() {
+ short_desc="${short_desc} - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so*"
+ }
+}
+t1lib-devel_package() {
+ depends="libXaw-devel libt1>=${version}"
+ short_desc="Development files for the DjVu image format"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ }
+}
+t1lib_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/taglib/taglib-devel.template b/srcpkgs/taglib/taglib-devel.template
deleted file mode 100644
index 4e218963e6..0000000000
--- a/srcpkgs/taglib/taglib-devel.template
+++ /dev/null
@@ -1,14 +0,0 @@
-# Template file for 'taglib-devel'.
-#
-noarch=yes
-depends="zlib-devel taglib>=${version}"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-do_install() {
- vmove usr/bin usr
- vmove usr/include usr
- vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/taglib/template b/srcpkgs/taglib/template
index cc6de31473..c67f907bdd 100644
--- a/srcpkgs/taglib/template
+++ b/srcpkgs/taglib/template
@@ -1,10 +1,10 @@
# Template file for 'taglib'
pkgname=taglib
version=1.8
-revision=1
+revision=2
build_style=cmake
configure_args="-DWITH_MP4=ON -DWITH_ASF=ON"
-makedepends="pkg-config cmake"
+hostmakedepends="pkg-config cmake"
short_desc="Library for accessing ID tags in various media files"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://developer.kde.org/~wheeler/taglib.html"
@@ -16,4 +16,18 @@ long_desc="
audio formats. Currently it supports both ID3v1 and ID3v2 for MP3 files, Ogg
Vorbis comments and ID3 tags and Vorbis comments in FLAC files."
-subpackages="${pkgname}-devel"
+taglib-devel_package() {
+ depends="zlib-devel taglib>=${version}"
+ short_desc="${short_desc} -- development files"
+ pkg_install() {
+ vmove usr/bin
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ }
+}
+
+taglib_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tar/template b/srcpkgs/tar/template
index 8b9f5900bb..cca0416603 100644
--- a/srcpkgs/tar/template
+++ b/srcpkgs/tar/template
@@ -2,7 +2,6 @@
pkgname=tar
version=1.26
revision=3
-conflicts="chroot-tar>=0"
build_style=gnu-configure
short_desc="The GNU tape archiver with remote magnetic tape support"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -14,3 +13,10 @@ checksum=5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41
pre_configure() {
sed -i -e '/gets is a/d' gnu/stdio.in.h
}
+
+tar_package() {
+ conflicts="chroot-tar>=0"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tcc/template b/srcpkgs/tcc/template
index a5f25bd568..a48432d6ac 100644
--- a/srcpkgs/tcc/template
+++ b/srcpkgs/tcc/template
@@ -10,3 +10,9 @@ homepage="http://bellard.org/tcc/"
license="LGPL-2.1"
distfiles="${NONGNU_SITE}/tinycc/tcc-$version.tar.bz2"
checksum=521e701ae436c302545c3f973a9c9b7e2694769c71d9be10f70a2460705b6d71
+
+tcc_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template b/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
deleted file mode 100644
index 86a8f3e8d4..0000000000
--- a/srcpkgs/tcp_wrappers/tcp_wrappers-devel.template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'tcp_wrappers-devel'.
-#
-depends="glibc-devel tcp_wrappers-libs"
-short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mkdir -p ${DESTDIR}/usr/share/man/man3
-
- mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
- mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template b/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
deleted file mode 100644
index 9e3e7bc02f..0000000000
--- a/srcpkgs/tcp_wrappers/tcp_wrappers-libs.template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'tcp_wrappers-libs'.
-#
-short_desc="${short_desc} (shared libraries)"
-long_desc="${long_desc}
-
- This package contains the ${pkgname} shared libraries."
-
-conf_files="/etc/hosts.allow /etc/hosts.deny"
-
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mkdir -p ${DESTDIR}/usr/share/man
- mv ${SRCPKGDESTDIR}/usr/lib/lib*.so* ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/etc ${DESTDIR}
- mv ${SRCPKGDESTDIR}/usr/share/man/man5 ${DESTDIR}/usr/share/man
-}
diff --git a/srcpkgs/tcp_wrappers/template b/srcpkgs/tcp_wrappers/template
index 74fe6b7f2d..f04bf9ad6d 100644
--- a/srcpkgs/tcp_wrappers/template
+++ b/srcpkgs/tcp_wrappers/template
@@ -1,25 +1,22 @@
# Template file for 'tcp_wrappers'
pkgname=tcp_wrappers
version=7.6
+revision=5
wrksrc="${pkgname}_${version}"
-distfiles="ftp://ftp.porcupine.org/pub/security/${pkgname}_${version}.tar.gz"
build_style=gnu-makefile
make_build_target="REAL_DAEMON_DIR=/usr/sbin STYLE=-DSYS_ERRLIST_DEFINED linux"
-revision=4
short_desc="A security tool which acts as a wrapper for TCP daemons"
homepage="ftp://ftp.porcupine.org/pub/security/index.html"
license="Custom"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="ftp://ftp.porcupine.org/pub/security/${pkgname}_${version}.tar.gz"
checksum=9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d
long_desc="
The $pkgname package provides small daemon programs which can
monitor and filter incoming requests for systat, finger, FTP, telnet,
rlogin, rsh, exec, tftp, talk and other network services."
-subpackages="$pkgname-devel $pkgname-libs"
-
-pre_install()
-{
+pre_install() {
install -d ${DESTDIR}/usr/lib
install -d ${DESTDIR}/usr/sbin
install -d ${DESTDIR}/usr/include
@@ -30,3 +27,29 @@ pre_install()
install -m644 ${FILESDIR}/hosts.deny ${DESTDIR}/etc/hosts.deny
sed -i -e "s|-o root -g root||g" ${wrksrc}/Makefile
}
+
+tcp_wrappers-devel_package() {
+ depends="tcp_wrappers-libs>=${version}"
+ short_desc="${short_desc} -- development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove usr/share/man/man3
+ }
+}
+
+tcp_wrappers-libs_package() {
+ short_desc="${short_desc} -- shared libraries"
+ conf_files="/etc/hosts.allow /etc/hosts.deny"
+ pkg_install() {
+ vmove "usr/lib/*.so*"
+ vmove usr/share/man/man5
+ vmove etc
+ }
+}
+
+tcp_wrappers_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tcpdump/template b/srcpkgs/tcpdump/template
index 1c174911b0..75c7e9be94 100644
--- a/srcpkgs/tcpdump/template
+++ b/srcpkgs/tcpdump/template
@@ -13,5 +13,11 @@ distfiles="http://www.tcpdump.org/release/${pkgname}-${version}.tar.gz"
checksum=efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286
if [ "$CROSS_BUILD" ]; then
- configure_args="${configure_args} ac_cv_linux_vers=$(uname -r 2>&1 | sed -n -e '$s/.* //' -e '$s/\..*//p') td_cv_buggygetaddrinfo=no"
+ configure_args+=" ac_cv_linux_vers=$(uname -r 2>&1 | sed -n -e '$s/.* //' -e '$s/\..*//p') td_cv_buggygetaddrinfo=no"
fi
+
+tcpdump_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-butterfly/template b/srcpkgs/telepathy-butterfly/template
index 24848f4880..29796832ec 100644
--- a/srcpkgs/telepathy-butterfly/template
+++ b/srcpkgs/telepathy-butterfly/template
@@ -2,13 +2,13 @@
pkgname=telepathy-butterfly
version=0.5.15
revision=2
-distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu-configure
-fulldepends="python papyon telepathy-python"
+makedepends="python papyon telepathy-python"
short_desc="A MSN connection manager for Telepathy"
homepage="http://telepathy.freedesktop.org"
license="GPL-2"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=d48eef7f938c2b5bb805dd6bbbcde673b1c6526ca15af6b5f8fe03d926d35b90
long_desc="
Telepathy is a D-Bus framework for unifying real time communication,
@@ -16,6 +16,11 @@ long_desc="
differences between protocols to provide a unified interface for
applications."
-pycompile_module="butterfly"
-noarch=yes
-
+telepathy-butterfly_package() {
+ depends="${makedepends}"
+ noarch="yes"
+ pycompile_module="butterfly"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template b/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template
deleted file mode 100644
index 1f3e7aa550..0000000000
--- a/srcpkgs/telepathy-farstream/telepathy-farstream-devel.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'telepathy-glib-devel'.
-#
-depends="dbus-glib-devel telepathy-glib-devel farstream-devel>=0.2.0
-gstreamer1-devel telepathy-farstream>=${version}"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install() {
- vmove usr/include usr
- vmove usr/lib/pkgconfig usr/lib
- vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/telepathy-farstream/template b/srcpkgs/telepathy-farstream/template
index f0088779f8..bf3bc4d5e7 100644
--- a/srcpkgs/telepathy-farstream/template
+++ b/srcpkgs/telepathy-farstream/template
@@ -1,12 +1,12 @@
# Template file for 'telepathy-farstream'
pkgname=telepathy-farstream
version=0.6.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-static"
makedepends="pkg-config intltool vala-devel libxslt gobject-introspection
-dbus-glib-devel telepathy-glib-devel>=0.19.9 farstream-devel>=0.2.0
-python-devel pygobject2-devel gst-python-devel"
+ dbus-glib-devel telepathy-glib-devel>=0.19.9 farstream-devel>=0.2.0
+ python-devel pygobject2-devel gst-python-devel"
short_desc="Telepathy library that uses Farstream to handle Call channels"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -19,5 +19,20 @@ long_desc="
differences between protocols to provide a unified interface for
applications."
-subpackages="$pkgname-devel"
-replaces="telepathy-farsight>=0"
+telepathy-farstream-devel_package() {
+ depends="dbus-glib-devel telepathy-glib-devel farstream-devel>=0.2.0
+ gstreamer1-devel ${sourcepkg}>=${version}"
+ short_desc+=" -- development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ }
+}
+
+telepathy-farstream_package() {
+ replaces="telepathy-farsight>=0"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-gabble/template b/srcpkgs/telepathy-gabble/template
index ba5d5454e3..4a861eac95 100644
--- a/srcpkgs/telepathy-gabble/template
+++ b/srcpkgs/telepathy-gabble/template
@@ -4,11 +4,10 @@ version=0.16.2
revision=2
build_style=gnu-configure
configure_args="--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
---enable-handle-leak-debug --disable-debug --disable-static"
-depends="ca-certificates"
+ --enable-handle-leak-debug --disable-debug --disable-static"
makedepends="python pkg-config libxslt dbus-glib-devel libxml2-devel
sqlite-devel gnutls-devel>=3.1.5 telepathy-glib-devel libsoup-devel
- libnice-devel"
+ libnice-devel ca-certificates"
short_desc="A Jabber/XMPP connection manager for Telepathy"
maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1"
@@ -20,3 +19,10 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
+
+telepathy-gabble_package() {
+ depends="ca-certificates"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-glib/telepathy-glib-devel.template b/srcpkgs/telepathy-glib/telepathy-glib-devel.template
deleted file mode 100644
index 964533762c..0000000000
--- a/srcpkgs/telepathy-glib/telepathy-glib-devel.template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'telepathy-glib-devel'.
-#
-depends="vala-devel dbus-glib-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${sourcepkg} - development files"
-long_desc="${long_desc}
-
- This package contains files for development, headers, static libs, etc."
-
-noarch=yes
-
-do_install() {
- vmove usr/include usr
- vmove usr/lib/pkgconfig usr/lib
- vmove usr/share/gir-1.0 usr/share
- vmove usr/share/gtk-doc usr/share
- vmove usr/share/vala usr/share
-}
diff --git a/srcpkgs/telepathy-glib/template b/srcpkgs/telepathy-glib/template
index eaacc497e7..ffa2a925f0 100644
--- a/srcpkgs/telepathy-glib/template
+++ b/srcpkgs/telepathy-glib/template
@@ -1,8 +1,7 @@
# Template file for 'telepathy-glib'
pkgname=telepathy-glib
version=0.20.1
-revision=1
-subpackages="$pkgname-devel"
+revision=2
build_style=gnu-configure
configure_args="--enable-vala-bindings --disable-static"
makedepends="pkg-config intltool vala-devel libxslt gobject-introspection
@@ -18,3 +17,21 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
+
+telepathy-glib-devel_package() {
+ depends="vala-devel dbus-glib-devel ${sourcepkg}-${version}_${revision}"
+ short_desc="${sourcepkg} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/gtk-doc
+ vmove usr/share/vala
+ }
+}
+
+telepathy-glib_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-idle/template b/srcpkgs/telepathy-idle/template
index e0fc154d48..735136bd7b 100644
--- a/srcpkgs/telepathy-idle/template
+++ b/srcpkgs/telepathy-idle/template
@@ -16,3 +16,9 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
+
+telepathy-idle_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-logger/telepathy-logger-devel.template b/srcpkgs/telepathy-logger/telepathy-logger-devel.template
deleted file mode 100644
index 7f3c5f22ab..0000000000
--- a/srcpkgs/telepathy-logger/telepathy-logger-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'telepathy-logger-devel'.
-#
-depends="libxml2-devel telepathy-glib-devel ${sourcepkg}-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
- mkdir -p ${DESTDIR}/usr/{lib,share}
- mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/share/{gir*,gtk-doc} ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/telepathy-logger/template b/srcpkgs/telepathy-logger/template
index 6e5c524a11..75f0f4bbf8 100644
--- a/srcpkgs/telepathy-logger/template
+++ b/srcpkgs/telepathy-logger/template
@@ -2,7 +2,6 @@
pkgname=telepathy-logger
version=0.8.0
revision=1
-subpackages="$pkgname-devel"
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile"
hostmakedepends="pkg-config intltool libxslt gobject-introspection"
@@ -18,3 +17,20 @@ long_desc="
including instant messaging, voice calls and video calls. It abstracts
differences between protocols to provide a unified interface for
applications."
+
+telepathy-logger-devel_package() {
+ depends="libxml2-devel telepathy-glib-devel ${sourcepkg}-${version}_${revision}"
+ short_desc="${short_desc} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/gtk-doc
+ }
+}
+
+telepathy-logger_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template b/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
deleted file mode 100644
index 6922fe1326..0000000000
--- a/srcpkgs/telepathy-mission-control/telepathy-mission-control-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'telepathy-mission-control-devel'.
-#
-depends="telepathy-glib-devel>=0.20.1 ${sourcepkg}>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
- mkdir -p ${DESTDIR}/usr/{lib,share}
- mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
- mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/share/gtk-doc ${DESTDIR}/usr/share
-}
diff --git a/srcpkgs/telepathy-mission-control/template b/srcpkgs/telepathy-mission-control/template
index 47e87f5632..bc70eba888 100644
--- a/srcpkgs/telepathy-mission-control/template
+++ b/srcpkgs/telepathy-mission-control/template
@@ -2,7 +2,6 @@
pkgname=telepathy-mission-control
version=5.14.0
revision=1
-subpackages="$pkgname-devel"
build_style=gnu-configure
configure_args="--disable-static --enable-gnome-keyring
--disable-schemas-compile"
@@ -19,3 +18,19 @@ long_desc="
Telepathy is a D-Bus framework for unifying real time communication, including
instant messaging, voice calls and video calls. It abstracts differences
between protocols to provide a unified interface for applications."
+
+telepathy-mission-control-devel_package() {
+ depends="telepathy-glib-devel>=0.20.1 ${sourcepkg}>=${version}"
+ short_desc="${short_desc} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ }
+}
+
+telepathy-mission-control_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-python/template b/srcpkgs/telepathy-python/template
index 71ba80de01..6498c4ff5a 100644
--- a/srcpkgs/telepathy-python/template
+++ b/srcpkgs/telepathy-python/template
@@ -2,14 +2,14 @@
pkgname=telepathy-python
version=0.15.19
revision=3
-distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
build_style=gnu-configure
-makedepends="libxslt"
-fulldepends="python dbus-python"
+hostmakedepends="libxslt"
+makedepends="python dbus-python"
short_desc="Python libraries for use in Telepathy clients and connection managers"
homepage="http://telepathy.freedesktop.org"
license="LGPL-2.1"
maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=244c0e1bf4bbd78ae298ea659fe10bf3a73738db550156767cc2477aedf72376
long_desc="
Telepathy is a D-Bus framework for unifying real time communication,
@@ -17,6 +17,11 @@ long_desc="
differences between protocols to provide a unified interface for
applications."
-pycompile_module="telepathy"
-noarch=yes
-
+telepathy-python_package() {
+ depends="python dbus-python"
+ noarch="yes"
+ pycompile_module="telepathy"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/telepathy-salut/template b/srcpkgs/telepathy-salut/template
index 3d0a1eb530..6b92e0b38b 100644
--- a/srcpkgs/telepathy-salut/template
+++ b/srcpkgs/telepathy-salut/template
@@ -1,17 +1,18 @@
# Template file for 'telepathy-salut'
pkgname=telepathy-salut
version=0.8.0
-distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
+revision=1
build_style=gnu-configure
configure_args="--disable-tests --disable-debug --disable-plugins --with-tls=openssl
--disable-avahi-tests --disable-static"
-depends="avahi"
-makedepends="pkg-config xmldiff avahi-glib-libs-devel libsoup-devel telepathy-glib-devel openssl-devel libuuid-devel sqlite-devel"
-revision=1
+hostmakedepends="pkg-config xmldiff"
+makedepends="avahi-glib-libs-devel libsoup-devel telepathy-glib-devel
+ openssl-devel libuuid-devel sqlite-devel"
short_desc="A link-local XMPP connection manager for Telepathy"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://telepathy.freedesktop.org"
license="LGPL-2.1"
+distfiles="http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz"
checksum=f504faf472e81c17c2707696124d4219fe869c83d7cdbbe53a035eb724bfb5ce
long_desc="
Telepathy is a D-Bus framework for unifying real time communication,
@@ -19,4 +20,9 @@ long_desc="
differences between protocols to provide a unified interface for
applications."
-
+telepathy-salut_package() {
+ depends="avahi"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/terminus-font/template b/srcpkgs/terminus-font/template
index 36fc8e993b..453c856b3e 100644
--- a/srcpkgs/terminus-font/template
+++ b/srcpkgs/terminus-font/template
@@ -9,10 +9,7 @@ license="OFL-1.1, GPL-2"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5eed97b7
-noarch=yes
-makedepends="perl bdftopcf"
-fulldepends="font-util xbps-triggers>=0.58"
-font_dirs="/usr/share/fonts/X11/misc"
+makedepends="perl bdftopcf font-util xbps-triggers>=0.58"
do_configure() {
sh ./configure --prefix=/usr --x11dir=/usr/share/fonts/X11/misc \
@@ -28,3 +25,12 @@ do_install() {
vinstall OFL.TXT 644 usr/share/licenses/${pkgname} LICENSE
}
+
+terminus-font_package() {
+ depends="font-util xbps-triggers>=0.58"
+ noarch="yes"
+ font_dirs="/usr/share/fonts/X11/misc"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/testdisk/template b/srcpkgs/testdisk/template
index d7dc47eb79..d05e8b5cad 100644
--- a/srcpkgs/testdisk/template
+++ b/srcpkgs/testdisk/template
@@ -5,11 +5,17 @@ revision=3
build_style=gnu-configure
configure_args="--without-ewf --enable-sudo"
makedepends="libjpeg-turbo-devel libuuid-devel e2fsprogs-devel
- openssl-devel ntfs-3g-devel>=2013.1.13 ncurses-devel"
-fulldepends="sudo"
+ openssl-devel ntfs-3g-devel>=2013.1.13 ncurses-devel sudo"
short_desc="Powerful free data recovery software"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.cgsecurity.org/"
distfiles="http://www.cgsecurity.org/$pkgname-$version.tar.bz2"
checksum=48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220
+
+testdisk_package() {
+ depends="sudo"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/texinfo/template b/srcpkgs/texinfo/template
index e489530302..cc4b66565a 100644
--- a/srcpkgs/texinfo/template
+++ b/srcpkgs/texinfo/template
@@ -3,8 +3,6 @@ pkgname=texinfo
version=4.13a
revision=10
wrksrc="$pkgname-4.13"
-conflicts="chroot-texinfo>=0"
-depends="gzip"
makedepends="ncurses-devel"
short_desc="The GNU Documentation System"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -33,3 +31,11 @@ do_install() {
# Compress manually info files.
gzip -9 ${DESTDIR}/usr/share/info/*
}
+
+texinfo_package() {
+ conflicts="chroot-texinfo>=0"
+ depends="gzip"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tftp-hpa/template b/srcpkgs/tftp-hpa/template
index 27f1f69968..5b861acff2 100644
--- a/srcpkgs/tftp-hpa/template
+++ b/srcpkgs/tftp-hpa/template
@@ -9,5 +9,14 @@ license="BSD"
homepage="http://www.kernel.org"
distfiles="${homepage}/pub/software/network/tftp/${pkgname}-${version}.tar.gz"
checksum=12ea5182b27ee8da4867f5947762ff2924ef3e41b1e6f7ca5bc1c2c7feff649e
-makedepends="autoconf"
-make_install_args="INSTALLROOT=${XBPS_DESTDIR}/${pkgname}-${version}"
+hostmakedepends="autoconf"
+
+do_install() {
+ make INSTALLROOT=${DESTDIR} install
+}
+
+tftp-hpa_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index 837549f3a8..e8ee2f87af 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,15 +1,16 @@
# Template file for 'thunar-volman'.
pkgname=thunar-volman
version=0.8.0
-homepage="http://xfce.org"
-distfiles="http://archive.xfce.org/src/xfce/thunar-volman/0.8/$pkgname-$version.tar.bz2"
-build_style=gnu-configure
-depends="hicolor-icon-theme desktop-file-utils"
-makedepends="pkg-config intltool gtk+-devel libgudev-devel libnotify-devel libxfce4util-devel libxfce4ui-devel xfconf-devel exo-devel"
revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config intltool"
+makedepends="gtk+-devel libgudev-devel libnotify-devel libxfce4util-devel
+ libxfce4ui-devel xfconf-devel exo-devel"
short_desc="Thunar Volume Manager"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
+homepage="http://xfce.org"
+distfiles="http://archive.xfce.org/src/xfce/thunar-volman/0.8/$pkgname-$version.tar.bz2"
checksum=ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb
long_desc="
The Thunar Volume Manager is an extension for the Thunar file manager,
@@ -19,6 +20,9 @@ long_desc="
photo application and import the new pictures from the camera into your
photo collection."
-
-
-
+thunar-volman_package() {
+ depends="hicolor-icon-theme desktop-file-utils"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index f0375d12d5..598e5dddae 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -11,7 +11,6 @@ distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${ve
checksum=081b53161750a31f9b43d4ba4ccb496c69fdfaa3430f0ce0798cd5fa3036764c
disable_debug=yes
-depends="desktop-file-utils hicolor-icon-theme"
makedepends="unzip zip perl python yasm libjpeg-turbo-devel libpng-devel>=1.5.10
pixman-devel libIDL-devel nss-devel>=3.13.3 sqlite-devel libXrender-devel
@@ -44,3 +43,10 @@ do_install() {
# We don't want the development stuff
rm -r ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl}
}
+
+thunderbird_package() {
+ depends="desktop-file-utils hicolor-icon-theme"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tig/template b/srcpkgs/tig/template
index c0df3952c6..b3b25d78af 100644
--- a/srcpkgs/tig/template
+++ b/srcpkgs/tig/template
@@ -4,8 +4,7 @@ version=1.1
revision=1
build_style=gnu-configure
make_install_args="install-doc-man"
-makedepends="ncurses-devel"
-fulldepends="git"
+makedepends="ncurses-devel git"
short_desc="Text-mode interface for Git"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -27,3 +26,10 @@ post_install() {
vinstall contrib/tig-completion.bash 644 \
usr/share/bash-completion/completions tig
}
+
+tig_package() {
+ depends="tig"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/time/template b/srcpkgs/time/template
index ed105dc698..f264c8c167 100644
--- a/srcpkgs/time/template
+++ b/srcpkgs/time/template
@@ -1,29 +1,27 @@
# Template file for 'time'
pkgname=time
version=1.7
-distfiles="$GNU_SITE/$pkgname/$pkgname-$version.tar.gz"
-revision=1
-makedepends="glibc-devel"
+revision=2
+build_style=gnu-configure
short_desc="The GNU time program for measuring cpu resource usage"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://directory.fsf.org/project/time"
license="GPL-2"
+distfiles="$GNU_SITE/$pkgname/$pkgname-$version.tar.gz"
checksum=e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d
long_desc="
- The time command runs another program, then displays information about the
- resources used by that program, collected by the system while the program
- was running. You can select which information is reported and the format in
- which it is shown, or have time save the information in a file instead of
- display it on the screen."
+ The time command runs another program, then displays information about the
+ resources used by that program, collected by the system while the program
+ was running. You can select which information is reported and the format in
+ which it is shown, or have time save the information in a file instead of
+ display it on the screen."
-
-do_build()
-{
- ./configure --prefix=/usr --infodir=/usr/share/info
- make ${makejobs}
-}
-
-do_install()
-{
+do_install() {
make exec_prefix="${DESTDIR}/usr" infodir="${DESTDIR}/usr/share/info" install
}
+
+time_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tinc/template b/srcpkgs/tinc/template
index 2fa22ef2d0..ed864988fd 100644
--- a/srcpkgs/tinc/template
+++ b/srcpkgs/tinc/template
@@ -14,3 +14,9 @@ makedepends="lzo-devel openssl-devel"
post_install() {
vinstall ${FILESDIR}/tincd@.service 644 usr/lib/systemd/system
}
+
+tinc_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tinyxml/template b/srcpkgs/tinyxml/template
index c4e8f47643..b1102efec6 100644
--- a/srcpkgs/tinyxml/template
+++ b/srcpkgs/tinyxml/template
@@ -2,7 +2,6 @@
pkgname=tinyxml
version=2.6.2
revision=3
-subpackages="${pkgname}-devel"
short_desc="A simple, small, C++ XML parser that can be easily integrated into other programs"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.grinninglizard.com/tinyxml/"
@@ -33,3 +32,17 @@ do_install() {
ln -s lib${sourcepkg}.so.0.${version} lib${sourcepkg}.so
)
}
+
+tinyxml-devel_package() {
+ depends="${sourcepkg}>=${version}"
+ short_desc="${short_desc} -- development files"
+ pkg_install() {
+ vmove usr/include usr
+ }
+}
+
+tinyxml_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tinyxml/tinyxml-devel.template b/srcpkgs/tinyxml/tinyxml-devel.template
deleted file mode 100644
index 1512bb9365..0000000000
--- a/srcpkgs/tinyxml/tinyxml-devel.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# Template file for 'tinyxml-devel'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- development files"
-
-do_install() {
- vmove usr/include usr
-}
diff --git a/srcpkgs/tiv/template b/srcpkgs/tiv/template
index 51ccabd46d..6bf675cfc1 100644
--- a/srcpkgs/tiv/template
+++ b/srcpkgs/tiv/template
@@ -14,3 +14,9 @@ checksum=4aeae8b132ff507084ed1365652dda96ee245e003a4b409d3a304ce0871802f3
pre_install() {
vmkdir usr/bin
}
+
+tiv_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tmux/template b/srcpkgs/tmux/template
index c6d1429e5b..21a0c90caa 100644
--- a/srcpkgs/tmux/template
+++ b/srcpkgs/tmux/template
@@ -17,3 +17,9 @@ long_desc="
created, accessed, and controlled from a single screen. tmux may be
detached from a screen and continue running in the background, then later
reattached."
+
+tmux_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tor/template b/srcpkgs/tor/template
index d5d1d95dae..cb62044bdd 100644
--- a/srcpkgs/tor/template
+++ b/srcpkgs/tor/template
@@ -3,8 +3,7 @@ pkgname=tor
version=0.2.3.25
revision=1
build_style=gnu-configure
-makedepends="zlib-devel openssl-devel libevent-devel"
-fulldepends="ca-certificates tsocks"
+makedepends="zlib-devel openssl-devel libevent-devel ca-certificates tsocks"
short_desc="Anonymity Online"
maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD"
@@ -19,12 +18,6 @@ long_desc="
individuals to share information over public networks without compromising
their privacy."
-conf_files="/etc/tor/tor-tsocks.conf /etc/tor/torrc"
-make_dirs="/var/lib/tor 0700 tor tor"
-systemd_services="tor.service on"
-system_accounts="tor"
-tor_homedir="/var/lib/tor"
-
post_install() {
# Use our own default config file.
vinstall ${FILESDIR}/torrc 640 etc/tor
@@ -32,3 +25,16 @@ post_install() {
# Install systemd service.
vinstall ${FILESDIR}/tor.service 644 usr/lib/systemd/system
}
+
+tor_package() {
+ depends="shadow ca-certificates tsocks"
+ conf_files="/etc/tor/tor-tsocks.conf /etc/tor/torrc"
+ system_accounts="tor"
+ tor_homedir="/var/lib/tor"
+ systemd_services="tor.service on"
+ make_dirs="/var/lib/tor 0700 tor tor"
+ pkg_install() {
+ vmove etc
+ vmove usr
+ }
+}
diff --git a/srcpkgs/torsocks/template b/srcpkgs/torsocks/template
index be5284bbc9..db79399fb4 100644
--- a/srcpkgs/torsocks/template
+++ b/srcpkgs/torsocks/template
@@ -3,7 +3,6 @@ pkgname=torsocks
version=1.2
revision=3
build_style=gnu-configure
-conf_files="/etc/torsocks.conf"
configure_args="--disable-static --enable-oldmethod
--datarootdir=/usr/share/${pkgname}"
short_desc="A transparent socks proxy for use with tor"
@@ -16,3 +15,11 @@ long_desc="
Torsocks allows you to use most socks-friendly applications in a safe way
with Tor. It ensures that DNS requests are handled safely and explicitly
rejects UDP traffic from the application you're using."
+
+torsocks_package() {
+ conf_files="/etc/torsocks.conf"
+ pkg_install() {
+ vmove etc
+ vmove usr
+ }
+}
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index 0e45df7912..c065b723a5 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -12,4 +12,21 @@ homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/3.4/$pkgname-$version.tar.xz"
checksum=b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457
-subpackages="$pkgname-devel"
+
+totem-pl-parser-devel_package() {
+ depends="libglib-devel libxml2-devel gmime-devel libquvi-devel
+ libgcrypt-devel ${sourcepkg}>=${version}"
+ short_desc="${short_desc} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/gtk-doc
+ }
+}
+
+totem-pl-parser_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template b/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template
deleted file mode 100644
index f879ea0275..0000000000
--- a/srcpkgs/totem-pl-parser/totem-pl-parser-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'totem-pl-parser-devel'.
-#
-depends="libglib-devel libxml2-devel gmime-devel libquvi-devel
- libgcrypt-devel ${sourcepkg}>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
- vmove usr/include usr
- vmove usr/lib/pkgconfig usr/lib
- vmove usr/share/gir-1.0 usr/share
- vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/totem/libtotem.template b/srcpkgs/totem/libtotem.template
deleted file mode 100644
index d763ca40de..0000000000
--- a/srcpkgs/totem/libtotem.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'libtotem'.
-#
-short_desc="${short_desc} - runtime library"
-replaces="totem<3.6.2"
-
-do_install() {
- vmove "usr/lib/*.so*" usr/lib
- vmove usr/lib/girepository-1.0 usr/lib
-}
diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template
index 9e2a91fe75..3ed7bfb0da 100644
--- a/srcpkgs/totem/template
+++ b/srcpkgs/totem/template
@@ -43,12 +43,43 @@ makedepends="gnutls-devel gst-plugins-base1-devel totem-pl-parser-devel
clutter-gst-devel>=2.0.2_2 clutter-gtk-devel>=1.4.4
libpeas-devel libXtst-devel grilo-devel>=0.2.0 libepc-devel vala-devel>=0.20
gst-plugins-bad1-devel>=1.0.0_2 gsettings-desktop-schemas-devel>=3.8.0
- libzeitgeist-devel nautilus-devel>=3.8.0"
-
-depends="grilo-plugins>=0.2.0 hicolor-icon-theme desktop-file-utils gst-libav"
-fulldepends="gst-plugins-ugly1 gst-plugins-good1"
+ libzeitgeist-devel nautilus-devel>=3.8.0 gst-plugins-ugly1 gst-plugins-good1"
# XXX xulrunner plugin.
-subpackages="libtotem totem-devel totem-mozilla-plugin"
# XXX reenable python plugin if pylint pkg exists.
#pycompile_dirs="usr/lib/totem/plugins"
+
+libtotem_package() {
+ short_desc="${short_desc} - runtime library"
+ replaces="totem<3.6.2"
+ pkg_install() {
+ vmove "usr/lib/*.so*"
+ vmove usr/lib/girepository-1.0
+ }
+}
+
+totem-devel_package() {
+ depends="gtk+3-devel totem-pl-parser-devel libtotem-${version}_${revision}"
+ short_desc="${short_desc} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gir-1.0
+ vmove usr/share/gtk-doc
+ }
+}
+
+totem-mozilla-plugin_package() {
+ short_desc="Mozilla plug-in for Totem media player"
+ pkg_install() {
+ vmove usr/lib/mozilla
+ }
+}
+
+totem_package() {
+ depends="grilo-plugins>=0.2.0 hicolor-icon-theme desktop-file-utils
+ gst-libav gst-plugins-ugly1 gst-plugins-good1"
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/totem/totem-devel.template b/srcpkgs/totem/totem-devel.template
deleted file mode 100644
index c79caec225..0000000000
--- a/srcpkgs/totem/totem-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'totem-devel'.
-#
-depends="gtk+3-devel totem-pl-parser-devel libtotem-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
- vmove usr/include usr
- vmove usr/lib/pkgconfig usr/lib
- vmove usr/share/gir-1.0 usr/share
- vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/totem/totem-mozilla-plugin.template b/srcpkgs/totem/totem-mozilla-plugin.template
deleted file mode 100644
index 9a09948d86..0000000000
--- a/srcpkgs/totem/totem-mozilla-plugin.template
+++ /dev/null
@@ -1,13 +0,0 @@
-# Template file for 'totem-mozilla-plugins'.
-#
-short_desc="Mozilla plug-in for Totem media player"
-long_desc="${long_desc}
-
- This package contains plug-ins for the Mozilla (or derived) web browsers
- to play different type of videos through GNOME's Totem media player."
-
-do_install()
-{
- mkdir -p ${DESTDIR}/usr/lib
- mv ${SRCPKGDESTDIR}/usr/lib/mozilla ${DESTDIR}/usr/lib
-}
diff --git a/srcpkgs/traceroute/template b/srcpkgs/traceroute/template
index 4785911d5a..5f3cd81239 100644
--- a/srcpkgs/traceroute/template
+++ b/srcpkgs/traceroute/template
@@ -23,3 +23,9 @@ do_install() {
vinstall traceroute/traceroute 755 usr/bin
vinstall traceroute/traceroute.8 644 usr/share/man/man8
}
+
+traceroute_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tracker/libtracker.template b/srcpkgs/tracker/libtracker.template
deleted file mode 100644
index 66a96d4cd5..0000000000
--- a/srcpkgs/tracker/libtracker.template
+++ /dev/null
@@ -1,9 +0,0 @@
-# Template file for 'libtracker'.
-#
-short_desc="${short_desc} - shared libraries"
-
-do_install() {
- vmove "usr/lib/*.so*" usr/lib
- vmove "usr/lib/tracker-0.16/*.so*" usr/lib/tracker-0.16
- vmove usr/lib/girepository-1.0 usr/lib
-}
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 2986678c6c..df6a73e314 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -11,7 +11,6 @@ makedepends="libpng-devel libgee-devel libsecret-devel upower-devel
libgsf-devel icu-devel>=49 enca-devel libvorbis-devel libflac-devel
taglib-devel giflib-devel>=5.0 totem-pl-parser-devel
libexif-devel tiff-devel network-manager-applet-devel sqlite-devel"
-subpackages="$pkgname-devel libtracker"
short_desc="Personal search tool and storage system"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -26,3 +25,31 @@ long_desc="
your data with keywords which can be used to find related information or to
group and categorise your data further. Tracker lets you extend your data
with additional metadata."
+
+tracker-devel_package() {
+ depends="libglib-devel libtracker-${version}_${revision}"
+ short_desc="${short_desc} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/share/gir-1.0
+ vmove usr/share/gtk-doc
+ vmove usr/share/vala
+ vmove usr/lib/pkgconfig
+ }
+}
+
+libtracker_package() {
+ short_desc="${short_desc} - shared libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so*"
+ vmove "usr/lib/tracker-0.16/*.so*"
+ vmove usr/lib/girepository-1.0
+ }
+}
+
+tracker_package() {
+ pkg_install() {
+ vmove etc
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tracker/tracker-devel.template b/srcpkgs/tracker/tracker-devel.template
deleted file mode 100644
index b777d718d8..0000000000
--- a/srcpkgs/tracker/tracker-devel.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'tracker-devel'.
-#
-depends="libglib-devel libtracker-${version}_${revision}"
-short_desc="${short_desc} - development files"
-
-do_install() {
- vmove usr/include usr
- vmove usr/share/gir-1.0 usr/share
- vmove usr/share/gtk-doc usr/share
- vmove usr/share/vala usr/share
- vmove usr/lib/pkgconfig usr/lib
-}
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 0cef6a6e81..188e36ef72 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -2,10 +2,10 @@
pkgname=transmission
version=2.77
revision=1
-subpackages="${pkgname}-gtk ${pkgname}-qt"
build_style=gnu-configure
configure_args="--enable-nls --enable-cli --enable-daemon --enable-utp"
-makedepends="pkg-config intltool zlib-devel openssl-devel dbus-glib-devel
+hostmakedepends="pkg-config intltool"
+makedepends="zlib-devel openssl-devel dbus-glib-devel
libcurl-devel libevent-devel gtk+3-devel qt-devel"
short_desc="A fast, easy, and free BitTorrent client"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -16,5 +16,41 @@ checksum=55b1653fc18a10153ba9439f284bd7b2276a6859416dcae217d9e8c689841fde
post_build() {
# Build the qt frontend.
- cd qt && qmake qtr.pro && make ${makejobs}
+ cd qt
+ qmake qtr.pro
+ make ${makejobs}
+}
+
+post_install() {
+ # Install qt frontend
+ make -C qt INSTALL_ROOT=${DESTDIR}/usr install
+}
+
+transmission-gtk_package() {
+ depends="${sourcepkg}>=${version} hicolor-icon-theme desktop-file-utils"
+ short_desc="${short_desc} -- GTK+ frontend"
+ pkg_install() {
+ vmove usr/bin/transmission-gtk
+ vmove usr/share/man/man1/transmission-gtk.1
+ vmove usr/share/icons/hicolor
+ vmove usr/share/applications
+ vmove usr/share/locale
+ }
+}
+
+transmission-qt_package() {
+ depends="${sourcepkg}>=${version}"
+ short_desc="${short_desc} -- QT Frontend"
+ pkg_install() {
+ vmove usr/bin/transmission-qt
+ vmove usr/share/man/man1/transmission-qt.1
+ vinstall ${wrksrc}/qt/icons/transmission.png 644 usr/share/pixmaps transmission-qt.png
+ vinstall ${wrksrc}/qt/transmission-qt.desktop 644 usr/share/applications
+ }
+}
+
+transmission_package() {
+ pkg_install() {
+ vmove usr
+ }
}
diff --git a/srcpkgs/transmission/transmission-gtk.template b/srcpkgs/transmission/transmission-gtk.template
deleted file mode 100644
index 0553ad4e97..0000000000
--- a/srcpkgs/transmission/transmission-gtk.template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'transmission-gtk'.
-#
-depends="${sourcepkg}>=${version} hicolor-icon-theme desktop-file-utils"
-short_desc="${short_desc} -- GTK+ frontend"
-
-do_install() {
- vmove usr/bin/transmission-gtk usr/bin
- vmove usr/share/man/man1/transmission-gtk.1 usr/share/man/man1
- vmove usr/share/icons/hicolor usr/share/icons
- vmove usr/share/applications usr/share
- vmove usr/share/locale usr/share
-}
diff --git a/srcpkgs/transmission/transmission-qt.template b/srcpkgs/transmission/transmission-qt.template
deleted file mode 100644
index 13abe238a5..0000000000
--- a/srcpkgs/transmission/transmission-qt.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'transmission-qt'.
-#
-depends="${sourcepkg}>=${version}"
-short_desc="${short_desc} -- QT Frontend"
-
-do_install() {
- make -C ${wrksrc}/qt INSTALL_ROOT=${DESTDIR}/usr install
- vinstall qt/icons/transmission.png 644 \
- usr/share/pixmaps transmission-qt.png
- vinstall qt/transmission-qt.desktop 644 usr/share/applications
-}
diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index 05a3a2d0f7..bcc8f33858 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -1,9 +1,9 @@
# Template file for 'tree'
pkgname=tree
version=1.6.0
+revision=1
homepage="http://mama.indstate.edu/users/ice/tree"
distfiles="$homepage/src/tree-$version.tgz"
-revision=1
short_desc="Resursive directory listing program"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
@@ -21,3 +21,9 @@ do_install() {
make MANDIR=${DESTDIR}/usr/share/man/man1 \
BINDIR=${DESTDIR}/usr/bin install
}
+
+tree_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tsocks/template b/srcpkgs/tsocks/template
index 87a90f168c..3da317c290 100644
--- a/srcpkgs/tsocks/template
+++ b/srcpkgs/tsocks/template
@@ -1,15 +1,15 @@
# Template file for 'tsocks'
pkgname=tsocks
version=1.8beta5
+revision=1
wrksrc="tsocks-1.8"
-homepage="http://tsocks.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/tsocks/tsocks-$version.tar.gz"
build_style=gnu-configure
configure_args="--libdir=/usr/lib"
-revision=1
short_desc="Transparent SOCKS proxying library"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
+homepage="http://tsocks.sourceforge.net/"
+distfiles="${SOURCEFORGE_SITE}/tsocks/tsocks-$version.tar.gz"
checksum=849d7ef5af80d03e76cc05ed9fb8fa2bcc2b724b51ebfd1b6be11c7863f5b347
long_desc="
SOCKS servers are a form of proxy that are commonly used in firewalled LAN
@@ -30,3 +30,9 @@ post_install() {
vmkdir usr/share/examples/tsocks
install -m644 *.example ${DESTDIR}/usr/share/examples/tsocks
}
+
+tsocks_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index d931cf96d6..a9f13810ff 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,16 +1,31 @@
# Template file for 'tumbler'.
pkgname=tumbler
version=0.1.27
-revision=1
+revision=2
build_style=gnu-configure
# XXX: missing support: libopenraw, ffmpegthumbnailer
makedepends="pkg-config intltool libjpeg-turbo-devel libpng-devel>=1.5.10
gtk+-devel dbus-glib-devel libgsf-devel poppler-glib-devel
gst-plugins-base1-devel"
-subpackages="tumbler-devel"
short_desc="D-Bus Thumbnailer service"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://xfce.org"
distfiles="http://archive.xfce.org/src/xfce/${pkgname}/0.1/${pkgname}-${version}.tar.bz2"
checksum=4c60b3b92877257fcc54d18acbbe4ad73c84a7ff7608a430ad5a05b452923869
+
+tumbler-devel_package() {
+ depends="libglib-devel tumbler>=${version}"
+ short_desc="${short_desc} - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove usr/share/gtk-doc
+ }
+}
+
+tumbler_package() {
+ pkg_install() {
+ vmove usr
+ }
+}
diff --git a/srcpkgs/tumbler/tumbler-devel.template b/srcpkgs/tumbler/tumbler-devel.template
deleted file mode 100644
index 4afc3a3b9c..0000000000
--- a/srcpkgs/tumbler/tumbler-devel.template
+++ /dev/null
@@ -1,11 +0,0 @@
-# Template file for 'tumbler-devel'.
-#
-noarch=yes
-depends="glib-devel tumbler>=${version}"
-short_desc="${short_desc} - development files"
-
-do_install() {
- vmove usr/include usr
- vmove usr/lib/pkgconfig usr/lib
- vmove usr/share/gtk-doc usr/share
-}
diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index fde30a6c9f..f721068682 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -4,7 +4,6 @@ wrksrc=${pkgname}
create_wrksrc=yes
version=2013b
revision=1
-noarch=yes
homepage="http://www.iana.org/time-zones"
short_desc="Time zone and daylight-saving time data"
maintainer="Juan RP <xtraeme@gmail.com>"
@@ -28,3 +27,10 @@ do_install() {
zic -y ./yearistype -d ${DESTDIR}/usr/share/zoneinfo -p America/New_York
install -m444 -t ${DESTDIR}/usr/share/zoneinfo iso3166.tab zone.tab
}
+
+tzdata_package() {
+ noarch="yes"
+ pkg_install() {
+ vmove usr
+ }
+}