From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Aug 11 13:50:08 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B59C3106567C for ; Wed, 11 Aug 2010 13:50:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 7933D8FC17 for ; Wed, 11 Aug 2010 13:50:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BDo8g9029657 for ; Wed, 11 Aug 2010 13:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o7BDo8bD029656; Wed, 11 Aug 2010 13:50:08 GMT (envelope-from gnats) Resent-Date: Wed, 11 Aug 2010 13:50:08 GMT Resent-Message-Id: <201008111350.o7BDo8bD029656@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, Alberto Villa Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F62A106564A for ; Wed, 11 Aug 2010 13:47:22 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 0E9FF8FC1D for ; Wed, 11 Aug 2010 13:47:22 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o7BDlL2p014365 for ; Wed, 11 Aug 2010 13:47:21 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o7BDlLdH014364; Wed, 11 Aug 2010 13:47:21 GMT (envelope-from nobody) Message-Id: <201008111347.o7BDlLdH014364@www.freebsd.org> Date: Wed, 11 Aug 2010 13:47:21 GMT From: Alberto Villa To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/149525: [PATCH] astro/xplanet - fix install when astro/xearth is not there X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 13:50:08 -0000 >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: