svn commit: r324824 - in head: . graphics/opendx math/octave-forge-octcdf

[Stephen Montgomery-Smith]

Author: stephen
Date: Fri Aug 16 23:43:28 2013
New Revision: 324824
URL: http://svnweb.freebsd.org/changeset/ports/324824

Log:
  - Change dependency science/netcdf to science/netcdf4.
  - Fix some portlint errors.

Modified:
  head/UPDATING
  head/graphics/opendx/Makefile
  head/math/octave-forge-octcdf/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Fri Aug 16 22:43:15 2013	(r324823)
+++ head/UPDATING	Fri Aug 16 23:43:28 2013	(r324824)
@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20130816:
+  AFFECTS: users of graphics/opendx and math/octave-forge-octcdf
+  AUTHOR: stephen at FreeBSD.org
+
+  These two ports have changed the science/netcdf dependency to
+  science/netcdf4.  It is recommended that the science/netcdf package
+  be deinstalled before rebuilding these ports, otherwise you are likely
+  to face port conflicts when building future ports.
+
 20130806:
   AFFECTS: users of devel/eric4
   AUTHOR: bsam at FreeBSD.org

Modified: head/graphics/opendx/Makefile
==============================================================================
--- head/graphics/opendx/Makefile	Fri Aug 16 22:43:15 2013	(r324823)
+++ head/graphics/opendx/Makefile	Fri Aug 16 23:43:28 2013	(r324824)
@@ -3,7 +3,7 @@
 
 PORTNAME=	opendx
 PORTVERSION=	4.4.4
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	graphics math
 MASTER_SITES=	http://www.sfr-fresh.com/unix/misc/
 DISTNAME=	dx-${PORTVERSION}
@@ -12,10 +12,10 @@ MAINTAINER=	stephen at FreeBSD.org
 COMMENT=	IBM's Open Visualization Data Explorer
 
 LIB_DEPENDS=	MagickWand:${PORTSDIR}/graphics/ImageMagick	\
-		tiff.4:${PORTSDIR}/graphics/tiff		\
-		cdf.0:${PORTSDIR}/science/cdf
+		tiff:${PORTSDIR}/graphics/tiff		\
+		cdf:${PORTSDIR}/science/cdf
 
-USE_XORG=	xinerama xext xpm xmu sm ice 
+USE_XORG=	xinerama xext xpm xmu sm ice
 USES=		bison motif gmake
 USE_GCC=	any
 USE_GL=		yes
@@ -33,13 +33,13 @@ IGNORE=	HDF and NETCDF are conflicting
 .endif
 
 .if defined(WITH_HDF)
-LIB_DEPENDS+=	mfhdf.3:${PORTSDIR}/science/hdf
+LIB_DEPENDS+=	mfhdf:${PORTSDIR}/science/hdf
 .else
 CONFIGURE_ARGS+=	--without-hdf
 .endif
 
 .if !defined(WITHOUT_NETCDF)
-LIB_DEPENDS+=	netcdf.4:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=	netcdf:${PORTSDIR}/science/netcdf4
 .else
 CONFIGURE_ARGS+=	--without-netcdf
 .endif

Modified: head/math/octave-forge-octcdf/Makefile
==============================================================================
--- head/math/octave-forge-octcdf/Makefile	Fri Aug 16 22:43:15 2013	(r324823)
+++ head/math/octave-forge-octcdf/Makefile	Fri Aug 16 23:43:28 2013	(r324824)
@@ -3,6 +3,7 @@
 
 PORTNAME=	octave-forge-octcdf
 PORTVERSION=	1.1.6
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen at FreeBSD.org
@@ -14,7 +15,7 @@ OCTSRC=		${OCTAVE_PKGNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-LIB_DEPENDS+=	netcdf:${PORTSDIR}/science/netcdf
+LIB_DEPENDS+=	netcdf:${PORTSDIR}/science/netcdf4
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"