diff options
author | Andrey Slusar <anray@FreeBSD.org> | 2006-03-22 18:40:57 +0000 |
---|---|---|
committer | Andrey Slusar <anray@FreeBSD.org> | 2006-03-22 18:40:57 +0000 |
commit | 32ea56b4163c3175e7ed734bdb3b89aaf33f436f (patch) | |
tree | 57f075f083d05e87e635a4c9e1b252d64019e365 /net-im | |
parent | - Use 'exec' in the launcher shell script to comply with Porter's Handbook (diff) |
- Update to 0.10
- Removed deprecated option WITH_KDE. Now psi icons and psi.desktop
installed without any options.
PR: ports/92793
Submitted by: "Stepan Zastupov [RedChrom]" <redchrom@gmail.com>
Approved by: mantainer timeout(1 month 18 days)
Notes
Notes:
svn path=/head/; revision=157976
Diffstat (limited to 'net-im')
-rw-r--r-- | net-im/psi/Makefile | 34 | ||||
-rw-r--r-- | net-im/psi/distinfo | 6 | ||||
-rw-r--r-- | net-im/psi/files/patch-configure | 15 | ||||
-rw-r--r-- | net-im/psi/files/patch-src-ui_about.ui | 10 | ||||
-rw-r--r-- | net-im/psi/files/patch-src_options-opt_appearance-ui.ui | 13 | ||||
-rw-r--r-- | net-im/psi/pkg-plist | 139 |
6 files changed, 53 insertions, 164 deletions
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile index 19803d24e284..fadbc339d276 100644 --- a/net-im/psi/Makefile +++ b/net-im/psi/Makefile @@ -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,20 @@ CONFIGURE_ENV= QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \ 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 - -.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 +PORTDOCS= README ChangeLog post-install: ${STRIP_CMD} ${PREFIX}/bin/psi +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} +.endfor +.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/psi/distinfo b/net-im/psi/distinfo index 8ce890fa16b7..63cdadf82f0f 100644 --- a/net-im/psi/distinfo +++ b/net-im/psi/distinfo @@ -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 --git a/net-im/psi/files/patch-configure b/net-im/psi/files/patch-configure index 4a00387f8cab..f1a19a1bac28 100644 --- a/net-im/psi/files/patch-configure +++ b/net-im/psi/files/patch-configure @@ -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 --git a/net-im/psi/files/patch-src-ui_about.ui b/net-im/psi/files/patch-src-ui_about.ui deleted file mode 100644 index d5c2db9b5be8..000000000000 --- a/net-im/psi/files/patch-src-ui_about.ui +++ /dev/null @@ -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 --git a/net-im/psi/files/patch-src_options-opt_appearance-ui.ui b/net-im/psi/files/patch-src_options-opt_appearance-ui.ui deleted file mode 100644 index f485165136b7..000000000000 --- a/net-im/psi/files/patch-src_options-opt_appearance-ui.ui +++ /dev/null @@ -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 --git a/net-im/psi/pkg-plist b/net-im/psi/pkg-plist index 14958ad4c049..090a01c91462 100644 --- a/net-im/psi/pkg-plist +++ b/net-im/psi/pkg-plist @@ -3,7 +3,6 @@ bin/psi %%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 @@ bin/psi %%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 @@ bin/psi %%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 @@ bin/psi %%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 @@ bin/psi %%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 @@ bin/psi %%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 @@ -220,39 +157,27 @@ bin/psi %%DATADIR%%/sound/offline.wav %%DATADIR%%/sound/online.wav %%DATADIR%%/sound/send.wav +share/applications/psi.desktop +share/icons/hicolor/16x16/apps/psi.png +share/icons/hicolor/32x32/apps/psi.png +share/icons/hicolor/48x48/apps/psi.png @dirrm %%DATADIR%%/sound @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 +@dirrmtry share/applications +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/32x32/apps +@dirrmtry share/icons/hicolor/32x32 +@dirrmtry share/icons/hicolor/48x48/apps +@dirrmtry share/icons/hicolor/48x48 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons |