- Unbreak: switch from courier:courier (UID/GID 62, conflicts with pf)

  to mailnull:mailnull (UID/GID 26)
  Still looking for a better solution
- Update to 0.44.0

PR:		59367
Submitted by:	Shizuka Kudo <shizukakudo_99@yahoo.com>

5 files changed, 13 insertions, 14 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 7e2cf913e4a0..99033f4ffeb9 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.42.2
+PORTVERSION=	0.44.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR=	courier
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 
-BROKEN=		Uses unregistered uid/gid, already in use by pf
-
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
 		${SITE_PERL}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 
@@ -38,10 +36,10 @@ CACHEOWN?=	pop
 MAILDROPDEFAULT?=./Maildir
 # End of user-serviceable variables
 CONFLICTS=	postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
-MAILOWN=	courier
-MAILGRP=	courier
-MAILUID=	62
-MAILGID=	62
+MAILOWN=	mailnull
+MAILGRP=	mailnull
+MAILUID=	26
+MAILGID=	26
 ETCDIR=		${PREFIX}/etc
 SYSCONFDIR=	${ETCDIR}/courier
 USERDB=		${ETCDIR}/userdb
@@ -55,8 +53,6 @@ USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
 USE_AUTOMAKE_VER=15
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
@@ -112,7 +108,7 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		WITH_SENDFAX="${WITH_SENDFAX:L}" \
 		WITH_IPV6="${WITH_IPV6:L}" \
 		WITH_TRANSPORT="${WITH_TRANSPORT}" \
-		WITH_GHOSTSCRIPT_AFPL="${WITH_GHOSTSCRIPT_AFPL:no}" \
+		WITH_GHOSTSCRIPT_AFPL="${WITH_GHOSTSCRIPT_AFPL:L}" \
 		TOUCH="${TOUCH}" \
 		MKDIR="${MKDIR}"
 
diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man
index 70c9e853373e..77809ac0a321 100644
--- a/mail/courier/Makefile.man
+++ b/mail/courier/Makefile.man
@@ -6,6 +6,7 @@ MAN1=	\
 	dot-forward.1 \
 	lockmail.1 \
 	mailbot.1 \
+	maildirkw.1 \
 	maildirmake.1 \
 	maildrop.1 \
 	mailq.1 \
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 273f05cd4c44..493e76511c7b 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1 +1 @@
-MD5 (courier-0.42.2.tar.bz2) = f607cbd949dd0fe7f138cf3b65d702f4
+MD5 (courier-0.44.0.tar.bz2) = acf6721a56f94791adf4fd7f56ba3e38
diff --git a/mail/courier/pkg-install b/mail/courier/pkg-install
index f377ef011d91..3342bb03c5d2 100644
--- a/mail/courier/pkg-install
+++ b/mail/courier/pkg-install
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.3 2002-06-08 18:54:01 ijliao Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.4 2003-12-11 14:01:59 sergei Exp $
 #
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
 
-USER=courier;	UID=62
-GROUP=courier;	GID=62
+USER=mailnull;	UID=26
+GROUP=mailnull;	GID=26
 
 ask() {
     local question default answer
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index cc8a5ff0ec03..5ed49af56812 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -37,6 +37,7 @@ bin/dotforward
 bin/imapd
 bin/lockmail
 bin/mailbot
+bin/maildirkw
 bin/maildirmake
 bin/maildrop
 bin/mailq
@@ -652,6 +653,7 @@ share/courier/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/html/lockmail.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mailbot.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildir.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildirkw.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirmake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildirquota.html
 %%PORTDOCS%%%%DOCSDIR%%/html/maildrop.README.html