aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/deco/Makefile24
-rw-r--r--archivers/deco/distinfo9
-rw-r--r--archivers/deco/pkg-plist15
3 files changed, 35 insertions, 13 deletions
diff --git a/archivers/deco/Makefile b/archivers/deco/Makefile
index a1feed05377e..50bbef216417 100644
--- a/archivers/deco/Makefile
+++ b/archivers/deco/Makefile
@@ -6,9 +6,12 @@
#
PORTNAME= deco
-PORTVERSION= 1.5
+PORTVERSION= 1.5.5.1
CATEGORIES= archivers
-MASTER_SITES= http://hartlich.com/deco/download/
+MASTER_SITES= http://hartlich.com/deco/download/:site1 \
+ http://hartlich.com/deco/archive/download/:site2
+DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz:site1 \
+ ${PORTNAME}-archive-1.1.tar.gz:site2
MAINTAINER= kevlo@FreeBSD.org
COMMENT= A program to extract various archive file formats
@@ -18,6 +21,7 @@ RUN_DEPENDS= arc:${PORTSDIR}/archivers/arc \
cabextract:${PORTSDIR}/archivers/cabextract \
dpkg:${PORTSDIR}/archivers/dpkg \
lzma:${PORTSDIR}/archivers/lzmautils \
+ lzop:${PORTSDIR}/archivers/lzop \
7z:${PORTSDIR}/archivers/p7zip \
rpm:${PORTSDIR}/archivers/rpm \
unace:${PORTSDIR}/archivers/unace \
@@ -26,8 +30,20 @@ RUN_DEPENDS= arc:${PORTSDIR}/archivers/arc \
zoo:${PORTSDIR}/archivers/zoo \
flac:${PORTSDIR}/audio/flac
-NO_BUILD= yes
-
CONFLICTS= deco-[0-9]*
+do-build:
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+ cd ${WRKDIR}/${PORTNAME}-archive-1.1 && ${SETENV} ${MAKE_ENV} \
+ ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
+
+do-install:
+ @${INSTALL_PROGRAM} ${WRKSRC}/deco ${PREFIX}/bin
+ @${MKDIR} ${DATADIR}
+.for i in CREDITS LICENSE Makefile NEWS README config.mk
+ ${RM} -rf ${WRKSRC}/../${PORTNAME}-archive-1.1/${i}
+.endfor
+ @cd ${WRKDIR}/${PORTNAME}-archive-1.1/ && ${CP} -pPR * ${DATADIR}
+
.include <bsd.port.mk>
diff --git a/archivers/deco/distinfo b/archivers/deco/distinfo
index 85f79c35d46f..ca05bcceafdc 100644
--- a/archivers/deco/distinfo
+++ b/archivers/deco/distinfo
@@ -1,3 +1,6 @@
-MD5 (deco-1.5.tar.gz) = 043eed2918d5d8009e6c7fb4dd9fba52
-SHA256 (deco-1.5.tar.gz) = 8e72011c56082ee469c57fde0baf9e1df0ea8223ec029cdbe1cc761621d8880f
-SIZE (deco-1.5.tar.gz) = 25056
+MD5 (deco-1.5.5.1.tar.gz) = 21c7c9fbcf1988ba228d0aae56e9120c
+SHA256 (deco-1.5.5.1.tar.gz) = e238da725e09f744d3a293330f8fc7d274903a213f8d98c62f8d7aa31190bb81
+SIZE (deco-1.5.5.1.tar.gz) = 11048
+MD5 (deco-archive-1.1.tar.gz) = d83fbe3feea256c4cb8ff5aaa08b42ad
+SHA256 (deco-archive-1.1.tar.gz) = 2490bb93be8d91fdbce2387ab2855c76ec0a5deaba3260b4f2dc22c4f6d1085c
+SIZE (deco-archive-1.1.tar.gz) = 3732
diff --git a/archivers/deco/pkg-plist b/archivers/deco/pkg-plist
index 235532323ed6..8f39302d422f 100644
--- a/archivers/deco/pkg-plist
+++ b/archivers/deco/pkg-plist
@@ -1,8 +1,9 @@
bin/deco
%%DATADIR%%/7z/extract
+%%DATADIR%%/7z\.[0-9]{2,}
%%DATADIR%%/a/extract
-%%DATADIR%%/ace|[c0-9][0-9][0-9]/extract
-%%DATADIR%%/ace|[c0-9][0-9][0-9]/permissions
+%%DATADIR%%/ace|[c0-9][0-9]{2}/extract
+%%DATADIR%%/ace|[c0-9][0-9]{2}/permissions
%%DATADIR%%/alz/extract
%%DATADIR%%/ape/extract
%%DATADIR%%/ar
@@ -44,15 +45,17 @@ bin/deco
%%DATADIR%%/part[0-9]+\.rar
%%DATADIR%%/pk3
%%DATADIR%%/pk4
-%%DATADIR%%/rar|[rst][0-9][0-9]/extract
-%%DATADIR%%/rar|[rst][0-9][0-9]/permissions
+%%DATADIR%%/rar|[rst][0-9]{2}/extract
+%%DATADIR%%/rar|[rst][0-9]{2}/permissions
%%DATADIR%%/rpm/extract
%%DATADIR%%/rpm/subdirectory
%%DATADIR%%/shn/extract
%%DATADIR%%/sue
%%DATADIR%%/t7z
+%%DATADIR%%/t7z\.[0-9]{2,}
%%DATADIR%%/tar/extract
%%DATADIR%%/tar\.7z/extract
+%%DATADIR%%/tar\.7z\.[0-9]{2,}
%%DATADIR%%/tar\.bz2/extract
%%DATADIR%%/tar\.gz/extract
%%DATADIR%%/tar\.lzma/extract
@@ -75,7 +78,7 @@ bin/deco
@dirrm %%DATADIR%%/tar
@dirrm %%DATADIR%%/shn
@dirrm %%DATADIR%%/rpm
-@dirrm %%DATADIR%%/rar|[rst][0-9][0-9]
+@dirrm %%DATADIR%%/rar|[rst][0-9]{2}
@dirrm %%DATADIR%%/lzo
@dirrm %%DATADIR%%/lzma
@dirrm %%DATADIR%%/lha
@@ -89,7 +92,7 @@ bin/deco
@dirrm %%DATADIR%%/arc
@dirrm %%DATADIR%%/ape
@dirrm %%DATADIR%%/alz
-@dirrm %%DATADIR%%/ace|[c0-9][0-9][0-9]
+@dirrm %%DATADIR%%/ace|[c0-9][0-9]{2}
@dirrm %%DATADIR%%/a
@dirrm %%DATADIR%%/7z
@dirrm %%DATADIR%%