From a710cb2a841b10452d5918394c23e1fc4d652b07 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 8 Mar 2013 16:24:39 +0000 Subject: [PATCH] Remove CVS ID so that patch applies properly. --- sysutils/ruby-puppet/2/Makefile | 9 ++++++++- .../2/patches/patch-examples_etc_puppet_fileserver_conf | 9 ++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sysutils/ruby-puppet/2/Makefile b/sysutils/ruby-puppet/2/Makefile index d28c5063a63..479d009fd61 100644 --- a/sysutils/ruby-puppet/2/Makefile +++ b/sysutils/ruby-puppet/2/Makefile @@ -1,8 +1,15 @@ -# $OpenBSD: Makefile,v 1.3 2013/03/08 16:19:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2013/03/08 16:24:39 ajacoutot Exp $ VERSION= 2.7.20 REVISION= 1 +# remove CVS ID +post-extract: + @sed '1d' ${WRKSRC}/examples/etc/puppet/fileserver.conf > \ + ${WRKSRC}/examples/etc/puppet/fileserver.conf.bak + @mv ${WRKSRC}/examples/etc/puppet/fileserver.conf.bak \ + ${WRKSRC}/examples/etc/puppet/fileserver.conf + post-install: ${INSTALL_DATA} ${WRKSRC}/examples/etc/puppet/{fileserver,puppet,tagmail}.conf \ ${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-puppet diff --git a/sysutils/ruby-puppet/2/patches/patch-examples_etc_puppet_fileserver_conf b/sysutils/ruby-puppet/2/patches/patch-examples_etc_puppet_fileserver_conf index 733c5f26fb6..941f1bedb0d 100644 --- a/sysutils/ruby-puppet/2/patches/patch-examples_etc_puppet_fileserver_conf +++ b/sysutils/ruby-puppet/2/patches/patch-examples_etc_puppet_fileserver_conf @@ -1,8 +1,7 @@ -$OpenBSD: patch-examples_etc_puppet_fileserver_conf,v 1.2 2013/03/08 16:19:15 ajacoutot Exp $ ---- examples/etc/puppet/fileserver.conf.orig Thu Oct 18 18:52:08 2012 -+++ examples/etc/puppet/fileserver.conf Fri Mar 8 17:15:41 2013 -@@ -1,13 +1,41 @@ --# $Id: patch-examples_etc_puppet_fileserver_conf,v 1.2 2013/03/08 16:19:15 ajacoutot Exp $ +$OpenBSD: patch-examples_etc_puppet_fileserver_conf,v 1.3 2013/03/08 16:24:39 ajacoutot Exp $ +--- examples/etc/puppet/fileserver.conf.orig Fri Mar 8 17:23:12 2013 ++++ examples/etc/puppet/fileserver.conf Fri Mar 8 17:23:15 2013 +@@ -1,12 +1,41 @@ +# fileserver.conf -[dist]