From owner-svn-ports-branches@FreeBSD.ORG Wed Mar 4 23:39:41 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B842926; Wed, 4 Mar 2015 23:39:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 161065F9; Wed, 4 Mar 2015 23:39:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t24Ndemi055829; Wed, 4 Mar 2015 23:39:40 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t24Ndekm055826; Wed, 4 Mar 2015 23:39:40 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201503042339.t24Ndekm055826@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 4 Mar 2015 23:39:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r380459 - in branches/2015Q1/archivers/dact: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2015 23:39:41 -0000 Author: amdmi3 Date: Wed Mar 4 23:39:39 2015 New Revision: 380459 URL: https://svnweb.freebsd.org/changeset/ports/380459 QAT: https://qat.redports.org/buildarchive/r380459/ Log: MFH: r380197 - Unbreak modules build - Switch to @sample - Fix plist - Add LICENSE - Strip binary Approved by: ports-secteam (delphij) Modified: branches/2015Q1/archivers/dact/Makefile branches/2015Q1/archivers/dact/files/patch-Makefile.in branches/2015Q1/archivers/dact/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/dact/Makefile ============================================================================== --- branches/2015Q1/archivers/dact/Makefile Wed Mar 4 23:36:19 2015 (r380458) +++ branches/2015Q1/archivers/dact/Makefile Wed Mar 4 23:39:39 2015 (r380459) @@ -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 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} Modified: branches/2015Q1/archivers/dact/files/patch-Makefile.in ============================================================================== --- branches/2015Q1/archivers/dact/files/patch-Makefile.in Wed Mar 4 23:36:19 2015 (r380458) +++ branches/2015Q1/archivers/dact/files/patch-Makefile.in Wed Mar 4 23:39:39 2015 (r380459) @@ -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@ Modified: branches/2015Q1/archivers/dact/pkg-plist ============================================================================== --- branches/2015Q1/archivers/dact/pkg-plist Wed Mar 4 23:36:19 2015 (r380458) +++ branches/2015Q1/archivers/dact/pkg-plist Wed Mar 4 23:39:39 2015 (r380459) @@ -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