Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 56 insertions, 1 deletions

diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 40ac78aa1f11..c3b5d9917911 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.8.12
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.8,} \
 		ftp://ftp.gtk.org/pub/gtk/v2.8/ \
@@ -36,7 +37,7 @@ USE_XPM=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=  libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist
index f76d097bb68e..7201720ae6fd 100644
--- a/x11-toolkits/gtk20/pkg-plist
+++ b/x11-toolkits/gtk20/pkg-plist
@@ -228,41 +228,95 @@ include/gtk-2.0/gtk/gtkvscrollbar.h
 include/gtk-2.0/gtk/gtkvseparator.h
 include/gtk-2.0/gtk/gtkwidget.h
 include/gtk-2.0/gtk/gtkwindow.h
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.a
+lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.la
 lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-inuktitut.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ipa.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-thai-broken.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-er.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-ti-et.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.a
+lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.la
 lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-jpeg.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pcx.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-png.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-pnm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ras.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tga.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-tiff.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-wbmp.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.a
+lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.la
 lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so
 lib/libgdk-x11-2.0.a
+lib/libgdk-x11-2.0.la
 lib/libgdk-x11-2.0.so
 lib/libgdk-x11-2.0.so.0
 lib/libgdk_pixbuf-2.0.a
+lib/libgdk_pixbuf-2.0.la
 lib/libgdk_pixbuf-2.0.so
 lib/libgdk_pixbuf-2.0.so.0
 lib/libgdk_pixbuf_xlib-2.0.a
+lib/libgdk_pixbuf_xlib-2.0.la
 lib/libgdk_pixbuf_xlib-2.0.so
 lib/libgdk_pixbuf_xlib-2.0.so.0
 lib/libgtk-x11-2.0.a
+lib/libgtk-x11-2.0.la
 lib/libgtk-x11-2.0.so
 lib/libgtk-x11-2.0.so.0
 libdata/pkgconfig/gdk-2.0.pc