Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Nov 2015 01:55:59 +0000 (UTC)
From:      Wen Heping <wen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401800 - in head/www/moodle30: . files
Message-ID:  <201511170155.tAH1txdo063354@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: wen
Date: Tue Nov 17 01:55:59 2015
New Revision: 401800
URL: https://svnweb.freebsd.org/changeset/ports/401800

Log:
  - Switch to options helpers
  - Sort USE_PHP
  - Update pkg-message

Modified:
  head/www/moodle30/Makefile
  head/www/moodle30/files/pkg-message.in

Modified: head/www/moodle30/Makefile
==============================================================================
--- head/www/moodle30/Makefile	Tue Nov 17 01:24:12 2015	(r401799)
+++ head/www/moodle30/Makefile	Tue Nov 17 01:55:59 2015	(r401800)
@@ -3,6 +3,7 @@
 
 PORTNAME=	moodle
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/moodle/Moodle/stable30/
 PKGNAMESUFFIX=	${PKGORIGIN:T:S/moodle//}
@@ -18,8 +19,8 @@ RUN_DEPENDS=	${PHPBASE}/lib/php/${PHP_EX
 CONFLICTS=	moodle28-2.8.[0-9]* moodle29-2.9.[0-9]*
 
 USES=		tar:tgz
-USE_PHP=	session gd pcre mbstring iconv tokenizer curl xml xmlrpc ctype \
-		soap openssl simplexml spl dom json zip zlib hash opcache
+USE_PHP=	ctype curl dom gd hash iconv json mbstring opcache openssl pcre \
+		session simplexml soap spl tokenizer xml xmlrpc zip zlib
 WRKSRC=		${WRKDIR}/moodle
 
 OPTIONS_SINGLE=		BACKEND
@@ -28,27 +29,11 @@ OPTIONS_DEFINE=		LDAP MIMETEX
 OPTIONS_DEFAULT=	MYSQL
 MIMETEX_DESC=		mimeTeX filter functionality support
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-USE_PHP+=	mysqli
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pgsql
-.endif
-
-.if ${PORT_OPTIONS:MMSSQL}
-USE_PHP+=	mssql
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-USE_PHP+=	ldap
-.endif
-
-.if ${PORT_OPTIONS:MMIMETEX}
-RUN_DEPENDS+=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
-.endif
+MYSQL_USE=	mysql=client php=mysql
+PGSQL_USE=	php=pgsql
+MSSQL_USE=	php=mssql
+LDAP_USE=	php=ldap
+MIMETEX_RUN_DEPENDS=	${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
 
 NO_BUILD=	yes
 PLIST=		${WRKDIR}/plist
@@ -76,9 +61,9 @@ pre-install:
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
 	@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}
-.if ${PORT_OPTIONS:MMIMETEX}
+
+do-install-MIMETEX-on:
 	${LN} -sf ${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi \
 		${STAGEDIR}${PREFIX}/${MOODLEDIR}/filter/tex/mimetex.freebsd
-.endif
 
 .include <bsd.port.mk>

Modified: head/www/moodle30/files/pkg-message.in
==============================================================================
--- head/www/moodle30/files/pkg-message.in	Tue Nov 17 01:24:12 2015	(r401799)
+++ head/www/moodle30/files/pkg-message.in	Tue Nov 17 01:55:59 2015	(r401800)
@@ -59,8 +59,7 @@ configuration will allow Moodle to opera
 If you are upgrading from an earlier version of Moodle, check out
 possible additional steps at:
 
-   http://docs.moodle.org/en/Upgrading
-   http://docs.moodle.org/en/Upgrading_to_Moodle_2.0
+   https://docs.moodle.org/30/en/Upgrading
 
 If you have real trouble, please visit the Moodle course
 "Using Moodle" on moodle.org.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511170155.tAH1txdo063354>