Date: Tue, 17 May 2005 03:00:17 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/81124: Update port: japanese/xjtext Message-ID: <20050517030017.46eca05f.tkato432@yahoo.com> Resent-Message-ID: <200505161810.j4GIA7IG011970@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 81124 >Category: ports >Synopsis: Update port: japanese/xjtext >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon May 16 18:10:07 GMT 2005 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p7 i386 >Organization: >Environment: >Description: - Fix build on -current - Support CXX/CXXFLAGS properly - Support DOCSDIR/EXAMPLESDIR New file: files/patch-lex.l files/patch-parser.y files/patch-parsing.h files/patch-xfont.c files/patch-xjtext-main.c >How-To-Repeat: >Fix: diff -urN /usr/ports/japanese/xjtext/Makefile japanese/xjtext/Makefile --- /usr/ports/japanese/xjtext/Makefile Tue Apr 5 01:04:18 2005 +++ japanese/xjtext/Makefile Mon May 16 16:03:22 2005 @@ -7,7 +7,7 @@ PORTNAME= xjtext PORTVERSION= 1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= japanese MASTER_SITES= http://plaza.harmonix.ne.jp/~onizuka/ DISTNAME= XJTEXT-${PORTVERSION} @@ -17,28 +17,20 @@ 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 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} +.for file in README.txt + ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} +.endfor + @${MKDIR} ${EXAMPLESDIR} +.for file in FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png + ${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR} +.endfor + .endif + @${CAT} ${PKGMESSAGE} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/japanese/xjtext/files/patch-aa japanese/xjtext/files/patch-aa --- /usr/ports/japanese/xjtext/files/patch-aa Sat Jul 8 02:04:35 2000 +++ japanese/xjtext/files/patch-aa Mon May 16 15:30:48 2005 @@ -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 -urN /usr/ports/japanese/xjtext/files/patch-ab japanese/xjtext/files/patch-ab --- /usr/ports/japanese/xjtext/files/patch-ab Sat Jul 8 02:04:35 2000 +++ japanese/xjtext/files/patch-ab Mon May 16 15:52:35 2005 @@ -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 -urN /usr/ports/japanese/xjtext/files/patch-lex.l japanese/xjtext/files/patch-lex.l --- /usr/ports/japanese/xjtext/files/patch-lex.l Thu Jan 1 09:00:00 1970 +++ japanese/xjtext/files/patch-lex.l Mon May 16 15:55:27 2005 @@ -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 -urN /usr/ports/japanese/xjtext/files/patch-parser.y japanese/xjtext/files/patch-parser.y --- /usr/ports/japanese/xjtext/files/patch-parser.y Thu Jan 1 09:00:00 1970 +++ japanese/xjtext/files/patch-parser.y Mon May 16 15:57:35 2005 @@ -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 -urN /usr/ports/japanese/xjtext/files/patch-parsing.h japanese/xjtext/files/patch-parsing.h --- /usr/ports/japanese/xjtext/files/patch-parsing.h Thu Jan 1 09:00:00 1970 +++ japanese/xjtext/files/patch-parsing.h Mon May 16 16:07:20 2005 @@ -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 -urN /usr/ports/japanese/xjtext/files/patch-xfont.c japanese/xjtext/files/patch-xfont.c --- /usr/ports/japanese/xjtext/files/patch-xfont.c Thu Jan 1 09:00:00 1970 +++ japanese/xjtext/files/patch-xfont.c Mon May 16 15:53:35 2005 @@ -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 -urN /usr/ports/japanese/xjtext/files/patch-xjtext-main.c japanese/xjtext/files/patch-xjtext-main.c --- /usr/ports/japanese/xjtext/files/patch-xjtext-main.c Thu Jan 1 09:00:00 1970 +++ japanese/xjtext/files/patch-xjtext-main.c Mon May 16 15:58:23 2005 @@ -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 -urN /usr/ports/japanese/xjtext/pkg-plist japanese/xjtext/pkg-plist --- /usr/ports/japanese/xjtext/pkg-plist Sat Jul 8 02:04:35 2000 +++ japanese/xjtext/pkg-plist Mon May 16 16:02:40 2005 @@ -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 +%%PORTDOCS%%%%EXAMPLESDIR%%/Ao.png +%%PORTDOCS%%%%EXAMPLESDIR%%/Back2.png +%%PORTDOCS%%%%EXAMPLESDIR%%/Brown.png +%%PORTDOCS%%%%EXAMPLESDIR%%/FSS +%%PORTDOCS%%%%EXAMPLESDIR%%/README +%%PORTDOCS%%%%EXAMPLESDIR%%/Royal.png +%%PORTDOCS%%%%EXAMPLESDIR%%/Royal2.png +%%PORTDOCS%%%%EXAMPLESDIR%%/YAMA +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050517030017.46eca05f.tkato432>