some improvement and fixes for qpopper and poppassd.

qpopper:
* add user-destdir support
* add ${QPOPPER_USER}:${QPOPPER_GROUP} to PKG_USERS, fixes PR#28807.
* honor VARBASE.
common:
* update ipv6 patch to appropriate one for base version.
* some pkglint cleanup.

Bump PKGREVISION.

7 files changed, 75 insertions, 47 deletions

diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index ec9b4011e33..075dc9485d8 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.61 2008/01/18 05:08:30 tnn Exp $
+# $NetBSD: Makefile,v 1.62 2009/12/27 14:17:37 obache Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
 PKGNAME=		qpopper-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		${QPOPPER_MASTER_SITES}
 
@@ -15,10 +15,12 @@ MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		${QPOPPER_HOMEPAGE}
 COMMENT=		Qualcomm's POP server for Eudora
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 .include "Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-apop=${QPOPPER_APOP_AUTH:Q} \
-			--enable-popuid=${QPOPPER_USER:Q} \
+			--enable-popuid=${QPOPPER_USER} \
 			--disable-update-abort --without-gdbm
 
 .include "options.mk"
@@ -27,37 +29,38 @@ QPOPPER_USER?=		pop
 QPOPPER_GROUP?=		mail
 QPOPPER_APOP_AUTH?=	${PKG_SYSCONFDIR}/apop.auth
 
-BUILD_DEFS+=		QPOPPER_APOP_AUTH
+BUILD_DEFS+=		QPOPPER_APOP_AUTH VARBASE
 PKG_GROUPS_VARS+=	QPOPPER_GROUP
 PKG_USERS_VARS+=	QPOPPER_USER
 
 .if defined(QPOPPER_SPOOL_DIR)
-CONFIGURE_ARGS+=	--enable-spool-dir=${QPOPPER_SPOOL_DIR:Q}
+CONFIGURE_ARGS+=	--enable-spool-dir=${QPOPPER_SPOOL_DIR}
 .endif
 
 RCD_SCRIPTS=		qpopper
 MESSAGE_SUBST+=		RCD_SCRIPTS=${RCD_SCRIPTS} \
 			RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
 
-PKG_USERS?=		${QPOPPER_USER}:${QPOPPER_GROUP}
-MAKE_ENV+=		BINGRP=${BINGRP:Q}
-
-SUBST_CLASSES+=		root
-SUBST_STAGE.root=	pre-configure
-SUBST_FILES.root=	Makefile.in */Makefile.in
-SUBST_SED.root=		-e 's,-o root,-o ${ROOT_USER},g'
+PKG_USERS=		${QPOPPER_USER}:${QPOPPER_GROUP}
 
 SUBST_CLASSES+=		libexec
 SUBST_STAGE.libexec=	pre-configure
 SUBST_FILES.libexec=	man/popper.8
 SUBST_SED.libexec=	-e "s|/usr/local/lib|${PREFIX}/libexec|g"
 
+SUBST_CLASSES+=		varbase
+SUBST_STAGE.varbase=	pre-configure
+SUBST_FILES.varbase=	popper/main.c
+SUBST_VARS.varbase=	VARBASE
+
+SPECIAL_PERMS+=		sbin/qpopauth ${QPOPPER_USER} ${REAL_ROOT_GROUP} 4511
+
 INSTALLATION_DIRS=	libexec ${PKGMANDIR}/man8 sbin share/doc share/examples
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/License.txt				\
-		${PREFIX}/share/doc/qpopper.License
+		${DESTDIR}${PREFIX}/share/doc/qpopper.License
 	${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config		\
-		 ${PREFIX}/share/examples
+		 ${DESTDIR}${PREFIX}/share/examples
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index ae91cbbc7fe..0a5ecd1f9d7 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.common,v 1.20 2006/10/23 08:14:02 rillig Exp $
+# $NetBSD: Makefile.common,v 1.21 2009/12/27 14:17:38 obache Exp $
+# used by mail/poppassd/Makefile
 
 QPOPPER_MASTER_SITES+=	ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
 			http://core.ring.gr.jp/archives/net/mail/qpopper/
 QPOPPER_HOMEPAGE=	http://www.eudora.com/products/unsupported/qpopper/
 QPOPPER_PATCHSITES+=	http://www.imasy.or.jp/~ume/ipv6/
-QPOPPER_PATCHFILES=	qpopper4.0.8-ipv6-20050515.diff.gz
+QPOPPER_PATCHFILES=	qpopper4.0.9-ipv6-20060626.diff.gz
 
 VERSION=		4.0.9
 QPOPPER_FAC?=		LOCAL1
 BUILD_DEFS+=		QPOPPER_FAC
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q} \
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--enable-log-facility=LOG_${QPOPPER_FAC}
 LIBS+=			${LDFLAGS}
diff --git a/mail/qpopper/distinfo b/mail/qpopper/distinfo
index d883597ac2d..5a6ec939b55 100644
--- a/mail/qpopper/distinfo
+++ b/mail/qpopper/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.16 2009/10/31 20:08:05 tnn Exp $
+$NetBSD: distinfo,v 1.17 2009/12/27 14:17:38 obache Exp $
 
+SHA1 (qpopper4.0.9-ipv6-20060626.diff.gz) = f141b8604f9d3d85369a87c3bd449e74528d97a5
+RMD160 (qpopper4.0.9-ipv6-20060626.diff.gz) = a546b435247d236536aead7909056566e0820174
+Size (qpopper4.0.9-ipv6-20060626.diff.gz) = 10986 bytes
 SHA1 (qpopper4.0.9.tar.gz) = 5629aa86d92fe10565021980882dffb733ce73d9
 RMD160 (qpopper4.0.9.tar.gz) = b48a68cd9e282bfb3d78c6b53f3dee7c97bdf77d
 Size (qpopper4.0.9.tar.gz) = 2767261 bytes
-SHA1 (qpopper4.0.8-ipv6-20050515.diff.gz) = 3ccd51fa8fb1633c34dee19e6d50351cb649a3c1
-RMD160 (qpopper4.0.8-ipv6-20050515.diff.gz) = 0ca9a8893e31933d8bf33a3cfa4d88fde511ed5e
-Size (qpopper4.0.8-ipv6-20050515.diff.gz) = 11479 bytes
-SHA1 (patch-aa) = d1f4e56dbb8eb4b7cc250ca261435ec609f14c23
+SHA1 (patch-aa) = 54cb138d4fd3fa8cc8b416b3544b1a954305bf65
 SHA1 (patch-ab) = 67d661adce74d0662cab5b644d2e57bfd1d5e3c7
 SHA1 (patch-ac) = 6df76adb260bee99eb4165f5ac8dff7a2e685a8a
 SHA1 (patch-ad) = 24fe673113eff34f896c05c0f3d71ca235219525
@@ -14,7 +14,7 @@ SHA1 (patch-ae) = 1e06159f56c78e63a7960d4d9ca80535752099b2
 SHA1 (patch-af) = a2100b026a0bab0be8c99c211ec0bd14d4405f32
 SHA1 (patch-ag) = 4b187ab978ead4b751290fe483f6d6a6bf959089
 SHA1 (patch-ah) = 22db68feb33452e53c88ce291fdac0e4789d8820
-SHA1 (patch-al) = 63fdc28b9c1d292d55464cda13c529ffb2a47b34
-SHA1 (patch-am) = fba92571d9225f8c5cacb38a4621127a19151352
+SHA1 (patch-al) = 0adad3dcbf89a867c20d804cdbc978fec01570d2
+SHA1 (patch-am) = d9c8e6ecf34e673db724aa41df061fc532abd6da
 SHA1 (patch-an) = 43e7c20b9c3cfd978255748236efbcbaf2f929ce
 SHA1 (patch-ap) = 14ad2349ba690bbdc679a24a8b96da5681af1f18
diff --git a/mail/qpopper/files/qpopper.sh b/mail/qpopper/files/qpopper.sh
index 75ebc759dbd..3dbdb58dbd7 100644
--- a/mail/qpopper/files/qpopper.sh
+++ b/mail/qpopper/files/qpopper.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: qpopper.sh,v 1.3 2004/12/19 01:33:36 grant Exp $
+# $NetBSD: qpopper.sh,v 1.4 2009/12/27 14:17:38 obache Exp $
 #
 
 # PROVIDE: qpopper
@@ -12,7 +12,7 @@
 name=qpopper
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
+pidfile="@VARBASE@/run/${name}.pid"
 extra_commands="reload"
 
 load_rc_config $name
diff --git a/mail/qpopper/patches/patch-aa b/mail/qpopper/patches/patch-aa
index 606599b0d7a..5f2f1f1d77d 100644
--- a/mail/qpopper/patches/patch-aa
+++ b/mail/qpopper/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/03/13 07:23:25 itojun Exp $
+$NetBSD: patch-aa,v 1.10 2009/12/27 14:17:38 obache Exp $
 
---- configure-	Thu Mar 13 16:16:03 2003
-+++ configure	Thu Mar 13 16:16:25 2003
-@@ -3022,13 +3022,6 @@
+--- configure.orig	2009-12-27 12:17:33.000000000 +0000
++++ configure
+@@ -3023,13 +3023,6 @@ fi
  
  
  
@@ -16,3 +16,11 @@ $NetBSD: patch-aa,v 1.9 2003/03/13 07:23:25 itojun Exp $
  if test "$GCC" = yes
  then
          echo "$as_me:$LINENO: checking for gcc version 2.7.2.3" >&5
+@@ -5132,6 +5125,7 @@ fi
+       ipv6_cv_iruserok_sa=no
+       :
+     fi
++fi
+ 
+ 
+ USE_REG_STRUCT_RET="default"
diff --git a/mail/qpopper/patches/patch-al b/mail/qpopper/patches/patch-al
index f9b04278756..bdc03b4fb7e 100644
--- a/mail/qpopper/patches/patch-al
+++ b/mail/qpopper/patches/patch-al
@@ -1,8 +1,16 @@
-$NetBSD: patch-al,v 1.1 2001/06/10 15:08:41 taca Exp $
+$NetBSD: patch-al,v 1.2 2009/12/27 14:17:38 obache Exp $
 
---- Makefile.in.orig	Mon Apr 23 07:59:14 2001
+--- Makefile.in.orig	2006-03-09 22:32:36.000000000 +0000
 +++ Makefile.in
-@@ -58,10 +58,10 @@
+@@ -26,6 +26,7 @@ MAKEFILE        =       Makefile
+ YACC            =       @YACC@
+ LEX             =       @LEX@
+ INSTALL         =       @INSTALL@
++DESTDIR		=
+ 
+ @SET_MAKE@
+ 
+@@ -58,10 +59,10 @@ popper_server: 
  	cd ${popper_dir}  && ${MAKE} all
  
  install:
@@ -10,9 +18,9 @@ $NetBSD: patch-al,v 1.1 2001/06/10 15:08:41 taca Exp $
 -	echo "Installed man/popper.8 as ${mandir}/man8/popper.8"
 -	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/
 -	echo "Installed man/popauth.8 as ${mandir}/man8/popauth.8"
-+	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popper.8 ${mandir}/man8/qpopper.8
++	${BSD_INSTALL_MAN} ${top_srcdir}/man/popper.8 ${DESTDIR}${mandir}/man8/qpopper.8
 +	@echo "Installed man/popper.8 as ${mandir}/man8/qpopper.8"
-+	${INSTALL} -m 0644 -o root ${top_srcdir}/man/popauth.8 ${mandir}/man8/qpopauth.8
++	${BSD_INSTALL_MAN} ${top_srcdir}/man/popauth.8 ${DESTDIR}${mandir}/man8/qpopauth.8
 +	@echo "Installed man/popauth.8 as ${mandir}/man8/qpopauth.8"
  	cd ${popper_dir}  && ${MAKE} install
  
diff --git a/mail/qpopper/patches/patch-am b/mail/qpopper/patches/patch-am
index 22312d98e30..82c5c76fc43 100644
--- a/mail/qpopper/patches/patch-am
+++ b/mail/qpopper/patches/patch-am
@@ -1,8 +1,16 @@
-$NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
+$NetBSD: patch-am,v 1.6 2009/12/27 14:17:38 obache Exp $
 
---- popper/Makefile.in.orig	2005-05-13 19:20:11.000000000 +0000
+--- popper/Makefile.in.orig	2006-03-09 22:32:37.000000000 +0000
 +++ popper/Makefile.in
-@@ -96,6 +96,8 @@ VPATH           =   @srcdir@
+@@ -86,6 +86,7 @@ CC              =   @CC@
+ GPERF           =   @GPERF@
+ MAKEFILE        =   Makefile
+ INSTALL         =   @INSTALL@
++DESTDIR		=
+ 
+ @SET_MAKE@
+ 
+@@ -96,6 +97,8 @@ VPATH           =   @srcdir@
  prefix          =   @prefix@
  exec_prefix     =   @exec_prefix@
  installdir      =   @sbindir@
@@ -11,7 +19,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
  
  popper_srcdir   =   ${top_srcdir}/popper
  qd_srcdir       =   ${top_srcdir}/qd
-@@ -114,17 +116,20 @@ password_dir    =   ${base_dir}/password
+@@ -114,17 +117,20 @@ password_dir    =   ${base_dir}/password
  
  
  OBJS            =   pop_dele.o pop_dropcopy.o \
@@ -35,7 +43,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
  
  SRCS            =   pop_dele.c pop_dropcopy.c \
                      pop_get_command.c pop_get_subcommand.c pop_init.c \
-@@ -132,7 +137,7 @@ SRCS            =   pop_dele.c pop_dropc
+@@ -132,7 +138,7 @@ SRCS            =   pop_dele.c pop_dropc
                      pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
                      pop_rset.c pop_send.c pop_stat.c pop_updt.c \
                      pop_user.c pop_xtnd.c pop_xmit.c popper.c \
@@ -44,7 +52,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
                      pop_rpop.c pop_apop.c md5.c pop_auth.c pop_pope.c \
                      pop_extend.c scram.c hmac.c base64.c pop_util.c \
                      get_sub_opt.c msg_ptr.c drac.c pop_config.c pop_tls.c \
-@@ -181,7 +186,7 @@ USE_PAM         =   @USE_PAM@
+@@ -181,7 +187,7 @@ USE_PAM         =   @USE_PAM@
  
  .SUFFIXES: .c .o
  
@@ -53,7 +61,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
  
  mangler_library: 
  	cd ${mmangle_dir} && ${MAKE} all
-@@ -189,13 +194,18 @@ mangler_library: 
+@@ -189,13 +195,18 @@ mangler_library: 
  common_library:
  	cd ${common_dir} && ${MAKE} all
  
@@ -75,7 +83,7 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
  		${common_dir}/libcommon.a
  
  poppassd: common_library
-@@ -206,22 +216,35 @@ poppassd: common_library
+@@ -206,22 +217,35 @@ poppassd: common_library
  	        -I${mmangle_srcdir} -I${common_srcdir} ${SSL_INC} \
  	        ${CFLAGS} ${DEFS} ${CDEFS} ${OS_DEFS} $< -o $@
  
@@ -100,13 +108,13 @@ $NetBSD: patch-am,v 1.5 2006/05/02 08:39:37 joerg Exp $
 -	if [ "x${poppassd}" != "x" ]; then \
 -	    cd ${password_dir} && ${MAKE} $@ ;\
 +install: popper popper-standalone ${pop_auth}
-+	${INSTALL} -s -m 0755 -o root popper ${libexecdir}/qpopper
++	${BSD_INSTALL_PROGRAM} popper ${DESTDIR}${libexecdir}/qpopper
 +	echo "Installed popper as ${libexecdir}/qpopper"
-+	${INSTALL} -s -m 0755 -o root popper-standalone ${sbindir}/qpopper
++	${BSD_INSTALL_PROGRAM} popper-standalone ${DESTDIR}${sbindir}/qpopper
 +	@echo "Installed standalone popper as ${sbindir}/qpopper"
 +	@if [ "x${pop_auth}" != "x" ]; then \
-+		${INSTALL} -s -m 4755 -o ${apop_uid} -g ${BINGRP} ${pop_auth} \
-+			${sbindir}/q${pop_auth}; \
++		${BSD_INSTALL_PROGRAM} ${pop_auth} \
++			${DESTDIR}${sbindir}/q${pop_auth}; \
 +		echo "Installed popauth as ${sbindir}/q${pop_auth} " \
 +			"with uid ${apop_uid}"; \
  	fi