From owner-svn-ports-head@FreeBSD.ORG  Tue Nov 19 12:56:32 2013
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 6F1E9382;
 Tue, 19 Nov 2013 12:56:32 +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 44DF52E60;
 Tue, 19 Nov 2013 12:56:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAJCuWoj006791;
 Tue, 19 Nov 2013 12:56:32 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAJCuVm5006787;
 Tue, 19 Nov 2013 12:56:31 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201311191256.rAJCuVm5006787@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Tue, 19 Nov 2013 12:56:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334309 - head/security/zebedee
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.16
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: Tue, 19 Nov 2013 12:56:32 -0000

Author: ehaupt
Date: Tue Nov 19 12:56:31 2013
New Revision: 334309
URL: http://svnweb.freebsd.org/changeset/ports/334309

Log:
  Support staging.

Modified:
  head/security/zebedee/Makefile
  head/security/zebedee/pkg-plist

Modified: head/security/zebedee/Makefile
==============================================================================
--- head/security/zebedee/Makefile	Tue Nov 19 12:52:28 2013	(r334308)
+++ head/security/zebedee/Makefile	Tue Nov 19 12:56:31 2013	(r334309)
@@ -10,38 +10,40 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Encrypted, secure compressed TCP tunnel
 
 USES=		perl5
-USE_OPENSSL=	YES
+USE_OPENSSL=	yes
 USE_PERL5=	build
 
 MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS}
 
-MAN1=		zebedee.1 ftpgw.tcl.1
-
 EXAMPLES=	vncviewer.zbd vncserver.zbd server.key server.id client1.key \
 		client2.key clients.id
 DOCS=		README.txt LICENCE.txt CHANGES.txt zebedee.html ftpgw.tcl.html
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's| gcc| ${CC}|' \
 		${BUILD_WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/zebedee ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/ftpgw.tcl ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/zebedee.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${PREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/server.zbd ${PREFIX}/etc/server.zbd.sample
-	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/zebedee ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/ftpgw.tcl ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/zebedee.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/server.zbd ${STAGEDIR}${PREFIX}/etc/server.zbd.sample
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for e in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${e} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/${e} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 

Modified: head/security/zebedee/pkg-plist
==============================================================================
--- head/security/zebedee/pkg-plist	Tue Nov 19 12:52:28 2013	(r334308)
+++ head/security/zebedee/pkg-plist	Tue Nov 19 12:56:31 2013	(r334309)
@@ -1,6 +1,8 @@
 bin/ftpgw.tcl
 bin/zebedee
 etc/server.zbd.sample
+man/man1/ftpgw.tcl.1.gz
+man/man1/zebedee.1.gz
 %%EXAMPLESDIR%%/client1.key
 %%EXAMPLESDIR%%/client2.key
 %%EXAMPLESDIR%%/clients.id