From beat@chruetertee.ch  Thu Aug 24 15:43:24 2006
Return-Path: <beat@chruetertee.ch>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EE4AE16A4DE
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Aug 2006 15:43:24 +0000 (UTC)
	(envelope-from beat@chruetertee.ch)
Received: from mx1.zhwin.ch (mx1.zhwin.ch [160.85.104.50])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5A27B43D45
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 24 Aug 2006 15:43:23 +0000 (GMT)
	(envelope-from beat@chruetertee.ch)
Received: from orwell.zhwin.ch ([160.85.104.31])
	by mx1.zhwin.ch with esmtp (Exim 4.54)
	id 1GGHMX-0001No-Th
	for FreeBSD-gnats-submit@freebsd.org; Thu, 24 Aug 2006 17:43:21 +0200
Received: from _HOSTNAME_ (Not Verified[160.85.171.0]) by orwell.zhwin.ch with NetIQ MailMarshal 6.0 Service Pack 1a (v6,0,3,33)
	id <B44edc8e30001>; Thu, 24 Aug 2006 17:42:27 +0200
Received: by _HOSTNAME_ (sSMTP sendmail emulation); Thu, 24 Aug 2006 17:43:18 +0200
Message-Id: <20060824154323.5A27B43D45@mx1.FreeBSD.org>
Date: Thu, 24 Aug 2006 17:43:18 +0200
From: "Beat Gaetzi" <beat@chruetertee.ch>
Reply-To: Beat Gtzi <beat@chruetertee.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] www/fluxcms: remove pecl-imagick support
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         102482
>Category:       ports
>Synopsis:       [PATCH] www/fluxcms: remove pecl-imagick support
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 24 15:50:20 GMT 2006
>Closed-Date:    Mon Aug 28 07:35:35 GMT 2006
>Last-Modified:  Mon Aug 28 07:35:35 GMT 2006
>Originator:     Beat Gtzi
>Release:        FreeBSD 6.1-RELEASE-p2 i386
>Organization:
>Environment:
System: FreeBSD daedalus.network.local 6.1-RELEASE-p2 FreeBSD 6.1-RELEASE-p2 #0: Tue Jun 20 20:11:03 CEST 2006 beat@daedalus.network.local:/usr/obj/usr/src/sys/BEASTIE i386


	
>Description:
	- Remove pecl-imagick support, because pecl-imagick is deprecated and will be removed 
	  from the ports tree soon.
	- Add patch that gd is enabled by default
>How-To-Repeat:
	
>Fix:

	

--- fluxcms.patch begins here ---
#
# Try patch -p1 < /path-to-patch/fluxcms.patch in the fluxcms directory
#
diff -urBN fluxcms.ori/Makefile fluxcms/Makefile
--- fluxcms.ori/Makefile	Sun Jul  9 10:04:30 2006
+++ fluxcms/Makefile	Thu Aug 24 16:50:16 2006
@@ -23,10 +23,9 @@
 SUB_FILES=	pkg-deinstall pkg-message
 SUB_LIST=	INSTALLDIR=${INSTALLDIR}
 
-OPTIONS=	GD "Use GD support instead of ImageMagick" on \
-		TIDY "Configure with tidy support" off
+OPTIONS=	TIDY "Configure with tidy support" off
 
-USE_PHP=	dom xml simplexml iconv mysql xsl session pcre
+USE_PHP=	dom xml simplexml iconv mysql xsl session pcre gd
 
 IGNORE_WITH_PHP=	4
 DEFAULT_PHP_VER=	5
@@ -34,12 +33,6 @@
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 .include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_GD)
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/gd.so:${PORTSDIR}/${gd_DEPENDS}
-.else
-RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/${imagick_DEPENDS}
-.endif
 
 .if defined(WITH_TIDY)
 RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/tidy.so:${PORTSDIR}/${tidy_DEPENDS}
diff -urBN fluxcms.ori/files/patch-install-dist-conf-config_xml fluxcms/files/patch-install-dist-conf-config_xml
--- fluxcms.ori/files/patch-install-dist-conf-config_xml	Thu Jan  1 01:00:00 1970
+++ fluxcms/files/patch-install-dist-conf-config_xml	Thu Aug 24 16:48:41 2006
@@ -0,0 +1,11 @@
+--- install/dist/conf/config.xml.orig	Thu Aug 24 16:42:47 2006
++++ install/dist/conf/config.xml	Thu Aug 24 16:48:03 2006
+@@ -112,7 +112,7 @@
+        resizing to a certain size, it works.
+     -->
+     
+-    <useGD>false</useGD>
++    <useGD>true</useGD>
+     
+     <!-- 
+         unccomment the following if want versioning.
--- fluxcms.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Fri Aug 25 07:49:54 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102482 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Aug 28 07:35:31 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102482 
>Unformatted:
