pkgsrc/misc/fd 3.01b

fd.patch

diff -urN misc/fd/Makefile local/fd/Makefile
--- misc/fd/Makefile	2012-10-08 18:57:21.000000000 +0900
+++ local/fd/Makefile	2015-01-04 21:36:36.000000000 +0900
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.29 2012/10/08 09:57:21 asau Exp $
 #
 
-DISTNAME=	FD-3.00j
+DISTNAME=	FD-3.01b
 PKGNAME=	${DISTNAME:tl}
-PKGREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 
@@ -11,6 +10,8 @@
 HOMEPAGE=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 COMMENT=	File and directory management tool
 
+MAKE_FLAGS+=	CC=${CC}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS}
 MAKE_FLAGS+=	CONFDIR=${PKG_SYSCONFDIR}
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 
diff -urN misc/fd/distinfo local/fd/distinfo
--- misc/fd/distinfo	2011-12-19 09:25:59.000000000 +0900
+++ local/fd/distinfo	2015-01-04 22:05:57.000000000 +0900
@@ -1,6 +1,7 @@
 $NetBSD: distinfo,v 1.11 2011/12/19 00:25:59 sbd Exp $
 
-SHA1 (FD-3.00j.tar.gz) = 4cf6ce007ee62fba7166cb405122b2da7277dca3
-RMD160 (FD-3.00j.tar.gz) = b976c68e6facc01bf331959be4b831206c05fef7
-Size (FD-3.00j.tar.gz) = 925560 bytes
-SHA1 (patch-Makefile.in) = ad7f99cbeee272e4d3b31d43456dbedac48abe72
+SHA1 (FD-3.01b.tar.gz) = 01a0174d0409a246c2caf34e901a1d51f9e45519
+RMD160 (FD-3.01b.tar.gz) = 50ac94ed1e8a93a9a0001038ab6517e89031ea4a
+Size (FD-3.01b.tar.gz) = 953287 bytes
+SHA1 (patch-Makefile.in) = d54bf9caca0bbddb7a62c3d8caf010b20999fe5a
+SHA1 (patch-machine.h) = 1b61464bb307af564b8eeb6af6d979431d4cd0fb
diff -urN misc/fd/patches/patch-Makefile.in local/fd/patches/patch-Makefile.in
--- misc/fd/patches/patch-Makefile.in	2011-12-19 09:25:59.000000000 +0900
+++ local/fd/patches/patch-Makefile.in	2015-01-04 22:15:35.000000000 +0900
@@ -2,11 +2,8 @@
 
 * honor PKGMANDIR
 * let not to take __LANGDIR__ from ${LANG}
-* Append to LDFLAGS
-* Force the use of -ltermcap and let BUILDLINK_TRANSFORM sort out the right
-  library to use.
 
---- Makefile.in.orig	2010-09-24 15:00:00.000000000 +0000
+--- Makefile.in.orig	2014-05-05 15:00:00.000000000 +0000
 +++ Makefile.in
 @@ -13,11 +13,11 @@ BINTOP	= $(PREFIX)/bin
  BINDIR	= $(BUILD)$(BINTOP)
@@ -23,12 +20,3 @@
  IPKWDIR	= ./ipk.work
  IPKTDIR	= ./ipk.tmp
  DEPDIR	= ./depend.tmp
-@@ -191,7 +191,7 @@ TOBJ	= tstring$(OBJ) troman$(OBJ) tkconv
- ALLOC	=
- DEBUG	=
- 
--LDFLAGS	= __TERMLIBS__ __REGLIBS__ __SOCKETLIBS__ __OTHERLIBS__ $(ALLOC)
-+LDFLAGS	+= -ltermcap __REGLIBS__ __SOCKETLIBS__ __OTHERLIBS__ $(ALLOC)
- CFLAGS	= -D__OSTYPE__=1 __CCOPTIONS__ $(DEBUG)
- HOSTCFLAGS = -D__OSTYPE__=1 __HOSTCCOPTIONS__
- SLDFLAGS = __REGLIBS__ __OTHERLIBS__ $(ALLOC)
diff -urN misc/fd/patches/patch-machine.h local/fd/patches/patch-machine.h
--- misc/fd/patches/patch-machine.h	1970-01-01 09:00:00.000000000 +0900
+++ local/fd/patches/patch-machine.h	2015-01-04 22:05:48.000000000 +0900
@@ -0,0 +1,20 @@
+$NetBSD$
+
+* Force the use of -ltermcap and let BUILDLINK_TRANSFORM sort out the right
+  library to use.
+* Install *.tbl files to ${PREFIX}/share/fd.
+
+--- machine.h.orig	2014-05-05 15:00:00.000000000 +0000
++++ machine.h
+@@ -638,9 +638,11 @@ typedef long	off_t;
+ #define	CODEEUC
+ #define	BSDINSTALL
+ #define	TARUSESPACE
++#define	TERMCAPLIB		"-ltermcap"
+ #define	REGEXPLIB		"-lcompat"
+ #define	DECLSIGLIST
+ #define	DECLERRLIST
++#define	USEDATADIR
+ #define	USELEAPCNT
+ #define	USEFFSTYPE
+ #define	USERE_COMP