- Update to 1.60

- Move print/py-reportlab from BUILD_DEPENDS to RUN_DEPENDS
- Use DOCSDIR in pkg-plist
- Update WWW

PR:		58309
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

4 files changed, 30 insertions, 24 deletions

diff --git a/misc/pdfmap/Makefile b/misc/pdfmap/Makefile
index 91a796d9c14c..ec770c9b3fdb 100644
--- a/misc/pdfmap/Makefile
+++ b/misc/pdfmap/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pdfmap
-PORTVERSION=	1.50
+PORTVERSION=	1.60
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,17 +16,19 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate maps in PDF format and place clickable objects on them
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/jaxml.py:${PORTSDIR}/textproc/py-jaxml \
-		${PYTHON_SITELIBDIR}/reportlab/pdfgen/canvas.py:${PORTSDIR}/print/py-reportlab \
 		${PYTHON_SITELIBDIR}/PIL/Image.py:${PORTSDIR}/graphics/py-imaging
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/reportlab/pdfgen/canvas.py:${PORTSDIR}/print/py-reportlab
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
-post-install:
-	@${MV} -f ${PREFIX}/bin/pdfmap.py ${PREFIX}/bin/pdfmap
+DOCS=		CREDITS NEWS README TODO doc/*.html
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/pdfmap.py ${PREFIX}/bin/pdfmap
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/pdfmap/distinfo b/misc/pdfmap/distinfo
index 3a4954cc73f6..bc5618e48c26 100644
--- a/misc/pdfmap/distinfo
+++ b/misc/pdfmap/distinfo
@@ -1 +1 @@
-MD5 (pdfmap-1.50.tar.gz) = 7fe8ecec1ab5413d0dd08a8ce734a422
+MD5 (pdfmap-1.60.tar.gz) = 77d60321c095b4bb6207e9f9a0fb6f39
diff --git a/misc/pdfmap/pkg-descr b/misc/pdfmap/pkg-descr
index 8ecba12b80f2..d61c0f788224 100644
--- a/misc/pdfmap/pkg-descr
+++ b/misc/pdfmap/pkg-descr
@@ -10,4 +10,4 @@ own programs, this will allow you to produce multipage documents with
 different sizes, orientations, scales, background, etc... from page to
 page.
 
-WWW: http://pdfmap.sourceforge.net/
+WWW: http://www.librelogiciel.com/software/PDFMap/action_Presentation
diff --git a/misc/pdfmap/pkg-plist b/misc/pdfmap/pkg-plist
index 52ae1f11c42a..7cf79529646b 100644
--- a/misc/pdfmap/pkg-plist
+++ b/misc/pdfmap/pkg-plist
@@ -1,18 +1,22 @@
+@comment $FreeBSD$
 bin/pdfmap
-%%PORTDOCS%%share/doc/pdfmap/index.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Circle.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Cross.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Diamond.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Ellipse.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Image.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_MapBackground.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_MapObject.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_PDFMap.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_PDFMapCanvas.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_PDFMapError.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Rectangle.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Square.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Star.py.html
-%%PORTDOCS%%share/doc/pdfmap/pdfmap_Triangle.py.html
-%%PORTDOCS%%@dirrm share/doc/pdfmap
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Circle.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Cross.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Diamond.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Ellipse.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Image.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_MapBackground.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_MapObject.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_PDFMap.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_PDFMapError.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Rectangle.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Square.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Star.py.html
+%%PORTDOCS%%%%DOCSDIR%%/pdfmap_Triangle.py.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%