- remove unneeded MODGNU_SHARED_LIBS and related patches

- remove old libtool and ltdl patches since we use the in-tree versions

graphics/ImageMagick/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2006/01/14 00:07:28 espie Exp $
+# $OpenBSD: Makefile,v 1.87 2006/01/15 14:24:21 steven Exp $
 
 COMMENT=	"image processing tools"
 
@@ -6,13 +6,9 @@ VER=		6.2.3
 DASHVER=	3
 DISTNAME=	ImageMagick-${VER}-${DASHVER}
 PKGNAME=	ImageMagick-${VER}.${DASHVER}p2
-SHARED_LIBS=		Magick++	9.0	\
-			Magick		8.3	\
-			Wand		8.3
-MODGNU_SHARED_LIBS=	Magick++	''	\
-			Magick		'-no-undefined'	\
-			Wand		'-no-undefined'
-
+SHARED_LIBS=	Magick++	9.0	\
+		Magick		8.3	\
+		Wand		8.3
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.imagemagick.org

graphics/ImageMagick/patches/patch-Makefile_in

@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2005/12/28 14:56:54 steven Exp $
+$OpenBSD: patch-Makefile_in,v 1.4 2006/01/15 14:24:22 steven Exp $
 --- Makefile.in.orig	Fri Jun 24 06:07:35 2005
 +++ Makefile.in	Wed Dec 28 11:39:40 2005
 @@ -1914,7 +1914,7 @@ EXTRA_DIST = \
@@ -10,32 +10,3 @@ $OpenBSD: patch-Makefile_in,v 1.3 2005/12/28 14:56:54 steven Exp $
  
  # Where architecture-independent configuration files get installed
  # (share/ImageMagick-version)
-@@ -2802,8 +2802,7 @@ LIBMAGICK = magick/libMagick.la
- @WITH_MODULES_FALSE@magick_libMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(LIBLTDL)
- @WITH_MODULES_TRUE@magick_libMagick_la_LIBADD = $(MAGICK_DEP_LIBS) $(LIBLTDL)
- magick_libMagick_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
--magick_libMagick_la_LDFLAGS = -no-undefined \
--	-version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
-+magick_libMagick_la_LDFLAGS = $(libMagick_la_LDFLAGS)
- 
- 
- # Library base sources
-@@ -3161,8 +3160,7 @@ WAND_BUILT_SRCS = \
- 
- LIBWAND = wand/libWand.la
- wand_libWand_la_SOURCES = $(WAND_SOURCES)
--wand_libWand_la_LDFLAGS = -no-undefined \
--	-version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
-+wand_libWand_la_LDFLAGS = $(libWand_la_LDFLAGS)
- 
- wand_libWand_la_LIBADD = $(LIBMAGICK) $(LIB_MATH)
- WAND_EXTRA_DIST = \
-@@ -3317,7 +3315,7 @@ WAND_CLEANFILES = \
- @WITH_MAGICK_PLUS_PLUS_TRUE@	Magick++/lib/Magick++/TypeMetric.h
- 
- @WITH_MAGICK_PLUS_PLUS_TRUE@Magick___lib_libMagick___la_LDFLAGS = \
--@WITH_MAGICK_PLUS_PLUS_TRUE@	-version-info $(LIBRARY_CURRENT):$(LIBRARY_REVISION):$(LIBRARY_AGE)
-+@WITH_MAGICK_PLUS_PLUS_TRUE@	$(libMagick++_la_LDFLAGS)
- 
- @WITH_MAGICK_PLUS_PLUS_TRUE@Magick___lib_libMagick___la_LIBADD = $(LIBMAGICK) $(LIBWAND)
- @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_CHECK_PGRMS = \

graphics/ImageMagick/patches/patch-ltdl_Makefile_am

@@ -1,40 +0,0 @@
-$OpenBSD: patch-ltdl_Makefile_am,v 1.1 2005/03/31 04:23:42 pvalchev Exp $
---- ltdl/Makefile.am.orig	Wed Feb  9 12:29:44 2005
-+++ ltdl/Makefile.am	Wed Feb  9 12:32:11 2005
-@@ -15,11 +15,11 @@
- #  Makefile for building libltdl.
- 
- LTDL_HDRS = \
--	ltdl/ltdl.h
-+	/usr/local/share/libtool/libltdl/ltdl.h
- 
- LTDL_SRCS = \
--	ltdl/ltdl.c \
--	ltdl/ltdl.h
-+	/usr/local/share/libtool/libltdl/ltdl.c \
-+	/usr/local/share/libtool/libltdl/ltdl.h
- 
- #if WITH_LTDL
- #LIB_LTDL=$(LIBLTDL)
-@@ -28,18 +28,14 @@ LTDL_SRCS = \
- #endif
- 
- if WITH_LTDL
--  LIBLTDL=ltdl/libltdl.la
--if INSTALL_LTDL
--  LTDL_INSTALLHEADERS =  $(LTDL_HDRS)
--else
-+  LIBLTDL=/usr/local/lib/libltdl.la
-   LTDL_NOINST_HDRS = $(LTDL_HDRS)
--endif # INSTALL_LTDL
- else
-   LIBLTDL=
- endif # WITH_LTDL
- 
--LTDL_CLEANFILES = \
--	ltdl/libltdl.la
-+LTDL_CLEANFILES =
-+
- 
- ltdl_libltdl_la_SOURCES = $(LTDL_SRCS)
- ltdl_libltdl_la_LDFLAGS = -no-undefined -version-info 4:0:1

graphics/ImageMagick/patches/patch-ltmain_sh

@@ -1,53 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.11 2005/06/04 14:39:21 naddy Exp $
---- ltmain.sh.orig	Tue May 24 00:33:09 2005
-+++ ltmain.sh	Sun May 29 20:00:07 2005
-@@ -2641,7 +2641,7 @@ EOF
- 	    add_dir=
- 	    add=
- 	    # Finalize command for both is simple: just hardcode it.
--	    if test "$hardcode_direct" = yes; then
-+	    if test "$hardcode_direct" = yes && test -f $libdir/$linklib; then
- 	      add="$libdir/$linklib"
- 	    elif test "$hardcode_minus_L" = yes; then
- 	      add_dir="-L$libdir"
-@@ -5898,40 +5898,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = : && exit $EXIT_SUCCESS
- 
--    $echo "----------------------------------------------------------------------"
--    $echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      $echo "   $libdir"
--    done
--    $echo
--    $echo "If you ever happen to want to link against installed libraries"
--    $echo "in a given directory, LIBDIR, you must either use libtool, and"
--    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    $echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      $echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      $echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      $echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      $echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    $echo
--    $echo "See any operating system documentation about shared libraries for"
--    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    $echo "----------------------------------------------------------------------"
-     exit $EXIT_SUCCESS
-     ;;
-