5 files changed, 43 insertions, 91 deletions

diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 6334b2a42fb0..8552c8d249b9 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -6,54 +6,36 @@
 #
 
 PORTNAME=	xplanet
-PORTVERSION=	0.94
+PORTVERSION=	1.0.1
 CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	will@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Draw pictures of the earth textured by an image
 
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		netpbm.1:${PORTSDIR}/graphics/netpbm
 
-RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
-
 USE_X_PREFIX=	yes
-USE_MESA=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-
 CONFIGURE_ARGS=	--with-map-extension=jpg --with-freetype --with-gif \
 		--with-png --with-pnm --with-tiff
-
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm" \
-		WISH=${LOCALBASE}/bin/wish8.3
-
-MAKE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lm"
+USE_GMAKE=	yes
 
-MAN1=		xplanet.1 xplanetbg.1 tkxplanet.1 tzcoord.pl.1
-MANCOMPRESSED=	no
-
-.include <bsd.port.pre.mk>
-
-pre-configure:
-	@${PERL} -pi -e 's|-O3||' ${WRKSRC}/configure
-
-pre-build:
-	@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/auxfiles.h
+MAN1=	xplanet.1
 
 # Install the list of FreeBSD sites & committers locations from astro/xearth
 post-install:
 .for file in freebsd.committers.markers freebsd.ftp.markers
 	@${INSTALL_DATA} ${PORTSDIR}/astro/xearth/files/${file} \
-		${PREFIX}/share/xplanet/markers
+		${DATADIR}/markers
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/xplanet/distinfo b/astro/xplanet/distinfo
index f46b0a78c251..973e0709746f 100644
--- a/astro/xplanet/distinfo
+++ b/astro/xplanet/distinfo
@@ -1 +1 @@
-MD5 (xplanet-0.94.tar.gz) = 10faa5934cc24f3d913ea100b1df915d
+MD5 (xplanet-1.0.1.tar.gz) = 402fe65bece7adf2fcbf1c0df1e59602
diff --git a/astro/xplanet/files/patch-aa b/astro/xplanet/files/patch-aa
deleted file mode 100644
index d5501b85775c..000000000000
--- a/astro/xplanet/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.org       Wed Jul 11 08:06:39 2001
-+++ configure   Wed Jul 11 08:06:58 2001
-@@ -3755,7 +3755,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lglut $X_LIBS -lGL -lGLU -lXmu -lX11 -lm $LIBS"
-+LIBS="-lglut $X_LIBS -lGL -lGLU -lXmu -lX11 -lXi -lm $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3761 "configure"
- #include "confdefs.h"
diff --git a/astro/xplanet/files/patch-xplanetbg.cc b/astro/xplanet/files/patch-xplanetbg.cc
deleted file mode 100644
index e0f022967c28..000000000000
--- a/astro/xplanet/files/patch-xplanetbg.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- xplanetbg.cc.orig	Fri Mar 22 04:17:05 2002
-+++ xplanetbg.cc	Sun Nov 17 18:26:59 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;
-         }
diff --git a/astro/xplanet/pkg-plist b/astro/xplanet/pkg-plist
index b54269a51ccb..5f955ac121ba 100644
--- a/astro/xplanet/pkg-plist
+++ b/astro/xplanet/pkg-plist
@@ -1,44 +1,36 @@
 bin/xplanet
-bin/xplanetbg
-bin/tkxplanet
-bin/tzcoord.pl
-share/xplanet/satellites/science
-share/xplanet/satellites/iss
-share/xplanet/satellites/science.tle
-share/xplanet/satellites/iss.tle
-share/xplanet/markers/locale/ru_RU/earth
-share/xplanet/markers/locale/el_GR/earth
-share/xplanet/markers/locale/ja_JP/earth
-share/xplanet/markers/locale/ko_KR/earth
-share/xplanet/markers/locale/zh_CN/earth
-share/xplanet/markers/locale/zh_TW/earth
-share/xplanet/markers/earth
-share/xplanet/markers/moon
-share/xplanet/markers/mars
-share/xplanet/markers/freebsd.committers.markers
-share/xplanet/markers/freebsd.ftp.markers
-share/xplanet/images/night.jpg
-share/xplanet/images/iss.png
-share/xplanet/images/smile.png
-share/xplanet/images/hubble.png
-share/xplanet/images/shuttle.png
-share/xplanet/images/sublunar.png
-share/xplanet/images/subsolar.png
-share/xplanet/images/earth.jpg
-share/xplanet/images/README
-share/xplanet/fonts/helr____.ttf
-share/xplanet/fonts/README
-share/xplanet/rgb.txt
-@dirrm share/xplanet/satellites
-@dirrm share/xplanet/markers/locale/ru_RU
-@dirrm share/xplanet/markers/locale/el_GR
-@dirrm share/xplanet/markers/locale/ja_JP
-@dirrm share/xplanet/markers/locale/ko_KR
-@dirrm share/xplanet/markers/locale/zh_CN
-@dirrm share/xplanet/markers/locale/zh_TW
-@dirrm share/xplanet/markers/locale
-@dirrm share/xplanet/markers
-@dirrm share/xplanet/images
-@dirrm share/xplanet/fonts
-@dirrm share/xplanet/arcs
-@dirrm share/xplanet
+%%DATADIR%%/arcs/README
+%%DATADIR%%/config/default
+%%DATADIR%%/config/earth_markers
+%%DATADIR%%/config/moon_orbit
+%%DATADIR%%/config/overlay_clouds
+%%DATADIR%%/fonts/FreeSans.ttf
+%%DATADIR%%/fonts/README
+%%DATADIR%%/images/README
+%%DATADIR%%/images/earth.jpg
+%%DATADIR%%/images/hubble.png
+%%DATADIR%%/images/iss.png
+%%DATADIR%%/images/night.jpg
+%%DATADIR%%/images/shuttle.png
+%%DATADIR%%/images/smile.png
+%%DATADIR%%/images/sublunar.png
+%%DATADIR%%/images/subsolar.png
+%%DATADIR%%/markers/earth
+%%DATADIR%%/markers/freebsd.committers.markers
+%%DATADIR%%/markers/freebsd.ftp.markers
+%%DATADIR%%/origin/README
+%%DATADIR%%/origin/cassini
+%%DATADIR%%/origin/galileo
+%%DATADIR%%/rgb.txt
+%%DATADIR%%/satellites/iss
+%%DATADIR%%/satellites/iss.tle
+%%DATADIR%%/stars/BSC
+@dirrm %%DATADIR%%/arcs
+@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/markers
+@dirrm %%DATADIR%%/origin
+@dirrm %%DATADIR%%/satellites
+@dirrm %%DATADIR%%/stars
+@dirrm %%DATADIR%%