Use libtool port instead of included version to avoid objformat a.out botch

23 files changed, 28 insertions, 1 deletions

diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index e6cd438c26a1..1c4c7b521a11 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 LATEST_LINK=	fox10
 
+USE_AUTOTOOLS=	libtool:15
 USE_GL=		yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index 3a15c5c734b6..2ebddf495908 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -28,6 +28,7 @@ MAJORVER=	1.2
 SHVER=		18
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	lthack
 USE_GL=		yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index aa4fe65a65f8..bc199551ae36 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -28,6 +28,7 @@ MAJORVER=	1.4
 SHVER=		32
 PLIST_SUB+=	MAJORVER=${MAJORVER} SHVER=${SHVER}
 
+USE_AUTOTOOLS=	libtool:15
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index 0f252a95c9cd..0b3d692efa5a 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -17,6 +17,7 @@ DISTNAME=	${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A useful widget set complementary to GTK+
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk12
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index 28d3608fb746..0289e8972a59 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -21,6 +21,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LIB_DEPENDS=	gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
 		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
+USE_AUTOTOOLS=	libtool:15
 USE_GL=		yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile
index 4ce5adee70d9..359ff77b7458 100644
--- a/x11-toolkits/gtkglarea/Makefile
+++ b/x11-toolkits/gtkglarea/Makefile
@@ -17,6 +17,7 @@ COMMENT=	An OpenGL widget for the GTK+ GUI toolkit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12 lthack
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 247c893b0e36..39f91e029983 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -19,6 +19,7 @@ COMMENT=	C++ wrapper for gtk, a x11 graphics library
 LIB_DEPENDS=	sigc.1:${PORTSDIR}/devel/libsigc++
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 7fa612e887a7..edecbd2b7cb6 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -26,6 +26,7 @@ LATEST_LINK=	gtkmm2
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 7fa612e887a7..edecbd2b7cb6 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -26,6 +26,7 @@ LATEST_LINK=	gtkmm2
 LIB_DEPENDS=	sigc-1.2.5:${PORTSDIR}/devel/libsigc++12
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/inti-gl/Makefile b/x11-toolkits/inti-gl/Makefile
index 0ddba9c33eb6..75eea880272f 100644
--- a/x11-toolkits/inti-gl/Makefile
+++ b/x11-toolkits/inti-gl/Makefile
@@ -19,6 +19,7 @@ COMMENT=	An Inti binding for GtkGLExt, the Open-GL extension to GTK+
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti \
 		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GNOME=	gnomehack gnomeprefix
diff --git a/x11-toolkits/inti-gl/pkg-plist b/x11-toolkits/inti-gl/pkg-plist
index cc5f18c8658d..80ab80758bf8 100644
--- a/x11-toolkits/inti-gl/pkg-plist
+++ b/x11-toolkits/inti-gl/pkg-plist
@@ -17,6 +17,8 @@ include/inti-1.0/inti/gtk/gl/init.h
 include/inti-1.0/inti/gtk/gl/widget.h
 include/inti-1.0/inti/inti-gl.h
 lib/inti-1.0/include/inti-gl-config.h
+lib/libinti-gl-1.0.a
+lib/libinti-gl-1.0.la
 lib/libinti-gl-1.0.so
 lib/libinti-gl-1.0.so.0
 libdata/pkgconfig/inti-gl-1.0.pc
diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile
index 755ec99828fb..b2001c10747a 100644
--- a/x11-toolkits/libsexy/Makefile
+++ b/x11-toolkits/libsexy/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso
 LIB_DEPENDS=		enchant:${PORTSDIR}/textproc/enchant
 RUN_DEPENDS=		${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=		gnomehack lthack gtk20 libxml2
 INSTALLS_SHLIB=		yes
 USE_X_PREFIX=		yes
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 2096bdba7d4e..e50ca0d7938d 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 widget library required by xfce4 and xfwm4
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 9562a201712e..4fdd3a6fd9f4 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -15,6 +15,7 @@ COMMENT=	This is the Mowitz ("More widgets") library
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 4e33cdd1fcb7..0554967b26e3 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://siag.nu/pub/neXtaw/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Athena Widgets with N*XTSTEP appearance
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index ea34e29e3ee2..5daa8d6559fb 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -21,6 +21,7 @@ COMMENT=	Motif X11 Toolkit (industry standard GUI (IEEE 1295))
 
 RUN_DEPENDS=	imake:${X_IMAKE_PORT}
 
+USE_AUTOTOOLS=	libtool:15
 CONFLICTS=	lesstif-*
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
index fee4f2f7da91..4e73984c56ed 100644
--- a/x11-toolkits/open-motif/pkg-plist
+++ b/x11-toolkits/open-motif/pkg-plist
@@ -339,12 +339,15 @@ lib/X11/system.mwmrc
 %%MOTIF_DEMOS%%lib/X11/uid/swedish/uid/l_strings.uid
 %%MOTIF_DEMOS%%lib/X11/uid/xmanimate.uid
 lib/libMrm.a
+lib/libMrm.la
 lib/libMrm.so
 lib/libMrm.so.3
 lib/libUil.a
+lib/libUil.la
 lib/libUil.so
 lib/libUil.so.3
 lib/libXm.a
+lib/libXm.la
 lib/libXm.so
 lib/libXm.so.3
 %%MANUALS%%%%DOCSDIR%%/BUGREPORT
diff --git a/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile
index 3a914a24cbd2..78bcd6eae069 100644
--- a/x11-toolkits/p5-qt/Makefile
+++ b/x11-toolkits/p5-qt/Makefile
@@ -22,13 +22,15 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:cpan \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A set of Perl bindings for the Qt toolkit
 
+USE_AUTOTOOLS=	libtool:15
 USE_GL=		yes
 USE_QT_VER=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	bin/pqtapi bin/pqtsh bin/puic include/smoke.h \
-		lib/libsmokeqt.la lib/libsmokeqt.so lib/libsmokeqt.so.3
+		lib/libsmokeqt.la lib/libsmokeqt.so lib/libsmokeqt.so.3 \
+		lib/libsmokeqt.a
 
 MAN1=	puic.1
 MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index 6a186da2ceea..21aeea432c93 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -17,6 +17,7 @@ DISTNAME=	SDL_gui-${PORTVERSION}
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A Graphical User Interface library for SDL
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image ttf
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile
index daa05ddd90a1..9102a0ab2f45 100644
--- a/x11-toolkits/sdl_pango/Makefile
+++ b/x11-toolkits/sdl_pango/Makefile
@@ -19,6 +19,7 @@ PATCHFILES=	SDL_Pango-0.1.2-API-adds.patch
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	SDL_Pango is the SDL API to the Pango text rendering engine of GNOME 2.x
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_GNOME=	pango
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index 691c79bce930..0ad8048d753b 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Qt toolkit library for Coin
 
 LIB_DEPENDS=	Coin.44:${PORTSDIR}/graphics/Coin
 
+USE_AUTOTOOLS=	libtool:15
 USE_QT_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/soqt/pkg-plist b/x11-toolkits/soqt/pkg-plist
index 08d7a7391c63..ded33ef7521c 100644
--- a/x11-toolkits/soqt/pkg-plist
+++ b/x11-toolkits/soqt/pkg-plist
@@ -24,6 +24,7 @@ include/Inventor/Qt/viewers/SoQtPlaneViewer.h
 include/Inventor/Qt/viewers/SoQtViewer.h
 include/Inventor/Qt/widgets/SoQtPopupMenu.h
 include/Inventor/Qt/widgets/SoQtThumbWheel.h
+lib/libSoQt.a
 lib/libSoQt.la
 lib/libSoQt.so
 lib/libSoQt.so.23
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 0856d9bee6ea..301ba7911afa 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	vdklib
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for GTK+ toolkit
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget gtk20
 GNU_CONFIGURE=	yes