From owner-svn-ports-all@FreeBSD.ORG  Sat Jun 28 20:49:00 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 004F23ED;
 Sat, 28 Jun 2014 20:48:59 +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 E19FE26A7;
 Sat, 28 Jun 2014 20:48:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5SKmxJq067088;
 Sat, 28 Jun 2014 20:48:59 GMT (envelope-from glewis@svn.freebsd.org)
Received: (from glewis@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5SKmxFc067087;
 Sat, 28 Jun 2014 20:48:59 GMT (envelope-from glewis@svn.freebsd.org)
Message-Id: <201406282048.s5SKmxFc067087@svn.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sat, 28 Jun 2014 20:48:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359717 - head/graphics/grads
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2014 20:49:00 -0000

Author: glewis
Date: Sat Jun 28 20:48:59 2014
New Revision: 359717
URL: http://svnweb.freebsd.org/changeset/ports/359717
QAT: https://qat.redports.org/buildarchive/r359717/

Log:
  . Make NETCDF the default rather than HDF, and hence unbreak.
  . Mark BROKEN only if the HDF option is chosen.
  . Remove NOPORTDATA conditional (since this makes no sense).

Modified:
  head/graphics/grads/Makefile

Modified: head/graphics/grads/Makefile
==============================================================================
--- head/graphics/grads/Makefile	Sat Jun 28 20:36:01 2014	(r359716)
+++ head/graphics/grads/Makefile	Sat Jun 28 20:48:59 2014	(r359717)
@@ -14,8 +14,6 @@ EXTRACT_ONLY=	${PORTNAME}-src-${PORTVERS
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The Grid Analysis and Display System
 
-BROKEN=		Fails to package
-
 BUILD_DEPENDS=	${LOCALBASE}/lib/libudunits2.a:${PORTSDIR}/science/udunits \
 		${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx
 LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
@@ -31,13 +29,11 @@ CONFIGURE_ARGS+=	--enable-dyn-supplibs \
 			--with-x
 
 OPTIONS_DEFINE=	HDF NETCDF DOCS EXAMPLES
-OPTIONS_DEFAULT=	HDF
+OPTIONS_DEFAULT=	NETCDF
 HDF_DESC=	Build hdf-support (only hdf OR netcdf is supported)
 NETCDF_DESC=	Build netcdf-support
 
-.if !defined(NOPORTDATA)
 PORTDATA=	*
-.endif
 
 .include <bsd.port.options.mk>
 
@@ -50,6 +46,7 @@ PORTEXAMPLES=	*
 .endif
 
 .if ${PORT_OPTIONS:MHDF}
+BROKEN=			Fails to package
 LIB_DEPENDS+=		libmfhdf.so:${PORTSDIR}/science/hdf
 CONFIGURE_ARGS+=	--with-hdf
 PLIST_SUB+=		NETCDF="@comment " HDF=""
@@ -70,10 +67,8 @@ post-configure:
 	${REINPLACE_CMD} -e "s:ludunits:ludunits2:" ${WRKSRC}/src/Makefile
 
 post-install:
-.if !defined(NOPORTDATA)
 	${MKDIR} "${STAGEDIR}${DATADIR}"
 	cd ${WRKSRC}/data && ${COPYTREE_SHARE} . "${STAGEDIR}${DATADIR}"
-.endif
 .if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . "${STAGEDIR}${EXAMPLESDIR}"