From 80ae0dd54462aa6f4eb746f3d5f196e299cfbb8e Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 26 Oct 2004 18:48:07 +0000
Subject: [PATCH] kill one more INSTALL/DEINSTALL

---
 x11/xfce4/desktop/xfce-utils/pkg/DEINSTALL | 24 --------
 x11/xfce4/desktop/xfce-utils/pkg/INSTALL   | 65 ----------------------
 x11/xfce4/desktop/xfce-utils/pkg/PLIST     |  4 +-
 3 files changed, 3 insertions(+), 90 deletions(-)
 delete mode 100644 x11/xfce4/desktop/xfce-utils/pkg/DEINSTALL
 delete mode 100644 x11/xfce4/desktop/xfce-utils/pkg/INSTALL

diff --git a/x11/xfce4/desktop/xfce-utils/pkg/DEINSTALL b/x11/xfce4/desktop/xfce-utils/pkg/DEINSTALL
deleted file mode 100644
index 91767c381da..00000000000
--- a/x11/xfce4/desktop/xfce-utils/pkg/DEINSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2003/12/15 06:11:34 jolan Exp $
-#!/bin/sh
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-SYSCONFDIR=${SYSCONFDIR:-/etc}
-CONFDIR=${SYSCONFDIR}/xfce4
-CONF=$CONFDIR/xinitrc
-
-if [ -f ${CONFFILE} ];
-then
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|         rm -f ${CONF}"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-fi
-
-exit 0
diff --git a/x11/xfce4/desktop/xfce-utils/pkg/INSTALL b/x11/xfce4/desktop/xfce-utils/pkg/INSTALL
deleted file mode 100644
index f68352cd580..00000000000
--- a/x11/xfce4/desktop/xfce-utils/pkg/INSTALL
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2003/12/15 06:11:34 jolan Exp $
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-SYSCONFDIR=${SYSCONFDIR:-/etc}
-CONFDIR=${SYSCONFDIR}/xfce4
-CONF=$CONFDIR/xinitrc
-EXAMPLECONFDIR=$PREFIX/share/examples/xfce-utils
-EXAMPLECONF=$EXAMPLECONFDIR/xinitrc
-
-do_confdir_install()
-{
-  install -d -o root -g wheel -m 755 $CONFDIR
-}
-
-do_conf_install()
-{
-  install -o root -g wheel -m 644 $EXAMPLECONF $CONF
-  echo
-  echo "+---------------"
-  echo "| The $1 configuration file has been installed to:"
-  echo "| $CONF."
-  echo "| Please view this file and change the configuration to meet your needs."
-  echo "+---------------"
-  echo
-}
-
-do_conf_notice()
-{
-  echo
-  echo "+---------------"
-  echo "| The existing $1 configuration file at $CONF"
-  echo "| has NOT been changed.  You may want to compare it to"
-  echo "| the current samples in $EXAMPLECONFDIR"
-  echo "| and update your configuration as needed."
-  echo "+---------------"
-  echo
-}
-
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-case $2 in
-    PRE-INSTALL)
-        #
-        ;;
-    POST-INSTALL)
-        if [ ! -d $CONFDIR ]; then
-          do_confdir_install
-        fi
-        if [ ! -f $CONF ]; then
-          do_conf_install $1
-        else
-          do_conf_notice $1
-        fi
-        ;;
-    *)
-        echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
diff --git a/x11/xfce4/desktop/xfce-utils/pkg/PLIST b/x11/xfce4/desktop/xfce-utils/pkg/PLIST
index 6c959cb6fbe..d809fd4acef 100644
--- a/x11/xfce4/desktop/xfce-utils/pkg/PLIST
+++ b/x11/xfce4/desktop/xfce-utils/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 19:26:33 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2004/10/26 18:48:07 espie Exp $
 bin/startxfce4
 bin/xfce4-about
 bin/xfhelp4
@@ -12,7 +12,9 @@ lib/xfce4/mcs-plugins/
 lib/xfce4/mcs-plugins/xftaskbar_plugin.a
 lib/xfce4/mcs-plugins/xftaskbar_plugin.la
 share/examples/xfce-utils/
+@sample ${SYSCONFDIR}/xfce4/
 share/examples/xfce-utils/xinitrc
+@sample ${SYSCONFDIR}/xfce4/xinitrc
 share/locale/ar/
 share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/xfce-utils.mo