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)

3 files changed, 72 insertions, 2 deletions

diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index fe51f85de348..c1b0b3462254 100644
--- 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>
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index 9a233c3f9e90..0722ea319375 100644
--- 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>
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 987c83eb6f16..37425b0f10c0 100644
--- 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}