Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Mar 2016 00:41:52 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411248 - head/security/zebedee
Message-ID:  <201603170041.u2H0fqdH083120@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Mar 17 00:41:52 2016
New Revision: 411248
URL: https://svnweb.freebsd.org/changeset/ports/411248

Log:
  - Add LICENSE
  - Switch to options helpers

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

Modified: head/security/zebedee/Makefile
==============================================================================
--- head/security/zebedee/Makefile	Wed Mar 16 21:07:11 2016	(r411247)
+++ head/security/zebedee/Makefile	Thu Mar 17 00:41:52 2016	(r411248)
@@ -9,13 +9,16 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Encrypted, secure compressed TCP tunnel
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/GPL2.txt
+
 USES=		perl5
 USE_OPENSSL=	yes
 USE_PERL5=	build
 
-EXAMPLES=	vncviewer.zbd vncserver.zbd server.key server.id client1.key \
+PORTEXAMPLES=	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
+PORTDOCS=	README.txt CHANGES.txt zebedee.html ftpgw.tcl.html
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -27,16 +30,19 @@ post-patch:
 do-install:
 	${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_MAN} ${WRKSRC}/zebedee.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/server.zbd ${STAGEDIR}${PREFIX}/etc/server.zbd.sample
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for e in ${EXAMPLES}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for e in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${e} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for d in ${DOCS}
+.for d in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 

Modified: head/security/zebedee/pkg-plist
==============================================================================
--- head/security/zebedee/pkg-plist	Wed Mar 16 21:07:11 2016	(r411247)
+++ head/security/zebedee/pkg-plist	Thu Mar 17 00:41:52 2016	(r411248)
@@ -3,15 +3,3 @@ bin/zebedee
 etc/server.zbd.sample
 man/man1/ftpgw.tcl.1.gz
 man/man1/zebedee.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client1.key
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client2.key
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clients.id
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.id
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.key
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncserver.zbd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncviewer.zbd
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html
-%%PORTDOCS%%%%DOCSDIR%%/zebedee.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603170041.u2H0fqdH083120>