4 files changed, 58 insertions, 7 deletions

diff --git a/vietnamese/vnroff/Makefile b/vietnamese/vnroff/Makefile
index eacaecfad4ca..0762e6948052 100644
--- a/vietnamese/vnroff/Makefile
+++ b/vietnamese/vnroff/Makefile
@@ -7,10 +7,11 @@
 #
 
 PORTNAME=	vnroff
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	vietnamese print
 MASTER_SITES=	ftp://ftp.media.mit.edu/pub/Vietnet/Viscii/Troff/
 DISTFILES=	vnroff.c.Z vnroff.1.Z
+DISTNAME=	${PORTNAME}-2.0
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/vietnamese/vnroff/files/patch-01 b/vietnamese/vnroff/files/patch-01
index a50368e29e5f..811d87c0d123 100644
--- a/vietnamese/vnroff/files/patch-01
+++ b/vietnamese/vnroff/files/patch-01
@@ -1,5 +1,5 @@
---- vnroff.c.orig	Tue Dec 10 04:12:31 1996
-+++ vnroff.c	Tue Dec 10 04:13:02 1996
+--- vnroff.c.orig	Sat May 20 11:32:08 2000
++++ vnroff.c	Sat May 20 11:52:54 2000
 @@ -19,7 +19,7 @@
   * #define Dau_Mu          '^'                                          *
   * #define Dau_Trang       '('                                          *
@@ -9,6 +9,17 @@
   *                                                                      *
   * Change them to any symbol you are comfortable with.                  *
   *                                                                      *
+@@ -29,8 +29,8 @@
+  * 2 diacritical marks: vowel followed by Dau_Mu, Dau_Trang, Dau_Rau    *
+  *                     then other symbols, i.e: a^' o+~ a(` ...         *
+  *                                                                      *
+- * DD and dd: self-explanatory, you have to type DD or dd, Dd or dD     *
+- *            will not work.  You can change the code to ignore this.   *
++ * DD and dd: self-explanatory, the resulting case is the same as the   *
++ * first character of [Dd][Dd].                                         *
+  *                                                                      *
+  * The Escape_Symbol is provided to avoid the confusion between the     *
+  * diacritical marks and end-of-sentence symbols (. ; ? ! ...)          *
 @@ -54,7 +54,7 @@
  #define Dau_Mu          '^'
  #define Dau_Trang       '('
@@ -18,3 +29,24 @@
  
  #define NON     0          /* ^ as in a^ */
  #define RAU     1          /* + as in u+, o+ */
+@@ -308,7 +308,7 @@
+    int ch,nextch,loai;
+ 
+    if (argc < 2) {
+-      printf("Usage: vpp filename\n");
++      printf("Usage: vnroff filename\n");
+       exit(0);
+    }
+    if ((infile = fopen(argv[1],"r")) == NULL) {
+@@ -344,9 +344,9 @@
+ 	 else
+ 	    putchar(ch);
+       }
+-      else if (ch == 'D' || ch == 'd') {       /* take care DD, dd */
++      else if (toupper(ch) == 'D') {       /* take care DD, dd */
+ 	 putchar(ch);
+-	 if (nextchar() == ch) {
++	 if (toupper(nextchar()) == toupper(ch)) {
+ 	    getc(infile);
+ 	    if (ch == 'd')  
+                Move(0.30,0.35,'-'); 
diff --git a/vietnamese/vnroff/files/patch-02 b/vietnamese/vnroff/files/patch-02
index 4fc14a276a0b..75c0eadf0ce7 100644
--- a/vietnamese/vnroff/files/patch-02
+++ b/vietnamese/vnroff/files/patch-02
@@ -1,5 +1,5 @@
---- vnroff.1.orig	Wed Dec 25 04:16:16 1996
-+++ vnroff.1	Wed Dec 25 04:29:49 1996
+--- vnroff.1.orig	Sat May 20 11:32:08 2000
++++ vnroff.1	Sat May 20 11:54:33 2000
 @@ -1,21 +1,21 @@
  .TH vnroff 1
  .SH NAME
@@ -13,8 +13,9 @@
 -.NXB "troff command"
 +.NXB "groff command"
  This program processes a text file with special Vietnamese character 
- sequences giving an output suitable for 
+-sequences giving an output suitable for 
 -.I troff(1)
++sequences (VIQR syntax) giving an output suitable for 
 +.I groff(1)
  processing.
  The output should work for all point sizes supported by 
@@ -37,7 +38,18 @@
  .sp
  .SH SPELLING RULES
  Only one diacritical mark: 
-@@ -43,7 +43,10 @@
+@@ -34,16 +34,22 @@
+ .br
+ 	vowel followed by Dau_Mu, Dau_Trang, Dau_Rau then other symbols.
+ .sp
+-DD and dd: self-explanatory, you have to type DD or dd, 
++DD and dd: self-explanatory,
+ .br
+-	Dd or dD will not work.  You can change the code to ignore this.   
++    the resulting case is the same as the first character of the sequence.
+ .sp
+ The Escape_Symbol is provided to avoid the confusion between the     
+ diacritical marks and end-of-sentence symbols.
  .br
  	i.e:	the question           Anh ddi dda^u?
  .br
@@ -46,6 +58,9 @@
 +.SH SEE ALSO
 +groff(1),
 +troff(1)
++.SH STANDARDS
++Vietnamese Standard Code for Information Interchange (VISCII version 1.1, 1992)
++<Viet-Std@Haydn.Stanford.EDU> http://www.vietstd.org/.
  .SH AUTHORS
  Written in Pascal by Hu+~u (University of California at Berkeley).
  Converted to C & modified by Tra^`n H. Nha^n (Concurrent Computer).   
diff --git a/vietnamese/vnroff/pkg-descr b/vietnamese/vnroff/pkg-descr
index d12924c5324c..baffaea4bcae 100644
--- a/vietnamese/vnroff/pkg-descr
+++ b/vietnamese/vnroff/pkg-descr
@@ -5,3 +5,6 @@ groff/troff can print it out.
 
    vnroff file | groff | ...   or
    vnroff file | whater_program_that_print_out_a_troff_file
+
+
+WWW:  http://www.trichlor.org/