From ad6b1685fdb8fd97ada49f28fc564c1888388e81 Mon Sep 17 00:00:00 2001
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 23 Dec 2006 22:22:45 +0000
Subject: - Update MASTER_SITES - Fix build with gcc 4.X

PR:		ports/107117
Submitted by:	Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net> (maintainer)
---
 science/netcdf4/Makefile               |  9 +++++----
 science/netcdf4/files/patch-Makefile   | 20 ++++++++++++++++++++
 science/netcdf4/files/patch-aa         | 19 -------------------
 science/netcdf4/files/patch-rules.make | 19 +++++++++++++++++++
 4 files changed, 44 insertions(+), 23 deletions(-)
 create mode 100644 science/netcdf4/files/patch-Makefile
 delete mode 100644 science/netcdf4/files/patch-aa
 create mode 100644 science/netcdf4/files/patch-rules.make

(limited to 'science/netcdf4')

diff --git a/science/netcdf4/Makefile b/science/netcdf4/Makefile
index f4b13d6b36de..0b4465af8dad 100644
--- a/science/netcdf4/Makefile
+++ b/science/netcdf4/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	netcdf
 PORTVERSION=	3.6.1
 CATEGORIES=	science
-MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf/%SUBDIR%/
+MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf/%SUBDIR%/ \
+		http://sunpoet.net/distfiles/
 MASTER_SITE_SUBDIR=	. old
 
 MAINTAINER=	sunpoet@sunpoet.net
@@ -18,10 +19,10 @@ 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
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 
 MAN1=	ncdump.1 ncgen.1
 MAN3=	netcdf.3 netcdf.3f
diff --git a/science/netcdf4/files/patch-Makefile b/science/netcdf4/files/patch-Makefile
new file mode 100644
index 000000000000..00d94fb843f1
--- /dev/null
+++ b/science/netcdf4/files/patch-Makefile
@@ -0,0 +1,20 @@
+--- Makefile.orig	Mon Feb 27 00:43:59 2006
++++ Makefile	Sat Dec 23 05:33:43 2006
+@@ -117,6 +117,8 @@
+ ncgen/distclean	\
+ cxx/clean	\
+ cxx/distclean	\
++fortran/install	\
++fortran/uninstall	\
+ :
+ 	@subdir=`echo $@ | sed 's,/.*,,'`; \
+ 	target=`echo $@ | sed 's,.*/,,'`; \
+@@ -124,8 +126,6 @@
+ 
+ fortran/all	\
+ fortran/test	\
+-fortran/install	\
+-fortran/uninstall	\
+ nf_test/all	\
+ nf_test/test	\
+ :
diff --git a/science/netcdf4/files/patch-aa b/science/netcdf4/files/patch-aa
deleted file mode 100644
index 4c9e564dc054..000000000000
--- a/science/netcdf4/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/science/netcdf4/files/patch-rules.make b/science/netcdf4/files/patch-rules.make
new file mode 100644
index 000000000000..4c9e564dc054
--- /dev/null
+++ b/science/netcdf4/files/patch-rules.make
@@ -0,0 +1,19 @@
+--- 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:
-- 
cgit v1.2.3