From 4d0a3ffd55686c8297cb65f97ea8bc0ebf95ba89 Mon Sep 17 00:00:00 2001 From: sturm Date: Sat, 26 Apr 2003 15:02:31 +0000 Subject: [PATCH] etc -> SYSCONFDIR --- net/gated/patches/patch-src_gated_paths_h_in | 12 ++++++++++++ net/gated/pkg/DEINSTALL | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 net/gated/patches/patch-src_gated_paths_h_in diff --git a/net/gated/patches/patch-src_gated_paths_h_in b/net/gated/patches/patch-src_gated_paths_h_in new file mode 100644 index 00000000000..09c30df8c37 --- /dev/null +++ b/net/gated/patches/patch-src_gated_paths_h_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_gated_paths_h_in,v 1.1 2003/04/26 15:02:31 sturm Exp $ +--- src/gated/paths.h.in.orig Sat Apr 26 16:23:52 2003 ++++ src/gated/paths.h.in Sat Apr 26 16:24:03 2003 +@@ -35,7 +35,7 @@ + * __END_OF_COPYRIGHT__ + */ + +-#define _PATH_CONFIG "/etc/%s.conf" ++#define _PATH_CONFIG "@sysconfdir@/%s.conf" + #define _PATH_DEFS "/usr/include/isode" + #define _PATH_DUMP "@DUMPDIR@/%s_dump" + #define _PATH_DUMPDIR "@DUMPDIR@" diff --git a/net/gated/pkg/DEINSTALL b/net/gated/pkg/DEINSTALL index 40dff1d322a..0290f714d24 100644 --- a/net/gated/pkg/DEINSTALL +++ b/net/gated/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: DEINSTALL,v 1.1 2000/08/15 17:12:37 jakob Exp $ +# $OpenBSD: DEINSTALL,v 1.2 2003/04/26 15:02:31 sturm Exp $ PATH=/bin:/usr/bin:/sbin:/usr/sbin PREFIX=${PKG_PREFIX:-/usr/local} @@ -10,7 +10,7 @@ if id gii >/dev/null 2>&1 ; then fi GII_LINE=`grep ^gii /etc/services` -if [ -n "$GII_LINE" -o -f /etc/gated.conf -o "x$HAVE_USER" = "xYES" ]; then +if [ -n "$GII_LINE" -o -f ${SYSCONFDIR}/gated.conf -o "x$HAVE_USER" = "xYES" ]; then echo echo "+---------------" @@ -27,9 +27,9 @@ if [ -n "$GII_LINE" -o -f /etc/gated.conf -o "x$HAVE_USER" = "xYES" ]; then echo "| $GII_LINE" echo "|" fi - if [ -f /etc/gated.conf ]; then + if [ -f ${SYSCONFDIR}/gated.conf ]; then echo "| - remove gated configuration file" - echo "| rm /etc/gated.conf" + echo "| rm ${SYSCONFDIR}/gated.conf" echo "|" fi echo "| Do not do this if you plan on re-installing $1"