Hi Vlad, hi Bernd,
Vlad Glagolev wrote on Sat, Mar 24, 2007 at 12:48:06PM +0300:
> On 3/23/07, viq <[EMAIL PROTECTED]> wrote:
>> On 15/03/07, Vlad Glagolev <[EMAIL PROTECTED]> wrote:
>>> Tested @ i386. Also the current maintainer of Psi for OpenBSD
>>> told me, that I could take Psi maintainership :-)
>> i386, seems to do everything as it should.
> Nice! I think it should be committed.
thanks a lot for your offer to take over the net/psi port
abandoned by Gerardo Santana.
Not paying enough attention on ports@, i did the same update last
week, so now we can compare notes. :-/
Please consider the following points:
- Are you *really* sure you can safely remove Bernd's patch
patch-iris_libidn_rfc3454_c? I still need that patch!
The file iris/libidn/rfc3454.c gets compiled with
gcc -c [...] -I. -I../../../../../../../local/include [...]
-I../iris/libidn -o .obj/rfc3454.o ../iris/libidn/rfc3454.c
In case the libidn package is installed, the preprocessor picks
up /usr/local/include/stringprep.h, which is *not* compatible
with iris/libidn/rfc3454.c, instead of the required
iris/libidn/stringprep.h.
- Removing patch-iris_xmpp-core_jid_cpp also means that the
include file /usr/local/include/stringprep.h gets used for
iris/xmpp-core/jid.cpp. As that one is only using
int stringprep(...)
typedef enum {...} Stringprep_profile_flags
and the stringprep-#defines
stringprep_nameprep
stringprep_xmpp_nodeprep
stringprep_xmpp_resourceprep
which are consistently defined across both versions of the
header, this *might* be safe for now, but i doubt using
two different versions of the same header file is wise.
- Why do you patch the files
psics.pri
src/psiaccount.cpp
iris/jabber/s5b.cpp
iris/xmpp-core/connector.cpp
The port works for me without these patches, and i fail to
imagine why they might be needed.
- The net/psi port can be built and run without qca-tls.
Therefore, i think that qca-tls should not be in LIB_DEPENDS.
What is more, there is also qca-sasl as an alternative,
even though it has not yet been ported to OpenBSD, so
forcing qca-tls on people might be a bad idea.
- Even if you should decide to add qca-tls a a dependency,
IMHO qca should not be removed from LIB_DEPENDS.
The qca libs is what we link against, so it should be there.
In theory, it could happen that qca might be removed
as a dependency from qca-tls at some future time, thus
breaking psi. Ok, i do admit this is not terribly probable
in this particular case, but anyway...
In case you put qca back to LIB_DEPENDS, don't forget to
remove it from WANTLIB.
- As long as growl is not ported to OpenBSD, i think
CONFIGURE_ARGS should have --disable-growl.
Imagine someone suddenly ports growl.
At that point, psi will probably pick up the dependency
without having it in *_DEPENDS!
In case we want growl later, we should enable it explicitely.
- The distinfo file should also have SHA256 now.
- The file patches/patch-configure needs updated line numbers.
Finally, i see three minor points:
- In the file
/usr/ports/infrastructure/templates/Makefile.template,
MASTER_SITES and EXTRACT_SUFX is behind PERMIT_*.
I see no reason to change the standard order.
- I suggest to put PORTHOME after the standard variables,
not somewhere in the middle.
- AFAIK, patching the $OpenBSD$ tags is not needed,
so i left that out of my diff.
My suggested patch to -current CVS is attached.
It is also available at
http://www.studis.de/Software/psi-0.10.diff
Could you cross-check and possibly resubmit?
Thank you very much for your work and your consideration,
and sorry for bursting in so late,
Ingo
--
Ingo Schwarze <[EMAIL PROTECTED]>
usta.de / studis.de system operation
Index: net/psi/Makefile
===================================================================
RCS file: /cvs/ports/net/psi/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- net/psi/Makefile 3 Aug 2006 23:15:58 -0000 1.6
+++ net/psi/Makefile 24 Mar 2007 02:31:58 -0000
@@ -2,13 +2,12 @@
COMMENT= "multiplatform Jabber client"
-DISTNAME= psi-0.9.3
-PKGNAME= ${DISTNAME}p2
+DISTNAME= psi-0.10
CATEGORIES= net
-HOMEPAGE= http://psi.affinix.com/
+HOMEPAGE= http://psi-im.org/
-MAINTAINER= Gerardo Santana Gomez Garrido <[EMAIL PROTECTED]>
+MAINTAINER= Vlad Glagolev <[EMAIL PROTECTED]>
# GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -32,11 +31,15 @@
CONFIGURE_ARGS+= --qtdir=${MODQT_QTDIR} \
--with-qca-inc=${LOCALBASE}/include \
--with-qca-lib=${LOCALBASE}/lib \
+ --disable-growl \
--disable-dnotify \
--disable-ghbnr
CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \
KDEDIR=${LOCALBASE}
+
+# For QSettings to write its setup
+PORTHOME= ${WRKDIST}
pre-configure:
@perl -pi -e "[EMAIL PROTECTED]@${X11BASE}@" ${WRKSRC}/configure
Index: net/psi/distinfo
===================================================================
RCS file: /cvs/ports/net/psi/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- net/psi/distinfo 19 May 2005 20:29:58 -0000 1.1.1.1
+++ net/psi/distinfo 24 Mar 2007 02:31:58 -0000
@@ -1,4 +1,5 @@
-MD5 (psi-0.9.3.tar.bz2) = d20f3bb530235a246bc2d92308089744
-RMD160 (psi-0.9.3.tar.bz2) = 66983a9746812b27a5c8a1c072e9b33aca638d30
-SHA1 (psi-0.9.3.tar.bz2) = dc5e7dbf5d791db2f0c4189cad055a40b21cf9b6
-SIZE (psi-0.9.3.tar.bz2) = 1423322
+MD5 (psi-0.10.tar.bz2) = f0fd4ccf077f7b24e236f71c22649b7b
+RMD160 (psi-0.10.tar.bz2) = b8be1490cd02f61cf86f09f2dc9f29716ea4c186
+SHA1 (psi-0.10.tar.bz2) = f1687f8b93338f47cb1c8fa363e4b4f58628f167
+SHA256 (psi-0.10.tar.bz2) =
e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1
+SIZE (psi-0.10.tar.bz2) = 1430929
Index: net/psi/patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/psi/patches/patch-configure,v
retrieving revision 1.2
diff -u -r1.2 patch-configure
--- net/psi/patches/patch-configure 24 Sep 2005 00:02:48 -0000 1.2
+++ net/psi/patches/patch-configure 24 Mar 2007 02:31:58 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.2 2005/09/24 00:02:48 espie Exp $
---- configure.orig Sat Nov 20 14:05:03 2004
-+++ configure Sat Sep 24 01:20:20 2005
-@@ -261,7 +261,7 @@ public:
+--- configure.orig Sat Jan 7 22:19:01 2006
++++ configure Thu Mar 22 23:09:35 2007
+@@ -360,7 +360,7 @@ class qc_qca : public ConfObj (public)
s = conf->getenv("QC_WITH_QCA_LIB");
if(!s.isEmpty()) {
Index: net/psi/patches/patch-iris_xmpp-core_jid_cpp
===================================================================
RCS file: /cvs/ports/net/psi/patches/patch-iris_xmpp-core_jid_cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-iris_xmpp-core_jid_cpp
--- net/psi/patches/patch-iris_xmpp-core_jid_cpp 29 Mar 2006 09:16:03
-0000 1.1
+++ net/psi/patches/patch-iris_xmpp-core_jid_cpp 24 Mar 2007 02:31:58
-0000
@@ -1,10 +1,10 @@
$OpenBSD: patch-iris_xmpp-core_jid_cpp,v 1.1 2006/03/29 09:16:03 bernd Exp $
---- iris/xmpp-core/jid.cpp.orig Wed Mar 22 11:25:09 2006
-+++ iris/xmpp-core/jid.cpp Wed Mar 22 11:25:09 2006
-@@ -20,7 +20,7 @@
-
+--- iris/xmpp-core/jid.cpp.orig Thu Mar 22 23:26:30 2007
++++ iris/xmpp-core/jid.cpp Thu Mar 22 23:25:26 2007
+@@ -21,7 +21,7 @@
#include"xmpp.h"
+ #include<qdict.h>
-#include<stringprep.h>
+#include"../libidn/stringprep.h"
Index: net/psi/patches/patch-src_options_opt_appearance-ui_ui
===================================================================
RCS file: /cvs/ports/net/psi/patches/patch-src_options_opt_appearance-ui_ui,v
retrieving revision 1.1
diff -u -r1.1 patch-src_options_opt_appearance-ui_ui
--- net/psi/patches/patch-src_options_opt_appearance-ui_ui 24 Sep 2005
00:02:48 -0000 1.1
+++ net/psi/patches/patch-src_options_opt_appearance-ui_ui 24 Mar 2007
02:31:58 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_options_opt_appearance-ui_ui,v 1.1 2005/09/24 00:02:48
espie Exp $
---- src/options/opt_appearance-ui.ui.orig Sat Sep 24 01:50:35 2005
-+++ src/options/opt_appearance-ui.ui Sat Sep 24 01:50:46 2005
-@@ -458,9 +458,5 @@
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-- <includehint>fontlabel.h</includehint>
-- <includehint>fontlabel.h</includehint>
-- <includehint>fontlabel.h</includehint>
-- <includehint>fontlabel.h</includehint>
- </includehints>
- </UI>
Index: net/psi/patches/patch-src_src_pro
===================================================================
RCS file: /cvs/ports/net/psi/patches/patch-src_src_pro,v
retrieving revision 1.1
diff -u -r1.1 patch-src_src_pro
--- net/psi/patches/patch-src_src_pro 3 Jun 2005 06:02:37 -0000 1.1
+++ net/psi/patches/patch-src_src_pro 24 Mar 2007 02:31:58 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-src_src_pro,v 1.1 2005/06/03 06:02:37 sturm Exp $
---- src/src.pro.orig Thu Jun 2 15:24:37 2005
-+++ src/src.pro Thu Jun 2 15:25:11 2005
-@@ -17,12 +17,6 @@ MOC_DIR = .moc
- OBJECTS_DIR = .obj
- UI_DIR = .ui
-
--# qconf
--unix: {
-- include(../conf.pri)
-- include(../extra.pri)
--}
--
- # qxml
- !isEmpty(QXML_STATIC) {
- unix: {
-@@ -42,6 +36,12 @@ exists(../cutestuff) {
- PSICS_CPP = ../cutestuff
- }
- include(../psics.pri)
-+
-+# qconf
-+unix: {
-+ include(../conf.pri)
-+ include(../extra.pri)
-+}
-
- # qca
- #DEFINES += QCA_STATIC
Index: net/psi/patches/patch-src_ui_about_ui
===================================================================
RCS file: /cvs/ports/net/psi/patches/patch-src_ui_about_ui,v
retrieving revision 1.1
diff -u -r1.1 patch-src_ui_about_ui
--- net/psi/patches/patch-src_ui_about_ui 24 Sep 2005 00:02:48 -0000
1.1
+++ net/psi/patches/patch-src_ui_about_ui 24 Mar 2007 02:31:58 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_ui_about_ui,v 1.1 2005/09/24 00:02:48 espie Exp $
---- src/ui_about.ui.orig Sat Sep 24 01:44:47 2005
-+++ src/ui_about.ui Sat Sep 24 01:44:58 2005
-@@ -334,7 +334,6 @@ Now that this is out of the way, enjoy P
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
- <includehint>fancylabel.h</includehint>
-- <includehint>urllabel.h</includehint>
- <includehint>psitextview.h</includehint>
- <includehint>psitextview.h</includehint>
- <includehint>psitextview.h</includehint>
Index: net/psi/pkg/DESCR
===================================================================
RCS file: /cvs/ports/net/psi/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- net/psi/pkg/DESCR 19 May 2005 20:29:58 -0000 1.1.1.1
+++ net/psi/pkg/DESCR 24 Mar 2007 02:31:58 -0000
@@ -1,4 +1,4 @@
Psi is the premiere Instant Messaging application designed for Microsoft
Windows, Apple Mac OS X, GNU/Linux and BSD. Built upon an open protocol named
Jabber, Psi is a fast and lightweight messaging client that utilises the best
-in open source technologies.
+in open source technologies.
Index: net/psi/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/psi/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- net/psi/pkg/PLIST 9 Mar 2006 20:40:06 -0000 1.2
+++ net/psi/pkg/PLIST 24 Mar 2007 02:31:58 -0000
@@ -65,19 +65,14 @@
share/psi/iconsets/emoticons/default/yes.png
share/psi/iconsets/roster/
share/psi/iconsets/roster/README
-share/psi/iconsets/roster/aim/
-share/psi/iconsets/roster/aim/away.png
-share/psi/iconsets/roster/aim/dnd.png
-share/psi/iconsets/roster/aim/icondef.xml
-share/psi/iconsets/roster/aim/offline.png
-share/psi/iconsets/roster/aim/online.png
-share/psi/iconsets/roster/aim/xa.png
-share/psi/iconsets/roster/crystal_aim.jisp
-share/psi/iconsets/roster/crystal_icq.jisp
-share/psi/iconsets/roster/crystal_msn.jisp
-share/psi/iconsets/roster/crystal_roster.jisp
-share/psi/iconsets/roster/crystal_transport.jisp
-share/psi/iconsets/roster/crystal_yahoo.jisp
+share/psi/iconsets/roster/crystal-aim.jisp
+share/psi/iconsets/roster/crystal-gadu.jisp
+share/psi/iconsets/roster/crystal-icq.jisp
+share/psi/iconsets/roster/crystal-msn.jisp
+share/psi/iconsets/roster/crystal-roster.jisp
+share/psi/iconsets/roster/crystal-service.jisp
+share/psi/iconsets/roster/crystal-sms.jisp
+share/psi/iconsets/roster/crystal-yahoo.jisp
share/psi/iconsets/roster/default/
share/psi/iconsets/roster/default/ask.png
share/psi/iconsets/roster/default/away.png
@@ -99,80 +94,13 @@
share/psi/iconsets/roster/default/perr.png
share/psi/iconsets/roster/default/system.png
share/psi/iconsets/roster/default/xa.png
-share/psi/iconsets/roster/gadugadu/
-share/psi/iconsets/roster/gadugadu/away.png
-share/psi/iconsets/roster/gadugadu/icondef.xml
-share/psi/iconsets/roster/gadugadu/invisible.png
-share/psi/iconsets/roster/gadugadu/offline.png
-share/psi/iconsets/roster/gadugadu/online.png
-share/psi/iconsets/roster/icq/
-share/psi/iconsets/roster/icq/away.png
-share/psi/iconsets/roster/icq/chat.png
-share/psi/iconsets/roster/icq/dnd.png
-share/psi/iconsets/roster/icq/icondef.xml
-share/psi/iconsets/roster/icq/invisible.png
-share/psi/iconsets/roster/icq/offline.png
-share/psi/iconsets/roster/icq/online.png
-share/psi/iconsets/roster/icq/xa.png
-share/psi/iconsets/roster/lightbulb/
-share/psi/iconsets/roster/lightbulb/away.png
-share/psi/iconsets/roster/lightbulb/chat.png
-share/psi/iconsets/roster/lightbulb/dnd.png
-share/psi/iconsets/roster/lightbulb/ffc.png
-share/psi/iconsets/roster/lightbulb/groupclose.png
-share/psi/iconsets/roster/lightbulb/groupempty.png
-share/psi/iconsets/roster/lightbulb/groupopen.png
-share/psi/iconsets/roster/lightbulb/icondef.xml
-share/psi/iconsets/roster/lightbulb/invisible.png
-share/psi/iconsets/roster/lightbulb/message.png
-share/psi/iconsets/roster/lightbulb/offline.png
-share/psi/iconsets/roster/lightbulb/online.png
-share/psi/iconsets/roster/lightbulb/system.png
-share/psi/iconsets/roster/lightbulb/xa.png
-share/psi/iconsets/roster/msn/
-share/psi/iconsets/roster/msn/away.png
-share/psi/iconsets/roster/msn/dnd.png
-share/psi/iconsets/roster/msn/icondef.xml
-share/psi/iconsets/roster/msn/offline.png
-share/psi/iconsets/roster/msn/online.png
-share/psi/iconsets/roster/sms/
-share/psi/iconsets/roster/sms/away.png
-share/psi/iconsets/roster/sms/dnd.png
-share/psi/iconsets/roster/sms/icondef.xml
-share/psi/iconsets/roster/sms/offline.png
-share/psi/iconsets/roster/sms/online.png
-share/psi/iconsets/roster/sms/xa.png
-share/psi/iconsets/roster/stellar-icq/
-share/psi/iconsets/roster/stellar-icq/ask.png
-share/psi/iconsets/roster/stellar-icq/away.png
-share/psi/iconsets/roster/stellar-icq/dnd.png
-share/psi/iconsets/roster/stellar-icq/ffc.png
-share/psi/iconsets/roster/stellar-icq/icondef.xml
-share/psi/iconsets/roster/stellar-icq/invisible.png
-share/psi/iconsets/roster/stellar-icq/noauth.png
-share/psi/iconsets/roster/stellar-icq/offline.png
-share/psi/iconsets/roster/stellar-icq/online.png
-share/psi/iconsets/roster/stellar-icq/xa.png
-share/psi/iconsets/roster/transport/
-share/psi/iconsets/roster/transport/away.png
-share/psi/iconsets/roster/transport/dnd.png
-share/psi/iconsets/roster/transport/icondef.xml
-share/psi/iconsets/roster/transport/offline.png
-share/psi/iconsets/roster/transport/online.png
-share/psi/iconsets/roster/transport/xa.png
-share/psi/iconsets/roster/yahoo/
-share/psi/iconsets/roster/yahoo/away.png
-share/psi/iconsets/roster/yahoo/dnd.png
-share/psi/iconsets/roster/yahoo/icondef.xml
-share/psi/iconsets/roster/yahoo/offline.png
-share/psi/iconsets/roster/yahoo/online.png
-share/psi/iconsets/roster/yahoo/xa.png
share/psi/iconsets/system/
share/psi/iconsets/system/README
-share/psi/iconsets/system/crystal_system.jisp
share/psi/iconsets/system/default/
share/psi/iconsets/system/default/account.png
share/psi/iconsets/system/default/add.png
+share/psi/iconsets/system/default/advanced.png
+share/psi/iconsets/system/default/appearance.png
share/psi/iconsets/system/default/arrow_down.png
share/psi/iconsets/system/default/arrow_left.png
share/psi/iconsets/system/default/arrow_right.png
@@ -199,15 +127,11 @@
share/psi/iconsets/system/default/clients/unknown.png
share/psi/iconsets/system/default/clients/yahoo.png
share/psi/iconsets/system/default/close.png
+share/psi/iconsets/system/default/closetab.png
share/psi/iconsets/system/default/configure_toolbars.png
+share/psi/iconsets/system/default/disco.png
share/psi/iconsets/system/default/download.png
-share/psi/iconsets/system/default/edit.png
-share/psi/iconsets/system/default/editclear.png
-share/psi/iconsets/system/default/editcopy.png
-share/psi/iconsets/system/default/editcut.png
-share/psi/iconsets/system/default/editdelete.png
-share/psi/iconsets/system/default/editpaste.png
-share/psi/iconsets/system/default/edittrash.png
+share/psi/iconsets/system/default/events.png
share/psi/iconsets/system/default/eye_blue.png
share/psi/iconsets/system/default/filemanager.png
share/psi/iconsets/system/default/groupchat.png
@@ -221,7 +145,6 @@
share/psi/iconsets/system/default/info.png
share/psi/iconsets/system/default/jabber.png
share/psi/iconsets/system/default/key.png
-share/psi/iconsets/system/default/key2.png
share/psi/iconsets/system/default/key_bad.png
share/psi/iconsets/system/default/key_unknown.png
share/psi/iconsets/system/default/ok.png
@@ -236,10 +159,16 @@
share/psi/iconsets/system/default/reload.png
share/psi/iconsets/system/default/remove.png
share/psi/iconsets/system/default/search.png
+share/psi/iconsets/system/default/self.png
share/psi/iconsets/system/default/send.png
+share/psi/iconsets/system/default/show_away.png
+share/psi/iconsets/system/default/show_hidden.png
+share/psi/iconsets/system/default/show_offline.png
share/psi/iconsets/system/default/smile.png
share/psi/iconsets/system/default/ssl_no.png
share/psi/iconsets/system/default/ssl_yes.png
+share/psi/iconsets/system/default/start-chat.png
+share/psi/iconsets/system/default/status.png
share/psi/iconsets/system/default/stop.png
share/psi/iconsets/system/default/time.png
share/psi/iconsets/system/default/tip.png
