cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

restore psi 0.10, but with a workaround to avoid inclusion of

Browse Source 
/usr/local/include/socks.h which breaks compilation.

ok naddy@
This commit is contained in:
steven 2007-08-08 05:51:51 +00:00
parent 9ad7bde84e
commit b9cf7ed60c
9 changed files with 60 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
net/psi/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.8 2007/08/01 05:50:43 steven Exp $
# $OpenBSD: Makefile,v 1.9 2007/08/08 05:51:51 steven Exp $
COMMENT= "multiplatform Jabber client"
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 <gerardo.santana@gmail.com>
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
EXTRACT_SUFX= .tar.bz2
# GPL
PERMIT_PACKAGE_CDROM= Yes
@ -17,30 +17,42 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xss m c z Xext pthread stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=psi/}
EXTRACT_SUFX= .tar.bz2
MODULES= x11/qt3
MODQT_OVERRIDE_UIC= No
MODQT_MT= Yes
LIB_DEPENDS= qca.>=1::security/qca
USE_X11= Yes
USE_GMAKE= Yes
LIB_DEPENDS= qca.>=1::security/qca
RUN_DEPENDS= ::security/qca-tls
CONFIGURE_STYLE= simple
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}
NO_REGRESS= Yes
pre-configure:
@perl -pi -e "s@%%X11BASE%%@${X11BASE}@" ${WRKSRC}/configure
# compilation breaks if /usr/local/include/socks.h (from security/dante) is
# found before psi's own socks.h, so add a workaround.
pre-build:
@perl -pi -e 's,INCLUDEPATH.*,,' ${WRKSRC}/conf.pri
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/psi ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/psi

9
net/psi/distinfo
View File

@ -1,5 +1,6 @@
MD5 (psi-0.9.3.tar.bz2) = 0g87tTAjWiRrwtkjCAiXRA==
RMD160 (psi-0.9.3.tar.bz2) = Zpg6l0aBKyelyKHAcumzOspjjTA=
SHA1 (psi-0.9.3.tar.bz2) = 3F59v115HbLwxBicrQVaQLIc+bY=
SHA256 (psi-0.9.3.tar.bz2) = 460q7f3d+gRdsqVdZiewQS8krEFMD2weFfVEiDRDmgA=
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
SIZE (psi-0.9.3.tar.bz2) = 1423322

8
net/psi/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2007/08/01 05:50:43 steven Exp $
--- configure.orig Sat Nov 20 14:05:03 2004
+++ configure Sat Sep 24 01:20:20 2005
@@ -261,7 +261,7 @@ public:
$OpenBSD: patch-configure,v 1.5 2007/08/08 05:51:51 steven Exp $
--- 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()) {

10
net/psi/patches/patch-iris_xmpp-core_jid_cpp
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-iris_xmpp-core_jid_cpp,v 1.3 2007/08/01 05:50:43 steven 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 @@
$OpenBSD: patch-iris_xmpp-core_jid_cpp,v 1.4 2007/08/08 05:51:51 steven Exp $
--- 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"

13
net/psi/patches/patch-src_options_opt_appearance-ui_ui
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_options_opt_appearance-ui_ui,v 1.3 2007/08/01 05:50:43 steven 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>

29
net/psi/patches/patch-src_src_pro
View File

@ -1,29 +0,0 @@
$OpenBSD: patch-src_src_pro,v 1.3 2007/08/01 05:50:43 steven 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

11
net/psi/patches/patch-src_ui_about_ui
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_ui_about_ui,v 1.3 2007/08/01 05:50:43 steven 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>

6
net/psi/pkg/DESCR
View File

@ -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.
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.

111
net/psi/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2007/08/01 05:50:43 steven Exp $
@comment $OpenBSD: PLIST,v 1.5 2007/08/08 05:51:52 steven Exp $
%%SHARED%%
bin/psi
share/applnk/
@ -65,19 +65,14 @@ share/psi/iconsets/emoticons/default/wink.png
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/online.png
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/trillian.png
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/icondef.xml
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/register.png
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