5 files changed, 23 insertions, 75 deletions

diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 7cbbd673a3e8..7855bf2dac22 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,13 +3,13 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.28 1999/02/28 06:06:24 obrien Exp $
+# $Id: Makefile,v 1.29 1999/02/28 21:48:09 asami Exp $
 #
 
-DISTNAME=	kdelibs-1.1
+DISTNAME=	kdelibs-1.1.1
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1/distribution/tar/generic/source/bz2
+MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
 
 MAINTAINER=	se@freebsd.org
 
@@ -27,6 +27,7 @@ CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
 		"--x-lib=$(X11BASE)/lib"
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
+CFLAGS+=	"-I$(PREFIX)/include"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/kdelibs11/distinfo b/x11/kdelibs11/distinfo
index b8a633b4d2c7..9acf717650ed 100644
--- a/x11/kdelibs11/distinfo
+++ b/x11/kdelibs11/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-1.1.tar.bz2) = c3ba5b202432222222c8e48ca142d086
+MD5 (kdelibs-1.1.1.tar.bz2) = a2f485c7cb2e53add861898f7383258a
diff --git a/x11/kdelibs11/files/patch-aa b/x11/kdelibs11/files/patch-aa
deleted file mode 100644
index a71f36e346a4..000000000000
--- a/x11/kdelibs11/files/patch-aa
+++ /dev/null
@@ -1,71 +0,0 @@
-*** configure~	Sat Dec 19 22:26:31 1998
---- configure	Mon Jan 25 20:03:24 1999
-***************
-*** 4863,4867 ****
-  ac_cpp='$CXXCPP $CPPFLAGS'
-  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
---- 4863,4867 ----
-  ac_cpp='$CXXCPP $CPPFLAGS'
-  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $all_includes $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
-***************
-*** 5237,5241 ****
-  ac_cpp='$CXXCPP $CPPFLAGS'
-  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
---- 5237,5241 ----
-  ac_cpp='$CXXCPP $CPPFLAGS'
-  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $all_includes $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
-***************
-*** 5330,5334 ****
-  ac_cpp='$CXXCPP $CPPFLAGS'
-  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
---- 5330,5334 ----
-  ac_cpp='$CXXCPP $CPPFLAGS'
-  ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $all_includes $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
-***************
-*** 5409,5414 ****
-  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-  ac_cpp='$CXXCPP $CPPFLAGS'
-! ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
---- 5409,5414 ----
-  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-  ac_cpp='$CXXCPP $CPPFLAGS'
-! ac_compile='${CXX-g++} -c $CXXFLAGS $all_includes $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $all_includes $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cxx_cross
-  
-***************
-*** 5800,5805 ****
-  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-  ac_cpp='$CPP $CPPFLAGS'
-! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cc_cross
-  
---- 5800,5805 ----
-  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-  ac_cpp='$CPP $CPPFLAGS'
-! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS $all_includes conftest.$ac_ext 1>&5'
-! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $all_includes $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-  cross_compiling=$ac_cv_prog_cc_cross
-  
diff --git a/x11/kdelibs11/files/patch-ab b/x11/kdelibs11/files/patch-ab
new file mode 100644
index 000000000000..e3ba8ec0f6d9
--- /dev/null
+++ b/x11/kdelibs11/files/patch-ab
@@ -0,0 +1,15 @@
+*** mediatool/kaudio.cpp.orig	Mon Jan 18 11:58:21 1999
+--- mediatool/kaudio.cpp	Fri Feb 19 18:49:31 1999
+***************
+*** 192,196 ****
+  void KAudio::sync()
+  {
+!   while ( StatChunk->sync_id != KeysChunk->sync_id )
+      usleep(10*1000);
+  }
+--- 192,196 ----
+  void KAudio::sync()
+  {
+!   while ( StatChunk && StatChunk->sync_id != KeysChunk->sync_id )
+      usleep(10*1000);
+  }
diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist
index b2dd80068959..d9f6c56565c2 100644
--- a/x11/kdelibs11/pkg-plist
+++ b/x11/kdelibs11/pkg-plist
@@ -227,6 +227,7 @@ share/locale/sl/LC_MESSAGES/kde.mo
 share/locale/sl/charset
 share/locale/sv/LC_MESSAGES/kde.mo
 share/locale/sv/charset
+share/locale/th/LC_MESSAGES/kde.mo
 share/locale/tr/LC_MESSAGES/kde.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/kde.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/kde.mo
@@ -317,6 +318,8 @@ share/toolbar/viewzoom.xpm
 @dirrm share/locale/zh_CN.GB2312
 @dirrm share/locale/tr/LC_MESSAGES
 @dirrm share/locale/tr
+@dirrm share/locale/th/LC_MESSAGES
+@dirrm share/locale/th
 @dirrm share/locale/sv/LC_MESSAGES
 @dirrm share/locale/sv
 @dirrm share/locale/sl/LC_MESSAGES