Merge remote branch 'clandmeter/master'

9 files changed, 26 insertions, 76 deletions

diff --git a/extra/ncftp/APKBUILD b/extra/ncftp/APKBUILD
index 2c157f3412..4a43f4582c 100644
--- a/extra/ncftp/APKBUILD
+++ b/extra/ncftp/APKBUILD
@@ -7,9 +7,9 @@ url="http://www.ncftp.com/"
 license="custom"
 depends="uclibc"
 makedepends="ncurses-dev"
-install="$pkgname.install"
+install="$pkgname.post-install"
 source="ftp://ftp.$pkgname.com/$pkgname/$pkgname-$pkgver-src.tar.bz2
-ncftp.install"
+$pkgname.post-install"
 subpackages="$pkgname-doc $pkgname-bookmarks"
 
 build () {
@@ -35,4 +35,4 @@ bookmarks () {
 }
 
 md5sums="b2b4b2fd38c81754b8f13895d784d491  ncftp-3.2.2-src.tar.bz2
-14748964fb593df0e2914a61941cb3c0  ncftp.install"
+b2f4e60fb769c6c9461f28979efa087d  ncftp.post-install"
diff --git a/extra/ncftp/ncftp.install b/extra/ncftp/ncftp.install
deleted file mode 100644
index 3532be46e1..0000000000
--- a/extra/ncftp/ncftp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-  post_install)
-  	echo '*'
-	echo '* If you like to install the ncurses based bookmark manager run: '
-	echo '*'
-	echo '*   apk_add ncftp-bookmarks' 
-	echo '*'
-	;;
-esac
diff --git a/extra/ncftp/ncftp.post-install b/extra/ncftp/ncftp.post-install
new file mode 100644
index 0000000000..e1ccb7b839
--- /dev/null
+++ b/extra/ncftp/ncftp.post-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+echo '*'
+echo '* If you like to install the ncurses based bookmark manager run: '
+echo '*'
+echo '*   apk_add ncftp-bookmarks' 
+echo '*'
+exit 0
diff --git a/extra/tar/APKBUILD b/extra/tar/APKBUILD
index fcf1f82fb0..1bf4027f93 100644
--- a/extra/tar/APKBUILD
+++ b/extra/tar/APKBUILD
@@ -6,8 +6,10 @@ pkgdesc="Utility used to store, backup, and transport files"
 url="http://www.gnu.org"
 license='GPL'
 depends="uclibc"
+install="$pkgname.post-deinstall"
 makedepends=""
-source="ftp://ftp.gnu.org/gnu/tar/$pkgname-$pkgver.tar.gz"
+source="ftp://ftp.gnu.org/gnu/tar/$pkgname-$pkgver.tar.gz
+$pkgname.post-deinstall"
 subpackages="$pkgname-doc"
 
 build() {
@@ -19,4 +21,5 @@ build() {
 	make DESTDIR="$pkgdir/" install
 }
 
-md5sums="e7ae56b3bf924d5108b57b544b247c50  tar-1.21.tar.gz"
+md5sums="e7ae56b3bf924d5108b57b544b247c50  tar-1.21.tar.gz
+b84506d253e04db3c5af9016fead45a3  tar.post-deinstall"
diff --git a/extra/tar/tar.post-deinstall b/extra/tar/tar.post-deinstall
new file mode 100644
index 0000000000..99b57c4635
--- /dev/null
+++ b/extra/tar/tar.post-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+busybox --install -s
diff --git a/extra/transmission/APKBUILD b/extra/transmission/APKBUILD
index a7796fc76b..b3886e3d32 100644
--- a/extra/transmission/APKBUILD
+++ b/extra/transmission/APKBUILD
@@ -4,15 +4,14 @@ pkgver=1.51
 pkgel=0
 pkgdesc="Fast, easy, and fee BitToent client (CLI tools daemon and webinterface)"
 url="http://www.tansmissionbt.com"
-install=transmission.install
+install="$pkgname.pre-install"
 license="MIT"
 depends="curl"
 makedepends="openssl-dev pkgconfig curl-dev"
 source="http://download.m0k.org/transmission/files/transmission-$pkgver.tar.bz2
 	transmission-daemon.initd
 	transmission-daemon.confd
-	transmission.install
-	"
+	$pkgname.pre-install"
 subpackages="$pkgname-doc"
 
 build() {
@@ -30,4 +29,4 @@ build() {
 md5sums="b93439fbd0040ad6eb448f70a48355f5  transmission-1.51.tar.bz2
 b3b921242bdc3b33a8ac05fc30653b6c  transmission-daemon.initd
 89478a70fcd93463e1dd8d751da994da  transmission-daemon.confd
-4e338c4f7c902e132707b9e87b9bf1b5  transmission.install"
+f1c8d94e1f7ff77c23a7e92d3860754d  transmission.pre-install"
diff --git a/extra/transmission/transmission-1.34-configure-no-nls.patch b/extra/transmission/transmission-1.34-configure-no-nls.patch
deleted file mode 100644
index 551d624615..0000000000
--- a/extra/transmission/transmission-1.34-configure-no-nls.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- transmission-1.34.orig/configure	Fri Nov 28 15:54:27 2008
-+++ transmission-1.34/configure	Fri Nov 28 15:57:05 2008
-@@ -23735,22 +23735,7 @@
-     ;;
- esac
- 
--if test -n "0.23"; then
--    { echo "$as_me:$LINENO: checking for intltool >= 0.23" >&5
--echo $ECHO_N "checking for intltool >= 0.23... $ECHO_C" >&6; }
- 
--    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
--    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
--    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
--
--    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
--echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
--    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
--	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.23 or later." >&5
--echo "$as_me: error: Your intltool is too old.  You need intltool 0.23 or later." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
-   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-      INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -23909,21 +23894,6 @@
- else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
--fi
--
--
--if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
--    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
--mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
--mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
--if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
--    { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
--   { (exit 1); exit 1; }; }
- fi
- 
- # Use the tools built into the package, not the ones that are installed.
diff --git a/extra/transmission/transmission.install b/extra/transmission/transmission.install
deleted file mode 100644
index 870b5e29e8..0000000000
--- a/extra/transmission/transmission.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-case $1 in
-	pre_install)
-		adduser -h /var/lib/transmission -s /bin/false -D transmission 2>/dev/null
-		;;
-esac
-
-exit 0
diff --git a/extra/transmission/transmission.pre-install b/extra/transmission/transmission.pre-install
new file mode 100644
index 0000000000..44a14760f6
--- /dev/null
+++ b/extra/transmission/transmission.pre-install
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+adduser -h /var/lib/transmission -s /bin/false -D transmission 2>/dev/null
+
+exit 0