ports/91270: [patch] ImageMagick segfaults, port update to 6.2.5-5 solves problem

Piotr Rybicki meritus at innervision.pl
Wed Jan 4 09:41:36 UTC 2006


>Isn't the patch backwards? Also it would look much better if it was
>unified diff...

You are absolutely right, here comes better diff:

diff -ur /tmp/ImageMagick/Makefile /usr/ports/graphics/ImageMagick/Makefile
--- /tmp/ImageMagick/Makefile   Tue Nov 15 07:49:23 2005
+++ /usr/ports/graphics/ImageMagick/Makefile    Tue Jan  3 15:54:31 2006
@@ -6,7 +6,7 @@
 #

 PORTNAME=      ImageMagick
-PORTVERSION=   6.2.2.1
+PORTVERSION=   6.2.5.5
 CATEGORIES=    graphics perl5
 MASTER_SITES=  ftp://ftp.nluug.nl/pub/ImageMagick/ \
                ${MASTER_SITE_LOCAL:S/%SUBDIR%/pav/}
diff -ur /tmp/ImageMagick/distinfo /usr/ports/graphics/ImageMagick/distinfo
--- /tmp/ImageMagick/distinfo   Mon May  2 10:27:39 2005
+++ /usr/ports/graphics/ImageMagick/distinfo    Tue Jan  3 15:56:34 2006
@@ -1,2 +1,2 @@
-MD5 (ImageMagick-6.2.2-1.tar.bz2) = 129caaa6d32adb162a29eef7ebe92a9b
-SIZE (ImageMagick-6.2.2-1.tar.bz2) = 4721988
+MD5 (ImageMagick-6.2.5-5.tar.bz2) = eaee90992c8cf36f1f5fc6c887d73897
+SIZE (ImageMagick-6.2.5-5.tar.bz2) = 5044679
diff -ur /tmp/ImageMagick/files/patch-Makefile.in /usr/ports/graphics/ImageMagick/files/patch-Makefile.in
--- /tmp/ImageMagick/files/patch-Makefile.in    Sat Apr  9 23:48:45 2005
+++ /usr/ports/graphics/ImageMagick/files/patch-Makefile.in     Tue Jan  3 16:02:02 2006
@@ -1,32 +1,5 @@
 --- 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)
-
--lib_LTLIBRARIES = $(LIBLTDL) $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
-+lib_LTLIBRARIES = $(LIBMAGICK) $(LIBWAND) $(LIBMAGICKPP)
-
- # Where architecture-independent configuration files get installed
- # (share/ImageMagick-version)
-@@ -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)


Best regards
Piotr Rybicki




More information about the freebsd-ports-bugs mailing list