aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CVSROOT/modules2
-rw-r--r--MOVED1
-rw-r--r--graphics/gmt/Makefile2
-rw-r--r--graphics/grads/Makefile2
-rw-r--r--graphics/opendx/Makefile2
-rw-r--r--math/Makefile1
-rw-r--r--math/grace/Makefile2
-rw-r--r--math/gri/Makefile2
-rw-r--r--math/labplot/Makefile2
-rw-r--r--math/netcdf/Makefile50
-rw-r--r--math/netcdf/distinfo3
-rw-r--r--math/netcdf/files/patch-aa19
-rw-r--r--math/netcdf/pkg-descr9
-rw-r--r--math/netcdf/pkg-plist17
-rw-r--r--math/p5-NetCDF/Makefile2
-rw-r--r--math/petsc/Makefile2
-rw-r--r--math/py-scientific/Makefile2
-rw-r--r--math/ruby-netcdf/Makefile2
-rw-r--r--science/Makefile1
-rw-r--r--science/gnudatalanguage/Makefile2
-rw-r--r--science/netcdf/Makefile2
-rw-r--r--science/netcdf4/Makefile2
-rw-r--r--science/ruby-netcdf/Makefile2
-rw-r--r--science/vis5d+/Makefile2
24 files changed, 18 insertions, 115 deletions
diff --git a/CVSROOT/modules b/CVSROOT/modules
index f56e54523bd1..c7661a26baaf 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -6838,7 +6838,7 @@ netatalk ports/net/netatalk
netbeans ports/java/netbeans
netbeans3 ports/java/netbeans3
netcat ports/net/netcat
-netcdf ports/math/netcdf
+netcdf ports/science/netcdf
netcomponents ports/java/netcomponents
netdude ports/net/netdude
netdump-server ports/sysutils/netdump-server
diff --git a/MOVED b/MOVED
index a329dd6cf4bd..5cc1201828d4 100644
--- a/MOVED
+++ b/MOVED
@@ -2156,3 +2156,4 @@ net/xnap|net-p2p/xnap|2006-01-30|Moved to new category
misc/ed2k|net-p2p/ed2k|2006-01-30|Moved to new category
misc/edonkey-tool-hash|net-p2p/edonkey-tool-hash|2006-01-30|Moved to new category
misc/linux-edonkey-tool-recovermet|net-p2p/linux-edonkey-tool-recovermet|2006-01-30|Moved to new category
+math/netcdf|science/netcdf|2006-01-30|Moved to a better category
diff --git a/graphics/gmt/Makefile b/graphics/gmt/Makefile
index 683f27874a50..05ae4918e1bd 100644
--- a/graphics/gmt/Makefile
+++ b/graphics/gmt/Makefile
@@ -23,7 +23,7 @@ EXTRACT_ONLY= ${DISTNAME}_progs${EXTRACT_SUFX} \
MAINTAINER= sec@42.org
COMMENT= The Generic Mapping Tools data processing and display software package
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
EXTRACT_SUB= GMT_share${EXTRACT_SUFX}
diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile
index cceee35a9718..dd4d559d7d48 100644
--- a/graphics/grads/Makefile
+++ b/graphics/grads/Makefile
@@ -45,7 +45,7 @@ PLIST_SUB+= NETCDF="@comment " HDF=""
.endif
.if defined(WITH_NETCDF)
-LIB_DEPENDS+= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf
CONFIGURE_ARGS+= --with-nc
PLIST_SUB+= NETCDF="" HDF="@comment "
.endif
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index a2d35f24df79..8a5f3979f529 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --without-hdf
.endif
.if defined(WITH_NETCDF)
-LIB_DEPENDS+= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf
.else
CONFIGURE_ARGS+= --without-netcdf
.endif
diff --git a/math/Makefile b/math/Makefile
index 087a7daaa2aa..2ae87541bfca 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -133,7 +133,6 @@
SUBDIR += naturalmath
SUBDIR += nauty
SUBDIR += ndiff
- SUBDIR += netcdf
SUBDIR += newmat
SUBDIR += ngraph
SUBDIR += nsc2ke
diff --git a/math/grace/Makefile b/math/grace/Makefile
index c216f88c8a0f..2a8388d00cf6 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A powerful plotting tool (successor of xmgr)
LIB_DEPENDS= Xbae:${PORTSDIR}/x11-toolkits/xbae \
- netcdf.1:${PORTSDIR}/math/netcdf \
+ netcdf.1:${PORTSDIR}/science/netcdf \
fftw.2:${PORTSDIR}/math/fftw \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/math/gri/Makefile b/math/gri/Makefile
index 869091c275b8..16ff8ce10d50 100644
--- a/math/gri/Makefile
+++ b/math/gri/Makefile
@@ -15,7 +15,7 @@ DISTNAME= gri-${PORTVERSION}-arch-indep
MAINTAINER= ports@FreeBSD.org
COMMENT= An extensible plotting language for producing scientific graphs
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 8a76823c3fc9..ccbd6188c0c0 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
gsl.7:${PORTSDIR}/math/gsl \
jasper.4:${PORTSDIR}/graphics/jasper \
fftw3.3:${PORTSDIR}/math/fftw3 \
- netcdf:${PORTSDIR}/math/netcdf \
+ netcdf:${PORTSDIR}/science/netcdf \
qwtplot3d.0:${PORTSDIR}/math/qwtplot3d
RUN_DEPENDS= pstoedit:${PORTSDIR}/graphics/pstoedit
diff --git a/math/netcdf/Makefile b/math/netcdf/Makefile
deleted file mode 100644
index b907ef08a76a..000000000000
--- a/math/netcdf/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for: netcdf
-# Date created: 29 July 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= netcdf
-PORTVERSION= 3.6.0p1
-CATEGORIES= math
-MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/%SUBDIR%/
-MASTER_SITE_SUBDIR= . old
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-p/}
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Library for machine-independent, array-oriented data access
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/src
-
-CONFLICTS= hdf-4.*
-
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CPPFLAGS="-fPIC -DPIC -Df2cFortran"
-INSTALLS_SHLIB= yes
-
-MAN1= ncdump.1 ncgen.1
-MAN3= netcdf.3 netcdf.3f
-
-post-build:
- @(cd ${WRKSRC}/libsrc && \
- ${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library)
- @(cd ${WRKSRC}/cxx && \
- ${SETENV} ${MAKE_ENV} ${MAKE} linux_shared_library)
-
-post-install:
- @${STRIP_CMD} ${PREFIX}/bin/ncdump
- @${STRIP_CMD} ${PREFIX}/bin/ncgen
- ${INSTALL_DATA} ${WRKSRC}/libsrc/libnetcdf.so ${PREFIX}/lib/libnetcdf.so.1
- ${LN} -sf libnetcdf.so.1 ${PREFIX}/lib/libnetcdf.so
- ${INSTALL_DATA} ${WRKSRC}/cxx/libnetcdf_c++.so ${PREFIX}/lib/libnetcdf_c++.so.1
- ${LN} -sf libnetcdf_c++.so.1 ${PREFIX}/lib/libnetcdf_c++.so
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in COPYRIGHT README RELEASE_NOTES
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/math/netcdf/distinfo b/math/netcdf/distinfo
deleted file mode 100644
index c95930469808..000000000000
--- a/math/netcdf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (netcdf-3.6.0-p1.tar.gz) = 27c193e0462d9979406d167a01a5ee95
-SHA256 (netcdf-3.6.0-p1.tar.gz) = a9e6105ed89ce6cfd2edc78e8184232a2f950e674c5241c28cae361a1fe1adfe
-SIZE (netcdf-3.6.0-p1.tar.gz) = 842025
diff --git a/math/netcdf/files/patch-aa b/math/netcdf/files/patch-aa
deleted file mode 100644
index 4c9e564dc054..000000000000
--- a/math/netcdf/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
---- rules.make.orig Sat Dec 18 05:34:48 2004
-+++ rules.make Thu Jan 6 15:12:59 2005
-@@ -145,14 +145,8 @@
- $(INSTALL) $(MANUAL) $@
- $(MANDIR)/man3/$(MANUAL): $(MANDIR)/man3 $(MANUAL)
- $(INSTALL) $(MANUAL) $@
--$(MANDIR)/man3f/$(MANUAL): $(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL) \
-- $(MANDIR)/man3f
-- rm -f $@
-- ln -s $(MANDIR)/man3/$(MANUAL) $@
--$(MANDIR)/man3f90/$(MANUAL): $(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL) \
-- $(MANDIR)/man3f90
-- rm -f $@
-- ln -s $(MANDIR)/man3/$(MANUAL) $@
-+$(MANDIR)/man3f/$(MANUAL): $(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL)
-+$(MANDIR)/man3f90/$(MANUAL): $(MANDIR)/man3 $(MANDIR)/man3/$(MANUAL)
-
- ################################################################################
- # Cleanup:
diff --git a/math/netcdf/pkg-descr b/math/netcdf/pkg-descr
deleted file mode 100644
index a8ab96607da6..000000000000
--- a/math/netcdf/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-NetCDF (network Common Data Form) is an interface for array-oriented
-data access and a library that provides an implementation of the
-interface. The netCDF library also defines a machine-independent
-format for representing scientific data. Together, the interface,
-library, and format support the creation, access, and sharing of
-scientific data. The netCDF software was developed at the Unidata
-Program Center in Boulder, Colorado.
-
-WWW: http://www.unidata.ucar.edu/packages/netcdf/
diff --git a/math/netcdf/pkg-plist b/math/netcdf/pkg-plist
deleted file mode 100644
index fcbebdf8999f..000000000000
--- a/math/netcdf/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-bin/ncdump
-bin/ncgen
-include/ncvalues.h
-include/netcdf.h
-include/netcdf.hh
-include/netcdf.inc
-include/netcdfcpp.h
-lib/libnetcdf.a
-lib/libnetcdf.so
-lib/libnetcdf.so.1
-lib/libnetcdf_c++.a
-lib/libnetcdf_c++.so
-lib/libnetcdf_c++.so.1
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/math/p5-NetCDF/Makefile b/math/p5-NetCDF/Makefile
index 1ae34c84c067..2808208f18f0 100644
--- a/math/p5-NetCDF/Makefile
+++ b/math/p5-NetCDF/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= rand@meridian-enviro.com
COMMENT= Perl5 module to read and write netCDF files
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
USE_PERL5= yes
diff --git a/math/petsc/Makefile b/math/petsc/Makefile
index 657c04382861..f3cd78eb3030 100644
--- a/math/petsc/Makefile
+++ b/math/petsc/Makefile
@@ -143,7 +143,7 @@ CONFIGURE_ARGS+= --with-parmetis=1 \
#WITH_NETCDF= yes
#.endif
#.if defined(WITH_NETCDF)
-#LIB_DEPENDS+= netcdf.1:${PORTSDIR}/math/netcdf
+#LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf
#CONFIGURE_ENV+= NETCDF_INCLUDE=${LOCALBASE}/include \
# NETCDF_LIB=${LOCALBASE}/lib
#.endif
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 5b725ba2bb9b..073871997d4b 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= tg@FreeBSD.org
COMMENT= Collection of Python modules for scientific computing
BUILD_DEPENDS= ${PYNUMERIC}
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
RUN_DEPENDS= ${PYNUMERIC}
USE_PYTHON= yes
diff --git a/math/ruby-netcdf/Makefile b/math/ruby-netcdf/Makefile
index bdb7cd4a2ad1..542145c820d1 100644
--- a/math/ruby-netcdf/Makefile
+++ b/math/ruby-netcdf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Ruby interface to the NetCDF scientific IO library
BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray
USE_RUBY= yes
diff --git a/science/Makefile b/science/Makefile
index 42fa754e24d8..8d5e172aecc7 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -48,6 +48,7 @@
SUBDIR += mpb
SUBDIR += mpqc
SUBDIR += mpqc-mpich
+ SUBDIR += netcdf
SUBDIR += oases
SUBDIR += omnetpp
SUBDIR += openbabel
diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile
index 8d710737ac7e..a0f74283cc3f 100644
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--with-hdf5=no
.endif
.if !defined(WITHOUT_NETCDF)
-LIB_DEPENDS+= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS+= netcdf.1:${PORTSDIR}/science/netcdf
CONFIGURE_ARGS+=--with-netcdf=${LOCALBASE} --with-hdf=no
.else
CONFIGURE_ARGS+=--with-netcdf=no
diff --git a/science/netcdf/Makefile b/science/netcdf/Makefile
index b907ef08a76a..45c61fd487d6 100644
--- a/science/netcdf/Makefile
+++ b/science/netcdf/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netcdf
PORTVERSION= 3.6.0p1
-CATEGORIES= math
+CATEGORIES= science
MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-p/}
diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index b907ef08a76a..45c61fd487d6 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= netcdf
PORTVERSION= 3.6.0p1
-CATEGORIES= math
+CATEGORIES= science
MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-p/}
diff --git a/science/ruby-netcdf/Makefile b/science/ruby-netcdf/Makefile
index bdb7cd4a2ad1..542145c820d1 100644
--- a/science/ruby-netcdf/Makefile
+++ b/science/ruby-netcdf/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A Ruby interface to the NetCDF scientific IO library
BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/narray.so:${PORTSDIR}/math/ruby-narray
USE_RUBY= yes
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index d75ab4516bb8..3b85ddfd75bc 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -18,7 +18,7 @@ COMMENT= An OpenGL-based volumetric visualization program for scientific dataset
BUILD_DEPENDS= ${LOCALBASE}/lib/libmix.a:${PORTSDIR}/graphics/qslim \
convert:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf \
+LIB_DEPENDS= netcdf.1:${PORTSDIR}/science/netcdf \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick