Date: Mon, 29 Oct 2007 19:40:03 GMT From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/117635: [graphics/ImageMagick] add missing file in pkg-plist (fix make deinstall) Message-ID: <200710291940.l9TJe3Ou018583@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/117635; it has been noted by GNATS.
From: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/117635: [graphics/ImageMagick] add missing file in
pkg-plist (fix make deinstall)
Date: Tue, 30 Oct 2007 03:20:30 +0800
I apologize for giving out a wrong patch.
The truth is ImageMagick installs exr.* regardless of IMAGEMAGICK_OPENEXR option.
Since IMAGEMAGICK_OPENEXR is default off, we should use defined(WITH_...) instead of !defined(WITHOUT_...).
The correct patch file should be:
--- /usr/ports/graphics/ImageMagick/Makefile.orig 2007-10-29 16:33:56.000000000 +0800
+++ /usr/ports/graphics/ImageMagick/Makefile 2007-10-30 03:14:11.000000000 +0800
@@ -132,12 +132,10 @@
PLIST_SUB+= MODULES='@comment '
.endif
-.if !defined(WITHOUT_IMAGEMAGICK_OPENEXR)
+.if defined(WITH_IMAGEMAGICK_OPENEXR)
LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR
-PLIST_SUB+= OPENEXR=""
.else
CONFIGURE_ARGS+= --without-openexr
-PLIST_SUB+= OPENEXR="@comment "
.endif
.if !defined(WITHOUT_IMAGEMAGICK_DJVU)
--- /usr/ports/graphics/ImageMagick/pkg-plist.orig 2007-10-05 13:32:09.000000000 +0800
+++ /usr/ports/graphics/ImageMagick/pkg-plist 2007-10-30 02:41:05.000000000 +0800
@@ -187,6 +187,9 @@
%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.a
%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.la
%%TIFF%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/ept.so
+%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/exr.a
+%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/exr.la
+%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/exr.so
%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fax.a
%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fax.la
%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/fax.so
@@ -310,9 +313,6 @@
%%PNG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.a
%%PNG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.la
%%PNG%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/png.so
-%%OPENEXR%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/exr.a
-%%OPENEXR%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/exr.la
-%%OPENEXR%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/exr.so
%%DJVU%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/djvu.a
%%DJVU%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/djvu.la
%%DJVU%%%%MODULES%%lib/ImageMagick/modules-%%QBIT%%/coders/djvu.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710291940.l9TJe3Ou018583>