From fc0d1e6d8a9ef1ebf8a496bf4875e0d9d6cf5826 Mon Sep 17 00:00:00 2001
From: danh <danh@openbsd.org>
Date: Mon, 8 Jan 2001 09:04:30 +0000
Subject: [PATCH] - bump NEED_VERSION. - allow concurrent builds. - respect
 CFLAGS. - no need to set ALL_TARGET or WRKDIST. - do not override install
 target, use post-install. - mkdir -> INSTALL_DATA_DIR.

---
 net/tcpslice/Makefile                  | 22 ++++++----------
 net/tcpslice/patches/patch-Makefile_in | 36 ++++++++++++++++++++++++++
 net/tcpslice/pkg/PLIST                 |  4 +--
 3 files changed, 46 insertions(+), 16 deletions(-)
 create mode 100644 net/tcpslice/patches/patch-Makefile_in

diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile
index 9f9d78579f9..6ca80ddf797 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/01/08 05:23:42 obecian Exp $
+# $OpenBSD: Makefile,v 1.2 2001/01/08 09:04:30 danh Exp $
 
 DISTNAME=	tcpslice-1.1a3
 CATEGORIES=	net
-NEED_VERSION=	1.305
+NEED_VERSION=	1.348
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/
 EXTRACT_SUFX=	.tar.Z
 
@@ -13,19 +13,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE=gnu
+SEPARATE_BUILD=	concurrent
+CONFIGURE_STYLE= gnu
 
-ALL_TARGET=	tcpslice
-WRKDIST=	${WRKDIR}/tcpslice-1.1a3
-
-DOCFILES=	CHANGES README
-
-do-install:
-	mkdir ${PREFIX}/share/doc/tcpslice
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpslice ${PREFIX}/bin
+post-install:
 	${INSTALL_MAN} ${WRKSRC}/tcpslice.1 ${PREFIX}/man/man1/tcpslice.1
-.for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/tcpslice
-.endfor
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpslice
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/tcpslice
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/tcpslice
 
 .include <bsd.port.mk>
diff --git a/net/tcpslice/patches/patch-Makefile_in b/net/tcpslice/patches/patch-Makefile_in
new file mode 100644
index 00000000000..7a4c8c47a8b
--- /dev/null
+++ b/net/tcpslice/patches/patch-Makefile_in
@@ -0,0 +1,36 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/01/08 09:04:30 danh Exp $
+--- Makefile.in.orig	Fri Jan 24 01:25:22 1997
++++ Makefile.in	Mon Jan  8 03:51:00 2001
+@@ -40,8 +40,8 @@ VPATH = @srcdir@
+ #
+ 
+ CC = @CC@
+-CCOPT = @V_CCOPT@
+-INCLS = -I. @V_INCLS@
++CCOPT = @CFLAGS@
++INCLS = -I. -I$(srcdir) -I$(srcdir)/lbl
+ DEFS = @DEFS@
+ 
+ # Standard CFLAGS
+@@ -55,9 +55,9 @@ INSTALL = @INSTALL@
+ # Explicitly define compilation rule since SunOS 4's make doesn't like gcc.
+ # Also, gcc does not remove the .o before forking 'as', which can be a
+ # problem if you don't own the file but can write to the directory.
+-.c.o:
+-	@rm -f $@
+-	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
++# .c.o:
++# 	@rm -f $@
++# 	$(CC) $(CFLAGS) -c $*.c
+ 
+ CSRC =	tcpslice.c gmt2local.c gwtm2secs.c machdep.c search.c util.c
+ GENSRC = version.c
+@@ -94,7 +94,7 @@ version.c: $(srcdir)/VERSION
+ 
+ 
+ install: force
+-	$(INSTALL) -m 555 -o bin -g bin tcpslice $(DESTDIR)$(BINDEST)
++	$(INSTALL) -s -m 555 -o root -g bin tcpslice $(DESTDIR)$(BINDEST)
+ 
+ install-man: force
+ 	$(INSTALL) -m 444 -o bin -g bin $(srcdir)/tcpslice.1 \
diff --git a/net/tcpslice/pkg/PLIST b/net/tcpslice/pkg/PLIST
index 8aa740fb422..b06afe4feb7 100644
--- a/net/tcpslice/pkg/PLIST
+++ b/net/tcpslice/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/01/08 05:23:42 obecian Exp $
-bin/tcpslice
+@comment $OpenBSD: PLIST,v 1.2 2001/01/08 09:04:31 danh Exp $
 man/man1/tcpslice.1
+sbin/tcpslice
 share/doc/tcpslice/CHANGES
 share/doc/tcpslice/README
 @dirrm share/doc/tcpslice