Don't hard code prefix, remove unnecessary patches, cleanup "Makefile".

4 files changed, 49 insertions, 58 deletions

diff --git a/net/gated/Makefile b/net/gated/Makefile
index 40708d10130..f7ba5208180 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 1998/06/26 00:21:03 christos Exp $
+# $NetBSD: Makefile,v 1.2 1998/07/02 21:23:44 tron Exp $
 # FreeBSD Id: Makefile,v 1.17 1998/04/26 18:47:12 peter Exp 
 #
 
@@ -9,6 +9,10 @@ MASTER_SITES=   ftp://ftp.gated.merit.edu/net-research/gated/
 
 MAINTAINER=	packages@netbsd.org
 
-.include "../../mk/bsd.prefs.mk"
+ALL_TARGET=	gated
+
+post-extract:
+	@${SED} -e 's#@PREFIX@#${PREFIX}#' <${FILESDIR}/configuration \
+	    >${WRKSRC}/src/configs/netbsd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gated/files/configuration b/net/gated/files/configuration
new file mode 100644
index 00000000000..658c8c9a33c
--- /dev/null
+++ b/net/gated/files/configuration
@@ -0,0 +1,43 @@
+#
+#	$NetBSD: configuration,v 1.1 1998/07/02 21:23:44 tron Exp $
+#
+#       "gated" configuration for NetBSD
+#
+
+bindir  @PREFIX@/bin
+sbindir @PREFIX@/sbin
+mandir  @PREFIX@/man
+mantype bsd42
+
+cc      cc
+#cflags -g
+cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
+cflags  -O -g
+
+ldflags -lkvm
+
+lex     lex
+lflags  -p -Cfe
+yflags	-d -v
+
+mkdep   mkdep -flag -MM
+
+options INCLUDE_UNISTD INCLUDE_PATHS GID_T=gid_t
+options POSIX_SIGNALS HAVE_WAITPID USE_SETSID
+options VARIABLE_MASKS SOCKET_LENGTHS SOCKADDR_DL INCLUDE_IF_DL
+options KRT_RTREAD_KINFO KRT_IFREAD_KINFO KRT_RT_SOCK USE_SYSCTL
+options KRT_LLADDR_NONE KRT_SYMBOLS_SYSCTL KVM_TYPE_BSD44 KSYM_VERSION=VRS_SYM
+options KRT_SOCKET_TYPE="PF_ROUTE, SOCK_RAW, AF_UNSPEC"
+options U_INT8=u_int8_t U_INT16=u_int16_t U_INT32=u_int32_t U_INT64=u_int64_t
+options S_INT8=int8_t S_INT16=int16_t S_INT32=int32_t S_INT64=int64_t
+options GDC_RESOURCE GDCCORENAME=""%s.core""
+
+gdc_group       wheel
+
+path_dump       /var/tmp/%s_dump
+path_dumpdir    /var/tmp
+path_pid        /var/run/%s.pid
+path_version    /var/run/%s.version
+path_unix	/netbsd
+
+protocols	bgp egp hello icmp rip ospf iso slsp isis rdisc
diff --git a/net/gated/patches/patch-aa b/net/gated/patches/patch-aa
deleted file mode 100644
index 43494d6db40..00000000000
--- a/net/gated/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Thu Jun 25 17:37:44 1998
-+++ Makefile	Thu Jun 25 17:45:38 1998
-@@ -70,7 +70,7 @@
- #	Makefile for gated root directory
- #
- #
--gated:	src
-+all:	src
- 	(cd src; make)
- 
- install:	src man install-man
diff --git a/net/gated/patches/patch-ac b/net/gated/patches/patch-ac
deleted file mode 100644
index 62898e9bf89..00000000000
--- a/net/gated/patches/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
---- /dev/null	Thu Jun 25 17:09:49 1998
-+++ src/configs/netbsd	Thu Jun 25 17:41:46 1998
-@@ -0,0 +1,42 @@
-+#
-+#	$Id: patch-ac,v 1.1 1998/06/26 00:23:38 christos Exp $
-+#       Configuration for freebsd-2.0 alpha (i386)
-+#
-+
-+bindir  /usr/pkg/bin
-+sbindir /usr/pkg/sbin
-+mandir  /usr/pkg/man
-+mantype bsd42
-+
-+cc      cc
-+#cflags -g
-+cwflags -W -Wreturn-type -Wcast-qual -Wpointer-arith -Wwrite-strings -Wswitch -Wshadow
-+cflags  -O -g
-+
-+ldflags -lkvm
-+
-+lex     lex
-+lflags  -p -Cfe
-+yflags	-d -v
-+
-+mkdep   mkdep -flag -MM
-+
-+options INCLUDE_UNISTD INCLUDE_PATHS GID_T=gid_t
-+options POSIX_SIGNALS HAVE_WAITPID USE_SETSID
-+options VARIABLE_MASKS SOCKET_LENGTHS SOCKADDR_DL INCLUDE_IF_DL
-+options KRT_RTREAD_KINFO KRT_IFREAD_KINFO KRT_RT_SOCK USE_SYSCTL
-+options KRT_LLADDR_NONE KRT_SYMBOLS_SYSCTL KVM_TYPE_BSD44 KSYM_VERSION=VRS_SYM
-+options KRT_SOCKET_TYPE="PF_ROUTE, SOCK_RAW, AF_UNSPEC"
-+options U_INT8=u_int8_t U_INT16=u_int16_t U_INT32=u_int32_t U_INT64=u_int64_t
-+options S_INT8=int8_t S_INT16=int16_t S_INT32=int32_t S_INT64=int64_t
-+options GDC_RESOURCE GDCCORENAME=""%s.core""
-+
-+gdc_group       wheel
-+
-+path_dump       /var/tmp/%s_dump
-+path_dumpdir    /var/tmp
-+path_pid        /var/run/%s.pid
-+path_version    /var/run/%s.version
-+path_unix	/netbsd
-+
-+protocols	bgp egp hello icmp rip ospf iso slsp isis rdisc