From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jun 16 13:10:21 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 27F5616A41C for ; Thu, 16 Jun 2005 13:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02D1E43D48 for ; Thu, 16 Jun 2005 13:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j5GDAKLx072184 for ; Thu, 16 Jun 2005 13:10:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j5GDAKqw072183; Thu, 16 Jun 2005 13:10:20 GMT (envelope-from gnats) Resent-Date: Thu, 16 Jun 2005 13:10:20 GMT Resent-Message-Id: <200506161310.j5GDAKqw072183@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, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1BDEB16A41C for ; Thu, 16 Jun 2005 13:09:37 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: from chinsan.twbbs.org (218-166-146-48.dynamic.hinet.net [218.166.146.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id B261C43D58 for ; Thu, 16 Jun 2005 13:09:36 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 0) id 1A86D7301F; Thu, 16 Jun 2005 21:09:38 +0800 (CST) Message-Id: <20050616130938.1A86D7301F@chinsan.twbbs.org> Date: Thu, 16 Jun 2005 21:09:38 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/82319: [MAINTAINER] www/b2evo: make B2EVO_DIR as a optional knob X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jun 2005 13:10:21 -0000 >Number: 82319 >Category: ports >Synopsis: [MAINTAINER] www/b2evo: make B2EVO_DIR as a optional knob >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jun 16 13:10:20 GMT 2005 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 5.3-RELEASE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: - Thanks to the advice from Dave Dean which use "data" instead if "data-dist" >How-To-Repeat: >Fix: --- b2evo.patch begins here --- diff -ruN b2evo.orig/Makefile b2evo/Makefile --- b2evo.orig/Makefile Thu Jun 16 20:39:52 2005 +++ b2evo/Makefile Thu Jun 16 20:59:27 2005 @@ -10,44 +10,52 @@ CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= evocms -DISTNAME= ${PORTNAME}-${PORTVERSION}-${B2EVODATE} +DISTNAME= ${PORTNAME}-${PORTVERSION}-${B2EVO_DATE} MAINTAINER= chinsan.tw@gmail.com COMMENT= A multilingual, multiuser, multi-blog engine USE_ZIP= YES -B2EVODATE?= 2005-05-06 -USE_PHP= mysql pcre session +B2EVO_DATE?= 2005-05-06 +USE_PHP= mysql pcre session xml PHP4_PORT?= www/mod_php4 NO_BUILD= YES WANT_PHP_WEB= YES -TMPDIR?= b2evolution +TMPDIR?= ${PORTNAME} WRKSRC= ${WRKDIR}/${TMPDIR} -WWWDOCROOT?= www/data-dist -B2EVOURL?= b2evo + +pre-fetch: +.if !defined(B2EVO_DIR) + @${ECHO_MSG} "" + @${ECHO_MSG} "Define B2EVO_DIR to override default of '${B2EVO_DIR}'." + @${ECHO_MSG} "" +.endif + +WWWDOCROOT?= www/data +B2EVO_URL?= b2evo WWWOWN?= www WWWGRP?= www -B2EVODIR?= ${WWWDOCROOT}/${B2EVOURL} +B2EVO_DIR?= ${WWWDOCROOT}/${B2EVO_URL} PLIST= ${WRKDIR}/pkg-plist .include pre-install: cd ${WRKSRC} && ${FIND} -s . -type f | \ - ${SED} -e 's|^./||;s|^|${B2EVODIR}/|' > ${PLIST} \ + ${SED} -e 's|^./||;s|^|${B2EVO_DIR}/|' > ${PLIST} \ && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm ${B2EVODIR}/|' >> ${PLIST} \ - && ${ECHO_CMD} @dirrm ${B2EVODIR} >> ${PLIST} + ${SED} -e 's|^|@dirrm ${B2EVO_DIR}/|' >> ${PLIST} \ + && ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST} do-install: - -${MKDIR} ${PREFIX}/${B2EVODIR} - @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${B2EVODIR} - @${CHMOD} 755 ${PREFIX}/${B2EVODIR} - @${CP} -R ${WRKSRC}/ ${PREFIX}/${B2EVODIR} + -${MKDIR} ${PREFIX}/${B2EVO_DIR} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${B2EVO_DIR} + @${CHMOD} 755 ${PREFIX}/${B2EVO_DIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${B2EVO_DIR} post-install: - @${SED} -e 's|%%B2EVOURL%%|${B2EVOURL}|' ${PKGMESSAGE} + @${SED} -e 's|%%B2EVO_URL%%|${B2EVO_URL}|' ${PKGMESSAGE} .include diff -ruN b2evo.orig/pkg-message b2evo/pkg-message --- b2evo.orig/pkg-message Thu Jun 16 20:39:52 2005 +++ b2evo/pkg-message Thu Jun 16 20:45:25 2005 @@ -2,6 +2,6 @@ **** NOTE **** For first use of b2evolution, remember to point your browser to - http://localhost/%%B2EVOURL%%/blogs/install/ + http://localhost/%%B2EVO_URL%%/blogs/install/ and follow the instructions. --- b2evo.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: