Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 May 2008 14:04:43 GMT
From:      Ganael Laplanche <ganael.laplanche@martymac.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/123397: Port update: games/flightgear-atlas - Update to 0.3.0.20080504 (CVS snapshot)
Message-ID:  <200805041404.m44E4hva024648@www.freebsd.org>
Resent-Message-ID: <200805041410.m44EA1UI029814@freefall.freebsd.org>

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

>Number:         123397
>Category:       ports
>Synopsis:       Port update: games/flightgear-atlas - Update to 0.3.0.20080504 (CVS snapshot)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 04 14:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Ganael Laplanche
>Release:        7.0-STABLE
>Organization:
http://contribs.martymac.com
>Environment:
FreeBSD home.martymac.com 7.0-STABLE FreeBSD 7.0-STABLE #15: Wed Apr 30 22:06:57 CEST 2008     root@home.martymac.com:/usr/obj/usr/src/sys/MYKERNEL  amd64
>Description:
This patch updates games/flightgear-atlas to make it build with the new version of simgear (1.0.0).

Since no new version is officially available, the port is updated using a CVS snapshot (20080504) hosted on my webserver and backed-up on a secondary server (Thanks Miwi ;-)).

I'll also take maintainership for it, if possible.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -aurN flightgear-atlas.orig/Makefile flightgear-atlas/Makefile
--- flightgear-atlas.orig/Makefile	2008-05-04 13:14:13.035436685 +0200
+++ flightgear-atlas/Makefile	2008-05-04 13:11:54.238583663 +0200
@@ -6,26 +6,29 @@
 #
 
 PORTNAME=	flightgear-atlas
-PORTVERSION=	0.3.0
-PORTREVISION=	6
+PORTVERSION=	0.3.0.20080504
 CATEGORIES=	games
-MASTER_SITES=	SF/atlas
+MASTER_SITES=	http://contribs.martymac.com/FreeBSD-ports/distfiles/ \
+		http://freebsd.unixfreunde.de/sources/
 DISTNAME=	Atlas-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	A map viewer for use with the FlightGear flight simulator
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		glut.4:${PORTSDIR}/graphics/libglut
+		curl.4:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
 		${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \
 		${LOCALBASE}/share/FlightGear/version:${PORTSDIR}/games/fgfs-base
 
+USE_AUTOTOOLS=	aclocal:19 autoheader:261 automake:15 autoconf:261
+AUTOMAKE_ARGS=	--add-missing
 GNU_CONFIGURE=	yes
-USE_GL=		yes
+USE_XORG=	ice sm x11 xext xi xt xmu
+USE_GL=	gl glu glut
 
 CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${LOCALBASE}/lib
@@ -33,8 +36,9 @@
 CONFIGURE_ARGS=	--with-fgbase="${LOCALBASE}/share/FlightGear"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|^base_LIBS="$$LIBS"|base_LIBS="$$LIBS ${PTHREAD_LIBS}"|' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's|^AC_CHECK_LIB(pthread, pthread_exit)||' ${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/src/Makefile.am
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/AtlasPalette ${LOCALBASE}/share/FlightGear
diff -aurN flightgear-atlas.orig/distinfo flightgear-atlas/distinfo
--- flightgear-atlas.orig/distinfo	2008-05-04 13:14:13.035436685 +0200
+++ flightgear-atlas/distinfo	2008-05-04 13:06:02.272890817 +0200
@@ -1,3 +1,3 @@
-MD5 (Atlas-0.3.0.tar.gz) = 863a878322a60873785a163d394c3075
-SHA256 (Atlas-0.3.0.tar.gz) = 14214a5e7f927f23de0353012c3649649f568f66723800d535adf361b4602e6e
-SIZE (Atlas-0.3.0.tar.gz) = 199379
+MD5 (Atlas-0.3.0.20080504.tar.gz) = a1e884dc3f75e82db7f7b2129cf074f2
+SHA256 (Atlas-0.3.0.20080504.tar.gz) = 8c4447debc1ad6bbd63622131179f3805d1bbda2a13e278a06f5e8fde03f2598
+SIZE (Atlas-0.3.0.20080504.tar.gz) = 133687
diff -aurN flightgear-atlas.orig/pkg-descr flightgear-atlas/pkg-descr
--- flightgear-atlas.orig/pkg-descr	2008-05-04 13:14:13.035436685 +0200
+++ flightgear-atlas/pkg-descr	2008-05-04 13:08:38.942336235 +0200
@@ -11,6 +11,3 @@
 so called moving map display.
 
 WWW: http://atlas.sourceforge.net/
-
-- Jean-Yves Lefort
-jylefort@FreeBSD.org
diff -aurN flightgear-atlas.orig/pkg-plist flightgear-atlas/pkg-plist
--- flightgear-atlas.orig/pkg-plist	2008-05-04 13:14:13.035436685 +0200
+++ flightgear-atlas/pkg-plist	2008-05-04 12:48:34.387930577 +0200
@@ -1,4 +1,5 @@
 bin/Atlas
+bin/GetMap
 bin/Map
 bin/MapPS
 bin/buildmaps.sh


>Release-Note:
>Audit-Trail:
>Unformatted:



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