svn commit: r371657 - head/databases/rrdtool10

[Olli Hauer]

Author: ohauer
Date: Tue Oct 28 23:17:46 2014
New Revision: 371657
URL: https://svnweb.freebsd.org/changeset/ports/371657
QAT: https://qat.redports.org/buildarchive/r371657/

Log:
  - fix build with pod2x from perl5.18+
  - bump PORTREVISION
  - make portlint happy

Modified:
  head/databases/rrdtool10/Makefile
  head/databases/rrdtool10/pkg-plist

Modified: head/databases/rrdtool10/Makefile
==============================================================================
--- head/databases/rrdtool10/Makefile	Tue Oct 28 22:56:27 2014	(r371656)
+++ head/databases/rrdtool10/Makefile	Tue Oct 28 23:17:46 2014	(r371657)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.0.50
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/
 PKGNAMESUFFIX=	10
@@ -11,9 +11,11 @@ PKGNAMESUFFIX=	10
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Round Robin Database Tools
 
+LICENSE=	GPLv2
+
 MAKE_ENV=	PERL=${PERL}
 
-CONFLICTS=	rrdtool12-* rrdtool-1.*
+CONFLICTS=	rrdtool12-1.* rrdtool-1.*
 
 USES=		pkgconfig perl5 libtool
 USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
@@ -34,10 +36,12 @@ LATIN2_DESC=	ISO-8859-2 fonts support
 
 LATIN2_CONFIGURE_ENABLE=	latin2
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_VER} >= 5.18
-BROKEN=		Does not build with Perl 5.18 or above
-.endif
+post-patch:
+# fix perl5.18+ pod2x tool
+	${REINPLACE_CMD} -e 's|IMG<|IMG ... E<|' \
+		${WRKSRC}/doc/rrdcgi.pod
+	${REINPLACE_CMD} -e 's|rrdtutorial.es.pod||' \
+		${WRKSRC}/doc/Makefile.am \
+		${WRKSRC}/doc/Makefile.in
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/databases/rrdtool10/pkg-plist
==============================================================================
--- head/databases/rrdtool10/pkg-plist	Tue Oct 28 22:56:27 2014	(r371656)
+++ head/databases/rrdtool10/pkg-plist	Tue Oct 28 23:17:46 2014	(r371657)
@@ -34,7 +34,6 @@ man/man1/rrdrestore.1.gz
 man/man1/rrdtool.1.gz
 man/man1/rrdtune.1.gz
 man/man1/rrdtutorial.1.gz
-man/man1/rrdtutorial.es.1.gz
 man/man1/rrdupdate.1.gz
 man/man1/rrdxport.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/RRDp.txt
@@ -61,7 +60,6 @@ man/man1/rrdxport.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.es.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
@@ -93,8 +91,6 @@ man/man1/rrdxport.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/rrdtool.txt
 %%PORTDOCS%%%%DOCSDIR%%/rrdtune.pod
 %%PORTDOCS%%%%DOCSDIR%%/rrdtune.txt
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.pod
-%%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.es.txt
 %%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.pod
 %%PORTDOCS%%%%DOCSDIR%%/rrdtutorial.txt
 %%PORTDOCS%%%%DOCSDIR%%/rrdupdate.pod