Moudulalize GraphicsMagick, for let PerlMagick to lightweight.

Bump PKGREVISION.

It introduce bump PKGREVISION of p5-GraphicsMagick.
While here,
 * move distinfo and patches location to Makefile.common.
 * let to exactly linked against installed GraphicsMagick.

6 files changed, 122 insertions, 39 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index b67a36f91d8..17145ab4f3a 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.41 2011/05/17 11:44:28 obache Exp $
+# $NetBSD: Makefile,v 1.42 2011/05/18 14:26:26 obache Exp $
 #
 
 .include "Makefile.common"
-PKGREVISION=	5
+PKGREVISION=	6
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.graphicsmagick.org/
 COMMENT=	X application for displaying and manipulating images
@@ -14,9 +14,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake pkg-config gs
+USE_TOOLS+=	gmake pkg-config gs:run
 USE_FEATURES=	vsnprintf		# optional but recommended for security
 GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS+=	--with-modules=yes
+CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--with-gs-font-dir=${URW_FONTS_DIR}/share/fonts/urw
 
 PKGCONFIG_OVERRIDE+=	magick/GraphicsMagick.pc.in \
diff --git a/graphics/GraphicsMagick/Makefile.common b/graphics/GraphicsMagick/Makefile.common
index d22b9586a84..036b15852a4 100755
--- a/graphics/GraphicsMagick/Makefile.common
+++ b/graphics/GraphicsMagick/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2011/05/16 01:18:54 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.2 2011/05/18 14:26:26 obache Exp $
 #
 # used by graphics/p5-GraphicsMagick/Makefile
 
@@ -11,3 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=graphicsmagick/} \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/${GM_MAJOR_VER}/
 
 CATEGORIES=	graphics
+
+DISTINFO_FILE=	${.CURDIR}/../../graphics/GraphicsMagick/distinfo
+#FILESDIR=	${.CURDIR}/../../graphics/GraphicsMagick/files
+PATCHDIR=	${.CURDIR}/../../graphics/GraphicsMagick/patches
diff --git a/graphics/GraphicsMagick/PLIST b/graphics/GraphicsMagick/PLIST
index b81e21e1a89..ff7645dc80e 100644
--- a/graphics/GraphicsMagick/PLIST
+++ b/graphics/GraphicsMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2010/02/05 05:09:07 obache Exp $
+@comment $NetBSD: PLIST,v 1.15 2011/05/18 14:26:26 obache Exp $
 bin/GraphicsMagick++-config
 bin/GraphicsMagick-config
 bin/GraphicsMagickWand-config
@@ -89,6 +89,100 @@ lib/${PKGNAME}/config/type-ghostscript.mgk
 lib/${PKGNAME}/config/type-solaris.mgk
 lib/${PKGNAME}/config/type-windows.mgk
 lib/${PKGNAME}/config/type.mgk
+lib/${PKGNAME}/modules-Q8/coders/art.la
+lib/${PKGNAME}/modules-Q8/coders/avi.la
+lib/${PKGNAME}/modules-Q8/coders/avs.la
+lib/${PKGNAME}/modules-Q8/coders/bmp.la
+lib/${PKGNAME}/modules-Q8/coders/cals.la
+lib/${PKGNAME}/modules-Q8/coders/caption.la
+lib/${PKGNAME}/modules-Q8/coders/cineon.la
+lib/${PKGNAME}/modules-Q8/coders/cmyk.la
+lib/${PKGNAME}/modules-Q8/coders/cut.la
+lib/${PKGNAME}/modules-Q8/coders/dcm.la
+lib/${PKGNAME}/modules-Q8/coders/dcraw.la
+lib/${PKGNAME}/modules-Q8/coders/dib.la
+lib/${PKGNAME}/modules-Q8/coders/dpx.la
+lib/${PKGNAME}/modules-Q8/coders/ept.la
+lib/${PKGNAME}/modules-Q8/coders/fax.la
+lib/${PKGNAME}/modules-Q8/coders/fits.la
+lib/${PKGNAME}/modules-Q8/coders/gif.la
+lib/${PKGNAME}/modules-Q8/coders/gradient.la
+lib/${PKGNAME}/modules-Q8/coders/gray.la
+lib/${PKGNAME}/modules-Q8/coders/histogram.la
+lib/${PKGNAME}/modules-Q8/coders/hrz.la
+lib/${PKGNAME}/modules-Q8/coders/html.la
+lib/${PKGNAME}/modules-Q8/coders/icon.la
+lib/${PKGNAME}/modules-Q8/coders/identity.la
+lib/${PKGNAME}/modules-Q8/coders/jbig.la
+${PLIST.jasper}lib/${PKGNAME}/modules-Q8/coders/jp2.la
+lib/${PKGNAME}/modules-Q8/coders/jpeg.la
+lib/${PKGNAME}/modules-Q8/coders/label.la
+lib/${PKGNAME}/modules-Q8/coders/locale.la
+lib/${PKGNAME}/modules-Q8/coders/logo.la
+lib/${PKGNAME}/modules-Q8/coders/map.la
+lib/${PKGNAME}/modules-Q8/coders/mat.la
+lib/${PKGNAME}/modules-Q8/coders/matte.la
+lib/${PKGNAME}/modules-Q8/coders/meta.la
+lib/${PKGNAME}/modules-Q8/coders/miff.la
+lib/${PKGNAME}/modules-Q8/coders/mono.la
+lib/${PKGNAME}/modules-Q8/coders/mpc.la
+lib/${PKGNAME}/modules-Q8/coders/mpeg.la
+lib/${PKGNAME}/modules-Q8/coders/mpr.la
+lib/${PKGNAME}/modules-Q8/coders/msl.la
+lib/${PKGNAME}/modules-Q8/coders/mtv.la
+lib/${PKGNAME}/modules-Q8/coders/mvg.la
+lib/${PKGNAME}/modules-Q8/coders/null.la
+lib/${PKGNAME}/modules-Q8/coders/otb.la
+lib/${PKGNAME}/modules-Q8/coders/palm.la
+lib/${PKGNAME}/modules-Q8/coders/pcd.la
+lib/${PKGNAME}/modules-Q8/coders/pcl.la
+lib/${PKGNAME}/modules-Q8/coders/pcx.la
+lib/${PKGNAME}/modules-Q8/coders/pdb.la
+lib/${PKGNAME}/modules-Q8/coders/pdf.la
+lib/${PKGNAME}/modules-Q8/coders/pict.la
+lib/${PKGNAME}/modules-Q8/coders/pix.la
+lib/${PKGNAME}/modules-Q8/coders/plasma.la
+lib/${PKGNAME}/modules-Q8/coders/png.la
+lib/${PKGNAME}/modules-Q8/coders/pnm.la
+lib/${PKGNAME}/modules-Q8/coders/preview.la
+lib/${PKGNAME}/modules-Q8/coders/ps.la
+lib/${PKGNAME}/modules-Q8/coders/ps2.la
+lib/${PKGNAME}/modules-Q8/coders/ps3.la
+lib/${PKGNAME}/modules-Q8/coders/psd.la
+lib/${PKGNAME}/modules-Q8/coders/pwp.la
+lib/${PKGNAME}/modules-Q8/coders/rgb.la
+lib/${PKGNAME}/modules-Q8/coders/rla.la
+lib/${PKGNAME}/modules-Q8/coders/rle.la
+lib/${PKGNAME}/modules-Q8/coders/sct.la
+lib/${PKGNAME}/modules-Q8/coders/sfw.la
+lib/${PKGNAME}/modules-Q8/coders/sgi.la
+lib/${PKGNAME}/modules-Q8/coders/stegano.la
+lib/${PKGNAME}/modules-Q8/coders/sun.la
+lib/${PKGNAME}/modules-Q8/coders/svg.la
+lib/${PKGNAME}/modules-Q8/coders/tga.la
+lib/${PKGNAME}/modules-Q8/coders/tiff.la
+lib/${PKGNAME}/modules-Q8/coders/tile.la
+lib/${PKGNAME}/modules-Q8/coders/tim.la
+lib/${PKGNAME}/modules-Q8/coders/topol.la
+lib/${PKGNAME}/modules-Q8/coders/ttf.la
+lib/${PKGNAME}/modules-Q8/coders/txt.la
+lib/${PKGNAME}/modules-Q8/coders/uil.la
+lib/${PKGNAME}/modules-Q8/coders/url.la
+lib/${PKGNAME}/modules-Q8/coders/uyvy.la
+lib/${PKGNAME}/modules-Q8/coders/vicar.la
+lib/${PKGNAME}/modules-Q8/coders/vid.la
+lib/${PKGNAME}/modules-Q8/coders/viff.la
+lib/${PKGNAME}/modules-Q8/coders/wbmp.la
+lib/${PKGNAME}/modules-Q8/coders/wmf.la
+lib/${PKGNAME}/modules-Q8/coders/wpg.la
+${PLIST.x11}lib/${PKGNAME}/modules-Q8/coders/x.la
+lib/${PKGNAME}/modules-Q8/coders/xbm.la
+lib/${PKGNAME}/modules-Q8/coders/xc.la
+lib/${PKGNAME}/modules-Q8/coders/xcf.la
+lib/${PKGNAME}/modules-Q8/coders/xpm.la
+${PLIST.x11}lib/${PKGNAME}/modules-Q8/coders/xwd.la
+lib/${PKGNAME}/modules-Q8/coders/yuv.la
+lib/${PKGNAME}/modules-Q8/filters/analyze.la
 lib/libGraphicsMagick++.la
 lib/libGraphicsMagick.la
 lib/libGraphicsMagickWand.la
@@ -261,5 +355,3 @@ share/doc/GraphicsMagick/www/wand/drawing_wand.html
 share/doc/GraphicsMagick/www/wand/magick_wand.html
 share/doc/GraphicsMagick/www/wand/pixel_wand.html
 share/doc/GraphicsMagick/www/wand/wand.html
-@pkgdir lib/${PKGNAME}/modules-Q8/filters
-@pkgdir lib/${PKGNAME}/modules-Q8/coders
diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk
index 79d50eb64dc..65d284220c1 100644
--- a/graphics/GraphicsMagick/buildlink3.mk
+++ b/graphics/GraphicsMagick/buildlink3.mk
@@ -1,36 +1,20 @@
-# $NetBSD: buildlink3.mk,v 1.18 2011/05/17 11:34:04 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2011/05/18 14:26:26 obache Exp $
 
 BUILDLINK_TREE+=	GraphicsMagick
 
 .if !defined(GRAPHICSMAGICK_BUILDLINK3_MK)
 GRAPHICSMAGICK_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.2
-BUILDLINK_ABI_DEPENDS.GraphicsMagick?=	GraphicsMagick>=1.3.12nb4
+BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=1.3.12nb6
 BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick
 
-.include "../../mk/bsd.fast.prefs.mk"
-
-_GM_PRE_X11_OPTION!= \
-	if ${PKG_INFO} -qe 'GraphicsMagick<=1.3.12nb4'; then		\
-		${ECHO} yes;						\
-	else								\
-		${ECHO} no;						\
-	fi
-
 pkgbase := GraphicsMagick
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mghostscript)
 .include "../../print/ghostscript/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mjasper)
-.include "../../graphics/jasper/buildlink3.mk"
-.endif
-.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mwmf)
-.include "../../graphics/libwmf/buildlink3.mk"
-.endif
-.if ${_GM_PRE_X11_OPTION} == "yes" || !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mx11)
+.if !empty(PKG_BUILD_OPTIONS.GraphicsMagick:Mx11)
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
@@ -41,15 +25,9 @@ pkgbase := GraphicsMagick
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libexif/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/tiff/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GRAPHICSMAGICK_BUILDLINK3_MK
 
diff --git a/graphics/GraphicsMagick/options.mk b/graphics/GraphicsMagick/options.mk
index 25667b952c8..a1d5eabfbfc 100755
--- a/graphics/GraphicsMagick/options.mk
+++ b/graphics/GraphicsMagick/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2011/05/16 01:18:54 dmcmahill Exp $
+# $NetBSD: options.mk,v 1.2 2011/05/18 14:26:26 obache Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.GraphicsMagick
 PKG_SUPPORTED_OPTIONS=	bzip2 x11 jasper ghostscript wmf
@@ -6,6 +6,8 @@ PKG_SUGGESTED_OPTIONS=	bzip2 x11 jasper
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	jasper x11
+
 .if !empty(PKG_OPTIONS:Mbzip2)
 .include "../../archivers/bzip2/buildlink3.mk"
 .else
@@ -17,6 +19,7 @@ CONFIGURE_ARGS+=	--without-bzlib
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+PLIST.x11=		yes
 .else
 CONFIGURE_ARGS+=	--without-x
 .endif
@@ -25,6 +28,7 @@ CONFIGURE_ARGS+=	--without-x
 BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.701.0
 .include "../../graphics/jasper/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-jp2
+PLIST.jasper=		yes
 .else
 CONFIGURE_ARGS+=	--without-jp2
 .endif
diff --git a/graphics/p5-GraphicsMagick/Makefile b/graphics/p5-GraphicsMagick/Makefile
index d6fa41f8b75..b49ef5207c9 100644
--- a/graphics/p5-GraphicsMagick/Makefile
+++ b/graphics/p5-GraphicsMagick/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/05/17 11:17:24 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2011/05/18 14:26:26 obache Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../graphics/GraphicsMagick/Makefile.common"
 
 PKGNAME=	p5-GraphicsMagick-${DISTVERSION}
+PKGREVISION=	1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.graphicsmagick.org/perl.html
 COMMENT=	Object-oriented Perl interface to GraphicMagick
 
-DISTINFO_FILE=	${.CURDIR}/../../graphics/GraphicsMagick/distinfo
-#FILESDIR=	${.CURDIR}/../../graphics/GraphicsMagick/files
-#PATCHDIR=	${.CURDIR}/../../graphics/GraphicsMagick/patches
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
@@ -28,6 +25,11 @@ BUILD_DIRS=		${PERL5_CONFIGURE_DIRS}
 
 post-configure: perl5-configure
 
+SUBST_CLASSES+=		libdir
+SUBST_STAGE.libdir=	pre-configure
+SUBST_SED.libdir=	-e 's|@MAGICKLIBDIR@|${BUILDLINK_PREFIX.GraphicsMagick} ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.GraphicsMagick}|g'
+SUBST_FILES.libdir=	PerlMagick/Makefile.PL.in
+
 BUILDLINK_API_DEPENDS.GraphicsMagick+=	GraphicsMagick>=${DISTVERSION}
 .include "../../graphics/GraphicsMagick/buildlink3.mk"
 .include "../../lang/perl5/module.mk"