Attachment 144785 Details for Bug 191958 – gogoc.diff

[patch] gogoc.diff

gogoc.diff (text/plain), 2.87 KB, created by Carlos J Puga Medina on 2014-07-18 20:14:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-07-18 20:14:49 UTC

Size: 2.87 KB

patch

obsolete

>diff -urN /usr/ports/net/gogoc.old/Makefile /usr/ports/net/gogoc/Makefile
>--- /usr/ports/net/gogoc.old/Makefile	2014-06-25 07:35:31.000000000 +0200
>+++ /usr/ports/net/gogoc/Makefile	2014-07-18 20:23:06.000000000 +0200
>@@ -14,34 +14,40 @@
> 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}
>+	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
>+.if ${PORT_OPTIONS:MEXAMPLES}
>+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/gogoc-tsp/bin/gogoc.conf.sample ${STAGEDIR}${EXAMPLESDIR}
> .endif
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>+.if ${PORT_OPTIONS:MDOCS}
>+	${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 ; \
>+	@${REINPLACE_CMD} -e \
>+	's|gogoc_dir=/usr/ports/net/gogoc/work/stage/usr/local|gogoc_dir=/usr/local|g' \
>+	${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample
>+	
>+	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/gogoc.conf ]; then \
>+		${CP} -p ${STAGEDIR}${EXAMPLESDIR}/gogoc.conf.sample ${STAGEDIR}${PREFIX}/etc/gogoc.conf ; \
> 	fi
> 
> .include <bsd.port.mk>
>
>diff -urN /usr/ports/net/gogoc.old/pkg-descr /usr/ports/net/gogoc/pkg-descr
>--- /usr/ports/net/gogoc.old/pkg-descr	2014-01-22 16:44:51.000000000 +0100
>+++ /usr/ports/net/gogoc/pkg-descr	2014-07-18 20:18:12.000000000 +0200
>@@ -6,4 +6,4 @@
> 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/
>diff -urN /usr/ports/net/gogoc.old/pkg-plist /usr/ports/net/gogoc/pkg-plist
>--- /usr/ports/net/gogoc.old/pkg-plist	2014-01-22 16:16:56.000000000 +0100
>+++ /usr/ports/net/gogoc/pkg-plist	2014-07-18 20:20:30.000000000 +0200
>@@ -1,7 +1,9 @@
> bin/gogoc
> %%ETCDIR%%.conf
>+man/man5/gogoc.conf.5.gz
>+man/man8/gogoc.8.gz
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gogoc.conf.sample
> template/README
> template/freebsd.sh
>-@dirrm template
>-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
>+@dirrmtry template

Actions: View | Diff

Attachments on bug 191958: 144782 | 144785 | 144802