3 files changed, 58 insertions, 25 deletions

diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 4e038610bf98..ab5bfd1054f3 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xjtext
-# Date created:		8 July 2000
-# Whom:			sada
-#
+# Created by: sada
 # $FreeBSD$
-#
 
 PORTNAME=	xjtext
 PORTVERSION=	1.3
@@ -15,26 +11,26 @@ DISTNAME=	XJTEXT-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A text viewer for Japanese vertical writings
 
-BROKEN=		does not compile
-
 USE_BISON=	build
 USE_GNOME=	imlib
+MAKE_JOBS_SAFE=	yes
 
 SUB_FILES=	pkg-message
-PLIST_FILES=	bin/xjtext
+
 PORTDOCS=	README.txt
 PORTEXAMPLES=	FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png
+PLIST_FILES=	bin/xjtext
+
+.include <bsd.port.options.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xjtext ${PREFIX}/bin
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/japanese/xjtext/files/patch-aa b/japanese/xjtext/files/patch-aa
index bca9e7b51509..d81230894bb1 100644
--- a/japanese/xjtext/files/patch-aa
+++ b/japanese/xjtext/files/patch-aa
@@ -1,10 +1,9 @@
---- Makefile.orig	Sat Sep  4 22:45:16 1999
-+++ Makefile	Mon May 16 15:30:41 2005
-@@ -1,9 +1,9 @@
--CC	=g++
+--- Makefile.orig	1999-09-04 22:45:16.000000000 +0900
++++ Makefile	2012-09-11 04:28:11.000000000 +0900
+@@ -1,27 +1,27 @@
+ CC	=g++
 -CFLAGS	=-c -g -O 
 -INCDIRS	=-I/usr/X11R6/include -I/usr/local/include
-+CC	=${CXX}
 +CFLAGS	=${CXXFLAGS} -c
 +INCDIRS	=-I${LOCALBASE}/include `imlib-config --cflags`
  LIBS 	=-lX11 -lXext  -lm -lfl 
@@ -15,12 +14,43 @@
  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
+ 
+ xwindow.o: xwindow.h xwindow.c 
+-	${CC} ${CFLAGS} ${INCDIRS} xwindow.c
++	${CXX} ${CFLAGS} ${INCDIRS} xwindow.c
+ 
+ xfont.o: xwindow.h xfont.h xfont.c 
+-	${CC} ${CFLAGS} ${INCDIRS} xfont.c
++	${CXX} ${CFLAGS} ${INCDIRS} xfont.c
+ 
+ xtext.o: xwindow.h xfont.h xtext.h xtext.c
+-	${CC} ${CFLAGS} ${INCDIRS} xtext.c
++	${CXX} ${CFLAGS} ${INCDIRS} xtext.c
+ 
+ xjtext.o: xwindow.h xfont.h xtext.h xjtext.h xjtext.c
+-	${CC} ${CFLAGS} ${INCDIRS} xjtext.c
++	${CXX} ${CFLAGS} ${INCDIRS} xjtext.c
+ 
+ xjtext-main.o: xwindow.h xfont.h xtext.h xjtext.h xjtext-main.c
+-	${CC} ${CFLAGS} ${INCDIRS} xjtext-main.c
++	${CXX} ${CFLAGS} ${INCDIRS} xjtext-main.c
+ 
+ parser.tab.c: xwindow.h xfont.h xtext.h xjtext.h parsing.h parser.y
+ 	bison -dv parser.y
+@@ -33,13 +33,13 @@
+ 	flex lex.l
+ 
+ parser.tab.o: parser.tab.c
+-	${CC} ${CFLAGS} ${INCDIRS} parser.tab.c
++	${CXX} ${CFLAGS} ${INCDIRS} parser.tab.c
+ 
+ lex.yy.o: xwindow.h xfont.h xtext.h xjtext.h parsing.h parser.tab.h lex.yy.c
+-	${CC} ${CFLAGS} ${INCDIRS} lex.yy.c
++	${CXX} ${CFLAGS} ${INCDIRS} lex.yy.c
  
  xjtext: ${OBJS}
 -	LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
-+	LD_RUN_PATH=${LOCALBASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
++	LD_RUN_PATH=${LOCALBASE}/lib/ ${CXX} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
  	-o xjtext
  
  clean:
diff --git a/japanese/xjtext/files/patch-xjtext_main.c b/japanese/xjtext/files/patch-xjtext_main.c
index 71e9794d9d5a..3d0156e24b62 100644
--- a/japanese/xjtext/files/patch-xjtext_main.c
+++ b/japanese/xjtext/files/patch-xjtext_main.c
@@ -1,6 +1,13 @@
---- 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 @@
+--- xjtext-main.c.orig	1999-09-04 22:45:16.000000000 +0900
++++ xjtext-main.c	2012-09-11 04:23:11.000000000 +0900
+@@ -3,13 +3,13 @@
+ xJTextWindow*   XWin;
+ 
+ char            FileName[256];
+-main            (int ArgCnt,char** ArgVal)
++int main            (int ArgCnt,char** ArgVal)
+ {
+   if(ArgCnt<2){ yyin=stdin;strcpy(FileName,"stdin");}
    else
      {
        if(NULL==(yyin=fopen(ArgVal[1],"r")))