*** 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%%