- use STAGEDIR

- use OPTIONS_DEFINE

6 files changed, 49 insertions, 59 deletions

diff --git a/mail/noattach/Makefile b/mail/noattach/Makefile
index b73dbfef429d..311fb6325aec 100644
--- a/mail/noattach/Makefile
+++ b/mail/noattach/Makefile
@@ -9,18 +9,13 @@ MASTER_SITES=	ftp://ftp.rhnet.is/pub/noattach/
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	An attachment filter for Sendmail Milter
 
+USES=		manpages:install
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=    noattach
-
-NO_STAGE=	yes
-
 CFLAGS+=	${PTHREAD_CFLAGS:S=""==}
-MAN8=		noattach.8
 DOCSFILES=	AUTHORS THANKS INSTALL NEWS README TODO ChangeLog
 SAMPLEFILES=	README noattach.patterns noattach.patterns.johncon
-.if defined(SENDMAIL_WITH_LDAP)
-CONFIGURE_ARGS+=	--enable-ldap
-.endif
+MAN8=		noattach.8
 
 .include <bsd.port.pre.mk>
 
@@ -35,21 +30,20 @@ pre-configure:
 	${REINPLACE_CMD} -e 's=-pthread=${PTHREAD_LIBS}=' \
 		${WRKSRC}/configure
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${PREFIX}/libexec/noattach
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/noattach ${STAGEDIR}${PREFIX}/libexec/noattach
 	${INSTALL_DATA} ${WRKSRC}/examples/noattach.patterns \
-		 ${PREFIX}/etc/noattach.patterns-dist
-	${INSTALL_MAN} ${WRKSRC}/noattach.8 ${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+		 ${STAGEDIR}${PREFIX}/etc/noattach.patterns-dist
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${SAMPLEFILES}
-	${INSTALL_DATA} ${WRKSRC}/examples/${i} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/examples/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 .endif
 
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index e918c0d18ed3..3bef48d939de 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -10,8 +10,6 @@ DISTNAME=	rays-filter-${PORTVERSION}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A configurable filter for Sendmail Milter
 
-NO_STAGE=	yes
-
 CTARGETS+=	rays-filter
 CFLAGS+=	-Wall ${PTHREAD_CFLAGS:S=""==}
 LIBS+=		${PTHREAD_LIBS}
@@ -46,20 +44,20 @@ do-build:	${CTARGETS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rays-filter \
-		${PREFIX}/libexec/rays-filter
+		${STAGEDIR}${PREFIX}/libexec/rays-filter
 	${INSTALL_SCRIPT} ${WRKSRC}/mail-filter \
-		${PREFIX}/etc/rc.d/raysfilter.sh.sample
+		${STAGEDIR}${PREFIX}/etc/rc.d/raysfilter.sh.sample
 .for i in ${BINFILES}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-	${MKDIR} ${PREFIX}/etc/mail-filter
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mail-filter
 .for i in ${ETCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/etc/mail-filter/${i}-dist
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/etc/mail-filter/${i}-dist
 .endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
 
diff --git a/mail/ripmime/Makefile b/mail/ripmime/Makefile
index 4cedb8b51cf1..0bf2524eea18 100644
--- a/mail/ripmime/Makefile
+++ b/mail/ripmime/Makefile
@@ -12,8 +12,8 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Extracts attached files out of a MIME encoded email package
 
 MAKE_JOBS_UNSAFE=	yes
-NO_STAGE=	yes
 
+USES=		manpages:install
 PLIST_FILES=	bin/ripmime
 MAN1=		ripmime.1
 
@@ -23,9 +23,8 @@ pre-build:
 		${WRKSRC}/Makefile ${WRKSRC}/ripOLE/Makefile \
 		${WRKSRC}/tnef/Makefile
 
-do_install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/ripmime.1 ${MANPREFIX}/man/man1/
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/ripmime ${STAGEDIR}${PREFIX}/bin/
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/sentinel/Makefile b/mail/sentinel/Makefile
index fa074aeded68..874fd4fb80be 100644
--- a/mail/sentinel/Makefile
+++ b/mail/sentinel/Makefile
@@ -12,7 +12,7 @@ COMMENT=	A sendmail milter API implementation
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
-NO_STAGE=	yes
+NEED_ROOT=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -32,15 +32,15 @@ do-build:
 		-lmilter -lpcre -lpcreposix ${PTHREAD_LIBS}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${PREFIX}/sbin
-	@${MKDIR} /var/spool/sentinel
-	${CHOWN} smmsp:smmsp /var/spool/sentinel
-	${INSTALL_DATA} ${FILESDIR}/000.sentinel.sh ${PREFIX}/etc/rc.d/sentinel.sh-dist
-	${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${PREFIX}/etc/sentinel.cf.dist
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/sentinel ${STAGEDIR}${PREFIX}/sbin/
+	@${MKDIR} ${STAGEDIR}/var/spool/sentinel
+	${CHOWN} smmsp:smmsp ${STAGEDIR}/var/spool/sentinel
+	${INSTALL_DATA} ${FILESDIR}/000.sentinel.sh ${STAGEDIR}${PREFIX}/etc/rc.d/sentinel.sh-dist
+	${INSTALL_DATA} ${WRKSRC}/sentinel.cf.SAMPLE ${STAGEDIR}${PREFIX}/etc/sentinel.cf.dist
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.FreeBSD ${STAGEDIR}${DOCSDIR}
 .endif
 
 post-install:
diff --git a/mail/sma/Makefile b/mail/sma/Makefile
index 7523e21d61d5..18007ad04998 100644
--- a/mail/sma/Makefile
+++ b/mail/sma/Makefile
@@ -10,32 +10,31 @@ MASTER_SITE_SUBDIR=	dinoex
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Program that analyses Sendmail log entries
 
-NO_STAGE=	yes
-
-MAN8=		sma.8
-DOCSFILES=	BUGS COPYRIGHT HISTORY README TODO
-SAMPLEFILES=	sma.conf
+USES=		manpages:install
 ALL_TARGET=	sma
+SAMPLEFILES=	sma.conf
+DOCSFILES=	BUGS COPYRIGHT HISTORY README TODO
+MAN8=		sma.8
+
+.include <bsd.port.options.mk>
 
 do-configure:
-	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.sed
-	${SED} -e "s,CC	=,CC?=	," \
+	${REINPLACE_CMD} -e "s,CC	=,CC?=	," \
 		-e "s,CFLAGS	= -Wall -O,CFLAGS+=	," \
-		${WRKSRC}/Makefile.sed > ${WRKSRC}/Makefile
+		${WRKSRC}/Makefile
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sma ${PREFIX}/bin/sma
-	${INSTALL_MAN} ${WRKSRC}/sma.8 ${PREFIX}/man/man8/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+do-install:	install-all-manpages
+	${INSTALL_PROGRAM} ${WRKSRC}/sma ${STAGEDIR}${PREFIX}/bin/sma
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${DOCSFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/
 .endfor
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for i in ${SAMPLEFILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${EXAMPLESDIR}/
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}/
 .endfor
 .endif
 
diff --git a/mail/vbsfilter/Makefile b/mail/vbsfilter/Makefile
index 291f9f9ed9ed..b274b17c0650 100644
--- a/mail/vbsfilter/Makefile
+++ b/mail/vbsfilter/Makefile
@@ -46,6 +46,6 @@ do-build:	${CTARGETS}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vbsfilter-${PORTVERSION} \
-		${PREFIX}/libexec/vbsfilter
+		${STAGEDIR}${PREFIX}/libexec/vbsfilter
 
 .include <bsd.port.post.mk>