Index: head/security/tripwire/Makefile
===================================================================
--- head/security/tripwire/Makefile	(revision 433188)
+++ head/security/tripwire/Makefile	(revision 433189)
@@ -1,185 +1,184 @@
 # Created by: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
 # $FreeBSD$
 
 PORTNAME=	tripwire
-PORTVERSION=	2.4.3.1
-PORTREVISION=	1
+PORTVERSION=	2.4.3.2
 CATEGORIES=	security
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	File system security and verification program
 
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Tripwire
 GH_PROJECT=	tripwire-open-source
 
 NO_LICENSES_INSTALL=	yes
 MAKE_JOBS_UNSAFE=	yes
 USES=		gmake ssl
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	SYSPRE=${ARCH}-unknown-freebsd \
 		DESTDIR=${STAGEDIR}
 M4=		/usr/bin/m4
 
 # Tripwire database files are stored in TWDB.
 TWDB?=		/var/db/tripwire
 
 #	If TW_CLOBBER is set to true, the install script clobbers
 #	previously installed config files.
 #
 #	If TW_PROMPT is set to true, the install script is interactive.
 
 OPTIONS_SINGLE=	TWCFG
 OPTIONS_SINGLE_TWCFG=	TWCFG_ETC TWCFG_TWDB
 OPTIONS_DEFINE=	TW_CLOBBER TW_PROMPT SW_ONLY DB_BUILD
 OPTIONS_DEFAULT=	TWCFG_ETC TW_PROMPT DB_BUILD
 TWCFG_ETC_DESC=		Put config files in ${ETCDIR}
 TWCFG_TWDB_DESC=	Put config files in ${TWDB}/etc
 TW_CLOBBER_DESC=	Clobber existing database files at install
 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)
 
 PACKAGE_BUILDING=	yes
 .ifndef PACKAGE_BUILDING
 BROKEN=		for testing only
 .endif
 
 .include <bsd.port.pre.mk>
 
 # Tripwire config files are stored in TWCFG
 .if ${PORT_OPTIONS:MTWCFG_ETC}
 TWCFG?=		${ETCDIR}
 .endif
 .if ${PORT_OPTIONS:MTWCFG_TWDB}
 TWCFG?=		${TWDB}/etc
 .endif
 
 .if ${PORT_OPTIONS:MTW_CLOBBER}
 TW_CLOBBER=	true
 .else
 TW_CLOBBER=	false
 .endif
 
 .if ${PORT_OPTIONS:MTW_PROMPT}
 TW_PROMPT=	true
 .else
 TW_PROMPT=	false
 # TW_SITE_PASS?=	FreeBSD
 .ifndef TW_SITE_PASS
 BROKEN=		No site passphrase specified or turn PROMPT on
 .endif
 # TW_LOCAL_PASS?=	FreeBSD
 .ifndef TW_LOCAL_PASS
 BROKEN=		No local passphrase specified or turn PROMPT on
 .endif
 .endif
 
 # Tripwire policy files are stored in TWPOLICY.
 TWPOLICY?=	${TWCFG}
 # The Tripwire site key files are stored in TWSITEKEYDIR.
 TWSITEKEYDIR?=	${TWPOLICY}
 # The Tripwire local key files are stored in TWLOCALKEYDIR.
 TWLOCALKEYDIR?=	${TWPOLICY}
 # Tripwire report files are stored in TWREPORT.
 TWREPORT?=	${TWDB}/report
 # This sets the default text editor for Tripwire.
 TWEDITOR?=	/usr/bin/vi
 # This sets the location of the twpol.txt file that is to be installed
 TWPOL_TXT?=	${FILESDIR}/twpol.m4
 CONFIGURE_ARGS=	--prefix=${PREFIX} --program-transform-name='' --sysconfdir=${TWCFG}
 
 PLIST_SUB+=	TWCFG=${TWCFG} TWDB=${TWDB}
 PKGPOSTINSTALL=	${WRKDIR}/pkg-postinstall
 PKGPOSTDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	TWCFG=${TWCFG} TWDB=${TWDB}
 
 pre-configure:
 	@ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} > ${WRKSRC}/policy/twpol-FreeBSD.txt
 	@ ${MV} ${WRKSRC}/src/core/stdcore.h ${WRKSRC}/src/core/stdcore.h.orig
 	@ ${SED} 's%^# define CONFIG_FILE_ROOT	"${TWCFG}"%# define CONFIG_FILE_ROOT	"${TWCFG}"%' ${WRKSRC}/src/core/stdcore.h.orig > ${WRKSRC}/src/core/stdcore.h
 	@ ${MV} ${WRKSRC}/man/man4/twconfig.4 ${WRKSRC}/man/man5/twconfig.5
 	@ ${MV} ${WRKSRC}/man/man4/twpolicy.4 ${WRKSRC}/man/man5/twpolicy.5
 	@ ${LN} -s ${WRKSRC}/contrib ${WRKSRC}/install
 
 install-config-files:
-	@ ${ECHO_CMD} TWPOLICY=${TWPOLICY} >> ${WRKSRC}/install/install.cfg
-	@ ${ECHO_CMD} TWSITEKEYDIR=${TWSITEKEYDIR} >> ${WRKSRC}/install/install.cfg
-	@ ${ECHO_CMD} TWLOCALKEYDIR=${TWLOCALKEYDIR} >> ${WRKSRC}/install/install.cfg
-	@ ${ECHO_CMD} TWDB=${TWDB} >> ${WRKSRC}/install/install.cfg
-	@ ${ECHO_CMD} TWREPORT=${TWREPORT} >> ${WRKSRC}/install/install.cfg
-	@ ${ECHO_CMD} TWEDITOR=${TWEDITOR} >> ${WRKSRC}/install/install.cfg
+	@ ${ECHO_CMD} TWPOLICY=${TWPOLICY} >> ${WRKSRC}/installer/install.cfg
+	@ ${ECHO_CMD} TWSITEKEYDIR=${TWSITEKEYDIR} >> ${WRKSRC}/installer/install.cfg
+	@ ${ECHO_CMD} TWLOCALKEYDIR=${TWLOCALKEYDIR} >> ${WRKSRC}/installer/install.cfg
+	@ ${ECHO_CMD} TWDB=${TWDB} >> ${WRKSRC}/installer/install.cfg
+	@ ${ECHO_CMD} TWREPORT=${TWREPORT} >> ${WRKSRC}/installer/install.cfg
+	@ ${ECHO_CMD} TWEDITOR=${TWEDITOR} >> ${WRKSRC}/installer/install.cfg
 .ifdef TW_SITE_PASS
-	@ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${WRKSRC}/install/install.cfg
+	@ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${WRKSRC}/installer/install.cfg
 .endif
 .ifdef TW_LOCAL_PASS
-	@ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${WRKSRC}/install/install.cfg
+	@ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${WRKSRC}/installer/install.cfg
 .endif
-	@ cd ${WRKSRC} && ${LN} -sf install/install.cfg install/install.sh .
+	@ cd ${WRKSRC} && ${LN} -sf installer/install.cfg installer/install.sh .
 .ifdef PACKAGE_BUILDING
 	@ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook
 .else
 .if ${PORT_OPTIONS:MSW_ONLY}
 	@ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${MAKE_CMD} install-data-hook
 .else
 	@ cd ${WRKSRC} && DESTDIR=${STAGEDIR} PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${MAKE_CMD} install-data-hook
 .endif
 .endif
 
 make-pkg-install:
 	@ ${ECHO_CMD} '#!/bin/sh -' > ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} '#' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} "# Generated by make-${PKGPOSTINSTALL} on `date`" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} '#' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} 'case $$2 in' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} 'POST-INSTALL)	;;' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} '*)	exit 0;;' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} 'esac' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} PACKAGE_INSTALLER=yes >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} POLICYSRC=/tmp/$$$$.tmp >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} PREFIX="${PREFIX}" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} DO_NOT_CONFIG=yes >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} TW_CLOBBER="false" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} TW_PROMPT="false" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} prefix=${PREFIX} >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} sysconfdir=${TWCFG} >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} path_to_vi="/usr/bin/vi" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} path_to_sendmail="/usr/sbin/sendmail" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} BASE_DIR=${PREFIX}/ >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} BIN_DIR=${PREFIX}/sbin >> ${PKGPOSTINSTALL}
 .ifdef TW_SITE_PASS
 	@ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${PKGPOSTINSTALL}
 .endif
 .ifdef TW_LOCAL_PASS
 	@ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${PKGPOSTINSTALL}
 .endif
-	@ ${CAT} ${WRKSRC}/install/install.cfg >> ${PKGPOSTINSTALL}
+	@ ${CAT} ${WRKSRC}/installer/install.cfg >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} ${CAT} "> /tmp/$$$$.tmp <<'EOF'" >> ${PKGPOSTINSTALL}
 	@ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} EOF >> ${PKGPOSTINSTALL}
-	@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGPOSTINSTALL}
+	@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/installer/install.sh >> ${PKGPOSTINSTALL}
 
 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.
 .else
 	@ ${MKDIR} ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \
 		${TWDB} ${TWREPORT}
 	@ ${ECHO} Creating tripwire database
 	@ cd ${TWCFG} && ${PREFIX}/sbin/tripwire --init
 	@ ${ECHO_CMD}
 	@ ${ECHO} The tripwire database, configuration file and
 	@ ${ECHO} policy file are signed using the local and site keys,
 	@ ${ECHO} therefore the authors suggest creating a floppy is not necessary.
 .endif
 .endif
 .endif
 
 post-install:	install-config-files create-database make-pkg-install
 
 .include <bsd.port.post.mk>
Index: head/security/tripwire/distinfo
===================================================================
--- head/security/tripwire/distinfo	(revision 433188)
+++ head/security/tripwire/distinfo	(revision 433189)
@@ -1,2 +1,3 @@
-SHA256 (Tripwire-tripwire-open-source-2.4.3.1_GH0.tar.gz) = 9744af4de7ecb1d643442eb22f08c819556494bb6f56f5879e22c3438f2db896
-SIZE (Tripwire-tripwire-open-source-2.4.3.1_GH0.tar.gz) = 932665
+TIMESTAMP = 1486025650
+SHA256 (Tripwire-tripwire-open-source-2.4.3.2_GH0.tar.gz) = 25588c585f1af60958b3dce5bfc28e52c3237b2690dd5f4120e9c2f42d98fd2b
+SIZE (Tripwire-tripwire-open-source-2.4.3.2_GH0.tar.gz) = 967679
Index: head/security/tripwire/files/patch-install-install.sh
===================================================================
--- head/security/tripwire/files/patch-install-install.sh	(revision 433188)
+++ head/security/tripwire/files/patch-install-install.sh	(nonexistent)
@@ -1,140 +0,0 @@
---- install/install.sh.orig	2011-11-21 08:06:56.000000000 -0800
-+++ install/install.sh	2014-06-21 10:37:36.784492831 -0700
-@@ -19,10 +19,6 @@
- 
- PATH='.:/bin:/usr/bin'
- export PATH || (echo 'You must use sh to run this script'; kill $$)
--if [ ! -t 0 ] ; then
--	echo "Say 'sh install.sh', not 'sh < install.sh'"
--	exit 1
--fi
- 
- ##-------------------------------------------------------
- ## The usage message.
-@@ -174,17 +170,11 @@
- # Starting directory.
- START_DIR=`pwd`
- 
--# Site passphrase.
--TW_SITE_PASS=""
--
--# Local passphrase.
--TW_LOCAL_PASS=""
--
- # If clobber==true, overwrite files; if false, do not overwrite files.
--CLOBBER="false"
-+CLOBBER=${TW_CLOBBER:-"false"}
- 
- # If prompt==true, ask for confirmation before continuing with install.
--PROMPT="true"
-+PROMPT=${TW_PROMPT:-"true"}
- 
- # Guess where the toplevel for the distribution is.
- # A bad guess is the current directory
-@@ -200,6 +190,7 @@
- ## Parse the command line.
- ##-------------------------------------------------------
- 
-+test "$PACKAGE_INSTALLER" != "yes" && {
- while [ "x$1" != "x" ] ; do
-     case "$1" in
- 	-n) PROMPT="false"; xCLOBBER="true" ;;
-@@ -232,6 +223,7 @@
-     esac
-     shift
- done
-+}
- 
- ##-------------------------------------------------------
- ## Print the sign-on banner here before the first
-@@ -333,7 +325,7 @@
- ## passphrases must be specified on the command line.
- ##-------------------------------------------------------
- 
--if [ "$PROMPT" = "false" ] ; then
-+if [ "$DO_NOT_CONFIG" != "yes" -a "$PROMPT" = "false" ] ; then
- 	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
-@@ -514,7 +506,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 +517,12 @@
- 			chmod 0750 "$d" > /dev/null
- 		fi
- 	else
--		echo "$d: already exists"
-+		test "$PACKAGE_INSTALLER" != "yes" && echo "$d: already exists"
- 	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 +533,7 @@
- 			chmod 0755 "$d" > /dev/null
- 		fi
- 	else
--		echo "$d: already exists"
-+		test "$PACKAGE_INSTALLER" != "yes" && echo "$d: already exists"
- 	fi
- done
- 
-@@ -550,6 +542,7 @@
- ## Copy all files to the location specified.
- ##=======================================================
- 
-+test "$PACKAGE_INSTALLER" != "yes" && {
- echo
- echo "----------------------------------------------"
- echo "Copying files..."
-@@ -568,14 +561,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 +586,7 @@
- 	f=${TAR_DIR}$d/$ff
- 	ff=${dd}/$ff
- 	if [ -s $ff ] && [ "$CLOBBER" = "false" ] ; then
--		echo "$ff: file already exists"
-+		test "$PACKAGE_INSTALLER" != "yes" && echo "$ff: file already exists"
- 	else
- 		cp "$f" "$dd"
-                 if [ $? -eq 0 ]; then
-@@ -604,6 +597,12 @@
- 		fi
-        	fi
- done
-+}
-+
-+case $DO_NOT_CONFIG in
-+yes)	exit;;
-+*)	;;
-+esac
- 
- ##=======================================================
- ## Files are now present on user's system.

Property changes on: head/security/tripwire/files/patch-install-install.sh
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/tripwire/files/patch-install__install.cfg
===================================================================
--- head/security/tripwire/files/patch-install__install.cfg	(revision 433188)
+++ head/security/tripwire/files/patch-install__install.cfg	(nonexistent)
@@ -1,43 +0,0 @@
---- install/install.cfg.orig	2007-03-30 21:09:39.000000000 -0700
-+++ install/install.cfg	2009-02-20 12:26:13.505110456 -0800
-@@ -24,31 +24,31 @@
- CLOBBER=false
- 
- # Tripwire binaries are stored in TWBIN.
--TWBIN="${prefix}/sbin"
-+TWBIN="${PREFIX}/sbin"
- 
- # Tripwire policy files are stored in TWPOLICY.
--TWPOLICY="${sysconfdir}"
-+TWPOLICY="${TWPOLICY}"	# Set in the FreeBSD port Makefile
- 
- # Tripwire manual pages are stored in TWMAN.
--TWMAN="${prefix}/man"
-+TWMAN="${PREFIX}/man"
- 
- # Tripwire database files are stored in TWDB.
--TWDB="${prefix}/lib/tripwire"
-+TWDB="${TWDB}"	# Set in the FreeBSD port Makefile
- 
- # Tripwire documents directory
--TWDOCS="${prefix}/doc/tripwire"
-+TWDOCS="${PREFIX}/share/doc/tripwire"
- 
- # The Tripwire site key files are stored in TWSITEKEYDIR.
--TWSITEKEYDIR="${TWPOLICY}"
-+# TWSITEKEYDIR="${TWPOLICY}"
- 
- # The Tripwire local key files are stored in TWLOCALKEYDIR.
--TWLOCALKEYDIR="${TWPOLICY}"
-+# TWLOCALKEYDIR="${TWPOLICY}"
- 
- # Tripwire report files are stored in TWREPORT.
--TWREPORT="${TWDB}/report"
-+# TWREPORT="${TWREPORT}"	# Set in the FreeBSD port Makefile
- 
- # This sets the default text editor for Tripwire.
--TWEDITOR="${path_to_vi}"
-+# TWEDITOR="${path_to_vi}"
- 
- # TWLATEPROMTING controls the point when tripwire asks for a password.
- TWLATEPROMPTING=false

Property changes on: head/security/tripwire/files/patch-install__install.cfg
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/tripwire/files/patch-Makefile.in
===================================================================
--- head/security/tripwire/files/patch-Makefile.in	(revision 433188)
+++ head/security/tripwire/files/patch-Makefile.in	(revision 433189)
@@ -1,19 +1,19 @@
---- 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 @@
+--- Makefile.in.orig	2017-01-31 21:35:07.000000000 -0800
++++ Makefile.in	2017-02-02 00:55:45.246665000 -0800
+@@ -727,7 +727,6 @@
  
  install-data-am:
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive
  
- install-exec-am:
+ install-dvi-am:
+@@ -797,7 +796,7 @@
  
-@@ -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.
+         ./installer/install.sh
+ 
Index: head/security/tripwire/files/patch-installer-install.sh
===================================================================
--- head/security/tripwire/files/patch-installer-install.sh	(nonexistent)
+++ head/security/tripwire/files/patch-installer-install.sh	(revision 433189)
@@ -0,0 +1,140 @@
+--- installer/install.sh.orig	2011-11-21 08:06:56.000000000 -0800
++++ installer/install.sh	2014-06-21 10:37:36.784492831 -0700
+@@ -19,10 +19,6 @@
+ 
+ PATH='.:/bin:/usr/bin'
+ export PATH || (echo 'You must use sh to run this script'; kill $$)
+-if [ ! -t 0 ] ; then
+-	echo "Say 'sh install.sh', not 'sh < install.sh'"
+-	exit 1
+-fi
+ 
+ ##-------------------------------------------------------
+ ## The usage message.
+@@ -174,17 +170,11 @@
+ # Starting directory.
+ START_DIR=`pwd`
+ 
+-# Site passphrase.
+-TW_SITE_PASS=""
+-
+-# Local passphrase.
+-TW_LOCAL_PASS=""
+-
+ # If clobber==true, overwrite files; if false, do not overwrite files.
+-CLOBBER="false"
++CLOBBER=${TW_CLOBBER:-"false"}
+ 
+ # If prompt==true, ask for confirmation before continuing with install.
+-PROMPT="true"
++PROMPT=${TW_PROMPT:-"true"}
+ 
+ # Guess where the toplevel for the distribution is.
+ # A bad guess is the current directory
+@@ -200,6 +190,7 @@
+ ## Parse the command line.
+ ##-------------------------------------------------------
+ 
++test "$PACKAGE_INSTALLER" != "yes" && {
+ while [ "x$1" != "x" ] ; do
+     case "$1" in
+ 	-n) PROMPT="false"; xCLOBBER="true" ;;
+@@ -232,6 +223,7 @@
+     esac
+     shift
+ done
++}
+ 
+ ##-------------------------------------------------------
+ ## Print the sign-on banner here before the first
+@@ -333,7 +325,7 @@
+ ## passphrases must be specified on the command line.
+ ##-------------------------------------------------------
+ 
+-if [ "$PROMPT" = "false" ] ; then
++if [ "$DO_NOT_CONFIG" != "yes" -a "$PROMPT" = "false" ] ; then
+ 	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
+@@ -514,7 +506,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 +517,12 @@
+ 			chmod 0750 "$d" > /dev/null
+ 		fi
+ 	else
+-		echo "$d: already exists"
++		test "$PACKAGE_INSTALLER" != "yes" && echo "$d: already exists"
+ 	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 +533,7 @@
+ 			chmod 0755 "$d" > /dev/null
+ 		fi
+ 	else
+-		echo "$d: already exists"
++		test "$PACKAGE_INSTALLER" != "yes" && echo "$d: already exists"
+ 	fi
+ done
+ 
+@@ -550,6 +542,7 @@
+ ## Copy all files to the location specified.
+ ##=======================================================
+ 
++test "$PACKAGE_INSTALLER" != "yes" && {
+ echo
+ echo "----------------------------------------------"
+ echo "Copying files..."
+@@ -568,14 +561,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 +586,7 @@
+ 	f=${TAR_DIR}$d/$ff
+ 	ff=${dd}/$ff
+ 	if [ -s $ff ] && [ "$CLOBBER" = "false" ] ; then
+-		echo "$ff: file already exists"
++		test "$PACKAGE_INSTALLER" != "yes" && echo "$ff: file already exists"
+ 	else
+ 		cp "$f" "$dd"
+                 if [ $? -eq 0 ]; then
+@@ -604,6 +597,12 @@
+ 		fi
+        	fi
+ done
++}
++
++case $DO_NOT_CONFIG in
++yes)	exit;;
++*)	;;
++esac
+ 
+ ##=======================================================
+ ## Files are now present on user's system.

Property changes on: head/security/tripwire/files/patch-installer-install.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/security/tripwire/files/patch-installer__install.cfg
===================================================================
--- head/security/tripwire/files/patch-installer__install.cfg	(nonexistent)
+++ head/security/tripwire/files/patch-installer__install.cfg	(revision 433189)
@@ -0,0 +1,43 @@
+--- installer/install.cfg.orig	2007-03-30 21:09:39.000000000 -0700
++++ installer/install.cfg	2009-02-20 12:26:13.505110456 -0800
+@@ -24,31 +24,31 @@
+ CLOBBER=false
+ 
+ # Tripwire binaries are stored in TWBIN.
+-TWBIN="${prefix}/sbin"
++TWBIN="${PREFIX}/sbin"
+ 
+ # Tripwire policy files are stored in TWPOLICY.
+-TWPOLICY="${sysconfdir}"
++TWPOLICY="${TWPOLICY}"	# Set in the FreeBSD port Makefile
+ 
+ # Tripwire manual pages are stored in TWMAN.
+-TWMAN="${prefix}/man"
++TWMAN="${PREFIX}/man"
+ 
+ # Tripwire database files are stored in TWDB.
+-TWDB="${prefix}/lib/tripwire"
++TWDB="${TWDB}"	# Set in the FreeBSD port Makefile
+ 
+ # Tripwire documents directory
+-TWDOCS="${prefix}/doc/tripwire"
++TWDOCS="${PREFIX}/share/doc/tripwire"
+ 
+ # The Tripwire site key files are stored in TWSITEKEYDIR.
+-TWSITEKEYDIR="${TWPOLICY}"
++# TWSITEKEYDIR="${TWPOLICY}"
+ 
+ # The Tripwire local key files are stored in TWLOCALKEYDIR.
+-TWLOCALKEYDIR="${TWPOLICY}"
++# TWLOCALKEYDIR="${TWPOLICY}"
+ 
+ # Tripwire report files are stored in TWREPORT.
+-TWREPORT="${TWDB}/report"
++# TWREPORT="${TWREPORT}"	# Set in the FreeBSD port Makefile
+ 
+ # This sets the default text editor for Tripwire.
+-TWEDITOR="${path_to_vi}"
++# TWEDITOR="${path_to_vi}"
+ 
+ # TWLATEPROMTING controls the point when tripwire asks for a password.
+ TWLATEPROMPTING=false

Property changes on: head/security/tripwire/files/patch-installer__install.cfg
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property