From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Mar 29 09:50:16 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D742416A400 for ; Wed, 29 Mar 2006 09:50:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B74D43D49 for ; Wed, 29 Mar 2006 09:50:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k2T9oFOY068498 for ; Wed, 29 Mar 2006 09:50:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k2T9oF90068491; Wed, 29 Mar 2006 09:50:15 GMT (envelope-from gnats) Resent-Date: Wed, 29 Mar 2006 09:50:15 GMT Resent-Message-Id: <200603290950.k2T9oF90068491@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Artis Caune Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E5B116A42D for ; Wed, 29 Mar 2006 09:45:01 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 05DB943D45 for ; Wed, 29 Mar 2006 09:45:01 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k2T9j0fN028523 for ; Wed, 29 Mar 2006 09:45:00 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k2T9j0jB028521; Wed, 29 Mar 2006 09:45:00 GMT (envelope-from nobody) Message-Id: <200603290945.k2T9j0jB028521@www.freebsd.org> Date: Wed, 29 Mar 2006 09:45:00 GMT From: Artis Caune To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: ports/95070: [PATCH] mail/courier-imap - copy config files && @dirrm X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2006 09:50:17 -0000 >Number: 95070 >Category: ports >Synopsis: [PATCH] mail/courier-imap - copy config files && @dirrm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Mar 29 09:50:14 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Artis Caune >Release: 6.0 >Organization: >Environment: >Description: pkg_delete: file '/usr/local/etc/courier-imap/shared' doesn't exist pkg_delete: unable to completely remove directory '/usr/local/etc/courier-imap/shared' pkg_delete: file '/usr/local/etc/courier-imap/shared.tmp' doesn't exist pkg_delete: unable to completely remove directory '/usr/local/etc/courier-imap/shared.tmp' >How-To-Repeat: >Fix: *** pkg-plist.orig Mon Jan 23 12:26:45 2006 --- pkg-plist Wed Mar 29 10:46:56 2006 *************** *** 7,22 **** --- 7,26 ---- bin/pop3d @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 + @exec [ ! -f %D/%%CONFDIR%%/imapd-ssl ] && cp -p %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl @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 + @exec [ ! -f %D/%%CONFDIR%%/imapd ] && cp -p %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd-ssl @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 + @exec [ ! -f %D/%%CONFDIR%%/pop3d-ssl ] && cp -p %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl @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 + @exec [ ! -f %D/%%CONFDIR%%/pop3d ] && cp -p %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d %%CONFDIR%%/quotawarnmsg.example %%RCDIR%%/courier-imap-imapd.sh %%RCDIR%%/courier-imap-imapd-ssl.sh *************** *** 52,57 **** @dirrm share/courier-imap @dirrmtry %%LIBEXECDIR%%/authlib @dirrm %%LIBEXECDIR%% ! @dirrm %%CONFDIR%%/shared ! @dirrm %%CONFDIR%%/shared.tmp @dirrmtry %%CONFDIR%% --- 56,61 ---- @dirrm share/courier-imap @dirrmtry %%LIBEXECDIR%%/authlib @dirrm %%LIBEXECDIR%% ! @dirrmtry %%CONFDIR%%/shared ! @dirrmtry %%CONFDIR%%/shared.tmp @dirrmtry %%CONFDIR%% >Release-Note: >Audit-Trail: >Unformatted: