Date: Sat, 4 Feb 2006 15:17:41 +0800 From: "Stepan Zastupov [RedChrom]" <redchrom@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92793: [Update] new version of net-im/psi Message-ID: <20060204071741.GA36527@asylum> Resent-Message-ID: <200602040720.k147K3MC001295@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92793
>Category: ports
>Synopsis: [Update] new version of net-im/psi
>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 Feb 04 07:20:03 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: RedChrom
>Release: FreeBSD 6.0-STABLE i386
>Organization:
RedChrom
>Environment:
System: FreeBSD asylum 6.0-STABLE FreeBSD 6.0-STABLE #1: Fri Jan 27 23:07:53 IRKT 2006 root@asylum:/usr/obj/usr/src/sys/ASYLUM i386
>Description:
New version of the psi is available. Btw --with-kde option is deprecated.
P.S. Can I be maintainer of this port?
>How-To-Repeat:
Please apply the patch.
>Fix:
diff -urN --exclude=work psi.old/Makefile psi/Makefile
--- psi.old/Makefile Sat Feb 4 14:29:07 2006
+++ psi/Makefile Sat Feb 4 14:52:03 2006
@@ -6,8 +6,7 @@
#
PORTNAME= psi
-PORTVERSION= 0.9.3
-PORTREVISION= 3
+PORTVERSION= 0.10
CATEGORIES= net-im
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -30,31 +29,22 @@
KDEDIR=${LOCALBASE}
CONFIGURE_ARGS= --prefix=${PREFIX} --qtdir=${X11BASE} \
--with-qca-inc=${X11BASE}/include/plugins/qca \
- --with-qca-lib=${X11BASE}/lib
+ --with-qca-lib=${X11BASE}/lib \
+ --disable-growl --disable-dnotify --disable-ghbnr
MAKE_ARGS+= QTDIR=${X11BASE} \
QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-OPTIONS= KDE "Enable KDE tray support" off
+PORTDOCS= README ChangeLog
.include <bsd.port.pre.mk>
-.if defined(WITH_KDE)
-LIB_DEPENDS+= kdecore:${PORTSDIR}/x11/kdelibs3
-_NO_KDE_CONFTARGET_HACK= yes
-PLIST_SUB+= KDE=""
-.else
-CONFIGURE_ARGS+= --disable-kde
-PLIST_SUB+= KDE="@comment "
-.endif
-
-pre-install:
-.if defined(WITH_KDE)
- @for size in 16x16 32x32 48x48; do \
- ${MKDIR} ${LOCALBASE}/share/icons/hicolor/${size}/apps; \
- done
-.endif
-
post-install:
${STRIP_CMD} ${PREFIX}/bin/psi
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for i in README ChangeLog
+ ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.post.mk>
diff -urN --exclude=work psi.old/distinfo psi/distinfo
--- psi.old/distinfo Sat Feb 4 14:29:07 2006
+++ psi/distinfo Sat Feb 4 13:48:52 2006
@@ -1,3 +1,3 @@
-MD5 (psi-0.9.3.tar.bz2) = d20f3bb530235a246bc2d92308089744
-SHA256 (psi-0.9.3.tar.bz2) = e3ad2aedfdddfa045db2a55d6627b0412f24ac414c0f6c1e15f5448834439a00
-SIZE (psi-0.9.3.tar.bz2) = 1423322
+MD5 (psi-0.10.tar.bz2) = f0fd4ccf077f7b24e236f71c22649b7b
+SHA256 (psi-0.10.tar.bz2) = e10a88586f8d7f29535510cf3a3857dc8ff2792e64db4207d62a935890a60ca1
+SIZE (psi-0.10.tar.bz2) = 1430929
diff -urN --exclude=work psi.old/files/patch-configure psi/files/patch-configure
--- psi.old/files/patch-configure Sat Feb 4 14:29:07 2006
+++ psi/files/patch-configure Sat Feb 4 14:06:38 2006
@@ -1,6 +1,6 @@
---- configure.orig Sat Nov 20 16:05:03 2004
-+++ configure Mon Mar 28 02:12:08 2005
-@@ -94,6 +94,8 @@
+--- configure.orig Sun Jan 8 05:19:01 2006
++++ configure Sat Feb 4 14:06:18 2006
+@@ -192,6 +192,8 @@
shift
;;
--help) show_usage; exit ;;
@@ -9,22 +9,21 @@
*) show_usage; exit ;;
esac
done
-@@ -882,9 +884,14 @@
+@@ -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;
-@@ -1110,14 +1117,6 @@
+@@ -1287,14 +1293,6 @@
echo
exit 1;
fi
@@ -38,4 +37,4 @@
-rm -f Makefile.tmp
echo
- echo Good, your configure finished. Now run \'make\'.
+ echo "Good, your configure finished. Now run 'make'."
diff -urN --exclude=work psi.old/files/patch-src-ui_about.ui psi/files/patch-src-ui_about.ui
--- psi.old/files/patch-src-ui_about.ui Sat Feb 4 14:29:07 2006
+++ psi/files/patch-src-ui_about.ui Thu Jan 1 08:00:00 1970
@@ -1,10 +0,0 @@
---- src/ui_about.ui.orig Tue Sep 27 21:37:27 2005
-+++ src/ui_about.ui Tue Sep 27 21:38:07 2005
-@@ -334,7 +334,6 @@
- <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>
diff -urN --exclude=work psi.old/files/patch-src_options-opt_appearance-ui.ui psi/files/patch-src_options-opt_appearance-ui.ui
--- psi.old/files/patch-src_options-opt_appearance-ui.ui Sat Feb 4 14:29:07 2006
+++ psi/files/patch-src_options-opt_appearance-ui.ui Thu Jan 1 08:00:00 1970
@@ -1,13 +0,0 @@
---- src/options/opt_appearance-ui.ui.orig Tue Sep 27 21:48:20 2005
-+++ src/options/opt_appearance-ui.ui Tue Sep 27 21:48:58 2005
-@@ -457,10 +457,4 @@
- <tabstop>pb_fChat</tabstop>
- </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>
diff -urN --exclude=work psi.old/pkg-plist psi/pkg-plist
--- psi.old/pkg-plist Sat Feb 4 14:29:07 2006
+++ psi/pkg-plist Sat Feb 4 15:13:55 2006
@@ -3,7 +3,6 @@
%%DATADIR%%/README
%%DATADIR%%/certs/README
%%DATADIR%%/certs/rootcert.xml
-%%DATADIR%%/designer/libpsiwidgets.so
%%DATADIR%%/iconsets/emoticons/README
%%DATADIR%%/iconsets/emoticons/default/angry.png
%%DATADIR%%/iconsets/emoticons/default/bat.png
@@ -44,18 +43,14 @@
%%DATADIR%%/iconsets/emoticons/default/wink.png
%%DATADIR%%/iconsets/emoticons/default/yes.png
%%DATADIR%%/iconsets/roster/README
-%%DATADIR%%/iconsets/roster/crystal_aim.jisp
-%%DATADIR%%/iconsets/roster/crystal_icq.jisp
-%%DATADIR%%/iconsets/roster/crystal_msn.jisp
-%%DATADIR%%/iconsets/roster/crystal_roster.jisp
-%%DATADIR%%/iconsets/roster/crystal_transport.jisp
-%%DATADIR%%/iconsets/roster/crystal_yahoo.jisp
-%%DATADIR%%/iconsets/roster/aim/away.png
-%%DATADIR%%/iconsets/roster/aim/dnd.png
-%%DATADIR%%/iconsets/roster/aim/icondef.xml
-%%DATADIR%%/iconsets/roster/aim/offline.png
-%%DATADIR%%/iconsets/roster/aim/online.png
-%%DATADIR%%/iconsets/roster/aim/xa.png
+%%DATADIR%%/iconsets/roster/crystal-aim.jisp
+%%DATADIR%%/iconsets/roster/crystal-gadu.jisp
+%%DATADIR%%/iconsets/roster/crystal-icq.jisp
+%%DATADIR%%/iconsets/roster/crystal-msn.jisp
+%%DATADIR%%/iconsets/roster/crystal-roster.jisp
+%%DATADIR%%/iconsets/roster/crystal-service.jisp
+%%DATADIR%%/iconsets/roster/crystal-sms.jisp
+%%DATADIR%%/iconsets/roster/crystal-yahoo.jisp
%%DATADIR%%/iconsets/roster/default/ask.png
%%DATADIR%%/iconsets/roster/default/away.png
%%DATADIR%%/iconsets/roster/default/chat.png
@@ -76,69 +71,10 @@
%%DATADIR%%/iconsets/roster/default/perr.png
%%DATADIR%%/iconsets/roster/default/system.png
%%DATADIR%%/iconsets/roster/default/xa.png
-%%DATADIR%%/iconsets/roster/gadugadu/away.png
-%%DATADIR%%/iconsets/roster/gadugadu/icondef.xml
-%%DATADIR%%/iconsets/roster/gadugadu/invisible.png
-%%DATADIR%%/iconsets/roster/gadugadu/offline.png
-%%DATADIR%%/iconsets/roster/gadugadu/online.png
-%%DATADIR%%/iconsets/roster/icq/away.png
-%%DATADIR%%/iconsets/roster/icq/chat.png
-%%DATADIR%%/iconsets/roster/icq/dnd.png
-%%DATADIR%%/iconsets/roster/icq/icondef.xml
-%%DATADIR%%/iconsets/roster/icq/invisible.png
-%%DATADIR%%/iconsets/roster/icq/offline.png
-%%DATADIR%%/iconsets/roster/icq/online.png
-%%DATADIR%%/iconsets/roster/icq/xa.png
-%%DATADIR%%/iconsets/roster/lightbulb/away.png
-%%DATADIR%%/iconsets/roster/lightbulb/chat.png
-%%DATADIR%%/iconsets/roster/lightbulb/dnd.png
-%%DATADIR%%/iconsets/roster/lightbulb/ffc.png
-%%DATADIR%%/iconsets/roster/lightbulb/groupclose.png
-%%DATADIR%%/iconsets/roster/lightbulb/groupempty.png
-%%DATADIR%%/iconsets/roster/lightbulb/groupopen.png
-%%DATADIR%%/iconsets/roster/lightbulb/icondef.xml
-%%DATADIR%%/iconsets/roster/lightbulb/invisible.png
-%%DATADIR%%/iconsets/roster/lightbulb/message.png
-%%DATADIR%%/iconsets/roster/lightbulb/offline.png
-%%DATADIR%%/iconsets/roster/lightbulb/online.png
-%%DATADIR%%/iconsets/roster/lightbulb/system.png
-%%DATADIR%%/iconsets/roster/lightbulb/xa.png
-%%DATADIR%%/iconsets/roster/msn/away.png
-%%DATADIR%%/iconsets/roster/msn/dnd.png
-%%DATADIR%%/iconsets/roster/msn/icondef.xml
-%%DATADIR%%/iconsets/roster/msn/offline.png
-%%DATADIR%%/iconsets/roster/msn/online.png
-%%DATADIR%%/iconsets/roster/sms/away.png
-%%DATADIR%%/iconsets/roster/sms/dnd.png
-%%DATADIR%%/iconsets/roster/sms/icondef.xml
-%%DATADIR%%/iconsets/roster/sms/offline.png
-%%DATADIR%%/iconsets/roster/sms/online.png
-%%DATADIR%%/iconsets/roster/sms/xa.png
-%%DATADIR%%/iconsets/roster/stellar-icq/ask.png
-%%DATADIR%%/iconsets/roster/stellar-icq/away.png
-%%DATADIR%%/iconsets/roster/stellar-icq/dnd.png
-%%DATADIR%%/iconsets/roster/stellar-icq/ffc.png
-%%DATADIR%%/iconsets/roster/stellar-icq/icondef.xml
-%%DATADIR%%/iconsets/roster/stellar-icq/invisible.png
-%%DATADIR%%/iconsets/roster/stellar-icq/noauth.png
-%%DATADIR%%/iconsets/roster/stellar-icq/offline.png
-%%DATADIR%%/iconsets/roster/stellar-icq/online.png
-%%DATADIR%%/iconsets/roster/stellar-icq/xa.png
-%%DATADIR%%/iconsets/roster/transport/away.png
-%%DATADIR%%/iconsets/roster/transport/dnd.png
-%%DATADIR%%/iconsets/roster/transport/icondef.xml
-%%DATADIR%%/iconsets/roster/transport/offline.png
-%%DATADIR%%/iconsets/roster/transport/online.png
-%%DATADIR%%/iconsets/roster/transport/xa.png
-%%DATADIR%%/iconsets/roster/yahoo/away.png
-%%DATADIR%%/iconsets/roster/yahoo/dnd.png
-%%DATADIR%%/iconsets/roster/yahoo/icondef.xml
-%%DATADIR%%/iconsets/roster/yahoo/offline.png
-%%DATADIR%%/iconsets/roster/yahoo/online.png
-%%DATADIR%%/iconsets/roster/yahoo/xa.png
%%DATADIR%%/iconsets/system/README
-%%DATADIR%%/iconsets/system/crystal_system.jisp
%%DATADIR%%/iconsets/system/default/account.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
@@ -149,16 +85,12 @@
%%DATADIR%%/iconsets/system/default/changeacc.png
%%DATADIR%%/iconsets/system/default/chatclear.png
%%DATADIR%%/iconsets/system/default/close.png
+%%DATADIR%%/iconsets/system/default/closetab.png
%%DATADIR%%/iconsets/system/default/configure_toolbars.png
%%DATADIR%%/iconsets/system/default/download.png
-%%DATADIR%%/iconsets/system/default/edit.png
-%%DATADIR%%/iconsets/system/default/editclear.png
-%%DATADIR%%/iconsets/system/default/editcopy.png
-%%DATADIR%%/iconsets/system/default/editcut.png
-%%DATADIR%%/iconsets/system/default/editdelete.png
-%%DATADIR%%/iconsets/system/default/editpaste.png
-%%DATADIR%%/iconsets/system/default/edittrash.png
+%%DATADIR%%/iconsets/system/default/disco.png
%%DATADIR%%/iconsets/system/default/eye_blue.png
+%%DATADIR%%/iconsets/system/default/events.png
%%DATADIR%%/iconsets/system/default/filemanager.png
%%DATADIR%%/iconsets/system/default/groupchat.png
%%DATADIR%%/iconsets/system/default/help.png
@@ -171,7 +103,6 @@
%%DATADIR%%/iconsets/system/default/info.png
%%DATADIR%%/iconsets/system/default/jabber.png
%%DATADIR%%/iconsets/system/default/key.png
-%%DATADIR%%/iconsets/system/default/key2.png
%%DATADIR%%/iconsets/system/default/key_bad.png
%%DATADIR%%/iconsets/system/default/key_unknown.png
%%DATADIR%%/iconsets/system/default/ok.png
@@ -187,6 +118,12 @@
%%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/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
@@ -224,35 +161,10 @@
@dirrm %%DATADIR%%/iconsets/system/default/clients
@dirrm %%DATADIR%%/iconsets/system/default
@dirrm %%DATADIR%%/iconsets/system
-@dirrm %%DATADIR%%/iconsets/roster/yahoo
-@dirrm %%DATADIR%%/iconsets/roster/transport
-@dirrm %%DATADIR%%/iconsets/roster/stellar-icq
-@dirrm %%DATADIR%%/iconsets/roster/sms
-@dirrm %%DATADIR%%/iconsets/roster/msn
-@dirrm %%DATADIR%%/iconsets/roster/lightbulb
-@dirrm %%DATADIR%%/iconsets/roster/icq
-@dirrm %%DATADIR%%/iconsets/roster/gadugadu
@dirrm %%DATADIR%%/iconsets/roster/default
-@dirrm %%DATADIR%%/iconsets/roster/aim
@dirrm %%DATADIR%%/iconsets/roster
@dirrm %%DATADIR%%/iconsets/emoticons/default
@dirrm %%DATADIR%%/iconsets/emoticons
@dirrm %%DATADIR%%/iconsets
-@dirrm %%DATADIR%%/designer
@dirrm %%DATADIR%%/certs
@dirrm %%DATADIR%%
-%%KDE%%@cwd %%LOCALBASE%%
-%%KDE%%share/applnk/Internet/psi.desktop
-%%KDE%%share/icons/hicolor/16x16/apps/psi.png
-%%KDE%%share/icons/hicolor/32x32/apps/psi.png
-%%KDE%%share/icons/hicolor/48x48/apps/psi.png
-%%KDE%%@dirrmtry share/applnk/Internet
-%%KDE%%@dirrmtry share/applnk
-%%KDE%%@dirrmtry share/icons/hicolor/16x16/apps
-%%KDE%%@dirrmtry share/icons/hicolor/16x16
-%%KDE%%@dirrmtry share/icons/hicolor/32x32/apps
-%%KDE%%@dirrmtry share/icons/hicolor/32x32
-%%KDE%%@dirrmtry share/icons/hicolor/48x48/apps
-%%KDE%%@dirrmtry share/icons/hicolor/48x48
-%%KDE%%@dirrmtry share/icons/hicolor
-%%KDE%%@dirrmtry share/icons
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060204071741.GA36527>