diff --git a/shells/fd/Makefile b/shells/fd/Makefile index 8c5faa45d393..dfd25e58eaba 100644 --- a/shells/fd/Makefile +++ b/shells/fd/Makefile @@ -1,47 +1,43 @@ 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 post-install: ${INSTALL_DATA} ${WRKSRC}/_fdrc.orig \ ${STAGEDIR}${PREFIX}/etc/fd2rc.dist ${INSTALL_DATA} ${WRKSRC}/_fdrc ${STAGEDIR}${PREFIX}/etc/fd2rc.sample post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} ${INSTALL_DATA} ${DOCS_EN:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS_JA:S,^,${WRKSRC}/,} \ ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME} .include 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,183 +1,183 @@ ---- _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) #SORTTYPE=0 +FD_SORTTYPE=101 # default display mode # 0: normal (Default) @@ -33,12 +34,14 @@ # 0: not sort (Default) # >= 1: sort according to SORTTYPE #SORTTREE=0 +FD_SORTTREE=1 # behavior about writing over directory on file system # 0: confirm to write or not, after directory arranged (Default) # 1: write directory only if commanded # 2: never write over directory even if commanded #WRITEFS=0 +FD_WRITEFS=1 # whether if ignore uppercase or lowercase in filename comparison # 0: not ignore (Default) @@ -49,6 +52,7 @@ # 0: not inherit (Default) # >= 1: inherit #INHERITCOPY=0 +FD_INHERITCOPY=1 # whether if display progress bar on copying/moving files # 0: not dislpay (Default) @@ -76,6 +80,7 @@ # 3: 3 columns # 5: 5 columns #DEFCOLUMNS=2 +FD_DEFCOLUMNS=1 # 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 +FD_ANSICOLOR=1 # 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 +FD_THRUARGS=1 # 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="" +FD_LANGUAGE=$LANG # system default Kanji code # Default: No convert -@@ -507,13 +515,58 @@ +@@ -535,13 +543,58 @@ #NOCONVPATH="" #PAGER=more%K +FD_PAGER=${PAGER:-/usr/bin/more}%K #EDITOR=vi #SHELL=/bin/sh # for Mischievous Japanese OS (see `man fd') #export LANG=C -# launcher definition +# launcher definitions +tar="tar" +tar_format="%a %u/%g %s %m %d %t %y %f" + +for ext in /.tar .gem; do + launch "$ext" "$tar tvf" "$tar_format" +done + +for ext in .tar.Z .taZ .TAZ; do + launch "$ext" "$tar Ztvf %C" "$tar_format" +done + +for ext in .tar.gz .tar.z /.tgz .taz; do + launch "$ext" "$tar ztvf %C" "$tar_format" +done + +for ext in .tar.bz2 .tbz2 /.tbz; do + launch "$ext" "$tar jtvf %C" "$tar_format" +done + +for ext in .tar.xz /.txz; do +# launch "$ext" "$tar Jtvf %C" "$tar_format" + launch "$ext" "xz -cd %C | $tar tvf -" "$tar_format" +done + +launch "/.lzh" "lha -lq" "%a %u/%g %s %x %m %d %{yt} %f" + +for ext in /.zip /.jar; do + launch "$ext" "unzip -lqq" " %s %m-%d-%y %t %f" +done + +for ext in .Z /.gz; do + launch "$ext" "zcat %C | $PAGER" +done + +launch "/.bz2" "bzip2 -cd %C | $PAGER" +launch "/.xz" "xz -cd %C | $PAGER" + +# RCS/CVS files +launch ",v" "rlog %C | $PAGER" + +# distribution files +launch "/.aa" "cat %X.?? | $tar tvfz -" "$tar_format" +arch "/.aa" "echo ERROR" "cat %X.?? | $tar zxf - %TA" + #(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 + +for ext in /.tar; do + arch "$ext" "$tar cf %C %T" "$tar xf %C %TA" +done + +for ext in .tar.Z .taZ .TAZ; do + arch "$ext" "$tar Zcf %C %T" "$tar Zxf %C %TA" +done + +for ext in .tar.gz .tar.z /.tgz .taz; do + arch "$ext" "$tar cf - %T | gzip -9c > %C" "$tar zxf %C %TA" +done + +for ext in .tar.bz2 .tbz2 /.tbz; do + arch "$ext" "$tar cf - %T | bzip2 -9c > %C" "$tar jxf %C %TA" +done + +for ext in .tar.xz /.txz; do +# arch "$ext" "$tar cf - %T | xz -9c > %C" "$tar Jxf %C %TA" + arch "$ext" "$tar cf - %T | xz -9c > %C" "xz -cd %C | $tar xf - %TA" +done + +arch ".Z" "compress %M" "uncompress %C" +arch "/.gz" "gzip -9 %M" "gzip -d %C" +arch "/.bz2" "bzip2 -9 %M" "bzip2 -d %C" +arch "/.xz" "xz -9 %M" "xz -d %C" + +arch "/.lzh" "lha aq %C %TA" "lha xq %C %TA" + +for ext in /.zip /.jar; do + arch "$ext" "zip -qr %C %TA" "unzip -q %C %TA" +done + +_uuencode() { + uu=$1 + shift + for file; do + uuencode $file $file >> $uu + done +} + +arch ".uu" "_uuencode %C %TA" "uudecode -ic < %C" + #(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~" + +if [ -f /etc/fd2rc.local ]; then + source /etc/fd2rc.local +fi 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,17 +1,26 @@ ---- 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 -#define MAXLAUNCHTABLE 32 -#define MAXARCHIVETABLE 16 +#define MAXLAUNCHTABLE 64 +#define MAXARCHIVETABLE 32 #define MAXALIASTABLE 256 #define MAXFUNCTABLE 32 -#define MAXFUNCLINES 16 +#define MAXFUNCLINES 32 #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,37 +1,37 @@ ---- 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 -#if defined (__FreeBSD__) && defined (__powerpc__) -#define BSD44 -#define OSTYPE "JCCBSD" -#define CODEEUC -#define TARUSESPACE -#define REGEXPLIB "-lcompat" -#define DECLSIGLIST -#define DECLERRLIST -#define USELEAPCNT -#define USEMOUNTH -#define USEMNTINFO -#define USERE_COMP -#define USESETENV -#define ULONGIOCTL -#define USEMKTIME -#define SIGFNCINT -#define USEINETATON -#endif - #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 -#define EXTENDCCOPT "-O" +#define EXTENDCCOPT "" #endif #ifndef TERMCAPLIB # ifdef USETERMINFO 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 @@ -1,7 +1,7 @@ `FD' (FDclone) is a CUI-based file and directory management tool which allows you to browse and manipulate directories and files with an easy 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.