[Midnightbsd-cvs] mports [24345] trunk/mail/courier-imap: update

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 17 22:38:16 EDT 2018 

Revision: 24345
          http://svnweb.midnightbsd.org/mports/?rev=24345
Author:   laffer1
Date:     2018-09-17 22:38:15 -0400 (Mon, 17 Sep 2018)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/mail/courier-imap/Makefile
    trunk/mail/courier-imap/distinfo
    trunk/mail/courier-imap/files/courier-imap-imapd-ssl.in
    trunk/mail/courier-imap/files/courier-imap-imapd.in
    trunk/mail/courier-imap/files/courier-imap-pop3d-ssl.in
    trunk/mail/courier-imap/files/courier-imap-pop3d.in
    trunk/mail/courier-imap/files/patch-Makefile.in
    trunk/mail/courier-imap/files/pkg-message.in
    trunk/mail/courier-imap/pkg-descr
    trunk/mail/courier-imap/pkg-plist

Modified: trunk/mail/courier-imap/Makefile
===================================================================
--- trunk/mail/courier-imap/Makefile	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/Makefile	2018-09-18 02:38:15 UTC (rev 24345)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.5.1
-PORTREVISION=	1
+PORTVERSION=	4.18.2
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -11,25 +10,25 @@
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 LICENSE=	gpl3
 
-BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
+		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
+LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode
 
-USES=		gmake ssl tar:bzip2
-USE_PERL5=	yes
+CONFLICTS=	courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]*
+
+USES=		compiler:c++11-lang gmake localbase:ldflags perl5 ssl tar:bzip2
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
-CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash \
-		CPPFLAGS='${CPPFLAGS}' \
-		CXXFLAGS='${CPPFLAGS}' \
-		LDFLAGS='${LDFLAGS}'
+CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
+
 MAKE_ENV:=	${CONFIGURE_ENV}
+ALL_TARGET=	all makeimapaccess makedat
 
 SUB_FILES=	pkg-message
-SUB_LIST+=	CONFDIR=${CONFDIR}
+SUB_LIST=	CONFDIR=${CONFDIR}
 
 #
 # options available:
@@ -37,10 +36,11 @@
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
-OPTIONS=	FAM		"Build in fam support for IDLE command"		off \
-		TRASHQUOTA	"Include deleted mails in the quota"		off \
-		GDBM		"Use gdbm db instead of system bdb"		off \
-		IPV6		"Build with IPv6 support"			on
+OPTIONS_DEFINE=	FAM TRASHQUOTA GDBM IPV6 GNUTLS
+FAM_DESC=	Fam support for IDLE command
+TRASHQUOTA_DESC=	Include deleted mails in the quota
+GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
+FAM_USES=	fam
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
@@ -52,8 +52,8 @@
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
+		--localstatedir="${PREFIX}/var" \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--enable-workarounds-for-imap-client-bugs \
@@ -62,93 +62,66 @@
 		--with-locking-method=fcntl \
 		COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig
 
+GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
+			libgcrypt.so:security/libgcrypt
+GNUTLS_CONFIGURE_WITH=	gnutls
+GNUTLS_USES=		pkgconfig
+
+IPV6_CONFIGURE_OFF=	--without-ipv6
+
+TRASHQUOTA_CONFIGURE_ON=--with-trashquota
+
 .include <bsd.port.pre.mk>
 
-#does not work with 4.4.0
-#.if defined(WITH_DRAC)
-# move me below .include <bsd.port.pre.mk> when re-enabling
-#PATCH_SITES=	http://www.smalltown.ne.jp/~usata/pub/patch/
-#PATCHFILES=	courier-imap-4.1.0-drac.patch
-#BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
-#.endif
-
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
-.if defined(WITH_SYSLOG_FACILITY)
+.if ${PORT_OPTIONS:MSYSLOG_FACILITY}
 CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .endif
 
-.if defined(WITH_AUTH_USERDB)
-.if defined(WITH_GDBM)
+.if ${PORT_OPTIONS:MAUTH_USERDB}
+.if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
-LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
 .endif
 
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--without-ipv6
-.endif
+EXTRA_DOCS=	AUTHORS INSTALL NEWS \
+		libs/imap/ChangeLog \
+		libs/imap/README \
+		libs/imap/README.proxy \
+		libs/maildir/README.imapkeywords.html \
+		libs/maildir/README.maildirfilter.html \
+		libs/maildir/README.maildirquota.txt \
+		libs/maildir/README.sharedfolders.txt \
+		libs/tcpd/README.couriertls \
 
-.if defined(WITH_TRASHQUOTA)
-CONFIGURE_ARGS+=--with-trashquota
-.endif
+post-patch-FAM-off:
+	@${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \
+		${WRKSRC}/libs/maildir/configure
 
-.if defined(WITH_FAM)
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS}"
-LDFLAGS+=	-L${LOCALBASE}/lib
-LIB_DEPENDS+=	fam.0:${PORTSDIR}/devel/fam
-.endif
-
-EXTRA_DOCS=	AUTHORS INSTALL NEWS imap/ChangeLog imap/README \
-		imap/README.proxy maildir/README.imapkeywords.html \
-		maildir/README.maildirfilter.html \
-		maildir/README.maildirquota.txt \
-		maildir/README.sharedfolders.txt tcpd/README.couriertls \
-
 post-patch:
-.if !defined(WITH_FAM)
-	@${REINPLACE_CMD} -e 's|$$LIBFAM||g; s|HAVE_FAM|DO_NOT_HAVE_FAM|g' \
-		${WRKSRC}/maildir/configure
-.endif
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
-		${WRKSRC}/liblock/configure
+		${WRKSRC}/libs/liblock/configure
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \
-		${WRKSRC}/imap/Makefile.in
 	@${REINPLACE_CMD} -e 's|TLS_PROTOCOL=SSL3|TLS_PROTOCOL=SSL23|g' \
-		${WRKSRC}/imap/pop3d-ssl.dist.in \
-		${WRKSRC}/imap/imapd-ssl.dist.in
+		${WRKSRC}/libs/imap/pop3d-ssl.dist.in \
+		${WRKSRC}/libs/imap/imapd-ssl.dist.in
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
-	${INSTALL_DATA} ${WRKSRC}/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
+	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
-	cd ${WRKSRC} && ( ${GMAKE} install-configure ; cd - )
-
-	@${ECHO_MSG} "In case you use authpam, you should put the following lines"
-	@${ECHO_MSG} "in your /etc/pam.d/imap"
-	@${ECHO_MSG} "auth    required    pam_unix.so         try_first_pass"
-	@${ECHO_MSG} "account required    pam_unix.so         try_first_pass"
-	@${ECHO_MSG} "session required    pam_permit.so"
-
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "You will have to run ${DATADIR}/mkimapdcert to create"
-	@${ECHO_MSG} "a self-signed certificate if you want to use imapd-ssl."
-	@${ECHO_MSG} "And you will have to copy and edit the *.dist files to *"
-	@${ECHO_MSG} "in ${CONFDIR}."
-	@${ECHO_MSG} ""
-
 .include <bsd.port.post.mk>

Modified: trunk/mail/courier-imap/distinfo
===================================================================
--- trunk/mail/courier-imap/distinfo	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/distinfo	2018-09-18 02:38:15 UTC (rev 24345)
@@ -1,4 +1,3 @@
-MD5 (courier-imap-4.5.1.tar.bz2) = 2fde05e53764d7b7e5b5a0621f424386
-SHA256 (courier-imap-4.5.1.tar.bz2) = 4faf4d6e755af9e87bead8bbbf9542369cf3151f7edc876442c918858640c6aa
-RMD160 (courier-imap-4.5.1.tar.bz2) = 2c83e9492af6105078631261f34cd22ca0d8985f
-SIZE (courier-imap-4.5.1.tar.bz2) = 3398855
+TIMESTAMP = 1507193939
+SHA256 (courier-imap-4.18.2.tar.bz2) = f66ceda3e5aa853e13f417302dfb83b312709e95f1bbcdafcd6214d76a94e79a
+SIZE (courier-imap-4.18.2.tar.bz2) = 3205230

Modified: trunk/mail/courier-imap/files/courier-imap-imapd-ssl.in
===================================================================
--- trunk/mail/courier-imap/files/courier-imap-imapd-ssl.in	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/files/courier-imap-imapd-ssl.in	2018-09-18 02:38:15 UTC (rev 24345)
@@ -15,10 +15,10 @@
 
 courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
 
-. %%RC_SUBR%%
+. /etc/rc.subr
 
 name="courier_imap_imapd_ssl"
-rcvar=`set_rcvar`
+rcvar=courier_imap_imapd_ssl_enable
 command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
 pidfile="/var/run/imapd-ssl.pid"
 procname="%%PREFIX%%/sbin/courierlogger"

Modified: trunk/mail/courier-imap/files/courier-imap-imapd.in
===================================================================
--- trunk/mail/courier-imap/files/courier-imap-imapd.in	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/files/courier-imap-imapd.in	2018-09-18 02:38:15 UTC (rev 24345)
@@ -15,10 +15,10 @@
 
 courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
 
-. %%RC_SUBR%%
+. /etc/rc.subr
 
 name="courier_imap_imapd"
-rcvar=`set_rcvar`
+rcvar=courier_imap_imapd_enable
 command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
 pidfile="/var/run/imapd.pid"
 procname="%%PREFIX%%/sbin/courierlogger"

Modified: trunk/mail/courier-imap/files/courier-imap-pop3d-ssl.in
===================================================================
--- trunk/mail/courier-imap/files/courier-imap-pop3d-ssl.in	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/files/courier-imap-pop3d-ssl.in	2018-09-18 02:38:15 UTC (rev 24345)
@@ -15,10 +15,10 @@
 
 courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
 
-. %%RC_SUBR%%
+. /etc/rc.subr
 
 name="courier_imap_pop3d_ssl"
-rcvar=`set_rcvar`
+rcvar=courier_imap_pop3d_ssl_enable
 command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
 pidfile="/var/run/pop3d-ssl.pid"
 procname="%%PREFIX%%/sbin/courierlogger"

Modified: trunk/mail/courier-imap/files/courier-imap-pop3d.in
===================================================================
--- trunk/mail/courier-imap/files/courier-imap-pop3d.in	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/files/courier-imap-pop3d.in	2018-09-18 02:38:15 UTC (rev 24345)
@@ -15,10 +15,10 @@
 
 courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
 
-. %%RC_SUBR%%
+. /etc/rc.subr
 
 name="courier_imap_pop3d"
-rcvar=`set_rcvar`
+rcvar=courier_imap_pop3d_enable
 command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
 pidfile="/var/run/pop3d.pid"
 procname="%%PREFIX%%/sbin/courierlogger"

Modified: trunk/mail/courier-imap/files/patch-Makefile.in
===================================================================
--- trunk/mail/courier-imap/files/patch-Makefile.in	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/files/patch-Makefile.in	2018-09-18 02:38:15 UTC (rev 24345)
@@ -1,8 +1,18 @@
---- Makefile.in.orig	2009-06-27 19:26:28.000000000 +0200
-+++ Makefile.in	2009-07-27 19:19:27.000000000 +0200
-@@ -307,7 +307,7 @@
- EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin COPYING.GPL \
- 	NEWS.html $(TEMPLFILES) pgpkeys.txt sysconftool
+--- Makefile.in.orig	2015-04-25 13:49:07 UTC
++++ Makefile.in
+@@ -395,8 +395,7 @@ sbin_SCRIPTS = sharedindexinstall shared
+ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
+ databindir = $(datadir)
+ databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
+-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+-	makeimapaccess makedat
++binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
+ 
+ sbinPROGRAMS = imaplogin pop3login
+ libexecPROGRAMS = makedatprog couriertcpd
+@@ -412,7 +411,7 @@ man_MANS = couriertcpd.1 deliverquota.8 
+ EXTRA_DIST = README README.cygwin COPYING.GPL NEWS.html $(TEMPLFILES) \
+ 	pgpkeys.txt sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	quotawarnmsg.example
@@ -9,7 +19,7 @@
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
  HTML2TXT = links -dump -no-numbering -no-references
-@@ -659,8 +659,8 @@
+@@ -793,8 +792,8 @@ install-man1: $(man_MANS)
  	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
  	while read files; do \
  	  test -z "$$files" || { \
@@ -20,7 +30,7 @@
  	done; }
  
  uninstall-man1:
-@@ -690,15 +690,15 @@
+@@ -829,15 +828,15 @@ install-man8: $(man_MANS)
  	sed 'N;N;s,\n, ,g' | { \
  	list=; while read file base inst; do \
  	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \

Modified: trunk/mail/courier-imap/files/pkg-message.in
===================================================================
--- trunk/mail/courier-imap/files/pkg-message.in	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/files/pkg-message.in	2018-09-18 02:38:15 UTC (rev 24345)
@@ -1,5 +1,5 @@
 In case you use authpam, you should put the following lines
-in your /etc/pam.d/imap
+in your /etc/pam.d/imap:
 
 auth    required    pam_unix.so         try_first_pass
 account required    pam_unix.so         try_first_pass
@@ -6,5 +6,6 @@
 session required    pam_permit.so
 
 You will have to run %%DATADIR%%/mkimapdcert to create
-a self-signed certificate if you want to use imapd-ssl. And you will have to
-copy and edit the *.dist files to * in %%CONFDIR%%.
+a self-signed certificate if you want to use imapd-ssl.
+And you will have to copy and edit the *.dist files to *
+in %%CONFDIR%%.

Modified: trunk/mail/courier-imap/pkg-descr
===================================================================
--- trunk/mail/courier-imap/pkg-descr	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/pkg-descr	2018-09-18 02:38:15 UTC (rev 24345)
@@ -16,4 +16,4 @@
      * Virtual mailbox support.
      * Pop3 daemon.
 
-WWW:	http://www.courier-mta.org/imap/
+WWW: http://www.courier-mta.org/imap/

Modified: trunk/mail/courier-imap/pkg-plist
===================================================================
--- trunk/mail/courier-imap/pkg-plist	2018-09-18 02:35:56 UTC (rev 24344)
+++ trunk/mail/courier-imap/pkg-plist	2018-09-18 02:38:15 UTC (rev 24345)
@@ -4,23 +4,25 @@
 bin/maildiracl
 bin/maildirkw
 bin/maildirmake
+bin/makedat
+bin/makeimapaccess
 bin/pop3d
- at unexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi
+ at preunexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi
 %%CONFDIR%%/imapd-ssl.dist
- at exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd-ssl.dist
- at unexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd-ssl.dist
+ at preunexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi
 %%CONFDIR%%/imapd.cnf.dist
- at unexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi
+ at preunexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi
 %%CONFDIR%%/imapd.dist
- at exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd.dist
- at unexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd.dist
+ at preunexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi
 %%CONFDIR%%/pop3d-ssl.dist
- at exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d-ssl.dist
- at unexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d-ssl.dist
+ at preunexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi
 %%CONFDIR%%/pop3d.cnf.dist
- at unexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi
+ at preunexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi
 %%CONFDIR%%/pop3d.dist
- at exec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist
+ at postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist
 %%CONFDIR%%/quotawarnmsg.example
 %%LIBEXECDIR%%/couriertcpd
 %%LIBEXECDIR%%/imapd-ssl.rc
@@ -28,12 +30,24 @@
 %%LIBEXECDIR%%/makedatprog
 %%LIBEXECDIR%%/pop3d-ssl.rc
 %%LIBEXECDIR%%/pop3d.rc
+man/man1/couriertcpd.1.gz
+man/man1/maildiracl.1.gz
+man/man1/maildirkw.1.gz
+man/man1/maildirmake.1.gz
+man/man8/deliverquota.8.gz
+man/man8/imapd.8.gz
+man/man8/mkdhparams.8.gz
+man/man8/mkimapdcert.8.gz
+man/man8/makeimapaccess.8.gz
+man/man8/mkpop3dcert.8.gz
 sbin/imaplogin
+sbin/mkdhparams
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3login
 sbin/sharedindexinstall
 sbin/sharedindexsplit
+share/courier-imap/mkdhparams
 share/courier-imap/mkimapdcert
 share/courier-imap/mkpop3dcert
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
@@ -47,13 +61,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.couriertls
- at exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared
- at exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared.tmp
- at dirrmtry var
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm share/courier-imap
- at dirrmtry %%LIBEXECDIR%%/authlib
- at dirrm %%LIBEXECDIR%%
- at dirrm %%CONFDIR%%/shared
- at dirrm %%CONFDIR%%/shared.tmp
- at dirrmtry %%CONFDIR%%
+ at dir %%ETCDIR%%/imapaccess
+ at dir var
+ at dir %%CONFDIR%%/shared
+ at dir %%CONFDIR%%/shared.tmp

More information about the Midnightbsd-cvs mailing list