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

79 files changed, 89 insertions, 2 deletions

diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 5ffba4fd727c..b0ff0cc4c9de 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -26,7 +26,7 @@ USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui
 USE_GCC=	3.4
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		MAKEINFO="makeinfo --no-split"
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index 0cf1436d58c6..7b300ea11afb 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	gst${PKGNAMESUFFIX}-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GStreamer plugin for monkeysaudio files
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index 22f9d5651e3e..fd9d3b44ab8c 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	PropList.2:${PORTSDIR}/devel/libPropList \
 		dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 RUN_DEPENDS=	wmaker:${PORTSDIR}/x11-wm/windowmaker
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 8088e45634cd..631d76db28a8 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -20,6 +20,7 @@ COMMENT=	C++ wrapper for libgda2 library
 LIB_DEPENDS=	glibmm-2.4:${PORTSDIR}/devel/glibmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GCC=	3.4
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index e3ce9b56daaa..f6c870ded075 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -21,6 +21,7 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \
 		intlhack referencehack
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index 23b74ee2b388..48f98a7fd485 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=		markus@FreeBSD.org
 COMMENT=		Drop stack applet for KDE
 
+USE_AUTOTOOLS=	libtool:15
 USE_KDEBASE_VER=	3
 GNU_CONFIGURE=		yes
 INSTALLS_SHLIB=		yes
diff --git a/deskutils/dragstack/pkg-plist b/deskutils/dragstack/pkg-plist
index b7d97d3801d8..e3b6cbd4ff4e 100644
--- a/deskutils/dragstack/pkg-plist
+++ b/deskutils/dragstack/pkg-plist
@@ -1,3 +1,4 @@
+lib/libdragstack.a
 lib/libdragstack.la
 lib/libdragstack.so
 lib/libdragstack.so.1
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index d734d7f1b8fe..b36c791a6766 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program to create labels and business cards
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libgnomeui libgnomeprintui \
 		desktopfileutils intlhack
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 0ba33854d18c..95c20640a0f7 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -18,6 +18,7 @@ COMMENT=	GnoTime is a time tracker for gnome2
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnomeprefix intlhack gtkhtml3 libgnomeui
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile
index 75fff6ef7c44..81b5e3dff98b 100644
--- a/deskutils/gtkjournal/Makefile
+++ b/deskutils/gtkjournal/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
 		sqlite.2:${PORTSDIR}/databases/sqlite2 \
 		gtkspell:${PORTSDIR}/textproc/gtkspell
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile
index 6cc961b687cd..be7f45117945 100644
--- a/deskutils/lightning-thunderbird/Makefile
+++ b/deskutils/lightning-thunderbird/Makefile
@@ -18,6 +18,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
 
+USE_AUTOTOOLS=	libtool:15
 USE_GCC=	3.4+
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile
index 6cc961b687cd..be7f45117945 100644
--- a/deskutils/lightning/Makefile
+++ b/deskutils/lightning/Makefile
@@ -18,6 +18,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
 
+USE_AUTOTOOLS=	libtool:15
 USE_GCC=	3.4+
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile
index 70c784b7a53a..cce5415997b1 100644
--- a/deskutils/nautilus-locked-folder/Makefile
+++ b/deskutils/nautilus-locked-folder/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	pav
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Nautilus plugin that allows you to encrypt the contents of a folder
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_GNOME=	nautilus2
 PKGCONFIGS=	gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0
diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile
index 6cc961b687cd..be7f45117945 100644
--- a/deskutils/sunbird/Makefile
+++ b/deskutils/sunbird/Makefile
@@ -18,6 +18,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Redesign of the Mozilla Calendar with XUL interface
 
+USE_AUTOTOOLS=	libtool:15
 USE_GCC=	3.4+
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index e3c68300f071..a01939a2c168 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/gnu-autotools/bin/autoconf:${PORTSDIR}/devel/gnu-autoc
 		${LOCALBASE}/gnu-autotools/bin/automake:${PORTSDIR}/devel/gnu-automake \
 		libtool:${PORTSDIR}/devel/libtool15
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 08ee7cf9ac13..5c6353bc4a77 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -31,6 +31,7 @@ MOZILLA=	seamonkey
 .endif
 .endif
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GETTEXT=	yes
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index ae12a8397655..76ca3dafc80a 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -11,6 +11,7 @@ include/devhelp-1.0/devhelp/dh-search.h
 include/devhelp-1.0/devhelp/dh-util.h
 include/devhelp-1.0/devhelp/dh-window.h
 lib/libdevhelp-1.a
+lib/libdevhelp-1.la
 lib/libdevhelp-1.so
 lib/libdevhelp-1.so.0
 libdata/pkgconfig/libdevhelp-1.0.pc
diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile
index 3f00605c0efe..2673e0808e4a 100644
--- a/devel/flatzebra/Makefile
+++ b/devel/flatzebra/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A generic game engine for 2D double-buffering animation
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl mixer image
 USE_GNOME=	pkgconfig
 
diff --git a/devel/flatzebra/pkg-plist b/devel/flatzebra/pkg-plist
index 46eb023f12da..4963d5118b20 100644
--- a/devel/flatzebra/pkg-plist
+++ b/devel/flatzebra/pkg-plist
@@ -1,6 +1,7 @@
 lib/libflatzebra-0.1.so.2
 lib/libflatzebra-0.1.so
 lib/libflatzebra-0.1.la
+lib/libflatzebra-0.1.a
 
 libdata/pkgconfig/flatzebra-0.1.pc
 
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index a82ce60e0de7..40f0ddd2e6fa 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -20,6 +20,7 @@ COMMENT=	A configuration database system for GNOME
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index d83ab80a0a48..83e5e8cb5794 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -19,6 +19,7 @@ COMMENT=	C++ wrapper for gconf2 API library
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gconf2
diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile
index 091da42ff4d5..081584690600 100644
--- a/devel/gtkmozedit/Makefile
+++ b/devel/gtkmozedit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Text editor widget based on Mozilla's editing functionality
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/gtkmozedit/pkg-plist b/devel/gtkmozedit/pkg-plist
index 1413bfe6b32c..0b8a2defa055 100644
--- a/devel/gtkmozedit/pkg-plist
+++ b/devel/gtkmozedit/pkg-plist
@@ -105,6 +105,7 @@ include/libgtkmozedit-1/gtkmozedit/gme-observer.h
 include/libgtkmozedit-1/gtkmozedit/gme-supports.h
 include/libgtkmozedit-1/gtkmozedit/gme-web-browser.h
 include/libgtkmozedit-1/gtkmozedit/gtkmozedit.h
+lib/libgtkmozedit-1.a
 lib/libgtkmozedit-1.la
 lib/libgtkmozedit-1.so
 lib/libgtkmozedit-1.so.0
diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile
index d912fc44a00c..48965f2f7059 100644
--- a/devel/guichan/Makefile
+++ b/devel/guichan/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	mva@sysfault.org
 COMMENT=	A small, efficient C++ GUI library designed for games
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 04c109f95d1e..fdd0f61a2171 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A library of assorted spiffy things
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 5461ac586083..30c5dc032fd0 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of C++ classes for flexible logging
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index ded7de44e514..f18998f03015 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Object Activation Framework for GNOME
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
diff --git a/devel/oaf/pkg-plist b/devel/oaf/pkg-plist
index 6ae0a769c48e..2861e3556ee3 100644
--- a/devel/oaf/pkg-plist
+++ b/devel/oaf/pkg-plist
@@ -22,6 +22,7 @@ include/liboaf/oaf-servreg.h
 include/liboaf/oaf-util.h
 include/liboaf/oaf.h
 lib/liboaf.a
+lib/liboaf.la
 lib/liboaf.so
 lib/liboaf.so.0
 share/aclocal/oaf.m4
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index 0b4b68b1e527..49d2b1e18731 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -16,6 +16,7 @@ COMMENT=	Problem reporting system
 
 RUN_DEPENDS=	postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-server
 
+USE_AUTOTOOLS=	libtool:15
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 gconf2 glib20 libgnomeui
diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 53ac3fd9a217..68bfef47ba5e 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -20,6 +20,7 @@ COMMENT=	Multi-plugins for AbiWord
 BUILD_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword
 RUN_DEPENDS=	AbiWord-${ABIVERSION}:${PORTSDIR}/editors/abiword
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gtk20
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 5d2c390aff32..020568579843 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -27,6 +27,7 @@ OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off
 OPTIONS+=	FPX "Build FPX backend -- broken on non-i386 systems" \
 		    ${ARCH:S,i386,on,:C,^[^o].*,off,}
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 5d2c390aff32..020568579843 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -27,6 +27,7 @@ OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off
 OPTIONS+=	FPX "Build FPX backend -- broken on non-i386 systems" \
 		    ${ARCH:S,i386,on,:C,^[^o].*,off,}
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 5d2c390aff32..020568579843 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -27,6 +27,7 @@ OPTIONS=	Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off
 OPTIONS+=	FPX "Build FPX backend -- broken on non-i386 systems" \
 		    ${ARCH:S,i386,on,:C,^[^o].*,off,}
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index 18772b7b6a98..ded806c0d55d 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		Magick.10:${PORTSDIR}/graphics/ImageMagick \
 		pstoedit.0:${PORTSDIR}/graphics/pstoedit
 
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" \
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 4b065db2672f..347552569e40 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	enlightenment
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fonts and font libraries necessary for Enlightenment
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index b7324d8adfea..8ced6839ea0e 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS=	jasper.4:${PORTSDIR}/graphics/jasper \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif
 
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 64b00d8031d8..1af07f2a1fcb 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -16,6 +16,7 @@ COMMENT=	A utility library that includes a wrapper for imlib2
 
 LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index 155bf87755ba..636aad61a604 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ogg.5:${PORTSDIR}/audio/libogg
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 155bf87755ba..636aad61a604 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ogg.5:${PORTSDIR}/audio/libogg
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index e5b79be29127..7168c8b19631 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		popt.0:${PORTSDIR}/devel/popt
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_GNOME=	gnomelibs gdkpixbuf
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 75981469ad92..8db38b09180a 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	geos:${PORTSDIR}/graphics/geos \
 		gdal:${PORTSDIR}/graphics/gdal
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_FREETYPE=	yes
 USE_QT_VER=	3
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 01f3daf36b7c..95588c2b2daa 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	lthack
 USE_X_LIB=	yes
 USE_ICONV=	yes
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 4e554e3f413b..9ad22f1475ab 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -18,6 +18,7 @@ COMMENT=	SCIM IMEngine module like SKK
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_LIB=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 660a029fbc63..4b2061fb7be6 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	uim:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	lthack
 USE_X_LIB=	yes
 USE_ICONV=	yes
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 788e966d20a3..22d960b9dada 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -18,6 +18,7 @@ COMMENT=	X11 terminal emulator based on rxvt/xterm that supports korean
 
 RUN_DEPENDS=	${PREFIX}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanyangfonts
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
diff --git a/math/gambit/Makefile b/math/gambit/Makefile
index 2ee5a0f6817f..7fa0633ff305 100644
--- a/math/gambit/Makefile
+++ b/math/gambit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of tools for doing computation in game theory
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_WX=		2.6
 USE_GNOME=	gnometarget gtk20
diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile
index 854b211d548d..f44584aad858 100644
--- a/multimedia/grpplaylist/Makefile
+++ b/multimedia/grpplaylist/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A playlist for Noatun
 
 LIB_DEPENDS=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
 
+USE_AUTOTOOLS=	libtool:15
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/gstreamer-editor/Makefile b/multimedia/gstreamer-editor/Makefile
index 3ac34e1b3cf2..34796d6176be 100644
--- a/multimedia/gstreamer-editor/Makefile
+++ b/multimedia/gstreamer-editor/Makefile
@@ -18,6 +18,7 @@ COMMENT=	Provide View and Controller counterparts to GStreamer's Model
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
+USE_AUTOTOOLS=	libtool:15
 USE_GSTREAMER80=	core
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile
index 3b3b645618ad..a5036f36f569 100644
--- a/multimedia/gstreamer-ffmpeg80/Makefile
+++ b/multimedia/gstreamer-ffmpeg80/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	gst-ffmpeg-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GStreamer plug-in for manipulating MPEG video streams
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget
diff --git a/multimedia/gstreamer-ffmpeg80/pkg-plist b/multimedia/gstreamer-ffmpeg80/pkg-plist
index 8f34c517fd8c..fac48ea2e0e8 100644
--- a/multimedia/gstreamer-ffmpeg80/pkg-plist
+++ b/multimedia/gstreamer-ffmpeg80/pkg-plist
@@ -1,6 +1,8 @@
 @exec %D/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+lib/gstreamer-%%VERSION%%/libgstffmpeg.a
 lib/gstreamer-%%VERSION%%/libgstffmpeg.la
 lib/gstreamer-%%VERSION%%/libgstffmpeg.so
+lib/gstreamer-%%VERSION%%/libgstpostproc.a
 lib/gstreamer-%%VERSION%%/libgstpostproc.la
 lib/gstreamer-%%VERSION%%/libgstpostproc.so
 @unexec %D/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index 6887c372845f..3d4d231768a8 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -22,6 +22,7 @@ COMMENT=	A set of Python bindings for gstreamer
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
 
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/multimedia/py-gstreamer80/pkg-plist b/multimedia/py-gstreamer80/pkg-plist
index 2accea360823..fcfc65014d6b 100644
--- a/multimedia/py-gstreamer80/pkg-plist
+++ b/multimedia/py-gstreamer80/pkg-plist
@@ -1,10 +1,13 @@
 %%PYTHON_SITELIBDIR%%/gst/__init__.py
 %%PYTHON_SITELIBDIR%%/gst/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gst/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gst/_gst.a
 %%PYTHON_SITELIBDIR%%/gst/_gst.la
 %%PYTHON_SITELIBDIR%%/gst/_gst.so
+%%PYTHON_SITELIBDIR%%/gst/interfaces.a
 %%PYTHON_SITELIBDIR%%/gst/interfaces.la
 %%PYTHON_SITELIBDIR%%/gst/interfaces.so
+%%PYTHON_SITELIBDIR%%/gst/play.a
 %%PYTHON_SITELIBDIR%%/gst/play.la
 %%PYTHON_SITELIBDIR%%/gst/play.so
 libdata/pkgconfig/gst-python-0.8.pc
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index 03685147765c..349320fd9cd5 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -20,6 +20,7 @@ COMMENT=	MPEG-1 player in GTK+ capable of playing MPEG-1 format streams
 
 LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 
+USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 9a3ff46b0b65..7d3e6a6df326 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -30,7 +30,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gdkpixbuf gnometarget
 USE_OPENSSL=	yes
 USE_GETOPT_LONG=	yes
-USE_AUTOTOOLS=	libltdl:15
+USE_AUTOTOOLS=	libltdl:15 libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index 43e340f83c3a..8173ae580405 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Plugin to add msn style "toaster" popups to Gaim
 BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
+USE_AUTOTOOLS=	libtool:15
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
diff --git a/net-im/gaim-openq/Makefile b/net-im/gaim-openq/Makefile
index 808b8e32f591..566ac6c8777c 100644
--- a/net-im/gaim-openq/Makefile
+++ b/net-im/gaim-openq/Makefile
@@ -23,6 +23,7 @@ COMMENT=	A QQ-liked protocol plugin for Gaim
 BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
+USE_AUTOTOOLS=	libtool:15
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 67b8bc9a60ea..570b65531444 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 CONFLICTS?=	ja-gaim-[0-9]* gaim-devel-2*
 
+USE_AUTOTOOLS=	libtool:15
 USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/net-im/icqnd/Makefile b/net-im/icqnd/Makefile
index ed5626d9fdf4..3904d83cefe8 100644
--- a/net-im/icqnd/Makefile
+++ b/net-im/icqnd/Makefile
@@ -16,6 +16,7 @@ COMMENT=	GTK based LICQ GUI program
 BUILD_DEPENDS=	licq:${PORTSDIR}/net-im/licq
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index 43e340f83c3a..8173ae580405 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -19,6 +19,7 @@ COMMENT=	Plugin to add msn style "toaster" popups to Gaim
 BUILD_DEPENDS=	${LOCALBASE}/include/gaim/config.h:${PORTSDIR}/net-im/gaim
 RUN_DEPENDS=	gaim:${PORTSDIR}/net-im/gaim
 
+USE_AUTOTOOLS=	libtool:15
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
diff --git a/net-p2p/gnunet/pkg-plist b/net-p2p/gnunet/pkg-plist
index f6dac0cb4569..157821131b56 100644
--- a/net-p2p/gnunet/pkg-plist
+++ b/net-p2p/gnunet/pkg-plist
@@ -88,16 +88,22 @@ lib/libgnunetutil.so
 lib/libgnunetutil.so.0
 share/GNUnet/gnunet_logo.png
 share/locale/de/LC_MESSAGES/GNUnet.mo
+lib/libgnunetafs_database_directory.a
 lib/libgnunetafs_database_directory.la
 lib/libgnunetafs_database_directory.so
+%%WITH_GDBM%%lib/libgnunetafs_database_gdbm.a
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.la
 %%WITH_GDBM%%lib/libgnunetafs_database_gdbm.so
+%%WITH_TDB%%lib/libgnunetafs_database_tdb.a
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.la
 %%WITH_TDB%%lib/libgnunetafs_database_tdb.so
+%%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.a
 %%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.la
 %%WITH_SQLITE%%lib/libgnunetafs_database_sqlite.so
+%%WITH_IPV6%%lib/libgnunettransport_tcp6.a
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.la
 %%WITH_IPV6%%lib/libgnunettransport_tcp6.so
+%%WITH_IPV6%%lib/libgnunettransport_udp6.a
 %%WITH_IPV6%%lib/libgnunettransport_udp6.la
 %%WITH_IPV6%%lib/libgnunettransport_udp6.so
 @dirrm share/GNUnet
diff --git a/net/dhcp-agent/Makefile b/net/dhcp-agent/Makefile
index f796c59b754b..a0226b037c67 100644
--- a/net/dhcp-agent/Makefile
+++ b/net/dhcp-agent/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 GNU_CONFIGURE=	yes
 
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 
 MAN1=	dhcp-client.1 dhcp-sniff.1
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a645d9d430a5..5305a9c6bbbf 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -26,6 +26,7 @@ RUN_DEPENDS=    dot:${PORTSDIR}/graphics/graphviz \
 
 DBDIR?=		/var/db
 
+USE_AUTOTOOLS=	libtool:15
 USE_GETOPT_LONG=yes
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 2b94526f2adf..bc97c1cff4ff 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -20,6 +20,7 @@ COMMENT=	Admistration tool for cups
 LIB_DEPENDS=	gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups
 RUN_DEPENDS=	gnomesu:${PORTSDIR}/security/libgnomesu
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index ab97e549da2e..188bd4be43af 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -25,6 +25,7 @@ USE_GHOSTSCRIPT_RUN=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile
index f8ab33c6e21f..5888f0bfc5a2 100644
--- a/textproc/scim-input-pad/Makefile
+++ b/textproc/scim-input-pad/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 INSTALLS_SHLIB=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile
index 4440a3aaa06d..20715281f5cd 100644
--- a/textproc/scim-table-imengine/Makefile
+++ b/textproc/scim-table-imengine/Makefile
@@ -19,6 +19,7 @@ COMMENT=	SCIM table based input method engine
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	intlhack
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index 242a3a4c0a3e..0b8f0c9edb2f 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A library for people wanting to use libwww with gtk/gnome
 
 LIB_DEPENDS=	wwwzip.1:${PORTSDIR}/www/libwww
 
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/inti-sourceview/Makefile b/x11-toolkits/inti-sourceview/Makefile
index f3c96a0eaa1b..86c699775697 100644
--- a/x11-toolkits/inti-sourceview/Makefile
+++ b/x11-toolkits/inti-sourceview/Makefile
@@ -18,6 +18,7 @@ COMMENT=	An Inti binding for GtkSourceView
 
 LIB_DEPENDS=	inti-1.0.9:${PORTSDIR}/x11-toolkits/inti
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gtksourceview gnomehack gnomeprefix
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/inti-sourceview/pkg-plist b/x11-toolkits/inti-sourceview/pkg-plist
index 2086ded758f0..3e9a2cde2c47 100644
--- a/x11-toolkits/inti-sourceview/pkg-plist
+++ b/x11-toolkits/inti-sourceview/pkg-plist
@@ -16,6 +16,8 @@ include/inti-1.0/inti/inti-sourceview.h
 @dirrm include/inti-1.0/inti/gtk-sourceview/private
 @dirrm include/inti-1.0/inti/gtk-sourceview
 lib/inti-1.0/include/inti-sourceview-config.h
+lib/libinti-sourceview-1.0.a
+lib/libinti-sourceview-1.0.la
 lib/libinti-sourceview-1.0.so
 lib/libinti-sourceview-1.0.so.0
 libdata/pkgconfig/inti-sourceview-1.0.pc
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index b4f7c894c515..5a28f743990f 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		gnomeprintmm-2.5.2:${PORTSDIR}/print/libgnomeprintmm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index fba131956ce5..61983cbd40bf 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -25,6 +25,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 LATEST_LINK=	libgnomeuimm26
 
+USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile
index ea215158109a..7e29f5ef5e45 100644
--- a/x11-toolkits/libsexymm/Makefile
+++ b/x11-toolkits/libsexymm/Makefile
@@ -16,6 +16,7 @@ COMMENT=		C++ bindings for libsexy
 LIB_DEPENDS=		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \
 			sexy:${PORTSDIR}/x11-toolkits/libsexy
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=		gnomehack
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile
index e3362ee32760..0aab8095677c 100644
--- a/x11-toolkits/py-sexy/Makefile
+++ b/x11-toolkits/py-sexy/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Libsexy bindings for Python
 
 LIB_DEPENDS=	sexy.2:${PORTSDIR}/x11-toolkits/libsexy
 
+USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	pygtk2 pkgconfig
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/py-sexy/pkg-plist b/x11-toolkits/py-sexy/pkg-plist
index 51598e4ae9d0..2df18ee32b56 100644
--- a/x11-toolkits/py-sexy/pkg-plist
+++ b/x11-toolkits/py-sexy/pkg-plist
@@ -1,4 +1,5 @@
 %%PYTHON_SITELIBDIR%%/gtk-2.0/sexy.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/sexy.a
 %%PYTHON_SITELIBDIR%%/gtk-2.0/sexy.la
 share/pygtk/2.0/defs/sexy.defs
 @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile
index a99db137e536..145df29143fd 100644
--- a/x11-wm/fluxspace/Makefile
+++ b/x11-wm/fluxspace/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A window manager and workspace enhancer and integrator
 BUILD_DEPENDS=	imlib2-config:${PORTSDIR}/graphics/imlib2 \
 		swig:${PORTSDIR}/devel/swig13
 
+USE_AUTOTOOLS=	libtool:15
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 667871d47edd..8d22ce873751 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -24,6 +24,7 @@ RUN_DEPENDS=	\
 
 DEPRECATED=	"Development ceased"
 
+USE_AUTOTOOLS=	libtool:15
 USE_PERL5_BUILD=yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 9a7a7249de12..414667325b79 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -19,6 +19,7 @@ COMMENT=	C++ wrapper for libgnome library
 LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
+USE_AUTOTOOLS=	libtool:15
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnome
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 6508e0b7c9d3..5321e278c0ca 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 settings management library used by most XFce 4 modules
 
+USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
diff --git a/x11/libxfce4mcs/pkg-plist b/x11/libxfce4mcs/pkg-plist
index 913ac3aa4e09..8df682bda1e8 100644
--- a/x11/libxfce4mcs/pkg-plist
+++ b/x11/libxfce4mcs/pkg-plist
@@ -2,9 +2,11 @@ include/xfce4/libxfce4mcs/mcs-client.h
 include/xfce4/libxfce4mcs/mcs-client-enum-types.h
 include/xfce4/libxfce4mcs/mcs-common.h
 include/xfce4/libxfce4mcs/mcs-manager.h
+lib/libxfce4mcs-client.a
 lib/libxfce4mcs-client.la
 lib/libxfce4mcs-client.so
 lib/libxfce4mcs-client.so.3
+lib/libxfce4mcs-manager.a
 lib/libxfce4mcs-manager.la
 lib/libxfce4mcs-manager.so
 lib/libxfce4mcs-manager.so.3