10 files changed, 14 insertions, 40 deletions

diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index 332dfd03510e..80d911d1d65a 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -26,19 +26,15 @@ LIBS+=		-L${LOCALBASE}/lib -lgmodule-2.0
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_USES=	gettext
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} 's/test "$$CC" = "gcc"/false/' ${WRKSRC}/configure
-.if ! ${PORT_OPTIONS:MNLS}
+.if empty(PORT_OPTIONS:MNLS)
 	@${REINPLACE_CMD} 's|SUBDIRS = src po man|SUBDIRS = src man|' \
 		${WRKSRC}/Makefile.in
 .endif
diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile
index d0661b6dcf9a..dea3e723f95b 100644
--- a/astro/gpsprune/Makefile
+++ b/astro/gpsprune/Makefile
@@ -27,11 +27,7 @@ PLIST_FILES=	bin/gpsprune ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
 OPTIONS_DEFINE=	JAVA3D
 JAVA3D_DESC=	Support for 3D view of track
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJAVA3D}
-RUN_DEPENDS+=	java3d>=1.5.2:${PORTSDIR}/java/java3d
-.endif
+JAVA3D_RUN_DEPENDS=	java3d>=1.5.2:${PORTSDIR}/java/java3d
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 7de0fff4a927..c27825e354bb 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -35,18 +35,15 @@ PGPLOT_CONFIGURE_ON=	--with-pgplot-include=${LOCALBASE}/include \
 			--with-pgplot-lib=${LOCALBASE}/lib
 PGPLOT_CONFIGURE_OFF=	--with-gnuplot
 PGPLOT_LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
+PGPLOT_RUN_DEPENDS_OFF=	gnuplot:${PORTSDIR}/math/gnuplot
 PGPLOT_USES=		fortran
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MGNOMEUI}
+.if ${PORT_OPTIONS:MGNOME}
 INSTALLS_OMF=	yes
 .endif
 
-.if ! ${PORT_OPTIONS:MPGPLOT}
-RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
-.endif
-
 post-patch:
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure
diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile
index 1a692d4a8a7d..c2dc998b2b0f 100644
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@@ -35,14 +35,11 @@ OPTIONS_DEFINE=	JAVASCRIPT DOXYGEN DOCS
 OPTIONS_DEFAULT=JAVASCRIPT
 JAVASCRIPT_DESC=Enable javascript support
 
+JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8 \
+			libshp.so:${PORTSDIR}/devel/shapelib \
+			libicuuc.so:${PORTSDIR}/devel/icu
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MJAVASCRIPT}
-LIB_DEPENDS+=	libv8.so:${PORTSDIR}/lang/v8 \
-		libshp.so:${PORTSDIR}/devel/shapelib \
-		libicuuc.so:${PORTSDIR}/devel/icu
-.endif
-
 .if ${PORT_OPTIONS:MDOXYGEN} && ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen
 .endif
diff --git a/astro/pp3/Makefile b/astro/pp3/Makefile
index 7d53b844b43e..de164c498a52 100644
--- a/astro/pp3/Makefile
+++ b/astro/pp3/Makefile
@@ -15,8 +15,6 @@ USE_TEX=	latex
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
 do-build:
 	(cd ${WRKSRC} \
 		&& ${CXX} ${CXXFLAGS} -DPP3DATA=\"${DATADIR}\" pp3.cc -o pp3)
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 4adfe6dfc580..acb61e70aef5 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -45,8 +45,6 @@ DOCS=		Bugs ChangeLog Coding Configuration Developer-Guide \
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O ||g ; \
 		 s|/usr/include|${LOCALBASE}/include|g ; \
@@ -74,12 +72,10 @@ do-install:
 .for _DATA in ${DATA}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/${_DATA} ${STAGEDIR}${DATADIR}/${_DATA}
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README
 .for _DOC in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${_DOC} ${STAGEDIR}${DOCSDIR}/${_DOC}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/sscalc/Makefile b/astro/sscalc/Makefile
index 4af1a2a567b3..1b2d797a4a87 100644
--- a/astro/sscalc/Makefile
+++ b/astro/sscalc/Makefile
@@ -11,8 +11,6 @@ COMMENT=	Sunrise and sunset time calculator
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 pre-fetch:
 .if !defined(LAT)
 	@${ECHO_MSG} "Type \"make LAT=<nnn.nn> LON=<nnn.nn>\" to hardwire your site"
@@ -23,10 +21,8 @@ pre-fetch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/sscalc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/sscalc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/cities.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index ca0a9dedf8ea..b0645a5f11a0 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://starplot.org/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3-dimensional viewer for star charts
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		gmake pathfix gettext pkgconfig
 USE_GNOME=	gtk20
@@ -18,8 +18,6 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|$$(docdir)/examples|${EXAMPLESDIR}|g' ${WRKSRC}/configure
diff --git a/astro/starplot/pkg-plist b/astro/starplot/pkg-plist
index 60faaaa4e9a5..025721e3c27d 100644
--- a/astro/starplot/pkg-plist
+++ b/astro/starplot/pkg-plist
@@ -53,7 +53,7 @@ share/applications/starplot.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/parfiles/hyades.par
 %%PORTDOCS%%%%DOCSDIR%%/html/parfiles/scocen.par
 %%PORTDOCS%%%%DOCSDIR%%/html/starplot.css
-%%EXAMPLESDIR%%/example.spec
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.spec
 share/locale/en@boldquot/LC_MESSAGES/starplot.mo
 share/locale/en@quot/LC_MESSAGES/starplot.mo
 share/locale/es/LC_MESSAGES/starplot.mo
@@ -61,7 +61,7 @@ share/pixmaps/starplot32x32.xpm
 %%DATADIR%%/sample.stars
 %%DATADIR%%/test.stars
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/parfiles
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index d231b64cc898..49328316c583 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -18,7 +18,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lm
 
 OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
-OPTIONS_DEFAULT= FREETYPE PANGO GIF JPEG PNG PNM TIFF
+OPTIONS_DEFAULT=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 
 FREETYPE_CONFIGURE_WITH=	--with-freetype
 FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2