diff options
| author |   Michael Cummings <mcummings@gentoo.org> | 2006-09-22 13:47:34 +0000 |
|---|---|---|
| committer | Michael Cummings <mcummings@gentoo.org> | 2006-09-22 13:47:34 +0000 |
| commit | 742e7e71ce419c78859bdf6c0acc50a5ea9c1b77 (patch) | |
| tree | 6d01e01c373142ffb68b1f99b2eb422bd125073d /media-gfx | |
| parent | removed old version + obsolete patches. (diff) | |
| download | gentoo-2-742e7e71ce419c78859bdf6c0acc50a5ea9c1b77.tar.gz gentoo-2-742e7e71ce419c78859bdf6c0acc50a5ea9c1b77.tar.bz2 gentoo-2-742e7e71ce419c78859bdf6c0acc50a5ea9c1b77.zip | |
Corrected patch, thanks for noting this nattfood
(Portage version: 2.1.2_pre1)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/imagemagick/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/imagemagick/files/imagemagick-perl.patch | 85 |
2 files changed, 47 insertions, 44 deletions
diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog index c9e7f5033191..506ec75c7c44 100644 --- a/media-gfx/imagemagick/ChangeLog +++ b/media-gfx/imagemagick/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/imagemagick # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.199 2006/09/21 02:22:12 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.200 2006/09/22 13:47:34 mcummings Exp $ + + 22 Sep 2006; Michael Cummings <mcummings@gentoo.org> + files/imagemagick-perl.patch: + Corrected patch, thanks for noting this nattfood *imagemagick-6.2.9.5-r1 (21 Sep 2006) diff --git a/media-gfx/imagemagick/files/imagemagick-perl.patch b/media-gfx/imagemagick/files/imagemagick-perl.patch index 7d87c70268a1..806af8b6261c 100644 --- a/media-gfx/imagemagick/files/imagemagick-perl.patch +++ b/media-gfx/imagemagick/files/imagemagick-perl.patch @@ -1,43 +1,42 @@ -Index: PerlMagick/Makefile.am
-===================================================================
---- PerlMagick/Makefile.am (Revision 4660)
-+++ PerlMagick/Makefile.am (Arbeitskopie)
-@@ -45,11 +45,10 @@
- cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-
- install-exec-perl: $(PERLMAKEFILE)
-- ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \
-- $(MAKE) CC='@CC@' install && \
-- $(MAKE) clean && rm -f Makefile.old )
-+ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
-
--all-perl:
-+all-perl: $(PERLMAKEFILE)
-+ cd $(PERLMAGICK) && $(MAKE) CC='@CC@'
-
- uninstall-exec-perl: $(PERLMAKEFILE)
- echo "Uninstall not supported for PerlMagick"
-Index: PerlMagick/Makefile.PL.in
-===================================================================
---- PerlMagick/Makefile.PL.in (Revision 4660)
-+++ PerlMagick/Makefile.PL.in (Arbeitskopie)
-@@ -53,16 +53,16 @@
- 'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@",
-
- # Linker flags for building an executable
-- 'LDFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}",
-+ 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}",
-
- # Linker flags for building a dynamically loadable module
-- 'LDDLFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}",
-+ 'LDDLFLAGS' => "-L../magick/.libs -lMagick $Config{'lddlflags'}",
-
- # Install PerlMagick binary into ImageMagick bin directory
- 'INSTALLBIN' => '@BIN_DIR@',
-
- # Library specification
-- 'LIBS' => ['-lMagick @MAGICK_DEP_LIBS@'],
-+ 'LIBS' => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ],
-
- # Perl binary name (if a Perl binary is built)
- 'MAP_TARGET' => 'PerlMagick',
+diff -Naurp ImageMagick-6.2.9.old/PerlMagick/Makefile.PL.in ImageMagick-6.2.9/PerlMagick/Makefile.PL.in +--- ImageMagick-6.2.9.old/PerlMagick/Makefile.PL.in 2006-09-07 21:28:34.000000000 -0400 ++++ ImageMagick-6.2.9/PerlMagick/Makefile.PL.in 2006-09-22 09:45:10.000000000 -0400 +@@ -53,17 +53,16 @@ WriteMakefile + 'CCFLAGS' => "$Config{'ccflags'} @CFLAGS@", + + # Linker flags for building an executable +- 'LDFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'ldflags'}", ++ 'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}", + + # Linker flags for building a dynamically loadable module +- 'LDDLFLAGS' => "-L../magick/.libs -L@MAGICKLIBDIR@ $Config{'lddlflags'}", ++ 'LDDLFLAGS' => "-L../magick/.libs -lMagick $Config{'lddlflags'}", + + # Install PerlMagick binary into ImageMagick bin directory + 'INSTALLBIN' => '@BIN_DIR@', + + # Library specification +- 'LIBS' => ['-lMagick @MAGICK_DEP_LIBS@'], +- ++ 'LIBS' => [ '-L@MAGICKLIBDIR@ @LDFLAGS@ @MAGICK_DEP_LIBS@' ], + # Perl binary name (if a Perl binary is built) + 'MAP_TARGET' => 'PerlMagick', + +diff -Naurp ImageMagick-6.2.9.old/PerlMagick/Makefile.am ImageMagick-6.2.9/PerlMagick/Makefile.am +--- ImageMagick-6.2.9.old/PerlMagick/Makefile.am 2005-04-20 12:27:36.000000000 -0400 ++++ ImageMagick-6.2.9/PerlMagick/Makefile.am 2006-09-22 09:44:09.000000000 -0400 +@@ -45,11 +45,10 @@ $(PERLMAKEFILE): perl-sources $(PERLMAKE + cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) + + install-exec-perl: $(PERLMAKEFILE) +- ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ +- $(MAKE) CC='@CC@' install && \ +- $(MAKE) clean && rm -f Makefile.old ) ++ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install + +-all-perl: ++all-perl: $(PERLMAKEFILE) ++ cd $(PERLMAGICK) && $(MAKE) CC='@CC@' + + uninstall-exec-perl: $(PERLMAKEFILE) + echo "Uninstall not supported for PerlMagick" |