diff options
author | rh <rh> | 1999-12-03 16:23:17 +0000 |
---|---|---|
committer | rh <rh> | 1999-12-03 16:23:17 +0000 |
commit | 6a4a00a94b4cc7e3078313e3662ed2af4b288a63 (patch) | |
tree | 34050214729074c5888795e853ea9cf3bf588754 | |
parent | 4e07ce50568734e153f6946d742b9f37387fc5e5 (diff) | |
download | pkgsrc-6a4a00a94b4cc7e3078313e3662ed2af4b288a63.tar.gz |
Update fd to 1.03l using the patches provided by Nobuhiro Yasutomi in PRs
8418 and 8940, thanks. This closes these PRs.
-rw-r--r-- | misc/fd/Makefile | 41 | ||||
-rw-r--r-- | misc/fd/files/md5 | 6 | ||||
-rw-r--r-- | misc/fd/files/patch-sum | 7 | ||||
-rw-r--r-- | misc/fd/patches/patch-aa | 23 | ||||
-rw-r--r-- | misc/fd/patches/patch-ab | 13 | ||||
-rw-r--r-- | misc/fd/patches/patch-ac | 13 | ||||
-rw-r--r-- | misc/fd/patches/patch-ad | 13 | ||||
-rw-r--r-- | misc/fd/pkg/DESCR | 2 | ||||
-rw-r--r-- | misc/fd/pkg/PLIST | 10 |
9 files changed, 41 insertions, 87 deletions
diff --git a/misc/fd/Makefile b/misc/fd/Makefile index 9915ac98b5e..7b7cf9e768f 100644 --- a/misc/fd/Makefile +++ b/misc/fd/Makefile @@ -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 +# $NetBSD: Makefile,v 1.8 1999/12/03 16:23:17 rh 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.03l +PKGNAME= fd-1.03l 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 --git a/misc/fd/files/md5 b/misc/fd/files/md5 index 2acdec6ab58..8100425c234 100644 --- a/misc/fd/files/md5 +++ b/misc/fd/files/md5 @@ -1,5 +1,3 @@ -$NetBSD: md5,v 1.2 1998/08/07 13:25:05 agc Exp $ +$NetBSD: md5,v 1.3 1999/12/03 16:23:18 rh 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.03l.tar.gz) = 290d37e37945a98829ddc59fc7fa3fed diff --git a/misc/fd/files/patch-sum b/misc/fd/files/patch-sum index 0dd080c3fcc..e7e859424bb 100644 --- a/misc/fd/files/patch-sum +++ b/misc/fd/files/patch-sum @@ -1,6 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:14 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/12/03 16:23:18 rh Exp $ -MD5 (patch-aa) = 41013f2118f14ef367041bb06649f7fd -MD5 (patch-ab) = 2a0bec77174c277e883e72792c1b0c3f -MD5 (patch-ac) = ee91dcf8dc86f84c1caa41d55e2c107b -MD5 (patch-ad) = c0a47caf3d99458e397d7e8dddd0042d +MD5 (patch-aa) = a61dc47ff929077815c0ca0750aa3522 diff --git a/misc/fd/patches/patch-aa b/misc/fd/patches/patch-aa index 5e8a6e20a25..dc92db71fbf 100644 --- a/misc/fd/patches/patch-aa +++ b/misc/fd/patches/patch-aa @@ -1,20 +1,13 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:10:17 agc Exp $ +$NetBSD: patch-aa,v 1.3 1999/12/03 16:23:18 rh 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) diff --git a/misc/fd/patches/patch-ab b/misc/fd/patches/patch-ab deleted file mode 100644 index f3129dcbb0e..00000000000 --- a/misc/fd/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:18 agc Exp $ - ---- input.c.BAK Thu Oct 23 22:11:36 1997 -+++ input.c Thu Oct 23 22:11:49 1997 -@@ -21,7 +21,7 @@ - extern int sorton; - extern int minfilename; - extern int inputkcode; --#ifndef DECLERRLIST -+#if 0 - extern char *sys_errlist[]; - #endif - diff --git a/misc/fd/patches/patch-ac b/misc/fd/patches/patch-ac deleted file mode 100644 index 1bdfcecb7d8..00000000000 --- a/misc/fd/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1998/08/07 11:10:18 agc Exp $ - ---- Makefile.in.BAK Thu Oct 23 22:20:04 1997 -+++ Makefile.in Thu Oct 23 22:20:14 1997 -@@ -9,7 +9,7 @@ - MANDIR = $(TOPDIR)/man/$(MANLANG)/man$(MANSEC) - CATDIR = $(TOPDIR)/man/$(MANLANG)/cat$(MANSEC) - MANLANG = ja_JP.EUC --DEFRC = /etc/fdrc -+DEFRC = ${PREFIX}/etc/fdrc - SHELL = /bin/sh - INSTALL = cp -p - CHMOD = chmod diff --git a/misc/fd/patches/patch-ad b/misc/fd/patches/patch-ad deleted file mode 100644 index a3f878ef0d1..00000000000 --- a/misc/fd/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 11:10:18 agc Exp $ - ---- machine.h.orig Sat Jun 27 22:34:14 1998 -+++ machine.h Sat Jun 27 22:35:30 1998 -@@ -160,7 +160,7 @@ - #define SIGARGINT - #endif - --#if (defined (__alpha) || defined (alpha)) && !defined(linux) -+#if (defined (__alpha) || defined (alpha)) && !defined(linux) && !defined(__NetBSD__) - #define CODEEUC - #define TARUSESPACE - # if defined (SYSTYPE_BSD) diff --git a/misc/fd/pkg/DESCR b/misc/fd/pkg/DESCR index a2f4ca9d01d..a078751d241 100644 --- a/misc/fd/pkg/DESCR +++ b/misc/fd/pkg/DESCR @@ -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 --git a/misc/fd/pkg/PLIST b/misc/fd/pkg/PLIST index 0cc041e1c5c..0c2ea2f5c7c 100644 --- a/misc/fd/pkg/PLIST +++ b/misc/fd/pkg/PLIST @@ -1,4 +1,8 @@ -@comment $NetBSD: PLIST,v 1.3 1997/11/06 10:01:32 agc Exp $ +@comment $NetBSD: PLIST,v 1.4 1999/12/03 16:23:19 rh 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 |