From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 20 02:50:02 2006 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 EBCAE16A404 for ; Thu, 20 Apr 2006 02:50:02 +0000 (UTC) (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 6218D43D48 for ; Thu, 20 Apr 2006 02:50:02 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3K2o2cH010914 for ; Thu, 20 Apr 2006 02:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3K2o2B7010913; Thu, 20 Apr 2006 02:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 20 Apr 2006 02:50:02 GMT Resent-Message-Id: <200604200250.k3K2o2B7010913@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, Shaun Amott Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 03AF116A400 for ; Thu, 20 Apr 2006 02:40:17 +0000 (UTC) (envelope-from shaun@inerd.com) Received: from dione.picobyte.net (host-212-158-207-124.bulldogdsl.com [212.158.207.124]) by mx1.FreeBSD.org (Postfix) with SMTP id 7300743D45 for ; Thu, 20 Apr 2006 02:40:16 +0000 (GMT) (envelope-from shaun@inerd.com) Received: from charon.picobyte.net (charon.picobyte.net [IPv6:2001:4bd0:201e::fe03]) by dione.picobyte.net (Postfix) with ESMTP for ; Thu, 20 Apr 2006 03:40:14 +0100 (BST) Message-Id: <1145500814.4937@charon.picobyte.net> Date: Thu, 20 Apr 2006 03:40:14 +0100 From: Shaun Amott To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/96080: [MAINTAINER] www/horde - Makefile tweak to fix bug X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Shaun Amott List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Apr 2006 02:50:03 -0000 >Number: 96080 >Category: ports >Synopsis: [MAINTAINER] www/horde - Makefile tweak to fix bug >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Apr 20 02:50:01 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Shaun Amott >Release: FreeBSD 6.1-PRERELEASE i386 >Organization: >Environment: >Description: Horde requires that one of its configuration files (conf.php) contain an RCS tag from another file (conf.xml) - but it doesn't appear to be there by default. So we copy it over if there isn't already one in the file, prior to install. >How-To-Repeat: >Fix: --- horde.diff begins here --- diff -urN horde.orig/Makefile horde/Makefile --- horde.orig/Makefile Sat Apr 15 21:32:38 2006 +++ horde/Makefile Thu Apr 20 03:20:56 2006 @@ -334,6 +334,13 @@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif + # Copy RCSID tag from conf.xml into conf.php to stop Horde complaining + @if ! ${GREP} -q -e "$$Horde.*conf\.xml" ${WRKSRC}/config/conf.php.dist; then \ + ${GREP} -h "$$Horde.*conf\.xml" ${WRKSRC} ${WRKSRC}/config/conf.xml \ + | ${SED} -e 's#^ * *$$##g' \ + >> ${WRKSRC}/config/conf.php.dist; \ + fi + do-install: @${MKDIR} ${HORDEDIR} .for REP in ${SUB_DIRS} --- horde.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: