diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-09 20:20:00 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-10-09 20:20:00 +0000 |
| commit | a070efd14956e97003e5b452501e01b4d2fba7ef (patch) | |
| tree | ad5d5b0468f0bb90f1598784b3468eb38dd6f63f /net/miredo | |
| parent | 9fc5b3a7792d67e6e332bffbbd5ee7c988278230 (diff) | |
| download | ports-a070efd14956e97003e5b452501e01b4d2fba7ef.tar.gz ports-a070efd14956e97003e5b452501e01b4d2fba7ef.zip | |
- 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)
Notes
Notes:
svn path=/head/; revision=398955
Diffstat (limited to 'net/miredo')
| -rw-r--r-- | net/miredo/Makefile | 31 | ||||
| -rw-r--r-- | net/miredo/pkg-plist | 4 |
2 files changed, 9 insertions, 26 deletions
diff --git a/net/miredo/Makefile b/net/miredo/Makefile index a0ffef5be5d2..7ddf51710512 100644 --- a/net/miredo/Makefile +++ b/net/miredo/Makefile @@ -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 tunneling) implementation 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> diff --git a/net/miredo/pkg-plist b/net/miredo/pkg-plist index d20d4f6e50f1..6b9766b63171 100644 --- a/net/miredo/pkg-plist +++ b/net/miredo/pkg-plist @@ -22,9 +22,7 @@ include/libteredo/teredo-udp.h 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 -%%EXAMPLESDIR%%/miredo.conf -@exec [ -f %D/etc/miredo/miredo.conf ] || cp %B/miredo.conf %D/etc/miredo/miredo.conf +@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 |