From owner-svn-ports-all@freebsd.org Fri Oct 9 20:20:02 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32D1F9D2C94; Fri, 9 Oct 2015 20:20:02 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D4F8914CC; Fri, 9 Oct 2015 20:20:01 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t99KK0Vi091389; Fri, 9 Oct 2015 20:20:00 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t99KK0Yk091387; Fri, 9 Oct 2015 20:20:00 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510092020.t99KK0Yk091387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 9 Oct 2015 20:20:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398955 - head/net/miredo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Oct 2015 20:20:02 -0000 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 - -.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 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 -@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