From af7b47a7b57489951e742a7c0a82294f6f5f80ed Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Fri, 21 Apr 2000 14:56:12 +0000
Subject: [PATCH] Fix the PLIST and fake.

---
 net/bing/Makefile         | 16 +++++++---------
 net/bing/patches/patch-aa | 25 ++++++++++---------------
 net/bing/pkg/PLIST        |  1 +
 net/icmpinfo/Makefile     |  8 ++++----
 net/icmpinfo/pkg/PLIST    |  1 +
 5 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/net/bing/Makefile b/net/bing/Makefile
index af928c4ccfd..45300f2f81d 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -1,24 +1,22 @@
-# $OpenBSD: Makefile,v 1.6 2000/04/09 17:37:19 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2000/04/21 14:56:12 kevlo Exp $
 # Original from: Ejovi Nuwere <ejovi@ejovi.net>
 
 DISTNAME=	bing-1.0.4
 CATEGORIES=	net
-FAKE=No
 MASTER_SITES=	ftp://ftp.lip6.fr/pub/networking/
 
 MAINTAINER=	ports@OpenBSD.ORG
 
-LICENSE_TYPE=		BSD
-PERMIT_PACKAGE_CDROM=	YES
-PERMIT_PACKAGE_FTP=	YES
-PERMIT_DISTFILES_CDROM=	YES
-PERMIT_DISTFILES_FTP=	YES
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-MAN8= 		bing.8
+FAKE=		Yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@mkdir -p ${PREFIX}/share/doc/bing
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bing
 	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/bing
 .endif
 
diff --git a/net/bing/patches/patch-aa b/net/bing/patches/patch-aa
index f5a62044738..4bfe7878af2 100644
--- a/net/bing/patches/patch-aa
+++ b/net/bing/patches/patch-aa
@@ -1,15 +1,10 @@
-*** Makefile.orig	Thu Jan  8 10:22:51 1998
---- Makefile	Thu Jan  8 10:23:10 1998
-***************
-*** 28,32 ****
-  	$(RM) -f bing bing.ps bing.0
-  
-  install: bing bing.8
-! 	$(INSTALL) -m 644 -o man -g man bing.8 $(MANDIR)/man8
-  	$(INSTALL) -m 4555 -o root -g staff bing $(BINDIR)
---- 28,32 ----
-  	$(RM) -f bing bing.ps bing.0
-  
-  install: bing bing.8
-! 	$(INSTALL) -m 644 -o root -g bin bing.8 $(MANDIR)/man8
-  	$(INSTALL) -m 4555 -o root -g staff bing $(BINDIR)
+--- Makefile.orig	Fri Jul 21 08:03:30 1995
++++ Makefile	Sat Apr 22 05:57:32 2000
+@@ -28,5 +28,5 @@
+ 	$(RM) -f bing bing.ps bing.0
+ 
+ install: bing bing.8
+-	$(INSTALL) -m 644 -o man -g man bing.8 $(MANDIR)/man8
+-	$(INSTALL) -m 4555 -o root -g staff bing $(BINDIR)
++	$(INSTALL) -m 644 -o root -g bin bing.8 $(DESTDIR)$(MANDIR)/man8
++	$(INSTALL) -m 4555 -o root -g staff bing $(DESTDIR)$(BINDIR)
diff --git a/net/bing/pkg/PLIST b/net/bing/pkg/PLIST
index f0c0a707ddc..25e660c0fcb 100644
--- a/net/bing/pkg/PLIST
+++ b/net/bing/pkg/PLIST
@@ -1,3 +1,4 @@
 bin/bing
 man/man8/bing.8
 share/doc/bing/README
+@dirrm share/doc/bing
diff --git a/net/icmpinfo/Makefile b/net/icmpinfo/Makefile
index 8b32e49a790..a1dbcfb9740 100644
--- a/net/icmpinfo/Makefile
+++ b/net/icmpinfo/Makefile
@@ -3,12 +3,11 @@
 # Date created:			  Mon June 23, 1997
 # Whom:				  Angelos D. Keromytis
 #
-# $OpenBSD: Makefile,v 1.4 2000/04/09 17:37:24 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2000/04/21 14:58:20 kevlo Exp $
 #
 
 DISTNAME=	icmpinfo-1.11
 CATEGORIES=	net sysutils
-FAKE=No
 MASTER_SITES=	ftp://hplyot.obspm.fr/net/
 
 MAINTAINER=     angelos@openbsd.org
@@ -19,7 +18,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 ALL_TARGET=
-MAN1=		icmpinfo.1
+MAN1=           icmpinfo.1
+FAKE=		Yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/icmpinfo ${PREFIX}/bin
@@ -27,7 +27,7 @@ do-install:
 	/bin/chmod 4555 ${PREFIX}/bin/icmpinfo
 	${INSTALL_MAN} ${WRKSRC}/icmpinfo.man ${PREFIX}/man/man1/${MAN1}
 .if !defined(NOPORTDOCS)
-	@mkdir -p ${PREFIX}/share/doc/icmpinfo
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icmpinfo
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icmpinfo
 .endif
 
diff --git a/net/icmpinfo/pkg/PLIST b/net/icmpinfo/pkg/PLIST
index 1059313c3f4..a3630157bdd 100644
--- a/net/icmpinfo/pkg/PLIST
+++ b/net/icmpinfo/pkg/PLIST
@@ -1,3 +1,4 @@
 bin/icmpinfo
 man/man1/icmpinfo.1
 share/doc/icmpinfo/README
+@dirrm share/doc/icmpinfo