Round one migration of ports from automake{19,110} to automake111

18 files changed, 62 insertions, 51 deletions

diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 1db232076503..99a0aa3bbedb 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -38,7 +38,7 @@ WRKSRC=		${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-USE_AUTOTOOLS=	autoconf:267:env automake:110:env libtool:22:env
+USE_AUTOTOOLS=	autoconf:267:env automake:111:env libtool:22:env
 
 USE_PERL5_BUILD=yes
 
diff --git a/net/jicmp/Makefile b/net/jicmp/Makefile
index 5e8bdd91767f..63304167b637 100644
--- a/net/jicmp/Makefile
+++ b/net/jicmp/Makefile
@@ -20,7 +20,6 @@ JAVA_RUN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JAVA_HOME=${JAVA_HOME}
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:19
 
 pre-everything::
 	@${ECHO_MSG}	""
diff --git a/net/jicmp/files/patch-Makefile.am b/net/jicmp/files/patch-Makefile.am
deleted file mode 100644
index adc409ddd682..000000000000
--- a/net/jicmp/files/patch-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2008-06-25 14:46:42.000000000 +0000
-+++ Makefile.am	2008-06-25 14:46:58.000000000 +0000
-@@ -67,7 +67,7 @@
- 	cd $(classdir) && \
- 	$(JAR) cvf ../$@ *
- 
--jardir=$(datadir)/java
-+jardir=$(datadir)/java/classes
- jar_DATA = jicmp.jar
- 
- deploy:
diff --git a/net/jicmp/files/patch-Makefile.in b/net/jicmp/files/patch-Makefile.in
new file mode 100644
index 000000000000..d6783b69b083
--- /dev/null
+++ b/net/jicmp/files/patch-Makefile.in
@@ -0,0 +1,7 @@
+--- Makefile.in.orig	2010-02-08 13:43:46.000000000 -0600
++++ Makefile.in	2010-10-02 18:09:59.000000000 -0500
+@@ -272,3 +272,3 @@
+ CLEANFILES = org_*.h jicmp.jar
+-jardir = $(datadir)/java
++jardir = $(datadir)/java/classes
+ jar_DATA = jicmp.jar
diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile
index 28a494e4acbd..9bcdf5897f58 100644
--- a/net/libsocket++/Makefile
+++ b/net/libsocket++/Makefile
@@ -20,7 +20,7 @@ LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	automake:19 autoconf:267 libtool:22
+USE_AUTOTOOLS=	automake:111 autoconf:267 libtool:22
 SCRIPTS_ENV+=	ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/"
 
 INFO=	socket++
diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile
index dea67aaa435c..b01a9daf0807 100644
--- a/net/mcast-tools/Makefile
+++ b/net/mcast-tools/Makefile
@@ -17,7 +17,8 @@ COMMENT=	IPv6 multicast routing daemons and tools
 MAKE_JOBS_UNSAFE=	yes
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:267
+USE_AUTOTOOLS=	automake:111 aclocal:111 autoconf:267
+AUTOMAKE_ARGS=	--add-missing
 CONFIGURE_ARGS=
 CONFIGURE_ENV=
 
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index e7430f73f5ee..0d5e5f5acec5 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -21,7 +21,7 @@ NSS_LDAP_VERSION=265
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	automake:19 aclocal:19 autoconf:267 autoheader:267
+USE_AUTOTOOLS=	automake:111 aclocal:111 autoconf:267 autoheader:267
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index ea916534efc0..96ac5b43783e 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -32,7 +32,7 @@ RUN_DEPENDS=	dot:${PORTSDIR}/graphics/graphviz \
 DBDIR?=		/var/db
 
 MAKE_JOBS_SAFE=	yes
-USE_AUTOTOOLS=	libtool:22 automake:19 autoconf:267
+USE_AUTOTOOLS=	libtool:22 automake:111 autoconf:267
 USE_GNOME=	libxml2
 USE_LUA=	5.1
 USE_GMAKE=	yes
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index d6f1c82ed091..3ea7b012d24b 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -21,7 +21,7 @@ COMMENT=	The Network Time Protocol Distribution
 LATEST_LINK=	${PORTNAME}-dev
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:110 libtool:22
+USE_AUTOTOOLS=	automake:111 libtool:22
 
 .if defined(ENABLE_RAWDCF)
 CONFIGURE_ARGS+=	--enable-RAWDCF
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index d86b964cd519..71e4f584f880 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -21,7 +21,7 @@ COMMENT=	The Network Time Protocol Distribution
 LATEST_LINK=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:110 libtool:22
+USE_AUTOTOOLS=	automake:111 libtool:22
 
 MAN1=		sntp.1 \
 		ntpd.1 \
diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile
index fbfe0dc6129d..44e8ac3c8b1a 100644
--- a/net/rabbitmq-c-devel/Makefile
+++ b/net/rabbitmq-c-devel/Makefile
@@ -29,7 +29,7 @@ USE_GMAKE=	YES
 USE_PYTHON=	YES
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
-USE_AUTOTOOLS=	aclocal:110 autoconf:267 automake:110 autoheader:267 libtool:22
+USE_AUTOTOOLS=	aclocal:111 autoconf:267 automake:111 autoheader:267 libtool:22
 AUTOMAKE_ARGS=	-i --add-missing
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 
diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile
index 0184145ec171..95dcceb745e3 100644
--- a/net/rabbitmq-c/Makefile
+++ b/net/rabbitmq-c/Makefile
@@ -28,7 +28,7 @@ USE_GMAKE=	YES
 USE_PYTHON=	YES
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
-USE_AUTOTOOLS=	aclocal:110 autoconf:267 automake:110 autoheader:267 libtool:22
+USE_AUTOTOOLS=	aclocal:111 autoconf:267 automake:111 autoheader:267 libtool:22
 AUTOMAKE_ARGS=	-i --add-missing
 ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
 
diff --git a/net/scribe/Makefile b/net/scribe/Makefile
index 3c0f09a4120a..f03d8643a6f0 100644
--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@@ -27,7 +27,7 @@ CONFIGURE_ARGS=	--with-boost-filesystem=boost_filesystem \
 		PY_PREFIX="${PREFIX}"
 PLIST_SUB+=	PYTHON_VERSION_SHORTNAME="${PYTHON_VERSION_SHORTNAME}"
 PYTHON_VERSION_SHORTNAME=	${PYTHON_VERSION:S/thon//}
-USE_AUTOTOOLS=	aclocal:19 automake:19 autoconf:267
+USE_AUTOTOOLS=	aclocal:111 automake:111 autoconf:267
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_RC_SUBR=	${PORTNAME}
diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index 5f5b5f8e1b27..8420dacfab60 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-epsilon
 MAINTAINER=	andy.lavr@gmail.com
 COMMENT=	Most SOCKS-friendly applications way with Tor
 
-USE_AUTOTOOLS=	libtool:22 aclocal:110 autoconf:267
+USE_AUTOTOOLS=	libtool:22 aclocal:111 autoconf:267
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
 
 USE_GMAKE=	yes
diff --git a/net/torsocks/files/patch-Makefile.in b/net/torsocks/files/patch-Makefile.in
index d8a54444b644..2d1fd7b0ccb1 100644
--- a/net/torsocks/files/patch-Makefile.in
+++ b/net/torsocks/files/patch-Makefile.in
@@ -1,20 +1,17 @@
---- src/Makefile.in.orig	2009-11-08 13:39:45.000000000 +0100
-+++ src/Makefile.in	2009-12-18 17:12:56.000000000 +0100
-@@ -143,7 +143,7 @@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
+--- src/Makefile.in.orig	2009-11-08 06:39:45.000000000 -0600
++++ src/Makefile.in	2010-10-02 15:56:22.000000000 -0500
+@@ -145,3 +145,3 @@
  LIBOBJS = @LIBOBJS@
 -LIBS = -ldl -lc -lresolv
 +LIBS = -lc
  LIBTOOL = @LIBTOOL@
- LIBTOOL_DEPS = @LIBTOOL_DEPS@
- LIPO = @LIPO@
-@@ -239,7 +239,7 @@
- 
- # Install configuration file
+@@ -207,3 +207,3 @@
+ install_sh = @install_sh@
+-libdir = @prefix@/lib/torsocks
++libdir = @prefix@/lib
+ libexecdir = @libexecdir@
+@@ -241,3 +241,3 @@
  usewithtorconfdir = $(CONFDIR)/
 -usewithtorconf_DATA = torsocks.conf
 +usewithtorconf_DATA = torsocks.conf.sample
  
- # Install invocation scripts
- bin_SCRIPTS = torsocks usewithtor
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 4bae2fe21631..93131de6d4b9 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	LOCAL/pav
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source Remote Desktop Protocol (RDP) server
 
-USE_AUTOTOOLS=	autoconf:267:env automake:110:env libtool:22
+USE_AUTOTOOLS=	autoconf:267:env automake:111:env libtool:22
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
 
@@ -30,27 +30,19 @@ MAN8=		xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
 SUB_FILES=	pkg-message
 
 post-patch:
-	@${REINPLACE_CMD} -e '/chmod/s|startwm.sh|startwm.sh.sample|' ${WRKSRC}/sesman/Makefile.am
-	@${REINPLACE_CMD} -e '/chmod/s|rsakeys.ini|rsakeys.ini.sample|' ${WRKSRC}/xrdp/Makefile.am
+.for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini
+	@${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample
+.endfor
 
 pre-configure:
 	@cd ${WRKSRC} && ./bootstrap
-	@${REINPLACE_CMD} -e 's|sesmansysconfdir)/$$$$f|sesmansysconfdir)/$$$$f.sample|' ${WRKSRC}/sesman/Makefile.in
-	@${REINPLACE_CMD} -e 's|xrdpsysconfdir)/$$$$f|xrdpsysconfdir)/$$$$f.sample|' ${WRKSRC}/xrdp/Makefile.in
 
 post-install:
-	@if [ ! -f ${PREFIX}/etc/xrdp/startwm.sh ]; then \
-		${CP} -p ${PREFIX}/etc/xrdp/startwm.sh.sample ${PREFIX}/etc/xrdp/startwm.sh ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/xrdp/rsakeys.ini ]; then \
-		${CP} -p ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/xrdp/sesman.ini ]; then \
-		${CP} -p ${PREFIX}/etc/xrdp/sesman.ini.sample ${PREFIX}/etc/xrdp/sesman.ini ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/xrdp/xrdp.ini ]; then \
-		${CP} -p ${PREFIX}/etc/xrdp/xrdp.ini.sample ${PREFIX}/etc/xrdp/xrdp.ini ; \
+.for f in rsakeys.ini sesman.ini startwm.sh xrdp.ini
+	@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
+		${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
 	fi
+.endfor
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/net/xrdp/files/patch-sesman__Makefile.am b/net/xrdp/files/patch-sesman__Makefile.am
new file mode 100644
index 000000000000..456fe30d0441
--- /dev/null
+++ b/net/xrdp/files/patch-sesman__Makefile.am
@@ -0,0 +1,13 @@
+--- sesman/Makefile.am.orig	2009-05-18 23:23:48.000000000 -0500
++++ sesman/Makefile.am	2010-10-02 16:07:53.000000000 -0500
+@@ -55,4 +55,4 @@
+ sesmansysconf_DATA = \
+-  sesman.ini \
+-  startwm.sh
++  sesman.ini.sample \
++  startwm.sh.sample
+ 
+@@ -66,2 +66,2 @@
+ install-data-hook:
+-	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh
++	chmod 755 $(DESTDIR)$(sysconfdir)/xrdp/startwm.sh.sample
diff --git a/net/xrdp/files/patch-xrdp__Makefile.am b/net/xrdp/files/patch-xrdp__Makefile.am
new file mode 100644
index 000000000000..d6f24f808229
--- /dev/null
+++ b/net/xrdp/files/patch-xrdp__Makefile.am
@@ -0,0 +1,13 @@
+--- xrdp/Makefile.am.orig	2009-05-18 23:23:48.000000000 -0500
++++ xrdp/Makefile.am	2010-10-02 16:05:10.000000000 -0500
+@@ -36,4 +36,4 @@
+ xrdpsysconf_DATA = \
+-  xrdp.ini \
+-  rsakeys.ini
++  xrdp.ini.sample \
++  rsakeys.ini.sample
+ 
+@@ -50,2 +50,2 @@
+ install-data-hook:
+-	chmod 600 $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini
++	chmod 600 $(DESTDIR)$(sysconfdir)/xrdp/rsakeys.ini.sample