From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Feb 6 16:00:01 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C6BE16A46C for ; Wed, 6 Feb 2008 16:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E3B8013C4D5 for ; Wed, 6 Feb 2008 16:00:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m16G00K4072160 for ; Wed, 6 Feb 2008 16:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m16G00CD072159; Wed, 6 Feb 2008 16:00:00 GMT (envelope-from gnats) Resent-Date: Wed, 6 Feb 2008 16:00:00 GMT Resent-Message-Id: <200802061600.m16G00CD072159@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Sivachenko Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC40816A418 for ; Wed, 6 Feb 2008 15:56:58 +0000 (UTC) (envelope-from mitya@cavia.yandex.ru) Received: from cavia.yandex.ru (dhcp250-140.yandex.ru [87.250.250.140]) by mx1.freebsd.org (Postfix) with ESMTP id 8259C13C4F3 for ; Wed, 6 Feb 2008 15:56:57 +0000 (UTC) (envelope-from mitya@cavia.yandex.ru) Received: from cavia.yandex.ru (localhost [127.0.0.1]) by cavia.yandex.ru (8.14.2/8.14.2) with ESMTP id m16Fv2O2036507 for ; Wed, 6 Feb 2008 18:57:02 +0300 (MSK) (envelope-from mitya@cavia.yandex.ru) Received: (from mitya@localhost) by cavia.yandex.ru (8.14.2/8.14.2/Submit) id m16Fv2Pe036506; Wed, 6 Feb 2008 18:57:02 +0300 (MSK) (envelope-from mitya) Message-Id: <200802061557.m16Fv2Pe036506@cavia.yandex.ru> Date: Wed, 6 Feb 2008 18:57:02 +0300 (MSK) From: Dmitry Sivachenko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/120324: Update port: net-im/psi X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Sivachenko List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Feb 2008 16:00:01 -0000 >Number: 120324 >Category: ports >Synopsis: Update port: net-im/psi >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Feb 06 16:00:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dmitry Sivachenko >Release: FreeBSD 7.0-PRERELEASE i386 >Organization: >Environment: System: FreeBSD cavia.yandex.ru 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #0: Wed Jan 23 19:20:04 MSK 2008 mitya@cavia.yandex.ru:/usr/obj/usr/src/sys/CAVIA i386 >Description: Update net-im/psi to current version. Requires updated devel/qca port. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net-im/psi/Makefile,v retrieving revision 1.35 diff -u -r1.35 Makefile --- Makefile 19 May 2007 20:19:38 -0000 1.35 +++ Makefile 6 Feb 2008 15:39:00 -0000 @@ -6,8 +6,7 @@ # PORTNAME= psi -PORTVERSION= 0.10 -PORTREVISION= 1 +PORTVERSION= 0.11 CATEGORIES= net-im MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,26 +15,23 @@ COMMENT?= A Qt-based Jabber client BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= qca.1:${PORTSDIR}/devel/qca -RUN_DEPENDS= ${X11BASE}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls +LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca HAS_CONFIGURE= yes USE_X_PREFIX= yes USE_BZIP2= yes -USE_QT_VER= 3 +USE_QT_VER= 4 -CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ +CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \ PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LDFLAGS=${PTHREAD_LIBS} \ KDEDIR=${LOCALBASE} CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} \ - --with-qca-inc=${X11BASE}/include/plugins/qca \ + --with-qca-inc=${X11BASE}/include/QtCrypto \ --with-qca-lib=${X11BASE}/lib \ --disable-growl --disable-dnotify --disable-ghbnr MAKE_ARGS+= QTDIR=${QT_PREFIX} \ - QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ - -PORTDOCS= README ChangeLog + QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ OPTIONS?= GENTOO_EXTRAS "Build with unofficial Gentoo patches" off @@ -49,11 +45,5 @@ post-install: ${STRIP_CMD} ${PREFIX}/bin/psi -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor -.endif .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/net-im/psi/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- distinfo 31 May 2006 11:21:30 -0000 1.12 +++ distinfo 6 Feb 2008 15:39:00 -0000 @@ -1,6 +1,6 @@ -MD5 (psi-0.10.tar.bz2) = f0fd4ccf077f7b24e236f71c22649b7b -SHA256 (psi-0.10.tar.bz2) = e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1 -SIZE (psi-0.10.tar.bz2) = 1430929 +MD5 (psi-0.11.tar.bz2) = 6ccc81783eece7959140951289cf5310 +SHA256 (psi-0.11.tar.bz2) = be37b7b8d86e965362512f47bf68af2b21d35e5c886a9e0eccf1c9bc519706b3 +SIZE (psi-0.11.tar.bz2) = 2000216 MD5 (gentoo-psi-0.10.tar.bz2) = 4aacc2de659a5a551e9b47382af83c35 SHA256 (gentoo-psi-0.10.tar.bz2) = 1d499ecb693401a69600d48c62bc3cbd3f4eed7605729655959d13af981d72bd SIZE (gentoo-psi-0.10.tar.bz2) = 211538 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/net-im/psi/pkg-plist,v retrieving revision 1.11 diff -u -r1.11 pkg-plist --- pkg-plist 27 May 2006 06:51:50 -0000 1.11 +++ pkg-plist 6 Feb 2008 15:39:00 -0000 @@ -2,8 +2,8 @@ %%DATADIR%%/COPYING %%DATADIR%%/README %%DATADIR%%/certs/README -%%DATADIR%%/certs/rootcert.xml -%%DATADIR%%/iconsets/emoticons/README +%%DATADIR%%/certs/rootcerts.pem +%%DATADIR%%/certs/startcom_ca.crt %%DATADIR%%/iconsets/emoticons/default/angry.png %%DATADIR%%/iconsets/emoticons/default/bat.png %%DATADIR%%/iconsets/emoticons/default/beer.png @@ -53,29 +53,28 @@ %%DATADIR%%/iconsets/roster/crystal-yahoo.jisp %%DATADIR%%/iconsets/roster/default/ask.png %%DATADIR%%/iconsets/roster/default/away.png -%%DATADIR%%/iconsets/roster/default/chat.png -%%DATADIR%%/iconsets/roster/default/connect.png +%%DATADIR%%/iconsets/roster/default/chat.fading.png +%%DATADIR%%/iconsets/roster/default/chatty.png %%DATADIR%%/iconsets/roster/default/dnd.png -%%DATADIR%%/iconsets/roster/default/ffc.png -%%DATADIR%%/iconsets/roster/default/file.png +%%DATADIR%%/iconsets/roster/default/file.fading.png %%DATADIR%%/iconsets/roster/default/groupclose.png -%%DATADIR%%/iconsets/roster/default/groupempty.png %%DATADIR%%/iconsets/roster/default/groupopen.png %%DATADIR%%/iconsets/roster/default/headline.png %%DATADIR%%/iconsets/roster/default/icondef.xml %%DATADIR%%/iconsets/roster/default/invisible.png -%%DATADIR%%/iconsets/roster/default/message.png +%%DATADIR%%/iconsets/roster/default/message.fading.png %%DATADIR%%/iconsets/roster/default/noauth.png %%DATADIR%%/iconsets/roster/default/offline.png +%%DATADIR%%/iconsets/roster/default/online.dimming.png %%DATADIR%%/iconsets/roster/default/online.png %%DATADIR%%/iconsets/roster/default/perr.png %%DATADIR%%/iconsets/roster/default/system.png %%DATADIR%%/iconsets/roster/default/xa.png %%DATADIR%%/iconsets/system/README %%DATADIR%%/iconsets/system/default/account.png +%%DATADIR%%/iconsets/system/default/add.png %%DATADIR%%/iconsets/system/default/advanced.png %%DATADIR%%/iconsets/system/default/appearance.png -%%DATADIR%%/iconsets/system/default/add.png %%DATADIR%%/iconsets/system/default/arrow_down.png %%DATADIR%%/iconsets/system/default/arrow_left.png %%DATADIR%%/iconsets/system/default/arrow_right.png @@ -86,25 +85,28 @@ %%DATADIR%%/iconsets/system/default/chatclear.png %%DATADIR%%/iconsets/system/default/close.png %%DATADIR%%/iconsets/system/default/closetab.png +%%DATADIR%%/iconsets/system/default/command.png +%%DATADIR%%/iconsets/system/default/configure-room.png %%DATADIR%%/iconsets/system/default/configure_toolbars.png -%%DATADIR%%/iconsets/system/default/download.png %%DATADIR%%/iconsets/system/default/disco.png -%%DATADIR%%/iconsets/system/default/eye_blue.png +%%DATADIR%%/iconsets/system/default/download.png %%DATADIR%%/iconsets/system/default/events.png +%%DATADIR%%/iconsets/system/default/eye_blue.png %%DATADIR%%/iconsets/system/default/filemanager.png %%DATADIR%%/iconsets/system/default/groupchat.png %%DATADIR%%/iconsets/system/default/help.png %%DATADIR%%/iconsets/system/default/history.png -%%DATADIR%%/iconsets/system/default/icon_16.png -%%DATADIR%%/iconsets/system/default/icon_32.png -%%DATADIR%%/iconsets/system/default/icon_48.png -%%DATADIR%%/iconsets/system/default/icon_mac.png %%DATADIR%%/iconsets/system/default/icondef.xml %%DATADIR%%/iconsets/system/default/info.png %%DATADIR%%/iconsets/system/default/jabber.png %%DATADIR%%/iconsets/system/default/key.png %%DATADIR%%/iconsets/system/default/key_bad.png %%DATADIR%%/iconsets/system/default/key_unknown.png +%%DATADIR%%/iconsets/system/default/logo_128.png +%%DATADIR%%/iconsets/system/default/logo_16.png +%%DATADIR%%/iconsets/system/default/logo_32.png +%%DATADIR%%/iconsets/system/default/logo_48.png +%%DATADIR%%/iconsets/system/default/logo_64.png %%DATADIR%%/iconsets/system/default/ok.png %%DATADIR%%/iconsets/system/default/options.png %%DATADIR%%/iconsets/system/default/pgp.png @@ -112,44 +114,50 @@ %%DATADIR%%/iconsets/system/default/play_sounds.png %%DATADIR%%/iconsets/system/default/psilogo.png %%DATADIR%%/iconsets/system/default/psimain.png +%%DATADIR%%/iconsets/system/default/publish_tune.png %%DATADIR%%/iconsets/system/default/quit.png %%DATADIR%%/iconsets/system/default/register.png %%DATADIR%%/iconsets/system/default/reload.png %%DATADIR%%/iconsets/system/default/remove.png %%DATADIR%%/iconsets/system/default/search.png -%%DATADIR%%/iconsets/system/default/send.png %%DATADIR%%/iconsets/system/default/self.png +%%DATADIR%%/iconsets/system/default/send.png +%%DATADIR%%/iconsets/system/default/shortcuts.png %%DATADIR%%/iconsets/system/default/show_away.png %%DATADIR%%/iconsets/system/default/show_hidden.png %%DATADIR%%/iconsets/system/default/show_offline.png -%%DATADIR%%/iconsets/system/default/start-chat.png -%%DATADIR%%/iconsets/system/default/status.png %%DATADIR%%/iconsets/system/default/smile.png %%DATADIR%%/iconsets/system/default/ssl_no.png %%DATADIR%%/iconsets/system/default/ssl_yes.png +%%DATADIR%%/iconsets/system/default/start-chat.png +%%DATADIR%%/iconsets/system/default/status.png %%DATADIR%%/iconsets/system/default/stop.png %%DATADIR%%/iconsets/system/default/time.png %%DATADIR%%/iconsets/system/default/tip.png %%DATADIR%%/iconsets/system/default/upload.png %%DATADIR%%/iconsets/system/default/url.png %%DATADIR%%/iconsets/system/default/vcard.png +%%DATADIR%%/iconsets/system/default/whiteboarding/add_image.png +%%DATADIR%%/iconsets/system/default/whiteboarding/add_text.png +%%DATADIR%%/iconsets/system/default/whiteboarding/bring_forwards.png +%%DATADIR%%/iconsets/system/default/whiteboarding/bring_to_front.png +%%DATADIR%%/iconsets/system/default/whiteboarding/draw_circles.png +%%DATADIR%%/iconsets/system/default/whiteboarding/draw_ellipses.png +%%DATADIR%%/iconsets/system/default/whiteboarding/draw_lines.png +%%DATADIR%%/iconsets/system/default/whiteboarding/draw_paths.png +%%DATADIR%%/iconsets/system/default/whiteboarding/draw_rectangles.png +%%DATADIR%%/iconsets/system/default/whiteboarding/erase.png +%%DATADIR%%/iconsets/system/default/whiteboarding/group.png +%%DATADIR%%/iconsets/system/default/whiteboarding/rotate.png +%%DATADIR%%/iconsets/system/default/whiteboarding/scale.png +%%DATADIR%%/iconsets/system/default/whiteboarding/scroll.png +%%DATADIR%%/iconsets/system/default/whiteboarding/select.png +%%DATADIR%%/iconsets/system/default/whiteboarding/send_backwards.png +%%DATADIR%%/iconsets/system/default/whiteboarding/send_to_back.png +%%DATADIR%%/iconsets/system/default/whiteboarding/translate.png +%%DATADIR%%/iconsets/system/default/whiteboarding/ungroup.png +%%DATADIR%%/iconsets/system/default/whiteboarding/whiteboard.png %%DATADIR%%/iconsets/system/default/xml.png -%%DATADIR%%/iconsets/system/default/clients/aim.png -%%DATADIR%%/iconsets/system/default/clients/exodus.png -%%DATADIR%%/iconsets/system/default/clients/gabber.png -%%DATADIR%%/iconsets/system/default/clients/gadu.png -%%DATADIR%%/iconsets/system/default/clients/gaim.png -%%DATADIR%%/iconsets/system/default/clients/gossip.png -%%DATADIR%%/iconsets/system/default/clients/icq.png -%%DATADIR%%/iconsets/system/default/clients/jajc.png -%%DATADIR%%/iconsets/system/default/clients/kopete.png -%%DATADIR%%/iconsets/system/default/clients/msn.png -%%DATADIR%%/iconsets/system/default/clients/nitro.png -%%DATADIR%%/iconsets/system/default/clients/pandion.png -%%DATADIR%%/iconsets/system/default/clients/tkabber.png -%%DATADIR%%/iconsets/system/default/clients/trillian.png -%%DATADIR%%/iconsets/system/default/clients/unknown.png -%%DATADIR%%/iconsets/system/default/clients/yahoo.png %%DATADIR%%/sound/chat1.wav %%DATADIR%%/sound/chat2.wav %%DATADIR%%/sound/ft_complete.wav @@ -173,7 +181,10 @@ share/icons/hicolor/16x16/apps/psi.png share/icons/hicolor/32x32/apps/psi.png share/icons/hicolor/48x48/apps/psi.png +share/icons/hicolor/64x64/apps/psi.png +share/icons/hicolor/128x128/apps/psi.png @dirrm %%DATADIR%%/sound +@dirrm %%DATADIR%%/iconsets/system/default/whiteboarding @dirrm %%DATADIR%%/iconsets/system/default/clients @dirrm %%DATADIR%%/iconsets/system/default @dirrm %%DATADIR%%/iconsets/system @@ -191,5 +202,9 @@ @dirrmtry share/icons/hicolor/32x32 @dirrmtry share/icons/hicolor/48x48/apps @dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor/64x64/apps +@dirrmtry share/icons/hicolor/64x64 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 @dirrmtry share/icons/hicolor @dirrmtry share/icons Index: files/patch-configure =================================================================== RCS file: /home/pcvs/ports/net-im/psi/files/patch-configure,v retrieving revision 1.8 diff -u -r1.8 patch-configure --- files/patch-configure 22 Mar 2006 18:40:57 -0000 1.8 +++ files/patch-configure 6 Feb 2008 15:39:00 -0000 @@ -9,32 +9,3 @@ *) show_usage; exit ;; esac done -@@ -1055,9 +1057,13 @@ - "}\n"; - - QString extra; -+ QString pthread_cflags = getenv("PTHREAD_CFLAGS"); -+ QString pthread_ldflags = getenv("PTHREAD_LDFLAGS"); - if(!path.isEmpty()) - extra += QString("-L") + path + ' '; - extra += QString("-l") + name; -+ extra += ' ' + pthread_cflags + ' ' + pthread_ldflags + ' '; -+ - if(!doCompileAndLink(str, extra)) - return false; - return true; -@@ -1287,14 +1293,6 @@ - echo - exit 1; - fi --cat >Makefile.tmp <> Makefile.tmp --rm -f Makefile --cp -f Makefile.tmp Makefile --rm -f Makefile.tmp - - echo - echo "Good, your configure finished. Now run 'make'." Index: files/patch-third-party-qca-cyrus-sasl.cpp =================================================================== RCS file: files/patch-third-party-qca-cyrus-sasl.cpp diff -N files/patch-third-party-qca-cyrus-sasl.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-third-party-qca-cyrus-sasl.cpp 6 Feb 2008 15:39:00 -0000 @@ -0,0 +1,10 @@ +--- third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp.orig 2007-10-14 18:00:57.000000000 +0400 ++++ third-party/qca/qca-cyrus-sasl/qca-cyrus-sasl.cpp 2008-02-06 18:08:20.000000000 +0300 +@@ -20,6 +20,7 @@ + */ + + #include ++#include + #include + #include + Index: files/patch-third-party-qca-gnupg.cpp =================================================================== RCS file: files/patch-third-party-qca-gnupg.cpp diff -N files/patch-third-party-qca-gnupg.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-third-party-qca-gnupg.cpp 6 Feb 2008 15:39:00 -0000 @@ -0,0 +1,10 @@ +--- third-party/qca/qca-gnupg/qca-gnupg.cpp.orig 2008-02-06 18:10:33.000000000 +0300 ++++ third-party/qca/qca-gnupg/qca-gnupg.cpp 2008-02-06 18:10:39.000000000 +0300 +@@ -17,6 +17,7 @@ + */ + + #include ++#include + #include + + #ifdef Q_OS_MAC Index: files/patch-third-party-qca-ossl.cpp =================================================================== RCS file: files/patch-third-party-qca-ossl.cpp diff -N files/patch-third-party-qca-ossl.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-third-party-qca-ossl.cpp 6 Feb 2008 15:39:00 -0000 @@ -0,0 +1,10 @@ +--- third-party/qca/qca-ossl/qca-ossl.cpp.orig 2007-10-14 18:00:57.000000000 +0400 ++++ third-party/qca/qca-ossl/qca-ossl.cpp 2008-02-06 18:09:55.000000000 +0300 +@@ -19,6 +19,7 @@ + */ + + #include ++#include + + #include + #include >Release-Note: >Audit-Trail: >Unformatted: