diff --git a/science/py-netCDF4/Makefile b/science/py-netCDF4/Makefile
index bfb3194c11eb..3d7cf22e9945 100644
--- a/science/py-netCDF4/Makefile
+++ b/science/py-netCDF4/Makefile
@@ -2,25 +2,59 @@
 # $FreeBSD$
 
 PORTNAME=	netCDF4
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.4
 CATEGORIES=	science python
-MASTER_SITES=	http://netcdf4-python.googlecode.com/files/ \
-		CHEESESHOP
+MASTER_SITES=	GOOGLE_CODE
+PROJECTHOST=	netcdf4-python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Python Interface to the NetCDF Library(versions 3 and 4)
+COMMENT=	Python Interface to the NetCDF Library (versions 3 and 4)
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy:${PORTSDIR}/math/py-numpy
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	hdf5:${PORTSDIR}/science/hdf5-18 \
 		netcdf:${PORTSDIR}/science/netcdf4
+RUN_DEPENDS=	${PYNUMPY}
 
-USE_PYTHON=	2.5+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+USE_DOS2UNIX=	utils/nc3tonc4
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+MAKE_ENV=	HDF5_INCDIR=${LOCALBASE}/include \
+		HDF5_LIBDIR=${LOCALBASE}/lib \
+		NETCDF4_INCDIR=${LOCALBASE}/include \
+		NETCDF4_LIBDIR=${LOCALBASE}/lib
+
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/nc3tonc4 \
+		bin/nc4tonc3 \
+		%%PYTHON_SITELIBDIR%%/netCDF4.so \
+		%%PYTHON_SITELIBDIR%%/netCDF4_utils.py \
+		%%PYTHON_SITELIBDIR%%/netCDF4_utils.pyc \
+		%%PYTHON_SITELIBDIR%%/netCDF4_utils.pyo \
+		%%PYTHON_SITELIBDIR%%/netcdftime.py \
+		%%PYTHON_SITELIBDIR%%/netcdftime.pyc \
+		%%PYTHON_SITELIBDIR%%/netcdftime.pyo
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \
-		${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e \
+		"/dirstosearch/s|=.*|= ['${LOCALBASE}']|" ${WRKSRC}/setup.py
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC}/docs && ${INSTALL_DATA} * ${DOCSDIR})
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${INSTALL_DATA} * ${EXAMPLESDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/science/py-netCDF4/distinfo b/science/py-netCDF4/distinfo
index e03fed7113eb..be9d0b35513f 100644
--- a/science/py-netCDF4/distinfo
+++ b/science/py-netCDF4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (netCDF4-1.0.2.tar.gz) = 76af3918112fbd254d07f073376d4364b3538ab0fdde47a453f1e10f612f6223
-SIZE (netCDF4-1.0.2.tar.gz) = 490900
+SHA256 (netCDF4-1.0.4.tar.gz) = 99f5eaebae2fae92759d13b790dde4226b2b8c83a68f86543c41c7998cba53b7
+SIZE (netCDF4-1.0.4.tar.gz) = 521990
diff --git a/science/py-netCDF4/pkg-plist b/science/py-netCDF4/pkg-plist
deleted file mode 100644
index 755d74cf5914..000000000000
--- a/science/py-netCDF4/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/nc4tonc3
-bin/nc3tonc4
-%%PYTHON_SITELIBDIR%%/netCDF4_utils.py
-%%PYTHON_SITELIBDIR%%/netCDF4_utils.pyc
-%%PYTHON_SITELIBDIR%%/netCDF4_utils.pyo
-%%PYTHON_SITELIBDIR%%/netCDF4.so
-%%PYTHON_SITELIBDIR%%/netcdftime.py
-%%PYTHON_SITELIBDIR%%/netcdftime.pyc
-%%PYTHON_SITELIBDIR%%/netcdftime.pyo
-%%PYTHON_SITELIBDIR%%/ordereddict.py
-%%PYTHON_SITELIBDIR%%/ordereddict.pyc
-%%PYTHON_SITELIBDIR%%/ordereddict.pyo