From owner-svn-ports-head@FreeBSD.ORG Thu Jul 3 20:18:08 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62986422; Thu, 3 Jul 2014 20:18:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 451952FF9; Thu, 3 Jul 2014 20:18:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63KI82H059507; Thu, 3 Jul 2014 20:18:08 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63KI6Wf059491; Thu, 3 Jul 2014 20:18:06 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407032018.s63KI6Wf059491@svn.freebsd.org> From: Adam Weinberger Date: Thu, 3 Jul 2014 20:18:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360454 - in head/astro: gpsdrive gpsprune nightfall osmium pp3 roadmap sscalc starplot xplanet X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jul 2014 20:18:08 -0000 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 +NLS_USES= gettext -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif +.include 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 - -.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 -.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 -.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 - 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 - 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 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 - pre-fetch: .if !defined(LAT) @${ECHO_MSG} "Type \"make LAT= LON=\" 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 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@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 - 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@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 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