Attachment #30768 for bug #51625

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




#

PORTNAME=	zhcon
PORTVERSION=	0.2.3
CATEGORIES=	chinese
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


MAN1=		zhcon.1

.include <bsd.port.mk>

post-patch:
.if ${OSVERSION} > 500012
.for i in src/main.cpp src/zhcon.cpp src/inputmanager.cpp src/display/fbdev.cpp src/mouse.h
	${REINPLACE_CMD} 's,machine/console.h>,sys/consio.h>@#include <sys/fbio.h>@#include <sys/kbio.h>,' ${WRKSRC}/${i} | tr '@' '\n' > ${WRKSRC}/${i}.bak && \
	${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i}
.endfor
	${REINPLACE_CMD} -i.bak -e 's,machine/mouse.h>,sys/mouse.h>,' ${WRKSRC}/src/mouse.h
.endif

.include <bsd.port.post.mk>

Line 1 Link Here

(-)zhcon/distinfo (-1 / +1 lines)
1	MD5 (zhcon-0.2.1.tar.gz) = 3171b538b8bb5c5eb70a8229e52bd28d	1	MD5 (zhcon-0.2.3.tar.gz) = 64b5d6c2d7055b4e45f4eadfd1303e8f

Lines 1-11 Link Here

(-)zhcon/files/patch-configure (-11 lines)
1	--- configure.orig Mon Jun 10 10:29:34 2002
2	+++ configure Wed Nov 27 20:03:03 2002
3	@@ -1671,7 +1671,7 @@
4	fi
5
6
7	-ZHCON_LOCALE_DIR="/usr/share/locale"
8	+ZHCON_LOCALE_DIR="/usr/local/share/locale"
9
10	if test "$ZHCON_ARCH" = "freebsd";then
11	echo $ac_n "checking for main in -lintl""... $ac_c" 1>&6




--- intl/dcigettext.c.orig	Mon Nov 25 23:59:34 2002
+++ intl/dcigettext.c	Tue Nov 26 00:19:20 2002
@@ -57,10 +57,12 @@
 #include <stdlib.h>
 
 #include <string.h>
+#if 0
 #if !HAVE_STRCHR && !defined _LIBC
 # ifndef strchr
 #  define strchr index
 # endif
+#endif
 #endif
 
 #if defined HAVE_UNISTD_H || defined _LIBC




--- src/Makefile.in.orig	Thu Apr 17 19:29:48 2003
+++ src/Makefile.in	Wed Apr 30 21:10:39 2003
@@ -478,7 +478,7 @@
 LIB = @LIB@
 LIBICONV = @LIBICONV@
 LIBINTL = @LIBINTL@
-LIBS = @LIBS@
+LIBS = -lintl -lcurses @LIBS@ -I/usr/lib
 LN_S = @LN_S@
 LTLIB = @LTLIB@
 LTLIBICONV = @LTLIBICONV@
@@ -117,7 +117,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/include
 CPPFLAGS = @CPPFLAGS@
 zhcon_OBJECTS =  basefont.o big52gbdecoder.o big5decoder.o configfile.o \
 console.o gb2big5decoder.o gbdecoder.o gbkdecoder.o graphdev.o \
@@ -395,7 +395,7 @@
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)/etc
-	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf
 	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf.sample
 
 uninstall-local:
 	-rm -f $(DESTDIR)/etc/zhcon.conf

Lines 1-11 Link Here

(-)zhcon/files/patch-src::graphdev.cpp (-11 lines)
1	--- src/graphdev.cpp.ori Tue Apr 9 14:54:28 2002
2	+++ src/graphdev.cpp Tue Apr 9 15:27:14 2002
3	@@ -29,7 +29,7 @@
4
5	#include "display/fbdev.h"
6	#include "display/vgadev.h"
7	-#if defined(linux)
8	+#if defined(linux) \|\| defined(__FreeBSD__)
9	#ifdef HAVE_GGI_LIB
10	#include "display/libggi.h"
11	#endif




--- src/zhcon.conf.orig	Tue Nov 26 02:03:39 2002
+++ src/zhcon.conf	Tue Nov 26 02:03:50 2002
@@ -34,10 +34,10 @@
 #    FreeBSD wizard and ask him to compile a new kernel with VESA support
 #    for you and ... emmmm ... explain all these stuff to you ...
 #
-x_resolution = 800
-y_resolution = 600
+x_resolution = 640
+y_resolution = 480
 # 4 bits = 16 colors, 8 bits = 256 colors, 16 bits = 64K colors, and so on..
-color_depth = 8 
+color_depth = 4
 
 #blanklineheight must >= 0
 blanklineheight = 1




--- tools/Makefile.in.orig	Mon Nov 25 23:45:33 2002
+++ tools/Makefile.in	Mon Nov 25 23:49:43 2002
@@ -107,7 +107,7 @@
 LDFLAGS = 
 CXXFLAGS = 
 CCFLAGS = 
-LIBS = 
+LIBS = -lX11 -L/usr/X11R6/lib
 
 EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff gpm-1.19.6-patched.tar.gz
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -116,7 +116,7 @@
 PROGRAMS =  $(bin_PROGRAMS)
 
 
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/X11R6/include
 CPPFLAGS = @CPPFLAGS@
 uc2win_OBJECTS =  uc2win.o
 uc2win_LDADD = $(LDADD)




bin/getbpsf
bin/uc2win
bin/win2mb
bin/zhcon
etc/zhcon.conf
etc/zhcon.conf.sample
lib/zhcon/font/asc12.bpsf
lib/zhcon/font/asc12x.bpsf
lib/zhcon/font/asc14.bpsf

lib/zhcon/input/winzm.mb
share/locale/ja/LC_MESSAGES/zhcon.mo
share/locale/ko/LC_MESSAGES/zhcon.mo
share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo

Return to bug 51625

Lines 6-12 Link Here

(-)zhcon/Makefile (-13 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= zhcon	8	PORTNAME= zhcon
9	PORTVERSION= 0.2.1	9	PORTVERSION= 0.2.3
10	CATEGORIES= chinese	10	CATEGORIES= chinese
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 26-40 Link Here
26		26
27	MAN1= zhcon.1	27	MAN1= zhcon.1
28		28
29	.include <bsd.port.pre.mk>	29	.include <bsd.port.mk>
30
31	post-patch:
32	.if ${OSVERSION} > 500012
33	.for i in src/main.cpp src/zhcon.cpp src/inputmanager.cpp src/display/fbdev.cpp src/mouse.h
34	${REINPLACE_CMD} 's,machine/console.h>,sys/consio.h>@#include <sys/fbio.h>@#include <sys/kbio.h>,' ${WRKSRC}/${i} \| tr '@' '\n' > ${WRKSRC}/${i}.bak && \
35	${MV} ${WRKSRC}/${i}.bak ${WRKSRC}/${i}
36	.endfor
37	${REINPLACE_CMD} -i.bak -e 's,machine/mouse.h>,sys/mouse.h>,' ${WRKSRC}/src/mouse.h
38	.endif
39
40	.include <bsd.port.post.mk>

Lines 1-15 Link Here

(-)zhcon/files/patch-intl::dcigettext.c (-15 lines)
1	--- intl/dcigettext.c.orig Mon Nov 25 23:59:34 2002
2	+++ intl/dcigettext.c Tue Nov 26 00:19:20 2002
3	@@ -57,10 +57,12 @@
4	#include <stdlib.h>
5
6	#include <string.h>
7	+#if 0
8	#if !HAVE_STRCHR && !defined _LIBC
9	# ifndef strchr
10	# define strchr index
11	# endif
12	+#endif
13	#endif
14
15	#if defined HAVE_UNISTD_H \|\| defined _LIBC

Lines 1-29 Link Here

(-)zhcon/files/patch-src::Makefile.in (-22 / +4 lines)
1	--- src/Makefile.in.orig Tue Jun 11 10:25:52 2002	1	--- src/Makefile.in.orig Thu Apr 17 19:29:48 2003
2	+++ src/Makefile.in Tue Nov 26 01:37:47 2002	2	+++ src/Makefile.in Wed Apr 30 21:10:39 2003
3	@@ -81,7 +81,7 @@	3	@@ -478,7 +478,7 @@
4	LIB = @LIB@
5	LIBICONV = @LIBICONV@
6	LIBINTL = @LIBINTL@
7	-LIBS = @LIBS@
8	+LIBS = -lintl -lcurses @LIBS@ -I/usr/lib
9	LN_S = @LN_S@
10	LTLIB = @LTLIB@
11	LTLIBICONV = @LTLIBICONV@
12	@@ -117,7 +117,7 @@
13	PROGRAMS = $(bin_PROGRAMS)
14
15
16	-DEFS = @DEFS@ -I. -I$(srcdir) -I..
17	+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/include
18	CPPFLAGS = @CPPFLAGS@
19	zhcon_OBJECTS = basefont.o big52gbdecoder.o big5decoder.o configfile.o \
20	console.o gb2big5decoder.o gbdecoder.o gbkdecoder.o graphdev.o \
21	@@ -395,7 +395,7 @@
22		4
23	install-data-local:	5	install-data-local:
24	$(mkinstalldirs) $(DESTDIR)/etc	6	$(mkinstalldirs) $(DESTDIR)/etc
25	- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf	7	- $(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)/etc/zhcon.conf
26	+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf	8	+ $(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf
27	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(PREFIX)/etc/zhcon.conf.sample
28		9
29	uninstall-local:	10	uninstall-local:
		11	-rm -f $(DESTDIR)/etc/zhcon.conf

Lines 1-16 Link Here

(-)zhcon/files/patch-src::zhcon.conf (-16 lines)
1	--- src/zhcon.conf.orig Tue Nov 26 02:03:39 2002
2	+++ src/zhcon.conf Tue Nov 26 02:03:50 2002
3	@@ -34,10 +34,10 @@
4	# FreeBSD wizard and ask him to compile a new kernel with VESA support
5	# for you and ... emmmm ... explain all these stuff to you ...
6	#
7	-x_resolution = 800
8	-y_resolution = 600
9	+x_resolution = 640
10	+y_resolution = 480
11	# 4 bits = 16 colors, 8 bits = 256 colors, 16 bits = 64K colors, and so on..
12	-color_depth = 8
13	+color_depth = 4
14
15	#blanklineheight must >= 0
16	blanklineheight = 1

Lines 1-20 Link Here

(-)zhcon/files/patch-tools::Makefile.in (-20 lines)
1	--- tools/Makefile.in.orig Mon Nov 25 23:45:33 2002
2	+++ tools/Makefile.in Mon Nov 25 23:49:43 2002
3	@@ -107,7 +107,7 @@
4	LDFLAGS =
5	CXXFLAGS =
6	CCFLAGS =
7	-LIBS =
8	+LIBS = -lX11 -L/usr/X11R6/lib
9
10	EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff gpm-1.19.6-patched.tar.gz
11	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
12	@@ -116,7 +116,7 @@
13	PROGRAMS = $(bin_PROGRAMS)
14
15
16	-DEFS = @DEFS@ -I. -I$(srcdir) -I..
17	+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I/usr/X11R6/include
18	CPPFLAGS = @CPPFLAGS@
19	uc2win_OBJECTS = uc2win.o
20	uc2win_LDADD = $(LDADD)

Lines 1-9 Link Here

(-)zhcon/pkg-plist (-4 / +1 lines)
1	bin/getbpsf
2	bin/uc2win
3	bin/win2mb
4	bin/zhcon	1	bin/zhcon
5	etc/zhcon.conf	2	etc/zhcon.conf
6	etc/zhcon.conf.sample
7	lib/zhcon/font/asc12.bpsf	3	lib/zhcon/font/asc12.bpsf
8	lib/zhcon/font/asc12x.bpsf	4	lib/zhcon/font/asc12x.bpsf
9	lib/zhcon/font/asc14.bpsf	5	lib/zhcon/font/asc14.bpsf
Lines 40-45 Link Here
40	lib/zhcon/input/winzm.mb	36	lib/zhcon/input/winzm.mb
41	share/locale/ja/LC_MESSAGES/zhcon.mo	37	share/locale/ja/LC_MESSAGES/zhcon.mo
42	share/locale/ko/LC_MESSAGES/zhcon.mo	38	share/locale/ko/LC_MESSAGES/zhcon.mo
		39	share/locale/zh_CN.EUC/LC_MESSAGES/zhcon.mo
43	share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo	40	share/locale/zh_CN.GB2312/LC_MESSAGES/zhcon.mo
44	share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo	41	share/locale/zh_CN.GBK/LC_MESSAGES/zhcon.mo
45	share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo	42	share/locale/zh_TW.Big5/LC_MESSAGES/zhcon.mo