Date: Tue, 21 May 2002 23:26:02 +0200 (CEST) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: SADA Kenji <sada@FreeBSD.org> Subject: ports/38391: mail/turba: fix deinstall-time trouble. Message-ID: <20020521212602.BE2CB7520@graf.pompo.net>
next in thread | raw e-mail | index | archive | help
>Number: 38391 >Category: ports >Synopsis: mail/turba: fix deinstall-time trouble. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue May 21 14:30:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Thierry Thomas >Release: FreeBSD 4.6-PRERELEASE i386 >Organization: Kabbale Eros >Environment: System: FreeBSD graf.pompo.net 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Sat May 4 07:26:38 CEST 2002 root@graf.pompo.net:/usr/obj/mntsrc/src/sys/GRAF010429 i386 >Description: mail/turba modifies /usr/local/www/horde/config/registry.php and www/horde2 couldn't be completely deinstalled. [Reported by SADA Kenji] >How-To-Repeat: Install turba, deinstall it, then deinstall www/horde2. >Fix: Remark: this PR bumps PORTREVISION for www/horde2 and mail/turba, because I had forgotten to incr it in PR ports/38261 and 38263. Pre-requisite: PR ports/38263 must be committed; then apply these patches: 1) www/horde2 (only PORTREVISION) diff -urN /usr/ports/www/horde2.orig/Makefile /usr/ports/www/horde2/Makefile --- /usr/ports/www/horde2.orig/Makefile Sat May 18 22:28:34 2002 +++ /usr/ports/www/horde2/Makefile Tue May 21 22:42:36 2002 @@ -7,6 +7,7 @@ PORTNAME= horde PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= ftp://ftp.horde.org/pub/horde/tarballs/ DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3 2) mail/turba diff -urN /usr/ports/mail/turba.orig/Makefile /usr/ports/mail/turba/Makefile --- /usr/ports/mail/turba.orig/Makefile Sun May 19 00:05:34 2002 +++ /usr/ports/mail/turba/Makefile Tue May 21 22:31:26 2002 @@ -7,6 +7,7 @@ PORTNAME= turba PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= ftp://ftp.horde.org/pub/turba/tarballs/ DISTNAME= ${PORTNAME}-${PORTVERSION}-RC3 @@ -108,10 +109,14 @@ @${CHOWN} -R www:www ${TURBADIR} @${CHMOD} -R o-rwx ${CONFDIR} @${CP} -p ${FILESDIR}/httpd.conf.turba ${HORDE_INC} - @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ + @${PERL} -pi -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ ${HORDE_INC}/httpd.conf.turba - @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.beforeTurba + @${PERL} -pi -e "s://UNCOMMENTWHENINSTTURBA::" \ ${HORDEDIR}/config/registry.php + @${CP} -p ${HORDEDIR}/config/registry.php \ + ${HORDEDIR}/config/registry.php.afterTurba .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} .for FILE in ${DOCS} diff -urN /usr/ports/mail/turba.orig/distinfo /usr/ports/mail/turba/distinfo --- /usr/ports/mail/turba.orig/distinfo Thu Jan 1 01:00:00 1970 +++ /usr/ports/mail/turba/distinfo Tue May 21 22:34:49 2002 @@ -0,0 +1 @@ +MD5 (turba-1.1-RC3.tar.gz) = b4f2cced9c830f55049897c6b5386e8b diff -urN /usr/ports/mail/turba.orig/pkg-plist /usr/ports/mail/turba/pkg-plist --- /usr/ports/mail/turba.orig/pkg-plist Sun May 19 00:23:06 2002 +++ /usr/ports/mail/turba/pkg-plist Tue May 21 22:31:05 2002 @@ -227,3 +227,4 @@ @dirrm %%TURBADIR%%/templates/wml @dirrm %%TURBADIR%%/templates @dirrm %%TURBADIR%% +@unexec if cmp -s %D/www/horde/config/registry.php %D/www/horde/config/registry.php.afterTurba; then rm -f %D/www/horde/config/registry.php.afterTurba; mv %D/www/horde/config/registry.php.beforeTurba %D/www/horde/config/registry.php; fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020521212602.BE2CB7520>