ports/79697: Fix ImageMagick when building WITH_IMAGEMAGICK_MODULES

[Arjan van Leeuwen]

>Number:         79697
>Category:       ports
>Synopsis:       Fix ImageMagick when building WITH_IMAGEMAGICK_MODULES
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 08 21:00:43 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Arjan van Leeuwen
>Release:        FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 6.0-CURRENT #: Thu Apr  7 21:58:02 CEST 2005
    root at winston.piwebs.com:/usr/obj/usr/src/sys/WINSTON



>Description:


- Unbreak building ImageMagick with modules (WITH_IMAGEMAGICK_MODULES) by installing .la files, which libtool15 doesn't do anymore.
- Clean up pkg-plist for modules case and remove non-working MASTER_SITE while I'm here

Reported by: NAKAMURA Takeshi <1yen at sh.rim.or.jp>


>How-To-Repeat:





>Fix:


--- ImageMagick.diff begins here ---
diff -urN /usr/ports/graphics/ImageMagick/Makefile ImageMagick/Makefile
--- /usr/ports/graphics/ImageMagick/Makefile	Mon Mar  7 23:17:58 2005
+++ ImageMagick/Makefile	Fri Apr  8 22:51:05 2005
@@ -8,8 +8,7 @@
 PORTNAME=	ImageMagick
 PORTVERSION=	6.2.0.5
 CATEGORIES=	graphics perl5
-MASTER_SITES=	ftp://ftp.nluug.nl/pub/ImageMagick/ \
-		http://people.fruitsalad.org/avleeuwen/distfiles/imagemagick/ \
+MASTER_SITES=	http://people.fruitsalad.org/avleeuwen/distfiles/imagemagick/ \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
diff -urN /usr/ports/graphics/ImageMagick/files/patch-Makefile.in ImageMagick/files/patch-Makefile.in
--- /usr/ports/graphics/ImageMagick/files/patch-Makefile.in	Fri Dec 10 22:24:01 2004
+++ ImageMagick/files/patch-Makefile.in	Thu Apr  7 23:38:58 2005
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Fri Dec 10 01:43:10 2004
-+++ Makefile.in	Fri Dec 10 21:19:20 2004
-@@ -1885,7 +1885,7 @@
+--- Makefile.in.orig	Sat Mar  5 01:08:24 2005
++++ Makefile.in	Thu Apr  7 23:38:41 2005
+@@ -1890,7 +1890,7 @@
  	$(UTILITIES_EXTRA_DIST) \
  	$(WAND_EXTRA_DIST)
  
@@ -9,7 +9,25 @@
  
  # Where architecture-independent configuration files get installed
  # (share/ImageMagick-version)
-@@ -9286,7 +9286,7 @@
+@@ -4443,6 +4443,8 @@
+ 	    f=$(am__strip_dir) \
+ 	    echo " $(LIBTOOL) --mode=install $(codersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(codersdir)/$$f'"; \
+ 	    $(LIBTOOL) --mode=install $(codersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(codersdir)/$$f"; \
++	    echo " $(codersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(codersdir)/$$f'"; \
++	    $(codersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(codersdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -4470,6 +4472,8 @@
+ 	    f=$(am__strip_dir) \
+ 	    echo " $(LIBTOOL) --mode=install $(filtersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(filtersdir)/$$f'"; \
+ 	    $(LIBTOOL) --mode=install $(filtersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(filtersdir)/$$f"; \
++	    echo " $(filtersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(filtersdir)/$$f'"; \
++	    $(filtersLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(filtersdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -9336,7 +9340,7 @@
  
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE at install-exec-perl: $(PERLMAKEFILE)
  @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff -urN /usr/ports/graphics/ImageMagick/pkg-plist ImageMagick/pkg-plist
--- /usr/ports/graphics/ImageMagick/pkg-plist	Mon Mar  7 23:17:58 2005
+++ ImageMagick/pkg-plist	Thu Apr  7 23:41:31 2005
@@ -128,8 +128,6 @@
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/cip.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/clip.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/clip.so
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/clipboard.la
-%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/clipboard.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/cut.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/cut.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/dcm.la
@@ -300,6 +298,8 @@
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xpm.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/xwd.so
+%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ycbcr.la
+%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ycbcr.so
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/yuv.la
 %%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/yuv.so
 lib/ImageMagick/modules-%%QBIT%%/filters/.keep
--- ImageMagick.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: