MFH: r380197

- Unbreak modules build
- Switch to @sample
- Fix plist
- Add LICENSE
- Strip binary

Approved by:	ports-secteam (delphij)

3 files changed, 41 insertions, 8 deletions

diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index c22da11da054..01d7aa475568 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -3,13 +3,16 @@
 
 PORTNAME=	dact
 PORTVERSION=	0.8.42
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.rkeene.org/files/oss/dact/release/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dynamic Adaptive Compression Tool
 
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
 		liblzo2.so:${PORTSDIR}/archivers/lzo2
 
@@ -22,11 +25,14 @@ MAKE_ARGS=	TOBUILD="dact libdact.so dact.conf"
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/dact.conf ${STAGEDIR}${EXAMPLESDIR}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so \
+		${STAGEDIR}${DATADIR}/*.so
+	${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \
+		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Docs/dact.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
diff --git a/archivers/dact/files/patch-Makefile.in b/archivers/dact/files/patch-Makefile.in
index a4351eb0e325..8ff5925b635b 100644
--- a/archivers/dact/files/patch-Makefile.in
+++ b/archivers/dact/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- ./Makefile.in.orig	2006-03-25 14:15:04.000000000 +0100
-+++ ./Makefile.in	2014-03-25 00:16:17.000000000 +0100
+--- Makefile.in.orig	2006-03-25 16:15:04.000000000 +0300
++++ Makefile.in	2015-02-25 22:26:51.000000000 +0300
 @@ -24,8 +24,8 @@
  
  prefix = @prefix@
@@ -11,3 +11,19 @@
  sysconfdir = @sysconfdir@
  mandir = @mandir@
  datadir = @datadir@
+@@ -41,13 +41,14 @@
+ # be kept in sync with OBJS
+ SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@
+ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@
++MODS = $(ALGO:.c=.so)
+ 
+ TOBUILD = dact$(EXEEXT) libdact.$(SHOBJEXT) libdact.a dact.conf
+ 
+ all: @DEFAULT@
+ 
+ module: @DEPEND@
+-	@MODS="$(ALGO:.c=.so)" LDLIBS="@ALLMODLIBS@" \
++	@LDLIBS="@ALLMODLIBS@" \
+ 	  $(MAKE) $(TOBUILD)
+ 
+ static: @DEPEND@
diff --git a/archivers/dact/pkg-plist b/archivers/dact/pkg-plist
index 63805786961e..d568c695b85e 100644
--- a/archivers/dact/pkg-plist
+++ b/archivers/dact/pkg-plist
@@ -1,7 +1,18 @@
 bin/dact
-etc/dact.conf
+@sample etc/dact.conf.sample
 lib/libdact.so
 man/man1/dact.1.gz
+%%DATADIR%%/cipher_chaos.so
+%%DATADIR%%/cipher_psub.so
+%%DATADIR%%/cipher_serpent.so
+%%DATADIR%%/cipher_sub.so
+%%DATADIR%%/comp_bzlib.so
+%%DATADIR%%/comp_delta.so
+%%DATADIR%%/comp_mzlib.so
+%%DATADIR%%/comp_mzlib2.so
+%%DATADIR%%/comp_rle.so
+%%DATADIR%%/comp_snibble.so
+%%DATADIR%%/comp_text.so
+%%DATADIR%%/comp_zlib.so
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/dact.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dact.conf