Update to version 1.08f.

Reclaim maintainership.

4 files changed, 40 insertions, 33 deletions

diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile
index 38862589cd6e..afd12aaedc5f 100644
--- a/sysutils/msyslog/Makefile
+++ b/sysutils/msyslog/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	msyslog
-PORTVERSION=	1.07
+PORTVERSION=	1.08f
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.core-sdi.com/soft/ \
+MASTER_SITES=	http://community.corest.com/pub/msyslog/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
-DISTNAME=	${PORTNAME}-v${PORTVERSION}
+DISTNAME=	${PORTNAME}-pre_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	anders@FreeBSD.org
 
+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 .if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .endif
@@ -22,7 +23,8 @@ LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 LIB_DEPENDS+=	pq.2:${PORTSDIR}/databases/postgresql7
 .endif
 
-USE_AUTOCONF=	yes
+#USE_AUTOCONF_VER=	252 # not yet
+AUTOCONF=	${LOCALBASE}/bin/autoconf
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 .if !defined(WITH_MYSQL)
@@ -57,6 +59,9 @@ pre-patch:
 	${WRKSRC}/${f}
 .endfor
 
+pre-configure:
+	(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF})
+
 post-install:
 	${INSTALL} -d -o root -g wheel -m 0775 ${PREFIX}/share/examples/msyslog
 	${INSTALL_DATA} ${WRKSRC}/src/examples/* \
diff --git a/sysutils/msyslog/distinfo b/sysutils/msyslog/distinfo
index 0f62c5602ddf..e0bd7e364d45 100644
--- a/sysutils/msyslog/distinfo
+++ b/sysutils/msyslog/distinfo
@@ -1 +1 @@
-MD5 (msyslog-v1.07.tgz) = b32bacaeba7e8a09923453517fb12762
+MD5 (msyslog-pre_1.08f.tgz) = f0b7fca693434cd6fb8ecc649fa3fc73
diff --git a/sysutils/msyslog/files/patch-configure.in b/sysutils/msyslog/files/patch-configure.in
index 826266d9d80b..1e87ad52261e 100644
--- a/sysutils/msyslog/files/patch-configure.in
+++ b/sysutils/msyslog/files/patch-configure.in
@@ -1,31 +1,34 @@
---- configure.in.orig	Wed May 30 02:08:44 2001
-+++ configure.in	Sun Jun  3 19:50:11 2001
-@@ -57,7 +57,7 @@
- AC_DEFINE_UNQUOTED(MSYSLOG_VERSION_STR, "$MSYSLOG_VERSION")dnl
+--- configure.in.orig	Wed Nov 21 07:49:36 2001
++++ configure.in	Sat Mar 23 18:20:54 2002
+@@ -33,7 +33,7 @@
+ AC_STRUCT_TM
+ 
+ dnl Checks for library functions.
+-AC_CHECK_LIB(dl, dlopen, SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl")
++AC_CHECK_LIB(c, dlopen)dnl
+ AC_CHECK_LIB(socket, connect, SYSLOGD_LIBS="$SYSLOGD_LIBS -lsocket")
+ AC_CHECK_LIB(nsl, gethostbyname, SYSLOGD_LIBS="$SYSLOGD_LIBS -lnsl")
+ AC_DEFINE(SYSLOGD_LIBS, $SYSLOGD_LIBS)
+@@ -65,7 +65,7 @@
+ AC_DEFINE_UNQUOTED(MSYSLOG_VERSION_STR, "$MSYSLOG_VERSION")
  echo msyslog version... $MSYSLOG_VERSION
  
 -MLIBNAME="libmsyslog.so.$MSYSLOG_VERSION" ;
-+MLIBNAME="libmsyslog.so.4" ;
- AC_DEFINE_UNQUOTED(MLIBNAME_STR, "$MLIBNAME")dnl
++MLIBNAME="libmsyslog.so.1" ;
+ AC_DEFINE_UNQUOTED(MLIBNAME_STR, "$MLIBNAME")
  
  MANPAGES="syslog.conf.5 syslogd.8"
-@@ -66,12 +66,12 @@
+@@ -74,7 +74,7 @@
  then
  	prefix=$ac_default_prefix
  fi
 -AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "$prefix/lib/alat")
 +AC_DEFINE_UNQUOTED(INSTALL_LIBDIR, "$prefix/lib")
  
- dnl
- dnl Check needed libs for daemon
- dnl
--AC_CHECK_LIB(dl, dlopen, SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl")dnl
-+AC_CHECK_LIB(c, dlopen)dnl
- AC_CHECK_LIB(socket, connect, SYSLOGD_LIBS="$SYSLOGD_LIBS -lsocket")dnl
- AC_CHECK_LIB(nsl, gethostbyname, SYSLOGD_LIBS="$SYSLOGD_LIBS -lnsl")dnl
- AC_DEFINE(SYSLOGD_LIBS, $SYSLOGD_LIBS)dnl
-@@ -153,6 +153,12 @@
- 	AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "_")dnl
+ AC_MSG_CHECKING(wheter optreset is needed)
+ AC_TRY_LINK([#include <unistd.h>],
+@@ -150,6 +150,12 @@
+ 	AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "_")
  	SHARED_PARAMS="-Bshareable"
  	DCCFLAGS="-fPIC"
 +elif test "$UNAME" = "FreeBSD" ; then
@@ -35,5 +38,5 @@
 +	DCCFLAGS="-fPIC"
 +	SYSLOGD_LIBS="$SYSLOGD_LIBS -Wl,-E"
  elif test "$UNAME" = "Linux" ; then
- 	AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY | RTLD_GLOBAL)dnl
- 	AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "")dnl
+ 	AC_DEFINE(DLOPEN_FLAGS, RTLD_LAZY | RTLD_GLOBAL)
+ 	AC_DEFINE_UNQUOTED(SYMBOL_PREFIX, "")
diff --git a/sysutils/msyslog/files/patch-im_udp.c b/sysutils/msyslog/files/patch-im_udp.c
index b15b6b4da474..3dd32fb092cf 100644
--- a/sysutils/msyslog/files/patch-im_udp.c
+++ b/sysutils/msyslog/files/patch-im_udp.c
@@ -1,15 +1,14 @@
---- src/modules/im_udp.c.orig	Thu Apr 26 00:43:50 2001
-+++ src/modules/im_udp.c	Sun May 13 23:44:03 2001
-@@ -58,12 +58,6 @@
+--- src/modules/im_udp.c.orig	Sat Mar 23 18:14:04 2002
++++ src/modules/im_udp.c	Sat Mar 23 18:14:24 2002
+@@ -58,11 +58,6 @@
  #include "../modules.h"
  #include "../syslogd.h"
  
--/* recvfrom() and others like socklen_t, Irix doesn't provide it */   
+-/* recvfrom() and others like socklen_t, Irix doesn't provide it */
 -#ifndef HAVE_SOCKLEN_T
 -  typedef int socklen_t;
 -#endif
 -
--
- /*
-  * get messge
-  *
+ struct im_udp_ctx {
+ 	int	flags;
+ };