svn commit: r331321 - head/net/ndisc6

[Tijl Coosemans]

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 <m.tsatsenko at gmail.com> (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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>

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