5 files changed, 36 insertions, 31 deletions

diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 8c5faa45d393..dfd25e58eaba 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -1,34 +1,30 @@
 PORTNAME=	fd
 PORTVERSION=	3.01j
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells net
-MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
+MASTER_SITES=	http://www.unixusers.net/authors/VA012337/soft/fd/ \
 		ftp://ftp.unixusers.net/src/fdclone/
 DISTNAME=	FD-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mew14930xvi@inbox.lv
 COMMENT=	CUI-based file and directory management tool
-WWW=		https://hp.vector.co.jp/authors/VA012337/soft/fd/
+WWW=		http://www.unixusers.net/authors/VA012337/soft/fd/index.html
+
+LICENSE=	UNKNOWN
+LICENSE_NAME=	unknown
+LICENSE_FILE=	${WRKSRC}/LICENSES
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USE_LOCALE=	ja
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
-		PREFIX="\$$(DESTDIR)${PREFIX}" \
 		CONFDIR="\$$(DESTDIR)${PREFIX}/etc" \
 		MANTOP="\$$(DESTDIR)${PREFIX}/share/man" \
+		PREFIX="\$$(DESTDIR)${PREFIX}"
 
 CONFLICTS_INSTALL=	fd-find # bin/fd
 
-DOCS_EN=	FAQ.eng \
-		LICENSES.eng \
-		README.eng \
-		TECHKNOW.eng \
-		ToAdmin.eng
-DOCS_JA=	FAQ \
-		HISTORY \
-		LICENSES \
-		README \
-		TECHKNOW \
-		ToAdmin
+DOCS_EN=	FAQ.eng LICENSES.eng README.eng TECHKNOW.eng ToAdmin.eng
+DOCS_JA=	FAQ HISTORY LICENSES README TECHKNOW ToAdmin
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/shells/fd/files/patch-_fdrc b/shells/fd/files/patch-_fdrc
index 4ba3f0e5d640..f5a7cea38d57 100644
--- a/shells/fd/files/patch-_fdrc
+++ b/shells/fd/files/patch-_fdrc
@@ -1,5 +1,5 @@
---- _fdrc.orig	2010-09-25 00:00:00.000000000 +0900
-+++ _fdrc	2011-05-16 18:40:53.987863891 +0900
+--- _fdrc.orig	2019-07-26 15:00:00 UTC
++++ _fdrc
 @@ -17,6 +17,7 @@
  #	200-213: preserve previous sort type also in the archive browser
  #		(the least 2 digits are effective just after initialize)
@@ -39,7 +39,7 @@
  
  # minimum columns of filename field
  #	Default: 12
-@@ -156,6 +161,7 @@
+@@ -184,6 +189,7 @@
  #	2: color & force background to blacken
  #	3: color & force foreground to blacken
  #ANSICOLOR=0
@@ -47,7 +47,7 @@
  
  # color palette in the ANSI color mode
  #	Default: none
-@@ -270,6 +276,7 @@
+@@ -298,6 +304,7 @@
  #	0: evaluate arguments (Default)
  #	>= 1: pass through
  #THRUARGS=0
@@ -55,7 +55,7 @@
  
  # whether if make URL drive effective
  #	0: not use (Default)
-@@ -365,6 +372,7 @@
+@@ -393,6 +400,7 @@
  #	utf8-iconv, UTF8-ICONV: UTF-8 for iconv
  #	en, EN, C: English
  #LANGUAGE=""
@@ -63,7 +63,7 @@
  
  # system default Kanji code
  #	Default: No convert
-@@ -507,13 +515,58 @@
+@@ -535,13 +543,58 @@
  #NOCONVPATH=""
  
  #PAGER=more%K
@@ -123,7 +123,7 @@
  #(Default)
  #launch ".lzh"		"lha l" \
  #		-f "%a %u/%g %s %x %m %d %{yt} %*f" \
-@@ -634,6 +687,49 @@
+@@ -662,6 +715,49 @@
  #launch ".zip"	"pkunzip -vb %S"	" %s %x %x %x %y-%m-%d %t %*f" 14 2
  
  # archiver definition
@@ -173,7 +173,7 @@
  #(Default)
  #arch ".lzh"	"lha aq %C %TA"			"lha xq %C %TA"
  #arch ".tar"	"tar cf %C %T"			"tar xf %C %TA"
-@@ -727,3 +823,7 @@
+@@ -755,3 +851,7 @@
  # keymap definition
  #(Example)
  #keymap DEL	"\033[3~"
diff --git a/shells/fd/files/patch-fd.h b/shells/fd/files/patch-fd.h
index ebd224de1bb5..75132ecfd7fd 100644
--- a/shells/fd/files/patch-fd.h
+++ b/shells/fd/files/patch-fd.h
@@ -1,6 +1,6 @@
---- fd.h.orig	2008-04-19 00:00:00.000000000 +0900
-+++ fd.h	2008-07-10 20:00:12.000000000 +0900
-@@ -183,11 +183,11 @@
+--- fd.h.orig	2019-07-26 15:00:00 UTC
++++ fd.h
+@@ -215,11 +215,11 @@ extern char *_mtrace_file;
   ****************************************************************/
  #define	MAXBINDTABLE		256
  #define	MAXMACROTABLE		64
@@ -15,3 +15,12 @@
  #if	MSDOS
  #define	MAXCOMMSTR		(128 - 2)
  #endif
+@@ -408,7 +408,7 @@ extern char *_mtrace_file;
+ #define	TC_USED			(TC_TOTAL + TW_TOTAL + TD_TOTAL + TW_GAP)
+ #define	TC_FREE			(TC_USED + TW_USED + TD_USED + TW_GAP)
+ 
+-#define	WSIZE			9
++#define	WSIZE			10
+ #define	WSIZE2			8
+ #define	TWSIZE2			10
+ #define	WDATE			8
diff --git a/shells/fd/files/patch-machine.h b/shells/fd/files/patch-machine.h
index c0bb5d5559e9..b22ccc0c06eb 100644
--- a/shells/fd/files/patch-machine.h
+++ b/shells/fd/files/patch-machine.h
@@ -1,6 +1,6 @@
---- machine.h.orig	2014-05-05 15:00:00 UTC
+--- machine.h.orig	2019-07-26 15:00:00 UTC
 +++ machine.h
-@@ -584,25 +584,6 @@ typedef long	off_t;
+@@ -594,25 +594,6 @@ typedef long	off_t;
  #define	USEINETATON
  #endif
  
@@ -26,7 +26,7 @@
  #if	defined (__FreeBSD__) && !defined (OSTYPE) && !defined (__BOW__)
  #define	BSD44
  #define	OSTYPE			"FREEBSD"
-@@ -1315,7 +1296,7 @@ typedef unsigned long		u_long;
+@@ -1341,7 +1322,7 @@ typedef unsigned long		u_long;
  #define	CCCOMMAND		"cc"
  #endif
  #ifndef	EXTENDCCOPT
diff --git a/shells/fd/pkg-descr b/shells/fd/pkg-descr
index 41981eea551b..d609f408c5e3 100644
--- a/shells/fd/pkg-descr
+++ b/shells/fd/pkg-descr
@@ -4,4 +4,4 @@ and intuitive user interface.  It also has a built-in Bourne-shell
 compatible shell which can be run stand-alone by the name of `fdsh'.
 
 This version is a clone of FD for DOS (AT and PC9801) designed and
-written by A. Idei (SDI00544@niftyserve.or.jp).
+written by A. Idei.