From 6dad768d2fc1193c4272755870445bf176a8c2aa Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Sat, 9 Sep 2000 04:49:07 +0000
Subject: Fix permissions for netplan.dir; other minor fixes to PLIST. Closes
 PR pkg/8942.

---
 misc/plan/Makefile         | 3 ++-
 misc/plan/files/patch-sum  | 4 ++--
 misc/plan/patches/patch-aa | 4 ++--
 misc/plan/pkg/PLIST        | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'misc')

diff --git a/misc/plan/Makefile b/misc/plan/Makefile
index efdbddd634d..d17f4ec8468 100644
--- a/misc/plan/Makefile
+++ b/misc/plan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/08/22 09:44:14 rh Exp $
+# $NetBSD: Makefile,v 1.8 2000/09/09 04:49:07 fredb Exp $
 #
 
 DISTNAME=	plan-1.8.4
@@ -16,6 +16,7 @@ ALL_TARGET=	netbsd
 pre-install:
 	${MKDIR} ${X11PREFIX}/libexec/plan ${X11PREFIX}/share/plan \
 		${X11PREFIX}/share/plan/holiday
+	${RM} -f ${WRKDIR}/${DISTNAME}/holiday/holiday_*.orig
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/holiday/holiday_* ${X11PREFIX}/share/plan/holiday
 	for f in HISTORY README; do					\
 		${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$$f ${X11PREFIX}/share/plan; \
diff --git a/misc/plan/files/patch-sum b/misc/plan/files/patch-sum
index bb37f83b805..83248f6ac6a 100644
--- a/misc/plan/files/patch-sum
+++ b/misc/plan/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/08/22 09:44:15 rh Exp $
+$NetBSD: patch-sum,v 1.4 2000/09/09 04:49:07 fredb Exp $
 
-MD5 (patch-aa) = 86b197fcdc2ccc284ab1e6fdd50364c8
+MD5 (patch-aa) = 2e992555e855075ead0ea321b48653eb
 MD5 (patch-ab) = f640fe7c551a99ad468275a57d01edf2
 MD5 (patch-ac) = d94f971a26acbc734e6ef8ec09971567
diff --git a/misc/plan/patches/patch-aa b/misc/plan/patches/patch-aa
index d402d57770a..c2fde5446d7 100644
--- a/misc/plan/patches/patch-aa
+++ b/misc/plan/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/08/22 09:44:16 rh Exp $
+$NetBSD: patch-aa,v 1.6 2000/09/09 04:49:07 fredb Exp $
 
 --- Makefile.orig	Mon Jul 17 22:07:03 2000
 +++ Makefile
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.5 2000/08/22 09:44:16 rh Exp $
  YACC=yacc
  #				# numerical user ID of <nobody> account
 -NOB_UID=60001
-+NOB_UID=39
++NOB_UID=32767
  #				# default numerical group ID of <nobody>
 -NOB_GID=60001
 +NOB_GID=39
diff --git a/misc/plan/pkg/PLIST b/misc/plan/pkg/PLIST
index 19ad1e3d9a5..a7611f1be8c 100644
--- a/misc/plan/pkg/PLIST
+++ b/misc/plan/pkg/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2000/08/22 09:44:17 rh Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/09/09 04:49:07 fredb Exp $
 bin/plan
 libexec/plan/pland
 libexec/plan/notifier
 libexec/plan/netplan
 libexec/plan/plan_cal.ps
-@exec mkdir -p %D/libexec/plan/netplan.dir ; chmod 700 %D/libexec/plan/netplan.dir
-@unexec rm -rf %D/libexec/plan/netplan.dir
+@exec mkdir -p %D/libexec/plan/netplan.dir && chmod 700 %D/libexec/plan/netplan.dir && chown 32767:39 %D/libexec/plan/netplan.dir
+@unexec rmdir %D/libexec/plan/netplan.dir 2>/dev/null || echo "==> %D/libexec/plan/netplan.dir not empty. You should remove it manually if it's no longer needed."
+@unexec rmdir %D/libexec/plan 2>/dev/null || true
 man/man1/plan.1
 man/man1/netplan.1
 man/man4/plan.4
@@ -43,4 +44,3 @@ share/plan/plan.lang.german
 share/plan/plan.lang.spanish
 @dirrm share/plan/holiday
 @dirrm share/plan
-@dirrm libexec/plan
-- 
cgit v1.2.3