Migration of final set of working ports from automake{19,110} -> 111

6 files changed, 11 insertions, 47 deletions

diff --git a/net-mgmt/coovachilli/Makefile b/net-mgmt/coovachilli/Makefile
index 45dd0b6044db..c801589b762f 100644
--- a/net-mgmt/coovachilli/Makefile
+++ b/net-mgmt/coovachilli/Makefile
@@ -25,9 +25,9 @@ MAN8=		chilli.8
 
 CONFIGURE_ARGS=-localstatedir=/var
 GNU_CONFIGURE=	yes
+USE_PERL5_BUILD=yes		# for manual page building
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	coovachilli
-USE_AUTOTOOLS=	automake:19
 
 post-install:
 .if !defined(NOPORTEXAMPLES)
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 = \
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 8ad395202b6c..dec9ae482882 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -16,7 +16,7 @@ COMMENT=	TorK is an Anonymity Manager for the KDE Desktop
 
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:22 aclocal:110:env
+USE_AUTOTOOLS=	libtool:22 aclocal:111:env
 USE_GETTEXT=	yes
 USE_XORG=	xext
 USE_LDCONFIG=	yes
diff --git a/net-mgmt/tork/files/patch-aclocal.m4 b/net-mgmt/tork/files/patch-aclocal.m4
index 9722a1a5a221..f97b697f37e3 100644
--- a/net-mgmt/tork/files/patch-aclocal.m4
+++ b/net-mgmt/tork/files/patch-aclocal.m4
@@ -3,10 +3,10 @@
 @@ -23,3 +23,3 @@
  # generated from the m4 files accompanying Automake X.Y.
 -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.10"])
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.11"])
  
 @@ -30,3 +30,3 @@
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -	 [AM_AUTOMAKE_VERSION([1.9.6])])
-+	 [AM_AUTOMAKE_VERSION([1.10.3])])
++	 [AM_AUTOMAKE_VERSION([1.11.1])])