svn commit: r398955 - head/net/miredo

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Oct  9 20:20:00 2015
New Revision: 398955
URL: https://svnweb.freebsd.org/changeset/ports/398955

Log:
  - Switch to @sample, fixing stage-qa
  - Use options helpers
  - Add USES=localbase, which is just the shorder way of adding CPPFLAGS=-I${LOCALBASE}/include, which fixes judy detection without NLS
  
  PR:		203292
  Submitted by:	amdmi3
  Approved by:	maintainer timeout (sumikawa, 2 weeks)

Modified:
  head/net/miredo/Makefile
  head/net/miredo/pkg-plist

Modified: head/net/miredo/Makefile
==============================================================================
--- head/net/miredo/Makefile	Fri Oct  9 20:02:04 2015	(r398954)
+++ head/net/miredo/Makefile	Fri Oct  9 20:20:00 2015	(r398955)
@@ -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/
 
@@ -12,36 +12,21 @@ COMMENT=		Opensource Teredo (IPv6 tunnel
 
 LIB_DEPENDS=		libJudy.so:${PORTSDIR}/devel/judy
 
-USES=			libtool tar:xz
+USES=			libtool localbase tar:xz
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--localstatedir=/var --enable-examplesdir=$(EXAMPLESDIR)
 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
 
-LDFLAGS+=		-L${LOCALBASE}/lib
-
-.include <bsd.port.options.mk>
-
-.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:
-.if ${PORT_OPTIONS:MPOLICYTABLE}
-			$(INSTALL_DATA) $(FILESDIR)/ip6addrctl.conf /etc
-PLIST_SUB+=		POLICYTABLE=""
-.else
-PLIST_SUB+=		POLICYTABLE="@comment "
-.endif
+post-install-POLICYTABLE-on:
+	$(INSTALL_DATA) $(FILESDIR)/ip6addrctl.conf /etc
 
 .include <bsd.port.mk>

Modified: head/net/miredo/pkg-plist
==============================================================================
--- head/net/miredo/pkg-plist	Fri Oct  9 20:02:04 2015	(r398954)
+++ head/net/miredo/pkg-plist	Fri Oct  9 20:20:00 2015	(r398955)
@@ -22,9 +22,7 @@ include/libteredo/teredo-udp.h
 include/libteredo/tunnel.h
 include/libtun6/tun6.h
 etc/miredo/client-hook
- at 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
-%%EXAMPLESDIR%%/miredo.conf
- at exec [ -f %D/etc/miredo/miredo.conf ] || cp %B/miredo.conf %D/etc/miredo/miredo.conf
+ at sample %%EXAMPLESDIR%%/miredo.conf 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