diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile index afc1bb001f2b..51686ccde3e4 100644 --- a/net/libsocket++/Makefile +++ b/net/libsocket++/Makefile @@ -17,9 +17,9 @@ COMMENT= A C++ wrapper library to the sockets GNU_CONFIGURE= yes INSTALLS_SHLIB= yes -USE_AUTOMAKE_VER= 15 -USE_AUTOCONF_VER= 253 -USE_INC_LIBTOOL_VER= 13 +USE_AUTOMAKE_VER= 19 +USE_AUTOCONF_VER= 259 +USE_INC_LIBTOOL_VER= 15 INFO= socket++ diff --git a/net/libsocket++/files/patch-autogen b/net/libsocket++/files/patch-autogen index 92c1c0e3de07..02e62475c4f8 100644 --- a/net/libsocket++/files/patch-autogen +++ b/net/libsocket++/files/patch-autogen @@ -3,7 +3,7 @@ @@ -14,12 +14,12 @@ else - libtoolize --automake -+ libtoolize13 --automake ++ ${LIBTOOLIZE} --automake fi echo "aclocal..." -aclocal diff --git a/news/newscache/Makefile b/news/newscache/Makefile index e014cfb281e6..9c10a8781f15 100644 --- a/news/newscache/Makefile +++ b/news/newscache/Makefile @@ -17,8 +17,9 @@ COMMENT= NewsCache is a free cache server for USENET News LIB_DEPENDS= socket[+][+].1:${PORTSDIR}/net/libsocket++ -USE_AUTOMAKE_VER= 15 -USE_AUTOHEADER_VER= 253 +USE_AUTOMAKE_VER= 19 +USE_AUTOHEADER_VER= 259 +USE_AUTOCONF_VER= 259 USE_GETOPT_LONG= yes USE_REINPLACE= yes AUTOMAKE_ARGS= --add-missing @@ -34,6 +35,6 @@ post-patch: ${REINPLACE_CMD} -e "s,-pedantic,," ${WRKSRC}/configure.in pre-configure: - cd ${WRKSRC}; ${ACLOCAL} + (cd ${WRKSRC}; ${SETENV} ${SCRIPTS_ENV} ${SH} ./autogen) .include diff --git a/news/newscache/files/patch-autogen b/news/newscache/files/patch-autogen new file mode 100644 index 000000000000..4d53145373f9 --- /dev/null +++ b/news/newscache/files/patch-autogen @@ -0,0 +1,20 @@ +--- autogen.orig Sat Nov 23 12:33:52 2002 ++++ autogen Sun Jun 5 00:44:04 2005 +@@ -9,13 +9,13 @@ + fi + + echo "aclocal..." +-aclocal ++${ACLOCAL} + echo "autoheader..." +-autoheader ++${AUTOHEADER} + echo "automake..." +-automake --add-missing ++${AUTOMAKE} --add-missing + echo "autoconf..." +-autoconf ++${AUTOCONF} + + echo "Next run ./configure" + echo "Next run make"