deco: 1.5.7 -> 1.6.0.1

5 files changed, 23 insertions, 128 deletions

diff --git a/deco/.footprint b/deco/.footprint
index 3eec9ad11..12d5ce764 100644
--- a/deco/.footprint
+++ b/deco/.footprint
@@ -1,102 +1,3 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/deco
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/deco/
-drwxr-xr-x	root/root	usr/share/deco/7z/
--rwxr-xr-x	root/root	usr/share/deco/7z/extract
-lrwxrwxrwx	root/root	usr/share/deco/7z\.[0-9]{2,} -> 7z
-drwxr-xr-x	root/root	usr/share/deco/a/
--rwxr-xr-x	root/root	usr/share/deco/a/extract
-drwxr-xr-x	root/root	usr/share/deco/ace|[c0-9][0-9]{2}/
--rwxr-xr-x	root/root	usr/share/deco/ace|[c0-9][0-9]{2}/extract
--rw-r--r--	root/root	usr/share/deco/ace|[c0-9][0-9]{2}/permissions (EMPTY)
-drwxr-xr-x	root/root	usr/share/deco/alz/
--rwxr-xr-x	root/root	usr/share/deco/alz/extract
-drwxr-xr-x	root/root	usr/share/deco/ape/
--rwxr-xr-x	root/root	usr/share/deco/ape/extract
-lrwxrwxrwx	root/root	usr/share/deco/ar -> a
-drwxr-xr-x	root/root	usr/share/deco/arc/
--rwxr-xr-x	root/root	usr/share/deco/arc/extract
-drwxr-xr-x	root/root	usr/share/deco/arj/
--rwxr-xr-x	root/root	usr/share/deco/arj/extract
-lrwxrwxrwx	root/root	usr/share/deco/ark -> arc
-drwxr-xr-x	root/root	usr/share/deco/bz2/
--rwxr-xr-x	root/root	usr/share/deco/bz2/extract
-drwxr-xr-x	root/root	usr/share/deco/cab/
--rwxr-xr-x	root/root	usr/share/deco/cab/extract
-lrwxrwxrwx	root/root	usr/share/deco/cbr -> rar|[rst][0-9]{2}
-lrwxrwxrwx	root/root	usr/share/deco/cbz -> zip
-drwxr-xr-x	root/root	usr/share/deco/cpio/
--rwxr-xr-x	root/root	usr/share/deco/cpio/extract
-drwxr-xr-x	root/root	usr/share/deco/deb/
--rwxr-xr-x	root/root	usr/share/deco/deb/extract
--rw-r--r--	root/root	usr/share/deco/deb/subdirectory (EMPTY)
-lrwxrwxrwx	root/root	usr/share/deco/ear -> zip
-drwxr-xr-x	root/root	usr/share/deco/flac/
--rwxr-xr-x	root/root	usr/share/deco/flac/extract
-drwxr-xr-x	root/root	usr/share/deco/gz/
--rwxr-xr-x	root/root	usr/share/deco/gz/extract
-lrwxrwxrwx	root/root	usr/share/deco/jar -> zip
-drwxr-xr-x	root/root	usr/share/deco/lha/
--rwxr-xr-x	root/root	usr/share/deco/lha/extract
-lrwxrwxrwx	root/root	usr/share/deco/lzh -> lha
-drwxr-xr-x	root/root	usr/share/deco/lzma/
--rwxr-xr-x	root/root	usr/share/deco/lzma/extract
-drwxr-xr-x	root/root	usr/share/deco/lzo/
--rwxr-xr-x	root/root	usr/share/deco/lzo/extract
-lrwxrwxrwx	root/root	usr/share/deco/odc -> zip
-lrwxrwxrwx	root/root	usr/share/deco/odf -> zip
-lrwxrwxrwx	root/root	usr/share/deco/odg -> zip
-lrwxrwxrwx	root/root	usr/share/deco/odi -> zip
-lrwxrwxrwx	root/root	usr/share/deco/odm -> zip
-lrwxrwxrwx	root/root	usr/share/deco/odp -> zip
-lrwxrwxrwx	root/root	usr/share/deco/ods -> zip
-lrwxrwxrwx	root/root	usr/share/deco/odt -> zip
-lrwxrwxrwx	root/root	usr/share/deco/otc -> zip
-lrwxrwxrwx	root/root	usr/share/deco/otf -> zip
-lrwxrwxrwx	root/root	usr/share/deco/otg -> zip
-lrwxrwxrwx	root/root	usr/share/deco/oth -> zip
-lrwxrwxrwx	root/root	usr/share/deco/oti -> zip
-lrwxrwxrwx	root/root	usr/share/deco/otp -> zip
-lrwxrwxrwx	root/root	usr/share/deco/ots -> zip
-lrwxrwxrwx	root/root	usr/share/deco/ott -> zip
-lrwxrwxrwx	root/root	usr/share/deco/oxt -> zip
-lrwxrwxrwx	root/root	usr/share/deco/part[0-9]+\.rar -> rar|[rst][0-9]{2}
-lrwxrwxrwx	root/root	usr/share/deco/pk3 -> zip
-lrwxrwxrwx	root/root	usr/share/deco/pk4 -> zip
-drwxr-xr-x	root/root	usr/share/deco/rar|[rst][0-9]{2}/
--rwxr-xr-x	root/root	usr/share/deco/rar|[rst][0-9]{2}/extract
--rw-r--r--	root/root	usr/share/deco/rar|[rst][0-9]{2}/permissions (EMPTY)
-drwxr-xr-x	root/root	usr/share/deco/rpm/
--rwxr-xr-x	root/root	usr/share/deco/rpm/extract
--rw-r--r--	root/root	usr/share/deco/rpm/subdirectory (EMPTY)
-drwxr-xr-x	root/root	usr/share/deco/shn/
--rwxr-xr-x	root/root	usr/share/deco/shn/extract
-lrwxrwxrwx	root/root	usr/share/deco/sue -> arc
-lrwxrwxrwx	root/root	usr/share/deco/t7z -> tar\.7z
-lrwxrwxrwx	root/root	usr/share/deco/t7z\.[0-9]{2,} -> tar\.7z
-drwxr-xr-x	root/root	usr/share/deco/tar/
--rwxr-xr-x	root/root	usr/share/deco/tar/extract
-drwxr-xr-x	root/root	usr/share/deco/tar\.7z/
--rwxr-xr-x	root/root	usr/share/deco/tar\.7z/extract
-lrwxrwxrwx	root/root	usr/share/deco/tar\.7z\.[0-9]{2,} -> tar\.7z
-drwxr-xr-x	root/root	usr/share/deco/tar\.bz2/
--rwxr-xr-x	root/root	usr/share/deco/tar\.bz2/extract
-drwxr-xr-x	root/root	usr/share/deco/tar\.gz/
--rwxr-xr-x	root/root	usr/share/deco/tar\.gz/extract
-drwxr-xr-x	root/root	usr/share/deco/tar\.lzma/
--rwxr-xr-x	root/root	usr/share/deco/tar\.lzma/extract
-lrwxrwxrwx	root/root	usr/share/deco/tar\.z -> tar\.gz
-lrwxrwxrwx	root/root	usr/share/deco/taz -> tar\.gz
-lrwxrwxrwx	root/root	usr/share/deco/tbz -> tar\.bz2
-lrwxrwxrwx	root/root	usr/share/deco/tgz -> tar\.gz
-lrwxrwxrwx	root/root	usr/share/deco/tlz -> tar\.lzma
-lrwxrwxrwx	root/root	usr/share/deco/udeb -> deb
-lrwxrwxrwx	root/root	usr/share/deco/wsz -> zip
-lrwxrwxrwx	root/root	usr/share/deco/xpi -> zip
-lrwxrwxrwx	root/root	usr/share/deco/z -> gz
-drwxr-xr-x	root/root	usr/share/deco/zip/
--rwxr-xr-x	root/root	usr/share/deco/zip/extract
-drwxr-xr-x	root/root	usr/share/deco/zoo/
--rwxr-xr-x	root/root	usr/share/deco/zoo/extract
diff --git a/deco/.md5sum b/deco/.md5sum
index 02201f4d0..f9b42f854 100644
--- a/deco/.md5sum
+++ b/deco/.md5sum
@@ -1,3 +1,2 @@
-3dc4b91ede16b038877c9d2bd3a781a7  deco-1.5.7.tar.gz
-5f3900969477445bd044009a91cab18e  deco-archive-1.2.tar.gz
-6cb0b8d0650f8cc0763e5cb2d831ec18  deco-make.patch
+b1ae574ffda8024934d25a48fdb537bf  config.mk.in
+7939b2bfae68cf753b8d8c5ff23d555c  deco-1.6.0.1.tar.gz
diff --git a/deco/Pkgfile b/deco/Pkgfile
index 0e77b4ed3..8c4b7513e 100644
--- a/deco/Pkgfile
+++ b/deco/Pkgfile
@@ -2,22 +2,24 @@
 # URL: http://hartlich.com/deco/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Danny Rawlins, monster dot romster at gmail dot com
+# Depends on: deco-archive
 
 name=deco
-version=1.5.7
+version=1.6.0.1
 release=1
-source=(http://hartlich.com/$name/download/$name-$version.tar.gz
-	http://hartlich.com/$name/archive/download/$name-archive-1.2.tar.gz
-	deco-make.patch)
+source=(http://hartlich.com/deco/download/$name-$version.tar.gz
+	config.mk.in)
 
 build() {
 	cd $name-$version
-	patch -p 1 -i $SRC/deco-make.patch
-	sed -i -e "s|@CFLAGS@|$CFLAGS|" config.mk
-	make
-	make DESTDIR=$PKG install
+	[ "$CC" ] || CC=gcc
 
-	cd $SRC/$name-archive-1.2
-	sed -i -e 's|^PREFIX   = /usr/local|PREFIX   = /usr|' config.mk
+	sed \
+		-e "s|@CC@|${CC}|" \
+		-e "s|@CFLAGS@|$CFLAGS|" \
+		-e "s|@LDFLAGS@|$LDFLAGS|" \
+		$SRC/config.mk.in > config.mk
+
+	make
 	make DESTDIR=$PKG install
 }
diff --git a/deco/config.mk.in b/deco/config.mk.in
new file mode 100644
index 000000000..7d08fe4f3
--- /dev/null
+++ b/deco/config.mk.in
@@ -0,0 +1,9 @@
+CC       = @CC@
+CPPFLAGS = -D _XOPEN_SOURCE=600
+CFLAGS   = @CFLAGS@
+LDFLAGS  = -s @LDFLAGS@
+
+DESTDIR =
+PREFIX  = /usr
+BIN     = $(PREFIX)/bin
+SHARE   = $(PREFIX)/share/deco
diff --git a/deco/deco-make.patch b/deco/deco-make.patch
deleted file mode 100644
index 94298e5f7..000000000
--- a/deco/deco-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -pruN deco-1.1.0.2.orig/config.mk deco-1.1.0.2/config.mk
---- deco-1.1.0.2.orig/config.mk	2008-07-17 03:47:26.355390803 +1000
-+++ deco-1.1.0.2/config.mk	2008-07-17 03:47:52.893390117 +1000
-@@ -1,9 +1,9 @@
--CC      = c99
--CFLAGS  = -O1
-+CC      = gcc
-+CFLAGS  = @CFLAGS@
- LDFLAGS = -s
- 
- DESTDIR =
--PREFIX  = /usr/local
-+PREFIX  = /usr
- BIN     = $(PREFIX)/bin
- SHARE   = $(PREFIX)/share/deco
-