- Update to 0.3.6

- Switch to easy_install
- Convert to new Makefile header
- Adapt to new options framework
- Allow OPTIONSFILE to be overridden
- Replace tab with a single space after 'WWW:' in pkg-descr

4 files changed, 18 insertions, 33 deletions

diff --git a/devel/py-funcparserlib/Makefile b/devel/py-funcparserlib/Makefile
index 5d29038fd9b8..b05bf6d4c080 100644
--- a/devel/py-funcparserlib/Makefile
+++ b/devel/py-funcparserlib/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	py-funcparserlib
-# Date created:		2011-08-02
-# Whom:			TAKATSU Tomonari <tota@FreeBSD.org>
-#
+# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	funcparserlib
-PORTVERSION=	0.3.5
+PORTVERSION=	0.3.6
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,25 +11,27 @@ MAINTAINER=	tota@FreeBSD.org
 COMMENT=	Recursive descent parsing library based on functional combinators
 
 LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 
+PORTDOCS=	README doc
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
 
-PORTDOCS=	README
-PORTEXAMPLES=	*
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
+
+OPTIONS_DEFINE=	DOCS
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
+	@${RM} -f ${WRKSRC}/doc/Makefile
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTDOCS} ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${INSTALL_WRKSRC}/examples; ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+	@cd ${INSTALL_WRKSRC} \
+	  && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \
+	  && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} \{} ${DOCSDIR}/\{} \;
 .endif
 
 x-generate-plist:
diff --git a/devel/py-funcparserlib/distinfo b/devel/py-funcparserlib/distinfo
index 4c8d4b35d86a..56535f87d13e 100644
--- a/devel/py-funcparserlib/distinfo
+++ b/devel/py-funcparserlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (funcparserlib-0.3.5.tar.gz) = 26df79cc5f119ffc467798df5abe20518c0b9c1bba558f8ee518f08bece37cb5
-SIZE (funcparserlib-0.3.5.tar.gz) = 33117
+SHA256 (funcparserlib-0.3.6.tar.gz) = b7992eac1a3eb97b3d91faa342bfda0729e990bd8a43774c1592c091e563c91d
+SIZE (funcparserlib-0.3.6.tar.gz) = 30401
diff --git a/devel/py-funcparserlib/pkg-descr b/devel/py-funcparserlib/pkg-descr
index cd63ed8594c2..5ff45440d7da 100644
--- a/devel/py-funcparserlib/pkg-descr
+++ b/devel/py-funcparserlib/pkg-descr
@@ -18,4 +18,4 @@ The library itself is very small. Its source code is only 0.5 KLOC, with lots
 of comments included. It features the longest parsed prefix error reporting,
 as well as a tiny lexer generator for token position tracking.
 
-WWW:	http://code.google.com/p/funcparserlib/
+WWW: http://code.google.com/p/funcparserlib/
diff --git a/devel/py-funcparserlib/pkg-plist b/devel/py-funcparserlib/pkg-plist
deleted file mode 100644
index 36d681a10d1f..000000000000
--- a/devel/py-funcparserlib/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-%%PYTHON_SITELIBDIR%%/funcparserlib/__init__.py
-%%PYTHON_SITELIBDIR%%/funcparserlib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/funcparserlib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/funcparserlib/lexer.py
-%%PYTHON_SITELIBDIR%%/funcparserlib/lexer.pyc
-%%PYTHON_SITELIBDIR%%/funcparserlib/lexer.pyo
-%%PYTHON_SITELIBDIR%%/funcparserlib/parser.py
-%%PYTHON_SITELIBDIR%%/funcparserlib/parser.pyc
-%%PYTHON_SITELIBDIR%%/funcparserlib/parser.pyo
-%%PYTHON_SITELIBDIR%%/funcparserlib/util.py
-%%PYTHON_SITELIBDIR%%/funcparserlib/util.pyc
-%%PYTHON_SITELIBDIR%%/funcparserlib/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/funcparserlib