svn commit: r360454 - in head/astro: gpsdrive gpsprune nightfall osmium pp3 roadmap sscalc starplot xplanet
Adam Weinberger
adamw at FreeBSD.org
Thu Jul 3 20:18:08 UTC 2014
Author: adamw
Date: Thu Jul 3 20:18:05 2014
New Revision: 360454
URL: http://svnweb.freebsd.org/changeset/ports/360454
QAT: https://qat.redports.org/buildarchive/r360454/
Log:
Reduce unecessary bsd.port.options.mk inclusion.
Modified:
head/astro/gpsdrive/Makefile
head/astro/gpsprune/Makefile
head/astro/nightfall/Makefile
head/astro/osmium/Makefile
head/astro/pp3/Makefile
head/astro/roadmap/Makefile
head/astro/sscalc/Makefile
head/astro/starplot/Makefile
head/astro/starplot/pkg-plist
head/astro/xplanet/Makefile
Modified: head/astro/gpsdrive/Makefile
==============================================================================
--- head/astro/gpsdrive/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/gpsdrive/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -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
Modified: head/astro/gpsprune/Makefile
==============================================================================
--- head/astro/gpsprune/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/gpsprune/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -27,11 +27,7 @@ PLIST_FILES= bin/gpsprune ${JAVAJARDIR:C
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}/
Modified: head/astro/nightfall/Makefile
==============================================================================
--- head/astro/nightfall/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/nightfall/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -35,18 +35,15 @@ PGPLOT_CONFIGURE_ON= --with-pgplot-inclu
--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
Modified: head/astro/osmium/Makefile
==============================================================================
--- head/astro/osmium/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/osmium/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -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
Modified: head/astro/pp3/Makefile
==============================================================================
--- head/astro/pp3/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/pp3/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -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)
Modified: head/astro/roadmap/Makefile
==============================================================================
--- head/astro/roadmap/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/roadmap/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -45,8 +45,6 @@ DOCS= Bugs ChangeLog Coding Configurati
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>
Modified: head/astro/sscalc/Makefile
==============================================================================
--- head/astro/sscalc/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/sscalc/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -11,8 +11,6 @@ COMMENT= Sunrise and sunset time calcula
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>
Modified: head/astro/starplot/Makefile
==============================================================================
--- head/astro/starplot/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/starplot/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -10,7 +10,7 @@ MASTER_SITES= http://starplot.org/downlo
MAINTAINER= ports at 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
Modified: head/astro/starplot/pkg-plist
==============================================================================
--- head/astro/starplot/pkg-plist Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/starplot/pkg-plist Thu Jul 3 20:18:05 2014 (r360454)
@@ -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 at boldquot/LC_MESSAGES/starplot.mo
share/locale/en at 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%%
- at dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/parfiles
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
Modified: head/astro/xplanet/Makefile
==============================================================================
--- head/astro/xplanet/Makefile Thu Jul 3 20:01:14 2014 (r360453)
+++ head/astro/xplanet/Makefile Thu Jul 3 20:18:05 2014 (r360454)
@@ -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
More information about the svn-ports-all
mailing list