Do the following to make this ELF and 1.3 friendly:

- use the autoconf configure script to configure and build (we were
  already running configure but using Imake to build!?)
- make use of pkglibtool (package already has full libtool support)

(Note that now that we use Autoconf, this installs in ${LOCALBASE} without
the need for a tool such as xpkgwedge.  The configure script automatically
detects all the stuff for which we had used patches in the Imakefiles.)

Also use --without-... to disable optional components for which we have no
explicit dependencies, which can be reenabled by the user in pkgsrc, so
that the built binaries do not have "hidden" dependencies.

Closes PR pkg/7463.

5 files changed, 88 insertions, 212 deletions

diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 65ea18c1f7a..f2c60caa4f0 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 1999/04/25 10:10:51 tron Exp $
+# $NetBSD: Makefile,v 1.42 1999/04/25 18:46:30 tv Exp $
 #
 
 DISTNAME=	ImageMagick-4.2.2
@@ -14,22 +14,22 @@ DEPENDS+=	mpeg2codec-1.2:../../graphics/mpeg2codec
 DEPENDS+=	png-1.0.3:../../graphics/png
 DEPENDS+=	tiff-3.4:../../graphics/tiff
 
-# "cc" on 1.3/1.3.x ELF systems doesn't recognize "-R" option.
-.if !exists(/usr/bin/c89)
-NOT_FOR_ARCHS=	alpha mips powerpc
-.endif
+MIRROR_DISTFILE= no
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
-pre-configure:
-.if exists(/usr/lib/libbz2.a)
-		@echo >${WRKSRC}/bzlib.tmpl "#define HasBZLIB"
-.else
-		@echo >${WRKSRC}/bzlib.tmpl
-.endif
-		@cd ${WRKSRC} && ./configure --prefix=${X11BASE}
+# 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).
 
-MIRROR_DISTFILE= no
-USE_IMAKE=	yes
-XMKMF=		${MAKE_ENV} xmkmf -a
-MAKE_ENV+=	LOCALBASE=${LOCALBASE} PREFIX=${PREFIX}
+CONFIGURE_ARGS=	--without-perl \
+		--without-dps --without-fpx --without-hdf --without-jbig \
+		--without-ttf
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/Copyright.txt ${WRKSRC}/QuickStart.txt \
+		${PREFIX}/share/ImageMagick/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ImageMagick/patches/patch-aa b/graphics/ImageMagick/patches/patch-aa
index 6075ec1ee6d..7065e14c035 100644
--- a/graphics/ImageMagick/patches/patch-aa
+++ b/graphics/ImageMagick/patches/patch-aa
@@ -1,110 +1,39 @@
-$NetBSD: patch-aa,v 1.9 1999/04/23 21:41:25 tron Exp $
+$NetBSD: patch-aa,v 1.10 1999/04/25 18:46:30 tv Exp $
 
---- Magick.tmpl.orig	Wed Mar 31 16:36:48 1999
-+++ Magick.tmpl	Fri Apr 23 23:32:58 1999
-@@ -37,17 +37,17 @@
- #ifdef RsArchitecture
- XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape
- #else
--XCOMM EXTENSIONS_DEFINES= -DHasLZW -DHasShape -DHasSharedMemory
-+EXTENSIONS_DEFINES= -DHasLZW -DHasShape -DHasSharedMemory
- #endif
- 
- XCOMM Set DoSharedLib to HasSharedLibraries to build ImageMagick with shared
- XCOMM libraries.
- XCOMM
--XCOMM #define DoSharedLib  HasSharedLibraries
-+#define DoSharedLib  HasSharedLibraries
- 
- XCOMM Define the location of the X11 RGB color database.
- XCOMM
--XCOMM DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/openwin/lib/X11/rgb.txt\"
-+DATABASE_DEFINES= -DRGBColorDatabase=\"/usr/X11R6/lib/X11/rgb.txt\"
- 
- XCOMM By default, the maximum color value is 255.  To increase the maximum to
- XCOMM 65535 define:
-@@ -59,16 +59,16 @@
- XCOMM of these optional delegates, uncomment the respective define.  Make sure
- XCOMM the path names are correct.  See README for more details.
- XCOMM
--XCOMM #define HasBZLIB
-+#include "bzlib.tmpl"
- XCOMM #define HasDPS
- XCOMM #define HasFPX
- XCOMM #define HasHDF
- XCOMM #define HasJBIG
--XCOMM #define HasJPEG
--XCOMM #define HasPNG
--XCOMM #define HasTIFF
-+#define HasJPEG
-+#define HasPNG
-+#define HasTIFF
- XCOMM #define HasTTF
--XCOMM #define HasZLIB
-+#define HasZLIB
- 
- #ifdef HasBZLIB
- BZLIB_DEFINES= -DHasBZLIB
-@@ -107,24 +107,24 @@
- 
- #ifdef HasJPEG
- JPEG_DEFINES= -DHasJPEG
--JPEG_INCLUDES= -I$(TOP)/jpeg
--JPEG_FLAGS= -L$(TOP)/jpeg
-+JPEG_INCLUDES= -I${LOCALBASE}/include
-+JPEG_FLAGS= -L${LOCALBASE}/lib -R${LOCALBASE}/lib
- JPEG_LIBRARIES= -ljpeg
- #endif
- 
- #ifdef HasPNG
- XCOMM Use libpng-1.00 or above.  You must also link with Zlib.
- PNG_DEFINES= -DHasPNG
--PNG_INCLUDES= -I$(TOP)/png
--PNG_FLAGS= -L$(TOP)/png
-+PNG_INCLUDES= -I${LOCALBASE}/include
-+PNG_FLAGS= -L${LOCALBASE}/lib -R${LOCALBASE}/lib
- PNG_LIBRARIES= -lpng
- #endif
- 
- #ifdef HasTIFF
- XCOMM Tiff library requires Jpeg and Zlib libraries.
- TIFF_DEFINES= -DHasTIFF
--TIFF_INCLUDES= -I$(TOP)/tiff/libtiff
--TIFF_FLAGS= -L$(TOP)/tiff/libtiff
-+TIFF_INCLUDES= -I${LOCALBASE}/include
-+TIFF_FLAGS= -L${LOCALBASE}/lib -R${LOCALBASE}/lib
- TIFF_LIBRARIES= -ltiff
- #endif
- 
-@@ -137,8 +137,8 @@
- 
- #ifdef HasZLIB
- ZLIB_DEFINES= -DHasZLIB
--ZLIB_INCLUDES= -I$(TOP)/zlib
--ZLIB_FLAGS= -L$(TOP)/zlib
-+ZLIB_INCLUDES= 
-+ZLIB_FLAGS= 
- ZLIB_LIBRARIES= -lz
- #endif
- 
-@@ -155,16 +155,16 @@
- XCOMM the top level X11 include directory or X11/X.h will be overwritten.
- 
- #ifndef PREFIX
--PREFIX= /usr/local
-+PREFIX= ${X11BASE}
- #endif
- 
- DelegatePath= -DDelegatePath=\"$(PREFIX)/share/ImageMagick/\"
- LOCALDIR= $(PREFIX)/bin
- LOCALINC= $(PREFIX)/include
- LOCALLIB= $(PREFIX)/lib
--LOCALMAN1= $(PREFIX)/man/man1
--LOCALMAN4= $(PREFIX)/man/man4
--LOCALMAN5= $(PREFIX)/man/man5
-+LOCALMAN1= $(PREFIX)/man/cat1
-+LOCALMAN4= $(PREFIX)/man/cat4
-+LOCALMAN5= $(PREFIX)/man/cat5
- 
- MAGICKDIR= $(TOP)/magick
- MAGICK_INCLUDES= -I$(TOP)
+--- configure.orig	Sun Apr 25 07:17:03 1999
++++ configure	Sun Apr 25 07:23:45 1999
+@@ -2133,7 +2133,7 @@
+ fi
+ rm -f confcache
+ 
+-
++if false; then
+ # Actually configure libtool.  ac_aux_dir is where install-sh is found.
+ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+ LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+@@ -2141,6 +2141,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ # Reload cache, that may have been modified by ltconfig
+ if test -r "$cache_file"; then
+@@ -2151,7 +2152,7 @@
+   > $cache_file
+ fi
+ 
+-
++if false; then
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+ 
+@@ -2176,7 +2177,7 @@
+ then
+   libtool_build_static_libs='yes'
+ fi
+-
++fi
+ 
+ # Add configure option --enable-maintainer-mode which enables dependency
+ # checking and generation useful to package maintainers.  This is made an
diff --git a/graphics/ImageMagick/patches/patch-ab b/graphics/ImageMagick/patches/patch-ab
deleted file mode 100644
index 5e4e496babe..00000000000
--- a/graphics/ImageMagick/patches/patch-ab
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ab,v 1.5 1998/08/07 10:40:46 agc Exp $
-
---- Imakefile.orig	Tue Feb 24 21:03:43 1998
-+++ Imakefile	Thu Mar 19 09:46:13 1998
-@@ -76,28 +76,28 @@
- NormalProgramTarget(display,display.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- NormalLintTarget($(LINTSRCS))
- InstallProgram(display,$(LOCALDIR))
--InstallMultipleMan(display.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(display,$(LOCALMAN1),1)
- NormalProgramTarget(montage,montage.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(montage,$(LOCALDIR))
--InstallMultipleMan(montage.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(montage,$(LOCALMAN1),1)
- NormalProgramTarget(import,import.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(import,$(LOCALDIR))
--InstallMultipleMan(import.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(import,$(LOCALMAN1),1)
- NormalProgramTarget(animate,animate.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(animate,$(LOCALDIR))
--InstallMultipleMan(animate.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(animate,$(LOCALMAN1),1)
- NormalProgramTarget(convert,convert.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(convert,$(LOCALDIR))
--InstallMultipleMan(convert.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(convert,$(LOCALMAN1),1)
- NormalProgramTarget(identify,identify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(identify,$(LOCALDIR))
--InstallMultipleMan(identify.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(identify,$(LOCALMAN1),1)
- NormalProgramTarget(mogrify,mogrify.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(mogrify,$(LOCALDIR))
--InstallMultipleMan(mogrify.1,$(LOCALMAN1))
-+InstallMultipleManSuffix(mogrify,$(LOCALMAN1),1)
- NormalProgramTarget(combine,combine.o,$(DEPLIBS),$(LOCAL_LIBRARIES),$(XLIB) -lm)
- InstallProgram(combine,$(LOCALDIR))
--InstallMultipleMan(combine.1,$(LOCALMAN1))
--InstallMultipleMan(ImageMagick.1,$(LOCALMAN1))
--InstallMultipleMan(miff.4,$(LOCALMAN4))
--InstallMultipleMan(quantize.5,$(LOCALMAN5))
-+InstallMultipleManSuffix(combine,$(LOCALMAN1),1)
-+InstallMultipleManSuffix(ImageMagick,$(LOCALMAN1),1)
-+InstallMultipleManSuffix(miff,$(LOCALMAN4),4)
-+InstallMultipleManSuffix(quantize,$(LOCALMAN5),5)
diff --git a/graphics/ImageMagick/patches/patch-ac b/graphics/ImageMagick/patches/patch-ac
deleted file mode 100644
index 817251af274..00000000000
--- a/graphics/ImageMagick/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.4 1998/08/07 10:40:46 agc Exp $
-
---- xtp/Imakefile.orig	Fri Jan 30 21:06:09 1998
-+++ xtp/Imakefile	Thu Feb  5 02:01:50 1998
-@@ -45,5 +45,5 @@
- 
- NormalProgramTarget(xtp,$(XTPObjects),NullParameter,NullParameter,NullParameter)
- InstallProgram(xtp,$(LOCALDIR))
--InstallMultipleMan(xtp.1,$(LOCALMAN))
-+InstallMultipleManSuffix(xtp,$(LOCALMAN1),1)
- DependTarget()
diff --git a/graphics/ImageMagick/pkg/PLIST b/graphics/ImageMagick/pkg/PLIST
index 40d74d45983..39cb00a7cd9 100644
--- a/graphics/ImageMagick/pkg/PLIST
+++ b/graphics/ImageMagick/pkg/PLIST
@@ -1,45 +1,47 @@
-@comment $NetBSD: PLIST,v 1.18 1999/04/05 01:11:58 tron Exp $
-bin/xtp
-bin/display
-bin/montage
-bin/import
+@comment $NetBSD: PLIST,v 1.19 1999/04/25 18:46:30 tv Exp $
+bin/Magick-config
 bin/animate
+bin/combine
 bin/convert
+bin/display
 bin/identify
+bin/import
 bin/mogrify
-bin/combine
-include/magick/magick.h
-include/magick/image.h
-include/magick/gems.h
+bin/montage
+bin/xtp
+include/magick/PreRvIcccm.h
+include/magick/X.h
+include/magick/classify.h
 include/magick/compress.h
-include/magick/monitor.h
+include/magick/config.h
+include/magick/defines.h
+include/magick/delegates.h
 include/magick/error.h
-include/magick/utility.h
-include/magick/X.h
-include/magick/widget.h
-include/magick/PreRvIcccm.h
+include/magick/gems.h
+include/magick/image.h
+include/magick/magick.h
 include/magick/memory.h
-include/magick/delegates.h
-include/magick/version.h
+include/magick/monitor.h
 include/magick/quantize.h
-include/magick/classify.h
-include/magick/defines.h
-@dirrm include/magick
+include/magick/utility.h
+include/magick/version.h
+include/magick/widget.h
 lib/libMagick.a
-lib/libMagick.so.4.0.22
-man/cat1/display.0
-man/cat1/montage.0
-man/cat1/import.0
-man/cat1/animate.0
-man/cat1/convert.0
-man/cat1/identify.0
-man/cat1/mogrify.0
-man/cat1/combine.0
-man/cat1/ImageMagick.0
-man/cat5/quantize.0
-man/cat4/miff.0
-man/cat1/xtp.0
+lib/libMagick.so.4.22
+man/man1/ImageMagick.1
+man/man1/animate.1
+man/man1/combine.1
+man/man1/convert.1
+man/man1/display.1
+man/man1/identify.1
+man/man1/import.1
+man/man1/mogrify.1
+man/man1/montage.1
+man/man1/xtp.1
+man/man4/miff.4
+man/man5/quantize.5
 share/ImageMagick/Copyright.txt
 share/ImageMagick/QuickStart.txt
 share/ImageMagick/delegates.mgk
+@dirrm include/magick
 @dirrm share/ImageMagick