- Convert graphics/libwmf to USES=libtool and bump dependent ports

- Add INSTALL_TARGET=install-strip

6 files changed, 13 insertions, 29 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 8376ef86bf9f..83f9f751cb01 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.8.9-4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 17be5d28be2a..fa8096df838c 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gimageview
 PORTVERSION=	0.2.27
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	graphics
 MASTER_SITES=	SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}
 
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 7d2d18d3964e..1cbcabe49609 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME?=	gimp-app
 PORTVERSION=	2.8.10
-PORTREVISION?=	4
+PORTREVISION?=	5
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 1677eb521496..4f661c056cab 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libwmf
 PORTVERSION=	0.2.8.4
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics
 MASTER_SITES=	SF/wvware/${PORTNAME}/${PORTVERSION}
 
@@ -12,19 +12,19 @@ COMMENT=	Tools and library for converting Microsoft WMF (windows metafile)
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
 CONFLICTS?=	libwmf-nox11-[0-9]*
 
-USE_AUTOTOOLS=	libtool
-USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sys-gd=no \
 		--with-png=${LOCALBASE} --with-jpeg=${LOCALBASE} \
 		--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts
+INSTALL_TARGET=	install-strip
+USES=		libtool
+USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 PORTDOCS=	*
@@ -41,10 +41,9 @@ X11_CONFIGURE_OFF=--with-x=no
 post-patch:
 	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|@LT_CURRENT@|2|g ; \
-		 s|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \
+	@${REINPLACE_CMD} -e \
+		's|@LIBWMF_GDK_PIXBUF_TRUE@|#|g ; \
 		 s|@LIBWMF_GDK_PIXBUF_FALSE@||g ; \
-		 s|-release $$(LT_RELEASE)||g ; \
 		 s|: install-loaderLTLIBRARIES|:|g' ${WRKSRC}/src/Makefile.in
 
 post-install:
diff --git a/graphics/libwmf/files/patch-ltmain.sh b/graphics/libwmf/files/patch-ltmain.sh
deleted file mode 100644
index f83fdb86dd19..000000000000
--- a/graphics/libwmf/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Wed May 15 18:57:35 2002
-+++ ltmain.sh	Fri May 17 21:18:44 2002
-@@ -4731,10 +4731,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/libwmf/pkg-plist b/graphics/libwmf/pkg-plist
index d03cfba1f490..9ccfee8a5d2f 100644
--- a/graphics/libwmf/pkg-plist
+++ b/graphics/libwmf/pkg-plist
@@ -29,14 +29,14 @@ include/libwmf/macro.h
 include/libwmf/svg.h
 include/libwmf/types.h
 include/libwmf/x.h
+lib/libwmf-0.2.so.7
+lib/libwmf-0.2.so.7.1.0
 lib/libwmf.a
-lib/libwmf.la
 lib/libwmf.so
-lib/libwmf.so.2
+lib/libwmflite-0.2.so.7
+lib/libwmflite-0.2.so.7.0.1
 lib/libwmflite.a
-lib/libwmflite.la
 lib/libwmflite.so
-lib/libwmflite.so.7
 %%DATADIR%%/fonts/fontmap
 %%DATADIR%%/fonts/n019003l.afm
 %%DATADIR%%/fonts/n019003l.pfb