Upgrade to KDE-1.1pre2 ...

4 files changed, 116 insertions, 10 deletions

diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 284289e073d8..76684678fb13 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -3,28 +3,29 @@
 # Date created:        28 October 1997
 # Whom:                Stefan Eßer <se@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1999/01/07 00:52:03 se Exp $
+# $Id: Makefile,v 1.25 1999/02/03 11:12:01 asami Exp $
 #
 
-DISTNAME=	kdelibs
-PKGNAME=	kdelibs-1.1a1
+DISTNAME=	kdelibs-1.1pre2
 CATEGORIES=	x11 kde
 MASTER_SITES=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1pre1/distribution/tar/generic/source
-EXTRACT_SUFX=	-1.1-alpha1.src.tar.bz2
+MASTER_SITE_SUBDIR= stable/1.1pre2/distribution/tar/generic/source
 
 MAINTAINER=	se@freebsd.org
 
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
-		jpeg.9:${PORTSDIR}/graphics/jpeg
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.3:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff34
 
-USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-extra-includes=${PREFIX}/include" \
 		"--x-inc=$(X11BASE)/include" \
 		"--x-lib=$(X11BASE)/lib"
-CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS)"
+CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
+USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/kdelibs11/distinfo b/x11/kdelibs11/distinfo
index 2278a386e8ed..335e4323fecf 100644
--- a/x11/kdelibs11/distinfo
+++ b/x11/kdelibs11/distinfo
@@ -1 +1 @@
-MD5 (kdelibs-1.1-alpha1.src.tar.bz2) = bdd129caa591866e8422d61048af595c
+MD5 (kdelibs-1.1pre2.tar.gz) = 64850973fbeda8f5a83d19a610c64fe1
diff --git a/x11/kdelibs11/files/patch-aa b/x11/kdelibs11/files/patch-aa
index 6b0f198bf41f..40c5a8211e4d 100644
--- a/x11/kdelibs11/files/patch-aa
+++ b/x11/kdelibs11/files/patch-aa
@@ -1,3 +1,74 @@
+*** 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
+  
 --- admin/ltconfig.orig	Mon Feb  1 19:00:27 1999
 +++ admin/ltconfig	Mon Feb  1 19:00:54 1999
 @@ -1201,7 +1201,7 @@
diff --git a/x11/kdelibs11/pkg-plist b/x11/kdelibs11/pkg-plist
index 00f33a4c10fa..d488a9211a1f 100644
--- a/x11/kdelibs11/pkg-plist
+++ b/x11/kdelibs11/pkg-plist
@@ -157,7 +157,6 @@ share/apps/kde/pics/stopsign.xpm
 share/apps/khtmlw/pics/khtmlw_dnd.xpm
 share/config/charsets
 share/config/kdebug.areas
-share/doc/HTML/default
 share/doc/HTML/en/kdelibs/kdebug.html
 share/doc/HTML/en/kfiledialog/back.gif
 share/doc/HTML/en/kfiledialog/bottom.gif
@@ -189,6 +188,8 @@ share/locale/eo/LC_MESSAGES/kde.mo
 share/locale/eo/charset
 share/locale/es/LC_MESSAGES/kde.mo
 share/locale/es/charset
+share/locale/et/LC_MESSAGES/kde.mo
+share/locale/et/charset
 share/locale/fi/LC_MESSAGES/kde.mo
 share/locale/fi/charset
 share/locale/fr/LC_MESSAGES/kde.mo
@@ -202,6 +203,7 @@ share/locale/hu/charset
 share/locale/is/LC_MESSAGES/kde.mo
 share/locale/is/charset
 share/locale/it/LC_MESSAGES/kde.mo
+share/locale/it/charset
 share/locale/ko/LC_MESSAGES/kde.mo
 share/locale/mk/LC_MESSAGES/kde.mo
 share/locale/nl/LC_MESSAGES/kde.mo
@@ -212,6 +214,7 @@ share/locale/pl/charset
 share/locale/pt/LC_MESSAGES/kde.mo
 share/locale/pt/charset
 share/locale/pt_BR/LC_MESSAGES/kde.mo
+share/locale/pt_BR/charset
 share/locale/ro/LC_MESSAGES/kde.mo
 share/locale/ro/charset
 share/locale/ru/LC_MESSAGES/kde.mo
@@ -225,14 +228,25 @@ share/locale/sv/charset
 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
+share/toolbar/add_point.xpm
+share/toolbar/airbrush.xpm
 share/toolbar/back.xpm
+share/toolbar/blend.xpm
 share/toolbar/bottom.xpm
+share/toolbar/centrejust.xpm
+share/toolbar/circle_select.xpm
 share/toolbar/configure.xpm
 share/toolbar/contents.xpm
+share/toolbar/context_help.xpm
+share/toolbar/delete.xpm
 share/toolbar/down.xpm
+share/toolbar/droplet.xpm
+share/toolbar/dropper.xpm
+share/toolbar/edit_point.xpm
 share/toolbar/editcopy.xpm
 share/toolbar/editcut.xpm
 share/toolbar/editpaste.xpm
+share/toolbar/eraser.xpm
 share/toolbar/exclamation.xpm
 share/toolbar/exit.xpm
 share/toolbar/filefloppy.xpm
@@ -241,31 +255,48 @@ share/toolbar/filenew.xpm
 share/toolbar/filenew2.xpm
 share/toolbar/fileopen.xpm
 share/toolbar/fileprint.xpm
+share/toolbar/find.xpm
 share/toolbar/finish.xpm
 share/toolbar/flag.xpm
 share/toolbar/forward.xpm
 share/toolbar/help.xpm
 share/toolbar/home.xpm
 share/toolbar/idea.xpm
+share/toolbar/knife.xpm
+share/toolbar/lassoo.xpm
+share/toolbar/leftjust.xpm
 share/toolbar/lock.xpm
+share/toolbar/move.xpm
 share/toolbar/next.xpm
 share/toolbar/openbook.xpm
 share/toolbar/page.xpm
+share/toolbar/paintbrush.xpm
 share/toolbar/paintbucket.xpm
+share/toolbar/pencil.xpm
 share/toolbar/prev.xpm
+share/toolbar/print_preview.xpm
+share/toolbar/rectangle_select.xpm
+share/toolbar/redo.xpm
 share/toolbar/reload.xpm
 share/toolbar/rightjust.xpm
+share/toolbar/search.xpm
 share/toolbar/send.xpm
+share/toolbar/smart_select.xpm
 share/toolbar/spellcheck.xpm
+share/toolbar/stamp.xpm
 share/toolbar/start.xpm
 share/toolbar/stop.xpm
+share/toolbar/text.xpm
 share/toolbar/tick.xpm
 share/toolbar/top.xpm
+share/toolbar/transform.xpm
+share/toolbar/undo.xpm
 share/toolbar/up.xpm
 share/toolbar/viewmag+.xpm
 share/toolbar/viewmag-.xpm
 share/toolbar/viewmag.xpm
 share/toolbar/viewzoom.xpm
+@exec ln -sf en %D/share/doc/HTML/default
 @exec ln -sf libjscript.so.2 %D/lib/libjscript.so
 @exec ln -sf libkab.so.2 %D/lib/libkab.so
 @exec ln -sf libkdecore.so.2 %D/lib/libkdecore.so
@@ -322,6 +353,8 @@ share/toolbar/viewzoom.xpm
 @dirrm share/locale/fr
 @dirrm share/locale/fi/LC_MESSAGES
 @dirrm share/locale/fi
+@dirrm share/locale/et/LC_MESSAGES
+@dirrm share/locale/et
 @dirrm share/locale/es/LC_MESSAGES
 @dirrm share/locale/es
 @dirrm share/locale/eo/LC_MESSAGES
@@ -360,4 +393,5 @@ share/toolbar/viewzoom.xpm
 @unexec rm -f %D/lib/libkimgio.so
 @unexec rm -f %D/lib/libkspell.so
 @unexec rm -f %D/lib/libmediatool.so
+@unexec rm -f %D/share/doc/HTML/default
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R