Date: Tue, 31 Dec 2013 04:00:01 GMT From: ckd-freebsd@ckdhr.com To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/184503: [patch] mail/policyd2 port assumes MySQL for web UI, requires web UI Message-ID: <201312310400.rBV4011H003201@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/184503; it has been noted by GNATS.
From: ckd-freebsd@ckdhr.com
To: bug-followup@freebsd.org
Cc:
Subject: Re: ports/184503: [patch] mail/policyd2 port assumes MySQL for web UI, requires web UI
Date: Mon, 30 Dec 2013 22:45:29 -0500 (EST)
Here's a cleaner (newer) version of the diff that matches the current ports tree.
--- Mk/bsd.options.desc.mk.orig 2013-11-23 13:18:33.000000000 -0500
+++ Mk/bsd.options.desc.mk 2013-12-30 13:55:25.774746490 -0500
@@ -457,6 +457,7 @@
WEBKIT_DESC?= WebKit support
WEBP_DESC?= WebP image format support
WEBSERVER_DESC?= Build and/or install internal web server
+WEBUI_DESC?= Build and/or install web user interface
WMA_DESC?= Windows Media Audio support
WMF_DESC?= Windows Metafile support
WXGTK_DESC?= wxGTK GUI toolkit support
--- mail/policyd2/Makefile.orig 2013-09-20 15:59:12.000000000 -0400
+++ mail/policyd2/Makefile 2013-12-30 13:58:13.094747414 -0500
@@ -16,7 +16,6 @@
p5-Cache-FastMmap>=0:${PORTSDIR}/devel/p5-Cache-FastMmap
USES= perl5
-USE_PHP= yes
NO_BUILD= yes
USE_RC_SUBR= policyd2
BINMODE= 0755
@@ -26,21 +25,29 @@
PORTDOCS= AUTHORS ChangeLog INSTALL TODO WISHLIST
PORTDATA= *
-OPTIONS_DEFINE= MYSQL PGSQL SQLITE
-OPTIONS_DEFAULT= MYSQL
+OPTIONS_DEFINE= MYSQL PGSQL SQLITE WEBUI
+OPTIONS_DEFAULT= MYSQL WEBUI
NO_STAGE= yes
.include <bsd.port.pre.mk>
-USE_PHP= pdo_mysql
.if ${PORT_OPTIONS:MMYSQL}
RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
-.endif
+.if ${PORT_OPTIONS:MWEBUI}
+USE_PHP= pdo_mysql
+.endif # MYSQL && WEBUI
+.endif # MYSQL
.if ${PORT_OPTIONS:MSQLITE}
RUN_DEPENDS+= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
-.endif
+.if ${PORT_OPTIONS:MWEBUI}
+USE_PHP= pdo_sqlite
+.endif # SQLITE && WEBUI
+.endif # SQLITE
.if ${PORT_OPTIONS:MPGSQL}
RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
-.endif
+.if ${PORT_OPTIONS:MWEBUI}
+USE_PHP= pdo_pgsql
+.endif # PGSQL && WEBUI
+.endif # PGSQL
post-patch:
@${REINPLACE_CMD} 's|/etc|${PREFIX}/etc|' ${WRKSRC}/cbpadmin \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312310400.rBV4011H003201>