From 53e6f7f55d88c54c4f2dc25157bc20ee2feb7bb6 Mon Sep 17 00:00:00 2001 From: naddy Date: Sun, 8 Aug 2004 15:51:06 +0000 Subject: [PATCH] new plist, use @sample --- x11/xdmchoose/pkg/DEINSTALL | 51 --------------------------- x11/xdmchoose/pkg/INSTALL | 68 ------------------------------------ x11/xdmchoose/pkg/PLIST | 13 ++++--- x11/xloadimage/pkg/DEINSTALL | 51 --------------------------- x11/xloadimage/pkg/INSTALL | 68 ------------------------------------ x11/xloadimage/pkg/PLIST | 15 ++++---- x11/xlogout/pkg/PLIST | 6 ++-- x11/xwit/pkg/PLIST | 4 +-- 8 files changed, 18 insertions(+), 258 deletions(-) delete mode 100644 x11/xdmchoose/pkg/DEINSTALL delete mode 100644 x11/xdmchoose/pkg/INSTALL delete mode 100644 x11/xloadimage/pkg/DEINSTALL delete mode 100644 x11/xloadimage/pkg/INSTALL diff --git a/x11/xdmchoose/pkg/DEINSTALL b/x11/xdmchoose/pkg/DEINSTALL deleted file mode 100644 index de12404989b..00000000000 --- a/x11/xdmchoose/pkg/DEINSTALL +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# $OpenBSD: DEINSTALL,v 1.2 2003/08/22 13:21:12 naddy Exp $ -# -# De-installation setup of xdmchoose - -# exit on errors, use a sane path and install prefix -# -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=${SYSCONFDIR}/xdmchoose.conf - -# Function: tell the user what they need to do to delete the port completely -# -do_notice() -{ - echo - echo "+---------------" - echo "| To completely deinstall the $1 package you need to perform" - echo "| these steps as root:" - echo "|" - echo "| rm -f ${CONFIG_FILE}" - echo "|" - echo "| Do not do this if you plan on re-installing $1" - echo "| at some future time." - echo "+---------------" - echo -} - -# Verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname DEINSTALL" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - DEINSTALL) - if [ "$PKG_DELETE_EXTRA" != Yes -a -f ${CONFIG_FILE} ]; then - do_notice "$1" - fi - ;; - *) - echo "usage: $0 distname DEINSTALL" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/x11/xdmchoose/pkg/INSTALL b/x11/xdmchoose/pkg/INSTALL deleted file mode 100644 index ec8eb7ce816..00000000000 --- a/x11/xdmchoose/pkg/INSTALL +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# $OpenBSD: INSTALL,v 1.2 2002/04/26 03:35:34 pvalchev Exp $ -# -# Pre/post-installation setup of xdmchoose - -# exit on errors, use a sane path and install prefix -# -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=${SYSCONFDIR}/xdmchoose.conf -SAMPLE_FILE=$PREFIX/share/examples/xdmchoose/xdmchoose.conf - -# Function: tell the user what they need to do to use the port just installed -# -do_notice() -{ - echo - echo "+---------------" - echo "| The existing $1 configuration file, ${CONFIG_FILE}," - echo "| has NOT been changed. You may want to compare it to the" - echo "| current sample file ${SAMPLE_FILE}" - echo "| and update your configuration as needed." - echo "+---------------" - echo -} - -# Function: install configuration files -# -do_install() -{ - install -o root -g wheel ${SAMPLE_FILE} ${CONFIG_FILE} - echo - echo "+---------------" - echo "| The $1 configuration file, ${CONFIG_FILE}," - echo "| has been installed. Please view this file and change" - echo "| the configuration to meet your needs." - echo "+---------------" - echo -} - -# Verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - PRE-INSTALL) - : nothing to pre-install for this port - ;; - POST-INSTALL) - if [ -f ${CONFIG_FILE} ]; then - do_notice "$1" - else - do_install "$1" - fi - ;; - *) - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/x11/xdmchoose/pkg/PLIST b/x11/xdmchoose/pkg/PLIST index c5df808d040..14486ece2ac 100644 --- a/x11/xdmchoose/pkg/PLIST +++ b/x11/xdmchoose/pkg/PLIST @@ -1,13 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.3 2003/08/22 13:21:12 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.4 2004/08/08 15:51:06 naddy Exp $ bin/xdmchooser bin/xdmping -man/man1/xdmchoose.1 -man/man5/xdmchoose.conf.5 +@man man/man1/xdmchoose.1 +@man man/man5/xdmchoose.conf.5 +share/examples/xdmchoose/ share/examples/xdmchoose/xdmchoose.conf +@sample ${SYSCONFDIR}/xdmchoose.conf +share/xdmchoose/ share/xdmchoose/xdmchoose-blur.xpm share/xdmchoose/xdmchoose-plain.xpm share/xdmchoose/xdmchoose-tiled.xpm -@dirrm share/xdmchoose -@dirrm share/examples/xdmchoose -@cwd ${SYSCONFDIR} -@extra xdmchoose.conf diff --git a/x11/xloadimage/pkg/DEINSTALL b/x11/xloadimage/pkg/DEINSTALL deleted file mode 100644 index 5d4332f6d03..00000000000 --- a/x11/xloadimage/pkg/DEINSTALL +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# $OpenBSD: DEINSTALL,v 1.3 2003/08/22 18:49:46 naddy Exp $ -# -# De-installation setup of xloadimage - -# exit on errors, use a sane path and install prefix -# -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=${SYSCONFDIR}/xloadimagerc - -# Function: tell the user what they need to do to delete the port completely -# -do_notice() -{ - echo - echo "+---------------" - echo "| To completely deinstall the $1 package you need to perform" - echo "| these steps as root:" - echo "|" - echo "| rm -f ${CONFIG_FILE}" - echo "|" - echo "| Do not do this if you plan on re-installing $1" - echo "| at some future time." - echo "+---------------" - echo -} - -# Verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname DEINSTALL" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - DEINSTALL) - if [ "$PKG_DELETE_EXTRA" != Yes -a -f ${CONFIG_FILE} ]; then - do_notice "$1" - fi - ;; - *) - echo "usage: $0 distname DEINSTALL" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/x11/xloadimage/pkg/INSTALL b/x11/xloadimage/pkg/INSTALL deleted file mode 100644 index d33ee94f378..00000000000 --- a/x11/xloadimage/pkg/INSTALL +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# $OpenBSD: INSTALL,v 1.3 2002/04/26 03:35:34 pvalchev Exp $ -# -# Pre/post-installation setup of xloadimage - -# exit on errors, use a sane path and install prefix -# -set -e -PATH=/bin:/usr/bin:/sbin:/usr/sbin -PREFIX=${PKG_PREFIX:-/usr/local} -CONFIG_FILE=${SYSCONFDIR}/xloadimagerc -SAMPLE_CONFIG_DIR=$PREFIX/share/examples/xloadimage - -# Function: tell the user what they need to do to use the port just installed -# -do_notice() -{ - echo - echo "+---------------" - echo "| The existing $1 configuration file, ${CONFIG_FILE}," - echo "| has NOT been changed. You may want to compare it to the" - echo "| current sample files in ${SAMPLE_CONFIG_DIR}" - echo "| and update your configuration as needed." - echo "+---------------" - echo -} - -# Function: install configuration files -# -do_install() -{ - install -o root -g wheel ${SAMPLE_CONFIG_DIR}/xloadimagerc ${CONFIG_FILE} - echo - echo "+---------------" - echo "| The $1 configuration file, ${CONFIG_FILE}," - echo "| has been installed. Please view this file and change" - echo "| the configuration to meet your needs." - echo "+---------------" - echo -} - -# Verify proper execution -# -if [ $# -ne 2 ]; then - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 -fi - -# Verify/process the command -# -case $2 in - PRE-INSTALL) - : nothing to pre-install for this port - ;; - POST-INSTALL) - if [ -f ${CONFIG_FILE} ]; then - do_notice "$1" - else - do_install "$1" - fi - ;; - *) - echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/x11/xloadimage/pkg/PLIST b/x11/xloadimage/pkg/PLIST index c59f57b9327..0a9b1af9e9f 100644 --- a/x11/xloadimage/pkg/PLIST +++ b/x11/xloadimage/pkg/PLIST @@ -1,13 +1,12 @@ -@comment $OpenBSD: PLIST,v 1.7 2003/08/22 18:49:46 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.8 2004/08/08 15:51:07 naddy Exp $ bin/uufilter bin/xloadimage bin/xsetbg bin/xview -man/man1/uufilter.1 -man/man1/xloadimage.1 -man/man1/xsetbg.1 -man/man1/xview.1 +@man man/man1/uufilter.1 +@man man/man1/xloadimage.1 +@man man/man1/xsetbg.1 +@man man/man1/xview.1 +share/examples/xloadimage/ share/examples/xloadimage/xloadimagerc -@dirrm share/examples/xloadimage -@cwd ${SYSCONFDIR} -@extra xloadimagerc +@sample ${SYSCONFDIR}/xloadimagerc diff --git a/x11/xlogout/pkg/PLIST b/x11/xlogout/pkg/PLIST index f8c34339b11..dddfddedfe7 100644 --- a/x11/xlogout/pkg/PLIST +++ b/x11/xlogout/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2000/10/27 13:57:43 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.3 2004/08/08 15:51:07 naddy Exp $ bin/xlogout -lib/X11/app-defaults/XLogout -man/cat1/xlogout.0 +lib/X11/app-defaults +@man man/cat1/xlogout.0 diff --git a/x11/xwit/pkg/PLIST b/x11/xwit/pkg/PLIST index 4eb58c64021..d8aaaa2f459 100644 --- a/x11/xwit/pkg/PLIST +++ b/x11/xwit/pkg/PLIST @@ -1,3 +1,3 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2001/01/25 17:03:05 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.2 2004/08/08 15:51:07 naddy Exp $ bin/xwit -man/cat1/xwit.0 +@man man/cat1/xwit.0