Index: head/science/cdf/Makefile
===================================================================
--- head/science/cdf/Makefile	(revision 423148)
+++ head/science/cdf/Makefile	(revision 423149)
@@ -1,52 +1,57 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
 PORTNAME=	cdf3
 PORTVERSION=	3.3.0
 PORTREVISION=	4
 CATEGORIES=	science
 MASTER_SITES=	LOCAL/thierry/${PORTNAME} \
 		ftp://cdaweb.gsfc.nasa.gov/pub/cdf/dist/cdf${VER}/unix/
 DISTNAME=	cdf${VER}-dist-cdf
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Device independent view of the CDF data model
 
+LICENSE=	NASA-G
+LICENSE_NAME=	NASA/Goddard Space Flight Center
+LICENSE_FILE=	${WRKSRC}/CDF_copyright.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 USES=		fortran ncurses
 USE_LDCONFIG=	yes
 MAKE_FLAGS=	INSTALLDIR=${STAGEDIR}${PREFIX} OS=freebsd ENV=gnu \
 		FORTRAN=yes FC_freebsd=${F77}
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/cdf${VER}-dist
 SUB_FILES=	pkg-message
 
 VER=		${PORTVERSION:S/.//:S/./_/}
 DEFS=		B C K
 
 PORTDOCS=	CDF_copyright.txt CHANGES.txt Release.notes Welcome.txt
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 .for def in ${DEFS}
 	@${REINPLACE_CMD} -e 's|<path>|${PREFIX}|' \
 		 ${WRKSRC}/src/definitions/definitions.${def}
 .endfor
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/lib/libcdf.so \
 		${STAGEDIR}${PREFIX}/lib/libcdf.so.0
 	${LN} -sf libcdf.so.0 ${STAGEDIR}${PREFIX}/lib/libcdf.so
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${EXAMPLESDIR}
 	${SED} -i '' 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/bin/definitions.?
 
 regression-test: build
 	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} test -C ${BUILD_WRKSRC}
 
 .include <bsd.port.mk>
Index: head/science/cdf/files/patch-src_include_cdflib.h
===================================================================
--- head/science/cdf/files/patch-src_include_cdflib.h	(revision 423148)
+++ head/science/cdf/files/patch-src_include_cdflib.h	(revision 423149)
@@ -1,12 +1,12 @@
---- src/include/cdflib.h.orig	2010-01-18 15:22:03.000000000 -0600
-+++ src/include/cdflib.h	2010-01-18 15:22:32.000000000 -0600
+--- src/include/cdflib.h.orig	2009-05-12 12:37:37 UTC
++++ src/include/cdflib.h
 @@ -375,8 +375,7 @@
  #elif defined(unix) && !defined(AIX) && !defined(Mach) && !defined(hpux) || \
      defined(__MINGW32__)
  #  if (defined(linux) && !defined(__ICC)) || defined(__CYGWIN__) || \
 -      defined(sun) || defined(__MINGW32__) || defined(__FreeBSD__) || \
 -      defined(__PPC__)
 +      defined(sun) || defined(__MINGW32__)
  #    define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep__
  #  else
  #    define Fif_ENTRYPOINT(ep__,ep_,ep,EP) ep_
Index: head/science/cdf/files/patch-src_tests_Makefile
===================================================================
--- head/science/cdf/files/patch-src_tests_Makefile	(revision 423148)
+++ head/science/cdf/files/patch-src_tests_Makefile	(revision 423149)
@@ -1,29 +1,29 @@
---- src/tests/Makefile.orig	Thu May 12 19:12:49 2005
-+++ src/tests/Makefile	Fri Jan 27 22:20:32 2006
-@@ -31,16 +31,16 @@
+--- src/tests/Makefile.orig	2009-05-12 18:09:12 UTC
++++ src/tests/Makefile
+@@ -33,16 +33,16 @@
  SHELL=/bin/sh
  NULL=true
  
 -FORTRAN=
 -FCx=
 -CCx=
 -SHARED=
 -FOPTIONS=
 -FOPTIONSld=
 -COPTIONS=
 -COPTIONSld=
 -SYSLIBS=
 -SHAREDEXT=
 +#FORTRAN=
 +#FCx=
 +#CCx=
 +#SHARED=
 +#FOPTIONS=
 +#FOPTIONSld=
 +#COPTIONS=
 +#COPTIONSld=
 +#SYSLIBS=
 +#SHAREDEXT=
  
  INCLUDEcdf=../include