Date: Wed, 11 Aug 2010 13:47:21 GMT From: Alberto Villa <avilla@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/149525: [PATCH] astro/xplanet - fix install when astro/xearth is not there Message-ID: <201008111347.o7BDlLdH014364@www.freebsd.org> Resent-Message-ID: <201008111350.o7BDo8bD029656@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149525
>Category: ports
>Synopsis: [PATCH] astro/xplanet - fix install when astro/xearth is not there
>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: Wed Aug 11 13:50:08 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Alberto Villa
>Release: FreeBSD 9.0-CURRENT
>Organization:
>Environment:
FreeBSD echo.hoth 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r210265: Tue Jul 20 03:02:22 CEST 2010 root@echo.hoth:/usr/obj/usr/src/sys/TPR60 i386
>Description:
xplanet installs files from astro/xearth/files without depending (obviously) on it. as a result of this, `porteasy` and similar scripts do not import xearth in custom ports trees, and the installation of xplanet fails (i'm thinking in particular about tinderbox environments)
>How-To-Repeat:
porteasy astro/xplanet and make install it. all the dependencies are there, except for astro/xearth
>Fix:
the attached patch makes the installation of xearth files conditional (if they exist, they get installed)
Patch attached with submission follows:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/xplanet/Makefile,v
retrieving revision 1.48
diff -u -r1.48 Makefile
--- Makefile 9 May 2010 14:03:14 -0000 1.48
+++ Makefile 11 Aug 2010 13:40:18 -0000
@@ -7,6 +7,7 @@
PORTNAME= xplanet
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= astro geography
MASTER_SITES= SF
@@ -87,8 +88,10 @@
post-install:
.for file in freebsd.committers.markers freebsd.ftp.markers
+.if exists(${PORTSDIR}/astro/xearth/files/${file})
@${INSTALL_DATA} ${PORTSDIR}/astro/xearth/files/${file} \
${DATADIR}/markers
+.endif
.endfor
@${FIND} ${DATADIR} -type f | \
${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008111347.o7BDlLdH014364>