- update to 1.0.Beta0.0

- use STAGEDIR
- preserve users and groups

3 files changed, 25 insertions, 24 deletions

diff --git a/mail/meta1/Makefile b/mail/meta1/Makefile
index 8c661f18aba6..2b8fad6d993f 100644
--- a/mail/meta1/Makefile
+++ b/mail/meta1/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	meta1
-PORTVERSION=	1.0.0a.22.0
-DISTVERSION=	1.0.Alpha22.0
+PORTVERSION=	1.0.0b.0.0
+DISTVERSION=	1.0.Beta0.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	http://www.MeTA1.org/download/.alpha/hybrid/
+MASTER_SITES=	http://www.MeTA1.org/download/.beta/proto/
 PKGNAMESUFFIX?=	${TLS_SUFFIX}${SASL_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
@@ -14,7 +14,6 @@ NOT_FOR_ARCHS=	ia64
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	smx-*
 NEED_ROOT=	yes
-NO_STAGE=	yes
 
 .if !defined(SENDMAIL_WITHOUT_SHMEM) && !defined(BUILDING_INDEX)
 IPCCHECK!=	ipcrm -q 0 2>&1 || true
@@ -29,10 +28,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-dependency-tracking
 MAKE_ENV+=	META1CONFDIR="${META1CONFDIR}"
-MAN5=		meta1.conf.5
-MAN8=		createmap.8 fsperf1.8 mailq.8 mcp.8 milter-spamd.8 \
-		milter-regex.8 qmgr.8 qmgrctl.8 runas.8 meta1.8 \
-		smar.8 smtpc.8 smtps.8
 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 \
@@ -92,7 +87,6 @@ PMILTER_SUFFIX?=	-nopmilter
 .endif
 
 .if ${PORT_OPTIONS:MMSP}
-MAN8+=	sendmail.8
 CONFLICTS+=	courier-0.* postfix-1.* postfix-2.* smail-3.* zmailer-2.* opensmtpd-* sendmail-*
 .endif
 
@@ -163,19 +157,16 @@ pre-install:
 		-h - -d ${NONEXISTENT} -s ${NOLOGIN_CMD} -c "MeTA1 other"; fi
 	pw groupmod meta1c -m meta1s
 	pw groupmod meta1m -m meta1s,meta1q
-.if !defined(BATCH)
-	cd ${WRKSRC} && ${SH} ./misc/sm.setup.sh
-.endif
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/sm.check.sh ${PREFIX}/sbin/
-	${INSTALL_SCRIPT} ${WRKDIR}/sm.setup.sh ${PREFIX}/sbin/
+	${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} ${PREFIX}/sbin/
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin/
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/meta1/distinfo b/mail/meta1/distinfo
index e5afde9f19c4..5b6af5a9c23d 100644
--- a/mail/meta1/distinfo
+++ b/mail/meta1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meta1-1.0.Alpha22.0.tar.gz) = 44f5ddaf43acd219b8fc3971bc8e5144f537cec0c9aca8349b82f099879e80e4
-SIZE (meta1-1.0.Alpha22.0.tar.gz) = 4919663
+SHA256 (meta1-1.0.Beta0.0.tar.gz) = 594ca15d70c57191aa4c50d731488802c34f2a327a830959a2b42f165c4a6066
+SIZE (meta1-1.0.Beta0.0.tar.gz) = 4920202
diff --git a/mail/meta1/pkg-plist b/mail/meta1/pkg-plist
index c2c34921b283..d71e98ca1880 100644
--- a/mail/meta1/pkg-plist
+++ b/mail/meta1/pkg-plist
@@ -10,11 +10,6 @@
 @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
-@unexec if pw usershow meta1s; then pw userdel meta1s; fi
-@unexec if pw usershow meta1q; then pw userdel meta1q; fi
-@unexec if pw usershow meta1c; then pw userdel meta1c; fi
-@unexec if pw usershow meta1m; then pw userdel meta1m; fi
-@unexec if pw usershow meta1; then pw userdel meta1; fi
 %%WITH_BDBINT%%bin/db_archive
 %%WITH_BDBINT%%bin/db_checkpoint
 %%WITH_BDBINT%%bin/db_deadlock
@@ -63,6 +58,21 @@ 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