ports/179137: www/mediawiki118 & www/mediawiki120: do not depend on MySQL server

[Remko Lodder]

>Number:         179137
>Category:       ports
>Synopsis:       www/mediawiki118 & www/mediawiki120: do not depend on MySQL server
>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:   Fri May 31 08:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Remko Lodder
>Release:        10.x
>Organization:
FreeBSD
>Environment:
FreeBSD nakur.elvandar.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r245690: Sun Jan 20 21:10:19 CET 2013     root at nakur.elvandar.org:/usr/obj/usr/src/sys/NAKUR  amd64
>Description:
Both mentioned Mediawiki ports still depend on the MySQL server, which is not needed to let mediawiki function properly. This was corrected for mediawiki119, but both other ports weren't adopted along. I am sending the patch for both ports now.

In addition the mediawiki118 could use some love and care for OptionsNG and such, which is included in the diff as well.
>How-To-Repeat:
Install either of one of the ports and see MySQL-server being sucked in as dependency.
>Fix:
Both patches can be found below or at:

https://www.evilcoder.org/tmp/mediawiki118.diff
https://www.evilcoder.org/tmp/mediawiki120.diff

--- mediawiki118/Makefile.orig  2013-05-01 17:59:48.000000000 +0200
+++ mediawiki118/Makefile       2013-05-31 09:50:29.000000000 +0200
@@ -1,9 +1,6 @@
-# New ports collection makefile for:   www/mediawiki
-# Date created:                                February 1st 2005
-# Whom:                                        Gerrit Beine <tux at pinguru.net>
-#
+
+# Created by: Gerrit Beine <tux at pinguru.net>
 # $FreeBSD: www/mediawiki118/Makefile 317030 2013-05-01 15:59:48Z wen $
-#

 PORTNAME=      mediawiki
 PORTVERSION=   1.18.6
@@ -13,48 +10,63 @@
 MAINTAINER=    wen at FreeBSD.org
 COMMENT=       The wiki engine used by Wikipedia

+LICENSE=       GPLv2
+
 DEPRECATED=    Unmaintained upstream
 EXPIRATION_DATE=2013-08-01

 CONFLICTS=     mediawiki-1.19.* mediawiki-1.2[0-9].*

 FETCH_ARGS=    -pr
-NO_LATEST_LINK=        yes
 USE_PHP=       ctype iconv mbstring pcre session xml zlib readline dom
-IGNORE_WITH_PHP=       4
+IGNORE_WITH_PHP=4
 WANT_PHP_WEB=  yes
 MEDIAWIKIDIR?= www/mediawiki
+
 NO_BUILD=      yes

-OPTIONS=       PGSQL "Use PostgreSQL (instead of MySQL)" off \
-               LDAP "Use LDAP authentication" off \
-               APC "Use pecl-APC" on \
-               EACCEL "Use eAccelerator (instead of pecl-APC)" off \
-               IMAGICK "Use ImageMagick" off
+OPTIONS_DEFINE=        MYSQL PGSQL SQLITE LDAP MEMCACHED APC EACCEL XCACHE IMAGICK
+OPTIONS_DEFAULT=MYSQL APC

-.include <bsd.port.pre.mk>
+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

-.if defined(WITH_PGSQL)
-USE_PHP+=      pgsql
-.else
-USE_MYSQL=     server
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+USE_MYSQL=     client
 USE_PHP+=      mysql
 .endif

-.if defined(WITH_LDAP)
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PHP+=      pgsql
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
+USE_PHP+=      sqlite
+.endif
+
+.if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=      ldap
 .endif

-.if defined(WITH_IMAGICK)
+.if ${PORT_OPTIONS:MMEMCACHED}
+RUN_DEPENDS=   memcached:${PORTSDIR}/databases/memcached
+.endif
+
+.if ${PORT_OPTIONS:MIMAGICK}
 RUN_DEPENDS+=  ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/imagick.so:${PORTSDIR}/graphics/pecl-imagick
 .endif

-.if defined(WITH_APC) || defined(WITH_EACCEL)
-.if defined(WITH_EACCEL)
-RUN_DEPENDS+=  ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/eaccelerator.so:${PORTSDIR}/www/eaccelerator
-.else
+.if ${PORT_OPTIONS:MAPC}
 RUN_DEPENDS+=  ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/apc.so:${PORTSDIR}/www/pecl-APC
-.endif
+.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
 .endif

 do-install:
@@ -69,4 +81,4 @@
                | ${SED} -ne 's,^${WRKSRC}, at dirrm ${MEDIAWIKIDIR},p' >> ${TMPPLIST}
        @${SED} -e 's|%%MEDIAWIKIDIR%%|${PREFIX}/${MEDIAWIKIDIR}|' ${PKGMESSAGE}

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



--- mediawiki120/Makefile.orig  2013-05-23 08:48:20.000000000 +0200
+++ mediawiki120/Makefile       2013-05-31 09:31:54.000000000 +0200
@@ -33,7 +33,7 @@
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=     server
+USE_MYSQL=     client
 USE_PHP+=      mysql
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted: