2 files changed, 75 insertions, 71 deletions

diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 6d608441eb2b..17e3399ec253 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -3,18 +3,16 @@
 
 PORTNAME=	xplanet
 PORTVERSION=	1.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro geography
 MASTER_SITES=	SF
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Draw pictures of the earth textured by an image
 
-NO_STAGE=	yes
 GNU_CONFIGURE=	yes
 USES=		iconv
 USE_XORG=	xt xscrnsaver
-USE_GNOME=	#
 CONFIGURE_ARGS=	--with-map-extension=jpg
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lm"
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -22,58 +20,20 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF
 
-MAN1=	xplanet.1
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MFREETYPE}
-CONFIGURE_ARGS+=	--with-freetype
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-.else
-CONFIGURE_ARGS+=	--without-freetype
-.endif
-
-.if ${PORT_OPTIONS:MPANGO}
-CONFIGURE_ARGS+=	--with-pango
-USE_GNOME+=	pango
-.else
-CONFIGURE_ARGS+=	--without-pango
-.endif
-
-.if ${PORT_OPTIONS:MGIF}
-CONFIGURE_ARGS+=	--with-gif
-LIB_DEPENDS+=	libgif.so:${PORTSDIR}/graphics/giflib
-.else
-CONFIGURE_ARGS+=	--without-gif
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-CONFIGURE_ARGS+=	--with-jpeg
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-.else
-CONFIGURE_ARGS+=	--without-jpeg
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-CONFIGURE_ARGS+=	--with-png
-LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
-.else
-CONFIGURE_ARGS+=	--without-png
-.endif
-
-.if ${PORT_OPTIONS:MPNM}
-CONFIGURE_ARGS+=	--with-pnm
-LIB_DEPENDS+=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
-.else
-CONFIGURE_ARGS+=	--without-pnm
-.endif
-
-.if ${PORT_OPTIONS:MTIFF}
-CONFIGURE_ARGS+=	--with-tiff
-LIB_DEPENDS+=	libtiff.so:${PORTSDIR}/graphics/tiff
-.else
-CONFIGURE_ARGS+=	--without-tiff
-.endif
+FREETYPE_CONFIGURE_WITH=	--with-freetype
+FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+PANGO_CONFIGURE_WITH=	pango
+PANGO_USE=	GNOME=pango
+GIF_CONFIGURE_WITH=	gif
+GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+JPEG_CONFIGURE_WITH=	jpeg
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+PNG_CONFIGURE_WITH=	png
+PNG_LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
+PNM_CONFIGURE_WITH=	pnm
+PNM_LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+TIFF_CONFIGURE_WITH=	tiff
+TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
 post-extract:
 	@${REINPLACE_CMD} -e "s/default/default.sample/g" ${WRKSRC}/Makefile.in
@@ -81,19 +41,4 @@ post-extract:
 		${WRKSRC}/src/libimage/gif.c
 	@${MV} ${WRKSRC}/xplanet/config/default ${WRKSRC}/xplanet/config/default.sample
 
-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}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
-	@if test ! -f ${DATADIR}/config/default; then \
-		${CP} ${DATADIR}/config/default.sample ${DATADIR}/config/default; \
-	fi
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/astro/xplanet/pkg-plist b/astro/xplanet/pkg-plist
index cf51d8f34df5..9c0135777fd2 100644
--- a/astro/xplanet/pkg-plist
+++ b/astro/xplanet/pkg-plist
@@ -1,2 +1,61 @@
 bin/xplanet
+man/man1/xplanet.1.gz
 @unexec if cmp -s %D/share/xplanet/config/default %D/share/xplanet/config/default.sample; then rm -f %D/share/xplanet/config/default;fi
+%%DATADIR%%/arcs/README
+%%DATADIR%%/arcs/constellations
+%%DATADIR%%/config/README
+%%DATADIR%%/config/default.sample
+%%DATADIR%%/config/earth_markers
+%%DATADIR%%/config/moon_orbit
+%%DATADIR%%/config/overlay_clouds
+%%DATADIR%%/ephemeris/README
+%%DATADIR%%/fonts/FreeMonoBold.ttf
+%%DATADIR%%/fonts/README
+%%DATADIR%%/images/README
+%%DATADIR%%/images/earth.jpg
+%%DATADIR%%/images/hubble.png
+%%DATADIR%%/images/iss.png
+%%DATADIR%%/images/mgs.png
+%%DATADIR%%/images/night.jpg
+%%DATADIR%%/images/odyssey.png
+%%DATADIR%%/images/shuttle.png
+%%DATADIR%%/images/smile.png
+%%DATADIR%%/images/sublunar.png
+%%DATADIR%%/images/subsolar.png
+%%DATADIR%%/images/sun.jpg
+%%DATADIR%%/markers/README
+%%DATADIR%%/markers/brightStars
+%%DATADIR%%/markers/earth
+%%DATADIR%%/markers/mars
+%%DATADIR%%/markers/moon
+%%DATADIR%%/origin/README
+%%DATADIR%%/origin/cassini
+%%DATADIR%%/origin/galileo
+%%DATADIR%%/rgb.txt
+%%DATADIR%%/satellites/README
+%%DATADIR%%/satellites/iss
+%%DATADIR%%/satellites/iss.tle
+%%DATADIR%%/scattering/README
+%%DATADIR%%/scattering/earthRayleigh
+%%DATADIR%%/spice/README
+%%DATADIR%%/spice/asteroids
+%%DATADIR%%/spice/asteroids.krn
+%%DATADIR%%/spice/cassini
+%%DATADIR%%/spice/cassini.krn
+%%DATADIR%%/spice/mgs
+%%DATADIR%%/spice/mgs.krn
+%%DATADIR%%/spice/voyager
+%%DATADIR%%/spice/voyager.krn
+%%DATADIR%%/stars/BSC
+@dirrmtry %%DATADIR%%/stars
+@dirrmtry %%DATADIR%%/spice
+@dirrmtry %%DATADIR%%/scattering
+@dirrmtry %%DATADIR%%/satellites
+@dirrmtry %%DATADIR%%/origin
+@dirrmtry %%DATADIR%%/markers
+@dirrmtry %%DATADIR%%/images
+@dirrmtry %%DATADIR%%/fonts
+@dirrmtry %%DATADIR%%/ephemeris
+@dirrmtry %%DATADIR%%/config
+@dirrmtry %%DATADIR%%/arcs
+@dirrmtry %%DATADIR%%