ports/146415: [MAINTAINER] science/netcdf: cleanup for makefile and patches
Sunpoet Po-Chuan Hsieh
sunpoet at sunpoet.net
Sun May 9 00:10:02 UTC 2010
>Number: 146415
>Category: ports
>Synopsis: [MAINTAINER] science/netcdf: cleanup for makefile and patches
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 09 00:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
SUNPOET.net
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.0-STABLE FreeBSD 8.0-STABLE #0: Wed May 5 00:44:42 CST
>Description:
Changes:
- Update MASTER_SITES
- Simplify NOPORTDOCS patch
- Remove NOPORTEXAMPLES section
- Remove unnecessary post-install: target
- Remove patch for fortran/cfortran.h
Removed file(s):
- files/extra-patch-man-Makefile.in
- files/patch-fortran+cfortran.h
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- netcdf-3.6.3_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/science/netcdf/Makefile /usr/ports/sunpoet/netcdf/Makefile
--- /usr/ports/science/netcdf/Makefile 2009-09-16 09:00:59.000000000 +0800
+++ /usr/ports/sunpoet/netcdf/Makefile 2010-05-09 07:36:59.000000000 +0800
@@ -9,28 +9,25 @@
PORTVERSION= 3.6.3
PORTREVISION= 4
CATEGORIES= science
-MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
+MASTER_SITES= http://www.unidata.ucar.edu/downloads/netcdf/ftp/ \
+ ftp://ftp.unidata.ucar.edu/pub/netcdf/ \
http://sunpoet.net/distfiles/
MAINTAINER= sunpoet at sunpoet.net
COMMENT?= Library for machine-independent, array-oriented data access
CONFLICTS= hdf-4.* netcdf-4.*
+PORTSCOUT= limit:^3\.
CONFIGURE_ARGS= --enable-shared
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC ${FTNTYPE}"
-
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -fPIC -DPIC"
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-#CONFIGURE_ENV+= ${MAKE_ENV}
-
-SLAVEDIRS= science/netcdf-ftn
-
-MAN1= ncdump.1 ncgen.1
-MAN3= netcdf.3
INFO= netcdf netcdf-c netcdf-cxx netcdf-f77 netcdf-f90 \
netcdf-install netcdf-tutorial
+MAN1= ncdump.1 ncgen.1
+MAN3= netcdf.3
OPTIONS= FORTRAN "Build library for Fortran" off
@@ -38,27 +35,20 @@
CONFIGURE_ARGS+=--enable-docs-install
.else
CONFIGURE_ARGS+=--disable-docs-install
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-man-Makefile.in
-.endif
-
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=--enable-examples
-.else
-CONFIGURE_ARGS+=--disable-examples
.endif
.include <bsd.port.pre.mk>
.if defined(WITH_FORTRAN)
-USE_FORTRAN= yes
-PKGNAMESUFFIX+= -ftn
+CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -DpgiFortran"
CONFLICTS+= netcdf-3.*
MAN3+= netcdf_f77.3 netcdf_f90.3
+PKGNAMESUFFIX+= -ftn
PLIST_SUB+= FORTRAN=""
-FTNTYPE= -DpgiFortran
+USE_FORTRAN= yes
.else
+CONFIGURE_ARGS+=--disable-f77 --disable-f90
CONFLICTS+= netcdf-ftn-3.*
-CONFIGURE_ARGS+=--disable-f77
PLIST_SUB+= FORTRAN="@comment "
.endif
@@ -69,10 +59,10 @@
@${REINPLACE_CMD} -e \
'271 s/\(info_docs\).*/html_docs\)/' \
${WRKSRC}/man4/Makefile.in
-
-post-install:
- ${LN} -fs libnetcdf.so.4 ${PREFIX}/lib/libnetcdf.so
- ${LN} -fs libnetcdf_c++.so.4 ${PREFIX}/lib/libnetcdf_c++.so
+.if defined(NOPORTDOCS)
+ @${REINPLACE_CMD} -e '790 s/install-docDATA //' \
+ ${WRKSRC}/man/Makefile.in
+.endif
regression-test: build
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
diff -ruN --exclude=CVS /usr/ports/science/netcdf/files/extra-patch-man-Makefile.in /usr/ports/sunpoet/netcdf/files/extra-patch-man-Makefile.in
--- /usr/ports/science/netcdf/files/extra-patch-man-Makefile.in 2009-01-02 15:53:12.000000000 +0800
+++ /usr/ports/sunpoet/netcdf/files/extra-patch-man-Makefile.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,17 +0,0 @@
---- man/Makefile.in.orig 2008-06-30 01:25:05.000000000 +0800
-+++ man/Makefile.in 2008-08-29 23:58:27.317775084 +0800
-@@ -683,14 +683,6 @@
- rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
- done
- install-docDATA: $(doc_DATA)
-- @$(NORMAL_INSTALL)
-- test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-- @list='$(doc_DATA)'; for p in $$list; do \
-- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-- f=$(am__strip_dir) \
-- echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-- $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
-- done
-
- uninstall-docDATA:
- @$(NORMAL_UNINSTALL)
diff -ruN --exclude=CVS /usr/ports/science/netcdf/files/patch-fortran+cfortran.h /usr/ports/sunpoet/netcdf/files/patch-fortran+cfortran.h
--- /usr/ports/science/netcdf/files/patch-fortran+cfortran.h 2008-08-07 16:29:49.000000000 +0800
+++ /usr/ports/sunpoet/netcdf/files/patch-fortran+cfortran.h 1970-01-01 08:00:00.000000000 +0800
@@ -1,21 +0,0 @@
---- fortran/cfortran.h.orig 2008-07-23 21:47:30.000000000 -0500
-+++ fortran/cfortran.h 2008-07-23 21:48:50.000000000 -0500
-@@ -134,7 +134,8 @@
- /* Split #if into 2 because some HP-UX can't handle long #if */
- #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)||defined(gFortran))
- #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
--/* If your compiler barfs on ' #error', replace # with the trigraph for # */
-+#define f2cFortran
-+/* If your compiler barfs on ' #error', replace # with the trigraph for #
- #error "cfortran.h: Can't find your environment among:\
- - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \
- - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000 \
-@@ -158,7 +159,7 @@
- - Absoft Pro Fortran: Use #define AbsoftProFortran \
- - Portland Group Fortran: Use #define pgiFortran \
- - PathScale Fortran: Use #define PATHSCALE_COMPILER"
--/* Compiler must throw us out at this point! */
-+ Compiler must throw us out at this point! */
- #endif
- #endif
-
--- netcdf-3.6.3_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list