aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2006-08-28 15:34:49 +0800
committermiwi <miwi@FreeBSD.org>2006-08-28 15:34:49 +0800
commit0883cca01ee76787b2dd7d2d618cf0623c2fbc05 (patch)
tree2ceb52390cf1668d21d34fd9cb9e1dbaa53f346d
parent78d57e1fdb45603fff43f7be14ea8c0ef60f9965 (diff)
downloadfreebsd-ports-gnome-0883cca01ee76787b2dd7d2d618cf0623c2fbc05.tar.gz
freebsd-ports-gnome-0883cca01ee76787b2dd7d2d618cf0623c2fbc05.tar.zst
freebsd-ports-gnome-0883cca01ee76787b2dd7d2d618cf0623c2fbc05.zip
- 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 PR: ports/102482 Submitted by: Beat Gätzi <beat(at)chruetertee.ch> (maintainer) Approved by: krion (mentor)
-rw-r--r--www/fluxcms/Makefile14
-rw-r--r--www/fluxcms/files/patch-install-dist-conf-config.xml11
2 files changed, 16 insertions, 9 deletions
diff --git a/www/fluxcms/Makefile b/www/fluxcms/Makefile
index 9b91d098424d..bdf296ecc40c 100644
--- a/www/fluxcms/Makefile
+++ b/www/fluxcms/Makefile
@@ -23,10 +23,9 @@ PLIST_SUB= INSTALLDIR=${FLUXCMSDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
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
@@ -35,16 +34,13 @@ 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}
.endif
+post-patch:
+ @${RM} ${WRKSRC}/install/dist/conf/config.xml.orig
+
do-install:
@${MKDIR} ${INSTALLDIR}
@${CP} -R ${WRKSRC}/* ${INSTALLDIR}
diff --git a/www/fluxcms/files/patch-install-dist-conf-config.xml b/www/fluxcms/files/patch-install-dist-conf-config.xml
new file mode 100644
index 000000000000..9e5e8c6198dc
--- /dev/null
+++ b/www/fluxcms/files/patch-install-dist-conf-config.xml
@@ -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. \ No newline at end of file