ports/144016: [MAINTAINER] polish/kadu: update to 0.6.5.4
Marcin Wisnicki
mwisnicki+freebsd at gmail.com
Tue Feb 16 20:10:02 UTC 2010
>Number: 144016
>Category: ports
>Synopsis: [MAINTAINER] polish/kadu: update to 0.6.5.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 16 20:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Marcin Wisnicki
>Release: FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD ghost.pnet.one.pl 7.2-STABLE FreeBSD 7.2-STABLE #4: Thu Dec 10 23:23:39 CET 2009
>Description:
- Update to 0.6.5.4
- Always use builtin spellchecker based on enchant
- Always use QSound, drop arts and ao options
- Needs ports/144014
Added file(s):
- files/patch-kadu-core_gadu_resolver.cpp
Removed file(s):
- files/patch-varia_themes_emoticons_get-all.sh
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- pl-kadu-0.6.5.4,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/Makefile /usr/ports/polish/kadu/Makefile
--- /usr/ports/polish/kadu.orig/Makefile 2010-01-24 16:38:38.000000000 +0100
+++ /usr/ports/polish/kadu/Makefile 2010-02-16 05:18:09.000000000 +0100
@@ -6,14 +6,11 @@
#
PORTNAME= kadu
-PORTVERSION= 0.6.5.2
-PORTREVISION= 2
+PORTVERSION= 0.6.5.4
PORTEPOCH= 1
CATEGORIES= polish net-im
MASTER_SITES= http://www.kadu.net/download/stable/:kadu \
http://www.kadu.net/download/additions/:additions \
- http://www.kadu.net/download/modules_extra/spellchecker/:aspell \
- http://www.kadu.net/download/modules_mirror/:modules \
http://kadu.net/~arvenil/tabs/download/${PORTVERSION:C/(([0-9]+\.){2}[0-9]+)(.*)/\1/}/:modtab
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:kadu
DIST_SUBDIR= kadu
@@ -23,14 +20,14 @@
COMMENT= QT Gadu-Gadu client
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS= gadu.3:${PORTSDIR}/polish/libgadu \
+LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
+ gadu.3:${PORTSDIR}/polish/libgadu \
qca.2:${PORTSDIR}/devel/qca \
sndfile.1:${PORTSDIR}/audio/libsndfile
RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
# TODO enable devel/libexecinfo
TABS_MOD_DISTFILE= kadu-tabs-1.2.3.tar.bz2
-ASPELL_MOD_DISTFILE= spellchecker-20080821.tar.bz2
GG6_EMOTS_DISTFILE= kompatybilne_z_GG6.tar.gz
GG7_EMOTS_DISTFILE= dodatkowe_emoty_GG7.tar.gz
@@ -49,39 +46,11 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
-OPTIONS= AO "Build AO sound module" off \
- ASPELL "Build spell checking module" off \
- ARTS "Build aRts sound module" off \
- GG_EMOTS "Install GG-compatible emoticons" off \
+OPTIONS= GG_EMOTS "Install GG-compatible emoticons" off \
TABS "Build tabs module" off
.include <bsd.port.pre.mk>
-.if defined(WITH_AO)
-LIB_DEPENDS+= ao.3:${PORTSDIR}/audio/libao
-PLIST_SUB+= AO_SOUND_MOD=""
-KADU_SHARED_MODULES+= ao_sound
-.else
-PLIST_SUB+= AO_SOUND_MOD="@comment "
-.endif
-
-.if defined(WITH_ASPELL)
-LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell
-PLIST_SUB+= ASPELL_MOD=""
-DISTFILES+= ${ASPELL_MOD_DISTFILE}:aspell
-KADU_SHARED_MODULES+= spellchecker
-.else
-PLIST_SUB+= ASPELL_MOD="@comment "
-.endif
-
-.if defined(WITH_ARTS)
-LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+= ARTS_MOD=""
-KADU_SHARED_MODULES+= arts_sound
-.else
-PLIST_SUB+= ARTS_MOD="@comment "
-.endif
-
.if defined(WITH_GG_EMOTS)
PLIST_SUB+= GG_EMOTS=""
DISTFILES+= ${GG6_EMOTS_DISTFILE}:additions \
@@ -98,7 +67,8 @@
PLIST_SUB+= TABS_MOD="@comment "
.endif
-KADU_DISABLED_MODULES= alsa_sound
+KADU_SHARED_MODULES+= spellchecker qt4_sound
+KADU_DISABLED_MODULES= alsa_sound amarok1_mediaplayer audacious_mediaplayer mediaplayer
post-patch:
@${FIND} ${WRKSRC} -exec ${GREP} -q "#!/bin/bash" {} \; \
@@ -112,9 +82,6 @@
.for module in ${KADU_STATIC_MODULES}
@${REINPLACE_CMD} -e 's|module_${module}=.|module_${module}=y|g' ${WRKSRC}/.config
.endfor
-.if defined(WITH_ASPELL)
- @cd ${WRKSRC}/modules && ${TAR} -zxf ${_DISTDIR}/${ASPELL_MOD_DISTFILE}
-.endif
.if defined(WITH_GG_EMOTS)
@${REINPLACE_CMD} -e 's|emoticons_gg6_compatible=n|emoticons_gg6_compatible=y|g' ${WRKSRC}/.config
@cd ${WRKSRC}/varia/themes/emoticons && \
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/distinfo /usr/ports/polish/kadu/distinfo
--- /usr/ports/polish/kadu.orig/distinfo 2009-05-16 22:52:50.000000000 +0200
+++ /usr/ports/polish/kadu/distinfo 2010-02-16 20:54:48.000000000 +0100
@@ -1,9 +1,6 @@
-MD5 (kadu/kadu-0.6.5.2.tar.bz2) = 9cc1e59e538ff1aa416d162834ce43bb
-SHA256 (kadu/kadu-0.6.5.2.tar.bz2) = 28d8e7e31a5e502217a2d5ddb93343c8c33ab09772035f32c568af0e3cc36183
-SIZE (kadu/kadu-0.6.5.2.tar.bz2) = 1554848
-MD5 (kadu/spellchecker-20080821.tar.bz2) = 61c3b8e64758b44dae1996f972f9312e
-SHA256 (kadu/spellchecker-20080821.tar.bz2) = bb9f0e2d8b673355aac0e037826ff314e1f4a9600958f4239dc6b80460911cb7
-SIZE (kadu/spellchecker-20080821.tar.bz2) = 6268
+MD5 (kadu/kadu-0.6.5.4.tar.bz2) = 97cb72c0ab4b5cf897bfbfc3b5ac0379
+SHA256 (kadu/kadu-0.6.5.4.tar.bz2) = 9decd7b9de6d91095b4f6b47bebbbbc5ca56b9ba6e8f6ee80d8ad172ba676d25
+SIZE (kadu/kadu-0.6.5.4.tar.bz2) = 1774602
MD5 (kadu/kompatybilne_z_GG6.tar.gz) = 16cbc9e657549b35ee8d8a32f4b6a47d
SHA256 (kadu/kompatybilne_z_GG6.tar.gz) = f8a84acd8512fd8fc38e394aa564e6b6d7ec2e9fe9864bdf0c5b8f2edb23da6f
SIZE (kadu/kompatybilne_z_GG6.tar.gz) = 254637
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-kadu-core_gadu_resolver.cpp /usr/ports/polish/kadu/files/patch-kadu-core_gadu_resolver.cpp
--- /usr/ports/polish/kadu.orig/files/patch-kadu-core_gadu_resolver.cpp 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/polish/kadu/files/patch-kadu-core_gadu_resolver.cpp 2010-02-16 01:43:09.000000000 +0100
@@ -0,0 +1,10 @@
+--- kadu-core/gadu_resolver.cpp.orig 2009-10-18 10:00:12.000000000 +0200
++++ kadu-core/gadu_resolver.cpp 2010-02-16 01:41:36.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <io.h>
+ #else
+ #include <sys/wait.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
+ #endif
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/files/patch-varia_themes_emoticons_get-all.sh /usr/ports/polish/kadu/files/patch-varia_themes_emoticons_get-all.sh
--- /usr/ports/polish/kadu.orig/files/patch-varia_themes_emoticons_get-all.sh 2009-05-21 20:22:59.000000000 +0200
+++ /usr/ports/polish/kadu/files/patch-varia_themes_emoticons_get-all.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- varia/themes/emoticons/get-all.sh.orig 2008-12-01 00:15:08.000000000 +0100
-+++ varia/themes/emoticons/get-all.sh 2009-03-12 23:56:25.000000000 +0100
-@@ -2,7 +2,7 @@
-
- available_emots_themes=""
- for dir in *; do
-- if [ -f "$dir/emots.txt" ]; then
-+ if [ "`find $dir -name emots.txt`" ]; then
- available_emots_themes="$available_emots_themes $dir"
- fi
- done
diff -ruN --exclude=CVS /usr/ports/polish/kadu.orig/pkg-plist /usr/ports/polish/kadu/pkg-plist
--- /usr/ports/polish/kadu.orig/pkg-plist 2009-05-17 00:02:33.000000000 +0200
+++ /usr/ports/polish/kadu/pkg-plist 2010-02-16 05:25:21.000000000 +0100
@@ -3,7 +3,9 @@
lib/kadu/modules/libadvanced_userlist.so
lib/kadu/modules/libautoaway.so
lib/kadu/modules/libautoresponder.so
+lib/kadu/modules/libautostatus.so
lib/kadu/modules/libconfig_wizard.so
+lib/kadu/modules/libdbus.so
lib/kadu/modules/libdcc.so
lib/kadu/modules/libdefault_sms.so
lib/kadu/modules/libdsp_sound.so
@@ -12,8 +14,10 @@
lib/kadu/modules/libhistory.so
lib/kadu/modules/libidle.so
lib/kadu/modules/libnotify.so
+lib/kadu/modules/libqt4_sound.so
lib/kadu/modules/libsms.so
lib/kadu/modules/libsound.so
+lib/kadu/modules/libspellchecker.so
lib/kadu/modules/libvoice.so
lib/kadu/modules/libwindow_notify.so
%%DATADIR%%/AUTHORS
@@ -28,10 +32,12 @@
%%DATADIR%%/modules/advanced_userlist.desc
%%DATADIR%%/modules/autoaway.desc
%%DATADIR%%/modules/autoresponder.desc
+%%DATADIR%%/modules/autostatus.desc
%%DATADIR%%/modules/config_wizard.desc
%%DATADIR%%/modules/configuration/advanced_userlist.ui
%%DATADIR%%/modules/configuration/autoaway.ui
%%DATADIR%%/modules/configuration/autoresponder.ui
+%%DATADIR%%/modules/configuration/autostatus.ui
%%DATADIR%%/modules/configuration/dcc.ui
%%DATADIR%%/modules/configuration/default_sms.ui
%%DATADIR%%/modules/configuration/docking.ui
@@ -42,7 +48,7 @@
%%DATADIR%%/modules/configuration/notify.ui
%%DATADIR%%/modules/configuration/sms.ui
%%DATADIR%%/modules/configuration/sound.ui
-%%ASPELL_MOD%%%%DATADIR%%/modules/configuration/spellchecker.ui
+%%DATADIR%%/modules/configuration/spellchecker.ui
%%TABS_MOD%%%%DATADIR%%/modules/configuration/tabs.ui
%%DATADIR%%/modules/configuration/voice.ui
%%DATADIR%%/modules/data/config_wizard/joi/brak.jpg
@@ -59,6 +65,7 @@
%%DATADIR%%/modules/data/config_wizard/ronk2/mobile.png
%%DATADIR%%/modules/data/config_wizard/ronk2/tlo.jpg
%%DATADIR%%/modules/data/config_wizard/ronk2/tux.png
+%%DATADIR%%/modules/dbus.desc
%%DATADIR%%/modules/dcc.desc
%%DATADIR%%/modules/default_sms.desc
%%DATADIR%%/modules/docking.desc
@@ -69,8 +76,10 @@
%%DATADIR%%/modules/idle.desc
%%DATADIR%%/modules/notify.desc
%%DATADIR%%/modules/qt4_docking.desc
+%%DATADIR%%/modules/qt4_sound.desc
%%DATADIR%%/modules/sms.desc
%%DATADIR%%/modules/sound.desc
+%%DATADIR%%/modules/spellchecker.desc
%%DATADIR%%/modules/translations/account_management_de.qm
%%DATADIR%%/modules/translations/account_management_fr.qm
%%DATADIR%%/modules/translations/account_management_it.qm
@@ -87,6 +96,7 @@
%%DATADIR%%/modules/translations/autoresponder_fr.qm
%%DATADIR%%/modules/translations/autoresponder_it.qm
%%DATADIR%%/modules/translations/autoresponder_pl.qm
+%%DATADIR%%/modules/translations/autostatus_pl.qm
%%DATADIR%%/modules/translations/config_wizard_de.qm
%%DATADIR%%/modules/translations/config_wizard_fr.qm
%%DATADIR%%/modules/translations/config_wizard_it.qm
@@ -131,6 +141,7 @@
%%DATADIR%%/modules/translations/sound_fr.qm
%%DATADIR%%/modules/translations/sound_it.qm
%%DATADIR%%/modules/translations/sound_pl.qm
+%%DATADIR%%/modules/translations/spellchecker_pl.qm
%%DATADIR%%/modules/translations/voice_de.qm
%%DATADIR%%/modules/translations/voice_fr.qm
%%DATADIR%%/modules/translations/voice_it.qm
@@ -160,20 +171,20 @@
%%DATADIR%%/syntax/infopanel/ronk.syntax
%%DATADIR%%/themes/icons/default/HOWTO.txt
%%DATADIR%%/themes/icons/default/README.txt
-%%DATADIR%%/themes/icons/default/kadu/big_busy.png
-%%DATADIR%%/themes/icons/default/kadu/big_busy_d.png
-%%DATADIR%%/themes/icons/default/kadu/big_invisible.png
-%%DATADIR%%/themes/icons/default/kadu/big_invisible_d.png
-%%DATADIR%%/themes/icons/default/kadu/big_message.png
-%%DATADIR%%/themes/icons/default/kadu/big_offline.png
-%%DATADIR%%/themes/icons/default/kadu/big_offline_d.png
-%%DATADIR%%/themes/icons/default/kadu/big_online.png
-%%DATADIR%%/themes/icons/default/kadu/big_online_d.png
-%%DATADIR%%/themes/icons/default/kadu/kadu-userlist-remove.png
%%DATADIR%%/themes/icons/default/external_modules/module_agent.png
+%%DATADIR%%/themes/icons/default/external_modules/module_avatar.png
%%DATADIR%%/themes/icons/default/external_modules/module_mail.png
%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-button.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-next.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-pause.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-play.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-prev.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-stop.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-volume_down.png
+%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer-volume_up.png
%%DATADIR%%/themes/icons/default/external_modules/module_mediaplayer.png
+%%DATADIR%%/themes/icons/default/external_modules/module_pajacyk-menu.png
+%%DATADIR%%/themes/icons/default/external_modules/module_pajacyk.png
%%DATADIR%%/themes/icons/default/external_modules/module_profiles-configure.png
%%DATADIR%%/themes/icons/default/external_modules/module_profiles-user.png
%%DATADIR%%/themes/icons/default/external_modules/module_profiles.png
@@ -190,6 +201,19 @@
%%DATADIR%%/themes/icons/default/kadu/audio-input-microphone.png
%%DATADIR%%/themes/icons/default/kadu/audio-volume-high.png
%%DATADIR%%/themes/icons/default/kadu/audio-volume-muted.png
+%%DATADIR%%/themes/icons/default/kadu/big_busy.png
+%%DATADIR%%/themes/icons/default/kadu/big_busy_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_dnd.png
+%%DATADIR%%/themes/icons/default/kadu/big_dnd_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_ffc.png
+%%DATADIR%%/themes/icons/default/kadu/big_ffc_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_invisible.png
+%%DATADIR%%/themes/icons/default/kadu/big_invisible_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_message.png
+%%DATADIR%%/themes/icons/default/kadu/big_offline.png
+%%DATADIR%%/themes/icons/default/kadu/big_offline_d.png
+%%DATADIR%%/themes/icons/default/kadu/big_online.png
+%%DATADIR%%/themes/icons/default/kadu/big_online_d.png
%%DATADIR%%/themes/icons/default/kadu/configure.png
%%DATADIR%%/themes/icons/default/kadu/configure_big.png
%%DATADIR%%/themes/icons/default/kadu/contact-new.png
@@ -276,17 +300,28 @@
%%DATADIR%%/themes/icons/default/kadu/kadu-transfers.png
%%DATADIR%%/themes/icons/default/kadu/kadu-unregisteraccount.png
%%DATADIR%%/themes/icons/default/kadu/kadu-unregisteraccount_big.png
+%%DATADIR%%/themes/icons/default/kadu/kadu-userlist-remove.png
%%DATADIR%%/themes/icons/default/kadu/kadu-wizard.png
%%DATADIR%%/themes/icons/default/kadu/list-add.png
%%DATADIR%%/themes/icons/default/kadu/list-remove.png
%%DATADIR%%/themes/icons/default/kadu/mail-attachment.png
%%DATADIR%%/themes/icons/default/kadu/phone.png
%%DATADIR%%/themes/icons/default/kadu/phone_big.png
+%%DATADIR%%/themes/icons/default/kadu/silent-mode-off.png
+%%DATADIR%%/themes/icons/default/kadu/silent-mode-on.png
%%DATADIR%%/themes/icons/default/kadu/view-refresh.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-away.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-away_d.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-away_d_m.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-away_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-dnd.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-dnd_d.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-dnd_d_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-dnd_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-ffc.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-ffc_d.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-ffc_d_m.png
+%%DATADIR%%/themes/icons/default/protocols/gg/user-ffc_m.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible_d.png
%%DATADIR%%/themes/icons/default/protocols/gg/user-invisible_d_m.png
@@ -995,14 +1030,6 @@
share/icons/hicolor/48x48/apps/kadu.png
share/icons/hicolor/64x64/apps/kadu.png
share/icons/hicolor/128x128/apps/kadu.png
-%%AO_SOUND_MOD%%lib/kadu/modules/libao_sound.so
-%%AO_SOUND_MOD%%share/kadu/modules/ao_sound.desc
-%%ARTS_MOD%%lib/kadu/modules/libarts_sound.so
-%%ARTS_MOD%%share/kadu/modules/bin/arts_sound/arts_connector
-%%ARTS_MOD%%share/kadu/modules/arts_sound.desc
-%%ASPELL_MOD%%lib/kadu/modules/libspellchecker.so
-%%ASPELL_MOD%%share/kadu/modules/translations/spellchecker_pl.qm
-%%ASPELL_MOD%%share/kadu/modules/spellchecker.desc
%%TABS_MOD%%lib/kadu/modules/libtabs.so
%%TABS_MOD%%share/kadu/modules/translations/tabs_pl.qm
%%TABS_MOD%%share/kadu/modules/tabs.desc
--- pl-kadu-0.6.5.4,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list