DragonFly BSD
DragonFly submit List (threaded) for 2005-02
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

dfports/mail/courier-imap upgrade


From: "Erik P. Skaalerud" <erik@xxxxxxxxxxxx>
Date: Tue, 01 Feb 2005 07:15:22 +0100

Hi!

Attached is patch to sync dfports/mail/courier-imap against the one FreeBSD has in ports.

(Compiled and installed fine.)

- Erik
diff -ruN mail/courier-imap.org/Makefile mail/courier-imap/Makefile
--- mail/courier-imap.org/Makefile	2004-10-12 18:01:37.000000000 +0200
+++ mail/courier-imap/Makefile	2005-02-01 07:08:02.000000000 +0100
@@ -2,32 +2,37 @@
 # Date created:		19 Feb 2000
 # Whom:			Neil Blakey-Milner
 #
-# $FreeBSD: ports/mail/courier-imap/Makefile,v 1.82 2004/07/20 21:11:17 oliver Exp $
-# $DragonFly: dfports/mail/courier-imap/Makefile,v 1.3 2004/10/12 16:01:37 eirikn Exp $
+# $FreeBSD: ports/mail/courier-imap/Makefile,v 1.90 2005/01/28 16:17:44 oliver Exp $
+# $DragonFly$
 #
 
 PORTNAME=	courier-imap
-PORTVERSION=	3.0.7
+PORTVERSION=	4.0.1
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
+MAINTAINER=	kernel@xxxxxxxxxxxxxxxx
+COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib
+RUN_DEPENDS=	${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib
+
 .if defined(WITH_DRAC)
+BROKEN=		DRAC support doesn't work with 4.0.0 right now
 PATCH_SITES=	http://www.smalltown.ne.jp/~usata/pub/patch/
 PATCHFILES=	courier-imap-3.0.6-drac.patch
 PATCH_DIST_STRIP=	-p1
 .endif
 
-MAINTAINER=	oliver@xxxxxxxxxxx
-COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_RC_SUBR=	yes
 
 CONFIGURE_ENV=	CFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
@@ -38,13 +43,6 @@
 # options available:
 #
 # WITHOUT_OPENSSL:		Don't build in TLS support
-# WITHOUT_PAM:			Don't build in PAM support
-# WITHOUT_AUTHDAEMON		Don't build the authdaemon
-# WITH_CRAM:			Build in CRAM-MD5 authentication support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
 # WITH_FAM:			Build in fam support for IDLE command
 # WITH_DRAC:			Build in DRAC support
 # WITH_TRASHQUOTA:		Include deleted mails in the quota
@@ -56,23 +54,13 @@
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
 
-VPOPMAILDIR?=	${LOCALBASE}/vpopmail
-
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		RCDIR=${RCDIR:S,^${PREFIX}/,,} \
 		USERDB=${USERDB:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
-.if !defined(WITHOUT_OPENSSL)
-USE_OPENSSL=	YES
-PLIST_SUB+=	OPENSSLFLAG=
-.else
-PLIST_SUB+=	OPENSSLFLAG="@comment "
-.endif
-
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--without-authshadow \
-		--sysconfdir=${CONFDIR} \
+CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--with-userdb=${USERDB} \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
@@ -92,71 +80,18 @@
 CONFIGURE_ARGS+=	--with-db=db
 .endif
 
-.if !defined(WITH_VPOPMAIL)
-CONFIGURE_ARGS+=--without-authvchkpw
-PLIST_SUB+=	VPOPMAILFLAG="@comment "
+.if !defined(WITHOUT_OPENSSL)
+USE_OPENSSL=	YES
+PLIST_SUB+=	OPENSSLFLAG=
 .else
-CONFIGURE_ARGS+=--with-authvchkpw
-BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-PLIST_SUB+=	VPOPMAILFLAG=""
+PLIST_SUB+=	OPENSSLFLAG="@comment "
 .endif
 
 .if defined(WITH_TRASHQUOTA)
 CONFIGURE_ARGS+=--with-trashquota
 .endif
 
-.if defined(WITH_LDAP)
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=--with-authldap
-PLIST_SUB+=	LDAPFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authldap
-PLIST_SUB+=	LDAPFLAG="@comment "
-.endif
-
-.if !defined(WITH_MYSQL)
-CONFIGURE_ARGS+=--without-authmysql
-PLIST_SUB+=	MYSQLFLAG="@comment "
-.else
-USE_MYSQL=	YES
-PLIST_SUB+=	MYSQLFLAG=""
-CONFIGURE_ARGS+=--with-authmysql \
-		--with-mysql-libs=${LOCALBASE}/lib/mysql \
-		--with-mysql-includes=${LOCALBASE}/include/mysql
-.endif
-
-.if !defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=--without-authpgsql
-PLIST_SUB+=	PGSQLFLAG="@comment "
-.else
-POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-PLIST_SUB+=	PGSQLFLAG=""
-.endif
-
-.if !defined(WITHOUT_AUTHDAEMON)
-CONFIGURE_ARGS+=--with-authdaemon
-PLIST_SUB+=	AUTHDFLAG=""
-.else
-CONFIGURE_ARGS+=--without-authdaemon
-PLIST_SUB+=	AUTHDFLAG="@comment "
-.endif
-
-.if !defined(WITHOUT_PAM)
-CONFIGURE_ARGS+=--with-authpam
-PLIST_SUB+=	PAMFLAG="" PWDFLAG="@comment "
-.else
-CONFIGURE_ARGS+=--without-authpam
-PLIST_SUB+=	PAMFLAG="@comment " PWDFLAG=""
-.endif
-
-.if !defined(WITH_CRAM)
-CONFIGURE_ARGS+=--without-authcram
-.else
-CONFIGURE_ARGS+=--with-authcram
-.endif
-
-.include <bsd.dfport.pre.mk>
+RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 .if defined(WITH_FAM) || exists(${LOCALBASE}/lib/libfam.so)
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -170,43 +105,35 @@
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac
 .endif
 
-MAN1=		courierlogger.1 couriertcpd.1 maildiracl.1 maildirkw.1 \
+MAN1=		couriertcpd.1 maildiracl.1 maildirkw.1 \
 		maildirmake.1
-MAN7=		authlib.7
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8 \
-		deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8
-
-MLINKS=		authlib.7 authpwd.7 \
-		authlib.7 authuserdb.7 \
-		authlib.7 authshadow.7 \
-		authlib.7 authpam.7 \
-		authlib.7 authvchkpw.7 \
-		authlib.7 authcram.7 \
-		authlib.7 authldap.7 \
-		authlib.7 authmysql.7 \
-		authlib.7 authdaemon.7 \
-		authlib.7 authdaemond.7 \
-		makeuserdb.8 pw2userdb.8 \
-		makeuserdb.8 vchkpw2userdb.8
 
-EXTRA_DOCS=	README INSTALL AUTHORS imap/ChangeLog
+MAN8=		deliverquota.8 imapd.8 mkimapdcert.8 mkpop3dcert.8
+
+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:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/liblock/configure
-	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/authlib/configure
-	@${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \
-		${WRKSRC}/authlib/installlist.in
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/authlib/Makefile.in
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \
+		${WRKSRC}/imap/Makefile.in
+
+.include <bsd.dfport.pre.mk>
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/authlib/authtest ${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/imap/${i}.cnf ${CONFDIR}/${i}.cnf.dist
-	${LN} -s ${LIBEXECDIR}/${i}.rc ${RCDIR}/${PORTNAME}-${i}.sh.sample
-	${LN} -s ${LIBEXECDIR}/${i}-ssl.rc ${RCDIR}/${PORTNAME}-${i}-ssl.sh.sample
+.endfor
+.for i in imapd imapd-ssl pop3d pop3d-ssl
+	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/courier-imap-${i}.sh > ${WRKDIR}/courier-imap-${i}.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/courier-imap-${i}.sh ${RCDIR}/courier-imap-${i}.sh
 .endfor
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
@@ -214,23 +141,27 @@
 	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
 .endfor
 .endif
-	@${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} ""
+
+	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.conf or /etc/pam.d/imap"
+.if ${OSVERSION} >= 500000
+	@${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"
+.else
+	@${ECHO_MSG} "in your /etc/pam.conf"
 	@${ECHO_MSG} "imap    auth    required    pam_unix.so         try_first_pass"
 	@${ECHO_MSG} "imap    account required    pam_unix.so         try_first_pass"
 	@${ECHO_MSG} "imap    session required    pam_permit.so"
+.endif
+
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "In case you are upgrading an existing Installation, you need to run"
-	@${ECHO_MSG} "'make install-configure' to update your old configuration files."
+	@${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} ""
 
-install-configure:
-	cd ${WRKSRC} && ${GMAKE} install-configure
-
 .include <bsd.dfport.post.mk>
diff -ruN mail/courier-imap.org/distinfo mail/courier-imap/distinfo
--- mail/courier-imap.org/distinfo	2004-10-12 18:01:37.000000000 +0200
+++ mail/courier-imap/distinfo	2005-02-01 06:58:45.000000000 +0100
@@ -1,4 +1,2 @@
-MD5 (courier-imap-3.0.7.tar.bz2) = 3177f4451d02b6380c5b45aa80d795a7
-SIZE(courier-imap-3.0.7.tar.bz2) = 1702769
-MD5 (courier-imap-3.0.6-drac.patch) = f369ea8f9d26012e6ae1220f12c07fff
-SIZE (courier-imap-3.0.6-drac.patch) = 10538
+MD5 (courier-imap-4.0.1.tar.bz2) = f8578d1a3d04ffdb99c75b550dd190a7
+SIZE(courier-imap-4.0.1.tar.bz2) = 3032350
diff -ruN mail/courier-imap.org/files/courier-imap-imapd-ssl.sh mail/courier-imap/files/courier-imap-imapd-ssl.sh
--- mail/courier-imap.org/files/courier-imap-imapd-ssl.sh	1970-01-01 01:00:00.000000000 +0100
+++ mail/courier-imap/files/courier-imap-imapd-ssl.sh	2005-02-01 06:58:45.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
+
+# PROVIDE: courier_imap_imapd_ssl
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_imapd_ssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapd_ssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapd_ssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
+pidfile="/var/run/imapd-ssl.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
+
+start_cmd="imapd_ssl_cmd start"
+stop_cmd="imapd_ssl_cmd stop"
+restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start"
+
+load_rc_config $name
+
+imapd_ssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff -ruN mail/courier-imap.org/files/courier-imap-imapd.sh mail/courier-imap/files/courier-imap-imapd.sh
--- mail/courier-imap.org/files/courier-imap-imapd.sh	1970-01-01 01:00:00.000000000 +0100
+++ mail/courier-imap/files/courier-imap-imapd.sh	2005-02-01 06:58:45.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's IMAP service.
+
+# PROVIDE: courier_imap_imapd
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_imapd_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_imapd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_imapd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
+pidfile="/var/run/imapd.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
+
+start_cmd="imapd_cmd start"
+stop_cmd="imapd_cmd stop"
+restart_cmd="imapd_cmd stop && imapd_cmd start"
+
+load_rc_config $name
+
+imapd_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff -ruN mail/courier-imap.org/files/courier-imap-pop3d-ssl.sh mail/courier-imap/files/courier-imap-pop3d-ssl.sh
--- mail/courier-imap.org/files/courier-imap-pop3d-ssl.sh	1970-01-01 01:00:00.000000000 +0100
+++ mail/courier-imap/files/courier-imap-pop3d-ssl.sh	2005-02-01 06:58:45.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
+
+# PROVIDE: courier_imap_pop3d_ssl
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_pop3d_ssl_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3d_ssl
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3d_ssl"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
+pidfile="/var/run/pop3d-ssl.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
+
+start_cmd="pop3d_ssl_cmd start"
+stop_cmd="pop3d_ssl_cmd stop"
+restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start"
+
+load_rc_config $name
+
+pop3d_ssl_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff -ruN mail/courier-imap.org/files/courier-imap-pop3d.sh mail/courier-imap/files/courier-imap-pop3d.sh
--- mail/courier-imap.org/files/courier-imap-pop3d.sh	1970-01-01 01:00:00.000000000 +0100
+++ mail/courier-imap/files/courier-imap-pop3d.sh	2005-02-01 06:58:45.000000000 +0100
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# An rc.subr-style startup script for Courier-IMAP's POP3 service.
+
+# PROVIDE: courier_imap_pop3d
+# REQUIRE: LOGIN courier_authdaemond
+# KEYWORD: FreeBSD shutdown
+
+# Define these courier_imap_pop3d_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/courier_imap_pop3d
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="courier_imap_pop3d"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
+pidfile="/var/run/pop3d.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
+
+start_cmd="pop3d_cmd start"
+stop_cmd="pop3d_cmd stop"
+restart_cmd="pop3d_cmd stop && pop3d_cmd start"
+
+load_rc_config $name
+
+pop3d_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		;;
+	esac
+}
+
+run_rc_command "$1"
+
diff -ruN mail/courier-imap.org/files/patch-Makefile.in mail/courier-imap/files/patch-Makefile.in
--- mail/courier-imap.org/files/patch-Makefile.in	2004-07-23 08:15:44.000000000 +0200
+++ mail/courier-imap/files/patch-Makefile.in	2005-02-01 06:58:45.000000000 +0100
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Jul 20 01:54:19 2004
-+++ Makefile.in	Tue Jul 20 19:31:37 2004
-@@ -218,7 +218,7 @@
+--- Makefile.in.orig	Thu Dec  9 03:07:01 2004
++++ Makefile.in	Sun Jan  2 21:17:35 2005
+@@ -248,7 +248,7 @@
  	COPYING.GPL NEWS.html $(TEMPLFILES)\
  sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
@@ -9,7 +9,7 @@
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
  HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
-@@ -433,8 +433,8 @@
+@@ -506,8 +506,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -20,7 +20,7 @@
  	done
  uninstall-man1:
  	@$(NORMAL_UNINSTALL)
-@@ -478,8 +478,8 @@
+@@ -551,8 +551,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -31,11 +31,3 @@
  	done
  uninstall-man8:
  	@$(NORMAL_UNINSTALL)
-@@ -1055,6 +1055,7 @@
- 
- install-data-local: install-man
- 	for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
-+		continue ; \
- 		test "$$f" = "authpam" || continue ; \
- 		test -d $(DESTDIR)/etc/pam.d || continue ; \
- 		test -w $(DESTDIR)/etc/pam.d || continue ; \
diff -ruN mail/courier-imap.org/files/patch-authlib::Makefile.in mail/courier-imap/files/patch-authlib::Makefile.in
--- mail/courier-imap.org/files/patch-authlib::Makefile.in	2004-07-12 05:16:34.000000000 +0200
+++ mail/courier-imap/files/patch-authlib::Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- authlib/Makefile.in.orig	Sun Jul 20 12:01:18 2003
-+++ authlib/Makefile.in	Sun Jul 20 12:56:12 2003
-@@ -1341,7 +1341,7 @@
- 	$(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
- 	for f in $(man_MANS) "" ; do \
- 		test "$$f" = "" && continue ; \
--		$(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \
-+		%%INSTALL_MAN%% $$f $(DESTDIR)$(man7dir) ; done ; \
- 	cd $(DESTDIR)$(man7dir) || exit 1 ; \
- 		for f in $(man_LINKS) "" ; do \
- 			test "$$f" = "" && continue ; \
diff -ruN mail/courier-imap.org/files/patch-ldap mail/courier-imap/files/patch-ldap
--- mail/courier-imap.org/files/patch-ldap	2004-07-12 05:16:34.000000000 +0200
+++ mail/courier-imap/files/patch-ldap	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- authlib/configure.orig	Wed Mar  3 05:54:13 2004
-+++ authlib/configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff -ruN mail/courier-imap.org/files/patch-mysql mail/courier-imap/files/patch-mysql
--- mail/courier-imap.org/files/patch-mysql	2004-07-23 08:15:44.000000000 +0200
+++ mail/courier-imap/files/patch-mysql	1970-01-01 01:00:00.000000000 +0100
@@ -1,182 +0,0 @@
---- authlib/configure.orig	Tue Jul 20 19:37:46 2004
-+++ authlib/configure	Tue Jul 20 19:37:22 2004
-@@ -7337,9 +7337,9 @@
- if test "$doauthmysql" = ""
- then
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -7348,12 +7348,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -7363,7 +7363,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -7372,14 +7372,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -7388,7 +7388,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -7415,19 +7415,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   doauthmysql="yes"
- 
- fi
-@@ -7537,9 +7537,9 @@
- else
- 	saveLIBS="$LIBS"
- 	LIBS="$MYSQL_LIBS $LIBS"
--	echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -7548,12 +7548,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
-    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
- 
- /* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.
-     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-     <limits.h> exists even on freestanding compilers.  */
- 
-@@ -7563,7 +7563,7 @@
- # include <assert.h>
- #endif
- 
--#undef mysql_connect
-+#undef mysql_real_connect
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
- #ifdef __cplusplus
-@@ -7572,14 +7572,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
-     to always fail with ENOSYS.  Some functions are actually named
-     something starting with __ and the normal name is an alias.  */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -7588,7 +7588,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
-   ;
-   return 0;
- }
-@@ -7615,19 +7615,19 @@
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_func_mysql_connect=yes
-+  ac_cv_func_mysql_real_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
-   AUTHMYSQL="authmysql${EXEEXT}"
- 		HAVE_AUTHMYSQL=1
- else
diff -ruN mail/courier-imap.org/pkg-descr mail/courier-imap/pkg-descr
--- mail/courier-imap.org/pkg-descr	2004-07-12 05:16:34.000000000 +0200
+++ mail/courier-imap/pkg-descr	2005-02-01 06:58:45.000000000 +0100
@@ -16,4 +16,4 @@
      * Virtual mailbox support.
      * Pop3 daemon.
 
-WWW:	http://www.inter7.com/courierimap/
+WWW:	http://www.courier-mta.org/imap/
diff -ruN mail/courier-imap.org/pkg-plist mail/courier-imap/pkg-plist
--- mail/courier-imap.org/pkg-plist	2004-07-12 05:16:34.000000000 +0200
+++ mail/courier-imap/pkg-plist	2005-02-01 06:58:45.000000000 +0100
@@ -1,4 +1,3 @@
-bin/authtest
 %%OPENSSLFLAG%%bin/couriertls
 bin/deliverquota
 bin/imapd
@@ -6,69 +5,53 @@
 bin/maildirkw
 bin/maildirmake
 bin/pop3d
-%%AUTHDFLAG%%%%CONFDIR%%/authdaemonrc.dist
-%%LDAPFLAG%%%%CONFDIR%%/authldaprc.dist
-%%MYSQLFLAG%%%%CONFDIR%%/authmysqlrc.dist
-%%PGSQLFLAG%%%%CONFDIR%%/authpgsqlrc.dist
+@unexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi
 %%CONFDIR%%/imapd-ssl.dist
+@unexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi
 %%CONFDIR%%/imapd.cnf.dist
+@unexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi
 %%CONFDIR%%/imapd.dist
+@unexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi
 %%CONFDIR%%/pop3d-ssl.dist
+@unexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi
 %%CONFDIR%%/pop3d.cnf.dist
+@unexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi
 %%CONFDIR%%/pop3d.dist
 %%CONFDIR%%/quotawarnmsg.example
-%%RCDIR%%/courier-imap-imapd.sh.sample
-%%RCDIR%%/courier-imap-imapd-ssl.sh.sample
-%%RCDIR%%/courier-imap-pop3d.sh.sample
-%%RCDIR%%/courier-imap-pop3d-ssl.sh.sample
-%%LIBEXECDIR%%/authlib/authcustom
-%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemon
-%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond
-%%LDAPFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.ldap
-%%LDAPFLAG%%%%LIBEXECDIR%%/authlib/authldap
-%%MYSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.mysql
-%%MYSQLFLAG%%%%LIBEXECDIR%%/authlib/authmysql
-%%PGSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.pgsql
-%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.plain
-%%PAMFLAG%%%%LIBEXECDIR%%/authlib/authpam
-%%PWDFLAG%%%%LIBEXECDIR%%/authlib/authpwd
-%%LIBEXECDIR%%/authlib/authuserdb
-%%VPOPMAILFLAG%%%%LIBEXECDIR%%/authlib/authvchkpw
+%%RCDIR%%/courier-imap-imapd.sh
+%%RCDIR%%/courier-imap-imapd-ssl.sh
+%%RCDIR%%/courier-imap-pop3d.sh
+%%RCDIR%%/courier-imap-pop3d-ssl.sh
 %%LIBEXECDIR%%/couriertcpd
 %%LIBEXECDIR%%/imapd-ssl.rc
 %%LIBEXECDIR%%/imapd.rc
 %%LIBEXECDIR%%/makedatprog
 %%LIBEXECDIR%%/pop3d-ssl.rc
 %%LIBEXECDIR%%/pop3d.rc
-sbin/authenumerate
-sbin/courierlogger
 sbin/imaplogin
-sbin/makeuserdb
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3login
-sbin/pw2userdb
 sbin/sharedindexinstall
 sbin/sharedindexsplit
-sbin/userdb
-sbin/userdbpw
-sbin/vchkpw2userdb
-share/courier-imap/makeuserdb
 share/courier-imap/mkimapdcert
 share/courier-imap/mkpop3dcert
-share/courier-imap/pw2userdb
-share/courier-imap/userdb
-share/courier-imap/vchkpw2userdb
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/README
-%%AUTHDFLAG%%@dirrm var/authdaemon
-@dirrm var
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.proxy
+%%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.couriertls
+@unexec rmdir %D/var 2>/dev/null || true
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/courier-imap
-@dirrm %%LIBEXECDIR%%/authlib
+@unexec rmdir %D/%%LIBEXECDIR%%/authlib 2>/dev/null || true
 @dirrm %%LIBEXECDIR%%
 @dirrm %%CONFDIR%%/shared
 @dirrm %%CONFDIR%%/shared.tmp
-@dirrm %%CONFDIR%%
+@unexec rmdir %D/%%CONFDIR%% 2>/dev/null || true


[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]