svn commit: r390102 - head/security/tripwire

[Cy Schubert]

Author: cy
Date: Fri Jun 19 05:44:57 2015
New Revision: 390102
URL: https://svnweb.freebsd.org/changeset/ports/390102

Log:
  Fix: pkg-static: POST-INSTALL script failed

Modified:
  head/security/tripwire/Makefile

Modified: head/security/tripwire/Makefile
==============================================================================
--- head/security/tripwire/Makefile	Fri Jun 19 04:27:04 2015	(r390101)
+++ head/security/tripwire/Makefile	Fri Jun 19 05:44:57 2015	(r390102)
@@ -3,7 +3,7 @@
 
 PORTNAME=	tripwire
 PORTVERSION=	2.4.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -91,7 +91,8 @@ TWPOL_TXT?=	${FILESDIR}/twpol.m4
 CONFIGURE_ARGS=	--prefix=${PREFIX} --program-transform-name='' --sysconfdir=${TWCFG}
 
 PLIST_SUB+=	TWCFG=${TWCFG} TWDB=${TWDB}
-PKGINSTALL=	${WRKDIR}/pkg-install
+PKGPOSTINSTALL=	${WRKDIR}/pkg-postinstall
+PKGPOSTDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	TWCFG=${TWCFG} TWDB=${TWDB}
 
@@ -128,38 +129,38 @@ install-config-files:
 .endif
 
 make-pkg-install:
-	@ ${ECHO_CMD} '#!/bin/sh -' > ${PKGINSTALL}
-	@ ${ECHO_CMD} '#' >> ${PKGINSTALL}
-	@ ${ECHO_CMD} "# Generated by make-${PKGINSTALL} on `date`" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} '#' >> ${PKGINSTALL}
-	@ ${ECHO_CMD} 'case $$2 in' >> ${PKGINSTALL}
-	@ ${ECHO_CMD} 'POST-INSTALL)	;;' >> ${PKGINSTALL}
-	@ ${ECHO_CMD} '*)	exit 0;;' >> ${PKGINSTALL}
-	@ ${ECHO_CMD} 'esac' >> ${PKGINSTALL}
-	@ ${ECHO_CMD} PACKAGE_INSTALLER=yes >> ${PKGINSTALL}
-	@ ${ECHO_CMD} POLICYSRC=/tmp/$$$$.tmp >> ${PKGINSTALL}
-	@ ${ECHO_CMD} PREFIX="$(PREFIX)" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} DO_NOT_CONFIG=yes >> ${PKGINSTALL}
-	@ ${ECHO_CMD} TW_CLOBBER="false" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} TW_PROMPT="false" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} sysconfdir="$(sysconfdir)" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} prefix=${PREFIX} >> ${PKGINSTALL}
-	@ ${ECHO_CMD} sysconfdir=${TWCFG} >> ${PKGINSTALL}
-	@ ${ECHO_CMD} path_to_vi="/usr/bin/vi" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} path_to_sendmail="/usr/sbin/sendmail" >> ${PKGINSTALL}
-	@ ${ECHO_CMD} BASE_DIR=${PREFIX}/ >> ${PKGINSTALL}
-	@ ${ECHO_CMD} BIN_DIR=${PREFIX}/sbin >> ${PKGINSTALL}
+	@ ${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} sysconfdir="$(sysconfdir)" >> ${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} >> ${PKGINSTALL}
+	@ ${ECHO_CMD} TW_SITE_PASS=${TW_SITE_PASS} >> ${PKGPOSTINSTALL}
 .endif
 .ifdef TW_LOCAL_PASS
-	@ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${PKGINSTALL}
+	@ ${ECHO_CMD} TW_LOCAL_PASS=${TW_LOCAL_PASS} >> ${PKGPOSTINSTALL}
 .endif
-	@ ${CAT} ${WRKSRC}/install/install.cfg >> ${PKGINSTALL}
-	@ ${ECHO_CMD} ${CAT} "> /tmp/$$$$.tmp <<'EOF'" >> ${PKGINSTALL}
-	@ ${M4} -DFREEBSD_VERSION=`${ECHO_CMD} ${OSREL} | ${CUT} -d. -f1` < ${TWPOL_TXT} >> ${PKGINSTALL}
-	@ ${ECHO_CMD} EOF >> ${PKGINSTALL}
-	@ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGINSTALL}
+	@ ${CAT} ${WRKSRC}/install/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}
 
 create-database:
 .ifndef PACKAGE_BUILDING