diff options
author | Ade Lovett <ade@FreeBSD.org> | 2010-10-07 15:18:56 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2010-10-07 15:18:56 +0000 |
commit | 231b6073decfcdbad451c9aeb05ae4fd0afacf71 (patch) | |
tree | 99fb67c0ee20a7f10c47ce9d6dbe0313ac92aaef /net-mgmt/coovachilli/files | |
parent | Backout accidental change. (diff) |
Migration of final set of working ports from automake{19,110} -> 111
Notes
Notes:
svn path=/head/; revision=262565
Diffstat (limited to 'net-mgmt/coovachilli/files')
-rw-r--r-- | net-mgmt/coovachilli/files/patch-conf_Makefile.am | 32 | ||||
-rw-r--r-- | net-mgmt/coovachilli/files/patch-www_Makefile.am | 11 | ||||
-rw-r--r-- | net-mgmt/coovachilli/files/patch-www_Makefile.in | 7 |
3 files changed, 7 insertions, 43 deletions
diff --git a/net-mgmt/coovachilli/files/patch-conf_Makefile.am b/net-mgmt/coovachilli/files/patch-conf_Makefile.am deleted file mode 100644 index 1d743f6b775e..000000000000 --- a/net-mgmt/coovachilli/files/patch-conf_Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ ---- conf/Makefile.am.orig 2007-08-20 15:05:54.000000000 +0100 -+++ conf/Makefile.am 2008-06-18 01:17:58.000000000 +0100 -@@ -6,15 +6,11 @@ - chilli_SCRIPTS = functions up.sh down.sh - chilli_DATA = defaults - --initdir = $(sysconfdir)/init.d --init_SCRIPTS = chilli -- --EXTRA_DIST = $(init_SCRIPTS:=.in) \ -+EXTRA_DIST = \ - $(chilli_SCRIPTS:=.in) chilli.conf.in defaults.in - - edit = sed \ - -e 's,@SBINDIR\@,$(sbindir),g' \ -- -e 's,@INITDIR\@,$(initrddir),g' \ - -e 's,@VARRUN\@,$(localstatedir)/run,g' \ - -e 's,@ETCCHILLI\@,$(sysconfdir)/chilli,g' \ - -e 's,@SYSCONFDIR\@,$(sysconfdir),g' \ -@@ -35,12 +31,6 @@ - $(edit) down.sh.in >down.sh.tmp - mv down.sh.tmp down.sh - --chilli: Makefile chilli.in -- rm -f chilli chilli.tmp -- $(edit) chilli.in >chilli.tmp -- chmod +x chilli.tmp -- mv chilli.tmp chilli -- - chilli.conf: Makefile chilli.conf.in - rm -f chilli.conf chilli.conf.tmp - $(edit) chilli.conf.in >chilli.conf.tmp diff --git a/net-mgmt/coovachilli/files/patch-www_Makefile.am b/net-mgmt/coovachilli/files/patch-www_Makefile.am deleted file mode 100644 index 6cbfd9970d29..000000000000 --- a/net-mgmt/coovachilli/files/patch-www_Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- www/Makefile.am.orig 2008-06-29 17:44:26.000000000 +0000 -+++ www/Makefile.am 2008-06-29 17:44:48.000000000 +0000 -@@ -3,7 +3,7 @@ - chillidir = $(sysconfdir)/chilli - chilli_SCRIPTS = wwwsh - --wwwdir = $(chillidir)/www -+wwwdir = $(prefix)/www/chilli - - wwwDATAFILES = \ - chillijs.chi chillijs.chi.sh chilliform.chi chilliform.chi.sh \ diff --git a/net-mgmt/coovachilli/files/patch-www_Makefile.in b/net-mgmt/coovachilli/files/patch-www_Makefile.in new file mode 100644 index 000000000000..f5714fd1df1b --- /dev/null +++ b/net-mgmt/coovachilli/files/patch-www_Makefile.in @@ -0,0 +1,7 @@ +--- www/Makefile.in.orig 2008-06-07 23:49:10.000000000 -0500 ++++ www/Makefile.in 2010-10-07 09:08:25.000000000 -0500 +@@ -160,3 +160,3 @@ + chilli_SCRIPTS = wwwsh +-wwwdir = $(chillidir)/www ++wwwdir = $(prefix)/www/chilli + wwwDATAFILES = \ |