Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Apr 2006 03:40:14 +0100
From:      Shaun Amott <shaun@inerd.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/96080: [MAINTAINER] www/horde - Makefile tweak to fix bug
Message-ID:  <1145500814.4937@charon.picobyte.net>
Resent-Message-ID: <200604200250.k3K2o2B7010913@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>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#^ *<!--#//#' -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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1145500814.4937>