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.

8 files changed, 24 insertions, 10 deletions

diff --git a/dns/dualserver/Makefile b/dns/dualserver/Makefile
index e9266018788a..f329d2aa8337 100644
--- a/dns/dualserver/Makefile
+++ b/dns/dualserver/Makefile
@@ -14,11 +14,13 @@ COMMENT=	Combined DHCP/DNS server for small LANs
 
 USE_DOS2UNIX=	yes
 USE_RC_SUBR=	dualserver
-WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	sbin/dualserver etc/dualserver.conf.sample
 
 .include <bsd.port.pre.mk>
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 pre-patch:
 	${REINPLACE_CMD} 's|/etc/dualserver.ini|${PREFIX}/etc/dualserver.conf|' ${WRKSRC}/dualserver.cpp
 	${REINPLACE_CMD} 's|/etc/dualserver.state|/var/run/dualserver.state|' ${WRKSRC}/dualserver.cpp
diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index 15b69b119f1c..b3d42f845b35 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -24,7 +24,6 @@ HAS_CONFIGURE=	yes
 MAKE_ENV=	OSTYPE=FreeBSD
 CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_PERL5=	yes
 USE_RC_SUBR=	${PORTNAME}
 
@@ -49,6 +48,9 @@ CONFIGURE_ARGS+=	"--with-iconv"
 CONFIGURE_ARGS+=	"--with-ssl"
 .endif
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^CONFIGS = / s|\.conf|&.sample|g' ${WRKSRC}/Makefile
 	@cd ${WRKSRC}/conf/ && (${LS} *.conf | ${XARGS} -I % ${MV} % %.sample)
diff --git a/irc/inspircd12/Makefile b/irc/inspircd12/Makefile
index fe7ea00af27a..0570403b5487 100644
--- a/irc/inspircd12/Makefile
+++ b/irc/inspircd12/Makefile
@@ -18,7 +18,6 @@ CONFLICTS=	inspircd-2.*
 
 LATEST_LINK=	inspircd12
 
-WRKSRC=	${WRKDIR}/inspircd
 USE_BZIP2=	yes
 USE_LDCONFIG=	${PREFIX}/lib/inspircd
 USE_RC_SUBR=	inspircd
@@ -178,6 +177,9 @@ PLIST_SUB+=	ZIPLINK="@comment "
 
 CXXFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 	${REINPLACE_CMD} -e '/INSTMODE/s|700|755|;/install -d.*BINPATH/d'\
 	  -e 's,FLAGS = @FLAGS@,FLAGS = ${CXXFLAGS} @FLAGS@,' \
diff --git a/irc/tircd/Makefile b/irc/tircd/Makefile
index cfce7ab1274e..4f68518b5f43 100644
--- a/irc/tircd/Makefile
+++ b/irc/tircd/Makefile
@@ -24,14 +24,15 @@ RUN_DEPENDS=	p5-JSON-Any>=0:${PORTSDIR}/converters/p5-JSON-Any \
 		p5-POE>=0:${PORTSDIR}/devel/p5-POE \
 		p5-POE-Filter-IRCD>=0:${PORTSDIR}/irc/p5-POE-Filter-IRCD
 
-WRKSRC=		${WRKDIR}/tircd
-
 USE_PERL5=	yes
 NO_BUILD=	yes
 
 MAN1=		tircd.1
 USE_RC_SUBR=	tircd
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 	${REINPLACE_CMD} -e '1s,^#!/usr/bin/perl,#!${PREFIX}/bin/perl,' \
 			 -e 's,/etc/tircd.cfg,${PREFIX}/etc/tircd.cfg,g' \
diff --git a/mail/couriergraph/Makefile b/mail/couriergraph/Makefile
index 2c3bcb98913e..1bb49bb9a11b 100644
--- a/mail/couriergraph/Makefile
+++ b/mail/couriergraph/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
 
 NO_BUILD=	yes
 USE_PERL5=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DATADIR?=	/var/db/couriergraph
 COURIERGRAPH_USER?=	${WWWOWN}
@@ -42,6 +41,9 @@ pre-everything::
 	@${ECHO_MSG} "COURIERGRAPH_GROUP=www			Group to run couriergraph (Default: ${WWWGRP})"
 	@${ECHO_MSG}
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.cgi
 	@${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR}," ${WRKSRC}/couriergraph.pl
diff --git a/mail/exilog/Makefile b/mail/exilog/Makefile
index 34422b05c8b8..84da6a44d2ac 100644
--- a/mail/exilog/Makefile
+++ b/mail/exilog/Makefile
@@ -20,7 +20,6 @@ RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
 USE_PERL5=	yes
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 # Default sql backend
 WITH_SQL_BACKEND?=	mysql
@@ -59,6 +58,9 @@ PORTDOC_FILES=	doc/Changelog \
 		doc/pgsql-db-script.sql
 .endif
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's,$$RealBin/exilog.conf,${PREFIX}/etc/exilog.conf,' ${WRKSRC}/exilog_config.pm
 	@${REINPLACE_CMD} -e "s,\(use exilog_config\),use lib \'${EXILOGDIR}\'; \1," ${WRKSRC}/exilog_agent.pl
diff --git a/mail/missey/Makefile b/mail/missey/Makefile
index dedae3501928..34d5b0818317 100644
--- a/mail/missey/Makefile
+++ b/mail/missey/Makefile
@@ -18,8 +18,6 @@ COMMENT=	Secure small and high performance POP3 server
 
 USE_BZIP2=	yes
 
-WRKSRC=		${WRKDIR}/mps/src
-
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}" MKDIR="${MKDIR}" WRKSRC="${WRKSRC}"
@@ -29,6 +27,9 @@ PLIST_DIRS=	etc/mps
 
 USE_RC_SUBR=	mps
 
+post-extract:
+	@${MV} ${WRKDIR}/mps/src ${WRKSRC}
+
 post-patch:
 	@${CP}	${FILESDIR}/Makefile ${WRKSRC}/Makefile
 
diff --git a/mail/spamilter/Makefile b/mail/spamilter/Makefile
index 25153ba6d592..d473a697ceb0 100644
--- a/mail/spamilter/Makefile
+++ b/mail/spamilter/Makefile
@@ -23,7 +23,6 @@ HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--have-resn
 USE_RC_SUBR=	spamilter
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
 LDFLAGS+=	${PTHREAD_LIBS}
 MAKE_ENV+=	__MAKE_CONF=/dev/null
@@ -64,6 +63,9 @@ PLIST_FILES+=	bin/dnsblchk bin/dnsblupd bin/ipfwmtad bin/mxlookup \
 PORTDOCS=	Changelog INSTALL LICENSE docs.html docs.txt db.rcpt \
 		db.rdnsbl db.sndr policy.html spamilter.rc
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
+
 pre-configure:
 	${REINPLACE_CMD} \
 		-e "s=/etc/spamilter.rc=${PREFIX}/etc/spamilter.rc=" \