Conversion to a single libtool environment.

Approved by:	portmgr (kris)

2 files changed, 26 insertions, 2 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 285d1fab2204..577556aa7d42 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gimp
 PORTVERSION=	2.2.10
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -38,11 +39,10 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
 CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 55fd7863dad1..44344fa0e255 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -171,13 +171,29 @@ include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 libexec/gimp/2.2/environ/default.env
 %%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
 %%PYTHON:%%libexec/gimp/2.2/python/pygimp-logo.png
+libexec/gimp/2.2/modules/libcdisplay_colorblind.a
+libexec/gimp/2.2/modules/libcdisplay_colorblind.la
 libexec/gimp/2.2/modules/libcdisplay_colorblind.so
+libexec/gimp/2.2/modules/libcdisplay_gamma.a
+libexec/gimp/2.2/modules/libcdisplay_gamma.la
 libexec/gimp/2.2/modules/libcdisplay_gamma.so
+libexec/gimp/2.2/modules/libcdisplay_highcontrast.a
+libexec/gimp/2.2/modules/libcdisplay_highcontrast.la
 libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
+libexec/gimp/2.2/modules/libcdisplay_proof.a
+libexec/gimp/2.2/modules/libcdisplay_proof.la
 libexec/gimp/2.2/modules/libcdisplay_proof.so
+libexec/gimp/2.2/modules/libcolorsel_cmyk.a
+libexec/gimp/2.2/modules/libcolorsel_cmyk.la
 libexec/gimp/2.2/modules/libcolorsel_cmyk.so
+libexec/gimp/2.2/modules/libcolorsel_triangle.a
+libexec/gimp/2.2/modules/libcolorsel_triangle.la
 libexec/gimp/2.2/modules/libcolorsel_triangle.so
+libexec/gimp/2.2/modules/libcolorsel_water.a
+libexec/gimp/2.2/modules/libcolorsel_water.la
 libexec/gimp/2.2/modules/libcolorsel_water.so
+libexec/gimp/2.2/modules/libcontroller_midi.a
+libexec/gimp/2.2/modules/libcontroller_midi.la
 libexec/gimp/2.2/modules/libcontroller_midi.so
 libexec/gimp/2.2/plug-ins/AlienMap2
 libexec/gimp/2.2/plug-ins/CEL
@@ -371,27 +387,35 @@ libexec/gimp/2.2/plug-ins/zealouscrop
 %%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyc
 %%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyo
 lib/libgimp-2.0.a
+lib/libgimp-2.0.la
 lib/libgimp-2.0.so
 lib/libgimp-2.0.so.%%SHLIBVER%%
 lib/libgimpbase-2.0.a
+lib/libgimpbase-2.0.la
 lib/libgimpbase-2.0.so
 lib/libgimpbase-2.0.so.%%SHLIBVER%%
 lib/libgimpcolor-2.0.a
+lib/libgimpcolor-2.0.la
 lib/libgimpcolor-2.0.so
 lib/libgimpcolor-2.0.so.%%SHLIBVER%%
 lib/libgimpmath-2.0.a
+lib/libgimpmath-2.0.la
 lib/libgimpmath-2.0.so
 lib/libgimpmath-2.0.so.%%SHLIBVER%%
 lib/libgimpmodule-2.0.a
+lib/libgimpmodule-2.0.la
 lib/libgimpmodule-2.0.so
 lib/libgimpmodule-2.0.so.%%SHLIBVER%%
 lib/libgimpthumb-2.0.a
+lib/libgimpthumb-2.0.la
 lib/libgimpthumb-2.0.so
 lib/libgimpthumb-2.0.so.%%SHLIBVER%%
 lib/libgimpui-2.0.a
+lib/libgimpui-2.0.la
 lib/libgimpui-2.0.so
 lib/libgimpui-2.0.so.%%SHLIBVER%%
 lib/libgimpwidgets-2.0.a
+lib/libgimpwidgets-2.0.la
 lib/libgimpwidgets-2.0.so
 lib/libgimpwidgets-2.0.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-2.0.pc