+ Move configuration from configure script to a standard package

Makefile target.

+ Modify Makefiles in patch stage, rather than using sed in configure
stage.

+ Use ${LOWER_OPSYS} where appropriate.

+ Use pax in preference to a tar pipeline to copy hierarchies at
install time.

5 files changed, 38 insertions, 24 deletions

diff --git a/net/gated/Makefile b/net/gated/Makefile
index e98a846d806..a2f8839fc4b 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/04/05 16:58:49 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/25 20:16:53 agc Exp $
 # FreeBSD Id: Makefile,v 1.17 1998/04/26 18:47:12 peter Exp 
 #
 
@@ -25,10 +25,16 @@ post-extract:
 	${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/gated \
 		> ${WRKDIR}/gated
 
+do-configure:
+	cd ${WRKSRC}/src; 						\
+		obj=obj.`util/archtype`;				\
+		${MKDIR} $$obj;						\
+		${CP} configs/${LOWER_OPSYS} $$obj/Config;		\
+		${RM} -f Config
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gated
-	cd ${WRKSRC}/doc ; \
-	${GTAR} pcf - . | ( cd ${PREFIX}/share/doc/gated ; ${GTAR} pvxf - )
+	cd ${WRKSRC}/doc; ${PAX} -rwpe . ${PREFIX}/share/doc/gated
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/gated
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/gated
 	${INSTALL_SCRIPT} ${WRKDIR}/gated ${PREFIX}/etc/rc.d
diff --git a/net/gated/distinfo b/net/gated/distinfo
index a30ed88d36f..bc2669ab278 100644
--- a/net/gated/distinfo
+++ b/net/gated/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/10/25 20:16:54 agc Exp $
 
 SHA1 (gated-3-5-11.tar.gz) = a6abdc59beb881dee06c9433b690fa6eab99fe07
 Size (gated-3-5-11.tar.gz) = 1565263 bytes
@@ -7,3 +7,5 @@ SHA1 (patch-ab) = 55043a19003b28c3a23d8281733341786a0e1936
 SHA1 (patch-ad) = 0338ffe0160d72daf45c1fb641cae7baee82e13e
 SHA1 (patch-ae) = c02081fa9281cbe5adfab53f24c3c662fcdf9beb
 SHA1 (patch-af) = 3b27a9b1e13533f4dd6dc6c2dc7d23c0a3ae725e
+SHA1 (patch-ag) = 375e91f1e04995ef4f7d3f7dcc592d90901fa21c
+SHA1 (patch-ah) = b1ebbf21e0bf8978503ff4b40f5019c02a2d619a
diff --git a/net/gated/patches/patch-ag b/net/gated/patches/patch-ag
new file mode 100644
index 00000000000..3614cdd23e8
--- /dev/null
+++ b/net/gated/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2001/10/25 20:16:54 agc Exp $
+
+--- src/Makefile.orig	Wed Feb 17 23:25:31 1999
++++ src/Makefile	Thu Oct 25 20:56:31 2001
+@@ -80,7 +80,7 @@
+ 
+ doall:	all
+ 
+-true:;
++true:
+ 
+ all build_depend depend gated gdc ripquery ospf_monitor \
+ install install-man man clean cleanall clean-man lint links version Makefile:
diff --git a/net/gated/patches/patch-ah b/net/gated/patches/patch-ah
new file mode 100644
index 00000000000..1e38e20aba8
--- /dev/null
+++ b/net/gated/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2001/10/25 20:16:55 agc Exp $
+
+--- src/util/Makefile.template.orig	Tue Sep 15 17:48:41 1998
++++ src/util/Makefile.template	Thu Oct 25 20:56:31 2001
+@@ -203,7 +203,7 @@
+ make-end:	true
+ 	@echo "Make ended at `${DATE}`"
+ 
+-true:;
++true:
+ 
+ 
+ #	Rebuild Makefile
diff --git a/net/gated/scripts/configure b/net/gated/scripts/configure
deleted file mode 100755
index de1a31c15b4..00000000000
--- a/net/gated/scripts/configure
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: configure,v 1.2 1998/08/07 11:10:40 agc Exp $
-#
-# Configure gated
-#
-cd $WRKSRC
-
-for file in Makefile src/Makefile src/util/Makefile.template ; do
-	mv $file $file.orig
-	sed -e 's/^true:;$/true:/' -e 's/^[ 	]*$//' $file.orig >$file
-done
-
-cd src
-
-obj=obj.`util/archtype`
-mkdir -p $obj
-
-cp configs/netbsd $obj/Config
-rm -f Config