From 320cd1ea2d17c86179fa69a8da5584397ab2a2e1 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Wed, 15 Aug 2012 01:04:30 +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.

---
 mail/couriergraph/Makefile | 4 +++-
 mail/exilog/Makefile       | 4 +++-
 mail/missey/Makefile       | 5 +++--
 mail/spamilter/Makefile    | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'mail')

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=" \
-- 
cgit