[Midnightbsd-cvs] mports [16787] trunk/databases/rrdtool: update plist

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 5 01:01:14 EDT 2014 

Revision: 16787
          http://svnweb.midnightbsd.org/mports/?rev=16787
Author:   laffer1
Date:     2014-09-05 01:01:13 -0400 (Fri, 05 Sep 2014)
Log Message:
-----------
update plist

Modified Paths:
--------------
    trunk/databases/rrdtool/Makefile
    trunk/databases/rrdtool/pkg-plist

Modified: trunk/databases/rrdtool/Makefile
===================================================================
--- trunk/databases/rrdtool/Makefile	2014-09-05 04:54:02 UTC (rev 16786)
+++ trunk/databases/rrdtool/Makefile	2014-09-05 05:01:13 UTC (rev 16787)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.4.8
+PORTREVISION=	1
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -10,29 +11,24 @@
 
 LICENSE=	gpl2
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		cairo.2:${PORTSDIR}/graphics/cairo \
-		png15:${PORTSDIR}/graphics/png \
-		xml2:${PORTSDIR}/textproc/libxml2 \
-		pangocairo-1\.0.0:${PORTSDIR}/x11-toolkits/pango
+CONFLICTS=	rrdtool10-* rrdtool12-*
 
-CONFLICTS=	rrdtool-1.0*
-
 USE_RC_SUBR=	rrdcached
-USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
-USE_GNOME=	gnomehack intltool
+USES=		gmake libtool pathfix pkgconfig
+USE_GNOME=	glib20 libxml2
+INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--disable-tcl --program-prefix=""
 
-PORTDOCS=	*
 PORTEXAMPLES=	4charts.pl bigtops.pl cgi-demo.cgi minmax.pl perftest.pl \
 		piped-demo.pl shared-demo.pl stripes.pl
 
-OPTIONS_DEFINE=	DEJAVU JSON MMAP PERL_MODULE PYTHON_MODULE RUBY_MODULE EXAMPLES DOCS
-OPTIONS_DEFAULT=	MMAP PERL_MODULE
+OPTIONS_DEFINE=	DEJAVU GRAPH JSON MMAP NLS PERL_MODULE PYTHON_MODULE \
+		RUBY_MODULE EXAMPLES DOCS
+OPTIONS_DEFAULT=	GRAPH MMAP PERL_MODULE
+GRAPH_DESC=		Enable the rrdtool graph command (needs cairo)
 DEJAVU_DESC=		Use DejaVu fonts (requires X11)
 JSON_DESC=		Support of json export
 MMAP_DESC=		Use mmap in rrd_update
@@ -66,6 +62,7 @@
 
 .if ${PORT_OPTIONS:MPERL_MODULE}
 USES+=		perl5
+USE_PERL5+=	build run fixpacklist
 CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
 PLIST_SUB+=	WITH_PERL=""
 .else
@@ -81,27 +78,44 @@
 EXTRA_PATCHES+=		${FILESDIR}/thirdparty-json.diff
 .endif
 
+.if ${PORT_OPTIONS:MGRAPH}
+LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libpng15.so:${PORTSDIR}/graphics/png
+USE_GNOME+=	cairo pango
+PLIST_SUB+=	WITH_GRAPH=""
+.else
+CONFIGURE_ARGS+=--disable-rrdcgi --disable-rrd_graph
+PLIST_SUB+=	WITH_GRAPH="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
+USE_GNOME+=	intltool
+.else
+CONFIGURE_ARGS+=--disable-nls
+.endif
+
 .if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-##LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS:=	${CFLAGS:N-ffast-math}
 
 post-extract:
-	@${REINPLACE_CMD} -e 's/^POD3/#POD3/' ${WRKSRC}/doc/Makefile.in
 .if ! ${PORT_OPTIONS:MDOCS}
-	@${REINPLACE_CMD} -e 's/[[:space:]]install-idocDATA//g' \
-		-e 's/[[:space:]]install-ihtmlDATA//g' \
-		-e 's/^[[:space:]].*cd .* rrdtool.html index.html/	#/' \
-		${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e '/^SUBDIRS = /s| doc | |' \
+		${WRKSRC}/Makefile.in
 .endif
 .if ! ${PORT_OPTIONS:MEXAMPLES}
-	${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
+	@${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
 		${WRKSRC}/Makefile.in
 .endif
+	@${REINPLACE_CMD} -E 's|(^rrdcached_LDADD = librrd_th.la)|\1 $$\(ALL_LIBS\)|' \
+		${WRKSRC}/src/Makefile.in
 
+	@${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \
+		${WRKSRC}/src/Makefile.in
+
 post-install:
 .if !defined(BATCH) && ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} ""

Modified: trunk/databases/rrdtool/pkg-plist
===================================================================
--- trunk/databases/rrdtool/pkg-plist	2014-09-05 04:54:02 UTC (rev 16786)
+++ trunk/databases/rrdtool/pkg-plist	2014-09-05 05:01:13 UTC (rev 16787)
@@ -1,5 +1,5 @@
 bin/rrdcached
-bin/rrdcgi
+%%WITH_GRAPH%%bin/rrdcgi
 bin/rrdcreate
 bin/rrdinfo
 bin/rrdtool
@@ -8,24 +8,148 @@
 include/rrd_client.h
 include/rrd_format.h
 lib/librrd.a
-lib/librrd.la
 lib/librrd.so
-lib/librrd.so.6
+lib/librrd.so.4
+lib/librrd.so.4.2.1
 lib/librrd_th.a
-lib/librrd_th.la
 lib/librrd_th.so
-lib/librrd_th.so.6
+lib/librrd_th.so.4
+lib/librrd_th.so.4.2.1
 libdata/pkgconfig/librrd.pc
+%%PORTDOCS%%man/man1/bin_dec_hex.1.gz
+%%PORTDOCS%%man/man1/cdeftutorial.1.gz
+%%PORTDOCS%%man/man1/rpntutorial.1.gz
+%%PORTDOCS%%man/man1/rrd-beginners.1.gz
+%%PORTDOCS%%man/man1/rrdbuild.1.gz
+%%PORTDOCS%%man/man1/rrdcached.1.gz
+%%PORTDOCS%%man/man1/rrdcgi.1.gz
+%%PORTDOCS%%man/man1/rrdcreate.1.gz
+%%PORTDOCS%%man/man1/rrddump.1.gz
+%%PORTDOCS%%man/man1/rrdfetch.1.gz
+%%PORTDOCS%%man/man1/rrdfirst.1.gz
+%%PORTDOCS%%man/man1/rrdflushcached.1.gz
+%%PORTDOCS%%man/man1/rrdgraph.1.gz
+%%PORTDOCS%%man/man1/rrdgraph_data.1.gz
+%%PORTDOCS%%man/man1/rrdgraph_examples.1.gz
+%%PORTDOCS%%man/man1/rrdgraph_graph.1.gz
+%%PORTDOCS%%man/man1/rrdgraph_rpn.1.gz
+%%PORTDOCS%%man/man1/rrdinfo.1.gz
+%%PORTDOCS%%man/man1/rrdlast.1.gz
+%%PORTDOCS%%man/man1/rrdlastupdate.1.gz
+%%PORTDOCS%%man/man1/rrdresize.1.gz
+%%PORTDOCS%%man/man1/rrdrestore.1.gz
+%%PORTDOCS%%man/man1/rrdthreads.1.gz
+%%PORTDOCS%%man/man1/rrdtool.1.gz
+%%PORTDOCS%%man/man1/rrdtune.1.gz
+%%PORTDOCS%%man/man1/rrdtutorial.1.gz
+%%PORTDOCS%%man/man1/rrdupdate.1.gz
+%%PORTDOCS%%man/man1/rrdxport.1.gz
+%%PORTDOCS%%man/man3/librrd.3.gz
+%%WITH_PERL%%%%PERL5_MAN3%%/RRDp.3.gz
+%%WITH_PERL%%%%PERL5_MAN3%%/RRDs.3.gz
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
 %%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
+%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm
+%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/librrd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcached.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdflushcached.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdlastupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/librrd.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdflushcached.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdflushcached.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
+%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
 %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
-%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/RRDCached.pm
-%%PORTEXAMPLES%%share/rrdtool/examples/rrdcached/rrdcached-size.pl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm share/rrdtool/examples/rrdcached
 %%PORTEXAMPLES%%@dirrm share/rrdtool/examples
 %%PORTEXAMPLES%%@dirrm share/rrdtool

More information about the Midnightbsd-cvs mailing list