From owner-svn-ports-head@FreeBSD.ORG  Sun Feb  9 02:22:45 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8AE3D523;
 Sun,  9 Feb 2014 02:22:45 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5BBAA1586;
 Sun,  9 Feb 2014 02:22:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s192Mjwl033603;
 Sun, 9 Feb 2014 02:22:45 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s192MjJW033601;
 Sun, 9 Feb 2014 02:22:45 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201402090222.s192MjJW033601@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 9 Feb 2014 02:22:45 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r343420 - head/mail/serialmail
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Feb 2014 02:22:45 -0000

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