Upgrade, 1.01 -> 1.01h.

Reviewed by:	max
Submitted by:	nobu@psrc.isac.co.jp

6 files changed, 52 insertions, 150 deletions

diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 0252ccaa9076..6083687b3d97 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,24 +1,35 @@
 # New ports collection makefile for:    FD
-# Version required:     1.01
+# Version required:     1.01h
 # Date created:         20 Feb 1996
 # Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.3 1996/11/17 09:05:43 obrien Exp $
+# $Id: $
 #
 
-DISTNAME=       FD-1.01
-PKGNAME=        fd-1.01
+DISTNAME=	FD-1.01
+PKGNAME=	fd-1.01h
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.mei.co.jp/free/others/Utilities/
+# The original distribution (NetNews articles) can be found at following site.
+#  site= ftp://skylark.ics.es.osaka-u.ac.jp/pub/FDclone/
+#  files= FD-1.01 FD-1.01g FD-1.01h
+# Here ,we use already decoded archive for convenience.
+MASTER_SITES=	ftp://ftp.hipecs.hokudai.ac.jp/pub/unix/FD/ \
+		ftp://ftp.cc.saga-u.ac.jp/pub/fj.sources/FD/
+
+PATCHFILES=	FD-1.01g.patch.gz FD-1.01h.patch.gz
+PATCH_SITES=	${MASTER_SITES}
 
 MAINTAINER=	nobu@psrc.isac.co.jp
 
 ALL_TARGET=	goal
-PATCH_STRIP=	-p0 -o fdrc
+INSTALL_TARGET=	install
 MANLANG=	ja_JP.EUC
 MAN1=		fd.1
 
 do-configure:
 	cd ${WRKSRC} ; make config
 
+post-install:
+	@strip ${PREFIX}/bin/fd
+
 .include <bsd.port.mk>
diff --git a/misc/fd/files/patch-aa b/misc/fd/files/patch-aa
index 14a21accb73b..f4a97c2c6690 100644
--- a/misc/fd/files/patch-aa
+++ b/misc/fd/files/patch-aa
@@ -1,77 +1,18 @@
---- .fdrc	Fri Oct  6 15:38:56 1995
-+++ fdrc	Tue Feb 20 13:34:02 1996
-@@ -77,7 +77,7 @@
- 
- # temporary directory where archive file is unpacked
- #	default: /tmp
--TMPDIR		=	/usr/tmp
-+TMPDIR		=	/tmp
- 
- # language code type to display
- #	default: No convert
-@@ -87,8 +87,8 @@
- #	eng, ENG, C: English
- LANGUAGE	=	$LANG
- 
--PAGER	=	/usr/local/bin/less
--EDITOR	=	/usr/ucb/vi
-+PAGER	=	/usr/bin/more
-+EDITOR	=	/usr/bin/vi
- 
- # for Mischievous Japanese OS (see `man fd')
- #export	LANG=C
-@@ -98,18 +98,21 @@
- #".tar"		"tar tvf"		0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
- #".tar.Z"	"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
- #".tar.gz"	"gunzip -c %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
--".taZ"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
--".taz"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
--".tgz"		"gunzip -c %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
-+#".taZ"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
-+#".taz"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
-+#".tgz"		"gunzip -c %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
- ".zip"		"unzip -lqq"		0,0:0,0,0,1,4,2,3,5,6:13,16
- ".zoo"		"zoo lq"		0,0:0,0,0,1,0,5,4,7-'+',8
- ".Z"		"zcat %C | $PAGER"
- ".gz"		"gunzip -c %C | $PAGER"
- 
- # example for SVR4 (or GNU tar)
--#".tar"		"tar tvf"		0,0:1,2-'/',2'/',3,7,4,5,6,8
--#".tar.Z"	"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
--#".tar.gz"	"gunzip -c %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tar"		"tar tvf"		0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tar.Z"	"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tar.gz"	"gunzip -c %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".taZ"		"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".taz"		"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tgz"		"gunzip -c %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
- 
- # archiver definition
- #".lzh"		A "lha aq %C %TA"		"lha xq %C %TA"
---- Makefile.in.orig	Mon Dec 18 13:39:36 1995
-+++ Makefile.in	Thu Dec 12 12:10:02 1996
-@@ -3,11 +3,12 @@
+--- Makefile.in-orig	Mon Jan  6 14:18:12 1997
++++ Makefile.in	Mon Jan  6 14:20:26 1997
+@@ -3,10 +3,12 @@
  #
  
  TITLE	= FD-
 -TOPDIR	= /usr/local
-+PREFIX?=  /usr/local
++PREFIX ?= /usr/local
 +TOPDIR	= $(PREFIX)
  BINDIR	= $(TOPDIR)/bin
 -MANDIR	= $(TOPDIR)/man/man$(MANSEC)
-+MANDIR	= $(TOPDIR)/man/ja_JP.EUC/man$(MANSEC)
- CATDIR	= $(TOPDIR)/man/cat$(MANSEC)
--DEFRC	= /etc/fdrc
-+DEFRC	= $(TOPDIR)/etc/fdrc
+-CATDIR	= $(TOPDIR)/man/cat$(MANSEC)
++MANDIR	= $(TOPDIR)/man/$(MANLANG)/man$(MANSEC)
++CATDIR	= $(TOPDIR)/man/$(MANLANG)/cat$(MANSEC)
++MANLANG = ja_JP.EUC
+ DEFRC	= /etc/fdrc
  SHELL	= /bin/sh
  INSTALL	= cp -p
- CHMOD	= chmod
-@@ -40,7 +41,7 @@
- 	kanji.o file.o apply.o archive.o tree.o command.o browse.o
- 
- LDFLAGS	= __TERMLIBS__ __REGLIBS__ __OTHERLIBS__
--CFLAGS	= -DFD -D__OSTYPE__ -DDEFRUNCOM=\"$(DEFRC)\" __CCOPTIONS__
-+CFLAGS	+= -DFD -D__OSTYPE__ -DDEFRUNCOM=\"$(DEFRC)\" __CCOPTIONS__
- 
- ############################################################
- #	Dependency Rules
diff --git a/misc/fd/pkg-plist b/misc/fd/pkg-plist
index 9f641075e93d..3c938bea8235 100644
--- a/misc/fd/pkg-plist
+++ b/misc/fd/pkg-plist
@@ -1,3 +1,2 @@
 bin/fd
 man/ja_JP.EUC/man1/fd.1.gz
-etc/fdrc
diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 0252ccaa9076..6083687b3d97 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -1,24 +1,35 @@
 # New ports collection makefile for:    FD
-# Version required:     1.01
+# Version required:     1.01h
 # Date created:         20 Feb 1996
 # Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.3 1996/11/17 09:05:43 obrien Exp $
+# $Id: $
 #
 
-DISTNAME=       FD-1.01
-PKGNAME=        fd-1.01
+DISTNAME=	FD-1.01
+PKGNAME=	fd-1.01h
 CATEGORIES=	misc
-MASTER_SITES=	ftp://ftp.mei.co.jp/free/others/Utilities/
+# The original distribution (NetNews articles) can be found at following site.
+#  site= ftp://skylark.ics.es.osaka-u.ac.jp/pub/FDclone/
+#  files= FD-1.01 FD-1.01g FD-1.01h
+# Here ,we use already decoded archive for convenience.
+MASTER_SITES=	ftp://ftp.hipecs.hokudai.ac.jp/pub/unix/FD/ \
+		ftp://ftp.cc.saga-u.ac.jp/pub/fj.sources/FD/
+
+PATCHFILES=	FD-1.01g.patch.gz FD-1.01h.patch.gz
+PATCH_SITES=	${MASTER_SITES}
 
 MAINTAINER=	nobu@psrc.isac.co.jp
 
 ALL_TARGET=	goal
-PATCH_STRIP=	-p0 -o fdrc
+INSTALL_TARGET=	install
 MANLANG=	ja_JP.EUC
 MAN1=		fd.1
 
 do-configure:
 	cd ${WRKSRC} ; make config
 
+post-install:
+	@strip ${PREFIX}/bin/fd
+
 .include <bsd.port.mk>
diff --git a/shells/fd/files/patch-aa b/shells/fd/files/patch-aa
index 14a21accb73b..f4a97c2c6690 100644
--- a/shells/fd/files/patch-aa
+++ b/shells/fd/files/patch-aa
@@ -1,77 +1,18 @@
---- .fdrc	Fri Oct  6 15:38:56 1995
-+++ fdrc	Tue Feb 20 13:34:02 1996
-@@ -77,7 +77,7 @@
- 
- # temporary directory where archive file is unpacked
- #	default: /tmp
--TMPDIR		=	/usr/tmp
-+TMPDIR		=	/tmp
- 
- # language code type to display
- #	default: No convert
-@@ -87,8 +87,8 @@
- #	eng, ENG, C: English
- LANGUAGE	=	$LANG
- 
--PAGER	=	/usr/local/bin/less
--EDITOR	=	/usr/ucb/vi
-+PAGER	=	/usr/bin/more
-+EDITOR	=	/usr/bin/vi
- 
- # for Mischievous Japanese OS (see `man fd')
- #export	LANG=C
-@@ -98,18 +98,21 @@
- #".tar"		"tar tvf"		0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
- #".tar.Z"	"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
- #".tar.gz"	"gunzip -c %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
--".taZ"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
--".taz"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
--".tgz"		"gunzip -c %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
-+#".taZ"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
-+#".taz"		"zcat %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
-+#".tgz"		"gunzip -c %C | tar tvf -"	0,0:1-9,2-'/',2'/',3,7,4,5,6,8:10
- ".zip"		"unzip -lqq"		0,0:0,0,0,1,4,2,3,5,6:13,16
- ".zoo"		"zoo lq"		0,0:0,0,0,1,0,5,4,7-'+',8
- ".Z"		"zcat %C | $PAGER"
- ".gz"		"gunzip -c %C | $PAGER"
- 
- # example for SVR4 (or GNU tar)
--#".tar"		"tar tvf"		0,0:1,2-'/',2'/',3,7,4,5,6,8
--#".tar.Z"	"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
--#".tar.gz"	"gunzip -c %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tar"		"tar tvf"		0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tar.Z"	"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tar.gz"	"gunzip -c %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".taZ"		"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".taz"		"zcat %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
-+".tgz"		"gunzip -c %C | tar tvf -"	0,0:1,2-'/',2'/',3,7,4,5,6,8
- 
- # archiver definition
- #".lzh"		A "lha aq %C %TA"		"lha xq %C %TA"
---- Makefile.in.orig	Mon Dec 18 13:39:36 1995
-+++ Makefile.in	Thu Dec 12 12:10:02 1996
-@@ -3,11 +3,12 @@
+--- Makefile.in-orig	Mon Jan  6 14:18:12 1997
++++ Makefile.in	Mon Jan  6 14:20:26 1997
+@@ -3,10 +3,12 @@
  #
  
  TITLE	= FD-
 -TOPDIR	= /usr/local
-+PREFIX?=  /usr/local
++PREFIX ?= /usr/local
 +TOPDIR	= $(PREFIX)
  BINDIR	= $(TOPDIR)/bin
 -MANDIR	= $(TOPDIR)/man/man$(MANSEC)
-+MANDIR	= $(TOPDIR)/man/ja_JP.EUC/man$(MANSEC)
- CATDIR	= $(TOPDIR)/man/cat$(MANSEC)
--DEFRC	= /etc/fdrc
-+DEFRC	= $(TOPDIR)/etc/fdrc
+-CATDIR	= $(TOPDIR)/man/cat$(MANSEC)
++MANDIR	= $(TOPDIR)/man/$(MANLANG)/man$(MANSEC)
++CATDIR	= $(TOPDIR)/man/$(MANLANG)/cat$(MANSEC)
++MANLANG = ja_JP.EUC
+ DEFRC	= /etc/fdrc
  SHELL	= /bin/sh
  INSTALL	= cp -p
- CHMOD	= chmod
-@@ -40,7 +41,7 @@
- 	kanji.o file.o apply.o archive.o tree.o command.o browse.o
- 
- LDFLAGS	= __TERMLIBS__ __REGLIBS__ __OTHERLIBS__
--CFLAGS	= -DFD -D__OSTYPE__ -DDEFRUNCOM=\"$(DEFRC)\" __CCOPTIONS__
-+CFLAGS	+= -DFD -D__OSTYPE__ -DDEFRUNCOM=\"$(DEFRC)\" __CCOPTIONS__
- 
- ############################################################
- #	Dependency Rules
diff --git a/shells/fd/pkg-plist b/shells/fd/pkg-plist
index 9f641075e93d..3c938bea8235 100644
--- a/shells/fd/pkg-plist
+++ b/shells/fd/pkg-plist
@@ -1,3 +1,2 @@
 bin/fd
 man/ja_JP.EUC/man1/fd.1.gz
-etc/fdrc