From owner-freebsd-ports  Wed Jan  6 07:10:08 1999
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id HAA25830
          for freebsd-ports-outgoing; Wed, 6 Jan 1999 07:10:08 -0800 (PST)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA25825
          for <freebsd-ports@FreeBSD.org>; Wed, 6 Jan 1999 07:10:06 -0800 (PST)
          (envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id HAA16358;
	Wed, 6 Jan 1999 07:10:00 -0800 (PST)
Received: from axl.noc.iafrica.com (axl.noc.iafrica.com [196.31.1.175])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA25719
          for <FreeBSD-gnats-submit@freebsd.org>; Wed, 6 Jan 1999 07:09:07 -0800 (PST)
          (envelope-from sheldonh@axl.noc.iafrica.com)
Received: from sheldonh (helo=axl.noc.iafrica.com)
	by axl.noc.iafrica.com with local-esmtp (Exim 2.10 #1)
	id 0zxuZV-0002Wq-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 6 Jan 1999 17:08:33 +0200
Message-Id: <9723.915635313@axl.noc.iafrica.com>
Date: Wed, 06 Jan 1999 17:08:33 +0200
From: Sheldon Hearn <axl@iafrica.com>
Reply-To: Sheldon Hearn <axl@iafrica.com>
To: FreeBSD-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: 3.2
Subject: ports/9347: [PATCH] unbreak apache13-php3 for over-install
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         9347
>Category:       ports
>Synopsis:       [PATCH] unbreak apache13-php3 for over-install
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan  6 07:10:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Sheldon Hearn
>Release:        FreeBSD 2.2.7-STABLE i386
>Organization:
UUNET Internet Africa
>Environment:

	Where symlinks for (apache_pb.gif|index.html|manual) exist in
	${PREFIX}/www/data/ from prior installations.

>Description:

	The www/apache13-php3 port install target breaks apache is
	already installed. This is because it assumes that
	(apache_pb.gif|index.html|manual) do not exist in
	${PREFIX}/www/data/ when it creates symlinks referencing
	installed files.

>How-To-Repeat:

	cd ${PORTSDIR}/www/apache13-php3 ; make install ; make clean \
	make install

>Fix:

	The following patch teaches www/apache13-php3 not to create a
	symlink in ${PREFIX}/www/data/ if a file with the same name
	of the intended link already exists in that directory.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/apache13-php3/Makefile,v
retrieving revision 1.63
diff -u -d -r1.63 Makefile
--- Makefile	1999/01/03 12:26:47	1.63
+++ Makefile	1999/01/06 14:59:19
@@ -113,7 +116,9 @@
 	find ${APACHEDOCDIR} -type d -exec chmod a+rx {} \; ; \
 	find ${APACHEDOCDIR} -type f -exec chmod a+r {} \;
 .for i in apache_pb.gif index.html manual
-	${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i
+	if [ ! -e ${PREFIX}/www/data/$i ] ; then \
+	    ${LN} -s ${PREFIX}/share/doc/apache/$i ${PREFIX}/www/data/$i ; \
+	fi
 .endfor
 .for i in CODING_STANDARDS EXTENSION_STATUS LICENSE
 	${INSTALL_DATA} ${WRKDIR}/php-${VERSION_PHP3}/$i ${PHP3DOCDIR}
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message