ports/114419: [PATCH] databases/rrdtool: [SUMMARIZE CHANGES]

Markus Dolze bsdfan at nurfuerspam.de
Sun Jul 8 18:30:04 UTC 2007


>Number:         114419
>Category:       ports
>Synopsis:       [PATCH] databases/rrdtool: [SUMMARIZE CHANGES]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 08 18:30:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Markus Dolze
>Release:        FreeBSD 6.2-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD rymelda.intra.mdolze.de 6.2-RELEASE-p3 FreeBSD 6.2-RELEASE-p3 #5: Sun Mar 25 11:49:58 CEST 2007
>Description:
Make dependency on Perl optional.

Port maintainer (bg1tpt at gmail.com) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- rrdtool-1.2.23_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool.orig/Makefile /usr/ports/databases/rrdtool/Makefile
--- /usr/ports/databases/rrdtool.orig/Makefile	Sun Jul  8 18:49:58 2007
+++ /usr/ports/databases/rrdtool/Makefile	Sun Jul  8 19:45:23 2007
@@ -7,6 +7,7 @@
 
 PORTNAME=	rrdtool
 PORTVERSION=	1.2.23
+PORTREVISION=	1
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 
@@ -18,15 +19,15 @@
 		png.5:${PORTSDIR}/graphics/png
 
 USE_AUTOTOOLS=	libtool:15
-USE_PERL5=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ARGS=	--enable-perl-site-install --disable-tcl
+CONFIGURE_ARGS=	--disable-tcl
 
 OPTIONS=	PYTHON_MODULE	"Build PYTHON bindings" off \
-		RUBY_MODULE	"Build RUBY bindings" off
+		RUBY_MODULE	"Build RUBY bindings" off \
+		PERL_MODULE	"Build PERL module" on
 
 .include <bsd.port.pre.mk>
 .if defined(WITH_PYTHON_MODULE)
@@ -49,6 +50,15 @@
 PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 
+.if !defined(WITHOUT_PERL_MODULE)
+USE_PERL5=	yes
+CONFIGURE_ARGS+=	--enable-perl --enable-perl-site-install
+PLIST_SUB+=	WITH_PERL=""
+.else
+CONFIGURE_ARGS+=	--disable-perl
+PLIST_SUB+=	WITH_PERL="@comment "
+.endif
+
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 -I${LOCALBASE}/include/freetype2
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -61,8 +71,11 @@
 		rrdgraph_rpn.1 rrdinfo.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
 		rrdthreads.1 rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 \
 		rrdxport.1 rrdlastupdate.1
+
+.if !defined(WITHOUT_PERL_MODULE)
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${TARGETDIR}/lib/perl5/${PERL_VERSION}
+.endif
 
 post-extract:
 .if defined(NOPORTDOCS)
diff -ruN --exclude=CVS /usr/ports/databases/rrdtool.orig/pkg-plist /usr/ports/databases/rrdtool/pkg-plist
--- /usr/ports/databases/rrdtool.orig/pkg-plist	Sun Jul  8 18:49:58 2007
+++ /usr/ports/databases/rrdtool/pkg-plist	Sun Jul  8 18:57:50 2007
@@ -100,13 +100,13 @@
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
 %%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
 %%DATADIR%%/fonts/DejaVuSansMono-Roman.ttf
-%%SITE_PERL%%/RRDp.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
-%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/RRDp.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/RRDs.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/ntmake.pl
+%%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_PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtoolmodule.so
 %%WITH_RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
 @dirrm %%EXAMPLESDIR%%
@@ -115,5 +115,5 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
- at dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDp
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/RRDs
--- rrdtool-1.2.23_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list