Fix runtime of py-gimp, make sure we link to the right libraries so

we don't get unresolved symbols [1].

While here:
Update LIB_DEPENDS to new syntax
USE_GMAKE => USES=gmake
Enable stage support

PR:		ports/182140 [1]
Submitted by:	Chris <bsd-lists@1command.com>

4 files changed, 27 insertions, 28 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 4dc990f89bd..3875948d602 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -24,21 +24,20 @@ LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		tiff:${PORTSDIR}/graphics/tiff \
-		lcms:${PORTSDIR}/graphics/lcms \
-		gegl-0.2:${PORTSDIR}/graphics/gegl \
-		babl-0.1:${PORTSDIR}/x11/babl
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		liblcms.so:${PORTSDIR}/graphics/lcms \
+		libgegl-0.2.so:${PORTSDIR}/graphics/gegl \
+		libbabl-0.1.so:${PORTSDIR}/x11/babl
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 
 USE_BZIP2=	yes
 USE_XORG=	xpm xmu xext
-USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME+=	intltool intlhack gtk20 libartlgpl2 ltverhack gnomehier \
 		desktopfileutils
-USES=		desktop-file-utils gettext pathfix pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -67,7 +66,6 @@ HELPBROWSER_DESC=	Internal help browser
 
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if defined(GIMP_SLAVE)
@@ -76,21 +74,16 @@ GIMP_LIBS=	`${PKG_CONFIG} --libs gimp-2.0`
 GIMP_THUMB_LIBS=`${PKG_CONFIG} --libs gimpthumb-2.0`
 GIMP_UI_LIBS=	`${PKG_CONFIG} --libs gimpui-2.0`
 
-LIB_DEPENDS+=	gimp-2.0:${PORTSDIR}/graphics/gimp-app
+LIB_DEPENDS+=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app
 
 .else
 
-MAN1+=	gimp-2.8.1 gimptool-2.0.1
-MAN5+=	gimprc-2.8.5
-MLINKS=	gimp-2.8.1 gimp.1 \
-	gimprc-2.8.5 gimprc.5
-
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MAA}
-LIB_DEPENDS+=		aa:${PORTSDIR}/graphics/aalib
+LIB_DEPENDS+=		libaa.so:${PORTSDIR}/graphics/aalib
 PLIST_SUB+=		AA=""
 .else
 CONFIGURE_ARGS+=	--without-aa
@@ -98,7 +91,7 @@ PLIST_SUB+=		AA="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=	--with-dbus
 .else
 CONFIGURE_ARGS+=	--without-dbus
@@ -116,12 +109,12 @@ PLIST_SUB+=		GS="@comment "
 .if ${PORT_OPTIONS:MGVFS}
 USE_GNOME+=		gvfs
 .else
-LIB_DEPENDS+=		curl:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=		libcurl.so:${PORTSDIR}/ftp/curl
 CONFIGURE_ARGS+=	--without-gvfs
 .endif
 
 .if ${PORT_OPTIONS:MHELPBROWSER}
-LIB_DEPENDS+=		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=		libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
 CONFIGURE_ARGS+=	--with-webkit
 PLIST_SUB+=		HELPBROWSER=""
 .else
@@ -130,7 +123,7 @@ PLIST_SUB+=		HELPBROWSER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MJASPER}
-LIB_DEPENDS+=		jasper:${PORTSDIR}/graphics/jasper
+LIB_DEPENDS+=		libjasper.so:${PORTSDIR}/graphics/jasper
 CONFIGURE_ARGS+=	--with-libjasper
 PLIST_SUB+=		JASPER=""
 .else
@@ -139,7 +132,7 @@ PLIST_SUB+=		JASPER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLIBEXIF}
-LIB_DEPENDS+=		exif:${PORTSDIR}/graphics/libexif
+LIB_DEPENDS+=		libexif.so:${PORTSDIR}/graphics/libexif
 PLIST_SUB+=		EXIF=""
 .else
 CONFIGURE_ARGS+=	--without-libexif
@@ -147,7 +140,7 @@ PLIST_SUB+=		EXIF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLIBMNG}
-LIB_DEPENDS+=		mng:${PORTSDIR}/graphics/libmng
+LIB_DEPENDS+=		libmng.so:${PORTSDIR}/graphics/libmng
 PLIST_SUB+=		MNG=""
 .else
 CONFIGURE_ARGS+=	--without-libmng
@@ -164,7 +157,7 @@ PLIST_SUB+=		SVG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPOPPLER}
-LIB_DEPENDS+=		poppler-glib:${PORTSDIR}/graphics/poppler-glib
+LIB_DEPENDS+=		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 PLIST_SUB+=		POPPLER=""
 .else
 CONFIGURE_ARGS+=	--without-poppler
@@ -178,7 +171,7 @@ CONFIGURE_ARGS+=	--disable-mmx \
 .endif
 
 .if ${PORT_OPTIONS:MWMF}
-LIB_DEPENDS+=		wmf:${PORTSDIR}/graphics/libwmf
+LIB_DEPENDS+=		libwmf.so:${PORTSDIR}/graphics/libwmf
 PLIST_SUB+=		WMF=""
 .else
 CONFIGURE_ARGS+=	--without-wmf
diff --git a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
index aaa49f5b3fa..42cfaafab59 100644
--- a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
+++ b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
@@ -88,7 +88,7 @@
 -	$(libgimp)		\
 -	$(libgimpcolor)		\
 -	$(libgimpbase)		\
-+	%%GIMP_LIBS%%		\
++	%%GIMP_UI_LIBS%%	\
  	$(GTK_LIBS)		\
  	$(PYLINK_LIBS)		\
  	$(RT_LIBS)		\
@@ -97,7 +97,7 @@
  
  gimpthumb_la_LIBADD = \
 -	$(libgimpthumb)		\
-+	%%GIMP_LIBS%%		\
++	%%GIMP_THUMB_LIBS%%	\
  	$(GDK_PIXBUF_LIBS)	\
  	$(PYLINK_LIBS)
  
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index bd93b4d9d67..358b0cb3250 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -467,6 +467,11 @@ libexec/gimp/2.2/plug-ins/web-browser
 %%HELPBROWSER%%libexec/gimp/2.2/plug-ins/web-page
 libexec/gimp/2.2/plug-ins/whirl-pinch
 libexec/gimp/2.2/plug-ins/wind
+man/man1/gimp-2.8.1.gz
+man/man1/gimp.1.gz
+man/man1/gimptool-2.0.1.gz
+man/man5/gimprc-2.8.5.gz
+man/man5/gimprc.5.gz
 share/aclocal/gimp-2.0.m4
 share/applications/gimp.desktop
 share/doc/gimp/libgimp/GimpAspectPreview.html
@@ -2208,6 +2213,8 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/tt/LC_MESSAGES
 @dirrmtry share/locale/tt
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index f1d556065e9..7a57ef6344a 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #    $MCom: ports/graphics/py-gimp/Makefile,v 1.6 2009/08/25 00:06:39 marcus Exp $
 
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -22,5 +22,4 @@ INSTALL_WRKSRC=	${WRKSRC}/plug-ins/pygimp
 
 MASTERDIR=	${.CURDIR}/../../graphics/gimp-app
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"