ports/50368: mail/imp3: install error if defined(WITHOUT_TURBA)

[Thierry Thomas]

>Number:         50368
>Category:       ports
>Synopsis:       mail/imp3: install error if defined(WITHOUT_TURBA)
>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:   Thu Mar 27 12:40:13 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Thierry Thomas
>Release:        FreeBSD 4.8-PRERELEASE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD graf.pompo.net 4.8-PRERELEASE FreeBSD 4.8-PRERELEASE #0: Fri Feb 28 22:45:45 CET 2003 root at graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF020727 i386


	
>Description:
	Problem reported on comp.unix.bsd.freebsd.misc (see
	Message-ID: <news:ERrga.251$%m.369385497 at news.nnrp.ca>).
	'make -DWITHOUT_TURBA install' tries to copy an unknown file.

>How-To-Repeat:
	cd /usr/ports/mail/imp3
	sudo make -DWITHOUT_TURBA install
	...
	cp: /usr/local/www/horde/turba/config/conf.php: No such file or directory
	*** Error code 1

>Fix:
	Pre-requisite: patch against 3.2.1, PR ports/48645 should have been committed.

	Please apply the following patch:


diff -urN mail/imp3.orig/Makefile mail/imp3/Makefile
--- mail/imp3.orig/Makefile	Tue Mar 11 23:05:23 2003
+++ mail/imp3/Makefile	Thu Mar 27 21:02:06 2003
@@ -74,6 +74,7 @@
 .endif
 .endif
 RUN_DEPENDS+=	${LOCALBASE}/www/horde/index.php:${PORTSDIR}/www/horde2
+NOTURBA=	"@comment "
 .else
 RUN_DEPENDS+=	${LOCALBASE}/www/horde/turba/index.php:${PORTSDIR}/mail/turba
 .endif
@@ -138,7 +139,7 @@
 LIMPDIR?=	${LHORDEDIR}/imp
 HORDESBIN?=	${PREFIX}/sbin
 
-PLIST_SUB=	HORDEDIR=${LHORDEDIR} IMPDIR=${LIMPDIR}
+PLIST_SUB=	HORDEDIR=${LHORDEDIR} IMPDIR=${LIMPDIR} TURBA=${NOTURBA}
 
 HORDEDIR=	${PREFIX}/${LHORDEDIR}
 IMPDIR=		${PREFIX}/${LIMPDIR}
@@ -248,7 +249,9 @@
 .endfor
 	@${CP} -p ${HCONFDIR}/mime_drivers.php ${HCONFDIR}/mime_drivers.php.beforeIMP3
 	@${CP} -p ${HCONFDIR}/registry.php ${HCONFDIR}/registry.php.beforeIMP3
+.if !defined(WITHOUT_TURBA)
 	@${CP} -p ${TURBADIR}/config/conf.php ${TURBADIR}/config/conf.php.beforeIMP3
+.endif
 	@${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g" ${CONFDIR}/servers.php
 	@${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${CONFDIR}/mime_drivers.php
 	@${RM} ${CONFDIR}/mime_drivers.php.beforeIMP
@@ -319,10 +322,12 @@
 	@${RM} ${CONFDIR}/conf.php.beforeIMP
 	@${MV} ${HCONFDIR}/mime_drivers.php.beforeIMP3 ${HCONFDIR}/mime_drivers.php.beforeIMP
 	@${MV} ${HCONFDIR}/registry.php.beforeIMP3 ${HCONFDIR}/registry.php.beforeIMP
-	@${MV} ${TURBADIR}/config/conf.php.beforeIMP3 ${TURBADIR}/config/conf.php.beforeIMP
 	@${CP} -p ${HCONFDIR}/mime_drivers.php ${HCONFDIR}/mime_drivers.php.afterIMP
 	@${CP} -p ${HCONFDIR}/registry.php ${HCONFDIR}/registry.php.afterIMP
+.if !defined(WITHOUT_TURBA)
+	@${MV} ${TURBADIR}/config/conf.php.beforeIMP3 ${TURBADIR}/config/conf.php.beforeIMP
 	@${CP} -p ${TURBADIR}/config/conf.php ${TURBADIR}/config/conf.php.afterIMP
+.endif
 
 post-install:
 	@${ECHO_MSG}
diff -urN mail/imp3.orig/pkg-plist mail/imp3/pkg-plist
--- mail/imp3.orig/pkg-plist	Tue Mar 11 23:06:56 2003
+++ mail/imp3/pkg-plist	Thu Mar 27 21:11:37 2003
@@ -374,4 +374,4 @@
 @dirrm %%IMPDIR%%
 @unexec if cmp -s %D/www/horde/config/mime_drivers.php %D/www/horde/config/mime_drivers.php.afterIMP; then rm -f %D/www/horde/config/mime_drivers.php.afterIMP; mv %D/www/horde/config/mime_drivers.php.beforeIMP %D/www/horde/config/mime_drivers.php; fi
 @unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterIMP; then rm -f %D/www/horde/config/registry.php.afterIMP; mv %D/www/horde/config/registry.php.beforeIMP %D/www/horde/config/registry.php; fi
- at unexec if cmp -s %D/www/horde/turba/config/conf.php %D/www/horde/turba/config/conf.php.afterIMP; then rm -f %D/www/horde/turba/config/conf.php.afterIMP; mv %D/www/horde/turba/config/conf.php.beforeIMP %D/www/horde/turba/config/conf.php; fi
+%%TURBA%%@unexec if cmp -s %D/www/horde/turba/config/conf.php %D/www/horde/turba/config/conf.php.afterIMP; then rm -f %D/www/horde/turba/config/conf.php.afterIMP; mv %D/www/horde/turba/config/conf.php.beforeIMP %D/www/horde/turba/config/conf.php; fi
>Release-Note:
>Audit-Trail:
>Unformatted: