Implement suggestion from last commit: Split out common part of

p5-PerlMagick and ImageMagick into Makefile.common.

3 files changed, 48 insertions, 57 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 81a006770d1..f934e84a736 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,25 +1,10 @@
-# $NetBSD: Makefile,v 1.95 2003/04/15 11:11:50 mjl Exp $
-
-IM_MAJOR_VER=		5.5.6
-IM_MINOR_VER=		NONE
-IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}-Q16
-
-.if (${IM_MINOR_VER} != NONE)
-DISTNAME=		ImageMagick-${IM_MAJOR_VER}-${IM_MINOR_VER}
-PKGNAME=		ImageMagick-${IM_MAJOR_VER}.${IM_MINOR_VER}
-.else
-DISTNAME=		ImageMagick-${IM_MAJOR_VER}
-PKGNAME=		ImageMagick-${IM_MAJOR_VER}
-.endif
-WRKSRC=			${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
+# $NetBSD: Makefile,v 1.96 2003/04/16 13:27:21 mjl Exp $
+
+.include "./Makefile.common"
+
+PKGNAME=		ImageMagick-${DISTSUFFIX}
+
 CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.nluug.nl/pub/ImageMagick/ \
-			ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
-			ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
-			http://imagemagick.sourceforge.net/http/
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.simplesystems.org/ImageMagick/
@@ -52,14 +37,8 @@ GCC_REQD=		2.95.3
 CFLAGS=			-O
 .endif
 
-# For things for which we do not specify an explicit dependency above, disable
-# so that we don't cause implicit "hidden" dependencies.  Users may reenable
-# any of these manually as desired (PerlMagick should probably be a separate
-# pkg, however).
-CONFIGURE_ARGS+=	--without-perl --without-dps --without-fpx \
-			--without-hdf --without-jbig --without-threads \
-			--without-ttf --without-wmf --without-xml \
-			--without-lcms
+# Some configure_args come from Makefile.common
+CONFIGURE_ARGS+=	--without-perl
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
diff --git a/graphics/ImageMagick/Makefile.common b/graphics/ImageMagick/Makefile.common
new file mode 100644
index 00000000000..5402f2185f9
--- /dev/null
+++ b/graphics/ImageMagick/Makefile.common
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile.common,v 1.1 2003/04/16 13:27:21 mjl Exp $
+
+IM_MAJOR_VER=		5.5.6
+IM_MINOR_VER=		NONE
+IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}-Q16
+
+.if (${IM_MINOR_VER} != NONE)
+DISTSUFFIX=		${IM_MAJOR_VER}-${IM_MINOR_VER}
+.else
+DISTSUFFIX=		${IM_MAJOR_VER}
+.endif
+
+DISTNAME=		ImageMagick-${DISTSUFFIX}
+
+WRKSRC=			${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
+
+CATEGORIES=		graphics
+MASTER_SITES=		ftp://ftp.nluug.nl/pub/ImageMagick/ \
+			ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
+			ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
+			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/
+EXTRACT_SUFX=		.tar.bz2
+
+# For things for which we do not specify an explicit dependency above, disable
+# so that we don't cause implicit "hidden" dependencies.  Users may reenable
+# any of these manually as desired (PerlMagick should probably be a separate
+# pkg, however).
+CONFIGURE_ARGS+=	--without-dps --without-fpx \
+			--without-hdf --without-jbig --without-threads \
+			--without-ttf --without-wmf --without-xml \
+			--without-lcms
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 4baf5e49ba0..275696ec0fc 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,25 +1,10 @@
-# $NetBSD: Makefile,v 1.26 2003/04/15 11:11:50 mjl Exp $
-
-IM_MAJOR_VER=		5.5.6
-IM_MINOR_VER=		NONE
-IM_MAJOR_LIB_VER=	${IM_MAJOR_VER}-Q16
-
-.if (${IM_MINOR_VER} != NONE)
-DISTNAME=		ImageMagick-${IM_MAJOR_VER}-${IM_MINOR_VER}
-PKGNAME=		p5-PerlMagick-${IM_MAJOR_VER}.${IM_MINOR_VER}
-.else
-DISTNAME=		ImageMagick-${IM_MAJOR_VER}
-PKGNAME=		p5-PerlMagick-${IM_MAJOR_VER}
-.endif
+# $NetBSD: Makefile,v 1.27 2003/04/16 13:27:22 mjl Exp $
+
+.include "../ImageMagick/Makefile.common"
+
+PKGNAME=		p5-PerlMagick-${DISTSUFFIX}
+
 SVR4_PKGNAME=		p5pma
-WRKSRC=			${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
-CATEGORIES=		graphics
-MASTER_SITES=		ftp://ftp.nluug.nl/pub/ImageMagick/ \
-			ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
-			ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
-			ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/
-EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.simplesystems.org/ImageMagick/
@@ -44,13 +29,8 @@ USE_X11=		YES
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/PerlMagick
 BUILD_DIRS=		${PERL5_CONFIGURE_DIRS}
 
-# These need to coordinate with the ImageMagick package.
-# Just leave out "--without-perl".
-
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
-			--without-dps --without-fpx \
-			--without-hdf --without-jbig --without-threads \
-			--without-ttf --without-xml
+# Some configure_args come from Makefile.common
+CONFIGURE_ARGS+=	--with-perl=${PERL5}
 
 post-configure: perl5-configure