From 2f2569f5adeb286474f720c64769cbe779121094 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Wed, 21 Jul 1999 22:29:36 +0000
Subject: "make install" could clobber files in "${INN_DATA_DIR}/etc" while
 "pkg_add" worked fine.

---
 news/inn/Makefile         |  6 +++---
 news/inn/files/patch-sum  |  3 ++-
 news/inn/patches/patch-ah | 26 ++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 news/inn/patches/patch-ah

(limited to 'news')

diff --git a/news/inn/Makefile b/news/inn/Makefile
index 93393e6ea81..a9b2a3b5c02 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/07/21 20:38:55 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/07/21 22:29:36 tron Exp $
 
 DISTNAME=		inn-2.2
 CATEGORIES=		news
@@ -29,7 +29,6 @@ CONFIGURE_ENV+=		_PATH_PERL=${LOCALBASE}/bin/perl
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
-#INSTALL_TARGET=		update
 
 post-build:
 	${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \
@@ -50,7 +49,8 @@ post-install:
 		     ${EGREP} -v '\.(in|orig)$'`; do \
 	  ${INSTALL_DATA} $$FILE ${PREFIX}/share/examples/inn; \
 	done
+	cd ${WRKSRC}/site && \
 	${INSTALL_SCRIPT} ${WRKDIR}/innd.sh ${PREFIX}/etc/rc.d
-#	@${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+	@${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/files/patch-sum b/news/inn/files/patch-sum
index 955f104fbc9..f4dce11f945 100644
--- a/news/inn/files/patch-sum
+++ b/news/inn/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 1999/07/21 20:02:00 tron Exp $
+$NetBSD: patch-sum,v 1.4 1999/07/21 22:29:37 tron Exp $
 
 MD5 (patch-aa) = 2390c877da186d1501bfb499a9f27096
 MD5 (patch-ab) = 69a4b8bfa51950f4d1fac766e906cc97
@@ -7,3 +7,4 @@ MD5 (patch-ad) = 3eec593f7b8efe5ec284887f713d4ddd
 MD5 (patch-ae) = 084256092f1179105004da3f000ee33f
 MD5 (patch-af) = d8eac199c981d82eed4b454bc20115f7
 MD5 (patch-ag) = d6962b6d0159854f7e8bd11b32b285f7
+MD5 (patch-ah) = 3a87d8d980c0beab113268d18388ecb5
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
new file mode 100644
index 00000000000..6adedff4d82
--- /dev/null
+++ b/news/inn/patches/patch-ah
@@ -0,0 +1,26 @@
+$NetBSD: patch-ah,v 1.3 1999/07/21 22:29:38 tron Exp $
+
+--- site/Makefile.orig	Thu Nov 12 00:02:49 1998
++++ site/Makefile	Thu Jul 22 00:10:10 1999
+@@ -87,19 +87,10 @@
+ 	$D$(CTLBIN)/sendsys.pl $D$(CTLBIN)/senduuname.pl $D$(CTLBIN)/version.pl
+ 
+ REST_INSTALLED	= \
+-	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
+-	$D$(PATH_NNRPACCESS) $D$(PATH_NNRPDTRACK) $D$(PATH_NNTPPASS) \
+-	$D$(PATH_CONFIG) $D$(PATH_MODERATORS) \
+-	$D$(PATH_CONTROLCTL) $D$(PATH_EXPIRECTL) $D$(PATHETC)/nntpsend.ctl \
+-	$D$(PATHETC)/innreport.conf $D$(PATHLIB)/innreport_inn.pm \
+-	$D$(PATH_CTLWATCH) $D$(PATH_DISTPATS) $D$(PATH_SCHEMA) \
+-	$D$(PATH_ACTSYNC_CFG) $D$(PATH_ACTSYNC_IGN) \
+-	$D$(PATH_MOTD) $D$(PATH_STORAGECONF) \
+-	$D$(PATH_OVERVIEWCTL) $D$(PATH_CYCBUFFCONFIG) \
+-	$D$(PATH_INNFEEDCTL) $D$(PATH_PERL_STARTUP_INND) \
++	$D$(PATHLIB)/innreport_inn.pm $D$(PATH_PERL_STARTUP_INND) \
+ 	$D$(PATH_PERL_FILTER_INND) $D$(PATH_PERL_FILTER_NNRPD) \
+ 	$D$(PATH_TCL_STARTUP) $D$(PATH_TCL_FILTER) \
+-	$D$(PATH_NNRPAUTH) $D$(PATHETC)/news2mail.cf
++	$D$(PATH_NNRPAUTH)
+ 
+ ALL_INSTALLED	= $(MOST_INSTALLED) $(REST_INSTALLED)
+ 
-- 
cgit v1.2.3