Attachment 161311 Details for Bug 203292 – Patch

[patch] Patch

miredo.patch (text/plain), 1.86 KB, created by Dmitry Marakasov on 2015-09-23 19:01:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-09-23 19:01:07 UTC

Size: 1.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 390640)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=		miredo
> PORTVERSION=		1.2.6
>-PORTREVISION=		3
>+PORTREVISION=		4
> CATEGORIES=		net ipv6
> MASTER_SITES=		http://www.remlab.net/files/miredo/archive/
> 
>@@ -18,6 +18,10 @@
> USE_LDCONFIG=		yes
> 
> OPTIONS_DEFINE=	POLICYTABLE NLS
>+OPTIONS_SUB=	yes
>+
>+NLS_USES=		gettext iconv
>+NLS_CONFIGURE_ENABLE=	nls
> POLICYTABLE_DESC=	Install policy table to support teredo
> 
> USE_RC_SUBR=		miredo-server miredo
>@@ -24,24 +28,11 @@
> 
> LDFLAGS+=		-L${LOCALBASE}/lib
> 
>-.include <bsd.port.options.mk>
>+post-install:
>+	${MV} ${STAGEDIR}${ETCDIR}/miredo.conf \
>+		${STAGEDIR}${ETCDIR}/miredo.conf.sample
> 
>-.if ${PORT_OPTIONS:MNLS}
>-USES+=		gettext iconv
>-CONFIGURE_ARGS+=	--enable-nls
>-PLIST_SUB=		NLS=""
>-.else
>-CONFIGURE_ARGS+=	--disable-nls
>-PLIST_SUB=		NLS="@comment "
>-.endif
>+post-install-POLICYTABLE-on:
>+	$(INSTALL_DATA) $(FILESDIR)/ip6addrctl.conf /etc
> 
>-
>-post-install:
>-.if ${PORT_OPTIONS:MPOLICYTABLE}
>-			$(INSTALL_DATA) $(FILESDIR)/ip6addrctl.conf /etc
>-PLIST_SUB+=		POLICYTABLE=""
>-.else
>-PLIST_SUB+=		POLICYTABLE="@comment "
>-.endif
>-
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 390640)
>+++ pkg-plist	(working copy)
>@@ -22,9 +22,8 @@
> include/libteredo/tunnel.h
> include/libtun6/tun6.h
> etc/miredo/client-hook
>-@unexec [ -f %D/etc/miredo/miredo.conf ] && cmp -s %D/etc/miredo/miredo.conf %D/%%EXAMPLESDIR%%/miredo.conf && rm %D/etc/miredo/miredo.conf || true
>+@sample etc/miredo/miredo.conf.sample
> %%EXAMPLESDIR%%/miredo.conf
>-@exec [ -f %D/etc/miredo/miredo.conf ] || cp %B/miredo.conf %D/etc/miredo/miredo.conf
> %%EXAMPLESDIR%%/miredo-server.conf
> %%NLS%%share/locale/en/LC_MESSAGES/miredo.mo
> %%NLS%%share/locale/en_GB/LC_MESSAGES/miredo.mo

Actions: View | Diff

Attachments on bug 203292: 161311