Hi!
In 2.0.18 gsed inline substitution was added. This breaks some scripts and
manuals.
This substitutions were disabled because it was a secure-fix update and sthen@
suggested to commit it as fast as possible.
Attached is a patch to switch from gsed to in-base perl.
OK?
P.S. I think this should be also commited to 5.4.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile 3 Dec 2013 10:21:01 -0000 1.35
+++ Makefile 14 Dec 2013 11:12:00 -0000
@@ -6,6 +6,7 @@
V = 2.0.18
DISTNAME = munin-$V
PKGNAME-main = munin-node-$V
+REVISION-main = 0
PKGNAME-server =munin-server-$V
CATEGORIES = net
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-Makefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Makefile
--- patches/patch-Makefile 3 Dec 2013 10:21:01 -0000 1.6
+++ patches/patch-Makefile 14 Dec 2013 11:12:00 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.6 2013/12/03 10:21:01 kirby Exp $
--- Makefile.orig Wed Nov 13 00:13:23 2013
-+++ Makefile Mon Dec 2 19:27:58 2013
++++ Makefile Tue Dec 3 15:15:23 2013
@@ -72,7 +72,6 @@ install-pre: Makefile Makefile.config
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
@@ -45,16 +45,77 @@
$(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
-@@ -213,7 +212,7 @@ install-doc: build-doc
- # Dummy rule to enable parallel building
- infiles: $(INFILES)
-
--build: infiles build-master build-common-prime build-node build-plugins $(JAVA_BUILD) build-man substitue-confvar-inline
-+build: infiles build-master build-common-prime build-node build-plugins $(JAVA_BUILD) build-man #substitue-confvar-inline
-
- build/%: %.in
- @echo "$< -> $@"
-@@ -466,7 +465,7 @@ install-%: %/Build
+@@ -254,38 +253,37 @@ build/%: %.in
+ build-common-prime: build-common-pre common/blib/lib/Munin/Common/Defaults.pm build-common
+
+ substitue-confvar-inline:
+- @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
+- -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
+- -e 's|@@BINDIR@@|$(BINDIR)|g' \
+- -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
+- -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
+- -e 's|@@LIBDIR@@|$(LIBDIR)|g' \
+- -e 's|@@MANDIR@@|$(MANDIR)|g' \
+- -e 's|@@LOGDIR@@|$(LOGDIR)|g' \
+- -e 's|@@HTMLDIR@@|$(HTMLDIR)|g' \
+- -e 's|@@DBDIR@@|$(DBDIR)|g' \
+- -e 's|@@STATEDIR@@|$(STATEDIR)|g' \
+- -e 's|@@SPOOLDIR@@|$(SPOOLDIR)|g' \
+- -e 's|@@PERL@@|$(PERL)|g' \
+- -e 's|@@PERLLIB@@|$(PERLLIB)|g' \
+- -e 's|@@PYTHON@@|$(PYTHON)|g' \
+- -e 's|@@RUBY@@|$(RUBY)|g' \
+- -e 's|@@JAVARUN@@|$(JAVARUN)|g' \
+- -e 's|@@JAVALIBDIR@@|$(JAVALIBDIR)|g' \
+- -e 's|@@OSTYPE@@|$(OSTYPE)|g' \
+- -e 's|@@HOSTNAME@@|$(HOSTNAME)|g' \
+- -e 's|@@MKTEMP@@|$(MKTEMP)|g' \
+- -e 's|@@VERSION@@|$(VERSION)|g' \
+- -e 's|@@PLUGSTATE@@|$(PLUGSTATE)|g' \
+- -e 's|@@CGIDIR@@|$(CGIDIR)|g' \
+- -e 's|@@USER@@|$(USER)|g' \
+- -e 's|@@GROUP@@|$(GROUP)|g' \
+- -e 's|@@PLUGINUSER@@|$(PLUGINUSER)|g' \
+- -e 's|@@GOODSH@@|$(GOODSH)|g' \
+- -e 's|@@BASH@@|$(BASH)|g' \
+- -e 's|@@HASSETR@@|$(HASSETR)|g' \
+- --in-place \
+- ./master/blib/libdoc/Munin::Master::HTMLOld.3pm \
++ perl -pi -e "s'@@PREFIX@@'$(PREFIX)'g;" \
++ -e "s'@@CONFDIR@@'$(CONFDIR)'g;" \
++ -e "s'@@BINDIR@@'$(BINDIR)'g;" \
++ -e "s'@@SBINDIR@@'$(SBINDIR)'g;" \
++ -e "s'@@DOCDIR@@'$(DOCDIR)'g;" \
++ -e "s'@@LIBDIR@@'$(LIBDIR)'g;" \
++ -e "s'@@MANDIR@@'$(MANDIR)'g;" \
++ -e "s'@@LOGDIR@@'$(LOGDIR)'g;" \
++ -e "s'@@HTMLDIR@@'$(HTMLDIR)'g;" \
++ -e "s'@@DBDIR@@'$(DBDIR)'g;" \
++ -e "s'@@STATEDIR@@'$(STATEDIR)'g;" \
++ -e "s'@@SPOOLDIR@@'$(SPOOLDIR)'g;" \
++ -e "s'@@PERL@@'$(PERL)'g;" \
++ -e "s'@@PERLLIB@@'$(PERLLIB)'g;" \
++ -e "s'@@PYTHON@@'$(PYTHON)'g;" \
++ -e "s'@@RUBY@@'$(RUBY)'g;" \
++ -e "s'@@JAVARUN@@'$(JAVARUN)'g;" \
++ -e "s'@@JAVALIBDIR@@'$(JAVALIBDIR)'g;" \
++ -e "s'@@OSTYPE@@'$(OSTYPE)'g;" \
++ -e "s'@@HOSTNAME@@'$(HOSTNAME)'g;" \
++ -e "s'@@MKTEMP@@'$(MKTEMP)'g;" \
++ -e "s'@@VERSION@@'$(VERSION)'g;" \
++ -e "s'@@PLUGSTATE@@'$(PLUGSTATE)'g;" \
++ -e "s'@@CGIDIR@@'$(CGIDIR)'g;" \
++ -e "s'@@USER@@'$(USER)'g;" \
++ -e "s'@@GROUP@@'$(GROUP)'g;" \
++ -e "s'@@PLUGINUSER@@'$(PLUGINUSER)'g;" \
++ -e "s'@@GOODSH@@'$(GOODSH)'g;" \
++ -e "s'@@BASH@@'$(BASH)'g;" \
++ -e "s'@@HASSETR@@'$(HASSETR)'g;" \
++ ./master/blib/libdoc/Munin::Master::HTMLOld.3p \
+ ./master/blib/lib/Munin/Master/HTMLOld.pm \
+ ./node/blib/sbin/munin-node-configure \
+ ./node/blib/sbin/munin-node \
+@@ -466,7 +464,7 @@ install-%: %/Build
--install_path script=$(BINDIR) \
--install_path sbin=$(SBINDIR) \
--install_path bindoc=$(MANDIR)/man1 \
