Attachment #143898 for bug #190941

Lines 35-40 patch-libtool: Link Here

(-)Mk/Uses/libtool.mk (+6 lines)
35		35
36	@${FIND} ${WRKDIR} -type f -name ltmain.sh \| \	36	@${FIND} ${WRKDIR} -type f -name ltmain.sh \| \
37	${XARGS} ${REINPLACE_CMD} \	37	${XARGS} ${REINPLACE_CMD} \
		38	-e '/link) libs=/s/ $$dependency_libs//' \
		39	-e '/elif.linkmode.prog.linkmode.lib/,/continue/ { \
		40	/elif/,/fi/ { /elif/ { h; d; }; H; d; }; \
		41	/continue/ { H; g; }; }' \
		42	-e '/if.linkmode.prog.mode.!= relink/s/if.*;/if :;/'\
		43	-e '/if.linkmode.prog.mode. = relink/s/\|\|.*;/;/' \
38	-e 's/\|-p\|-pg\|/\|-B*\|-p\|-pg\|/'	44	-e 's/\|-p\|-pg\|/\|-B*\|-p\|-pg\|/'
39		45
40	.if ! ${libtool_ARGS:Moldver}	46	.if ! ${libtool_ARGS:Moldver}




--- gettext-tools/src/Makefile.in.orig
+++ gettext-tools/src/Makefile.in
@@ -1984,24 +1984,21 @@
 msgmerge_CXXFLAGS = $(AM_CXXFLAGS) $(OPENMP_CFLAGS)
 
 # Link dependencies.
-# INTL_MACOSX_LIBS is needed because the programs depend on libintl.la
-# but libtool doesn't put -Wl,-framework options into .la files.
-# For msginit, it is also needed because of localename.c.
-msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD)
-msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
-msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
-msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgconv_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgen_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
-msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
+msgcmp_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @MSGMERGE_LIBM@ $(WOE32_LDADD)
+msgfmt_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgmerge_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
+msgunfmt_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+xgettext_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
+msgattrib_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgcat_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgcomm_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgconv_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgen_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgexec_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msgfilter_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msggrep_LDADD = $(LIBGREP) libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msginit_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
+msguniq_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
 
 # Specify when to relink the programs.
 msgcmp_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la $(WOE32_LDADD)

Lines 3-9 Link Here

(-)net/libnetdude/Makefile (-2 / +8 lines)
3		3
4	PORTNAME= libnetdude	4	PORTNAME= libnetdude
5	PORTVERSION= 0.12	5	PORTVERSION= 0.12
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= net	7	CATEGORIES= net
8	MASTER_SITES= SF/netdude/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/netdude/${PORTNAME}/${PORTVERSION}
9		9
Lines 14-21 LIB_DEPENDS= libpcapnav.so:${PORTSDIR}/n Link Here
14		14
15	USES= libtool	15	USES= libtool
16	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
		17	CONFIGURE_ARGS= --disable-gtk-doc --disable-static --with-html-dir=${DOCSDIR}
		18	CPPFLAGS+= -I${LOCALBASE}/include
		19	LIBS+= -L${LOCALBASE}/lib
		20	USE_AUTOTOOLS= libltdl
17	USE_GNOME= glib12	21	USE_GNOME= glib12
18	CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
19	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
20	INSTALL_TARGET= install-strip	23	INSTALL_TARGET= install-strip
21		24
Lines 29-33 post-patch: Link Here
29	${WRKSRC}/protocols/fddi/libnd_fddi.h	32	${WRKSRC}/protocols/fddi/libnd_fddi.h
30	@${REINPLACE_CMD} -e 's\|DOC_MODULE = libnetdude\|DOC_MODULE =\|' \	33	@${REINPLACE_CMD} -e 's\|DOC_MODULE = libnetdude\|DOC_MODULE =\|' \
31	${WRKSRC}/docs/Makefile.in	34	${WRKSRC}/docs/Makefile.in
		35	@${FIND} ${WRKSRC} -name Makefile.in \| ${XARGS} ${REINPLACE_CMD} \
		36	-e 's,-I$$(top_srcdir)/libltdl,@INCLTDL@,' \
		37	-e '/LIBADD/s,$$(top_builddir)/libltdl/libltdlc.la,@LIBLTDL@,'
32		38
33	.include <bsd.port.mk>	39	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)net/libnetdude/files/patch-plugins__ChecksumFix__Makefile.in (-11 lines)
1	--- ./plugins/ChecksumFix/Makefile.in.orig 2008-01-27 18:27:24.000000000 -0500
2	+++ ./plugins/ChecksumFix/Makefile.in 2008-01-27 18:27:33.000000000 -0500
3	@@ -79,7 +79,7 @@
4	ETAGS = etags
5	CTAGS = ctags
6	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7	-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
8	+pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins
9	ACLOCAL = @ACLOCAL@
10	AMDEP_FALSE = @AMDEP_FALSE@
11	AMDEP_TRUE = @AMDEP_TRUE@

Line 0 Link Here

(-)net/libnetdude/files/patch-tools-Makefile.in (+11 lines)
	1	--- tools/Makefile.in.orig
	2	+++ tools/Makefile.in
	3	@@ -224,7 +224,7 @@
	4	MAINTAINERCLEANFILES = Makefile.in Makefile lndtool.c
	5	INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG
	6	lndtool_SOURCES = lndtool.c
	7	-lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude
	8	+lndtool_LDADD = $(top_builddir)/src/libnetdude.la @pcapnav_libs@
	9	lndtool_LDFLAGS = -export-dynamic
	10	all: all-am
	11




include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcp.h
include/libnetdude/%%PORTVERSION%%/protocols/udp/libnd_udp.h
include/libnetdude/%%PORTVERSION%%/protocols/vlan/libnd_vlan.h
lib/libnetdude.a
lib/libnetdude.so
lib/libnetdude.so.0
lib/libnetdude.so.0.0.0
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.a
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.so
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.a
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.so
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.a
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.so
@dirrm %%DATADIR%%/%%PORTVERSION%%/protocols
@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins

Return to bug 190941

Line 0 Link Here

(-)devel/gettext/files/patch-gettext-tools_src_Makefile.in (+42 lines)
	1	--- gettext-tools/src/Makefile.in.orig
	2	+++ gettext-tools/src/Makefile.in
	3	@@ -1984,24 +1984,21 @@
	4	msgmerge_CXXFLAGS = $(AM_CXXFLAGS) $(OPENMP_CFLAGS)
	5
	6	# Link dependencies.
	7	-# INTL_MACOSX_LIBS is needed because the programs depend on libintl.la
	8	-# but libtool doesn't put -Wl,-framework options into .la files.
	9	-# For msginit, it is also needed because of localename.c.
	10	-msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD)
	11	-msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	12	-msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
	13	-msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	14	-xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
	15	-msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	16	-msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	17	-msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	18	-msgconv_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	19	-msgen_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	20	-msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	21	-msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	22	-msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	23	-msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	24	-msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
	25	+msgcmp_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @MSGMERGE_LIBM@ $(WOE32_LDADD)
	26	+msgfmt_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	27	+msgmerge_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
	28	+msgunfmt_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	29	+xgettext_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
	30	+msgattrib_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	31	+msgcat_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	32	+msgcomm_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	33	+msgconv_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	34	+msgen_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	35	+msgexec_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	36	+msgfilter_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	37	+msggrep_LDADD = $(LIBGREP) libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	38	+msginit_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	39	+msguniq_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
	40
	41	# Specify when to relink the programs.
	42	msgcmp_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la $(WOE32_LDADD)

Lines 38-72 include/libnetdude/%%PORTVERSION%%/proto Link Here

(-)net/libnetdude/pkg-plist (-14 lines)
38	include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcp.h	38	include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcp.h
39	include/libnetdude/%%PORTVERSION%%/protocols/udp/libnd_udp.h	39	include/libnetdude/%%PORTVERSION%%/protocols/udp/libnd_udp.h
40	include/libnetdude/%%PORTVERSION%%/protocols/vlan/libnd_vlan.h	40	include/libnetdude/%%PORTVERSION%%/protocols/vlan/libnd_vlan.h
41	lib/libnetdude.a
42	lib/libnetdude.so	41	lib/libnetdude.so
43	lib/libnetdude.so.0	42	lib/libnetdude.so.0
44	lib/libnetdude.so.0.0.0	43	lib/libnetdude.so.0.0.0
45	%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.a
46	%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.so	44	%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.so
47	%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.a
48	%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.so	45	%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.so
49	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.a
50	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.so	46	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.so
51	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.a
52	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.so	47	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.so
53	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.a
54	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.so	48	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.so
55	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.a
56	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.so	49	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.so
57	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.a
58	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.so	50	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.so
59	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.a
60	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.so	51	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.so
61	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.a
62	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.so	52	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.so
63	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.a
64	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.so	53	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.so
65	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.a
66	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.so	54	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.so
67	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.a
68	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.so	55	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.so
69	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.a
70	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.so	56	%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.so
71	@dirrm %%DATADIR%%/%%PORTVERSION%%/protocols	57	@dirrm %%DATADIR%%/%%PORTVERSION%%/protocols
72	@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins	58	@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins