From fb29962cfba6abf1ecb3fb2a0b636f829750aab1 Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 20 Apr 2004 13:02:56 +0000 Subject: bl3ify and update to kde3.2.2. Changes: * kopete (Cryptography Plugin): Fix enable/disable encryption per message * kopete: Fix suppression of buddy notification on connection * kopete (Jabber Plugin): Fix resource identifiers truncated from Jabber "to" addresses * kopete (Jabber Plugin): Fix Packets from foreign clients are duplicated * kopete (Main Application): Fix isReachable() is not called when clicking on the contact icon * kopete (Jabber Plugin): Fix String bug in account editor * kopete (ICQ and AIM Plugins): Fix [PATCH] ICQ User Info for temporary contacts is not automatically loaded * kopete: Fix Refresh icon cache when KIconLoader settings change * kopete (MSN Plugin): Fix "This user has me on his contact list" is inaccurate * kopete (IRC Plugin): Fix can't log into ANY IRC server * kopete: Fix no mainWindow restore on exec kopete * kopete (Jabber Plugin): Fix Registering new Account dialog in Jabber does not update username * kopete (MSN Plugin): Fix Kopete logs into MSN, connects and pops up current contacts and mail, and then disconnects. It will not stay logged in. * kopete (Main Application): Fix Selecting several contacts and dragging them only moves one * kopete (SMS Plugin): Fix sms sending blocked by kopete determining user is 'offline' * kopete: Fix Type in Kopete handbook * kpf: Fix Incorrect mimetypes for css and other fileformats. * krdc: Fix KRDC does not send key clicks to the server until "special keys" is used * knewsticker: Fix SIGFPE crash when scrolling speed is set to 1 * configure: Fix Extraneous message in admin/Makefile.common using --prefix * kwifimanager: make it compile with libiw-dev (27+) * kwifimanager: auto-scaling statistics window, should now work for every chipset out there * kwifimanager: control center module saves settings * Make various scripts install with the executable bit set --- net/kdenetwork3/PLIST | 6 ++++-- net/kdenetwork3/buildlink3.mk | 25 +++++++++++++++++++++++++ net/kdenetwork3/distinfo | 8 ++++---- net/kdenetwork3/patches/patch-aa | 23 ++++++++++++++++------- 4 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 net/kdenetwork3/buildlink3.mk (limited to 'net') diff --git a/net/kdenetwork3/PLIST b/net/kdenetwork3/PLIST index defc46c6767..97673224a31 100644 --- a/net/kdenetwork3/PLIST +++ b/net/kdenetwork3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2004/03/09 11:53:26 markd Exp $ +@comment $NetBSD: PLIST,v 1.10 2004/04/20 13:02:56 markd Exp $ bin/dsirc bin/feedbrowser bin/kdict @@ -1109,8 +1109,10 @@ share/kde/apps/kppp/Rules/Portugal/PT_Regional.rst share/kde/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst share/kde/apps/kppp/Rules/Portugal/PT_YesNET.rst share/kde/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst +share/kde/apps/kppp/Rules/Romania/Easynet.rst +share/kde/apps/kppp/Rules/Romania/RomTelecom_GSM.rst share/kde/apps/kppp/Rules/Romania/Romtelecom_Acces_Special_Internet.rst -share/kde/apps/kppp/Rules/Romania/Romtelecom_Interurban.rst +share/kde/apps/kppp/Rules/Romania/Romtelecom_Interjudetean.rst share/kde/apps/kppp/Rules/Romania/Romtelecom_Local.rst share/kde/apps/kppp/Rules/Romania/Zapp-Mobile.rst share/kde/apps/kppp/Rules/Russia/TEMPLATE.ru diff --git a/net/kdenetwork3/buildlink3.mk b/net/kdenetwork3/buildlink3.mk new file mode 100644 index 00000000000..a1415732153 --- /dev/null +++ b/net/kdenetwork3/buildlink3.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/20 13:02:56 markd Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +KDENETWORK_BUILDLINK3_MK:= ${KDENETWORK_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= kdenetwork +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nkdenetwork} +BUILDLINK_PACKAGES+= kdenetwork + +.if !empty(KDENETWORK_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.kdenetwork+= kdenetwork>=3.2.0 +BUILDLINK_RECOMMENDED.kdenetwork?= kdenetwork>=3.2.2 +BUILDLINK_PKGSRCDIR.kdenetwork?= ../../net/kdenetwork3 +.endif # KDENETWORK_BUILDLINK3_MK + +.include "../../converters/uulib/buildlink3.mk" +.include "../../databases/gdbm/buildlink3.mk" +.include "../../net/openslp/buildlink3.mk" +.include "../../x11/kdebase3/buildlink3.mk" +.include "../../x11/kdelibs3/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 173accb305f..cb9bb0abffe 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.20 2004/03/09 11:53:26 markd Exp $ +$NetBSD: distinfo,v 1.21 2004/04/20 13:02:56 markd Exp $ -SHA1 (kdenetwork-3.2.1.tar.bz2) = ed98f3ba036fcb6858da0a9173b3337cfb3a10b1 -Size (kdenetwork-3.2.1.tar.bz2) = 6210423 bytes -SHA1 (patch-aa) = f44f9cff3a34ea491ec0b31f928e537c5cbaeb9f +SHA1 (kdenetwork-3.2.2.tar.bz2) = c3410e34504da7637b92c8efe318c0d981bd96e7 +Size (kdenetwork-3.2.2.tar.bz2) = 6157487 bytes +SHA1 (patch-aa) = 9d28fc208d633e3c43f157ad59b75a047dc9b983 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2 SHA1 (patch-am) = e0511acfd35ebde0c919612f52dd63304934e8cf diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa index 23947bb1e4b..1c05aebc578 100644 --- a/net/kdenetwork3/patches/patch-aa +++ b/net/kdenetwork3/patches/patch-aa @@ -1,15 +1,14 @@ -$NetBSD: patch-aa,v 1.10 2004/02/04 14:42:23 markd Exp $ +$NetBSD: patch-aa,v 1.11 2004/04/20 13:02:56 markd Exp $ ---- configure.orig 2004-01-26 08:10:29.000000000 +1300 +--- configure.orig 2004-04-06 02:51:22.000000000 +1200 +++ configure -@@ -24856,63 +24856,6 @@ _ACEOF +@@ -26504,72 +26504,6 @@ _ACEOF - echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5 -echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6 - cat >conftest.$ac_ext <<_ACEOF --/* #line $LINENO "configure" */ -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext @@ -30,11 +29,21 @@ $NetBSD: patch-aa,v 1.10 2004/02/04 14:42:23 markd Exp $ -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 +- (eval $ac_compile) 2>conftest.er1 - ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? @@ -60,7 +69,7 @@ $NetBSD: patch-aa,v 1.10 2004/02/04 14:42:23 markd Exp $ - { (exit 1); exit 1; }; } - -fi --rm -f conftest.$ac_objext conftest.$ac_ext +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - - # darwin needs this to initialize the environment -- cgit v1.2.3