From owner-svn-ports-all@FreeBSD.ORG  Sun Oct  7 13:34:07 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A55DF106566C;
	Sun,  7 Oct 2012 13:34:07 +0000 (UTC)
	(envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BFE38FC08;
	Sun,  7 Oct 2012 13:34:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q97DY7ul007379;
	Sun, 7 Oct 2012 13:34:07 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q97DY7uY007377;
	Sun, 7 Oct 2012 13:34:07 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201210071334.q97DY7uY007377@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Sun, 7 Oct 2012 13:34:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r305476 - head/www/openacs
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Oct 2012 13:34:07 -0000

Author: eadler
Date: Sun Oct  7 13:34:06 2012
New Revision: 305476
URL: http://svn.freebsd.org/changeset/ports/305476

Log:
  Convert to OptionsNG

Modified:
  head/www/openacs/Makefile

Modified: head/www/openacs/Makefile
==============================================================================
--- head/www/openacs/Makefile	Sun Oct  7 13:32:30 2012	(r305475)
+++ head/www/openacs/Makefile	Sun Oct  7 13:34:06 2012	(r305476)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    openACS
-# Date created:         July 2005
-# Whom:                 Aldert Nooitgedagt <aldert@nooitgedagt.net>
-#
+# Created by: Aldert Nooitgedagt <aldert@nooitgedagt.net>
 # $FreeBSD$
-#
 
 PORTNAME?=	openacs
 DISTVERSION?=	5.7.0
@@ -50,10 +46,12 @@ PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PORTDOCS=	*
 
-OPTIONS=	TCLTHREAD "Depend on tclthread" on \
-		TCLWEBTEST "Depend on tclwebteset" on
+OPTIONS_DEFINE=	DOCS TCLTHREAD TCLWEBTEST
+OPTIONS_DEFAULT=TCLTHREAD TCLWEBTEST
+TCLTHREAD_DESC=	Depend on tclthread
+TCLWEBTEST_DESC=Depend on tclwebtest
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 # Parse ${PORTSDIR}/UIDs and GIDs for the defaults
 USER!=	${GREP} -E '^${OPENACS_USER}:' ${PORTSDIR}/UIDs | \
@@ -82,12 +80,12 @@ SUB_LIST+=	OPENACS_USER=${OPENACS_USER} 
 		SU=${SU} PGREP=${PGREP} AWK=${AWK} CP=${CP} GREP=${GREP} \
 		PW=${PW} CHOWN=${CHOWN} CHMOD=${CHMOD}
 
-.if !defined(WITHOUT_TCLTHREAD)
+.if ${PORT_OPTIONS:MTCLTHREAD}
 TCLTHREAD_VER?=	2.6.7
 RUN_DEPENDS+=	${LOCALBASE}/lib/thread${TCLTHREAD_VER}/libthread.so.1:${PORTSDIR}/devel/tclthread
 .endif
 
-.if !defined(WITHOUT_TCLWEBTEST)
+.if ${PORT_OPTIONS:MTCLWEBTEST}
 RUN_DEPENDS+=	${LOCALBASE}/bin/tclwebtest:${PORTSDIR}/www/tclwebtest
 .endif
 
@@ -128,7 +126,7 @@ do-install:
 	@ if ! [ -f ${OPENACSBASE}/etc/${PORTNAME}-config.tcl ]; then \
 		${INSTALL_DATA} ${WRKDIR}/${PORTNAME}-config.tcl ${OPENACSBASE}/etc/${PORTNAME}-config.tcl ; \
 	  fi
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@ ${ECHO} "Installing docs"
 	@ ${MKDIR} ${DOCSDIR}
 .for FILE in ChangeLog readme.txt license.txt
@@ -141,4 +139,4 @@ do-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>