svn commit: r362656 - in head: Mk/Uses archivers/rpm4 databases/evolution-data-server databases/gdbm devel/anjuta devel/gettext/files devel/gitg0 devel/gnome-vfs devel/libbonobo/files devel/libgii ...

Tijl Coosemans tijl at FreeBSD.org
Wed Jul 23 10:28:10 UTC 2014 

Author: tijl
Date: Wed Jul 23 10:28:03 2014
New Revision: 362656
URL: http://svnweb.freebsd.org/changeset/ports/362656
QAT: https://qat.redports.org/buildarchive/r362656/

Log:
  Remove two libtool fixes from Mk/Uses/libtool.mk.  They don't always work
  when an older version of a package is installed.  This is the case when an
  executable links with installed libraries and with uninstalled libraries
  that link with other uninstalled libraries.  For each of the directly
  linked libraries the executable will have an rpath (/usr/local/lib for the
  installed libraries and a path under WRKDIR for each of the uninstalled
  libraries), but not for the indirect libraries.  Both ld(1) and rtld(1)
  search the rpath of the executable first before any rpath of libraries, so
  the indirectly linked libraries will be found in /usr/local/lib if they are
  installed instead of in WRKDIR.
  
  With this commit executables will overlink with uninstalled indirect
  libraries again so their location is added to the rpath of the executable.
  
  This partially reverts r358784.
  
  PR:		191611
  Approved by:	portmgr (bapt)

Deleted:
  head/devel/gettext/files/patch-gettext-tools_src_Makefile.in
  head/devel/libbonobo/files/patch-samples-echo-Makefile.in
  head/graphics/libgnomecanvas/files/patch-demos-Makefile.in
  head/multimedia/mjpegtools/files/patch-mplex__Makefile.in
Modified:
  head/Mk/Uses/libtool.mk
  head/archivers/rpm4/Makefile
  head/databases/evolution-data-server/Makefile
  head/databases/gdbm/Makefile
  head/devel/anjuta/Makefile
  head/devel/gitg0/Makefile
  head/devel/gnome-vfs/Makefile
  head/devel/libgii/Makefile
  head/devel/ois/Makefile
  head/graphics/devil/Makefile
  head/graphics/geomview/Makefile
  head/graphics/libggi/Makefile
  head/graphics/swfdec/Makefile
  head/irc/xchat/Makefile
  head/mail/evolution/Makefile
  head/net/gtk-vnc/Makefile
  head/net/libgweather/Makefile
  head/security/sssd/Makefile
  head/sysutils/tracker-client/Makefile
  head/www/gtkhtml3/Makefile
  head/x11-toolkits/gdl/Makefile
  head/x11-toolkits/libgdiplus/Makefile
  head/x11-toolkits/open-motif/Makefile
  head/x11-wm/mutter/Makefile
  head/x11/gnome-panel/Makefile

Modified: head/Mk/Uses/libtool.mk
==============================================================================
--- head/Mk/Uses/libtool.mk	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/Mk/Uses/libtool.mk	Wed Jul 23 10:28:03 2014	(r362656)
@@ -35,10 +35,6 @@ 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|/'

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/archivers/rpm4/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -57,9 +57,7 @@ CONFIGURE_ENV+=	LUA_CFLAGS=-I${LUA_INCDI
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
 post-patch:
-	${REINPLACE_CMD} \
-		-e '/_LDADD =/s/=/= @LTLIBINTL@/' \
-		-e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
 		${WRKSRC}/misc/fts.?
 	${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/databases/evolution-data-server/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -68,23 +68,5 @@ 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>

Modified: head/databases/gdbm/Makefile
==============================================================================
--- head/databases/gdbm/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/databases/gdbm/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -33,7 +33,5 @@ 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
-	@${REINPLACE_CMD} '/_LDADD =/s/$$/ @LTLIBINTL@/' \
-		${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>

Modified: head/devel/anjuta/Makefile
==============================================================================
--- head/devel/anjuta/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/devel/anjuta/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -93,15 +93,6 @@ 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' \

Modified: head/devel/gitg0/Makefile
==============================================================================
--- head/devel/gitg0/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/devel/gitg0/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -35,8 +35,4 @@ 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>

Modified: head/devel/gnome-vfs/Makefile
==============================================================================
--- head/devel/gnome-vfs/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/devel/gnome-vfs/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -88,8 +88,6 @@ 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' \

Modified: head/devel/libgii/Makefile
==============================================================================
--- head/devel/libgii/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/devel/libgii/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -54,10 +54,6 @@ 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

Modified: head/devel/ois/Makefile
==============================================================================
--- head/devel/ois/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/devel/ois/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -25,7 +25,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-post-patch:
-	@${REINPLACE_CMD} '/_LDADD =/s/$$/ -lX11/' ${WRKSRC}/demos/Makefile.am
-
 .include <bsd.port.mk>

Modified: head/graphics/devil/Makefile
==============================================================================
--- head/graphics/devil/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/graphics/devil/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -94,8 +94,6 @@ CONFIGURE_ARGS+=--disable-altivec --disa
 
 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' \

Modified: head/graphics/geomview/Makefile
==============================================================================
--- head/graphics/geomview/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/graphics/geomview/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -34,8 +34,6 @@ 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 && makeinfo --no-split --no-validate \

Modified: head/graphics/libggi/Makefile
==============================================================================
--- head/graphics/libggi/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/graphics/libggi/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -72,21 +72,6 @@ CONFIGURE_ARGS+=--disable-vgagl --disabl
 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

Modified: head/graphics/swfdec/Makefile
==============================================================================
--- head/graphics/swfdec/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/graphics/swfdec/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -43,8 +43,6 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
-	    	${WRKSRC}/configure
-	@${REINPLACE_CMD} '/^swfdec_test_LDADD =/s/$$/ -lgmodule-2.0/' \
-		${WRKSRC}/test/Makefile.in
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>

Modified: head/irc/xchat/Makefile
==============================================================================
--- head/irc/xchat/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/irc/xchat/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -97,8 +97,6 @@ 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:

Modified: head/mail/evolution/Makefile
==============================================================================
--- head/mail/evolution/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/mail/evolution/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -109,14 +109,6 @@ 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' \

Modified: head/net/gtk-vnc/Makefile
==============================================================================
--- head/net/gtk-vnc/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/net/gtk-vnc/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -27,8 +27,4 @@ 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>

Modified: head/net/libgweather/Makefile
==============================================================================
--- head/net/libgweather/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/net/libgweather/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -28,7 +28,4 @@ INSTALL_TARGET=	install-strip
 
 GCONF_SCHEMAS=	gweather.schemas
 
-post-patch:
-	@${REINPLACE_CMD} '/noinst_PROGRAMS/,+1 d' ${WRKSRC}/libgweather/Makefile.in
-
 .include <bsd.port.mk>

Modified: head/security/sssd/Makefile
==============================================================================
--- head/security/sssd/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/security/sssd/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -97,7 +97,6 @@ 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' \

Modified: head/sysutils/tracker-client/Makefile
==============================================================================
--- head/sysutils/tracker-client/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/sysutils/tracker-client/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -81,10 +81,6 @@ CONFIGURE_ARGS+=	--disable-libtrackergtk
 
 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"

Modified: head/www/gtkhtml3/Makefile
==============================================================================
--- head/www/gtkhtml3/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/www/gtkhtml3/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -41,8 +41,6 @@ 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]

Modified: head/x11-toolkits/gdl/Makefile
==============================================================================
--- head/x11-toolkits/gdl/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/x11-toolkits/gdl/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -19,8 +19,4 @@ 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>

Modified: head/x11-toolkits/libgdiplus/Makefile
==============================================================================
--- head/x11-toolkits/libgdiplus/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/x11-toolkits/libgdiplus/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -31,9 +31,4 @@ 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>

Modified: head/x11-toolkits/open-motif/Makefile
==============================================================================
--- head/x11-toolkits/open-motif/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/x11-toolkits/open-motif/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -50,68 +50,6 @@ 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}

Modified: head/x11-wm/mutter/Makefile
==============================================================================
--- head/x11-wm/mutter/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/x11-wm/mutter/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -32,7 +32,5 @@ 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>

Modified: head/x11/gnome-panel/Makefile
==============================================================================
--- head/x11/gnome-panel/Makefile	Wed Jul 23 10:21:18 2014	(r362655)
+++ head/x11/gnome-panel/Makefile	Wed Jul 23 10:28:03 2014	(r362656)
@@ -74,8 +74,6 @@ 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>

More information about the svn-ports-all mailing list