Attachment #68697 for bug #100918

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




# Date created:                10 Mar 2001
# Whom:                        Shen Chuan-Hsing
#
# $FreeBSD: ports/chinese/qterm/Makefile,v 1.23 2006/05/03 23:38:33 edwin Exp $
#

PORTNAME=	qterm
PORTVERSION=	0.4.0
CATEGORIES=	chinese
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
DISTNAME=	${PORTNAME}-${PORTVERSION}

MAINTAINER=	yuanjue@yuanjue.net
COMMENT=	QTerm is a BBS client fot BSD/Linux

USE_BZIP2=	yes
USE_QT_VER=	3
USE_AUTOTOOLS=	libtool:15
HAS_CONFIGURE=	yes
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--enable-mt --prefix=${PREFIX}
		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include

.if !defined(WITHOUT_PYTHON)
USE_PYTHON=	2.3+

Lines 1-3 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/distinfo (-3 / +3 lines)
1	MD5 (qterm-0.4.0pre2.tar.gz) = 379a5932ee282bedcfa70d3f16e3e91e	1	MD5 (qterm-0.4.0.tar.bz2) = e948e6cda99f518881f3d241ab092d99
2	SHA256 (qterm-0.4.0pre2.tar.gz) = 82f1697c867ae6037df1390b60793e7641b94a396eaca625b7b689fd09924e92	2	SHA256 (qterm-0.4.0.tar.bz2) = b79cd26eb57d9abc1e2eb530d5fb42f9fdcff86d544466596674273e3571156a
3	SIZE (qterm-0.4.0pre2.tar.gz) = 895907	3	SIZE (qterm-0.4.0.tar.bz2) = 805526




--- qterm/main.cpp.orig	Mon Jul 10 15:36:13 2006
+++ qterm/main.cpp	Thu Jul 27 17:55:53 2006
@@ -16,6 +16,15 @@
 #ifdef HAVE_PYTHON
 #include <Python.h>
 #endif
+
+#undef isalnum
+#undef isalpha
+#undef islower
+#undef isspace
+#undef isupper
+#undef tolower
+#undef toupper
+
 #include <qpixmap.h>
 #include <qstringlist.h>
 #include <qapplication.h>




--- qterm/qtermwindow.h.orig	Mon Jul 10 15:36:12 2006
+++ qterm/qtermwindow.h	Thu Jul 27 17:39:46 2006
@@ -10,6 +10,14 @@
 #include <Python.h>
 #endif
 
+#undef isalnum
+#undef isalpha
+#undef islower
+#undef isspace
+#undef isupper
+#undef tolower
+#undef toupper
+
 #include <qmainwindow.h>
 #include <qcursor.h>
 

Lines 1-11 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/files/patch-qterm_qtermcanvas.cpp (-11 lines)
1	--- qterm/qtermcanvas.cpp.orig Fri Dec 17 19:26:35 2004
2	+++ qterm/qtermcanvas.cpp Fri Dec 17 19:26:39 2004
3	@@ -238,7 +238,7 @@
4	if(strSave.isEmpty())
5	return;
6	QString fmt = fi.extension(false).upper();
7	- if(!pxm.save(strSave, fmt=="JPG"?"JPEG":fmt))
8	+ if(!pxm.save(strSave, fmt=="JPG"?QString("JPEG"):fmt))
9	QMessageBox::warning(this, "Failed to save file", "Cant save file, maybe format not supported");
10	}
11




--- qterm/qtermiplocation.cpp.orig	Tue Dec  7 03:23:24 2004
+++ qterm/qtermiplocation.cpp	Fri Dec 17 19:24:22 2004
@@ -9,8 +9,8 @@
 #ifdef Q_OS_WIN32
 #include <winsock2.h>
 #else
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #endif
 
 #include <qstring.h>
@@ -79,13 +79,13 @@
 	if( fseek( fp, (long)offset, SEEK_SET ) ==-1 )
 	{
 		qDebug( " readLineFrom error 1 " );
-		ret_str = QCString(NULL);
+		ret_str = QCString();
 		return -1;
 	}
 	if( fgets( (char *) str, 512, fp ) == NULL )
 	{
 		qDebug( " readLineFrom error 2 " );
-		ret_str = QCString(NULL);
+		ret_str = QCString();
 		return -1;
 	}
 	ret_str = str;

Lines 1-11 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/files/patch-qterm_qtermtextline.cpp (-11 lines)
1	--- qterm/qtermtextline.cpp.orig Sat Nov 13 15:26:48 2004
2	+++ qterm/qtermtextline.cpp Sat Nov 13 15:27:41 2004
3	@@ -235,7 +235,7 @@
4
5
6	if(index>=m_length)
7	- return NULL;
8	+ return QCString();
9
10	printf("index=%d len=%d m_length=%d\n", index, len, m_length);
11

Lines 1-12 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/pkg-descr (-5 / +7 lines)
1	QTerm is a BBS client for X Window System. The goal is to make a client	1	QTerm is a BBS client for X Window System. The goal is
2	similar to Sterm and CTerm in MS Windows.	2	to make a client similar to Fterm and CTerm in MS Windows.
3		3
4	Features:	4	Features:
5	1.support mouse in Firebird BBS	5	1.mouse support
6	2.copy and paste	6	2.copy and paste
7	3.article download	7	3.article download
8	4.address book	8	4.address book
		9	5.anti-idle
		10	6.converting between GB and BIG5
9		11
10	WWW: http://qterm.sourceforge.net	12	WWW: http://qterm.sourceforge.net/wiki/
11		13
12	- Gavin Mu <gavin@FreeBSDChina.org>	14	- Yuan, Jue <yuanjue@yuanjue.net>




		To display IP location when using QTerm
you must get file "QQWry.dat" and put it into your ~/.qterm directory
*************************************************************************

*************************************************************************
Unfortunately there is an anonying bug in the release of QTerm 0.4.0. If 
your language setting is NOT English, you might experience some hang up 
when connecting to a site.

A simple workaround is to use the English interface. This bug will be fixed
in the next minor release.
*************************************************************************

Lines 24-29 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/pkg-plist (-2 / +6 lines)
24	%%DATADIR%%/pic/fonts.png	24	%%DATADIR%%/pic/fonts.png
25	%%DATADIR%%/pic/keys.png	25	%%DATADIR%%/pic/keys.png
26	%%DATADIR%%/pic/message.png	26	%%DATADIR%%/pic/message.png
		27	%%DATADIR%%/pic/messagebox_critical.png
		28	%%DATADIR%%/pic/messagebox_info.png
		29	%%DATADIR%%/pic/messagebox_warning.png
27	%%DATADIR%%/pic/mouse.png	30	%%DATADIR%%/pic/mouse.png
28	%%DATADIR%%/pic/paste.png	31	%%DATADIR%%/pic/paste.png
29	%%DATADIR%%/pic/popwidget.png	32	%%DATADIR%%/pic/popwidget.png
Lines 35-40 Link Here
35	%%DATADIR%%/pic/reconnect.png	38	%%DATADIR%%/pic/reconnect.png
36	%%DATADIR%%/pic/rect.png	39	%%DATADIR%%/pic/rect.png
37	%%DATADIR%%/pic/refresh.png	40	%%DATADIR%%/pic/refresh.png
		41	%%DATADIR%%/pic/shadow.png
38	%%DATADIR%%/pic/sound.png	42	%%DATADIR%%/pic/sound.png
39	%%DATADIR%%/pic/tabpad.png	43	%%DATADIR%%/pic/tabpad.png
40	%%DATADIR%%/po/qterm_chs.qm	44	%%DATADIR%%/po/qterm_chs.qm
Lines 56-60 Link Here
56	@dirrm %%DATADIR%%/pic	60	@dirrm %%DATADIR%%/pic
57	@dirrm %%DATADIR%%/cursor	61	@dirrm %%DATADIR%%/cursor
58	@dirrm %%DATADIR%%	62	@dirrm %%DATADIR%%
59	@dirrm share/icons	63	@dirrmtry share/icons
60	@dirrm share/applications	64	@dirrmtry share/applications

Return to bug 100918

Lines 2-26 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/Makefile (-8 / +7 lines)
2	# Date created: 10 Mar 2001	2	# Date created: 10 Mar 2001
3	# Whom: Shen Chuan-Hsing	3	# Whom: Shen Chuan-Hsing
4	#	4	#
5	# $FreeBSD: ports/chinese/qterm/Makefile,v 1.24 2006/07/25 14:52:23 clsung Exp $	5	# $FreeBSD: ports/chinese/qterm/Makefile,v 1.23 2006/05/03 23:38:33 edwin Exp $
6	#	6	#
7		7
8	PORTNAME= qterm	8	PORTNAME= qterm
9	PORTVERSION= 0.4.0.p2	9	PORTVERSION= 0.4.0
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}
13	DISTNAME= ${PORTNAME}-0.4.0pre2	13	DISTNAME= ${PORTNAME}-${PORTVERSION}
14		14
15	MAINTAINER= gavin@FreeBSDChina.org	15	MAINTAINER= yuanjue@yuanjue.net
16	COMMENT= QTerm is a BBS client in Unix	16	COMMENT= QTerm is a BBS client fot BSD/Linux
17		17
		18	USE_BZIP2= yes
18	USE_QT_VER= 3	19	USE_QT_VER= 3
19	USE_AUTOTOOLS= libtool:15
20	HAS_CONFIGURE= yes	20	HAS_CONFIGURE= yes
21	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}	21	CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
22	CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX} \	22	CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX}
23	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
24		23
25	.if !defined(WITHOUT_PYTHON)	24	.if !defined(WITHOUT_PYTHON)
26	USE_PYTHON= 2.3+	25	USE_PYTHON= 2.3+

Line 0 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/files/patch-qterm-main.cpp (+18 lines)
	1	--- qterm/main.cpp.orig Mon Jul 10 15:36:13 2006
	2	+++ qterm/main.cpp Thu Jul 27 17:55:53 2006
	3	@@ -16,6 +16,15 @@
	4	#ifdef HAVE_PYTHON
	5	#include <Python.h>
	6	#endif
	7	+
	8	+#undef isalnum
	9	+#undef isalpha
	10	+#undef islower
	11	+#undef isspace
	12	+#undef isupper
	13	+#undef tolower
	14	+#undef toupper
	15	+
	16	#include <qpixmap.h>
	17	#include <qstringlist.h>
	18	#include <qapplication.h>

Line 0 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/files/patch-qterm-qtermwindow.h (+17 lines)
	1	--- qterm/qtermwindow.h.orig Mon Jul 10 15:36:12 2006
	2	+++ qterm/qtermwindow.h Thu Jul 27 17:39:46 2006
	3	@@ -10,6 +10,14 @@
	4	#include <Python.h>
	5	#endif
	6
	7	+#undef isalnum
	8	+#undef isalpha
	9	+#undef islower
	10	+#undef isspace
	11	+#undef isupper
	12	+#undef tolower
	13	+#undef toupper
	14	+
	15	#include <qmainwindow.h>
	16	#include <qcursor.h>
	17

Lines 1-28 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/files/patch-qterm_qtermiplocation.cpp (-28 lines)
1	--- qterm/qtermiplocation.cpp.orig Tue Dec 7 03:23:24 2004
2	+++ qterm/qtermiplocation.cpp Fri Dec 17 19:24:22 2004
3	@@ -9,8 +9,8 @@
4	#ifdef Q_OS_WIN32
5	#include <winsock2.h>
6	#else
7	-#include <netinet/in.h>
8	#include <arpa/inet.h>
9	+#include <netinet/in.h>
10	#endif
11
12	#include <qstring.h>
13	@@ -79,13 +79,13 @@
14	if( fseek( fp, (long)offset, SEEK_SET ) ==-1 )
15	{
16	qDebug( " readLineFrom error 1 " );
17	- ret_str = QCString(NULL);
18	+ ret_str = QCString();
19	return -1;
20	}
21	if( fgets( (char *) str, 512, fp ) == NULL )
22	{
23	qDebug( " readLineFrom error 2 " );
24	- ret_str = QCString(NULL);
25	+ ret_str = QCString();
26	return -1;
27	}
28	ret_str = str;

Lines 4-6 Link Here

(-)/usr/home/maver/Develop/SVN_work/qterm/pkg-message (+9 lines)
4	To display IP location when using QTerm	4	To display IP location when using QTerm
5	you must get file "QQWry.dat" and put it into your ~/.qterm directory	5	you must get file "QQWry.dat" and put it into your ~/.qterm directory
6	*************************************************************************	6	*************************************************************************
		7
		8	*************************************************************************
		9	Unfortunately there is an anonying bug in the release of QTerm 0.4.0. If
		10	your language setting is NOT English, you might experience some hang up
		11	when connecting to a site.
		12
		13	A simple workaround is to use the English interface. This bug will be fixed
		14	in the next minor release.
		15	*************************************************************************