5 files changed, 15 insertions, 12 deletions

diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index a80b52d38699..326efdb569f9 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	13
+PORTREVISION=	15
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
@@ -19,9 +19,8 @@ COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GNOME=	glib12
-USE_AUTOTOOLS=	libtool:13:inc
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-suffix
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gtk12 --with-native-locale \
 		--with-xinput=xfree
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -44,5 +43,9 @@ pre-build:
 post-install:
 	@${MKDIR} ${PREFIX}/lib/gtk/themes/engines
 	@${LN} -sf ${PREFIX}/bin/gtk-config ${PREFIX}/bin/gtk12-config
+.for lib in gdk gtk
+	@${RM} ${PREFIX}/lib/lib${lib}.la ${PREFIX}/lib/lib${lib}.so
+	@${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-12.a
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab
index 620f9437519a..5ef60b088b4d 100644
--- a/x11-toolkits/gtk12/files/patch-ab
+++ b/x11-toolkits/gtk12/files/patch-ab
@@ -14,6 +14,6 @@
        done
  
 -      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
-+      echo $libdirs @x_ldflags@ -lgtk@LT_RELEASE@ -lgdk@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
++      echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm
  fi      
  
diff --git a/x11-toolkits/gtk12/files/patch-gdk.pc.in b/x11-toolkits/gtk12/files/patch-gdk.pc.in
index f7b7a7b056df..5db084b049ac 100644
--- a/x11-toolkits/gtk12/files/patch-gdk.pc.in
+++ b/x11-toolkits/gtk12/files/patch-gdk.pc.in
@@ -6,5 +6,5 @@
  Requires: glib
 -Libs: -L${libdir} @x_ldflags@ -lgdk @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
 -Cflags: -I${includedir}/gtk-1.2 @x_cflags@
-+Libs: -L${libdir} @x_ldflags@ -lgdk12 @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
++Libs: -L${libdir} @x_ldflags@ -lgdk-12 @INTLLIBS@ @GDK_WLIBS@ @x_libs@ -lm
 +Cflags: -I${includedir} @x_cflags@
diff --git a/x11-toolkits/gtk12/files/patch-gtk+.pc.in b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
index dc05caf18bdb..6ef64656dbc5 100644
--- a/x11-toolkits/gtk12/files/patch-gtk+.pc.in
+++ b/x11-toolkits/gtk12/files/patch-gtk+.pc.in
@@ -8,5 +8,5 @@ $FreeBSD$
  Version: @VERSION@
  Requires: gdk
 -Libs: -L${libdir} -lgtk
-+Libs: -L${libdir} -lgtk12
++Libs: -L${libdir} -lgtk-12
  Cflags: 
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index d228143ed30c..85bb6e41b339 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -120,12 +120,12 @@ include/gtk12/gtk/gtkvscrollbar.h
 include/gtk12/gtk/gtkvseparator.h
 include/gtk12/gtk/gtkwidget.h
 include/gtk12/gtk/gtkwindow.h
-lib/libgdk12.a
-lib/libgdk12.so
-lib/libgdk12.so.2
-lib/libgtk12.a
-lib/libgtk12.so
-lib/libgtk12.so.2
+lib/libgdk-12.a
+lib/libgdk-12.so
+lib/libgdk-12.so.2
+lib/libgtk-12.a
+lib/libgtk-12.so
+lib/libgtk-12.so.2
 libdata/pkgconfig/gdk.pc
 libdata/pkgconfig/gtk+.pc
 share/aclocal/gtk.m4