From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 15 20:50:34 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4957016A404 for ; Sat, 15 Apr 2006 20:50:34 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4599943D69 for ; Sat, 15 Apr 2006 20:50:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3FKoICE078788 for ; Sat, 15 Apr 2006 20:50:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3FKoIdC078787; Sat, 15 Apr 2006 20:50:18 GMT (envelope-from gnats) Resent-Date: Sat, 15 Apr 2006 20:50:18 GMT Resent-Message-Id: <200604152050.k3FKoIdC078787@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Botero-Lowry Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5412E16A408 for ; Sat, 15 Apr 2006 20:47:43 +0000 (UTC) (envelope-from alex@foxybanana.com) Received: from suede.reed.edu (suede.reed.edu [134.10.2.45]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3379A43D46 for ; Sat, 15 Apr 2006 20:47:39 +0000 (GMT) (envelope-from alex@foxybanana.com) Received: from Laptop.mine.box (c029h217.dorm.reed.edu [134.10.29.217]) by suede.reed.edu (8.13.6/8.13.6) with ESMTP id k3FKlcMQ022384 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NOT); Sat, 15 Apr 2006 13:47:38 -0700 Received: from Laptop.mine.box (localhost [127.0.0.1]) by Laptop.mine.box (8.13.4/8.13.4) with ESMTP id k3FKkhwG036598; Sat, 15 Apr 2006 13:46:43 -0700 (PDT) (envelope-from alex@Laptop.mine.box) Received: (from alex@localhost) by Laptop.mine.box (8.13.4/8.13.4/Submit) id k3FKkgXm036597; Sat, 15 Apr 2006 13:46:42 -0700 (PDT) (envelope-from alex) Message-Id: <200604152046.k3FKkgXm036597@Laptop.mine.box> Date: Sat, 15 Apr 2006 13:46:42 -0700 (PDT) From: Alexander Botero-Lowry To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: avleeuwen@piwebs.com Subject: ports/95839: [PATCH] graphics/ImageMagick: portlint(1) fixes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 20:50:34 -0000 >Number: 95839 >Category: ports >Synopsis: [PATCH] graphics/ImageMagick: portlint(1) fixes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 15 20:50:18 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Alexander Botero-Lowry >Release: FreeBSD 6.0-STABLE i386 >Organization: >Environment: System: FreeBSD Laptop.mine.box 6.0-STABLE FreeBSD 6.0-STABLE #1: Tue Feb 7 19:06:16 PST >Description: - Rename a patch to the new patch format - Use DATADIR and DOCSDIR macros in pkg-plist - Fix some whitepace - change around IGNORE wording a bit to please portlint(1) Added file(s): - files/patch-coders_jp2.c Removed file(s): - files/patch-coders::jp2.c Port maintainer (avleeuwen@piwebs.com) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- ImageMagick-6.2.5.5_3.patch begins here --- diff -ruN --exclude=CVS /usr/ports/graphics/ImageMagick/Makefile /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/Makefile --- /usr/ports/graphics/ImageMagick/Makefile Tue Mar 14 02:17:50 2006 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/Makefile Sat Apr 15 13:42:56 2006 @@ -123,7 +123,7 @@ # GraphViz dot graphs .if defined(WITH_IMAGEMAGICK_DOT) BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz -RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz +RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz .else CONFIGURE_ARGS+= --without-dot CONFIGURE_ARGS+= --without-gvc @@ -148,10 +148,10 @@ # WMF (Windows Meta File) images .if defined(WITH_IMAGEMAGICK_WMF) .if !defined(WITH_IMAGEMAGICK_MODULES) -IGNORE= WMF support requires WITH_IMAGEMAGICK_MODULES +IGNORE= enabling WMF support requires WITH_IMAGEMAGICK_MODULES .else .if defined(WITHOUT_X11) -IGNORE= WMF support requires X11 libraries, please unset WITHOUT_X11 +IGNORE= enabling WMF support requires X11 libraries, please unset WITHOUT_X11 .else LIB_DEPENDS+= wmf.2:${PORTSDIR}/graphics/libwmf CONFIGURE_ARGS+= --with-wmf=yes diff -ruN --exclude=CVS /usr/ports/graphics/ImageMagick/files/patch-coders::jp2.c /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/files/patch-coders::jp2.c --- /usr/ports/graphics/ImageMagick/files/patch-coders::jp2.c Sat Oct 4 09:36:09 2003 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/files/patch-coders::jp2.c Wed Dec 31 16:00:00 1969 @@ -1,17 +0,0 @@ ---- coders/jp2.c.orig Sat Oct 12 23:41:32 2002 -+++ coders/jp2.c Wed Jan 22 21:11:31 2003 -@@ -639,5 +639,14 @@ - - #if defined(HasJP2) -+ -+#ifndef JAS_IMAGE_CM_GRAY -+#define JAS_IMAGE_CM_GRAY JAS_IMAGE_CS_GRAY -+#endif -+ -+#ifndef JAS_IMAGE_CM_RGB -+#define JAS_IMAGE_CM_RGB JAS_IMAGE_CS_RGB -+#endif -+ - /* - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % % diff -ruN --exclude=CVS /usr/ports/graphics/ImageMagick/files/patch-coders_jp2.c /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/files/patch-coders_jp2.c --- /usr/ports/graphics/ImageMagick/files/patch-coders_jp2.c Wed Dec 31 16:00:00 1969 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/files/patch-coders_jp2.c Sat Oct 4 09:36:09 2003 @@ -0,0 +1,17 @@ +--- coders/jp2.c.orig Sat Oct 12 23:41:32 2002 ++++ coders/jp2.c Wed Jan 22 21:11:31 2003 +@@ -639,5 +639,14 @@ + + #if defined(HasJP2) ++ ++#ifndef JAS_IMAGE_CM_GRAY ++#define JAS_IMAGE_CM_GRAY JAS_IMAGE_CS_GRAY ++#endif ++ ++#ifndef JAS_IMAGE_CM_RGB ++#define JAS_IMAGE_CM_RGB JAS_IMAGE_CS_RGB ++#endif ++ + /* + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + % % diff -ruN --exclude=CVS /usr/ports/graphics/ImageMagick/pkg-plist /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/pkg-plist --- /usr/ports/graphics/ImageMagick/pkg-plist Tue Mar 14 02:17:50 2006 +++ /usr/local/tinderbox/portstrees/FreeBSD/ports/graphics/ImageMagick/pkg-plist Sat Apr 15 13:45:15 2006 @@ -431,9 +431,9 @@ %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.bs %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/Magick.so %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick/autosplit.ix -share/ImageMagick/config/coder.xml -share/ImageMagick/config/log.xml -share/ImageMagick/config/magic.xml +%%DATADIR%%/config/coder.xml +%%DATADIR%%/config/log.xml +%%DATADIR%%/config/magic.xml share/ImageMagick-%%PORTVERSION%%/LICENSE share/ImageMagick-%%PORTVERSION%%/ChangeLog share/ImageMagick-%%PORTVERSION%%/NEWS @@ -589,14 +589,14 @@ %%PORTDOCS%%%%DOCSDIR%%/www/search.html %%PORTDOCS%%%%DOCSDIR%%/www/sponsors.html %%PORTDOCS%%%%DOCSDIR%%/www/subversion.html -%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/api -%%PORTDOCS%%@dirrm share/doc/ImageMagick/www/Magick++ -%%PORTDOCS%%@dirrm share/doc/ImageMagick/www -%%PORTDOCS%%@dirrm share/doc/ImageMagick/images -%%PORTDOCS%%@dirrm share/doc/ImageMagick +%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/api +%%PORTDOCS%%@dirrm %%DOCSDIR%%/www/Magick++ +%%PORTDOCS%%@dirrm %%DOCSDIR%%/www +%%PORTDOCS%%@dirrm %%DOCSDIR%%/images +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm share/ImageMagick-%%PORTVERSION%% @dirrm share/ImageMagick/config -@dirrm share/ImageMagick +@dirrm %%DATADIR%% %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image/Magick %%WITH_PERL%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Image %%WITH_PERL%%@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Image --- ImageMagick-6.2.5.5_3.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: