Add 4 new sed commands to USES=libtool. The first two apply some of the

changes that Debian made to their libtool. The first command applies to libtool versions 1.4 and up. The second command is somewhat more elaborate but essentially it uses the sed hold space to move an "elif...fi" block down. It applies to 2.x. Together these reduce overlinking to unpatched .la files (from ports that don't have USES=libtool yet but also .la files in the work directory). The third and fourth command fix relinking. During staging libtool may relink libA when it links to another library in the work directory libB. The reason is that libA created during build phase has its runpath set to the location of libB in the work directory. This allows running an executable that links to libA from within the work directory. The relink removes this extra runpath. When libtool relinks libA it replaces "libB.la" on the linker command line with "-L${STAGEDIR}${PREFIX}/lib -lB" with the intention to link to libB in the stage directory but this -L flag isn't necessarily the first so another libB may be linked instead. The two sed commands make relink the same as a normal link. This means libtool will relink with libraries from the work directory using a path similar to "../srcB/.libs/libB.so" without -L flags. This applies to libtool 1.4 and up. Earlier versions don't seem to relink libraries. (This fixes ports like devel/apr1 so they link with freshly built libraries instead of installed libraries.) Fix all ports with missing libraries. Additionally: archivers/rpm4: USES=patchfix. databases/gdbm: INSTALL_TARGET=install-strip. devel/gnome-vfs: remove patch that doesn't change anything. devel/ois: INSTALL_TARGET=install-strip and use standard USE_AUTOTOOLS. devel/zziplib: INSTALL_TARGET=install-strip, MAKE_CMD. multimedia/mjpegtools: remove USE_AUTOTOOLS, use modern compiler on i386 instead of disabling optimisations. net/libnetdude: disable static plugins. PR: 190941 Exp-run: antoine Approved by: portmgr (antoine)
svn path=/head/; revision=358784
2024-11-21 00:25:50 +00:00 · 2014-06-22 10:44:29 +00:00 · 2014-06-22 10:44:29 +00:00 · 3e4a806167 · 2021-03-31 03:12:20 +00:00
commit 3e4a806167
parent d9b2d0f0da
37 changed files with 292 additions and 112 deletions
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@ -35,6 +35,12 @@ patch-libtool:

 	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
 		${XARGS} ${REINPLACE_CMD}				\
+		-e '/link) libs=/s/ $$dependency_libs//'		\
+		-e '/elif.*linkmode.*prog.*linkmode.*lib/,/continue/ {	\
+		    /elif/,/fi/ { /elif/ { h; d; }; H; d; };		\
+		    /continue/ { H; g; }; }'				\
+		-e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\
+		-e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/'	\
 		-e 's/|-p|-pg|/|-B*|-p|-pg|/'

 .if ! ${libtool_ARGS:Moldver}
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@ -25,7 +25,7 @@ NLS_CONFIGURE_ENABLE=nls
 NLS_USES=	gettext
 PORTDOCS=	*

-USES=		gmake shebangfix lua:51 libtool tar:bzip2
+USES=		gmake libtool lua:51 pathfix shebangfix tar:bzip2
 USE_BDB=	46+
 INVALID_BDB_VER=51
 GNU_CONFIGURE=	yes
@ -57,7 +57,8 @@ CONFIGURE_ENV+=	LUA_CFLAGS=-I${LUA_INCDIR} \
 PLIST_SUB+=	VERSION=${PORTVERSION}

 post-patch:
-	${REINPLACE_CMD} -e '/^pkgconfigdir/s:/:data/:' \
+	${REINPLACE_CMD} \
+		-e '/_LDADD =/s/=/= @LTLIBINTL@/' \
 		-e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/misc/fts.?
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -68,5 +68,23 @@ post-patch:
 		s|-Wl,--no-undefined||g ; \
 		s|-Wmissing-include-dirs||g' \
 			${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^e_addressbook_factory_LDADD =/ \
+		s/=/= -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 $$(INTLLIBS)/' \
+		${WRKSRC}/addressbook/libedata-book/Makefile.in
+	@${REINPLACE_CMD} '/^test_interval_searches_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/calendar/backends/file/Makefile.in
+	@${REINPLACE_CMD} -e '/^test_e_sexp_LDADD =/s/=/= -lical/' \
+		-e '/^test_intervaltree_LDADD =/s/=/= -lical/' \
+		-e '/^e_calendar_factory_LDADD =/s|=|= ../libecal/libecal-1.2.la -lical|' \
+		${WRKSRC}/calendar/libedata-cal/Makefile.in
+	@${REINPLACE_CMD} '/^camel_index_control_1_2_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/camel/Makefile.in
+	@${REINPLACE_CMD} '/^test_imapx_LDADD =/s/=/= -lgobject-2.0 -lgthread-2.0/' \
+		${WRKSRC}/camel/providers/imapx/Makefile.in
+	@${REINPLACE_CMD} -e '/^test_contact_store_LDADD =/s|$$| ../addressbook/libebook/libebook-1.2.la|' \
+		-e '/^test_name_selector_LDADD =/s|$$| ../camel/libcamel-1.2.la -lgthread-2.0|' \
+		${WRKSRC}/libedataserverui/Makefile.in
+	@${REINPLACE_CMD} '/^soap_test_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/servers/groupwise/Makefile.in

 .include <bsd.port.mk>
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@ -13,6 +13,7 @@ COMMENT=	GNU database manager
 LICENSE=	GPLv3

 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 USES=		gmake libtool:keepla

@ -32,8 +33,7 @@ post-patch:
 		-e "s|BINOWN = bin|BINOWN = root|" -e "s|BINGRP = bin|BINGRP = wheel|" \
 		-e "s|libgdbm.la libgdbm_compat.la|libgdbm.la libgdbm_compat.la gdbm.info|" \
 			${WRKSRC}/Makefile.in
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdbm*.so
+	@${REINPLACE_CMD} '/_LDADD =/s/$$/ @LTLIBINTL@/' \
+		${WRKSRC}/src/Makefile.in

 .include <bsd.port.mk>
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@ -93,6 +93,15 @@ PLIST_SUB+=	DEVHELP=""

 post-patch:
 	@${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
+	@${REINPLACE_CMD} '/^test_LDADD =/ \
+		s/=/= -lgtk-x11-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 $$(INTLLIBS)/' \
+		${WRKSRC}/plugins/gbf-am/Makefile.in
+	@${REINPLACE_CMD} '/^gdbmi_test_LDADD =/s/$$/ -lgtk-x11-2.0 -lglib-2.0/' \
+		${WRKSRC}/plugins/gdb/Makefile.in
+	@${REINPLACE_CMD} -e '/^anjuta_LDADD =/s/=/= $$(ANJUTA_LIBS)/' \
+		-e '/^anjuta_shell_LDADD =/ \
+		s/=/= -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 $$(INTLLIBS)/' \
+		${WRKSRC}/src/Makefile.in

 post-configure:
 	@${REINPLACE_CMD} -e 's|"make|"gmake|g' \
--- a/devel/gettext/files/patch-gettext-tools_src_Makefile.in
+++ b/devel/gettext/files/patch-gettext-tools_src_Makefile.in
@ -0,0 +1,42 @@
+--- 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)
--- a/devel/gitg0/Makefile
+++ b/devel/gitg0/Makefile
@ -35,4 +35,8 @@ NLS_CONFIGURE_ENABLE=nls
 NLS_CPPFLAGS=	-I${LOCALBASE}/include
 NLS_LDFLAGS=	-L${LOCALBASE}/lib

+post-patch:
+	@${REINPLACE_CMD} '/shell_LDADD =/s/$$/ -lgio-2.0 -lgobject-2.0 -lglib-2.0/' \
+		${WRKSRC}/tests/Makefile.in ${WRKSRC}/tools/Makefile.in
+
 .include <bsd.port.mk>
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@ -88,6 +88,8 @@ post-patch:
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/*/Makefile.in
+	@${REINPLACE_CMD} '/^gnomevfs_info_LDADD =/s/$$/ -lgobject-2.0/' \
+		${WRKSRC}/programs/Makefile.in
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
 	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@ -1,11 +0,0 @@
--- modules/Makefile.in.orig	Mon Oct  3 11:55:14 2005
-+++ modules/Makefile.in	Mon Oct  3 11:55:55 2005
-@@ -465,7 +465,7 @@
- @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
- @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
- @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
-module_flags = -export_dynamic -avoid-version -module -no-undefined
-+module_flags = -export_dynamic -avoid-version -module -no-undefined
- modulesdir = $(libdir)/gnome-vfs-2.0/modules
- modules_LTLIBRARIES = \
- 	$(CDDA_LTLIBS)				\
--- a/devel/libbonobo/files/patch-samples-echo-Makefile.in
+++ b/devel/libbonobo/files/patch-samples-echo-Makefile.in
@ -0,0 +1,10 @@
+--- samples/echo/Makefile.in.orig
+++ samples/echo/Makefile.in
+@@ -321,6 +321,7 @@
+ bonobo_echo_2_LDADD = \
+ 	libEcho.a				\
+ 	$(top_builddir)/bonobo/libbonobo-2.la	\
+	$(top_builddir)/bonobo-activation/libbonobo-activation.la	\
+ 	$(LIBBONOBO_LIBS)			\
+ 	$(INTLLIBS)
+ 
--- a/devel/libgii/Makefile
+++ b/devel/libgii/Makefile
@ -51,6 +51,10 @@ CONFIGURE_ARGS+=--disable-vgl
 PLIST_SUB+=	VGL="@comment "
 .endif

+post-patch:
+	@${REINPLACE_CMD} '/^LDADD =/s,$$, $$(top_builddir)/gg/libgg.la,' \
+		${WRKSRC}/regress/gii/Makefile.in
+
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf.sample
 	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse.sample
--- a/devel/ois/Makefile
+++ b/devel/ois/Makefile
@ -12,8 +12,11 @@ MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Object Oriented Input System

 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
 USES=		pathfix gmake libtool
-USE_AUTOTOOLS=	aclocal:env autoheader:env automake:env autoconf:env libtoolize:env
+PATHFIX_MAKEFILEIN=	Makefile.am
+USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
+AUTOMAKE_ARGS=	--add-missing --copy --foreign
 USE_XORG=	x11 xaw
 USE_LDCONFIG=	yes

@ -23,13 +26,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 WRKSRC=		${WRKDIR}/${PORTNAME}

 post-patch:
-	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.am
-
-pre-configure:
-	@cd ${WRKSRC} && ./bootstrap
-
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libOIS.so
+	@${REINPLACE_CMD} '/_LDADD =/s/$$/ -lX11/' ${WRKSRC}/demos/Makefile.am

 .include <bsd.port.mk>
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@ -20,6 +20,7 @@ USE_PYTHON_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip

 PORTSCOUT=	limit:^0\.

@ -29,19 +30,8 @@ OPTIONS_SUB=	yes
 SDL_USE=		SDL=sdl
 SDL_CONFIGURE_ENABLE=	sdl

-.include <bsd.port.pre.mk>
-
-test check:
-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+regression-test:
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} check)

-.if !defined(WITHOUT_TESTS)
-post-build::	test
-.endif
-
-post-install:
-.for lib in zzip zzipmmapped zzipfseeko zzipwrap
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so
-.endfor
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/zziplib/files/patch-configure
+++ b/devel/zziplib/files/patch-configure
@ -1,14 +1,5 @@
 --- configure.orig	2012-03-11 23:21:53.000000000 +0900
 +++ configure	2012-03-12 17:46:25.000000000 +0900
-@@ -2608,7 +2608,7 @@
-   else
-     test ".$ax_enable_builddir" = "."  && ax_enable_builddir="."
-     test ".$ax_enable_builddir" = ".no"  && ax_enable_builddir="."
-    test ".$BUILD" = "." && BUILD=`uname -msr | tr " /" "__"`.d
-+    test ".$BUILD" = "." && BUILD=./build
-     test ".$ax_enable_builddir" = ".yes" && ax_enable_builddir="$BUILD"
-     if test ".$ax_enable_builddir" != ".." ; then    # we know where to go and
-       as_dir=$ax_enable_builddir; as_fn_mkdir_p
@@ -11452,7 +11452,7 @@
   if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi
   if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi
@ -18,7 +9,7 @@
   VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
-@@ -13733,7 +13733,7 @@
+@@ -13733,12 +13733,12 @@
 ;; *)
     if test ".$can_build_shared" != ".no" ; then
       ZZIPLIB_LDFLAGS="-export-dynamic"
@ -27,12 +18,9 @@
          ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
          # TODO: that is for backward compatibility only
       fi
-@@ -16590,7 +16590,7 @@
- _EOF
-     test ".$USE_MAINTAINER_MODE" = ".no" || \
-   	cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~"            ## DEBUGGING
-    echo 'BUILD=`uname -msr | tr " /" "__"`.d' >$ac_top_srcdir/Makefile
-+    echo 'BUILD=./build' >$ac_top_srcdir/Makefile
-     echo 'ISNOTSRCDIR=test ! -f configure' >>$ac_top_srcdir/Makefile
-     $ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >>$ac_top_srcdir/Makefile
-     echo 'done: ;@ if grep "$(RULE)-done .*:" Makefile > /dev/null; then     echo $(MAKE) $(RULE)-done ; $(MAKE) $(RULE)-done ; else true ; fi'     >> $ac_top_srcdir/Makefile
+     fi
+-    RESOLVES=" # "
+    RESOLVES=' '
+ ;; esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5
+ $as_echo "$ZZIPLIB_LDFLAGS $RESOLVES" >&6; }
--- a/graphics/devil/Makefile
+++ b/graphics/devil/Makefile
@ -93,6 +93,8 @@ CONFIGURE_ARGS+=--disable-altivec --disable-sse --disable-sse2 --disable-sse3

 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/^ilur_LDADD =/s|$$| $$(il_library)|' \
+		${WRKSRC}/bin/Makefile.am
 	@${REINPLACE_CMD} -e '/^pkgdir=/s|$$(libdir)/|$$(prefix)/libdata/|g' \
 		${WRKSRC}/data/Makefile.am
 	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@ -34,6 +34,8 @@ post-patch:
 		'/^install-data-am:/s|install-info-am|| ; \
 		 /install-man/s|install-nobase_infoimgDATA||' \
 		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} '/^gvx_LDADD =/s/=/= $$(OPENGLLIBS)/' \
+		${WRKSRC}/src/bin/geomview/x11/Makefile.in

 post-build:
 	@(cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split --no-validate \
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@ -69,6 +69,21 @@ CONFIGURE_ARGS+=--disable-vgagl --disable-svga
 PLIST_SUB+=	WITH_SVGALIB="@comment "
 .endif

+post-patch:
+	@${REINPLACE_CMD} '/^exttest1_LDADD =/s/$$/ -lgg/' \
+		${WRKSRC}/extensions/test/Makefile.in
+	@${REINPLACE_CMD} '/^showaccel_LDADD =/ { \
+		p; s/showaccel/palette/; p; s/palette/cbconsist/; }' \
+		${WRKSRC}/programs/check/Makefile.in
+	@${REINPLACE_CMD} '/^cube3d_LDADD =/s/$$/ -lgii/' \
+		${WRKSRC}/programs/demos/Makefile.in
+	@${REINPLACE_CMD} '/^LDADD =/s/$$/ -lgii/' \
+		${WRKSRC}/programs/regress/Makefile.in
+	@${REINPLACE_CMD} '/^inputdump_LDADD =/s/$$/ -lgii/' \
+		${WRKSRC}/programs/util/Makefile.in
+	@${REINPLACE_CMD} '/^ggiteleserver_LDADD =/s/$$/ -lgg/' \
+		${WRKSRC}/programs/util/ggiteleserver/Makefile.in
+
 post-install:
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/fbdev/.keep
 	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/kgi/.keep
--- a/graphics/libgnomecanvas/files/patch-demos-Makefile.in
+++ b/graphics/libgnomecanvas/files/patch-demos-Makefile.in
@ -0,0 +1,10 @@
+--- demos/Makefile.in.orig
+++ demos/Makefile.in
+@@ -255,6 +255,7 @@
+ 
+ LDADD = \
+ 	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
+	$(LIBGNOMECANVAS_LIBS) \
+ 	$(INTLLIBS)
+ 
+ canvas_demo_SOURCES = \
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@ -38,11 +38,13 @@ CONFIGURE_ARGS+=	--with-audio=oss
 .endif

 post-extract:
-	${CP} ${FILESDIR}/swfdec_playback_oss.c \
-	    	${WRKSRC}/swfdec-gtk
+	@${CP} ${FILESDIR}/swfdec_playback_oss.c \
+		${WRKSRC}/swfdec-gtk

 post-patch:
-	${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
+	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^swfdec_test_LDADD =/s/$$/ -lgmodule-2.0/' \
+		${WRKSRC}/test/Makefile.in

 .include <bsd.port.mk>
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@ -32,9 +32,6 @@ OPTIONS_RADIO_SPELL=	GTKSPELL LIBSEXY
 GTKSPELL_DESC=	Spell check support via gtkspell
 LIBSEXY_DESC=	Spell check support via libsexy

-.if defined(WITH_PYTHON)
-.endif
-
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MDBUS}
@ -100,6 +97,8 @@ PLIST_SUB+=	TCL="@comment "
 post-patch:
 	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
 		${WRKSRC}/src/common/*.[ch]
+	@${REINPLACE_CMD} '/xchat_LDADD =/s/$$/ -lgmodule-2.0/' \
+		${WRKSRC}/src/fe-gtk/Makefile.in

 # Create plugins directory even when no plugins are installed
 post-install:
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@ -109,6 +109,14 @@ post-patch:
 		-e 's|-DG_DISABLE_DEPRECATED||g' \
 		-e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^evolution_alarm_notify_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/calendar/gui/alarm-notify/Makefile.in
+	@${REINPLACE_CMD} '/^evolution_settings_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/capplet/Makefile.in
+	@${REINPLACE_CMD} '/^evolution_backup_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/plugins/backup-restore/Makefile.in
+	@${REINPLACE_CMD} '/^evolution_LDADD =/s/=/= -lgthread-2.0/' \
+		${WRKSRC}/shell/Makefile.in
 	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
 		${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c
 	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mjpegtools
 PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}

@ -18,21 +18,17 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 CONFLICTS=	mplex-[0-9]*

 USES=		gmake libtool pathfix pkgconfig
-PATHFIX_MAKEFILEIN=	Makefile.am
-USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
-LIBTOOLIZE_ARGS=-i -c -f
-ACLOCAL_ARGS=	--automake-acdir=${ACLOCAL_DIR} \
-		-I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing --foreign
-CONFIGURE_ARGS=	--without-dga --without-x
 USE_LDCONFIG=	yes

+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-dga --without-x
+CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib

 INFO=		mjpeg-howto

-OPTIONS_DEFINE=		DOCS DV GTK2 PNG QUICKTIME SDL SIMD
+OPTIONS_DEFINE=		DOCS DV GTK2 PNG QUICKTIME SDL
 OPTIONS_DEFAULT=	GTK2 PNG SDL
 OPTIONS_SUB=		yes

@ -46,12 +42,11 @@ QUICKTIME_LIB_DEPENDS=	libquicktime.so:${PORTSDIR}/multimedia/libquicktime
 QUICKTIME_CONFIGURE_WITH=	libquicktime
 SDL_USE=		SDL=gfx,sdl
 SDL_CONFIGURE_OFF=	--without-libsdl --without-sdlgfx
-SIMD_CONFIGURE_ENABLE=	simd-accel

 .include <bsd.port.options.mk>

 .if ${ARCH} == "i386"
-CFLAGS:=	${CFLAGS:N-O*:N-fno-strict*}
+USES+=		compiler:c++11-lang
 .endif

 .if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
@ -59,12 +54,9 @@ BROKEN=		Does not build on powerpc-9
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e \
-		's| \*-\*-linux\*)| *-*-*)| ; \
-		 /ARCHFLAGS=/s|^|#|g' ${WRKSRC}/configure.ac
-
-pre-configure:
-	@${RM} -f ${WRKSRC}/missing
+	@${REINPLACE_CMD} \
+		-e 's| \*-\*-linux\*)| *-*-*)|' \
+		-e '/ARCHFLAGS=/d' ${WRKSRC}/configure

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/multimedia/mjpegtools/files/patch-mplex__Makefile.in
+++ b/multimedia/mjpegtools/files/patch-mplex__Makefile.in
@ -0,0 +1,11 @@
+--- mplex/Makefile.in.orig
+++ mplex/Makefile.in
+@@ -360,7 +360,7 @@
+ libmplex2_la_CXXFLAGS = 
+ mplex_SOURCES = main.cpp 
+ mplex_DEPENDENCIES = libmplex2.la
+-mplex_LDADD = libmplex2.la @LIBGETOPT_LIB@ $(LIBM_LIBS)
+mplex_LDADD = libmplex2.la $(top_builddir)/utils/libmjpegutils.la @LIBGETOPT_LIB@ $(LIBM_LIBS)
+ all: all-am
+ 
+ .SUFFIXES:
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@ -27,4 +27,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gtkglext=yes
 INSTALL_TARGET=	install-strip

+post-patch:
+	@${REINPLACE_CMD} '/LDADD/s/GTK_CFLAGS/GTK_LIBS/' \
+		${WRKSRC}/examples/Makefile.in
+
 .include <bsd.port.mk>
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@ -28,4 +28,7 @@ INSTALL_TARGET=	install-strip

 GCONF_SCHEMAS=	gweather.schemas

+post-patch:
+	@${REINPLACE_CMD} '/noinst_PROGRAMS/,+1 d' ${WRKSRC}/libgweather/Makefile.in
+
 .include <bsd.port.mk>
--- a/net/libnetdude/Makefile
+++ b/net/libnetdude/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libnetdude
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/netdude/${PORTNAME}/${PORTVERSION}

@ -14,8 +14,11 @@ LIB_DEPENDS=	libpcapnav.so:${PORTSDIR}/net/libpcapnav

 USES=		libtool
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-gtk-doc --disable-static --with-html-dir=${DOCSDIR}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
+USE_AUTOTOOLS=	libltdl
 USE_GNOME=	glib12
-CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

@ -29,5 +32,8 @@ post-patch:
 		${WRKSRC}/protocols/fddi/libnd_fddi.h
 	@${REINPLACE_CMD} -e 's|DOC_MODULE = libnetdude|DOC_MODULE =|' \
 		${WRKSRC}/docs/Makefile.in
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's,-I$$(top_srcdir)/libltdl,@INCLTDL@,' \
+		-e '/LIBADD/s,$$(top_builddir)/libltdl/libltdlc.la,@LIBLTDL@,'

 .include <bsd.port.mk>
--- a/net/libnetdude/files/patch-pluginsChecksumFixMakefile.in
+++ b/net/libnetdude/files/patch-pluginsChecksumFixMakefile.in
@ -1,11 +0,0 @@
--- ./plugins/ChecksumFix/Makefile.in.orig	2008-01-27 18:27:24.000000000 -0500
-+++ ./plugins/ChecksumFix/Makefile.in	2008-01-27 18:27:33.000000000 -0500
-@@ -79,7 +79,7 @@
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
-+pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
--- a/net/libnetdude/files/patch-tools-Makefile.in
+++ b/net/libnetdude/files/patch-tools-Makefile.in
@ -0,0 +1,11 @@
+--- tools/Makefile.in.orig
+++ tools/Makefile.in
+@@ -224,7 +224,7 @@
+ MAINTAINERCLEANFILES = Makefile.in Makefile lndtool.c
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG
+ lndtool_SOURCES = lndtool.c
+-lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude
+lndtool_LDADD = $(top_builddir)/src/libnetdude.la @pcapnav_libs@
+ lndtool_LDFLAGS = -export-dynamic
+ all: all-am
+ 
--- a/net/libnetdude/pkg-plist
+++ b/net/libnetdude/pkg-plist
@ -38,35 +38,21 @@ include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcb.h
 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
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@ -95,6 +95,7 @@ post-patch:
 		-e 's|install-data-hook install-dist_initSCRIPTS|install-dist_initSCRIPTS|g' \
 		-e 's|install-data-hook|notinstall-data-hook|g' \
 		-e 's| -lpam_misc||g' \
+		-e '/^ldap_child_LDADD =/s|=|= $$(LTLIBINTL)|' \
 		${WRKSRC}/Makefile.am
 	@${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \
 		-e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \
--- a/sysutils/tracker-client/Makefile
+++ b/sysutils/tracker-client/Makefile
@ -81,6 +81,10 @@ CONFIGURE_ARGS+=	--disable-libtrackergtk --disable-gui \

 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} '/tracker_extract_LDADD =/s/=/= $$(DBUS_LIBS) $$(GIO_LIBS)/' \
+		${WRKSRC}/src/tracker-extract/Makefile.in
+	@${REINPLACE_CMD} '/tracker_status_LDADD =/s/$$/ $$(DBUS_LIBS)/' \
+		${WRKSRC}/src/tracker-utils/Makefile.in

 post-build:
 .if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@ -23,7 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-co

 USES=		gettext libtool:keepla pathfix pkgconfig gmake tar:bzip2
 USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
-USE_GNOME=	gnomeprefix intlhack gconf2
+USE_GNOME=	gnomeprefix intlhack gconf2 gtk20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@ -41,6 +41,8 @@ post-patch:
 	    	s|-DGDK_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gtkhtml-editor-test[$$]|gtkhtml3-editor-test$$|' \
+		-e '/^gtkhtml_editor_test_LDADD =/s/=/= @GTKHTML_LIBS@/' \
+		-e 's/$$(GTHREAD_LIBS)/-lgthread-2.0/' \
 	    	${WRKSRC}/components/editor/Makefile.in
 	@${REINPLACE_CMD} -e 's|G_CONST_RETURN||g' \
 		${WRKSRC}/a11y/*.[ch]
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@ -19,4 +19,8 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip

+post-patch:
+	@${REINPLACE_CMD} '/^test_dock_LDADD =/s/$$/ $$(GDL_DEPENDENCIES_LIBS)/' \
+		${WRKSRC}/gdl/Makefile.in
+
 .include <bsd.port.mk>
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@ -31,4 +31,9 @@ PLIST_FILES=	lib/libgdiplus.a \
 		lib/libgdiplus.so.0.0.0 \
 		libdata/pkgconfig/libgdiplus.pc

+post-patch:
+	@${REINPLACE_CMD} \
+		'/^testgdi_LDADD =/s/$$/ $$(BASE_DEPENDENCIES_LIBS) -lX11/' \
+		${WRKSRC}/tests/Makefile.in
+
 .include <bsd.port.mk>
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@ -27,8 +27,7 @@ USES=		gmake iconv libtool:keepla pkgconfig
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
 ACLOCAL_ARGS=	-I.
 AUTOMAKE_ARGS=	-a -c -f --foreign
-LIBTOOLIZE_ARGS=-i -c -f
-USE_XORG=	xaw xbitmaps xft
+USE_XORG=	x11 xaw xbitmaps xext xft xt
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ENV=	LANG=C
@ -51,6 +50,68 @@ post-patch:
 		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
 		 s|file formats|5|'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} '/^mwm_LDADD =/s/$$/ -lXt -lXext -lX11/' \
+		${WRKSRC}/clients/mwm/Makefile.am
+	@${REINPLACE_CMD} '/^uil_LDADD =/s/$$/ -lXt/' \
+		${WRKSRC}/clients/uil/Makefile.am
+	@${REINPLACE_CMD} '/^LDADD =/s/\\*$$/ -lXt -lX11 &/' \
+		${WRKSRC}/clients/xmbind/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch05/Scale/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch06/combo_box/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch06/spin_box/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch08/Container/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch08/Notebook/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch16/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch17/simple_drag/Makefile.am \
+		${WRKSRC}/demos/doc/programGuide/ch17/simple_drop/Makefile.am \
+		${WRKSRC}/demos/programs/ColorSel/Makefile.am \
+		${WRKSRC}/demos/programs/Column/Makefile.am \
+		${WRKSRC}/demos/programs/Exm/simple_app/Makefile.am \
+		${WRKSRC}/demos/programs/Ext18List/Makefile.am \
+		${WRKSRC}/demos/programs/IconB/Makefile.am \
+		${WRKSRC}/demos/programs/TabStack/Makefile.am \
+		${WRKSRC}/demos/programs/Tree/Makefile.am \
+		${WRKSRC}/demos/programs/airport/Makefile.am \
+		${WRKSRC}/demos/programs/animate/Makefile.am \
+		${WRKSRC}/demos/programs/drag_and_drop/Makefile.am \
+		${WRKSRC}/demos/programs/draw/Makefile.am \
+		${WRKSRC}/demos/programs/filemanager/Makefile.am \
+		${WRKSRC}/demos/programs/fileview/Makefile.am \
+		${WRKSRC}/demos/programs/getsubres/Makefile.am \
+		${WRKSRC}/demos/programs/i18ninput/Makefile.am \
+		${WRKSRC}/demos/programs/panner/Makefile.am \
+		${WRKSRC}/demos/programs/periodic/Makefile.am \
+		${WRKSRC}/demos/programs/piano/Makefile.am \
+		${WRKSRC}/demos/programs/popups/Makefile.am \
+		${WRKSRC}/demos/programs/sampler2_0/Makefile.am \
+		${WRKSRC}/demos/programs/setdate/Makefile.am \
+		${WRKSRC}/demos/programs/workspace/Makefile.am \
+		${WRKSRC}/demos/unsupported/aicon/Makefile.am \
+		${WRKSRC}/demos/unsupported/dainput/Makefile.am \
+		${WRKSRC}/demos/unsupported/dogs/Makefile.am \
+		${WRKSRC}/demos/unsupported/motifshell/Makefile.am \
+		${WRKSRC}/demos/unsupported/xmapdef/Makefile.am \
+		${WRKSRC}/demos/unsupported/xmfonts/Makefile.am
+	@${REINPLACE_CMD} '/^LDADD =/s/$$/ -lXt/' \
+		${WRKSRC}/demos/lib/Exm/wml/Makefile.am \
+		${WRKSRC}/demos/lib/Xmd/Makefile.am \
+		${WRKSRC}/demos/programs/ButtonBox/Makefile.am \
+		${WRKSRC}/demos/programs/Combo2/Makefile.am \
+		${WRKSRC}/demos/programs/FontSel/Makefile.am \
+		${WRKSRC}/demos/programs/Outline/Makefile.am \
+		${WRKSRC}/demos/programs/Paned/Makefile.am \
+		${WRKSRC}/demos/programs/hellomotif/Makefile.am \
+		${WRKSRC}/demos/programs/hellomotifi18n/Makefile.am \
+		${WRKSRC}/demos/programs/tooltips/Makefile.am \
+		${WRKSRC}/demos/unsupported/hellomotif/Makefile.am \
+		${WRKSRC}/demos/unsupported/xmforc/Makefile.am \
+		${WRKSRC}/demos/unsupported/xmform/Makefile.am
+	@${REINPLACE_CMD} '/^LDADD =/s/\\*$$/ -lXt -lXext -lX11 &/' \
+		${WRKSRC}/demos/programs/Exm/app_in_c/Makefile.am \
+		${WRKSRC}/demos/programs/earth/Makefile.am \
+		${WRKSRC}/demos/programs/todo/Makefile.am
+	@${REINPLACE_CMD} '/^wmldbcreate_LDADD =/s/$$/ -lXt/' \
+		${WRKSRC}/tools/wml/Makefile.am

 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/x11-wm/mutter/Makefile
+++ b/x11-wm/mutter/Makefile
@ -32,5 +32,7 @@ GCONF_SCHEMAS=	mutter.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' \
 	    	${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^mutter_LDADD =/s|$$| -lgmodule-2.0|' \
+		${WRKSRC}/src/Makefile.in

 .include <bsd.port.mk>
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@ -74,6 +74,8 @@ post-patch:
 		${WRKSRC}/help/fish/Makefile.in
 	@${REINPLACE_CMD} -e 's|python.* python2\.0|${PYTHON_VERSION}|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} '/^panel_test_applets_LDADD =/s/=/= -lgmodule-2.0/' \
+		${WRKSRC}/gnome-panel/Makefile.in

 .include <bsd.port.mk>