svn commit: r345351 - head/mail/smtprc

[Emanuel Haupt]

Author: ehaupt
Date: Fri Feb 21 10:03:29 2014
New Revision: 345351
URL: http://svnweb.freebsd.org/changeset/ports/345351
QAT: https://qat.redports.org/buildarchive/r345351/

Log:
  - Support staging
  - Use optionsng

Modified:
  head/mail/smtprc/Makefile
  head/mail/smtprc/pkg-plist

Modified: head/mail/smtprc/Makefile
==============================================================================
--- head/mail/smtprc/Makefile	Fri Feb 21 09:54:10 2014	(r345350)
+++ head/mail/smtprc/Makefile	Fri Feb 21 10:03:29 2014	(r345351)
@@ -10,16 +10,19 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mich at FreeBSD.org
 COMMENT=	A scanner for open SMTP relays
 
-.if defined(WITH_GUI)
+OPTIONS_DEFINE=	DOCS GUI
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGUI}
 RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
 PLIST_SUB+=	WITHGUI=""
 .else
 PLIST_SUB+=	WITHGUI="@comment "
 .endif
 
-NO_STAGE=	yes
 pre-fetch:
-.if defined(WITH_GUI)
+.if ${PORT_OPTIONS:MGUI}
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Installed with GUI"
 	@${ECHO_MSG} ""
@@ -34,26 +37,17 @@ post-patch:
 	    s,gcc,${CC},g" ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/auto.conf ${PREFIX}/etc/${PORTNAME}/auto.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/email.tmpl ${PREFIX}/etc/${PORTNAME}/email.tmpl.sample
-	${INSTALL_DATA} ${WRKSRC}/rcheck.conf ${PREFIX}/etc/${PORTNAME}/rcheck.conf.sample
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${PREFIX}/man/man1
-.if defined(WITH_GUI)
-	${INSTALL_SCRIPT} ${WRKSRC}/gsmtprc ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/gsmtprc.1 ${PREFIX}/man/man1
-.endif
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
-.endif
-
-.if defined(WITH_GUI)
-MAN1=		smtprc.1 gsmtprc.1
-.else
-MAN1=		smtprc.1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/auto.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/auto.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/email.tmpl ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/email.tmpl.sample
+	${INSTALL_DATA} ${WRKSRC}/rcheck.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/rcheck.conf.sample
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MGUI}
+	${INSTALL_SCRIPT} ${WRKSRC}/gsmtprc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gsmtprc.1 ${STAGEDIR}${PREFIX}/man/man1
 .endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 
 .include <bsd.port.mk>

Modified: head/mail/smtprc/pkg-plist
==============================================================================
--- head/mail/smtprc/pkg-plist	Fri Feb 21 09:54:10 2014	(r345350)
+++ head/mail/smtprc/pkg-plist	Fri Feb 21 10:03:29 2014	(r345351)
@@ -2,7 +2,9 @@ bin/smtprc
 etc/smtprc/auto.conf.sample
 etc/smtprc/email.tmpl.sample
 etc/smtprc/rcheck.conf.sample
- at dirrm etc/smtprc
+man/man1/smtprc.1.gz
+%%WITHGUI%%man/man1/gsmtprc.1.gz
 %%WITHGUI%%bin/gsmtprc
 %%PORTDOCS%%share/doc/smtprc/README
 %%PORTDOCS%%@dirrm share/doc/smtprc
+ at dirrm etc/smtprc