- Update Makefile along with qpopper/Makefile.common.

- Introduce poppassd own options.mk.

No functional change to poppassd pkgsrc itself and this should fix
poppassd build problem reported by Martti Kuparinen on tech-pkg@.

mail/poppassd/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 21:00:39 adrianp Exp $
+# $NetBSD: Makefile,v 1.17 2005/06/13 16:57:02 taca Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -6,6 +6,10 @@ PKGNAME=		poppassd-${VERSION}
 CATEGORIES=		mail
 MASTER_SITES=		${QPOPPER_MASTER_SITES}
 
+PATCH_SITES=		${QPOPPER_PATCHSITES}
+PATCHFILES=		${QPOPPER_PATCHFILES}
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=		mellon@fugue.com
 HOMEPAGE=		${QPOPPER_HOMEPAGE}
 COMMENT=		Qualcomm's password change server mainly for Eudora
@@ -16,6 +20,8 @@ CONFIGURE_ARGS+=	--enable-poppassd
 CONFIGURE_ENV+=	CDEFS='-DSMBPASSWD_BINARY=\"${LOCALBASE}/bin/smbpasswd\"'
 MAKE_ENV+=	ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
 
+.include "options.mk"
+
 do-build:
 .for DIR in common password
 	cd ${WRKSRC}/${DIR}; ${SETENV} ${MAKE_ENV}			\

mail/poppassd/options.mk

@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2005/06/13 16:57:02 taca Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.poppassd
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ENV+=		O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif