5 files changed, 16 insertions, 86 deletions
diff --git a/net/pen/Makefile b/net/pen/Makefile
index 6d886f681f7..2b2023a96a7 100644
--- a/net/pen/Makefile
+++ b/net/pen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/08/21 12:00:14 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/13 15:09:38 rh Exp $
 #
 
-DISTNAME=	pen-0.2.0
+DISTNAME=	pen-0.4.0
 CATEGORIES=	net
 MASTER_SITES=	http://siag.nu/pub/pen/					\
 		ftp://siag.nu/pub/pen/
@@ -10,13 +10,13 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://siag.nu/pen/
 COMMENT=	load balancer for "simple" tcp based protocols
 
-NO_CONFIGURE=	YES
+GNU_CONFIGURE=	YES
 
-do-install:
-.for prg in pen mergelogs
-		${INSTALL_PROGRAM} ${WRKSRC}/${prg} ${PREFIX}/sbin
-		${INSTALL_MAN} ${WRKSRC}/${prg}.1 ${PREFIX}/man/man8/${prg}.8
-.endfor
+post-install:
+#.for prg in pen mergelogs
+#		${INSTALL_PROGRAM} ${WRKSRC}/${prg} ${PREFIX}/sbin
+#		${INSTALL_MAN} ${WRKSRC}/${prg}.1 ${PREFIX}/man/man8/${prg}.8
+#.endfor
 		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pen
 .for doc in COPYING ChangeLog README
 		${INSTALL_DATA} ${WRKSRC}/${doc} ${PREFIX}/share/doc/pen
diff --git a/net/pen/distinfo b/net/pen/distinfo
index 7a60c13bbad..5cba6390a32 100644
--- a/net/pen/distinfo
+++ b/net/pen/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/08/21 12:00:14 rh Exp $
+$NetBSD: distinfo,v 1.2 2001/09/13 15:09:38 rh Exp $
 
-SHA1 (pen-0.2.0.tar.gz) = d16daa8e32276d7e874d2811cd800c2659694455
-Size (pen-0.2.0.tar.gz) = 17469 bytes
-SHA1 (patch-aa) = 6ce188b309bbd51e4c7f4ece3c666340e6790ddf
-SHA1 (patch-ab) = e3c0dfeafc74cf653de4c90b8b6244e4a2bcae8f
+SHA1 (pen-0.4.0.tar.gz) = a64afa4ae47f55ff5378c13fe7e08c67a2a2d246
+Size (pen-0.4.0.tar.gz) = 45810 bytes
diff --git a/net/pen/patches/patch-aa b/net/pen/patches/patch-aa
deleted file mode 100644
index a4125362d39..00000000000
--- a/net/pen/patches/patch-aa
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/08/21 12:00:14 rh Exp $
-
---- Makefile.orig	Mon Aug 20 21:02:54 2001
-+++ Makefile
-@@ -3,11 +3,11 @@
- PKG = pen
- THIS = $(PKG)-$(VERSION)
- 
--CC = gcc
-+#CC = gcc
- 
- # Try this first
--CFLAGS = `./guess --cflags`
--LDFLAGS = `./guess --libs`
-+#CFLAGS = `./guess --cflags`
-+#LDFLAGS = `./guess --libs`
- 
- # For Linux
- #CFLAGS = -Wall -g
-@@ -16,7 +16,7 @@
- #CFLAGS = -Wall -g
- #LDFLAGS = -lnsl -lsocket
- 
--PREFIX = /usr/local
-+#PREFIX = /usr/local
- BINDIR = $(PREFIX)/bin
- MANDIR = $(PREFIX)/man
- MAN1DIR = $(MANDIR)/man1
diff --git a/net/pen/patches/patch-ab b/net/pen/patches/patch-ab
deleted file mode 100644
index 03c6c659e7b..00000000000
--- a/net/pen/patches/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/21 12:00:14 rh Exp $
-
---- pen.c.orig	Mon Aug 20 21:02:54 2001
-+++ pen.c
-@@ -33,6 +33,7 @@
- #include <sys/socket.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/param.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <syslog.h>
-@@ -465,6 +466,7 @@
- 	exit(0);
- }
- 
-+#if !(defined(BSD) && BSD >= 199306)
- static void background(void)
- {
- 	int childpid;
-@@ -478,6 +480,7 @@
- 	setpgrp();
- 	signal(SIGCHLD, SIG_IGN);
- }
-+#endif
- 
- static void init(int argc, char **argv)
- {
-@@ -817,7 +820,11 @@
- 	signal(SIGCHLD, SIG_IGN);
- 
- 	if (!foreground) {
-+#if (defined(BSD) && BSD >= 199306)
-+		daemon(0, 0);
-+#else
- 		background();
-+#endif
- 	}
- 
- 	listenfd = open_listener(argv[0]);
diff --git a/net/pen/pkg/PLIST b/net/pen/pkg/PLIST
index 3dcfb80d472..10ed6a77fb6 100644
--- a/net/pen/pkg/PLIST
+++ b/net/pen/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/08/21 12:00:14 rh Exp $
-man/man8/pen.8
-man/man8/mergelogs.8
-sbin/pen
-sbin/mergelogs
+@comment $NetBSD: PLIST,v 1.2 2001/09/13 15:09:39 rh Exp $
+bin/mergelogs
+bin/pen
+man/man1/mergelogs.1
+man/man1/pen.1
 share/doc/pen/COPYING
 share/doc/pen/ChangeLog
 share/doc/pen/README