Date: Mon, 4 Apr 2005 11:13:13 -0700 (PDT) From: Ted Faber <faber@isi.edu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Ted Faber <faber@isi.edu> Subject: ports/79531: Update port (&maintainer): net/psi New version released [0.9.3] (tied to new security/qca port) Message-ID: <200504041813.j34IDDn8069380@pun.isi.edu> Resent-Message-ID: <200504041820.j34IK13O006852@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 79531
>Category: ports
>Synopsis: Update port (&maintainer): net/psi New version released [0.9.3] (tied to new security/qca port)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Apr 04 18:20:00 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Ted Faber
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
USC/ISI
>Environment:
System: FreeBSD pun.isi.edu 6.0-CURRENT FreeBSD 6.0-CURRENT #15: Wed Mar 30 08:09:43 PST 2005 root@pun.isi.edu:/usr/obj/usr/src/sys/PUN i386
>Description:
I've built a port for the upgrade of net/psi. I passed it the
maintainer (eugos@gmx.net) who replied that he wasn't interested
in keeping it up any longer. I'm willing to do so.
The upgraded port is attached. N.B. the new port expects QCA
installed for which there was no port. I've also submitted a new
port for that component. Please do not import the psi upgrade until
the qca port has gone in.
Thanks!
>How-To-Repeat:
n/a
>Fix:
Patch:
diff -ruN psi.bak/Makefile psi/Makefile
--- psi.bak/Makefile Fri Jun 11 11:53:13 2004
+++ psi/Makefile Mon Apr 4 10:58:50 2005
@@ -6,23 +6,25 @@
#
PORTNAME= psi
-PORTVERSION= 0.9.2
+PORTVERSION= 0.9.3
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= eugos@gmx.net
+MAINTAINER= faber@isi.edu
COMMENT= A Qt-based Jabber client
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
+BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake \
+ ${X11BASE}/lib/libqca.so:${PORTSDIR}/security/qca
RUN_DEPENDS= ${X11BASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls
HAS_CONFIGURE= yes
USE_X_PREFIX= yes
USE_BZIP2= yes
+USE_GMAKE= yes
USE_QT_VER= 3
CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} --disable-kde
+CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} --disable-kde --with-qca-inc=${X11BASE}/include --with-qca-lib=${X11BASE}/lib
MAKE_ARGS+= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
diff -ruN psi.bak/distinfo psi/distinfo
--- psi.bak/distinfo Fri Jun 11 11:53:13 2004
+++ psi/distinfo Mon Apr 4 10:57:47 2005
@@ -1,2 +1,2 @@
-MD5 (psi-0.9.2.tar.bz2) = e29f90aea7d839f2a70e4a6e77e95a70
-SIZE (psi-0.9.2.tar.bz2) = 1154392
+MD5 (psi-0.9.3.tar.bz2) = d20f3bb530235a246bc2d92308089744
+SIZE (psi-0.9.3.tar.bz2) = 1423322
diff -ruN psi.bak/files/patch-configure psi/files/patch-configure
--- psi.bak/files/patch-configure Fri Jun 11 11:53:13 2004
+++ psi/files/patch-configure Mon Apr 4 10:57:47 2005
@@ -1,31 +1,42 @@
-$FreeBSD: ports/net/psi/files/patch-configure,v 1.6 2004/06/11 18:53:13 krion Exp $
-
-Hack configure to eat autogenerated qt options
-and to do the main Makefile make(1) compatible.
-
---- configure.orig Fri Jun 11 13:49:06 2004
-+++ configure Fri Jun 11 14:25:01 2004
-@@ -82,6 +82,8 @@
+--- ./configure.orig Sat Nov 20 05:05:03 2004
++++ ./configure Fri Apr 1 09:16:58 2005
+@@ -25,6 +25,7 @@
+ --disable-kde Disable use of KDE
+
+ EOT
++ exit 20
+ }
+
+ while [ $# -gt 0 ]; do
+@@ -68,7 +69,12 @@
+ QC_WITH_ZLIB_LIB="${1#--with-zlib-lib=}"
+ shift
+ ;;
+-
++ --with-qt*)
++ shift
++ ;;
++ --with-extra*)
++ shift
++ ;;
+ --disable-xss)
+ QC_DISABLE_xss="Y"
+ shift
+@@ -94,7 +100,7 @@
shift
;;
--help) show_usage; exit ;;
-+ --with-*)
-+ shift ;;
- *) show_usage; exit ;;
+- *) show_usage; exit ;;
++ *) echo "$1"; show_usage; exit ;;
esac
done
-@@ -1035,14 +1037,6 @@
- echo
- exit 1;
- fi
--cat >Makefile.tmp <<EOT
--export QTDIR = $QTDIR
--export PATH = $QTDIR/bin:$PATH
--EOT
--cat Makefile >> Makefile.tmp
--rm -f Makefile
--cp -f Makefile.tmp Makefile
--rm -f Makefile.tmp
- echo
- echo Good, your configure finished. Now run \'make\'.
+@@ -884,7 +890,7 @@
+ QString extra;
+ if(!path.isEmpty())
+ extra += QString("-L") + path + ' ';
+- extra += QString("-l") + name;
++ extra += QString("-pthread -l") + name;
+ if(!doCompileAndLink(str, extra))
+ return false;
+ return true;
diff -ruN psi.bak/pkg-plist psi/pkg-plist
--- psi.bak/pkg-plist Fri Jun 11 11:53:13 2004
+++ psi/pkg-plist Mon Apr 4 10:57:47 2005
@@ -50,6 +50,12 @@
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/default/ask.png
share/psi/iconsets/roster/default/away.png
share/psi/iconsets/roster/default/chat.png
@@ -131,6 +137,7 @@
share/psi/iconsets/roster/yahoo/online.png
share/psi/iconsets/roster/yahoo/xa.png
share/psi/iconsets/system/README
+share/psi/iconsets/system/crystal_system.jisp
share/psi/iconsets/system/default/account.png
share/psi/iconsets/system/default/add.png
share/psi/iconsets/system/default/arrow_down.png
@@ -190,6 +197,22 @@
share/psi/iconsets/system/default/url.png
share/psi/iconsets/system/default/vcard.png
share/psi/iconsets/system/default/xml.png
+share/psi/iconsets/system/default/clients/aim.png
+share/psi/iconsets/system/default/clients/exodus.png
+share/psi/iconsets/system/default/clients/gabber.png
+share/psi/iconsets/system/default/clients/gadu.png
+share/psi/iconsets/system/default/clients/gaim.png
+share/psi/iconsets/system/default/clients/gossip.png
+share/psi/iconsets/system/default/clients/icq.png
+share/psi/iconsets/system/default/clients/jajc.png
+share/psi/iconsets/system/default/clients/kopete.png
+share/psi/iconsets/system/default/clients/msn.png
+share/psi/iconsets/system/default/clients/nitro.png
+share/psi/iconsets/system/default/clients/pandion.png
+share/psi/iconsets/system/default/clients/tkabber.png
+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/sound/chat1.wav
share/psi/sound/chat2.wav
share/psi/sound/ft_complete.wav
@@ -198,6 +221,7 @@
share/psi/sound/online.wav
share/psi/sound/send.wav
@dirrm share/psi/sound
+@dirrm share/psi/iconsets/system/default/clients
@dirrm share/psi/iconsets/system/default
@dirrm share/psi/iconsets/system
@dirrm share/psi/iconsets/roster/yahoo
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504041813.j34IDDn8069380>