4 files changed, 75 insertions, 14 deletions

diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index ae8492b193f8..1bb86b8cdaeb 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -14,14 +14,13 @@ COMMENT=	File system security and verification program
 LICENSE=	GPLv2
 
 NO_LICENSES_INSTALL=	yes
-MAN5=		twfiles.5 twconfig.5 twpolicy.5
-MAN8=		siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 MAKE_JOBS_UNSAFE=	yes
-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	SYSPRE=${ARCH}-unknown-freebsd
+USE_GCC=	any
+MAKE_ARGS=	SYSPRE=${ARCH}-unknown-freebsd \
+		DESTDIR=${STAGEDIR}
 IS_INTERACTIVE=	yes
 M4=		/usr/bin/m4
 
@@ -44,7 +43,11 @@ TW_PROMPT_DESC=		Interactive install (ignored when PACKAGE_BUILDING)
 SW_ONLY_DESC=		Install software only, do not post-configure (ignored when PACKAGE_BUILDING)
 DB_BUILD_DESC=		Build database during post-install (ignored when PACKAGE_BUILDING)
 
-NO_STAGE=	yes
+PACKAGE_BUILDING=	yes
+.ifndef PACKAGE_BUILDING
+BROKEN=		for testing only
+.endif
+
 .include <bsd.port.pre.mk>
 
 # Tripwire config files are stored in TWCFG
@@ -117,12 +120,12 @@ install-config-files:
 .endif
 	@ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/install.sh .
 .ifdef PACKAGE_BUILDING
-	@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
+	@ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
 .else
 .if ${PORT_OPTIONS:MSW_ONLY}
-	@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
+	@ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook
 .else
-	@ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook
+	@ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook
 .endif
 .endif
 
@@ -161,6 +164,7 @@ make-pkg-install:
 	@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGINSTALL}
 
 create-database:
+.ifndef PACKAGE_BUILDING
 .if ${PORT_OPTIONS:MDB_BUILD}
 .if ${PORT_OPTIONS:MSW_ONLY}
 	@ ${ECHO} SW_ONLY has been specified, database will not be built.
@@ -175,6 +179,7 @@ create-database:
 	@ ${ECHO} therefore the authors suggest creating a floppy is not necessary.
 .endif
 .endif
+.endif
 
 post-install:	install-config-files create-database make-pkg-install
 
diff --git a/security/tripwire/files/patch-Makefile.in b/security/tripwire/files/patch-Makefile.in
index cb6d3c3c77a3..37b3a6be2014 100644
--- a/security/tripwire/files/patch-Makefile.in
+++ b/security/tripwire/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Thu Dec  1 19:24:47 2005
-+++ Makefile.in	Fri Jan  6 15:06:24 2006
-@@ -536,7 +536,6 @@
+--- Makefile.in.orig	2011-11-21 08:06:56.000000000 -0800
++++ Makefile.in	2014-05-30 22:28:35.966716249 -0700
+@@ -540,7 +540,6 @@
  
  install-data-am:
  	@$(NORMAL_INSTALL)
@@ -8,3 +8,12 @@
  
  install-exec-am:
  
+@@ -589,7 +588,7 @@
+ 
+ 
+ install-data-hook:
+-	prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
++	STGDIR="$$STAGEDIR" prefix="$(prefix)" sysconfdir="$(sysconfdir)" \
+         path_to_vi="$(path_to_vi)" path_to_sendmail="$(path_to_sendmail)" \
+         ./install/install.sh
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/security/tripwire/files/patch-install-install.sh b/security/tripwire/files/patch-install-install.sh
index d992b342d57f..3b926dfc5152 100644
--- a/security/tripwire/files/patch-install-install.sh
+++ b/security/tripwire/files/patch-install-install.sh
@@ -1,5 +1,5 @@
 --- install/install.sh.orig	2011-11-21 08:06:56.000000000 -0800
-+++ install/install.sh	2012-01-26 14:46:55.995316577 -0800
++++ install/install.sh	2014-06-01 20:55:20.632399290 -0700
 @@ -174,17 +174,11 @@
  # Starting directory.
  START_DIR=`pwd`
@@ -45,7 +45,16 @@
  	if [ -z "$TW_SITE_PASS" ] || [ -z "$TW_LOCAL_PASS" ] ; then
  		echo "Error: You must specify site and local passphrase" 1>&2
  		echo "if no prompting is chosen." 1>&2
-@@ -525,7 +521,7 @@
+@@ -514,7 +510,7 @@
+ ##-------------------------------------------------------
+ 
+ for i in $path2; do
+-	eval "d=\$${i}"
++	eval "d=${DESTDIR}/\$${i}"
+ 	if [ ! -d "$d" ] ; then
+ 		mkdir -p "$d"
+ 		if [ ! -d "$d" ] ; then
+@@ -525,12 +521,12 @@
  			chmod 0750 "$d" > /dev/null
  		fi
  	else
@@ -54,6 +63,12 @@
  	fi
  done
  
+ for i in $path3; do
+-	eval "d=\$${i}"
++	eval "d=${DESTDIR}/\$${i}"
+ 	if [ ! -d "$d" ] ; then
+ 		mkdir -p "$d"
+ 		if [ ! -d "$d" ] ; then
 @@ -541,7 +537,7 @@
  			chmod 0755 "$d" > /dev/null
  		fi
@@ -71,6 +86,25 @@
  echo
  echo "----------------------------------------------"
  echo "Copying files..."
+@@ -568,14 +565,14 @@
+ 
+ #f1=' ff=$README ; d="" ; dd=$TWDOCS ; rr=0444 '
+ #f2=' ff=$REL_NOTES ; d="" ; dd=$TWDOCS ; rr=0444 '
+-f3=' ff=$TWLICENSEFILE ; d="" ; dd=$TWDOCS ; rr=0444 '
++f3=' ff=$TWLICENSEFILE ; d="" ; dd=$DESTDIR/$TWDOCS ; rr=0444 '
+ #f4=' ff=tripwire ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+ #f5=' ff=twadmin ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+ #f6=' ff=twprint ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+ #f7=' ff=siggen ; d="/bin" ; dd=$TWBIN ; rr=0550 '
+-f8=' ff=TRADEMARK ; d="" ; dd=$TWDOCS ; rr=0444 '
+-f9=' ff=policyguide.txt ; d="/policy" ; dd=$TWDOCS ; rr=0444 '
+-f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$TWPOLICY ; rr=0640 '
++f8=' ff=TRADEMARK ; d="" ; dd=$DESTDIR/$TWDOCS ; rr=0444 '
++f9=' ff=policyguide.txt ; d="/policy" ; dd=$DESTDIR/$TWDOCS ; rr=0444 '
++f10=' ff=${POLICYSRC} ; d="/policy" ; dd=$DESTDIR/$TWPOLICY ; rr=0640 '
+ #f11=' ff=twpolicy.4 ; d="/man/man4" ; dd=$TWMAN/man4 ; rr=0444 '
+ #f12=' ff=twconfig.4 ; d="/man/man4" ; dd=$TWMAN/man4 ; rr=0444 '
+ #f13=' ff=twfiles.5 ; d="/man/man5" ; dd=$TWMAN/man5 ; rr=0444 '
 @@ -593,7 +590,7 @@
  	f=${TAR_DIR}$d/$ff
  	ff=${dd}/$ff
diff --git a/security/tripwire/pkg-plist b/security/tripwire/pkg-plist
index 005b7988576c..b239e62c3c5d 100644
--- a/security/tripwire/pkg-plist
+++ b/security/tripwire/pkg-plist
@@ -1,3 +1,11 @@
+man/man5/twfiles.5.gz
+man/man5/twconfig.5.gz
+man/man5/twpolicy.5.gz
+man/man8/siggen.8.gz
+man/man8/tripwire.8.gz
+man/man8/twadmin.8.gz
+man/man8/twintro.8.gz
+man/man8/twprint.8.gz
 sbin/tripwire
 sbin/twadmin
 sbin/twprint
@@ -6,3 +14,8 @@ share/doc/tripwire/COPYING
 share/doc/tripwire/TRADEMARK
 share/doc/tripwire/policyguide.txt
 @dirrm share/doc/tripwire
+%%ETCDIR%%/twpol-FreeBSD.txt
+@dirrmtry %%ETCDIR%%
+@dirrmtry %%TWDB%%/report
+@dirrmtry %%TWDB%%
+