Bug 182752 - [patch update] net/ndisc6 compile fix for 10-ALPHA4, add stage support
Summary: [patch update] net/ndisc6 compile fix for 10-ALPHA4, add stage support
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Tijl Coosemans
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-06 17:20 UTC by Kurt Jaeger
Modified: 2013-10-22 22:00 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (918 bytes, patch)
2013-10-06 17:20 UTC, Kurt Jaeger
no flags Details | Diff
ndisc6.txt (2.04 KB, text/plain; charset=US-ASCII)
2013-10-15 18:00 UTC, m.tsatsenko
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Kurt Jaeger 2013-10-06 17:20:01 UTC
	On fbsd 10 alpha 4, ndisc6 fails to compile

How-To-Repeat: 	-
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-06 17:20:09 UTC
Maintainer of net/ndisc6,

Please note that PR ports/182752 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/182752

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-06 17:20:10 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Kurt Jaeger 2013-10-06 17:30:35 UTC
Hi!

The patch was not complete, below follows a more complete patch:

------------

diff -r -u -N net/ndisc6/Makefile /usr/home/pi/myp/net/ndisc6/Makefile
--- net/ndisc6/Makefile	2013-10-01 21:13:24.000000000 +0200
+++ /usr/home/pi/myp/net/ndisc6/Makefile	2013-10-06 18:26:20.000000000 +0200
@@ -16,26 +16,16 @@
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-suid-install
+USE_GCC=	any
+LDFLAGS+=	-lintl
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${OSVERSION} >= 803000
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-rdnssd-rdnssd.h
 .endif
 
-.if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
-.else
-CONFIGURE_ARGS+=--disable-nls
-.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
 
@@ -43,9 +33,9 @@
 
 post-install:
 .if	${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}/${DOCSDIR}
 .endfor
 .endif
 
diff -r -u -N net/ndisc6/pkg-plist /usr/home/pi/myp/net/ndisc6/pkg-plist
--- net/ndisc6/pkg-plist	2013-10-01 21:13:24.000000000 +0200
+++ /usr/home/pi/myp/net/ndisc6/pkg-plist	2013-10-06 18:27:18.000000000 +0200
@@ -10,4 +10,22 @@
 sbin/tcptraceroute6
 sbin/rltraceroute6
 sbin/tracert6
+man/man1/addr2name.1.gz
+man/man1/dnssort.1.gz
+man/man1/name2addr.1.gz
+man/man1/tcpspray.1.gz
+man/man1/tcpspray6.1.gz
+man/man8/ndisc6.8.gz
+man/man8/rdisc6.8.gz
+man/man8/rdnssd.8.gz
+man/man8/rltraceroute6.8.gz
+man/man8/tcptraceroute6.8.gz
+man/man8/tracert6.8.gz
+share/locale/cs/LC_MESSAGES/ndisc6.mo
+share/locale/de/LC_MESSAGES/ndisc6.mo
+share/locale/en/LC_MESSAGES/ndisc6.mo
+share/locale/fr/LC_MESSAGES/ndisc6.mo
 @dirrm etc/rdnssd
+@dirrmtry var/run/rdnssd
+@dirrmtry var/run
+@dirrmtry var

--------------

-- 
pi@opsec.eu            +49 171 3101372                         7 years to go !
Comment 4 m.tsatsenko 2013-10-12 12:46:48 UTC
To submitter: what is the reason for making using gettext unconditional?


-- 
Mikhail
Comment 5 Kurt Jaeger 2013-10-12 12:51:46 UTC
Hi!

> To submitter: what is the reason for making using gettext unconditional?

To make it compile and run ? I'm not religous about which lib is linked or
not, but it should compile and run 8-}

-- 
pi@opsec.eu            +49 171 3101372                         7 years to go !
Comment 6 Kurt Jaeger 2013-10-19 12:17:39 UTC
Hi!

> Please try the patch attached and see if it works for you
> Build logs:
> https://redports.org/buildarchive/20131014190709-91683/

Patch works, please commit!

-- 
pi@opsec.eu            +49 171 3101372                         7 years to go !
Comment 7 Mark Linimon freebsd_committer freebsd_triage 2013-10-19 18:45:22 UTC
State Changed
From-To: feedback->open

Maintainer approved.
Comment 8 dfilter service freebsd_committer freebsd_triage 2013-10-22 21:57:26 UTC
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@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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 9 Tijl Coosemans freebsd_committer freebsd_triage 2013-10-22 21:57:32 UTC
State Changed
From-To: open->closed

Committed in r331321 with minor modifications. 


Comment 10 Tijl Coosemans freebsd_committer freebsd_triage 2013-10-22 21:57:32 UTC
Responsible Changed
From-To: freebsd-ports-bugs->tijl

Committed in r331321 with minor modifications.