Update Qterm from 0.3.2 to 0.3.5. changes: - take MAINTAINER, thanks for previous maintainer Statue's work! - update to 0.3.5, add the support of ssh1 - update WWW site How-To-Repeat: N/A
State Changed From-To: open->feedback Does not compile on 4-x: /usr/include/g++/iostream.h:253: warning: `_G_CLOG_CONFLICT' is not defined In file included from qtermtelnet.h:13, from qtermtelnet.cpp:11: /usr/include/sys/socket.h:52: syntax error before `;' /usr/include/sys/socket.h:163: syntax error before `;' /usr/include/sys/socket.h:174: syntax error before `;' /usr/include/sys/socket.h:188: syntax error before `;' /usr/include/sys/socket.h:190: `int64_t' was not declared in this scope /usr/include/sys/socket.h:190: `u_char' was not declared in this scope /usr/include/sys/socket.h:190: `sa_family_t' was not declared in this scope /usr/include/sys/socket.h:190: size of array `__ss_pad1' is negative /usr/include/sys/socket.h:191: syntax error before `;'
State Changed From-To: feedback->closed Committed, thanks!
Hi, I fixed it and tested it on FreeBSD 4.9 and 5.2, and changed the support of PYTHON. The new diff is here. Best Regards. - Gavin Mu fix: diff -ruN /usr/ports/chinese/qterm/Makefile qterm/Makefile --- /usr/ports/chinese/qterm/Makefile Wed Feb 4 05:18:55 2004 +++ qterm/Makefile Tue Mar 16 13:05:46 2004 @@ -6,13 +6,12 @@ # PORTNAME= qterm -PORTVERSION= 0.3.2 -PORTREVISION= 1 +PORTVERSION= 0.3.5 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gavin@tju.edu.cn COMMENT= QTerm is a BBS client in Unix USE_QT_VER= 3 @@ -20,10 +19,22 @@ HAS_CONFIGURE= yes USE_REINPLACE= yes CONFIGURE_ARGS= --enable-mt --with-pythondir=${LOCALBASE} --prefix=${PREFIX} -USE_PYTHON= -2.2 +INSTALLS_SHLIB= yes + +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_PYTHON) +USE_PYTHON= -2.3 +.endif + +pre-everything:: + @${ECHO_MSG} "Define WITHOUT_PYTHON to\ + disable PYTHON scripts support." post-patch: @${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \ ${WRKSRC}/qterm/qtermtelnet.cpp + @${REINPLACE_CMD} -e 's,-lssl,-lssl -lcrypto,' \ + ${WRKSRC}/configure -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN /usr/ports/chinese/qterm/distinfo qterm/distinfo --- /usr/ports/chinese/qterm/distinfo Thu Jan 29 07:22:40 2004 +++ qterm/distinfo Tue Mar 16 12:36:27 2004 @@ -1,2 +1,2 @@ -MD5 (qterm-0.3.2.tar.gz) = d7e9da29e0cc0a4cc5d996170422beb0 -SIZE (qterm-0.3.2.tar.gz) = 716334 +MD5 (qterm-0.3.5.tar.gz) = 0da21357cf155d665350b760ebed1cc9 +SIZE (qterm-0.3.5.tar.gz) = 786186 diff -ruN /usr/ports/chinese/qterm/files/patch-qterm::qtermtelnet.h qterm/files/patch-qterm::qtermtelnet.h --- /usr/ports/chinese/qterm/files/patch-qterm::qtermtelnet.h Sat Apr 12 20:37:49 2003 +++ qterm/files/patch-qterm::qtermtelnet.h Tue Mar 16 12:46:08 2004 @@ -1,14 +1,12 @@ ---- qterm/qtermtelnet.h.orig Sat Apr 12 21:10:39 2003 -+++ qterm/qtermtelnet.h Sat Apr 12 21:11:19 2003 -@@ -8,9 +8,9 @@ - #include <winsock2.h> - #else +--- qterm/qtermtelnet.h.orig Tue Mar 16 12:17:41 2004 ++++ qterm/qtermtelnet.h Tue Mar 16 12:18:02 2004 +@@ -9,8 +9,8 @@ + #elif defined(Q_OS_BSD4) || defined(_OS_FREEBSD_) \ + || defined(Q_OS_MACX) || defined(Q_OS_DARWIN) #include <netdb.h> - #include <sys/socket.h> #include <sys/types.h> -- #include <arpa/inet.h> + #include <sys/socket.h> -+ #include <netinet/in.h> - #endif - - #include <qobject.h> + #include <netinet/in.h> + #else + #include <netdb.h> diff -ruN /usr/ports/chinese/qterm/pkg-descr qterm/pkg-descr --- /usr/ports/chinese/qterm/pkg-descr Sat Oct 27 06:02:26 2001 +++ qterm/pkg-descr Tue Mar 16 12:42:19 2004 @@ -1,5 +1,5 @@ -QTerm is a BBS client in Unix. Our original goal is to make it -a practical tool like CTerm and STerm in Windows. +QTerm is a BBS client for X Window System. The goal is to make a client +similar to Sterm and CTerm in MS Windows. Features: 1.support mouse in Firebird BBS @@ -7,4 +7,6 @@ 3.article download 4.address book -WWW: http://qterm.gnuchina.org/index.html +WWW: http://qterm.sourceforge.net + +- Gavin Mu <gavin@tju.edu.cn> diff -ruN /usr/ports/chinese/qterm/pkg-plist qterm/pkg-plist --- /usr/ports/chinese/qterm/pkg-plist Sun Mar 14 10:51:11 2004 +++ qterm/pkg-plist Tue Mar 16 12:36:27 2004 @@ -1,6 +1,9 @@ bin/qterm -share/qterm/address.cfg -share/qterm/credits +@exec /sbin/ldconfig -m +@unexec /sbin/ldconfig -R +lib/libssh.so.0 +lib/libssh.so +lib/libssh.la share/qterm/cursor/end.xpm share/qterm/cursor/enter.xpm share/qterm/cursor/exit.xpm @@ -14,18 +17,19 @@ share/qterm/pic/anti-idle.png share/qterm/pic/article.png share/qterm/pic/auto-reply.png -share/qterm/pic/color.png share/qterm/pic/color-copy.png +share/qterm/pic/color.png share/qterm/pic/connect.png share/qterm/pic/copy.png share/qterm/pic/disconnect.png -share/qterm/pic/font.png +share/qterm/pic/fonts.png share/qterm/pic/keys.png share/qterm/pic/message.png share/qterm/pic/mouse.png share/qterm/pic/paste.png share/qterm/pic/popwidget.png share/qterm/pic/pref.png +share/qterm/pic/qterm_tray.png share/qterm/pic/qterm_32x32.png share/qterm/pic/qterm_48x48.png share/qterm/pic/quick.png @@ -34,11 +38,21 @@ share/qterm/pic/refresh.png share/qterm/pic/sound.png share/qterm/pic/tabpad.png -share/qterm/qterm.cfg share/qterm/script/continuous.py share/qterm/script/download.py share/qterm/script/system.py -@dirrm share/qterm/script +share/qterm/schema/Softness.schema +share/qterm/schema/Linux.schema +share/qterm/schema/VIM.schema +share/qterm/schema/XTerm.schema +share/qterm/schema/default.schema +share/qterm/qterm.cfg +share/qterm/address.cfg +share/qterm/credits +share/applications/qterm.desktop +share/icons/qterm.png @dirrm share/qterm/cursor @dirrm share/qterm/pic +@dirrm share/qterm/script +@dirrm share/qterm/schema @dirrm share/qterm