4 files changed, 58 insertions, 33 deletions

diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index 42be64aedf7b..34593d8f0667 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	deco
-PORTVERSION=	0.8.1
+PORTVERSION=	1.0
 CATEGORIES=	archivers
 MASTER_SITES=	http://hartlich.com/deco/download/
 
 MAINTAINER=	kevlo@FreeBSD.org
-COMMENT=	A script to extract various archive file formats
+COMMENT=	A program to extract various archive file formats
 
 RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc \
 		arj:${PORTSDIR}/archivers/arj \
@@ -27,7 +27,6 @@ RUN_DEPENDS=	arc:${PORTSDIR}/archivers/arc \
 		flac:${PORTSDIR}/audio/flac
 
 NO_BUILD=	yes
-USE_GMAKE=	yes
 
 CONFLICTS=	deco-[0-9]*
 
diff --git a/archivers/deco/distinfo b/archivers/deco/distinfo
index 08b05d2b1e11..e7e32c150673 100644
--- a/archivers/deco/distinfo
+++ b/archivers/deco/distinfo
@@ -1,3 +1,3 @@
-MD5 (deco-0.8.1.tar.gz) = 8f4122b892aed757c4d2d00e532b3ece
-SHA256 (deco-0.8.1.tar.gz) = 32cafa4da1a57462b4a2505b9e3e4c7758de1f72ea86cb7e1d726d71c0e6e47f
-SIZE (deco-0.8.1.tar.gz) = 19453
+MD5 (deco-1.0.tar.gz) = a3c07abd291e1026bde0a718435e4162
+SHA256 (deco-1.0.tar.gz) = 7759f963ec3829c602cf98bd05d5cafd635b2c29c3632f79664139e506853762
+SIZE (deco-1.0.tar.gz) = 24832
diff --git a/archivers/deco/pkg-descr b/archivers/deco/pkg-descr
index 92aa5c7eddcb..1ebdc428944a 100644
--- a/archivers/deco/pkg-descr
+++ b/archivers/deco/pkg-descr
@@ -1,5 +1,5 @@
 Deco is a Un*x script able to extract various archive file formats.
 Supported archive formats: 7z, ace, ar, arc, arj, bz2, cab, cpio, deb,
-gz, jar, lha, lzma, rar, rpm, tar, zip, zoo.
+flac, gz, jar, lha, lzma, rar, rpm, tar, zip, zoo.
 
 WWW: http://hartlich.com/deco/
diff --git a/archivers/deco/pkg-plist b/archivers/deco/pkg-plist
index b15dcec21040..3128271ab95c 100644
--- a/archivers/deco/pkg-plist
+++ b/archivers/deco/pkg-plist
@@ -1,27 +1,27 @@
-bin/crename
 bin/deco
-bin/symlinktarget
-%%DATADIR%%/7z
-%%DATADIR%%/a
-%%DATADIR%%/ace
-%%DATADIR%%/ape
+%%DATADIR%%/7z/extract
+%%DATADIR%%/a/extract
+%%DATADIR%%/ace|[c0-9][0-9][0-9]/extract
+%%DATADIR%%/ace|[c0-9][0-9][0-9]/permissions
+%%DATADIR%%/ape/extract
 %%DATADIR%%/ar
-%%DATADIR%%/arc
-%%DATADIR%%/arj
+%%DATADIR%%/arc/extract
+%%DATADIR%%/arj/extract
 %%DATADIR%%/ark
-%%DATADIR%%/bz2
-%%DATADIR%%/cab
+%%DATADIR%%/bz2/extract
+%%DATADIR%%/cab/extract
 %%DATADIR%%/cbr
 %%DATADIR%%/cbz
-%%DATADIR%%/cpio
-%%DATADIR%%/deb
+%%DATADIR%%/cpio/extract
+%%DATADIR%%/deb/extract
+%%DATADIR%%/deb/subdirectory
 %%DATADIR%%/ear
-%%DATADIR%%/flac
-%%DATADIR%%/gz
+%%DATADIR%%/flac/extract
+%%DATADIR%%/gz/extract
 %%DATADIR%%/jar
-%%DATADIR%%/lha
+%%DATADIR%%/lha/extract
 %%DATADIR%%/lzh
-%%DATADIR%%/lzma
+%%DATADIR%%/lzma/extract
 %%DATADIR%%/odc
 %%DATADIR%%/odf
 %%DATADIR%%/odg
@@ -38,17 +38,20 @@ bin/symlinktarget
 %%DATADIR%%/otp
 %%DATADIR%%/ots
 %%DATADIR%%/ott
+%%DATADIR%%/part[0-9]+\.rar
 %%DATADIR%%/pk3
 %%DATADIR%%/pk4
-%%DATADIR%%/rar
-%%DATADIR%%/rpm
-%%DATADIR%%/shn
+%%DATADIR%%/rar|[rst][0-9][0-9]/extract
+%%DATADIR%%/rar|[rst][0-9][0-9]/permissions
+%%DATADIR%%/rpm/extract
+%%DATADIR%%/rpm/subdirectory
+%%DATADIR%%/shn/extract
 %%DATADIR%%/sue
-%%DATADIR%%/tar
-%%DATADIR%%/tar.bz2
-%%DATADIR%%/tar.gz
-%%DATADIR%%/tar.lzma
-%%DATADIR%%/tar.z
+%%DATADIR%%/tar/extract
+%%DATADIR%%/tar\.bz2/extract
+%%DATADIR%%/tar\.gz/extract
+%%DATADIR%%/tar\.lzma/extract
+%%DATADIR%%/tar\.z
 %%DATADIR%%/taz
 %%DATADIR%%/tbz
 %%DATADIR%%/tgz
@@ -56,6 +59,29 @@ bin/symlinktarget
 %%DATADIR%%/wsz
 %%DATADIR%%/xpi
 %%DATADIR%%/z
-%%DATADIR%%/zip
-%%DATADIR%%/zoo
+%%DATADIR%%/zip/extract
+%%DATADIR%%/zoo/extract
+@dirrm %%DATADIR%%/zoo
+@dirrm %%DATADIR%%/zip
+@dirrm %%DATADIR%%/tar\.lzma
+@dirrm %%DATADIR%%/tar\.gz
+@dirrm %%DATADIR%%/tar\.bz2
+@dirrm %%DATADIR%%/tar
+@dirrm %%DATADIR%%/shn
+@dirrm %%DATADIR%%/rpm
+@dirrm %%DATADIR%%/rar|[rst][0-9][0-9]
+@dirrm %%DATADIR%%/lzma
+@dirrm %%DATADIR%%/lha
+@dirrm %%DATADIR%%/gz
+@dirrm %%DATADIR%%/flac
+@dirrm %%DATADIR%%/deb
+@dirrm %%DATADIR%%/cpio
+@dirrm %%DATADIR%%/cab
+@dirrm %%DATADIR%%/bz2
+@dirrm %%DATADIR%%/arj
+@dirrm %%DATADIR%%/arc
+@dirrm %%DATADIR%%/ape
+@dirrm %%DATADIR%%/ace|[c0-9][0-9][0-9]
+@dirrm %%DATADIR%%/a
+@dirrm %%DATADIR%%/7z
 @dirrm %%DATADIR%%