Update to version 3.2.3

4 files changed, 99 insertions, 2 deletions

diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 9392b8add91d..91b938f6c064 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -18,10 +18,13 @@ COMMENT=	Network-related programs and modules for KDE
 
 CONFLICTS=	kopete-*
 
+LIB_DEPENDS=	slp:${PORTSDIR}/net/openslp
+
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 KDE_BUILD_PLIST=yes
 
+USE_PERL5=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
@@ -33,6 +36,12 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+pre-configure:
+.if ${OSVERSION} < 500028
+	@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|g' \
+		${WRKSRC}/kopete/protocols/gadu/libgadu/libgadu-config.h.in
+.endif
+
 .if !defined(WITHOUT_KTALKD)
 UTMP?=	/var/run/utmp
 .if exists(${UTMP})
diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index c3a47a56a3fe..286925bf99a7 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdenetwork-3.2.2.tar.bz2) = 405ade1938cd74e3e9643f25814ee81d
-SIZE (KDE/kdenetwork-3.2.2.tar.bz2) = 6157487
+MD5 (KDE/kdenetwork-3.2.3.tar.bz2) = a58915e964d8f6ec87c76acaab9f8929
+SIZE (KDE/kdenetwork-3.2.3.tar.bz2) = 6194940
diff --git a/net/kdenetwork3/files/patch-configure b/net/kdenetwork3/files/patch-configure
new file mode 100644
index 000000000000..0080bfe0e139
--- /dev/null
+++ b/net/kdenetwork3/files/patch-configure
@@ -0,0 +1,71 @@
+--- configure	Mon May 31 16:06:53 2004
++++ configure	Sun Jun  6 20:29:06 2004
+@@ -36349,7 +36349,7 @@
+ 
+ ( exit $ac_status )
+ 
+-	if test "$LIBPTHREAD" != "" ; then
++	if test "$kde_use_threading" = "yes" ; then
+ 	echo "$as_me:$LINENO: result: no, falling back on supplied libgadu-copy" >&5
+ echo "${ECHO_T}no, falling back on supplied libgadu-copy" >&6
+ 	use_libgadu_copy=yes
+@@ -36391,12 +36391,12 @@
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ 
+ if test "$use_libgadu_copy" = "yes"; then
+-	cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.in,}
++	cp ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.in ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 	if test "$ac_cv_c_bigendian" = "yes"; then
+ 
+ sed -e "s/#undef __GG_LIBGADU_BIGENDIAN/#define __GG_LIBGADU_BIGENDIAN/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
++mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ 	fi
+ 
+@@ -36489,7 +36489,7 @@
+ 
+ sed -e "s/#undef __GG_LIBGADU_HAVE_LONG_LONG/#define __GG_LIBGADU_HAVE_LONG_LONG/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
++mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ 	fi
+ 
+@@ -36777,7 +36777,7 @@
+ 
+ sed -e "s/#undef __GG_LIBGADU_HAVE_OPENSSL/#define __GG_LIBGADU_HAVE_OPENSSL/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
++mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ 	fi
+ 	echo "$as_me:$LINENO: checking for C99-compatible vsnprintf()" >&5
+@@ -36821,7 +36821,7 @@
+ 
+ sed -e "s/#undef __GG_LIBGADU_HAVE_C99_VSNPRINTF/#define __GG_LIBGADU_HAVE_C99_VSNPRINTF/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
++mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ 
+ else
+@@ -36938,7 +36938,7 @@
+ 
+ sed -e "s/#undef __GG_LIBGADU_HAVE_VA_COPY/#define __GG_LIBGADU_HAVE_VA_COPY/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
++mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ fi
+ done
+@@ -37044,7 +37044,7 @@
+ 
+ sed -e "s/#undef __GG_LIBGADU_HAVE__VA_COPY/#define __GG_LIBGADU_HAVE__VA_COPY/" \
+ ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h > ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1
+-mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h{.1,}
++mv ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h.1 ${srcdir}/kopete/protocols/gadu/libgadu/libgadu-config.h
+ 
+ fi
+ done
diff --git a/net/kdenetwork3/files/plist.base b/net/kdenetwork3/files/plist.base
index 90bda46c8c05..a6f87c4af986 100644
--- a/net/kdenetwork3/files/plist.base
+++ b/net/kdenetwork3/files/plist.base
@@ -73,6 +73,8 @@ lib/kde3/kopete_contactnotes.la
 lib/kde3/kopete_contactnotes.so
 lib/kde3/kopete_cryptography.la
 lib/kde3/kopete_cryptography.so
+lib/kde3/kopete_gadu.la
+lib/kde3/kopete_gadu.so
 lib/kde3/kopete_highlight.la
 lib/kde3/kopete_highlight.so
 lib/kde3/kopete_history.la
@@ -226,6 +228,18 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/aol_icon.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/dt_icon.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/free_icon.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_away.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy_d.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_con.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_connecting.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_ignored.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_invi_d.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_offline.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_offline_d.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_online.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_online_d.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/icq_away.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/icq_dnd.png
@@ -283,6 +297,7 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png
+share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png
@@ -297,6 +312,7 @@ share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png
 share/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng
 share/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png
+share/apps/kopete/icons/crystalsvg/32x32/apps/gadu_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png
@@ -1364,6 +1380,7 @@ share/services/kopete_behaviorconfig.desktop
 share/services/kopete_connectionstatus.desktop
 share/services/kopete_contactnotes.desktop
 share/services/kopete_cryptography.desktop
+share/services/kopete_gadu.desktop
 share/services/kopete_highlight.desktop
 share/services/kopete_history.desktop
 share/services/kopete_icq.desktop