From 4ce70782766413b79ffa13ebc1600d22777f1f54 Mon Sep 17 00:00:00 2001 From: sthen Date: Sun, 6 Apr 2014 17:01:34 +0000 Subject: [PATCH] Remove MODRUBY_REV and switch to the default Ruby version now that packages are available on a wider range of arches. Adjust comments in rrdtool-chroot script (talk about "web server" rather than Apache). --- net/rrdtool/Makefile | 7 +++---- net/rrdtool/files/rrdtool-chroot.sh | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index 6911dcbc703..50a235f217b 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.78 2014/03/28 10:06:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.79 2014/04/06 17:01:34 sthen Exp $ SHARED_ONLY= Yes @@ -9,8 +9,8 @@ COMMENT-ruby= ruby interface to librrd MODPY_EGG_VERSION= 0.2.2 VERSION= 1.4.8 -REVISION-main= 2 -REVISION-ruby= 2 +REVISION-main= 3 +REVISION-ruby= 3 REVISION-python=0 REVISION-update=0 DISTNAME= rrdtool-${VERSION} @@ -39,7 +39,6 @@ PSEUDO_FLAVORS= no_ruby no_python MULTI_PACKAGES= -main -python -ruby -update MODULES= devel/gettext lang/python lang/ruby -MODRUBY_REV= 1.8# XXX ruby 1.9/2.0 work too, but don't build on sparc64 et al CONFIGURE_STYLE= gnu CPPFLAGS+= -I${X11BASE}/include/ \ diff --git a/net/rrdtool/files/rrdtool-chroot.sh b/net/rrdtool/files/rrdtool-chroot.sh index 8dfcd7b0381..56283c8545d 100644 --- a/net/rrdtool/files/rrdtool-chroot.sh +++ b/net/rrdtool/files/rrdtool-chroot.sh @@ -1,6 +1,7 @@ #!/bin/ksh # -# make rrdtool(1) available in Apache chroot(8) +# make rrdtool(1) available in webserver chroot(8): copy in library +# dependencies and generate barebones pango/fontconfig/pango configuration # WARNING: /var/www/usr/libexec/ld.so and /var/www/lib/* may be shared # by other executables in the chroot(8)