Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2002 23:35:47 +1000 (EST)
From:      Edwin Groothuis <edwin@mavetju.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        will@FreeBSD.org
Subject:   ports/44261: [patch] astro/xplanet - make it working under -current
Message-ID:  <20021019133547.EE1386A712B@k7.mavetju>

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

>Number:         44261
>Category:       ports
>Synopsis:       [patch] astro/xplanet - make it working under -current
>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:   Sat Oct 19 06:40:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386

$FreeBSD: ports/astro/xplanet/Makefile,v 1.19 2002/07/06 10:13:38 ijliao Exp $

>Description:

See http://bento.freebsd.org/errorlogs/5-full/xplanet-0.94.log

>How-To-Repeat:

See http://bento.freebsd.org/errorlogs/5-full/xplanet-0.94.log

>Fix:

This patch will update the Makefile to support REINPLACE_CMD and
adds two pathes: files/patch-orbit.h and files/patch-xplanetbg.cc

I've forwarded the patches to the author of xplanet too.

Special thanks to Xaa(at)timewasters.nl for lending his -current
machine.

--- files/patch-orbit.h	Sat Oct 19 22:28:42 2002
+++ files/patch-orbit.h	Sat Oct 19 22:28:42 2002
@@ -0,0 +1,11 @@
+--- orbit.h.old	Sat Oct 19 22:27:16 2002
++++ orbit.h	Sat Oct 19 22:27:21 2002
+@@ -25,7 +25,7 @@
+ 
+ // Sorry folks, most of this code is inline. Don't think I like it.
+ 
+-#include <iostream.h>
++#include <iostream>
+ #include <math.h>
+ 
+ #define DEG2RAD(Phi) (M_PI/180.0*Phi)
--- files/patch-xplanetbg.cc	Sat Oct 19 23:26:40 2002
+++ files/patch-xplanetbg.cc	Sat Oct 19 23:26:40 2002
@@ -0,0 +1,11 @@
+--- xplanetbg.cc.old	Sat Oct 19 15:12:16 2002
++++ xplanetbg.cc	Sat Oct 19 15:12:30 2002
+@@ -907,7 +907,7 @@
+         
+         if (debug)
+         {
+-            cout << "Finished at " << ctime(&current_time.tv_sec);
++            cout << "Finished at " << ctime((time_t *)&current_time.tv_sec);
+             cout << "Sleeping for " << sleep_time << " seconds until "
+                  << ctime((time_t *) &next_update) << endl;
+         }
--- Makefile.old	Sat Oct 19 23:27:19 2002
+++ Makefile	Sat Oct 19 23:28:52 2002
@@ -26,6 +26,7 @@
 USE_MESA=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--with-map-extension=jpg --with-freetype --with-gif \
 		--with-png --with-pnm --with-tiff
@@ -43,10 +44,10 @@
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	@${PERL} -pi -e 's|-O3||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O3||' ${WRKSRC}/configure
 
 pre-build:
-	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/auxfiles.h
+	@${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/auxfiles.h
 
 # Install the list of FreeBSD sites & committers locations from astro/xearth
 post-install:
>Release-Note:
>Audit-Trail:
>Unformatted:

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




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