--- plamo/00_base/old/nvi-20170426/PlamoBuild.nvi-1.79	2017-04-26 06:54:18.000000000 +0900
+++ plamo/00_base/nvi/PlamoBuild.nvi-1.79	2018-08-15 17:39:36.000000000 +0900
@@ -1,18 +1,19 @@
 #!/bin/sh
 
 ######################################################################
-url="http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.tar.gz/765e2153f5fc4f21793f2edc2647305a/nvi-1.79.tar.gz
-    http://pkgs.fedoraproject.org/repo/pkgs/nvi-m17n/nvi-1.79.m17n-20040401.diff.gz/851650ced51697b3b08400fa75621c97/nvi-1.79.m17n-20040401.diff.gz
+url="http://motoyuki.bsdclub.org/data/FreeBSD/distfiles/nvi-1.79.tar.gz
+    http://motoyuki.bsdclub.org/data/FreeBSD/distfiles/nvi-m17n-1.79-20040608.diff.gz
     ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-1.79-64bit_breakage.patch.gz
     ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-1.79-DESTDIR.patch.gz
     ftp://plamo.linet.gr.jp/pub/Plamo-src/plamo/00_base/nvi/nvi-cmdwrapper.gz"
 verify=
 digest=
+branch=
 commitid=
 pkgbase=nvi
 vers=1.79
 arch=`uname -m`
-build=P9
+build=P10
 src=$pkgbase-$vers
 patchfiles=""
 OPT_CONFIG="--enable-multibyte=euc-jp"
@@ -24,7 +25,7 @@
     `echo docs/internals/{gdb.script,structures,autowrite,quoting}`
     `echo docs/internals/{input,context,openmode,cscope.NOTES}`
     docs/changelog docs/tutorial/* `echo build/README{,.LynxOS}` LICENSE"
-template=20170415
+template=20180815
 tmplurl=ftp://plamo.linet.gr.jp/pub/Plamo-src/admin
 ######################################################################
 
@@ -49,14 +50,14 @@
   apply_patches
   cd $B
   chmod -R u+w .
-  gunzip -c $W/nvi-1.79.m17n-20040401.diff.gz | patch -Np0 -i -
+  gunzip -c $W/nvi-m17n-1.79-20040608.diff.gz \
+      | sed '/^\(---\|+++\) /s@\t[[:graph:]]*$@@' | patch -Np0 -fZ -i -
   gunzip -c $W/nvi-1.79-64bit_breakage.patch.gz | patch -Np1 -i -
   gunzip -c $W/nvi-1.79-DESTDIR.patch.gz | patch -Np1 -i -
-  cp -p build/configure{,.orig}
-  sed -i '/^LDFLAGS=/s@$LDFLAGS@${LDFLAGS-"-lncurses"}@g' build/configure
   for i in `seq 0 $((${#B[@]} - 1))` ; do
     cd ${B[$i]}/build
     if [ -x configure ] ; then
+      export ADDLDFLAGS="-lncurses"
       ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
           --libdir='${exec_prefix}'/$libdir --infodir='${prefix}'/share/info \
           --mandir='${prefix}'/share/man ${OPT_CONFIG[$i]}
@@ -83,36 +84,41 @@
     fi
   done
   install -d $P/usr/libexec
-  mv $P/usr/bin/{vi,ex,view} $P/usr/libexec
+  mv $P/usr/bin/vi $P/usr/libexec
   gunzip -c $W/nvi-cmdwrapper.gz > $P/usr/bin/vi
   chmod 755 $P/usr/bin/vi
-  ln $P/usr/bin/{vi,ex}
-  ln $P/usr/bin/{vi,view}
+  ln -f $P/usr/bin/{vi,ex}
+  ln -f $P/usr/bin/{vi,view}
   touch $W/i.et
   cd $W
-  find $P ! -type l -newer i.st ! -newer i.et \
-      -exec touch -t `date '+%m%d0900'` {} \;
+  TZ=UTC find $P ! -type l -newer i.st ! -newer i.et \
+      -exec touch -t `date -u '+%m%d0000'` {} \;
   compress
   strip_bindir $P/usr/libexec
-  gzip_dir $mandir/cat1
   setup_docdir
   chmod 755 $docdir/$src/docs/tutorial/vi.tut.csh.gz
+  for i in curses regex ; do
+    install -d $docdir/$src/$i
+    cp -p $B/$i/README.m17n $docdir/$src/$i
+    chown root.root $docdir/$src/$i/README.m17n
+    gzip_one $docdir/$src/$i/README.m17n
+  done
   cp -a $B/docs.m17n $docdir/$src
   chown -R root.root $docdir/$src/docs.m17n
-  find $docdir/$src/docs.m17n -exec touch -t `date '+%m%d0900'` {} \;
   gzip_dir $docdir/$src/docs.m17n
-  touch -t `date '+%m%d0900'` $docdir/$src/docs.m17n
+  TZ=UTC touch -t `date -u '+%m%d0000'` $docdir/$src/{curses,regex,docs.m17n}
+  mv $docdir/$src/{curses,build,LICENSE.gz,regex} $C
   mv $docdir/$src/{docs.m17n,{$func,$myname,$spec}.gz} $C
+  mv $C/{curses,build,LICENSE.gz,regex} $docdir/$src
   mv $C/{docs.m17n,{$func,$myname,$spec}.gz} $docdir/$src
   touch -r $S $docdir/$src
   convert_links
   tar cvpf $pkg.tar -C $P `cd $P ; find usr/bin | tail -n+2`
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/libexec | tail -n+2`
   tar rvpf $pkg.tar -C $P usr/share/vi
-  tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/cat1 | tail -n+2`
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2`
   tar rvpf $pkg.tar -C $P usr/share/doc/$src
-  touch -t `date '+%m%d0900'` $pkg.tar ; xz $pkg.tar ; touch $pkg.tar.xz
-  mv $pkg.tar.xz $pkg.txz
+  TZ=UTC touch -t `date -u '+%m%d0000'` $pkg.tar
+  xz $pkg.tar ; touch $pkg.tar.xz ; mv $pkg.tar.xz $pkg.txz
   cleanup
 fi