Index: head/mail/meta1/Makefile
===================================================================
--- head/mail/meta1/Makefile	(revision 388542)
+++ head/mail/meta1/Makefile	(revision 388543)
@@ -1,170 +1,147 @@
 # $FreeBSD$
 
 PORTNAME=	meta1
 PORTVERSION=	1.1.0a.1.0
 PORTREVISION=	2
 DISTVERSION=	1.1.Alpha1.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.MeTA1.org/download/.alpha/authpar/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Secure and efficient mail gateway
 
 NOT_FOR_ARCHS=	ia64
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	smx-*
-NEED_ROOT=	yes
 MANUAL_PACKAGE_BUILD=	needs hostname
 
 .if !defined(SENDMAIL_WITHOUT_SHMEM) && !defined(BUILDING_INDEX)
 IPCCHECK!=	ipcrm -q 0 2>&1 || true
 .if ${IPCCHECK:Mimplemented}
 IGNORE=		your system does not support sysvipc
 .endif
 .endif
 
 USES=	libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-dependency-tracking
 MAKE_ENV+=	META1CONFDIR="${META1CONFDIR}"
 PORTDOCS=	README.dvi README.html README.pdf README.ps README.txt \
 		img1.png img2.png img3.png img4.png img5.png img6.png \
 		nx_grp_g.png overview1.eps overview1.gif overview1.pdf \
 		prev_g.png up_g.png pmilter.api.tex
 PLIST_SUB+=	NOLOGIN=${NOLOGIN_CMD}
 EXTRA_SBIN=	libcheck/noroot libconf/tree libmta/statit \
 		libmta/t-hostname checks/t-getgroup
-# GROUPS/USERS does not work from package
-#GROUPS=	meta1s meta1q meta1c meta1m meta1
-#USERS=		meta1s meta1q meta1c meta1m meta1
+GROUPS=		meta1s meta1q meta1c meta1m meta1
+USERS=		meta1s meta1q meta1c meta1m meta1
 
 # default config:
 META1CONFDIR?=	${PREFIX}/etc/meta1
 NOLOGIN_CMD?=	/usr/sbin/nologin
 
-OPTIONS_DEFINE=	BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS
-OPTIONS_DEFAULT=	PMILTER DKIM SASL2 TLS
+OPTIONS_DEFINE=	IPV6 BDB PMILTER DKIM MSP SASL2 SASL2AUTHD TLS DOCS
+OPTIONS_DEFAULT=	IPV6 PMILTER DKIM SASL2 TLS
 NO_OPTIONS_SORT=yes
 OPTIONS_SUB=	yes
 
 BDB_DESC=	External Berkeley DB support
 PMILTER_DESC=	Adds policy milter support
 DKIM_DESC=	Enable DKIM signing support
 MSP_DESC=	Enable mail submision program
 SASL2_DESC=	Adds SASL2 support
 SASL2AUTHD_DESC=	Enable plaintext authentication via SASL2
 
 PMILTER_CONFIGURE_ENABLE=	pmilter
 DKIM_CONFIGURE_ENABLE=	DKIM
 MSP_CONFIGURE_ENABLE=	msp
 SASL2_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 SASL2_CONFIGURE_ENABLE=	SASL
 SASL2_CONFIGURE_ON=	--with-sasl-incdir=${LOCALBASE}/include \
 			--with-sasl-libdir=${LOCALBASE}/lib
 SASL2AUTHD_RUN_DEPENDS=	${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
 TLS_CONFIGURE_ENABLE=	TLS
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MIPV6}
+MAKE_ENV+=	MTA_NETINET6=1
+.endif
+
 .if ${PORT_OPTIONS:MBDB}
 BROKEN=		port version of Berkeley DB is not compatible
 USE_BDB=	42+
 INVALID_BDB_VER=	46 47 48 5 6
 BERKELEYDB_SUFFIX=	-db${BDB_VER}
 CONFIGURE_ARGS+=	--disable-included-bdb
 CONFIGURE_ARGS+=	--with-bdb-incdir=${BDB_INCLUDE_DIR}
 CONFIGURE_ARGS+=	--with-bdb-libdir=${BDB_LIB_DIR}
 PLIST_SUB+=	WITH_BDBINT="@comment "
 .else
 BERKELEYDB_SUFFIX=	-intbdb
 PLIST_SUB+=	WITH_BDBINT=""
 .endif
 
 .if ${PORT_OPTIONS:MPMILTER}
 USE_OPENSSL=	yes
 .else
 PMILTER_SUFFIX?=	-nopmilter
 .endif
 
 .if ${PORT_OPTIONS:MMSP}
 CONFLICTS+=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-*
 .endif
 
 .if ! ${PORT_OPTIONS:MSASL2}
 SASL_SUFFIX?=	-nosasl
 .endif
 
 .if ${PORT_OPTIONS:MSASL2AUTHD}
 .if empty(PORT_OPTIONS:MSASL2)
 IGNORE=		option SASL2AUTHD needs option SASL2
 .endif
 .endif
 
 .if ! ${PORT_OPTIONS:MTLS}
 TLS_SUFFIX?=	-notls
 .endif
 
 post-configure:
 	@${CP} ${WRKSRC}/misc/sm.check.sh ${WRKSRC}/misc/sm.setup.sh \
 		${WRKDIR}/
 	@${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
 		-e 's|$${SD}/misc|${PREFIX}/bin|' \
 		-e 's|$${SD}/libcheck|${PREFIX}/sbin|' \
 		-e 's|$${SD}/libmta|${PREFIX}/sbin|' \
 		-e 's|$${SD}/checks|${PREFIX}/sbin|' \
 		${WRKDIR}/sm.check.sh
 	@${REINPLACE_CMD} -e 's|/etc/meta1|${META1CONFDIR}|g' \
-		-e 's|[.]/misc|${PREFIX}/bin|' \
+		-e 's|$${S}/misc|${PREFIX}/bin|' \
 		-e 's|$${S}/libconf|${PREFIX}/sbin|' \
-		-e 's|[.]/libmta|${PREFIX}/sbin|' \
-		-e 's|[.]/checks|${PREFIX}/sbin|' \
+		-e 's|$${S}/libmta|${PREFIX}/sbin|' \
+		-e 's|$${S}/checks|${PREFIX}/sbin|' \
 		-e 's|=mcp.sh|=${PREFIX}/etc/rc.d/meta1-mcp.sh|' \
 		${WRKDIR}/sm.setup.sh
+	@${REINPLACE_CMD} -e "/install-data-hook/d" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|^TESTS =.*|TESTS = $$(TESTP)|' \
+		${WRKSRC}/libdkim/Makefile.in
+	${CP} ${WRKSRC}/libdns/common.sh ${WRKSRC}/
 
-test:
+test:	build
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
-
-#fails on bento
-#regression-test:	test
-
-.if !defined(UID)
-UID!=	${ID} -u
-.endif
-.if ${UID} != 0
-post-build:	test
-.endif
-
-pre-install:
-	if ! pw groupshow meta1s; then pw groupadd meta1s -g 260; fi
-	if ! pw groupshow meta1q; then pw groupadd meta1q -g 261; fi
-	if ! pw groupshow meta1c; then pw groupadd meta1c -g 262; fi
-	if ! pw groupshow meta1m; then pw groupadd meta1m -g 263; fi
-	if ! pw groupshow meta1; then pw groupadd meta1 -g 264; fi
-	if ! pw usershow meta1s; then pw useradd meta1s -g meta1s -u 260 \
-		-h - -d ${NONEXISTENT} -s ${NOLOGIN_CMD} -c "MeTA1 SMTPS"; fi
-	if ! pw usershow meta1q; then pw useradd meta1q -g meta1q -u 261 \
-		-h - -d ${NONEXISTENT} -s ${NOLOGIN_CMD} -c "MeTA1 QMGR"; fi
-	if ! pw usershow meta1c; then pw useradd meta1c -g meta1c -u 262 \
-		-h - -d ${NONEXISTENT} -s ${NOLOGIN_CMD} -c "MeTA1 SMTPC"; fi
-	if ! pw usershow meta1m; then pw useradd meta1m -g meta1m -u 263 \
-		-h - -d ${NONEXISTENT} -s ${NOLOGIN_CMD} -c "MeTA1 misc"; fi
-	if ! pw usershow meta1; then pw useradd meta1 -g meta1 -u 264 \
-		-h - -d ${NONEXISTENT} -s ${NOLOGIN_CMD} -c "MeTA1 other"; fi
-	pw groupmod meta1c -m meta1s
-	pw groupmod meta1m -m meta1s,meta1q
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/sm.check.sh ${STAGEDIR}${PREFIX}/sbin/
 	${INSTALL_SCRIPT} ${WRKDIR}/sm.setup.sh ${STAGEDIR}${PREFIX}/sbin/
 .for i in ${EXTRA_SBIN}
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/meta1/pkg-message
===================================================================
--- head/mail/meta1/pkg-message	(nonexistent)
+++ head/mail/meta1/pkg-message	(revision 388543)
@@ -0,0 +1,13 @@
+---------------------------------------------------
+on first installation please run:
+
+/usr/local/sbin/sm.setup.sh
+
+---------------------------------------------------
+to clean after permanent removal please run:
+
+rm -rf /usr/local/etc/meta1 /var/spool/meta1
+pw userdel meta1s meta1q meta1c meta1m meta1
+pw groupdel meta1s meta1q
+
+---------------------------------------------------

Property changes on: head/mail/meta1/pkg-message
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+on
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/meta1/pkg-plist
===================================================================
--- head/mail/meta1/pkg-plist	(revision 388542)
+++ head/mail/meta1/pkg-plist	(revision 388543)
@@ -1,87 +1,74 @@
-@exec if ! pw groupshow meta1s 2>/dev/null; then pw groupadd meta1s -g 260; fi
-@exec if ! pw groupshow meta1q 2>/dev/null; then pw groupadd meta1q -g 261; fi
-@exec if ! pw groupshow meta1c 2>/dev/null; then pw groupadd meta1c -g 262; fi
-@exec if ! pw groupshow meta1m 2>/dev/null; then pw groupadd meta1m -g 263; fi
-@exec if ! pw groupshow meta1 2>/dev/null; then pw groupadd meta1 -g 264; fi
-@exec if ! pw usershow meta1s 2>/dev/null; then pw useradd meta1s -g meta1s -u 260 -h - -d /nonexistent -s %%NOLOGIN%% -c "MeTA1 SMTPS"; fi
-@exec if ! pw usershow meta1q 2>/dev/null; then pw useradd meta1q -g meta1q -u 261 -h - -d /nonexistent -s %%NOLOGIN%% -c "MeTA1 QMGR"; fi
-@exec if ! pw usershow meta1c 2>/dev/null; then pw useradd meta1c -g meta1c -u 262 -h - -d /nonexistent -s %%NOLOGIN%% -c "MeTA1 SMTPC"; fi
-@exec if ! pw usershow meta1m 2>/dev/null; then pw useradd meta1m -g meta1m -u 263 -h - -d /nonexistent -s %%NOLOGIN%% -c "MeTA1 misc"; fi
-@exec if ! pw usershow meta1 2>/dev/null; then pw useradd meta1 -g meta1 -u 264 -h - -d /nonexistent -s %%NOLOGIN%% -c "MeTA1 other"; fi
-@exec pw groupmod meta1c -m meta1s
-@exec pw groupmod meta1m -m meta1s,meta1q
 %%WITH_BDBINT%%bin/db_archive
 %%WITH_BDBINT%%bin/db_checkpoint
 %%WITH_BDBINT%%bin/db_deadlock
 %%WITH_BDBINT%%bin/db_dump
 %%WITH_BDBINT%%bin/db_load
 %%WITH_BDBINT%%bin/db_printlog
 %%WITH_BDBINT%%bin/db_recover
 %%WITH_BDBINT%%bin/db_stat
 %%WITH_BDBINT%%bin/db_upgrade
 %%WITH_BDBINT%%bin/db_verify
 %%WITH_BDBINT%%include/db.h
 %%WITH_BDBINT%%lib/libdb-4.3.a
 %%WITH_BDBINT%%lib/libdb.a
 bin/createmap
 bin/log2time
 bin/mailq
 bin/mailq.sh
 bin/metaconf
 bin/metaqueue
 bin/qmgrctl
 bin/qmgrctl.sh
 bin/rcvrenvfromlog.sh
 bin/runas
 bin/smconf
 include/sm/generic.h
 include/sm/error.h
 include/sm/hdrmoddef.h
 include/sm/mfapi.h
 include/sm/pmfapi.h
 include/sm/pmfdef.h
 include/sm/pmilter.h
 include/sm/smreplycodes.h
 include/sm/smmts.h
 include/sm/ssmdef.h
 lib/meta1/libcstrr.a
 lib/meta1/libevthr.a
 lib/meta1/libmtar.a
 lib/meta1/libpmilter.a
 lib/meta1/libpmutil.a
 lib/meta1/librcbcommr.a
 lib/meta1/librcbr.a
 lib/meta1/libreplr.a
 lib/meta1/librsctr.a
 lib/meta1/libthr.a
 libexec/qmgr
 libexec/smar
 libexec/smtpc
 libexec/smtps
 man/man5/meta1.conf.5.gz
 man/man8/createmap.8.gz
 man/man8/fsperf1.8.gz
 man/man8/mailq.8.gz
 man/man8/mcp.8.gz
 man/man8/milter-spamd.8.gz
 man/man8/milter-regex.8.gz
 man/man8/qmgr.8.gz
 man/man8/qmgrctl.8.gz
 man/man8/runas.8.gz
 man/man8/meta1.8.gz
 %%MSP%%man/man8/sendmail.8.gz
 man/man8/smar.8.gz
 man/man8/smtpc.8.gz
 man/man8/smtps.8.gz
 sbin/greyprint
 sbin/greyrm
 sbin/mcp
 sbin/noroot
 %%MSP%%sbin/sendmail
 sbin/sm.check.sh
 sbin/sm.setup.sh
 sbin/statit
 sbin/t-hostname
 sbin/t-getgroup
 sbin/tree
-@exec %D/sbin/sm.setup.sh