Date: Wed, 21 Dec 2005 04:08:20 -0600 (CST) From: Babak Farrokhi <babak@farrokhi.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/90735: update port mail/roundcube - tidy up Makefile Message-ID: <20051221100820.ED61156454@royalway.propagation.net> Resent-Message-ID: <200512211010.jBLAA3xo084113@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90735
>Category: ports
>Synopsis: update port mail/roundcube - tidy up Makefile
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Dec 21 10:10:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Babak Farrokhi
>Release: FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD royalway.propagation.net 5.4-STABLE FreeBSD 5.4-STABLE #6: Thu Jun 30 05:11:17 CDT 2005 root@royalway.propagation.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
- Fix check for PHP5 (previous method did not work)
- Changed the handling method for OPTIONS to make portlint happy
>How-To-Repeat:
>Fix:
--- roundcube-latest.patch begins here ---
diff -ruN roundcube.orig/Makefile roundcube/Makefile
--- roundcube.orig/Makefile Wed Dec 21 13:24:27 2005
+++ roundcube/Makefile Wed Dec 21 13:25:56 2005
@@ -36,6 +36,12 @@
WANT_PHP_WEB= yes
+LOCALBASE?= /usr/local
+
+.if exists(${LOCALBASE}/etc/php.conf)
+.include "${LOCALBASE}/etc/php.conf"
+.endif
+
OPTIONS= MYSQL "Use MySQL backend" on \
PGSQL "Use PostgreSQL backend" off
@@ -43,7 +49,13 @@
OPTIONS+= SQLITE "Use SQLite backend" off
.endif
-.include <bsd.port.pre.mk>
+PORT_DBDIR?= /var/db/ports
+LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
+OPTIONSFILE?= ${PORT_DBDIR}/${LATEST_LINK}/options
+
+.if exists(${OPTIONSFILE})
+.include "${OPTIONSFILE}"
+.endif
.if !defined(WITHOUT_MYSQL)
USE_PHP+= mysql
@@ -57,8 +69,6 @@
USE_PHP+= sqlite
.endif
-.include "${PORTSDIR}/Mk/bsd.php.mk"
-
do-install:
${MKDIR} ${RCUBEROOT}
.for i in ${RCUBECOMP}
@@ -76,4 +86,4 @@
@${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${CAT} ${PKGMESSAGE}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- roundcube-latest.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?20051221100820.ED61156454>