svn commit: r302901 - in head: mail/missey net-mgmt/ipacctd net/frickin net/stund net/yate security/isakmpd security/snortsam sysutils/rsyncmanager
Doug Barton
dougb at FreeBSD.org
Tue Aug 21 21:00:35 UTC 2012
Author: dougb
Date: Tue Aug 21 21:00:33 2012
New Revision: 302901
URL: http://svn.freebsd.org/changeset/ports/302901
Log:
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.
Modified:
head/mail/missey/Makefile
head/net-mgmt/ipacctd/Makefile
head/net/frickin/Makefile
head/net/stund/Makefile
head/net/yate/Makefile
head/security/isakmpd/Makefile
head/security/snortsam/Makefile
head/sysutils/rsyncmanager/Makefile
Modified: head/mail/missey/Makefile
==============================================================================
--- head/mail/missey/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/mail/missey/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -29,6 +29,7 @@ USE_RC_SUBR= mps
post-extract:
@${MV} ${WRKDIR}/mps/src ${WRKSRC}
+ @${RM} -r ${WRKDIR}/mps
post-patch:
@${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
Modified: head/net-mgmt/ipacctd/Makefile
==============================================================================
--- head/net-mgmt/ipacctd/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/net-mgmt/ipacctd/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -16,13 +16,15 @@ COMMENT= IP accounting using divert sock
USE_RC_SUBR= ipacctd
-WRKSRC= ${WRKDIR}/${PORTNAME}
MAKE_ENV+= BINDIR="${PREFIX}/sbin"
MAN8= ipacctd.8
MANLANG= "" ru.KOI8-R
MANCOMPRESSED= yes
+post-extract:
+ @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
post-install:
.ifndef(NOPORTDOCS)
@${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
Modified: head/net/frickin/Makefile
==============================================================================
--- head/net/frickin/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/net/frickin/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -15,12 +15,14 @@ EXTRACT_SUFX= .tgz
MAINTAINER= asm at asm.kiev.ua
COMMENT= Frickin PPTP Proxy
-WRKSRC= ${WRKDIR}/${PORTNAME}
USE_RC_SUBR= frickin
SUB_FILES= pkg-message
PORTDOCS= INSTALL LICENSE
PLIST_FILES= sbin/frickin2 etc/frickin.conf.sample
+post-extract:
+ @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g;' \
${WRKSRC}/src/Makefile.FreeBSD
Modified: head/net/stund/Makefile
==============================================================================
--- head/net/stund/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/net/stund/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -15,12 +15,13 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sobomax at FreeBSD.org
COMMENT= A simple STUN (RFC 3489) server and client
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
USE_GMAKE= yes
USE_RC_SUBR= stund
MAKE_ENV= "CXX=${CXX}"
+post-extract:
+ @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/server ${PREFIX}/sbin/stund
${INSTALL_PROGRAM} ${WRKSRC}/client ${PREFIX}/bin/stun_client
Modified: head/net/yate/Makefile
==============================================================================
--- head/net/yate/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/net/yate/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -25,8 +25,6 @@ USE_LDCONFIG= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/yate
-
CONFIGURE_ARGS= --without-fdsize \
--without-libqt4 \
--with-zlib=/usr
@@ -162,6 +160,9 @@ PLIST_SUB+= WITH_ALSA="@comment "
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-noportdocs
.endif
+post-extract:
+ @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
post-install:
@cd ${PREFIX}/etc/${PORTNAME}; \
for cfg in *.sample; do \
Modified: head/security/isakmpd/Makefile
==============================================================================
--- head/security/isakmpd/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/security/isakmpd/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -26,7 +26,6 @@ BUILD_DEPENDS+= keynote:${PORTSDIR}/secu
.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}
Modified: head/security/snortsam/Makefile
==============================================================================
--- head/security/snortsam/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/security/snortsam/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -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
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
Modified: head/sysutils/rsyncmanager/Makefile
==============================================================================
--- head/sysutils/rsyncmanager/Makefile Tue Aug 21 20:56:44 2012 (r302900)
+++ head/sysutils/rsyncmanager/Makefile Tue Aug 21 21:00:33 2012 (r302901)
@@ -15,8 +15,6 @@ COMMENT= Flexible rsync resource manager
RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
USE_RUBY= yes
USE_RUBY_FEATURES= ruby18
@@ -27,6 +25,9 @@ PORTDOCS= README
USE_RC_SUBR= ${PORTNAME}
SUB_LIST= RUBY_WITHOUT_SUFFIX="${RUBY_WITHOUT_SUFFIX}"
+post-extract:
+ @${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/bin/${PORTNAME}.rb ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/documentation/${PORTNAME}.xml ${PREFIX}/etc/${PORTNAME}.xml.sample
More information about the svn-ports-head
mailing list