svn commit: r362414 - head/net/gogoc

[Rene Ladan]

Author: rene
Date: Mon Jul 21 10:05:50 2014
New Revision: 362414
URL: http://svnweb.freebsd.org/changeset/ports/362414
QAT: https://qat.redports.org/buildarchive/r362414/

Log:
  - Stage support
  - Install a proper configuaration file
  - Strip binaries
  - Mark jobs-unsafe
  - Fix WWW line in pkg-descr
  - Fix pkg-plist
  - Bump PORTREVISION
  
  PR:		191958
  Submitted by:	Carlos Jacobo Puga Media <cjpugmed at gmail.com>
  Approved by:	portmgr (infrastructure blanket)

Modified:
  head/net/gogoc/Makefile
  head/net/gogoc/pkg-descr
  head/net/gogoc/pkg-plist

Modified: head/net/gogoc/Makefile
==============================================================================
--- head/net/gogoc/Makefile	Mon Jul 21 09:15:07 2014	(r362413)
+++ head/net/gogoc/Makefile	Mon Jul 21 10:05:50 2014	(r362414)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gogoc
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://gogo6.com/downloads/
 DISTNAME=	gogoc-1_2-RELEASE
@@ -14,34 +15,35 @@ USES=		gmake
 USE_RC_SUBR=	gogoc
 USE_OPENSSL=	yes
 
-MAKE_JOBS_UNSAFE=	yes
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-MAN5=		gogoc.conf.5
-MAN8=		gogoc.8
+MAKE_JOBS_UNSAFE=	yes
 
-PORTDOCS=	README CLIENT-LICENSE.TXT GUI-LICENSE.TXT
+PORTDOCS=	CLIENT-LICENSE.TXT GUI-LICENSE.TXT INSTALL README
 
 SUB_FILES=	gogoc
 SUB_LIST=	LOCALBASE=${LOCALBASE}
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 do-install:
-	cd ${WRKSRC}/gogoc-tsp/ && \
-	    ${MAKE_CMD} platform=freebsd installdir=${PREFIX} install
-	${RM} ${PREFIX}/bin/gogoc.conf*
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${EXAMPLESDIR}
-.endif
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/gogoc-tsp/ && ${SETENV} ${MAKE_ENV} DESTDIR=${STAGEDIR} \
+	    ${MAKE_CMD} platform=freebsd installdir=${STAGEDIR}${PREFIX} install
+	${RM} ${STAGEDIR}${PREFIX}/bin/gogoc.conf*
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gogoc
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${STAGEDIR}${EXAMPLESDIR}
+	@${REINPLACE_CMD} -e \
+	    's|gogoc_dir=${STAGEDIR}${PREFIX}|gogoc_dir=${PREFIX}|g' \
+	    ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample
+	@${RM} ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample.bak # pass stage-qa
+	${INSTALL_DATA} ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample \
+	    ${STAGEDIR}${PREFIX}/etc/gogoc.conf
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-
-	@if [ ! -f ${PREFIX}/etc/gogoc.conf ]; then \
-		${TOUCH} ${PREFIX}/etc/gogoc.conf ; \
-	fi
 
 .include <bsd.port.mk>

Modified: head/net/gogoc/pkg-descr
==============================================================================
--- head/net/gogoc/pkg-descr	Mon Jul 21 09:15:07 2014	(r362413)
+++ head/net/gogoc/pkg-descr	Mon Jul 21 10:05:50 2014	(r362414)
@@ -6,4 +6,4 @@ incremental deployment of IPv6. Freenet6
 from anywhere, including from behind any NAT device or from outside of their
 home network.
 
-WWW: http://gogonet.gogo6.com/page/freenet6-services
+WWW: http://www.gogo6.com/freenet6

Modified: head/net/gogoc/pkg-plist
==============================================================================
--- head/net/gogoc/pkg-plist	Mon Jul 21 09:15:07 2014	(r362413)
+++ head/net/gogoc/pkg-plist	Mon Jul 21 10:05:50 2014	(r362414)
@@ -1,7 +1,9 @@
 bin/gogoc
-%%ETCDIR%%.conf
+etc/gogoc.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gogoc.conf.sample
+man/man5/gogoc.conf.5.gz
+man/man8/gogoc.8.gz
 template/README
 template/freebsd.sh
- at dirrm template
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+ at dirrmtry template