Date: Sat, 13 Oct 2012 09:17:25 GMT From: Spil <spil.oss@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172659: [www/mediawiki] Missing OPTION in Makefile Message-ID: <201210130917.q9D9HPV7041302@red.freebsd.org> Resent-Message-ID: <201210130920.q9D9K1C1026768@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172659
>Category: ports
>Synopsis: [www/mediawiki] Missing OPTION in Makefile
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Oct 13 09:20:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Spil
>Release: FreeBSD 9.0-p2
>Organization:
n/a
>Environment:
FreeBSD gw.example.org 9.0-RELEASE-p2 FreeBSD 9.0-RELEASE-p2 #2: Tue Jun 5 08:38:34 CEST 2012 root@gw.example.org:/usr/obj/usr/src/sys/BEASTIE90 i386
>Description:
Building www/mediawiki failed with
# make
"Makefile", line 59: Malformed conditional (${PORT_OPTIONS:MAPC} || ${PORTS_OPTIONS:MEACCEL} || ${PORTS_OPTIONS:MXCACHE})
"Makefile", line 67: if-less endif
make: fatal errors encountered -- cannot continue
Checked the Makefile and found that the option XCACHE was missing from OPTIONS_DEFINE and there was no XCACHE_DESC line.
Patched the Makefile, removed the nested if for the PHP Accelerator selection and moved pecl-APC to the preferred Accelerator when multiple are used.
>How-To-Repeat:
>Fix:
diff -ruN Makefile.orig Makefile
--- Makefile.orig 2012-10-13 11:13:24.000000000 +0200
+++ Makefile 2012-10-13 11:15:05.000000000 +0200
@@ -21,12 +21,13 @@
NO_BUILD= yes
-OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL IMAGICK
+OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK
OPTIONS_DEFAULT=MYSQL APC
MEMCACHED_DESC= use memcached
APC_DESC= use pecl-APC(Mediawiki recommended)
EACCEL_DESC= use eAccelerator (instead of pecl-APC)
+XCACHE_DESC= use xCache (instead of pecl-APC)
IMAGICK_DESC= use ImageMagick
.include <bsd.port.options.mk>
@@ -56,14 +57,12 @@
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
.endif
-.if ${PORT_OPTIONS:MAPC} || ${PORTS_OPTIONS:MEACCEL} || ${PORTS_OPTIONS:MXCACHE}
-.if ${PORT_OPTIONS:MEACCEL}
+.if ${PORT_OPTIONS:MAPC}
+RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+.elif ${PORT_OPTIONS:MEACCEL}
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccelerator
.elif ${PORT_OPTIONS:MXCACHE}
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
-.else
-RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
-.endif
.endif
do-install:
Patch attached with submission follows:
diff -ruN Makefile.orig Makefile
--- Makefile.orig 2012-10-13 11:13:24.000000000 +0200
+++ Makefile 2012-10-13 11:15:05.000000000 +0200
@@ -21,12 +21,13 @@
NO_BUILD= yes
-OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL IMAGICK
+OPTIONS_DEFINE= MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK
OPTIONS_DEFAULT=MYSQL APC
MEMCACHED_DESC= use memcached
APC_DESC= use pecl-APC(Mediawiki recommended)
EACCEL_DESC= use eAccelerator (instead of pecl-APC)
+XCACHE_DESC= use xCache (instead of pecl-APC)
IMAGICK_DESC= use ImageMagick
.include <bsd.port.options.mk>
@@ -56,14 +57,12 @@
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
.endif
-.if ${PORT_OPTIONS:MAPC} || ${PORTS_OPTIONS:MEACCEL} || ${PORTS_OPTIONS:MXCACHE}
-.if ${PORT_OPTIONS:MEACCEL}
+.if ${PORT_OPTIONS:MAPC}
+RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
+.elif ${PORT_OPTIONS:MEACCEL}
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccelerator
.elif ${PORT_OPTIONS:MXCACHE}
RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xcache.so:${PORTSDIR}/www/xcache
-.else
-RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
-.endif
.endif
do-install:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210130917.q9D9HPV7041302>