From b27652b43bdb1dc4a973d1db0d0da523579e215b Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Tue, 21 Aug 2012 21:00:33 +0000
Subject: Fix problem introduced in r302141.  The directory for the unpacked
 source files is unversioned, so it conflicts with the name of the rc.d script
 in WRKDIR after SUB_FILES is applied.

---
 security/isakmpd/Makefile  | 4 +++-
 security/snortsam/Makefile | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'security')

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index d039ca6bcb6e..3bf44d1f2db1 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -26,7 +26,6 @@ BUILD_DEPENDS+=	keynote:${PORTSDIR}/security/keynote
 .endif
 
 USE_RC_SUBR=	isakmpd
-WRKSRC=		${WRKDIR}/isakmpd
 MAKE_ENV+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man LC_ALL=C
 
 MAN5=		isakmpd.conf.5 isakmpd.policy.5
@@ -41,6 +40,9 @@ OPENSSLINC?=	/usr/include
 OPENSSLLIB?=	/usr/lib
 MAKE_ENV+=	OPENSSLINC="${OPENSSLINC}" OPENSSLLIB="${OPENSSLLIB}"
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 .for f in conf.h ike_auth.c isakmpd.8 isakmpd.conf.5 isakmpd.policy.5 policy.h
 	${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/${f}
diff --git a/security/snortsam/Makefile b/security/snortsam/Makefile
index 8baee38d07a6..14030bb3aba9 100644
--- a/security/snortsam/Makefile
+++ b/security/snortsam/Makefile
@@ -28,7 +28,6 @@ SUB_FILES=	pkg-message \
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 CONFIGURE_SCRIPT=	src/Makefile
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 
 CONFIG_DIR?=	${PREFIX}/etc/snortsam
 
@@ -55,6 +54,9 @@ EXTRA_PATCHES+=	${FILESDIR}/ssp_ipfw2_no_table_check.patch
 DEBUG=-DDEBUG
 .endif
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 pre-configure:
 	@${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${CONFIG_DIR}/snortsam.conf|g" ${WRKSRC}/conf/snortsam.conf.sample
 	@${REINPLACE_CMD} -e "s|/etc/snortsam.conf|${CONFIG_DIR}/snortsam.conf|g" ${WRKSRC}/docs/README.conf
-- 
cgit