svn commit: r343420 - head/mail/serialmail

[Bryan Drewery]

Author: bdrewery
Date: Sun Feb  9 02:22:44 2014
New Revision: 343420
URL: http://svnweb.freebsd.org/changeset/ports/343420
QAT: https://qat.redports.org/buildarchive/r343420/

Log:
  - Support STAGEDIR

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

Modified: head/mail/serialmail/Makefile
==============================================================================
--- head/mail/serialmail/Makefile	Sun Feb  9 02:17:38 2014	(r343419)
+++ head/mail/serialmail/Makefile	Sun Feb  9 02:22:44 2014	(r343420)
@@ -17,7 +17,6 @@ RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysut
 UCSPI_SSL_RUN_DEPENDS=	sslclient:${PORTSDIR}/sysutils/ucspi-ssl
 
 USES=		qmail:run
-NO_STAGE=	yes
 OPTIONS_SUB=	yes
 
 LEGAL_TEXT=	No license -- see http://cr.yp.to/softwarelaw.html
@@ -30,7 +29,7 @@ UCSPI_SSL_DESC=	ucspi-ssl SMTP SSL trans
 
 PROGRAMS=	serialqmtp serialsmtp maildirserial setlock
 SCRIPTS=	maildirqmtp maildirsmtp
-MAN1=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 \
+MAN=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 \
 		serialsmtp.1 setlock.1
 PORTDOCS=	AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
 
@@ -42,10 +41,6 @@ PATCHFILES=	serialmail-auth.patch
 PATCH_DIST_STRIP=	-p1
 .endif
 
-.if ${PORT_OPTIONS:MUCSPI_SSL}
-MLINKS+=	maildirsmtp.1 maildirsmtps.1
-.endif
-
 post-patch:
 .if ${PORT_OPTIONS:MUCSPI_SSL}
 	@${SED} -E \
@@ -64,15 +59,15 @@ post-configure:
 
 do-install:
 	cd ${WRKSRC} && \
-		${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin && \
-		${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin && \
-		${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
+		${INSTALL_PROGRAM} ${PROGRAMS} ${STAGEDIR}${PREFIX}/bin && \
+		${INSTALL_SCRIPT} ${SCRIPTS} ${STAGEDIR}${PREFIX}/bin && \
+		${INSTALL_MAN} ${MAN} ${STAGEDIR}${MANPREFIX}/man/man1
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MUCSPI_SSL}
-	@${INSTALL_SCRIPT} ${WRKDIR}/maildirsmtps ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKDIR}/maildirsmtps ${STAGEDIR}${PREFIX}/bin
 .endif
 
 .include <bsd.port.mk>

Modified: head/mail/serialmail/pkg-plist
==============================================================================
--- head/mail/serialmail/pkg-plist	Sun Feb  9 02:17:38 2014	(r343419)
+++ head/mail/serialmail/pkg-plist	Sun Feb  9 02:22:44 2014	(r343420)
@@ -5,3 +5,11 @@ bin/maildirsmtp
 bin/serialqmtp
 bin/serialsmtp
 bin/setlock
+man/man1/maildirqmtp.1.gz
+man/man1/maildirserial.1.gz
+man/man1/maildirsmtp.1.gz
+man/man1/serialqmtp.1.gz
+man/man1/serialsmtp.1.gz
+man/man1/setlock.1.gz
+%%UCSPI_SSL%%man/man1/maildirsmtp.1.gz
+%%UCSPI_SSL%%man/man1/maildirsmtps.1.gz