- Fix build on -CURRENT [1]

- Do not ignore CXX and CXXFLAGS [1]
- Use DOCSDIR and EXAMPLESDIR [1]
- Use SUB_FILES=pkg-message
- Improve the grammar of pkg-message and pkg-descr
- Fix a typo in COMMENT

PR:		ports/81124 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]

12 files changed, 155 insertions, 47 deletions

diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index b4fea03a8de0..a51af27c9d58 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -7,38 +7,29 @@
 
 PORTNAME=	xjtext
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	http://plaza.harmonix.ne.jp/~onizuka/
 DISTNAME=	XJTEXT-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A text viewer for Japanese virtical writings
+COMMENT=	A text viewer for Japanese vertical writings
 
 USE_BISON=	yes
 USE_GNOME=	imlib
-EXAMPLEDIR=	${PREFIX}/share/examples/xjtext
-DOCDIR=		${PREFIX}/share/doc/xjtext
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
+SUB_FILES=	pkg-message
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xjtext ${PREFIX}/bin
-
-post-install:
-	strip ${PREFIX}/bin/xjtext
-	${MKDIR} ${EXAMPLEDIR}
-.for i in FSS README YAMA \
-		Ao.png Back2.png Brown.png Royal.png Royal2.png
-	${INSTALL_DATA} ${WRKSRC}/$i ${EXAMPLEDIR}
-.endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIR}
-	${INSTALL_MAN} ${WRKSRC}/README.txt ${DOCDIR}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
+	${MKDIR} ${EXAMPLESDIR}
+.for file in FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png
+	${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
+.endfor
+	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/xjtext/files/patch-aa b/japanese/xjtext/files/patch-aa
index 855013bac1c3..98c017fe971c 100644
--- a/japanese/xjtext/files/patch-aa
+++ b/japanese/xjtext/files/patch-aa
@@ -1,11 +1,26 @@
---- Makefile.orig	Sat Jul  8 00:36:46 2000
-+++ Makefile	Sat Jul  8 00:36:57 2000
-@@ -2,7 +2,7 @@
- CFLAGS	=-c -g -O 
- INCDIRS	=-I/usr/X11R6/include -I/usr/local/include
+--- Makefile.orig	Sat Sep  4 22:45:16 1999
++++ Makefile	Mon May 16 15:30:41 2005
+@@ -1,9 +1,9 @@
+-CC	=g++
+-CFLAGS	=-c -g -O 
+-INCDIRS	=-I/usr/X11R6/include -I/usr/local/include
++CC	=${CXX}
++CFLAGS	=${CXXFLAGS} -c
++INCDIRS	=-I${X11BASE}/include `imlib-config --cflags`
  LIBS 	=-lX11 -lXext  -lm -lfl 
 -IMLIBS	=-ljpeg -lpng -ltiff -lz -lgif -lImlib
-+IMLIBS	=-ljpeg -lpng -ltiff -lz -lungif -lImlib
- LIBDIRS	=-L/usr/X11R6/lib/ -L/usr/local/lib
+-LIBDIRS	=-L/usr/X11R6/lib/ -L/usr/local/lib
++IMLIBS	=`imlib-config --libs`
++LIBDIRS	=-L${X11BASE}/lib
  OBJS	=xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o
  
+ all: xjtext
+@@ -39,7 +39,7 @@
+ 	${CC} ${CFLAGS} ${INCDIRS} lex.yy.c
+ 
+ xjtext: ${OBJS}
+-	LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
++	LD_RUN_PATH=${X11BASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
+ 	-o xjtext
+ 
+ clean:
diff --git a/japanese/xjtext/files/patch-ab b/japanese/xjtext/files/patch-ab
index e2f3fd789490..3ce709d5f816 100644
--- a/japanese/xjtext/files/patch-ab
+++ b/japanese/xjtext/files/patch-ab
@@ -1,6 +1,31 @@
 --- xwindow.h.orig	Sat Sep  4 22:45:16 1999
-+++ xwindow.h	Sat Jul  8 01:08:55 2000
-@@ -60,7 +60,7 @@
++++ xwindow.h	Mon May 16 15:51:32 2005
+@@ -1,12 +1,14 @@
+ #ifndef _XWINDOW
+ #define _XWINDOW
+-#include <stream.h>
++#include <iostream>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <X11/extensions/shape.h>
+ #include <Imlib.h>
+ 
++using namespace std;
++
+ extern  Display*         TheDisplay;
+ typedef unsigned long    ulong;
+ typedef unsigned int     uint;
+@@ -35,7 +37,7 @@
+     XColor Exact; XColor NewColor;
+     if(XAllocNamedColor(TheDisplay,CMap,ColorName,&Exact,&NewColor)==0)
+     {
+-      cerr<<form("Can't allocate the color specified by \"%s\".\n",ColorName);
++      cerr<<("Can't allocate the color specified by \"%s\".\n",ColorName);
+       return BlackPixel(TheDisplay,TheScreen);
+     }
+     else return NewColor.pixel;
+@@ -60,7 +62,7 @@
      XSetLineAttributes(TheDisplay,TheGC,1,LineSolid,CapButt,JoinMiter);
      XDrawLine(TheDisplay,TheWindow,TheGC,X1,Y1,X2,Y2);
    }
diff --git a/japanese/xjtext/files/patch-lex.l b/japanese/xjtext/files/patch-lex.l
new file mode 100644
index 000000000000..3bddce729494
--- /dev/null
+++ b/japanese/xjtext/files/patch-lex.l
@@ -0,0 +1,22 @@
+--- lex.l.orig	Sat Sep  4 22:45:16 1999
++++ lex.l	Mon May 16 15:55:19 2005
+@@ -1,8 +1,8 @@
+ %{
+-#include <stdio.h>
+-#include <string.h>
+-#include <stream.h>
+-#include <ctype.h>
++#include <cstdio>
++#include <cstring>
++#include <iostream>
++#include <cctype>
+ #include "parsing.h"
+ #include "parser.tab.h"
+ int       LineNumber= 0;
+@@ -72,5 +72,5 @@
+ %%
+ 
+ int yyerror(char* Error)
+-{ cerr << form("%s:%d: %s.\n",FileName,LineNumber+1,Error); return 0;}
++{ cerr << "%s:%d: %s.\n",FileName,LineNumber+1,Error; return 0;}
+ 
diff --git a/japanese/xjtext/files/patch-parser.y b/japanese/xjtext/files/patch-parser.y
new file mode 100644
index 000000000000..a607af2549c6
--- /dev/null
+++ b/japanese/xjtext/files/patch-parser.y
@@ -0,0 +1,15 @@
+--- parser.y.orig	Sat Sep  4 22:45:16 1999
++++ parser.y	Mon May 16 15:57:22 2005
+@@ -1,8 +1,8 @@
+ %{
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <stream.h>
+-#include <string.h>
++#include <cstdlib>
++#include <cstdio>
++#include <iostream>
++#include <cstring>
+ #include "parsing.h"
+ %}
+ 
diff --git a/japanese/xjtext/files/patch-parsing.h b/japanese/xjtext/files/patch-parsing.h
new file mode 100644
index 000000000000..ccc6fdeb3c95
--- /dev/null
+++ b/japanese/xjtext/files/patch-parsing.h
@@ -0,0 +1,10 @@
+--- parsing.h.orig	Sat Sep  4 22:45:16 1999
++++ parsing.h	Mon May 16 16:07:09 2005
+@@ -1,6 +1,6 @@
+ #ifndef _PARSING
+ #define _PARSING
+-#include <stdio.h>
++#include <cstdio>
+ #include "xjtext.h"
+ 
+ #define YYSTYPE      char*
diff --git a/japanese/xjtext/files/patch-xfont.c b/japanese/xjtext/files/patch-xfont.c
new file mode 100644
index 000000000000..20c01fd61d41
--- /dev/null
+++ b/japanese/xjtext/files/patch-xfont.c
@@ -0,0 +1,20 @@
+--- xfont.c.orig	Sat Sep  4 22:45:16 1999
++++ xfont.c	Mon May 16 15:53:22 2005
+@@ -5,7 +5,7 @@
+   if(NULL==TheDisplay)if(NULL==(TheDisplay=XOpenDisplay("")))
+     { cerr << "Can't open display.\n";exit(1);}
+   if(NULL==(KFontStruct    =XLoadQueryFont(TheDisplay,FontName)))
+-    { cerr << form("Can't load font \"%s\".",FontName);exit(1);}
++    { cerr << "Can't load font \"%s\".",FontName;exit(1);}
+ 
+   XChar2b Utsu;Utsu.byte1=0x31;Utsu.byte2=0x35;
+   int CharDirection; XCharStruct CharOverAll;
+@@ -152,7 +152,7 @@
+   if(NULL==TheDisplay)if(NULL==(TheDisplay=XOpenDisplay("")))
+     { cerr << "Can't open display.\n";exit(1);}
+   if(NULL==(AFontStruct    =XLoadQueryFont(TheDisplay,FontName)))
+-    { cerr << form("Can't load font \"%s\".",FontName);exit(1);}
++    { cerr << "Can't load font \"%s\".",FontName;exit(1);}
+   int CharDirection; XCharStruct CharOverAll;
+   XTextExtents(AFontStruct,"W",1,
+ 	       &CharDirection,&CharAscent,&CharDescent,&CharOverAll);
diff --git a/japanese/xjtext/files/patch-xjtext_main.c b/japanese/xjtext/files/patch-xjtext_main.c
new file mode 100644
index 000000000000..71e9794d9d5a
--- /dev/null
+++ b/japanese/xjtext/files/patch-xjtext_main.c
@@ -0,0 +1,11 @@
+--- xjtext-main.c.orig	Sat Sep  4 22:45:16 1999
++++ xjtext-main.c	Mon May 16 15:58:11 2005
+@@ -9,7 +9,7 @@
+   else
+     {
+       if(NULL==(yyin=fopen(ArgVal[1],"r")))
+-	{ cerr<<form("Can't open the file named \"%s\".\n",ArgVal[1]);exit(0);}
++	{ cerr<<"Can't open the file named \"%s\".\n",ArgVal[1];exit(0);}
+       strcpy(FileName,ArgVal[1]);
+     }
+   XWin = new xJTextWindow
diff --git a/japanese/xjtext/files/pkg-message.in b/japanese/xjtext/files/pkg-message.in
new file mode 100644
index 000000000000..8649255b1e54
--- /dev/null
+++ b/japanese/xjtext/files/pkg-message.in
@@ -0,0 +1,4 @@
+For a quick demonstration, issue the following commands:
+
+$ cd %%EXAMPLESDIR%%
+$ xjtext README
diff --git a/japanese/xjtext/pkg-descr b/japanese/xjtext/pkg-descr
index 1aacb4c75365..c4e443ccfc95 100644
--- a/japanese/xjtext/pkg-descr
+++ b/japanese/xjtext/pkg-descr
@@ -1,6 +1,5 @@
-This program shows Japanese text in vertical format.
-You can use directives in input text and perform some effects.
-This software is like a kind of demonstration program.
+Xjtext displays Japanese text in vertical form. Special effects can be
+created by inserting directives into the input text.
 
 WWW: http://plaza.harmonix.ne.jp/~onizuka/Software.html
 
diff --git a/japanese/xjtext/pkg-message b/japanese/xjtext/pkg-message
deleted file mode 100644
index c1f21f099200..000000000000
--- a/japanese/xjtext/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-Do like below for easy test play.
-
-$ cd PREFIX/share/examples/xjtext
-$ xjtext README
diff --git a/japanese/xjtext/pkg-plist b/japanese/xjtext/pkg-plist
index 85c864aa27c0..c89734ff458f 100644
--- a/japanese/xjtext/pkg-plist
+++ b/japanese/xjtext/pkg-plist
@@ -1,12 +1,12 @@
 bin/xjtext
-share/doc/xjtext/README.txt
-share/examples/xjtext/Ao.png
-share/examples/xjtext/Back2.png
-share/examples/xjtext/Brown.png
-share/examples/xjtext/FSS
-share/examples/xjtext/README
-share/examples/xjtext/Royal.png
-share/examples/xjtext/Royal2.png
-share/examples/xjtext/YAMA
-@dirrm share/examples/xjtext
-@dirrm share/doc/xjtext
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%EXAMPLESDIR%%/Ao.png
+%%EXAMPLESDIR%%/Back2.png
+%%EXAMPLESDIR%%/Brown.png
+%%EXAMPLESDIR%%/FSS
+%%EXAMPLESDIR%%/README
+%%EXAMPLESDIR%%/Royal.png
+%%EXAMPLESDIR%%/Royal2.png
+%%EXAMPLESDIR%%/YAMA
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%