summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-04-09 21:48:45 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-04-09 21:48:45 +0000
commit28eb48bab777917e166c4b055e892973aced5a3b (patch)
tree12d5f38e9591970dbec11a6a7de3e833ff10090a /graphics
parent- Update to 20050401 (diff)
- Fix WITH_IMAGEMAGICK_MODULES [1]
- Resort MASTER_SITES PR: ports/79697 Submitted by: Arjan van Leeuwen <avleeuwen@piwebs.com> (maintainer) Reported by: NAKAMURA Takeshi <1yen@sh.rim.or.jp> [1]
Notes
Notes: svn path=/head/; revision=132834
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile5
-rw-r--r--graphics/ImageMagick/files/patch-Makefile.in26
-rw-r--r--graphics/ImageMagick/pkg-plist4
3 files changed, 26 insertions, 9 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 79c91b574d4d..13123b7d309f 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -8,9 +8,8 @@
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_SITE_LOCAL:S/%SUBDIR%/pav/}
+MASTER_SITES= ${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/} \
+ http://people.fruitsalad.org/avleeuwen/distfiles/imagemagick/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= avleeuwen@piwebs.com
diff --git a/graphics/ImageMagick/files/patch-Makefile.in b/graphics/ImageMagick/files/patch-Makefile.in
index f90150bff790..629c61071f0a 100644
--- a/graphics/ImageMagick/files/patch-Makefile.in
+++ b/graphics/ImageMagick/files/patch-Makefile.in
@@ -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@install-exec-perl: $(PERLMAKEFILE)
@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
diff --git a/graphics/ImageMagick/pkg-plist b/graphics/ImageMagick/pkg-plist
index 53a688a9d533..1c8acded891c 100644
--- a/graphics/ImageMagick/pkg-plist
+++ b/graphics/ImageMagick/pkg-plist
@@ -128,8 +128,6 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
%%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 @@ lib/ImageMagick/modules-%%QBIT%%/coders/.keep
%%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