svn commit: r352379 - head/graphics/py-nwdiag

[TAKATSU Tomonari]

Author: tota
Date: Sat Apr 26 21:18:44 2014
New Revision: 352379
URL: http://svnweb.freebsd.org/changeset/ports/352379
QAT: https://qat.redports.org/buildarchive/r352379/

Log:
  - Update to 1.0.0
    * Switch run-time dependency from PIL to Pillow
  - Remove indefinate article from COMMENT
  - Use USE_PYDISTUTILS= yes instead of USE_PYDISTUTILS= easy_install
  - Use PYDISTUTILS_AUTOPLIST
    * Remove pkg-plist, accordingly
  - Make use of UNIQUENAME
  - Add DOCS and EXAMPLES to OPTIONS_DEFINE to fix options default
  - Support STAGEDIR
    * Make DOCS and EXAMPLES unconditional to stage
  - Unmute INSTALL_DATA and INSTALL_MAN in post-install target

Deleted:
  head/graphics/py-nwdiag/pkg-plist
Modified:
  head/graphics/py-nwdiag/Makefile
  head/graphics/py-nwdiag/distinfo

Modified: head/graphics/py-nwdiag/Makefile
==============================================================================
--- head/graphics/py-nwdiag/Makefile	Sat Apr 26 21:18:07 2014	(r352378)
+++ head/graphics/py-nwdiag/Makefile	Sat Apr 26 21:18:44 2014	(r352379)
@@ -2,60 +2,50 @@
 # $FreeBSD$
 
 PORTNAME=	nwdiag
-PORTVERSION=	0.9.4
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	tota at FreeBSD.org
-COMMENT=	A simple network-diagram image generator
+COMMENT=	Simple network-diagram image generator
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PKGNAMEPREFIX}imaging>=1.1.5:${PORTSDIR}/graphics/py-imaging \
-		${PKGNAMEPREFIX}funcparserlib>=0.3.4:${PORTSDIR}/devel/py-funcparserlib \
-		${PKGNAMEPREFIX}blockdiag>=1.2.4:${PORTSDIR}/graphics/py-blockdiag
+RUN_DEPENDS=	${PKGNAMEPREFIX}pillow>=2.2.1:${PORTSDIR}/graphics/py-pillow \
+		${PKGNAMEPREFIX}funcparserlib>=0.3.6:${PORTSDIR}/devel/py-funcparserlib \
+		${PKGNAMEPREFIX}blockdiag>=1.3.0:${PORTSDIR}/graphics/py-blockdiag
+
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
-USE_PYTHON=	2
-USE_PYDISTUTILS=	easy_install
-
-MAN1=	${PORTNAME}.1 rackdiag.1
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${UNIQUENAME}
 
 PORTDOCS=	README.txt
 PORTEXAMPLES=	*
 
-NO_STAGE=	yes
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/src/${PORTDOCS} ${DOCSDIR}
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} == 3.1
+IGNORE=	does not support in ${PYTHON_VERSION}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for d in ${PORTNAME} packetdiag
-	@${INSTALL_DATA} \
+	${INSTALL_DATA} \
 		${INSTALL_WRKSRC}/examples/${d}/${PORTEXAMPLES} \
-		${EXAMPLESDIR}
+		${STAGEDIR}${EXAMPLESDIR}
 .endfor
-.endif
-.for f in ${MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${f} ${MAN1PREFIX}/man/man1/
+.for f in ${PORTNAME} rackdiag
+	${INSTALL_MAN} ${WRKSRC}/${f}.1 ${STAGEDIR}${PREFIX}/man/man1/
+	@${ECHO_CMD} man/man1/${f}.1.gz >> ${TMPPLIST}
 .endfor
 
-x-generate-plist:
-	${ECHO} bin/${PORTNAME} > pkg-plist.new
-	${ECHO} bin/packetdiag >> pkg-plist.new
-	${ECHO} bin/rackdiag >> pkg-plist.new
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} -type f | ${SORT} | \
-	${SED} -e 's,${PYTHON_SITELIBDIR},%%PYTHON_SITELIBDIR%%,' \
-		-e 's,${PYEASYINSTALL_EGG},%%PYEASYINSTALL_EGG%%,' \
-		>> pkg-plist.new
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} -type d -depth | ${SORT} -r | \
-	${SED} -e 's,${PYTHON_SITELIBDIR}, at dirrm %%PYTHON_SITELIBDIR%%,' \
-		-e 's,${PYEASYINSTALL_EGG},%%PYEASYINSTALL_EGG%%,' \
-		>> pkg-plist.new
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/graphics/py-nwdiag/distinfo
==============================================================================
--- head/graphics/py-nwdiag/distinfo	Sat Apr 26 21:18:07 2014	(r352378)
+++ head/graphics/py-nwdiag/distinfo	Sat Apr 26 21:18:44 2014	(r352379)
@@ -1,2 +1,2 @@
-SHA256 (nwdiag-0.9.4.tar.gz) = 12b27a7462060949c81cf801338bc26af9c0ef47e9d2ce5a13502471c33d742c
-SIZE (nwdiag-0.9.4.tar.gz) = 96140
+SHA256 (nwdiag-1.0.0.tar.gz) = 1dbb66d487e7bc4a51c84e55e4ef400962b1ca503b2baca2ae5ade38becc55b4
+SIZE (nwdiag-1.0.0.tar.gz) = 94646