ports/172428: [PATCH] www/openacs: Converting port to new options framework

[Michael Gmelin]

>Number:         172428
>Category:       ports
>Synopsis:       [PATCH] www/openacs: Converting port to new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 07 04:20:17 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Michael Gmelin
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
Grem Equity GmbH
>Environment:
System: FreeBSD bsd64.grem.de 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
The patch below converts the port to use the new options framework[1]       
and converts the Makefile header to the new format[2].

The patch is to be applied using:

patch -p0 -E </path/to/patchfile 

No attempts have been made to fix any potential issues the port might  
have beyond this scope. 

See also:
1. http://lists.freebsd.org/pipermail/freebsd-ports/2012-October/078676.html
2. http://lists.freebsd.org/pipermail/freebsd-ports/2012-August/077801.html

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: suffix)
>How-To-Repeat:
>Fix:

--- openacs-5.7.0.patch begins here ---
diff -ruN --exclude=CVS ../openacs.orig/Makefile ./Makefile
--- ../openacs.orig/Makefile	2012-10-02 18:40:40.000000000 +0200
+++ ./Makefile	2012-10-06 21:27:15.606217093 +0200
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    openACS
-# Date created:         July 2005
-# Whom:                 Aldert Nooitgedagt <aldert at nooitgedagt.net>
-#
-# $FreeBSD: ports/www/openacs/Makefile,v 1.30 2012/10/02 16:40:40 az Exp $
-#
+# Created by: Aldert Nooitgedagt <aldert at nooitgedagt.net>
+# $FreeBSD: $
 
 PORTNAME?=	openacs
 DISTVERSION?=	5.7.0
@@ -50,10 +46,12 @@
 
 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 @@
 		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 @@
 	@ 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 @@
 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- openacs-5.7.0.patch ends here ---

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