Attachment #128142 for bug #172024

View | Details | Raw Unified | Return to bug 172024
Collapse All | Expand All




# Created by: sada
# Date created:		8 July 2000
# Whom:			sada
#
# $FreeBSD: ports/japanese/xjtext/Makefile,v 1.22 2012/06/13 20:55:51 pav Exp $
#

PORTNAME=	xjtext
PORTVERSION=	1.3

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A text viewer for Japanese vertical writings

OPTIONS_DEFINE=	DOCS EXAMPLES

USE_BISON=	build
USE_GNOME=	imlib
MAKE_JOBS_SAFE=	yes

SUB_FILES=	pkg-message

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
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
.if ${PORT_OPTIONS:MEXAMPLES}
	@${MKDIR} ${EXAMPLESDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
.endif
	@${CAT} ${PKGMESSAGE}




--- 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 

 OBJS	=xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o
 
 all: xjtext
 
 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/ ${CXX} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
 	-o xjtext
 
 clean:

Lines 1-6 Link Here

(-)japanese/xjtext/files/patch-xjtext_main.c (-3 / +10 lines)
1	--- xjtext-main.c.orig Sat Sep 4 22:45:16 1999	1	--- xjtext-main.c.orig 1999-09-04 22:45:16.000000000 +0900
2	+++ xjtext-main.c Mon May 16 15:58:11 2005	2	+++ xjtext-main.c 2012-09-11 04:23:11.000000000 +0900
3	@@ -9,7 +9,7 @@	3	@@ -3,13 +3,13 @@
		4	xJTextWindow* XWin;
		5
		6	char FileName[256];
		7	-main (int ArgCnt,char** ArgVal)
		8	+int main (int ArgCnt,char** ArgVal)
		9	{
		10	if(ArgCnt<2){ yyin=stdin;strcpy(FileName,"stdin");}
4	else	11	else
5	{	12	{
6	if(NULL==(yyin=fopen(ArgVal[1],"r")))	13	if(NULL==(yyin=fopen(ArgVal[1],"r")))

Return to bug 172024

Lines 1-9 Link Here

(-)japanese/xjtext/Makefile (-13 / +11 lines)
1	# New ports collection makefile for: xjtext	1	# Created by: sada
2	# Date created: 8 July 2000
3	# Whom: sada
4	#
5	# $FreeBSD: ports/japanese/xjtext/Makefile,v 1.22 2012/06/13 20:55:51 pav Exp $	2	# $FreeBSD: ports/japanese/xjtext/Makefile,v 1.22 2012/06/13 20:55:51 pav Exp $
6	#
7		3
8	PORTNAME= xjtext	4	PORTNAME= xjtext
9	PORTVERSION= 1.3	5	PORTVERSION= 1.3
Lines 15-40 Link Here
15	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A text viewer for Japanese vertical writings	12	COMMENT= A text viewer for Japanese vertical writings
17		13
18	BROKEN= does not compile	14	OPTIONS_DEFINE= DOCS EXAMPLES
19		15
20	USE_BISON= build	16	USE_BISON= build
21	USE_GNOME= imlib	17	USE_GNOME= imlib
		18	MAKE_JOBS_SAFE= yes
22		19
23	SUB_FILES= pkg-message	20	SUB_FILES= pkg-message
24	PLIST_FILES= bin/xjtext	21
25	PORTDOCS= README.txt	22	PORTDOCS= README.txt
26	PORTEXAMPLES= FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png	23	PORTEXAMPLES= FSS README YAMA Ao.png Back2.png Brown.png Royal.png Royal2.png
		24	PLIST_FILES= bin/xjtext
		25
		26	.include <bsd.port.options.mk>
27		27
28	do-install:	28	do-install:
29	${INSTALL_PROGRAM} ${WRKSRC}/xjtext ${PREFIX}/bin	29	${INSTALL_PROGRAM} ${WRKSRC}/xjtext ${PREFIX}/bin
30		30	.if ${PORT_OPTIONS:MDOCS}
31	post-install:	31	@${MKDIR} ${DOCSDIR}
32	.if !defined(NOPORTDOCS)
33	${MKDIR} ${DOCSDIR}
34	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}	32	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
35	.endif	33	.endif
36	.if !defined(NOPORTEXAMPLES)	34	.if ${PORT_OPTIONS:MEXAMPLES}
37	${MKDIR} ${EXAMPLESDIR}	35	@${MKDIR} ${EXAMPLESDIR}
38	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}	36	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
39	.endif	37	.endif
40	@${CAT} ${PKGMESSAGE}	38	@${CAT} ${PKGMESSAGE}

Lines 1-10 Link Here

(-)japanese/xjtext/files/patch-aa (-8 / +38 lines)
1	--- Makefile.orig Sat Sep 4 22:45:16 1999	1	--- Makefile.orig 1999-09-04 22:45:16.000000000 +0900
2	+++ Makefile Mon May 16 15:30:41 2005	2	+++ Makefile 2012-09-11 04:28:11.000000000 +0900
3	@@ -1,9 +1,9 @@	3	@@ -1,27 +1,27 @@
4	-CC =g++	4	CC =g++
5	-CFLAGS =-c -g -O	5	-CFLAGS =-c -g -O
6	-INCDIRS =-I/usr/X11R6/include -I/usr/local/include	6	-INCDIRS =-I/usr/X11R6/include -I/usr/local/include
7	+CC =${CXX}
8	+CFLAGS =${CXXFLAGS} -c	7	+CFLAGS =${CXXFLAGS} -c
9	+INCDIRS =-I${LOCALBASE}/include `imlib-config --cflags`	8	+INCDIRS =-I${LOCALBASE}/include `imlib-config --cflags`
10	LIBS =-lX11 -lXext -lm -lfl	9	LIBS =-lX11 -lXext -lm -lfl
Lines 15-26 Link Here
15	OBJS =xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o	14	OBJS =xwindow.o xfont.o xtext.o xjtext.o lex.yy.o parser.tab.o xjtext-main.o
16		15
17	all: xjtext	16	all: xjtext
18	@@ -39,7 +39,7 @@	17
19	${CC} ${CFLAGS} ${INCDIRS} lex.yy.c	18	xwindow.o: xwindow.h xwindow.c
		19	- ${CC} ${CFLAGS} ${INCDIRS} xwindow.c
		20	+ ${CXX} ${CFLAGS} ${INCDIRS} xwindow.c
		21
		22	xfont.o: xwindow.h xfont.h xfont.c
		23	- ${CC} ${CFLAGS} ${INCDIRS} xfont.c
		24	+ ${CXX} ${CFLAGS} ${INCDIRS} xfont.c
		25
		26	xtext.o: xwindow.h xfont.h xtext.h xtext.c
		27	- ${CC} ${CFLAGS} ${INCDIRS} xtext.c
		28	+ ${CXX} ${CFLAGS} ${INCDIRS} xtext.c
		29
		30	xjtext.o: xwindow.h xfont.h xtext.h xjtext.h xjtext.c
		31	- ${CC} ${CFLAGS} ${INCDIRS} xjtext.c
		32	+ ${CXX} ${CFLAGS} ${INCDIRS} xjtext.c
		33
		34	xjtext-main.o: xwindow.h xfont.h xtext.h xjtext.h xjtext-main.c
		35	- ${CC} ${CFLAGS} ${INCDIRS} xjtext-main.c
		36	+ ${CXX} ${CFLAGS} ${INCDIRS} xjtext-main.c
		37
		38	parser.tab.c: xwindow.h xfont.h xtext.h xjtext.h parsing.h parser.y
		39	bison -dv parser.y
		40	@@ -33,13 +33,13 @@
		41	flex lex.l
		42
		43	parser.tab.o: parser.tab.c
		44	- ${CC} ${CFLAGS} ${INCDIRS} parser.tab.c
		45	+ ${CXX} ${CFLAGS} ${INCDIRS} parser.tab.c
		46
		47	lex.yy.o: xwindow.h xfont.h xtext.h xjtext.h parsing.h parser.tab.h lex.yy.c
		48	- ${CC} ${CFLAGS} ${INCDIRS} lex.yy.c
		49	+ ${CXX} ${CFLAGS} ${INCDIRS} lex.yy.c
20		50
21	xjtext: ${OBJS}	51	xjtext: ${OBJS}
22	- LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\	52	- LD_RUN_PATH=/usr/X11R6/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
23	+ LD_RUN_PATH=${LOCALBASE}/lib/ ${CC} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\	53	+ LD_RUN_PATH=${LOCALBASE}/lib/ ${CXX} ${OBJS} ${LIBDIRS} ${LIBS} ${IMLIBS}\
24	-o xjtext	54	-o xjtext
25		55
26	clean:	56	clean: