- Some "pkglint -Wall" fixes

- Make this build on Solaris 10 by checking for strcasestr (patch received
  from Andri Piik in a private mail)

6 files changed, 77 insertions, 8 deletions

diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index c3106ff9dbc..c87dc71b950 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2007/12/02 13:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2008/01/09 14:10:06 martti Exp $
 
 DISTNAME=		clamsmtp-1.8
 PKGREVISION=		3
@@ -12,11 +12,12 @@ COMMENT=		SMTP filter that allows you to check for viruses
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=		aclocal autoconf autoheader automake
 GNU_CONFIGURE=		yes
 RCD_SCRIPTS=		clamsmtpd
 
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
-FILES_SUBST+=		CLAMAV_USER=${CLAMAV_USER:Q}
+FILES_SUBST+=		CLAMAV_USER=${CLAMAV_USER}
 
 # Doesn't work with GNU pth (missing required mutex features)
 PTHREAD_OPTS+=		require native
@@ -27,7 +28,13 @@ CONF_FILES=		${EGDIR}/clamsmtpd.conf \
 
 INSTALLATION_DIRS=	share/examples/${PKGBASE}
 
-PKG_USERS_VARS+=	CLAMAV_USER
+PKG_USERS_VARS=		CLAMAV_USER
+
+pre-configure:
+	cd ${WRKSRC} && aclocal
+	cd ${WRKSRC} && autoheader
+	cd ${WRKSRC} && automake -a --foreign -i
+	cd ${WRKSRC} && autoconf
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/clamsmtpd.conf ${EGDIR}
diff --git a/mail/clamsmtp/distinfo b/mail/clamsmtp/distinfo
index 367a7694ff3..927ec3f39c8 100644
--- a/mail/clamsmtp/distinfo
+++ b/mail/clamsmtp/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.20 2006/10/27 17:37:18 xtraeme Exp $
+$NetBSD: distinfo,v 1.21 2008/01/09 14:10:06 martti Exp $
 
 SHA1 (clamsmtp-1.8.tar.gz) = ad12dce1355f5e57a7e2a216795287145a5e566a
 RMD160 (clamsmtp-1.8.tar.gz) = f80745af5628f8058d591f7f1636ae2f0a88c2f0
 Size (clamsmtp-1.8.tar.gz) = 184285 bytes
-SHA1 (patch-aa) = 4a59000b6c9ca4dfcfa37e125f620a5f674beafa
-SHA1 (patch-ab) = ec4533d12bfcd52188575deb87a1d260a92b8cbd
+SHA1 (patch-aa) = f2ae4507b333816591b0c7f49c5e4ed16e4e4f95
+SHA1 (patch-ab) = 489aae100fb380e83809a9896a36265de9a09ef9
+SHA1 (patch-ac) = 7c367fd8a2bbbc86a2c11feec31d56ae615d036a
+SHA1 (patch-ad) = cfc10685789ae19f90e3611c1492e5c8d35668db
diff --git a/mail/clamsmtp/patches/patch-aa b/mail/clamsmtp/patches/patch-aa
index 6fe62f45f04..350cdf8ea88 100644
--- a/mail/clamsmtp/patches/patch-aa
+++ b/mail/clamsmtp/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2006/04/08 21:56:56 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2008/01/09 14:10:06 martti Exp $
+
+The default clamd socket as defined in pkgsrc/mail/clamav/files/clamd.sh
 
 --- doc/clamsmtpd.conf.orig	2006-04-06 16:42:26.000000000 +0200
 +++ doc/clamsmtpd.conf
diff --git a/mail/clamsmtp/patches/patch-ab b/mail/clamsmtp/patches/patch-ab
index edc19f3918c..0ceb0969974 100644
--- a/mail/clamsmtp/patches/patch-ab
+++ b/mail/clamsmtp/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2006/08/25 06:31:00 xtraeme Exp $
+$NetBSD: patch-ab,v 1.3 2008/01/09 14:10:06 martti Exp $
+
+The default clamd socket as defined in pkgsrc/mail/clamav/files/clamd.sh
 
 --- src/clamsmtpd.c.orig	2006-08-25 08:26:44.000000000 +0200
 +++ src/clamsmtpd.c	2006-08-25 08:26:59.000000000 +0200
diff --git a/mail/clamsmtp/patches/patch-ac b/mail/clamsmtp/patches/patch-ac
new file mode 100644
index 00000000000..6bdff8259a7
--- /dev/null
+++ b/mail/clamsmtp/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2008/01/09 14:10:06 martti Exp $
+
+Check for strcasestr. We provide an implementation for it if needed.
+
+--- configure.in.orig	2007-12-31 12:16:35.544370000 +0200
++++ configure.in	2007-12-31 12:34:53.195760000 +0200
+@@ -106,7 +106,7 @@
+ # Required Functions
+ AC_CHECK_FUNCS([memset strerror malloc realloc getopt strchr tolower getaddrinfo], , 
+            [echo "ERROR: Required function missing"; exit 1])
+-AC_CHECK_FUNCS([strlwr strlcat strlcpy strncat strncpy setenv daemon])
++AC_CHECK_FUNCS([strlwr strlcat strlcpy strncat strncpy setenv daemon strcasestr])
+ AC_CHECK_FUNCS([getline getdelim flockfile])
+ 
+ # DMALLOC memory debugging
diff --git a/mail/clamsmtp/patches/patch-ad b/mail/clamsmtp/patches/patch-ad
new file mode 100644
index 00000000000..f40b5dd8c5e
--- /dev/null
+++ b/mail/clamsmtp/patches/patch-ad
@@ -0,0 +1,41 @@
+$NetBSD: patch-ad,v 1.1 2008/01/09 14:10:07 martti Exp $
+
+Check for strcasestr. We provide an implementation for it if needed.
+
+--- common/smtppass.c.orig	2006-08-30 20:45:57.000000000 +0300
++++ common/smtppass.c	2007-12-31 12:45:35.075661000 +0200
+@@ -206,6 +206,13 @@
+ static const char* get_successful_rsp(const char* line, int* cont);
+ static void do_server_noop(spctx_t* ctx);
+ 
++/*------------------------------------------------------
++ *Added to support systems without strcasestr
++ */
++#ifndef HAVE_STRCASESTR
++char *strcasestr(const char *big, const char *little);
++#endif
++ 
+ /* Used externally in some cases */
+ int sp_parse_option(const char* name, const char* option);
+ 
+@@ -2069,3 +2076,20 @@
+     return 0;
+ }        
+ 
++#ifndef HAVE_STRCASESTR
++char *strcasestr(const char *big, const char *little)
++{
++    int blen;
++    int llen;
++    blen = strlen(big);
++    llen = strlen(little);
++    while (blen >= llen) {
++        if (strncasecmp(big, little, llen) == 0)
++            return (char *)big;
++        big++;
++        blen--;
++    }
++    
++    return NULL;
++}
++#endif