kdelibs-3.1: getaddrinfo is marked as non thread-safe in main archive now.

x11/kde/libs3/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2003/01/07 15:36:35 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2003/01/27 19:16:47 espie Exp $
 
 COMMENT=		"X11 toolkit, libraries"
 CATEGORIES=		x11 x11/kde
-VERSION=		3.0.5a
+VERSION=		3.1
 DISTNAME=		kdelibs-${VERSION}
-PKGNAME=		${DISTNAME}p0
 
 LIB_DEPENDS= 	png.2::graphics/png \
 		jpeg.62::graphics/jpeg \
@@ -14,6 +13,8 @@ LIB_DEPENDS= 	png.2::graphics/png \
 		xml2.6:libxml->=2.4.8:textproc/libxml \
 		xslt.1.10:libxslt->=1.0.10:textproc/libxslt \
 		bz2::archivers/bzip2 \
+		art_lgpl_2::graphics/libart \
+		lber,ldap.2:openldap-client-2.*:databases/openldap \
 		artsflow.1.0,artsflow_idl.1.0,kmedia2_idl.1.0,mcop.1.0,qtmcop.1.0,soundserver_idl.1.0::x11/kde/arts3
 
 SEPARATE_BUILD=	flavored
@@ -29,26 +30,36 @@ EXTRA_DIRECTORIES= \
 	share/applnk/Games/Board \
 	share/applnk/Games/Card \
 	share/applnk/Games/TacticStrategy \
-	share/applnk/Graphics \
+	share/applnk/Games/Kidsgames \
+	share/applnk/Graphics/More \
 	share/applnk/Office \
 	share/applnk/Settings/Information \
 	share/applnk/Settings/PowerControl \
+	share/applnk/Settings/System \
 	share/applnk/System/ScreenSavers \
 	share/applnk/Toys \
 	share/applnk/Utilities \
 	share/apps/kdesktop/programs \
 	share/apps/kicker/applets \
 	share/apps/knewsticker \
-	share/apps/konqueror \
+	share/apps/konqueror/servicemenus \
 	share/apps/kscreensaver \
 	share/apps/kthememgr/Themes \
 	share/apps/kwin/icewm-themes \
 	share/apps/kworldclock/maps/depths \
+	share/doc/HTML/en \
 	share/icons/hicolor/22x22/apps \
 	share/icons/hicolor/32x32/apps \
 	share/icons/hicolor/48x48/apps \
 	share/icons/locolor/16x16/apps \
 	share/icons/locolor/32x32/apps \
+	share/icons/crystalsvg/128x128/apps \
+	share/icons/crystalsvg/64x64/apps \
+	share/icons/crystalsvg/64x64/apps \
+	share/icons/crystalsvg/48x48/apps \
+	share/icons/crystalsvg/32x32/apps \
+	share/icons/crystalsvg/16x16/apps \
+	share/apps/konqueror/servicemenus \
 	share/locale \
 	share/sounds \
 	share/templates/.source \

x11/kde/libs3/distinfo

@@ -1,3 +1,3 @@
-MD5 (kde/kdelibs-3.0.5a.tar.bz2) = a3c714c7727ddc70e7c9ea6acf5e42dc
+MD5 (kde/kdelibs-3.1.tar.bz2) = 4b5cb94d5889134ba4e86749e6b5476c
-RMD160 (kde/kdelibs-3.0.5a.tar.bz2) = 288676a7f9b318936d6546ce1d5f313bb7eade6e
+RMD160 (kde/kdelibs-3.1.tar.bz2) = 2462bd563978e1c5e74872eb3a2a026b3d02862c
-SHA1 (kde/kdelibs-3.0.5a.tar.bz2) = 2ebc2927eb724bcf570a781fcfb8f988bc2681ad
+SHA1 (kde/kdelibs-3.1.tar.bz2) = 0b8c35cf2ba59a3335c6d5374a7bbddb0b1b8c75

x11/kde/libs3/patches/patch-config_h_in

@@ -1,9 +1,9 @@
-$OpenBSD: patch-config_h_in,v 1.4 2002/06/03 10:06:20 espie Exp $
+$OpenBSD: patch-config_h_in,v 1.5 2003/01/27 19:16:47 espie Exp $
---- config.h.in.orig	Tue May 21 16:41:11 2002
+--- config.h.in.orig	Tue Jan 14 14:01:45 2003
-+++ config.h.in	Tue May 28 12:28:36 2002
++++ config.h.in	Tue Jan 14 16:31:26 2003
-@@ -584,6 +584,9 @@
+@@ -928,6 +928,9 @@ int snprintf(char *str, size_t n, char c
- /* path to su */
+ #endif
- #undef __PATH_SU
+ 
  
 +/* path to sudo */
 +#undef __PATH_SUDO

x11/kde/libs3/patches/patch-configure_in

@@ -1,31 +1,18 @@
-$OpenBSD: patch-configure_in,v 1.7 2003/01/13 20:50:04 espie Exp $
+$OpenBSD: patch-configure_in,v 1.8 2003/01/27 19:16:47 espie Exp $
---- configure.in.orig	Tue Dec 17 11:42:55 2002
+--- configure.in.orig	Tue Jan 14 14:01:29 2003
-+++ configure.in	Mon Jan 13 21:45:03 2003
++++ configure.in	Tue Jan 14 16:31:26 2003
-@@ -585,6 +585,12 @@ AC_CHECK_FUNC(getaddrinfo,
+@@ -1051,6 +1051,14 @@ else
-     AC_DEFINE(GETADDRINFO_RETURNS_UNIX, 1, [Define if getaddrinfo returns AF_UNIX sockets])
-   ]
- )
-+case "$target" in
-+	  *-*-openbsd*)
-+	  dnl our getaddrinfo is not thread-safe yet
-+      AC_DEFINE(HAVE_BROKEN_GETADDRINFO, 1, [Define if getaddrinfo is broken and should be replaced])
-+	    ;;
-+esac
- LIBS="$my_LIBS"
- 
- AC_MSG_CHECKING([if struct sockaddr has member sa_len])
-@@ -912,6 +918,14 @@ if test "$path_su" = "no"; then
-     AC_MSG_WARN(su was not found)
- else
      AC_DEFINE_UNQUOTED(__PATH_SU, "$path_su", [path to su])
-+fi
+ fi
-+
+ 
 +dnl Check for sudo
 +AC_PATH_PROG(path_sudo, "sudo", "no")
 +if test "$path_sudo" = "no"; then
 +    AC_MSG_WARN(sudo was not found)
 +else
 +    AC_DEFINE_UNQUOTED(__PATH_SUDO, "$path_sudo", [path to sudo])
- fi
++fi
- 
++
  dnl Check for POSIX.1b scheduling
+ AC_MSG_CHECKING([POSIX.1b scheduling])
+ AC_TRY_LINK([

x11/kde/libs3/patches/patch-kdecore_kprocess_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-kdecore_kprocess_cpp,v 1.1 2003/01/09 20:17:23 espie Exp $
+$OpenBSD: patch-kdecore_kprocess_cpp,v 1.2 2003/01/27 19:16:47 espie Exp $
---- kdecore/kprocess.cpp.orig	Thu Jan  9 21:07:01 2003
+--- kdecore/kprocess.cpp.orig	Fri Jan  3 05:56:52 2003
-+++ kdecore/kprocess.cpp	Thu Jan  9 21:08:22 2003
++++ kdecore/kprocess.cpp	Mon Jan 13 14:18:02 2003
-@@ -261,7 +261,7 @@ bool KProcess::start(RunMode runmode, Co
+@@ -293,7 +293,7 @@ bool KProcess::start(RunMode runmode, Co
    int fd[2];
    if (0 > pipe(fd))
    {
@@ -10,7 +10,7 @@ $OpenBSD: patch-kdecore_kprocess_cpp,v 1.1 2003/01/09 20:17:23 espie Exp $
    }
  
    runs = true;
-@@ -273,7 +273,7 @@ bool KProcess::start(RunMode runmode, Co
+@@ -305,7 +305,7 @@ bool KProcess::start(RunMode runmode, Co
    pid_ = fork();
  
    if (0 == pid_) {
@@ -19,7 +19,7 @@ $OpenBSD: patch-kdecore_kprocess_cpp,v 1.1 2003/01/09 20:17:23 espie Exp $
             close(fd[0]);
          if (!runPrivileged())
          {
-@@ -303,11 +303,11 @@ bool KProcess::start(RunMode runmode, Co
+@@ -335,11 +335,11 @@ bool KProcess::start(RunMode runmode, Co
  
          // We set the close on exec flag.
          // Closing of fd[1] indicates that the execvp succeeded!
@@ -33,7 +33,7 @@ $OpenBSD: patch-kdecore_kprocess_cpp,v 1.1 2003/01/09 20:17:23 espie Exp $
            write(fd[1], &resultByte, 1);
          _exit(-1);
    } else if (-1 == pid_) {
-@@ -317,7 +317,7 @@ bool KProcess::start(RunMode runmode, Co
+@@ -349,7 +349,7 @@ bool KProcess::start(RunMode runmode, Co
          free(arglist);
          return false;
    } else {
@@ -42,7 +42,7 @@ $OpenBSD: patch-kdecore_kprocess_cpp,v 1.1 2003/01/09 20:17:23 espie Exp $
            close(fd[1]);
          // the parent continues here
  
-@@ -325,7 +325,7 @@ bool KProcess::start(RunMode runmode, Co
+@@ -357,7 +357,7 @@ bool KProcess::start(RunMode runmode, Co
          input_data = 0;
  
          // Check whether client could be started.
@@ -51,7 +51,7 @@ $OpenBSD: patch-kdecore_kprocess_cpp,v 1.1 2003/01/09 20:17:23 espie Exp $
          {
             char resultByte;
             int n = ::read(fd[0], &resultByte, 1);
-@@ -345,7 +345,7 @@ bool KProcess::start(RunMode runmode, Co
+@@ -377,7 +377,7 @@ bool KProcess::start(RunMode runmode, Co
             }
             break; // success
          }

x11/kde/libs3/patches/patch-kdesu_process_cpp

@@ -1,6 +1,6 @@
-$OpenBSD: patch-kdesu_process_cpp,v 1.2 2003/01/06 22:46:02 espie Exp $
+$OpenBSD: patch-kdesu_process_cpp,v 1.3 2003/01/27 19:16:47 espie Exp $
---- kdesu/process.cpp.orig	Mon Mar  4 01:59:15 2002
+--- kdesu/process.cpp.orig	Tue Jan 14 00:49:57 2003
-+++ kdesu/process.cpp	Mon Jan  6 23:41:20 2003
++++ kdesu/process.cpp	Tue Jan 14 16:31:26 2003
 @@ -38,6 +38,9 @@
  #include <stropts.h>
  #include <sys/stream.h>
@@ -9,9 +9,9 @@ $OpenBSD: patch-kdesu_process_cpp,v 1.2 2003/01/06 22:46:02 espie Exp $
 +#include <sys/ioctl.h>
 +#endif
  
- #ifdef HAVE_SYS_SELECT_H
+ #ifdef __OpenBSD__
- #include <sys/select.h>                // Needed on some systems.
+ #include <sys/ioctl.h>
-@@ -360,8 +363,13 @@ int PtyProcess::waitForChild()
+@@ -364,8 +367,13 @@ int PtyProcess::waitForChild()
      while (1) 
      {
          tv.tv_sec = 1; tv.tv_usec = 0;
@@ -27,7 +27,7 @@ $OpenBSD: patch-kdesu_process_cpp,v 1.2 2003/01/06 22:46:02 espie Exp $
          if (ret == -1) 
          {
              if (errno == EINTR) continue;
-@@ -448,6 +456,9 @@ int PtyProcess::SetupTTY(int fd)
+@@ -452,6 +460,9 @@ int PtyProcess::SetupTTY(int fd)
      ioctl(slave, I_PUSH, "ptem");
      ioctl(slave, I_PUSH, "ldterm");
  
@@ -36,4 +36,4 @@ $OpenBSD: patch-kdesu_process_cpp,v 1.2 2003/01/06 22:46:02 espie Exp $
 +    ioctl(slave, TIOCSCTTY, (char *)NULL);
  #endif
  
-     // Connect stdin, stdout and stderr
+ #ifdef __OpenBSD__

x11/kde/libs3/patches/patch-khtml_rendering_render_replaced_cpp

@@ -1,11 +0,0 @@
-$OpenBSD: patch-khtml_rendering_render_replaced_cpp,v 1.1 2003/01/05 22:13:31 espie Exp $
---- khtml/rendering/render_replaced.cpp.orig	Sun Jan  5 23:08:11 2003
-+++ khtml/rendering/render_replaced.cpp	Sun Jan  5 23:08:17 2003
-@@ -153,7 +153,6 @@ void RenderWidget::detach()
- RenderWidget::~RenderWidget()
- {
-     KHTMLAssert( refCount() <= 0 );
--    assert(!m_view);
- 
-     if(m_widget) {
-         m_widget->hide();

x11/kde/libs3/patches/patch-kio_kio_ktar_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-kio_kio_ktar_cpp,v 1.1 2002/12/29 16:43:44 espie Exp $
---- kio/kio/ktar.cpp.orig	Sun Dec 29 17:33:40 2002
-+++ kio/kio/ktar.cpp	Sun Dec 29 17:33:59 2002
-@@ -474,7 +474,7 @@ void KTar::fillBuffer( char * buffer,
-   buffer[ 0x87 ] = ' '; // space-terminate (no null after)
- 
-   // Dummy time
--  s.sprintf("%lo", time( 0 ) ); // OCT
-+  s.sprintf("%lo", static_cast<unsigned long>(time( 0 )) ); // OCT
-   s = s.rightJustify( 11, ' ' );
-   strcpy( buffer + 0x88, s.data() );
-   buffer[ 0x93 ] = ' '; // space-terminate (no null after)

x11/kde/libs3/pkg/PFRAG.shared

@@ -1,15 +1,22 @@
-@comment $OpenBSD: PFRAG.shared,v 1.6 2002/05/23 14:37:22 espie Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.7 2003/01/27 19:16:47 espie Exp $
+${KDE}/libkabc_dir.so.0.0
+${KDE}/libkabc_ldap.so.0.0
+${KDE}/libkabcformat_binary.so.0.0
+${KDE}/libkatepart.so.0.0
 ${KDE}/libkbzip2filter.so.0.0
+${KDE}/libkcm_kabc.so.0.0
+${KDE}/libkded_kcookiejar.so.0.0
 ${KDE}/libkded_kdeprintd.so.0.0
+${KDE}/libkded_kpasswdserver.so.0.0
 ${KDE}/libkded_kssld.so.0.0
 ${KDE}/libkdeprint_ext.so.0.0
 ${KDE}/libkdeprint_lpdunix.so.0.0
 ${KDE}/libkdeprint_lpr.so.0.0
 ${KDE}/libkdeprint_rlpr.so.0.0
+${KDE}/libkdeprint_tool_escputil.so.0.0
 ${KDE}/libkgzipfilter.so.0.0
 ${KDE}/libkhtmlimagepart.so.0.0
 ${KDE}/libkimg_eps.so.0.0
-${KDE}/libkimg_g3.so.0.0
 ${KDE}/libkimg_ico.so.0.0
 ${KDE}/libkimg_krl.so.0.0
 ${KDE}/libkimg_tiff.so.0.0
@@ -18,46 +25,53 @@ ${KDE}/libkio_file.so.0.0
 ${KDE}/libkio_ftp.so.0.0
 ${KDE}/libkio_help.so.0.0
 ${KDE}/libkio_http.so.0.0
+${KDE}/libkio_metainfo.so.0.0
 ${KDE}/libkjs_html.so.0.0
+${KDE}/libkmultipart.so.0.0
 ${KDE}/libkpac.so.0.0
+${KDE}/libktexteditor_insertfile.so.0.0
+${KDE}/libktexteditor_isearch.so.0.0
+${KDE}/libktexteditor_kdatatool.so.0.0
 ${KDE}/plugins/designer/libkdewidgets.so.0.0
 ${KDE}/plugins/styles/libhighcolor.so.0.0
+${KDE}/plugins/styles/libkeramik.so.0.0
 ${KDE}/plugins/styles/libkthemestyle.so.0.0
 ${KDE}/plugins/styles/liblight.so.0.0
-lib/libDCOP.so.4.0
+lib/libDCOP.so.5.0
-lib/libartskde.so.1.0
+lib/libartskde.so.2.0
 lib/libdcopserver.so.0.0
-lib/libkabc.so.1.0
+lib/libkabc.so.2.0
 lib/libkaddprinterwizard.so.0.0
-lib/libkatepart.so.0.0
 lib/libkatepartinterfaces.so.0.0
 lib/libkbuildsycoca.so.0.0
-lib/libkcertpart.so.4.0
+lib/libkcertpart.so.5.0
 lib/libkconf_update.so.0.0
 lib/libkcookiejar.so.0.0
-lib/libkdecore.so.4.0
+lib/libkdecore.so.5.0
 lib/libkded.so.0.0
-lib/libkdefakes.so.4.0
+lib/libkdefakes.so.5.0
-lib/libkdefx.so.4.0
+lib/libkdefx.so.5.0
-lib/libkdeprint.so.4.0
+lib/libkdeprint.so.5.0
-lib/libkdeprint_management.so.4.0
+lib/libkdeprint_management.so.5.0
-lib/libkdesasl.so.1.0
+lib/libkdesasl.so.2.0
-lib/libkdesu.so.4.0
+lib/libkdesu.so.5.0
-lib/libkdeui.so.4.0
+lib/libkdeui.so.5.0
-lib/libkhtml.so.4.0
+lib/libkhtml.so.5.0
-lib/libkio.so.4.0
+lib/libkio.so.5.0
 lib/libkio_http_cache_cleaner.so.0.0
 lib/libkio_uiserver.so.0.0
 lib/libkjava.so.1.0
 lib/libkjs.so.1.0
 lib/libklauncher.so.0.0
+lib/libkmediaplayer.so.0.0
 lib/libkmid.so.0.95
 lib/libknotify.so.0.0
-lib/libkparts.so.2.0
+lib/libkparts.so.3.0
-lib/libkscreensaver.so.4.0
+lib/libkscreensaver.so.5.0
 lib/libkscript.so.0.0
-lib/libkspell.so.4.0
+lib/libkspell.so.5.0
 lib/libktexteditor.so.0.0
+lib/libkutils.so.2.0
 lib/libshellscript.so.0.0
 lib/libvcard.so.0.0
 DYNLIBDIR(%D/lib)