Changes 5.4.3:

* gpglib/configure.in: Use "gpg2" if "gpg" is not found.
* sqwebmail.spec.in: Use gnugp2 as a requirement if gnupg is not
  installed. Replace vixie-cron with cronie as a listed req.

6 files changed, 41 insertions, 41 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index e2c7f64c601..866638b2630 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.66 2010/11/05 14:21:19 adam Exp $
+# $NetBSD: Makefile,v 1.67 2010/11/10 10:52:46 adam Exp $
 
-DISTNAME=	sqwebmail-5.4.2
+DISTNAME=	sqwebmail-5.4.3
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,10 +38,10 @@ SQWEBMAIL_CALENDARDIR=	${SQWEBMAIL_STATEDIR}/calendar
 SQWEBMAIL_IMAGEDIR=	${PREFIX}/share/courier/sqwebmail/images
 SQWEBMAIL_IMAGEURL?=	/sqwebmail
 BUILD_DEFS+=		SQWEBMAIL_IMAGEURL
-FILES_SUBST+=		SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR:Q}
-FILES_SUBST+=		SQWEBMAIL_CACHEDIR=${SQWEBMAIL_CACHEDIR:Q}
-FILES_SUBST+=		SQWEBMAIL_CALENDARDIR=${SQWEBMAIL_CALENDARDIR:Q}
-FILES_SUBST+=		ROOT_USER=${REAL_ROOT_USER:Q}
+FILES_SUBST+=		SQWEBMAIL_STATEDIR=${SQWEBMAIL_STATEDIR}
+FILES_SUBST+=		SQWEBMAIL_CACHEDIR=${SQWEBMAIL_CACHEDIR}
+FILES_SUBST+=		SQWEBMAIL_CALENDARDIR=${SQWEBMAIL_CALENDARDIR}
+FILES_SUBST+=		ROOT_USER=${REAL_ROOT_USER}
 MESSAGE_SUBST+=		IMAGEDIR=${SQWEBMAIL_IMAGEDIR}
 MESSAGE_SUBST+=		IMAGEURL=${SQWEBMAIL_IMAGEURL}
 
@@ -51,26 +51,26 @@ MIME_TYPES=		${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types
 # This is used by the sqwebmail configure script to set the location of
 # the sqwebmaild socket file and lockfile.
 #
-CONFIGURE_ARGS+=	--localstatedir=${SQWEBMAIL_STATEDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${SQWEBMAIL_STATEDIR}
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/courier
 CONFIGURE_ARGS+=	--program-transform-name='s/\.rc$$//'
 
-CONFIGURE_ARGS+=	--enable-cgibindir=${LIBEXECDIR:Q}/webmail
+CONFIGURE_ARGS+=	--enable-cgibindir=${LIBEXECDIR}/webmail
 CONFIGURE_ARGS+=	--enable-https=auto
-CONFIGURE_ARGS+=	--enable-imagedir=${SQWEBMAIL_IMAGEDIR:Q}
+CONFIGURE_ARGS+=	--enable-imagedir=${SQWEBMAIL_IMAGEDIR}
 CONFIGURE_ARGS+=	--enable-imageurl=${SQWEBMAIL_IMAGEURL:Q}
 CONFIGURE_ARGS+=	--enable-mimetypes=${MIME_TYPES:Q}
-CONFIGURE_ARGS+=	--with-cachedir=${SQWEBMAIL_CACHEDIR:Q}
-CONFIGURE_ARGS+=	--with-cacheowner=${REAL_ROOT_USER:Q}
-CONFIGURE_ARGS+=	--with-calendardir=${SQWEBMAIL_CALENDARDIR:Q}
+CONFIGURE_ARGS+=	--with-cachedir=${SQWEBMAIL_CACHEDIR}
+CONFIGURE_ARGS+=	--with-cacheowner=${REAL_ROOT_USER}
+CONFIGURE_ARGS+=	--with-calendardir=${SQWEBMAIL_CALENDARDIR}
 CONFIGURE_ARGS+=	--with-ispell="${PREFIX}/bin/ispell"
 CONFIGURE_ARGS+=	--with-mailer="${SENDMAIL} -oi -t"
-CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP:Q}
-CONFIGURE_ARGS+=	--with-piddir=${COURIER_STATEDIR:Q}/tmp
+CONFIGURE_ARGS+=	--with-mailgroup=${COURIER_GROUP}
+CONFIGURE_ARGS+=	--with-piddir=${COURIER_STATEDIR}/tmp
 
-CONFIGURE_ENV+=		GZIP=${TOOLS_PATH.gzip:Q}
-CONFIGURE_ENV+=		GPG=${PREFIX:Q}/bin/gpg
+CONFIGURE_ENV+=		GZIP=${TOOLS_PATH.gzip}
+CONFIGURE_ENV+=		GPG=${PREFIX}/bin/gpg
 
 REQD_DIRS+=		${DATADIR} ${DOCDIR} ${EGDIR} ${LIBEXECDIR}
 REQD_DIRS_PERMS+=	${LIBEXECDIR}/webmail				\
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 2f92f240dd3..066f3b7a4d9 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2010/11/05 14:21:19 adam Exp $
+$NetBSD: distinfo,v 1.23 2010/11/10 10:52:46 adam Exp $
 
-SHA1 (sqwebmail-5.4.2.tar.bz2) = 8d07fcb587e1cb8c39b3a5124d66ec389cc8db3e
-RMD160 (sqwebmail-5.4.2.tar.bz2) = 6bbf679430ec93b388595f996492a8791b424703
-Size (sqwebmail-5.4.2.tar.bz2) = 3939375 bytes
-SHA1 (patch-aa) = 4b0e0aec5c8b63d09309f137dc2c49a401d57483
-SHA1 (patch-ad) = 486883ae1924d2184f3ac8862decbabfc11334f3
-SHA1 (patch-ah) = 988c5825294ce78e8f4305d131a34c8eddd710f7
+SHA1 (sqwebmail-5.4.3.tar.bz2) = 651d3f880eed382ad88c782e8af83a08e76ae328
+RMD160 (sqwebmail-5.4.3.tar.bz2) = ebad2b458e8ab929a82c5277a2a9304477e4422b
+Size (sqwebmail-5.4.3.tar.bz2) = 4045464 bytes
+SHA1 (patch-aa) = 2e2320737a693843a94d5da89273e67823152093
+SHA1 (patch-ad) = 30dfbc3e0e05748ad60a75bf2c46a0fa658781e9
+SHA1 (patch-ah) = 7dc2fcb609fcfe2b69c79c8a34413022571ef5e2
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
 SHA1 (patch-aj) = 195ff33119c1991bac32282f2d9a5d15dc00b0d8
-SHA1 (patch-am) = 5b8b5da12c66034c48f7324d959e5ee66d492f22
+SHA1 (patch-am) = 84fc1f8c3ca047a6f4795cb9d88544cb31a49ea2
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index d699633121e..ca4e77e1e7a 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2010/06/15 23:18:13 pettai Exp $
+$NetBSD: patch-aa,v 1.11 2010/11/10 10:52:47 adam Exp $
 
---- Makefile.in.orig	Sat Sep 29 14:52:57 2007
+--- Makefile.in.orig	2010-11-07 18:41:57.000000000 +0000
 +++ Makefile.in
 @@ -283,18 +283,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
  
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.10 2010/06/15 23:18:13 pettai Exp $
  @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index2.html
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -975,6 +976,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
+@@ -976,6 +977,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
  sqwebmaild.dist: sqwebmail/sqwebmaild.dist
  	cp sqwebmail/sqwebmaild.dist .
  
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.10 2010/06/15 23:18:13 pettai Exp $
  pcpd: pcp/pcpd
  	cp pcp/pcpd .
  
-@@ -1010,7 +1014,7 @@ install-exec-local:
+@@ -1011,7 +1015,7 @@ install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(cgibindir)
  	test -w $(DESTDIR)$(cgibindir) || exit 0; \
  		$(INSTALL_PROGRAM) sqwebmail/sqwebmail \
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
index 1e02bbac023..1935235befc 100644
--- a/mail/sqwebmail/patches/patch-ad
+++ b/mail/sqwebmail/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.11 2010/06/15 23:18:13 pettai Exp $
+$NetBSD: patch-ad,v 1.12 2010/11/10 10:52:47 adam Exp $
 
---- sqwebmail/Makefile.in.orig	Sat Sep 29 14:53:23 2007
+--- sqwebmail/Makefile.in.orig	2010-11-07 18:42:06.000000000 +0000
 +++ sqwebmail/Makefile.in
-@@ -1143,7 +1143,7 @@ install-perms-local: install-perms-cache
+@@ -1144,7 +1144,7 @@ install-perms-local: install-perms-cache
  
  htmllibdir.h: config.status
  	echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.11 2010/06/15 23:18:13 pettai Exp $
  	echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
  	echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
  	echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -1151,7 +1151,7 @@ htmllibdir.h: config.status
+@@ -1152,7 +1152,7 @@ htmllibdir.h: config.status
  	echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
  	echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
  	echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.11 2010/06/15 23:18:13 pettai Exp $
  		; then \
  		echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
  		; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1188,9 +1188,6 @@ install-perms-cache:
+@@ -1189,9 +1189,6 @@ install-perms-cache:
  	@echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
  
  cache-reminder:
diff --git a/mail/sqwebmail/patches/patch-ah b/mail/sqwebmail/patches/patch-ah
index 669c433f98f..53c844b007e 100644
--- a/mail/sqwebmail/patches/patch-ah
+++ b/mail/sqwebmail/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.7 2010/06/15 23:18:13 pettai Exp $
+$NetBSD: patch-ah,v 1.8 2010/11/10 10:52:47 adam Exp $
 
---- sqwebmail/configure.orig	Sat Sep 29 14:53:22 2007
+--- sqwebmail/configure.orig	2010-11-07 18:42:06.000000000 +0000
 +++ sqwebmail/configure
-@@ -12502,7 +12502,7 @@ fi
+@@ -11712,7 +11712,7 @@ fi
  
  
  
diff --git a/mail/sqwebmail/patches/patch-am b/mail/sqwebmail/patches/patch-am
index 95e16d23923..dfce4e1b947 100644
--- a/mail/sqwebmail/patches/patch-am
+++ b/mail/sqwebmail/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2010/06/15 23:18:13 pettai Exp $
+$NetBSD: patch-am,v 1.4 2010/11/10 10:52:47 adam Exp $
 
---- pcp/configure.orig	2010-03-21 01:56:14.000000000 +0100
-+++ pcp/configure	2010-06-11 00:59:42.000000000 +0200
-@@ -21456,14 +21456,15 @@ LIBS="$saveLIBS"
+--- pcp/configure.orig	2010-11-07 14:50:39.000000000 +0000
++++ pcp/configure
+@@ -17258,14 +17258,15 @@ LIBS="$saveLIBS"
  echo $NETLIBS >pcp.libs
  
  
@@ -19,4 +19,4 @@ $NetBSD: patch-am,v 1.3 2010/06/15 23:18:13 pettai Exp $
 +SENDIT="$sysconfdir/sendit.sh"
  
  
- { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5