ports/50615: PR Fix (x2): mail/dovecot

[Dominic Marks]

>Number:         50615
>Category:       ports
>Synopsis:       PR Fix (x2): mail/dovecot
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 04 16:50:14 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dominic Marks
>Release:        FreeBSD 4.7-RELEASE-p3 i386
>Organization:
UMIST
>Environment:
System: FreeBSD moo.cus.org.uk 4.7-RELEASE-p3 FreeBSD 4.7-RELEASE-p3 #3: Mon Jan 20 23:49:12 GMT 2003 root at moo.cus.org.uk:/usr/obj/usr/src/sys/BAA i386

	
>Description:
	I have been sent two PRs by Kimura Fuyuki, these are:

	o ports/49026 - obsolete rc.d script update
	o ports/49027 - addition of iconv dependancy

	Additionally I like to request that files/dovecot-imapd.sh is
	repocopied (or moved, I don't suppose the cvs history is of any
	great value) if possible to files/dovecot.sh, dovecot supports
	imap and pop3 in recent versions.

	I leave bumping PORTREVISION to the disgression of the committer
	who tackles this PR. Thanks Kimura :-)

	
>How-To-Repeat:
	NA.
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.10
diff -u -3 -p -r1.10 Makefile
--- Makefile	31 Mar 2003 09:18:00 -0000	1.10
+++ Makefile	5 Apr 2003 00:40:22 -0000
@@ -13,12 +13,16 @@ MASTER_SITES=	http://dovecot.procontrol.
 MAINTAINER=	d.marks at student.umist.ac.uk
 COMMENT=	Secure and compact IMAP and POP3 servers
 
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
+
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--without-shadow --enable-ipv6 \
 		--localstatedir=/var/dovecot --with-ssl=openssl \
 		--with-ssldir=/var/dovecot/ssl --with-pop3d \
 		--with-ldap --with-pam
+CONFIGURE_ENV+=	CPPFLAGS=-I${LOCALBASE}/include \
+	LDFLAGS=-L${LOCALBASE}/lib
 
 #
 # SASL2 support
@@ -45,9 +49,12 @@ BUILD_DEPENDS+=	${VPOPMAIL}:${PORTSDIR}/
 CONFIGURE_ARGS+=	--with-vpopmail
 .endif
 
-pre-build:
+post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \
 		${WRKSRC}/dovecot-example.conf
+	@${REINPLACE_CMD} -e 's,^LIBS.*,& -liconv,' \
+		${WRKSRC}/src/imap/Makefile.in \
+		${WRKSRC}/src/pop3/Makefile.in
 
 pre-install:
 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" \
Index: files/dovecot-imapd.sh
===================================================================
RCS file: /home/ncvs/ports/mail/dovecot/files/dovecot-imapd.sh,v
retrieving revision 1.1
diff -u -3 -p -r1.1 dovecot-imapd.sh
--- files/dovecot-imapd.sh	1 Sep 2002 14:17:07 -0000	1.1
+++ files/dovecot-imapd.sh	5 Apr 2003 00:40:22 -0000
@@ -7,11 +7,11 @@ fi
 
 case "$1" in
 start)
-	[ -x ${PREFIX}/sbin/imap-master ] && \
-		${PREFIX}/sbin/imap-master && echo -n ' dovecot-imapd'
+	[ -x ${PREFIX}/sbin/dovecot ] && \
+		${PREFIX}/sbin/dovecot && echo -n ' dovecot'
 	;;
 stop)
-	/usr/bin/killall imap-master && echo -n ' dovecot-imapd'
+	/usr/bin/killall dovecot && echo -n ' dovecot'
 	;;
 *)
 	echo "Usage: `basename $0` { start | stop }" >&2

	


>Release-Note:
>Audit-Trail:
>Unformatted: