From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 7 04:20:20 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 72E8C106567A for ; Sun, 7 Oct 2012 04:20:19 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 23F6A8FC1F for ; Sun, 7 Oct 2012 04:20:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q974KI2Q064221 for ; Sun, 7 Oct 2012 04:20:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q974KIfw064220; Sun, 7 Oct 2012 04:20:18 GMT (envelope-from gnats) Resent-Date: Sun, 7 Oct 2012 04:20:18 GMT Resent-Message-Id: <201210070420.q974KIfw064220@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Michael Gmelin Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2F8E31065674 for ; Sun, 7 Oct 2012 04:15:35 +0000 (UTC) (envelope-from freebsd@grem.de) Received: from mail.grem.de (outcast.grem.de [213.239.217.27]) by mx1.freebsd.org (Postfix) with SMTP id 93BB58FC18 for ; Sun, 7 Oct 2012 04:15:34 +0000 (UTC) Received: (qmail 60500 invoked by uid 0); 7 Oct 2012 04:15:33 -0000 Message-Id: <20121007041533.60499.qmail@mail.grem.de> Date: 7 Oct 2012 04:15:33 -0000 From: Michael Gmelin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/172428: [PATCH] www/openacs: Converting port to new options framework X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 04:20:20 -0000 >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 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 -# -# $FreeBSD: ports/www/openacs/Makefile,v 1.30 2012/10/02 16:40:40 az Exp $ -# +# Created by: Aldert Nooitgedagt +# $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 +.include # 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 +.include --- openacs-5.7.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: