diff options
Diffstat (limited to 'chat/kadu')
| -rw-r--r-- | chat/kadu/Makefile | 7 | ||||
| -rw-r--r-- | chat/kadu/PLIST | 145 | ||||
| -rw-r--r-- | chat/kadu/distinfo | 12 | ||||
| -rw-r--r-- | chat/kadu/patches/patch-aa | 10 | ||||
| -rw-r--r-- | chat/kadu/patches/patch-ab | 39 |
5 files changed, 177 insertions, 36 deletions
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile index e05f28837f9..68788735e85 100644 --- a/chat/kadu/Makefile +++ b/chat/kadu/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:04 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/04/21 08:56:21 adam Exp $ -DISTNAME= kadu-0.3.9 -PKGREVISION= 1 +DISTNAME= kadu-0.4.0 CATEGORIES= chat MASTER_SITES= http://www.kadu.net/download/stable/ EXTRACT_SUFX= .tar.bz2 @@ -14,6 +13,7 @@ USE_GNU_TOOLS+= make USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-existing-libgadu=${BUILDLINK_PREFIX.ekg} +CONFIGURE_ENV+= X11BASE="${X11BASE}" LIBS+= ${LIBOSSAUDIO} WRKSRC= ${WRKDIR}/kadu @@ -21,6 +21,7 @@ WRKSRC= ${WRKDIR}/kadu post-configure: cd ${WRKSRC}; ${TOUCH} Makefile +.include "../../audio/libsndfile/buildlink3.mk" .include "../../chat/ekg/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" diff --git a/chat/kadu/PLIST b/chat/kadu/PLIST index c3417c744dc..a161b690724 100644 --- a/chat/kadu/PLIST +++ b/chat/kadu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/07/09 10:46:23 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2005/04/21 08:56:21 adam Exp $ bin/kadu bin/kadu-config bin/kadu-mozilla @@ -6,13 +6,10 @@ include/kadu/about.h include/kadu/chat.h include/kadu/config_dialog.h include/kadu/config_file.h -include/kadu/dcc.h include/kadu/debug.h include/kadu/emoticons.h -include/kadu/events.h include/kadu/expimp.h include/kadu/gadu.h -include/kadu/hints.h include/kadu/history.h include/kadu/ignore.h include/kadu/kadu-config.h @@ -20,26 +17,38 @@ include/kadu/kadu.h include/kadu/message_box.h include/kadu/misc.h include/kadu/modules.h +include/kadu/modules/account_management.h +include/kadu/modules/addons.h include/kadu/modules/autoaway.h include/kadu/modules/autoresponder.h +include/kadu/modules/change_password.h +include/kadu/modules/dcc.h include/kadu/modules/default_sms.h include/kadu/modules/docking.h include/kadu/modules/dsp_sound.h include/kadu/modules/encryption.h +include/kadu/modules/file_transfer.h +include/kadu/modules/hint.h +include/kadu/modules/hint_manager.h +include/kadu/modules/hint_manager_slots.h +include/kadu/modules/notify.h +include/kadu/modules/notify_slots.h include/kadu/modules/player_external.h +include/kadu/modules/register.h +include/kadu/modules/remind_password.h include/kadu/modules/simlite.h include/kadu/modules/sms.h include/kadu/modules/sound.h -include/kadu/modules/sound_desc.h +include/kadu/modules/sound_file.h +include/kadu/modules/sound_slots.h +include/kadu/modules/unregister.h include/kadu/modules/voice.h -include/kadu/modules/voice_arts.h -include/kadu/modules/voice_dsp.h +include/kadu/modules/window_notify.h +include/kadu/modules/wizard.h include/kadu/modules/x11_docking.h -include/kadu/password.h include/kadu/pending_events.h include/kadu/pending_msgs.h include/kadu/personal_info.h -include/kadu/register.h include/kadu/search.h include/kadu/status.h include/kadu/tabbar.h @@ -53,52 +62,119 @@ share/kadu/ChangeLog share/kadu/HISTORY share/kadu/README share/kadu/THANKS +share/kadu/modules/account_management.desc +share/kadu/modules/account_management.so share/kadu/modules/autoaway.desc +share/kadu/modules/autoaway.so share/kadu/modules/autoresponder.desc share/kadu/modules/autoresponder.so +share/kadu/modules/config_wizard.desc +share/kadu/modules/config_wizard.so +share/kadu/modules/data/config_wizard/joi/brak.jpg +share/kadu/modules/data/config_wizard/ronk2/Blocking.png +share/kadu/modules/data/config_wizard/ronk2/Busy (d.).png +share/kadu/modules/data/config_wizard/ronk2/Busy.png +share/kadu/modules/data/config_wizard/ronk2/Invisible (d.).png +share/kadu/modules/data/config_wizard/ronk2/Invisible.png +share/kadu/modules/data/config_wizard/ronk2/Offline (d.).png +share/kadu/modules/data/config_wizard/ronk2/Offline.png +share/kadu/modules/data/config_wizard/ronk2/Online (d.).png +share/kadu/modules/data/config_wizard/ronk2/Online.png +share/kadu/modules/data/config_wizard/ronk2/message.png +share/kadu/modules/data/config_wizard/ronk2/mobile.png +share/kadu/modules/data/config_wizard/ronk2/tlo.jpg +share/kadu/modules/data/config_wizard/ronk2/tux.png +share/kadu/modules/dcc.desc +share/kadu/modules/dcc.so share/kadu/modules/default_sms.desc +share/kadu/modules/default_sms.so share/kadu/modules/docking.desc share/kadu/modules/dsp_sound.desc share/kadu/modules/dsp_sound.so share/kadu/modules/encryption.desc +share/kadu/modules/encryption.so share/kadu/modules/ext_sound.desc +share/kadu/modules/ext_sound.so +share/kadu/modules/hints.desc +share/kadu/modules/hints.so +share/kadu/modules/notify.desc share/kadu/modules/sms.desc +share/kadu/modules/sms.so share/kadu/modules/sound.desc +share/kadu/modules/translations/account_management_de.qm +share/kadu/modules/translations/account_management_fr.qm +share/kadu/modules/translations/account_management_it.qm +share/kadu/modules/translations/account_management_pl.qm share/kadu/modules/translations/autoaway_de.qm +share/kadu/modules/translations/autoaway_fr.qm share/kadu/modules/translations/autoaway_it.qm share/kadu/modules/translations/autoaway_pl.qm share/kadu/modules/translations/autoresponder_de.qm +share/kadu/modules/translations/autoresponder_fr.qm share/kadu/modules/translations/autoresponder_it.qm share/kadu/modules/translations/autoresponder_pl.qm +share/kadu/modules/translations/config_wizard_de.qm +share/kadu/modules/translations/config_wizard_fr.qm +share/kadu/modules/translations/config_wizard_it.qm +share/kadu/modules/translations/config_wizard_pl.qm +share/kadu/modules/translations/dcc_de.qm +share/kadu/modules/translations/dcc_fr.qm +share/kadu/modules/translations/dcc_it.qm +share/kadu/modules/translations/dcc_pl.qm share/kadu/modules/translations/default_sms_de.qm +share/kadu/modules/translations/default_sms_fr.qm share/kadu/modules/translations/default_sms_it.qm share/kadu/modules/translations/default_sms_pl.qm share/kadu/modules/translations/docking_de.qm +share/kadu/modules/translations/docking_fr.qm share/kadu/modules/translations/docking_it.qm share/kadu/modules/translations/docking_pl.qm share/kadu/modules/translations/dsp_sound_de.qm +share/kadu/modules/translations/dsp_sound_fr.qm share/kadu/modules/translations/dsp_sound_it.qm share/kadu/modules/translations/dsp_sound_pl.qm share/kadu/modules/translations/encryption_de.qm +share/kadu/modules/translations/encryption_fr.qm share/kadu/modules/translations/encryption_it.qm share/kadu/modules/translations/encryption_pl.qm share/kadu/modules/translations/ext_sound_de.qm +share/kadu/modules/translations/ext_sound_fr.qm share/kadu/modules/translations/ext_sound_it.qm share/kadu/modules/translations/ext_sound_pl.qm +share/kadu/modules/translations/hints_de.qm +share/kadu/modules/translations/hints_fr.qm +share/kadu/modules/translations/hints_it.qm +share/kadu/modules/translations/hints_pl.qm +share/kadu/modules/translations/notify_de.qm +share/kadu/modules/translations/notify_fr.qm +share/kadu/modules/translations/notify_it.qm +share/kadu/modules/translations/notify_pl.qm share/kadu/modules/translations/sms_de.qm +share/kadu/modules/translations/sms_fr.qm share/kadu/modules/translations/sms_it.qm share/kadu/modules/translations/sms_pl.qm share/kadu/modules/translations/sound_de.qm +share/kadu/modules/translations/sound_fr.qm share/kadu/modules/translations/sound_it.qm share/kadu/modules/translations/sound_pl.qm share/kadu/modules/translations/voice_de.qm +share/kadu/modules/translations/voice_fr.qm share/kadu/modules/translations/voice_it.qm share/kadu/modules/translations/voice_pl.qm +share/kadu/modules/translations/window_notify_de.qm +share/kadu/modules/translations/window_notify_fr.qm +share/kadu/modules/translations/window_notify_it.qm +share/kadu/modules/translations/window_notify_pl.qm share/kadu/modules/translations/x11_docking_de.qm +share/kadu/modules/translations/x11_docking_fr.qm share/kadu/modules/translations/x11_docking_it.qm share/kadu/modules/translations/x11_docking_pl.qm share/kadu/modules/voice.desc +share/kadu/modules/voice.so +share/kadu/modules/window_notify.desc +share/kadu/modules/window_notify.so share/kadu/modules/x11_docking.desc +share/kadu/modules/x11_docking.so share/kadu/themes/emoticons/gadu-gadu/1/8P.gif share/kadu/themes/emoticons/gadu-gadu/1/8P_na.gif share/kadu/themes/emoticons/gadu-gadu/1/beksa.gif @@ -369,41 +445,70 @@ share/kadu/themes/emoticons/gadu-gadu/2/zly_na.gif share/kadu/themes/emoticons/gadu-gadu/2/zygi.gif share/kadu/themes/emoticons/gadu-gadu/2/zygi_na.gif share/kadu/themes/icons/default/abouticon.png +share/kadu/themes/icons/default/abouticon16.png +share/kadu/themes/icons/default/add.png +share/kadu/themes/icons/default/adduser.png +share/kadu/themes/icons/default/autoresponder.png share/kadu/themes/icons/default/back.png share/kadu/themes/icons/default/blocking.png share/kadu/themes/icons/default/busy.png share/kadu/themes/icons/default/busy_d.png share/kadu/themes/icons/default/busy_d_m.png share/kadu/themes/icons/default/busy_m.png +share/kadu/themes/icons/default/chat.png +share/kadu/themes/icons/default/chat16.png share/kadu/themes/icons/default/configure.png share/kadu/themes/icons/default/connect_creating.png share/kadu/themes/icons/default/decrypted.png +share/kadu/themes/icons/default/deluser.png +share/kadu/themes/icons/default/deluserlist.png share/kadu/themes/icons/default/emoticon.png share/kadu/themes/icons/default/encrypted.png +share/kadu/themes/icons/default/erasechat.png +share/kadu/themes/icons/default/erasehistory.png share/kadu/themes/icons/default/eraser.png share/kadu/themes/icons/default/exit.png +share/kadu/themes/icons/default/exporttofile.png +share/kadu/themes/icons/default/exportuserlist.png share/kadu/themes/icons/default/fileopen.png share/kadu/themes/icons/default/filesave.png share/kadu/themes/icons/default/forward.png +share/kadu/themes/icons/default/generals.png +share/kadu/themes/icons/default/help.png +share/kadu/themes/icons/default/hide.png +share/kadu/themes/icons/default/hints.png share/kadu/themes/icons/default/history.png +share/kadu/themes/icons/default/history_1.png share/kadu/themes/icons/default/icons.conf share/kadu/themes/icons/default/icons.png share/kadu/themes/icons/default/identity.png share/kadu/themes/icons/default/impexpicon.png +share/kadu/themes/icons/default/impexpicon16.png +share/kadu/themes/icons/default/importfromfile.png +share/kadu/themes/icons/default/importuserlist.png share/kadu/themes/icons/default/invisible.png share/kadu/themes/icons/default/invisible_d.png share/kadu/themes/icons/default/invisible_d_m.png share/kadu/themes/icons/default/invisible_m.png +share/kadu/themes/icons/default/kadu.png share/kadu/themes/icons/default/key_enter.png +share/kadu/themes/icons/default/language.png share/kadu/themes/icons/default/loading.png +share/kadu/themes/icons/default/look.png +share/kadu/themes/icons/default/mail.png share/kadu/themes/icons/default/mail_generic.png share/kadu/themes/icons/default/manageignored.png +share/kadu/themes/icons/default/manageignored16.png share/kadu/themes/icons/default/manusricon.png +share/kadu/themes/icons/default/mergeuserlist.png share/kadu/themes/icons/default/message.png share/kadu/themes/icons/default/mobile.png +share/kadu/themes/icons/default/modmanager.png share/kadu/themes/icons/default/msgbox_warning.png share/kadu/themes/icons/default/mute.png +share/kadu/themes/icons/default/network.png share/kadu/themes/icons/default/newuser.png +share/kadu/themes/icons/default/notify.png share/kadu/themes/icons/default/offline.png share/kadu/themes/icons/default/offline_d.png share/kadu/themes/icons/default/offline_d_m.png @@ -412,25 +517,41 @@ share/kadu/themes/icons/default/online.png share/kadu/themes/icons/default/online_d.png share/kadu/themes/icons/default/online_d_m.png share/kadu/themes/icons/default/online_m.png +share/kadu/themes/icons/default/pass-mail.png share/kadu/themes/icons/default/password.png +share/kadu/themes/icons/default/password16.png share/kadu/themes/icons/default/personalinfo.png share/kadu/themes/icons/default/registeraccount.png share/kadu/themes/icons/default/reload.png -share/kadu/themes/icons/default/remove.png +share/kadu/themes/icons/default/reload2.png +share/kadu/themes/icons/default/remind-pass.png +share/kadu/themes/icons/default/saveuserlist.png share/kadu/themes/icons/default/scroll_lock.png +share/kadu/themes/icons/default/selectpath.png share/kadu/themes/icons/default/share.png +share/kadu/themes/icons/default/shortcuts.png +share/kadu/themes/icons/default/sms.png +share/kadu/themes/icons/default/sounds.png +share/kadu/themes/icons/default/speech.png share/kadu/themes/icons/default/stop.png share/kadu/themes/icons/default/unmute.png share/kadu/themes/icons/default/unregisteraccount.png share/kadu/themes/icons/default/viewmag.png +share/kadu/themes/icons/default/voice.png +share/kadu/themes/icons/default/weather.png +share/kadu/themes/icons/default/weather16.png +share/kadu/themes/icons/default/wizard.png +share/kadu/themes/icons/default/xmms.png share/kadu/themes/sounds/default/msg.wav share/kadu/themes/sounds/default/sound.conf share/kadu/translations/kadu_de.qm share/kadu/translations/kadu_en.qm +share/kadu/translations/kadu_fr.qm share/kadu/translations/kadu_it.qm share/kadu/translations/kadu_pl.qm share/kadu/translations/qt_de.qm share/kadu/translations/qt_en.qm +share/kadu/translations/qt_fr.qm share/kadu/translations/qt_it.qm share/kadu/translations/qt_pl.qm @dirrm share/kadu/translations @@ -444,7 +565,11 @@ share/kadu/translations/qt_pl.qm @dirrm share/kadu/themes/emoticons @dirrm share/kadu/themes @dirrm share/kadu/modules/translations +@dirrm share/kadu/modules/data/config_wizard/ronk2 +@dirrm share/kadu/modules/data/config_wizard/joi +@dirrm share/kadu/modules/data/config_wizard @dirrm share/kadu/modules/data +@dirrm share/kadu/modules/bin @dirrm share/kadu/modules @dirrm share/kadu @dirrm include/kadu/modules diff --git a/chat/kadu/distinfo b/chat/kadu/distinfo index e772c1160c1..6addaa14ee8 100644 --- a/chat/kadu/distinfo +++ b/chat/kadu/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 15:59:12 agc Exp $ +$NetBSD: distinfo,v 1.4 2005/04/21 08:56:21 adam Exp $ -SHA1 (kadu-0.3.9.tar.bz2) = 633faefb53660be80b9f368dcbf837e07cb15cfd -RMD160 (kadu-0.3.9.tar.bz2) = dbc4d0fb6e0d15ceeadbe49dd8c0bea4e7e6aed1 -Size (kadu-0.3.9.tar.bz2) = 942895 bytes -SHA1 (patch-aa) = 5ed7b1dab199097fa032fee1349e585efa1d0096 -SHA1 (patch-ab) = 2bad6bf94b1f4f39a88914c625bf4a1d6da5ae52 +SHA1 (kadu-0.4.0.tar.bz2) = d480e77632e191eb8f85cc18dd376701de22034e +RMD160 (kadu-0.4.0.tar.bz2) = c5d6ce78d431b776c19c4c7181cf8a5e2b13da94 +Size (kadu-0.4.0.tar.bz2) = 1198118 bytes +SHA1 (patch-aa) = 326e786f46223121de946294a647289f1c190b87 +SHA1 (patch-ab) = b0583604ca1a0ca381d63e50c4cc37a02edc4a72 diff --git a/chat/kadu/patches/patch-aa b/chat/kadu/patches/patch-aa index e2fe51703d9..e84ae425c3b 100644 --- a/chat/kadu/patches/patch-aa +++ b/chat/kadu/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.2 2004/07/09 10:46:23 adam Exp $ +$NetBSD: patch-aa,v 1.3 2005/04/21 08:56:21 adam Exp $ ---- modules/voice/libgsm/Makefile.orig 2003-10-15 14:09:01.000000000 +0000 +--- modules/voice/libgsm/Makefile.orig 2005-03-08 17:42:25.000000000 +0000 +++ modules/voice/libgsm/Makefile @@ -44,7 +44,7 @@ WAV49 = -DWAV49 # CCFLAGS = -c -O - CC = gcc -ansi -pedantic --CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -+CCFLAGS = -c -DNeedFunctionPrototypes=1 + CC := $(CC) -ansi -pedantic +-CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -fPIC ++CCFLAGS = -c -DNeedFunctionPrototypes=1 -fPIC LD = $(CC) diff --git a/chat/kadu/patches/patch-ab b/chat/kadu/patches/patch-ab index 7f76f3c8218..cd046968663 100644 --- a/chat/kadu/patches/patch-ab +++ b/chat/kadu/patches/patch-ab @@ -1,13 +1,28 @@ -$NetBSD: patch-ab,v 1.2 2004/07/09 10:46:23 adam Exp $ +$NetBSD: patch-ab,v 1.3 2005/04/21 08:56:21 adam Exp $ ---- modules/dsp_sound/dsp_sound.cpp.orig 2004-05-25 17:44:15.000000000 +0000 -+++ modules/dsp_sound/dsp_sound.cpp -@@ -178,7 +178,7 @@ void DirectPlayThread::run() - continue; - } - -- if (ioctl(fd, SNDCTL_DSP_RESET)<0) -+ if (ioctl(fd, SNDCTL_DSP_RESET, NULL)<0) - { - qWarning("ioctl: %s", strerror(errno)); - close(fd); +--- configure.orig 2005-04-15 15:48:25.000000000 +0000 ++++ configure +@@ -6621,12 +6621,12 @@ echo "$as_me: error: libgadu.h not found + fi + rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + +- GADU_LIBS=-lgadu ++ GADU_LIBS="-lgadu -lssl -lpthread" + + echo "$as_me:$LINENO: checking if libgadu is in system directories" >&5 + echo $ECHO_N "checking if libgadu is in system directories... $ECHO_C" >&6 + save_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -lgadu" ++ CFLAGS="$CFLAGS ${GADU_LIBS}" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -7085,7 +7085,7 @@ fi + rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + \ +- MODULE_LDFLAGS="$MODULE_LDFLAGS -l$lib"; \ ++ MODULE_LDFLAGS="$MODULE_LDFLAGS -l$lib -Wl,-R${X11BASE}/lib"; \ + done && \ + for hdr in $MODULE_INCLUDES; do \ + |