Date: Thu, 24 Aug 2006 17:43:18 +0200 From: "Beat Gaetzi" <beat@chruetertee.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102482: [PATCH] www/fluxcms: remove pecl-imagick support Message-ID: <20060824154323.5A27B43D45@mx1.FreeBSD.org> Resent-Message-ID: <200608241550.k7OFoKxx071917@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102482
>Category: ports
>Synopsis: [PATCH] www/fluxcms: remove pecl-imagick support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 24 15:50:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Beat Gätzi
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060824154323.5A27B43D45>