Date: Sat, 2 Mar 2013 11:46:56 +0100 (CET) From: Kai Wang <kaiwang27@gmail.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/176598: [PATCH] chinese/qterm: update to 0.5.12, take maintainership Message-ID: <201303021046.r22AkuUi010590@localhost.my.domain> Resent-Message-ID: <201303021050.r22Ao0LD086934@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176598
>Category: ports
>Synopsis: [PATCH] chinese/qterm: update to 0.5.12, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 02 10:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Kai Wang
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD soulhacker 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243935: Fri Dec 7 07:11:25
>Description:
- Update to 0.5.12
- Take maintainership
Added file(s):
- files/patch-CMakeLists.txt
Removed file(s):
- files/patch-qterm-main.cpp
- files/patch-qterm-qtermwindow.h
- pkg-message
Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:
--- qterm-0.5.12.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/Makefile ./Makefile
--- /usr/ports/chinese/qterm/Makefile 2012-12-30 19:55:41.000000000 +0100
+++ ./Makefile 2013-03-02 11:44:09.000000000 +0100
@@ -1,47 +1,66 @@
-# New ports collection makefile for: qterm
-# Date created: 10 Mar 2001
-# Whom: Shen Chuan-Hsing
-#
+# Created by: Shen Chuan-Hsing
# $FreeBSD: ports/chinese/qterm/Makefile,v 1.47 2012/12/30 18:55:41 svnexp Exp $
-#
PORTNAME= qterm
-PORTVERSION= 0.4.1
-PORTREVISION= 8
+PORTVERSION= 0.5.12
CATEGORIES= chinese
-MASTER_SITES= SF/qterm/qterm/${PORTVERSION}
+MASTER_SITES= SF/qterm/qterm/${PORTVERSION}
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= kaiwang27@gmail.com
COMMENT= QTerm is a BBS client for BSD/Linux
-DEPRECATED= Depends on QT3; unmaintained
-EXPIRATION_DATE= 2013-07-01
-
-USE_XORG= x11 ice xext xt xaw xpm xi xproto xextproto
+USE_XORG= x11 ice
USE_BZIP2= yes
USE_PERL5_BUILD=yes
-USE_QT_VER= 3
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --enable-mt --prefix=${PREFIX}
+USE_KDE4= automoc4
+USE_QT4= codecs-cn codecs-tw gui help-tools linguist moc_build \
+ network qmake_build rcc_build uic_build xml
+USE_CMAKE= yes
+CMAKE_ARGS= -DCMAKE_INSTALL_PREFIX="${PREFIX}"
+MAKE_JOBS_SAFE= yes
+USE_LDCONFIG= yes
+INSTALLS_ICONS= yes
+
+CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-.if !defined(WITHOUT_PYTHON)
-USE_PYTHON= 2.5+
-CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE}
+OPTIONS_DEFINE= SSH DBUS PHONON QTSCRIPT
+
+SSH_DESC= SSH support
+DBUS_DESC= DBus support
+PHONON_DESC= Phonon support
+QTSCRIPT_DESC= QtScript Binding support
+
+OPTIONS_DEFAULT= SSH DBUS PHONON QTSCRIPT
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSSH}
+CMAKE_ARGS+= -DQTERM_ENABLE_SSH:BOOL=TRUE
+.else
+CMAKE_ARGS+= -DQTERM_ENABLE_SSH:BOOL=FALSE
+.endif
+
+.if ${PORT_OPTIONS:MDBUS}
+USE_QT4+= dbus
+CMAKE_ARGS+= -DQTERM_ENABLE_DBUS:BOOL=TRUE
+.else
+CMAKE_ARGS+= -DQTERM_ENABLE_DBUS:BOOL=FALSE
.endif
-pre-everything::
-.if !defined(WITHOUT_PYTHON)
- @${ECHO_MSG} "Define WITHOUT_PYTHON to disable Python scripts support."
+.if ${PORT_OPTIONS:MPHONON}
+USE_QT4+= phonon
+CMAKE_ARGS+= -DQTERM_ENABLE_PHONON:BOOL=TRUE
+.else
+CMAKE_ARGS+= -DQTERM_ENABLE_PHONON:BOOL=FALSE
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's,-lssl,-lssl -lcrypto,' \
- ${WRKSRC}/configure
-
-post-install:
- @${CHMOD} +w ${DATADIR}/qterm.cfg
- @${CHMOD} +w ${DATADIR}/address.cfg
- @${CAT} ${PKGMESSAGE}
+.if ${PORT_OPTIONS:MQTSCRIPT}
+USE_QT4+= script
+RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so:${PORTSDIR}/devel/qtscriptgenerator
+CMAKE_ARGS+= -DQTERM_ENABLE_SCRIPT:BOOL=TRUE
+.else
+CMAKE_ARGS+= -DQTERM_ENABLE_SCRIPT:BOOL=FALSE
+.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/distinfo ./distinfo
--- /usr/ports/chinese/qterm/distinfo 2011-01-09 12:13:35.000000000 +0100
+++ ./distinfo 2013-03-01 11:49:45.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (qterm-0.4.1.tar.bz2) = 60c19303bc2eba11273607ae8711f0eecbd0d94b7dd2773cde128338aa5149a1
-SIZE (qterm-0.4.1.tar.bz2) = 744822
+SHA256 (qterm-0.5.12.tar.bz2) = bd31051a6c117b05fef3ea163480143837c57632a84eab43e8e142860bcab22a
+SIZE (qterm-0.5.12.tar.bz2) = 749254
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/files/patch-CMakeLists.txt ./files/patch-CMakeLists.txt
--- /usr/ports/chinese/qterm/files/patch-CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-CMakeLists.txt 2013-03-01 23:32:49.000000000 +0100
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig 2011-03-03 05:25:49.000000000 +0100
++++ CMakeLists.txt 2013-03-01 23:32:47.000000000 +0100
+@@ -1,13 +1,13 @@
+ project(qterm)
+ include(CTest)
+ cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
+-set(QT_MIN_VERSION "4.5.0")
+ set(QTERM_VERSION_MAJOR 0)
+ set(QTERM_VERSION_MINOR 5)
+ set(QTERM_VERSION_RELEASE 12)
+ set(QTERM_VERSION "${QTERM_VERSION_MAJOR}.${QTERM_VERSION_MINOR}.${QTERM_VERSION_RELEASE}" )
+ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+-find_package(Qt4 REQUIRED)
++set(CMAKE_C_FLAGS "-O0")
++find_package(Qt4 4.5.0 REQUIRED)
+ find_package(KDE4)
+
+ IF(WIN32 AND MSVC)
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/files/patch-qterm-main.cpp ./files/patch-qterm-main.cpp
--- /usr/ports/chinese/qterm/files/patch-qterm-main.cpp 2006-08-01 14:19:05.000000000 +0200
+++ ./files/patch-qterm-main.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
---- 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>
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/files/patch-qterm-qtermwindow.h ./files/patch-qterm-qtermwindow.h
--- /usr/ports/chinese/qterm/files/patch-qterm-qtermwindow.h 2006-08-01 14:19:05.000000000 +0200
+++ ./files/patch-qterm-qtermwindow.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
---- 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>
-
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/pkg-message ./pkg-message
--- /usr/ports/chinese/qterm/pkg-message 2006-08-04 11:08:10.000000000 +0200
+++ ./pkg-message 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-*************************************************************************
- 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.
-*************************************************************************
diff -ruN --exclude=CVS /usr/ports/chinese/qterm/pkg-plist ./pkg-plist
--- /usr/ports/chinese/qterm/pkg-plist 2006-08-01 14:19:04.000000000 +0200
+++ ./pkg-plist 2013-03-02 11:26:56.000000000 +0100
@@ -1,64 +1,55 @@
bin/qterm
share/applications/qterm.desktop
-share/icons/qterm.png
-%%DATADIR%%/address.cfg
+share/icons/hicolor/128x128/apps/qterm.png
+share/icons/hicolor/16x16/apps/qterm.png
+share/icons/hicolor/22x22/apps/qterm.png
+share/icons/hicolor/32x32/apps/qterm.png
+share/icons/hicolor/48x48/apps/qterm.png
+share/icons/hicolor/64x64/apps/qterm.png
+%%DATADIR%%/address.xml
%%DATADIR%%/credits
-%%DATADIR%%/cursor/end.xpm
-%%DATADIR%%/cursor/enter.xpm
-%%DATADIR%%/cursor/exit.xpm
-%%DATADIR%%/cursor/hand.xpm
-%%DATADIR%%/cursor/home.xpm
-%%DATADIR%%/cursor/next.xpm
-%%DATADIR%%/cursor/pagedown.xpm
-%%DATADIR%%/cursor/pageup.xpm
-%%DATADIR%%/cursor/prev.xpm
-%%DATADIR%%/pic/addr.png
-%%DATADIR%%/pic/anti-idle.png
-%%DATADIR%%/pic/article.png
-%%DATADIR%%/pic/auto-reply.png
-%%DATADIR%%/pic/color-copy.png
-%%DATADIR%%/pic/color.png
-%%DATADIR%%/pic/connect.png
-%%DATADIR%%/pic/copy.png
-%%DATADIR%%/pic/disconnect.png
-%%DATADIR%%/pic/fonts.png
-%%DATADIR%%/pic/keys.png
-%%DATADIR%%/pic/message.png
-%%DATADIR%%/pic/messagebox_critical.png
-%%DATADIR%%/pic/messagebox_info.png
-%%DATADIR%%/pic/messagebox_warning.png
-%%DATADIR%%/pic/mouse.png
-%%DATADIR%%/pic/paste.png
-%%DATADIR%%/pic/popwidget.png
-%%DATADIR%%/pic/pref.png
-%%DATADIR%%/pic/qterm_32x32.png
-%%DATADIR%%/pic/qterm_48x48.png
-%%DATADIR%%/pic/qterm_tray.png
-%%DATADIR%%/pic/quick.png
-%%DATADIR%%/pic/reconnect.png
-%%DATADIR%%/pic/rect.png
-%%DATADIR%%/pic/refresh.png
-%%DATADIR%%/pic/shadow.png
-%%DATADIR%%/pic/sound.png
-%%DATADIR%%/pic/tabpad.png
+%%DATADIR%%/doc/qterm.qhc
+%%DATADIR%%/keyboard_profiles/default.keytab
+%%DATADIR%%/keyboard_profiles/linux.keytab
+%%DATADIR%%/keyboard_profiles/solaris.keytab
+%%DATADIR%%/keyboard_profiles/vt420pc.keytab
%%DATADIR%%/po/qterm_chs.qm
%%DATADIR%%/po/qterm_cht.qm
%%DATADIR%%/qterm.cfg
-%%DATADIR%%/schema/Linux.schema
-%%DATADIR%%/schema/Softness.schema
-%%DATADIR%%/schema/VIM.schema
-%%DATADIR%%/schema/XTerm.schema
-%%DATADIR%%/schema/default.schema
-%%DATADIR%%/script/continuous.py
-%%DATADIR%%/script/download.py
-%%DATADIR%%/script/sendmsg.py
-%%DATADIR%%/script/system.py
-%%DATADIR%%/script/tools.py
-@dirrm %%DATADIR%%/script
-@dirrm %%DATADIR%%/schema
+%%DATADIR%%/scheme/Linux.scheme
+%%DATADIR%%/scheme/Softness.scheme
+%%DATADIR%%/scheme/VIM.scheme
+%%DATADIR%%/scheme/XTerm.scheme
+%%DATADIR%%/scheme/default.scheme
+%%DATADIR%%/scripts/article.js
+%%DATADIR%%/scripts/console.js
+%%DATADIR%%/scripts/google.js
+%%DATADIR%%/scripts/highlight.js
+%%DATADIR%%/scripts/ptt.js
+%%DATADIR%%/scripts/senddelay.js
+%%DATADIR%%/scripts/smth.js
+%%DATADIR%%/scripts/ui/senddelay.ui
+%%DATADIR%%/scripts/utils.js
+%%DATADIR%%/scripts/websnap.js
+@dirrm %%DATADIR%%/scripts/ui
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/scheme
@dirrm %%DATADIR%%/po
-@dirrm %%DATADIR%%/pic
-@dirrm %%DATADIR%%/cursor
+@dirrm %%DATADIR%%/keyboard_profiles
+@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/22x22/apps
+@dirrmtry share/icons/hicolor/22x22
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
@dirrmtry share/icons
@dirrmtry share/applications
--- qterm-0.5.12.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303021046.r22AkuUi010590>