Index: head/devel/py-pyshapelib/Makefile
===================================================================
--- head/devel/py-pyshapelib/Makefile	(revision 414926)
+++ head/devel/py-pyshapelib/Makefile	(revision 414927)
@@ -1,41 +1,56 @@
 # Created by: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
 # $FreeBSD$
 
 PORTNAME=	pyshapelib
-PORTVERSION=	0.3
+PORTVERSION=	1.0
 CATEGORIES=	devel python geography
-MASTER_SITES=	http://ftp.intevation.de/users/bh/pyshapelib/:py \
-		http://dl.maptools.org/dl/shapelib/:c
+MASTER_SITES=	http://wald.intevation.org/frs/download.php/899/:py \
+		http://download.osgeo.org/shapelib/:c
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:py ${SHAPELIB}${EXTRACT_SUFX}:c
 
 MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	Python bindings for Shapelib
 
 LICENSE=	LGPL20
 
 USES=		python
-USE_PYTHON=	distutils
-SHAPELIB=	shapelib-1.2.10
 USE_LDCONFIG=	yes
+USE_PYTHON=	distutils
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_SUB=	yes
+
 PORTDOCS=	NEWS README
 PORTEXAMPLES=	pytest.py
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+# pyshapelib requires shapelib source to build
+SHAPELIB=	shapelib-1.3.0
 
 post-extract:
 	${LN} -s ${WRKDIR}/${SHAPELIB} ${WRKDIR}/shapelib
 
+.include <bsd.port.options.mk>
+
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
+.endif
 
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${EXAMPLESDIR}
 .endfor
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} != 2
+IGNORE=	does not work with ${PYTHON_VERSION}
+.endif
+
+.include <bsd.port.post.mk>
Index: head/devel/py-pyshapelib/distinfo
===================================================================
--- head/devel/py-pyshapelib/distinfo	(revision 414926)
+++ head/devel/py-pyshapelib/distinfo	(revision 414927)
@@ -1,4 +1,4 @@
-SHA256 (pyshapelib-0.3.tar.gz) = 492d5050135c05e8213eecfcaedbccebf8e960a4407615a5d72af4696f409ad1
-SIZE (pyshapelib-0.3.tar.gz) = 40427
-SHA256 (shapelib-1.2.10.tar.gz) = afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78
-SIZE (shapelib-1.2.10.tar.gz) = 167219
+SHA256 (pyshapelib-1.0.tar.gz) = cdf10299c361cf817a129d24da9c01f6a2dbe866be63a5506fe7e96ca6490c20
+SIZE (pyshapelib-1.0.tar.gz) = 36819
+SHA256 (shapelib-1.3.0.tar.gz) = 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f
+SIZE (shapelib-1.3.0.tar.gz) = 156301
Index: head/devel/py-pyshapelib/pkg-descr
===================================================================
--- head/devel/py-pyshapelib/pkg-descr	(revision 414926)
+++ head/devel/py-pyshapelib/pkg-descr	(revision 414927)
@@ -1,23 +1,16 @@
+
 Python bindings for Shapelib
 ============================
 
 These are three python modules for shapelib:
 
    shapelib     read/write shapefiles
 
    dbflib       read/write dbf files
 
    shptree      quadtree for shapes
 
 Shapelib is a free software library for reading and writing ESRI shape
-files and can be found at http://gdal.velocet.ca/projects/shapelib. 
+files and can be found at http://shapelib.maptools.org/.
 
-The bindings were partly created with SWIG, a tool that can generate
-wrappers of C and C++ libraries for a variety of scripting languages.
-It's homepage is http://www.swig.org.
-
-The bindings themselves don't have a homepage at the moment, but the
-source tarballs/zip files can be downloaded from
-http://ftp.intevation.de/users/bh/pyshapelib/
-
-WWW: http://ftp.intevation.de/users/bh/pyshapelib/
+WWW: http://wald.intevation.org/projects/pyshapelib/
Index: head/devel/py-pyshapelib/pkg-plist
===================================================================
--- head/devel/py-pyshapelib/pkg-plist	(revision 414926)
+++ head/devel/py-pyshapelib/pkg-plist	(revision 414927)
@@ -1,9 +1,3 @@
-%%PYTHON_SITELIBDIR%%/dbflib.py
-%%PYTHON_SITELIBDIR%%/dbflib.pyc
-%%PYTHON_SITELIBDIR%%/dbflib.pyo
-%%PYTHON_SITELIBDIR%%/dbflibc.so
-%%PYTHON_SITELIBDIR%%/shapelib.py
-%%PYTHON_SITELIBDIR%%/shapelib.pyc
-%%PYTHON_SITELIBDIR%%/shapelib.pyo
-%%PYTHON_SITELIBDIR%%/shapelibc.so
+%%PYTHON_SITELIBDIR%%/dbflib.so
+%%PYTHON_SITELIBDIR%%/shapelib.so
 %%PYTHON_SITELIBDIR%%/shptree.so