>Number:         8418
>Category:       pkg
>Synopsis:       update: pkgsrc/misc/fd (followup source distribution update)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager (NetBSD software packages system bug manager)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 15 18:50:01 1999
>Last-Modified:
>Originator:     Nobuhiro Yasutomi
>Organization:
ISAC, Inc.
>Release:        NetBSD 1.4
>Environment:
>Description:
update pkgsrc/misc/fd (followup source distribution update).
remove patch-a[b-d] files it's merge to source.
>How-To-Repeat:


>Fix:
diff -ur fd.old/Makefile fd/Makefile
--- fd.old/Makefile	Mon Mar  8 19:53:57 1999
+++ fd/Makefile	Thu Sep 16 10:34:32 1999
@@ -1,31 +1,32 @@
 # $NetBSD: Makefile,v 1.7 1999/03/08 10:53:57 agc Exp $
-# FreeBSD Id: Makefile,v 1.5 1997/01/06 06:38:33 max Exp
+# FreeBSD: ports/misc/fd/Makefile,v 1.14 1999/08/25 07:21:37 obrien Exp
 #
 
-DISTNAME=	FD-1.01
-PKGNAME=	fd-1.01h
+DISTNAME=	FD-1.03k
+PKGNAME=	fd-1.03k
 CATEGORIES=	misc
-# 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/
-
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	FD-1.01g.patch.gz FD-1.01h.patch.gz
+MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/
 
 MAINTAINER=	nobu@psrc.isac.co.jp
 
-ALL_TARGET=	goal
-INSTALL_TARGET=	install
+MANLANG=	ja
+MAN1=		fd.1
+MAKE_ENV=	LANG=${MANLANG}
+DOCS=		README FAQ HISTORY ToAdmin
+SIGNATURE=	Nobuhiro Yasutomi <${MAINTAINER}>
 
+# require maintainer signature for binary package distributions
 do-configure:
-	cd ${WRKSRC} ; ${MAKE} config
+	@cd ${WRKSRC}; v=version.h; ${MV} $$v $$v.orig; \
+	${SED} 's/\(distributor = \)NULL/\1"${SIGNATURE}"/' $$v.orig > $$v
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/fd ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/fd.1 ${PREFIX}/man/ja_JP.EUC/man1
-	${INSTALL_DATA} ${WRKSRC}/.fdrc ${PREFIX}/etc/fdrc
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/fd
+	@for i in $(DOCS); do \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \
+	done
+.endif
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff -ur fd.old/files/md5 fd/files/md5
--- fd.old/files/md5	Fri Aug  7 22:25:05 1998
+++ fd/files/md5	Thu Sep 16 10:07:52 1999
@@ -1,5 +1 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:25:05 agc Exp $
-
-MD5 (FD-1.01.tar.gz) = 3444e994a8b37bd004280d44ffcccff0
-MD5 (FD-1.01g.patch.gz) = 8eb94f0bc3cc044e01ba181278499393
-MD5 (FD-1.01h.patch.gz) = 01dd4b346ec282cb4fe35f4e10dec0c0
+MD5 (FD-1.03k.tar.gz) = 17a82e75d72153512500274c7ca75d10
Only in fd.old/files: patch-sum
diff -ur fd.old/patches/patch-aa fd/patches/patch-aa
--- fd.old/patches/patch-aa	Fri Aug  7 20:10:17 1998
+++ fd/patches/patch-aa	Thu Sep 16 10:07:52 1999
@@ -1,20 +1,11 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:17 agc Exp $
-
---- Makefile.in-orig	Mon Jan  6 14:18:12 1997
-+++ Makefile.in	Mon Jan  6 14:20:26 1997
-@@ -3,10 +3,12 @@
+--- Makefile.in.orig	Tue Sep 16 00:00:15 1997
++++ Makefile.in	Fri Sep 19 21:42:41 1997
+@@ -3,7 +3,7 @@
  #
  
  TITLE	= FD-
--TOPDIR	= /usr/local
-+PREFIX ?= /usr/local
-+TOPDIR	= $(PREFIX)
+-PREFIX	= /usr/local
++PREFIX	?= /usr/local
+ TOPDIR	= $(PREFIX)
  BINDIR	= $(TOPDIR)/bin
--MANDIR	= $(TOPDIR)/man/man$(MANSEC)
--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
+ MANDIR	= $(TOPDIR)/man__LANGDIR__/man$(MANSEC)
Only in fd.old/patches: patch-ab
Only in fd.old/patches: patch-ac
Only in fd.old/patches: patch-ad
diff -ur fd.old/pkg/DESCR fd/pkg/DESCR
--- fd.old/pkg/DESCR	Sun Oct 12 06:54:17 1997
+++ fd/pkg/DESCR	Thu Sep 16 10:07:52 1999
@@ -2,7 +2,7 @@
 Browsing file list, viewing, editing, archiving/extracting management
 with a few touch.
 
-FD for unix by shirai@red.nintendo.co.jp, and it is a clone of
+FD for unix by shirai@nintendo.co.jp, and it is a clone of
 FD for DOS (AT and PC9801) designed by A. Idei (SDI00544@niftyserve.or.jp).
 
       Currently, the man page is available only in Japanese, but it's
diff -ur fd.old/pkg/PLIST fd/pkg/PLIST
--- fd.old/pkg/PLIST	Thu Nov  6 19:01:32 1997
+++ fd/pkg/PLIST	Thu Sep 16 10:07:52 1999
@@ -1,4 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 1997/11/06 10:01:32 agc Exp $
 bin/fd
-man/ja_JP.EUC/man1/fd.1.gz
-etc/fdrc
+bin/fd-unicd.tbl
+share/doc/fd/FAQ
+share/doc/fd/HISTORY
+share/doc/fd/README
+share/doc/fd/ToAdmin
+@dirrm share/doc/fd

>Audit-Trail:
>Unformatted: