From owner-svn-ports-head@FreeBSD.ORG Tue Oct 22 20:57:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 44BE135A; Tue, 22 Oct 2013 20:57:19 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 17F8827EF; Tue, 22 Oct 2013 20:57:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9MKvIC8042946; Tue, 22 Oct 2013 20:57:18 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9MKvIiv042944; Tue, 22 Oct 2013 20:57:18 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201310222057.r9MKvIiv042944@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 22 Oct 2013 20:57:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331321 - head/net/ndisc6 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Oct 2013 20:57:19 -0000 Author: tijl Date: Tue Oct 22 20:57:18 2013 New Revision: 331321 URL: http://svnweb.freebsd.org/changeset/ports/331321 Log: - Fix FreeBSD 10 build. It uses an extension that clang does not support. - Support staging. PR: ports/182752 Submitted by: Mikhail Tsatsenko (maintainer) Modified: head/net/ndisc6/Makefile head/net/ndisc6/pkg-plist Modified: head/net/ndisc6/Makefile ============================================================================== --- head/net/ndisc6/Makefile Tue Oct 22 20:48:13 2013 (r331320) +++ head/net/ndisc6/Makefile Tue Oct 22 20:57:18 2013 (r331321) @@ -14,10 +14,15 @@ COMMENT= IPv6 network diagnostic tools LICENSE= GPLv2 USE_BZIP2= yes +USE_GCC= any GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-suid-install -NO_STAGE= yes +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -I${LOCALBASE}/include + +OPTIONS_DEFINE= DOCS NLS + .include .if ${OSVERSION} >= 803000 @@ -26,27 +31,21 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- .if ${PORT_OPTIONS:MNLS} USES+= gettext +LDFLAGS+= -lintl +PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif -MAN1= addr2name.1 dnssort.1 tcpspray.1 -MAN8= ndisc6.8 rdisc6.8 rdnssd.8 rltraceroute6.8 -MLINKS= rltraceroute6.8 tcptraceroute6.8 \ - rltraceroute6.8 tracert6.8 \ - addr2name.1 name2addr.1 \ - tcpspray.1 tcpspray6.1 - USE_RC_SUBR= rdnssd PORTDOCS= AUTHORS NEWS README post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in ${PORTDOCS} - ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/net/ndisc6/pkg-plist ============================================================================== --- head/net/ndisc6/pkg-plist Tue Oct 22 20:48:13 2013 (r331320) +++ head/net/ndisc6/pkg-plist Tue Oct 22 20:57:18 2013 (r331321) @@ -10,4 +10,19 @@ sbin/rdnssd sbin/tcptraceroute6 sbin/rltraceroute6 sbin/tracert6 +%%PORTDOCS%%man/man1/addr2name.1.gz +%%PORTDOCS%%man/man1/dnssort.1.gz +%%PORTDOCS%%man/man1/name2addr.1.gz +%%PORTDOCS%%man/man1/tcpspray.1.gz +%%PORTDOCS%%man/man1/tcpspray6.1.gz +%%PORTDOCS%%man/man8/ndisc6.8.gz +%%PORTDOCS%%man/man8/rdisc6.8.gz +%%PORTDOCS%%man/man8/rdnssd.8.gz +%%PORTDOCS%%man/man8/rltraceroute6.8.gz +%%PORTDOCS%%man/man8/tcptraceroute6.8.gz +%%PORTDOCS%%man/man8/tracert6.8.gz +%%NLS%%share/locale/cs/LC_MESSAGES/ndisc6.mo +%%NLS%%share/locale/de/LC_MESSAGES/ndisc6.mo +%%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo +%%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo @dirrm etc/rdnssd