diff options
42 files changed, 528 insertions, 223 deletions
diff --git a/audio/arts/Makefile b/audio/arts/Makefile index 8088382c98d..812b9042bab 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/08/08 16:17:04 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/28 07:15:25 skrll Exp $ -DISTNAME= arts-1.0.2 -PKGREVISION= 1 +DISTNAME= arts-1.0.3 CATEGORIES= audio COMMENT= Analog Real-Time Synthesizer diff --git a/audio/arts/distinfo b/audio/arts/distinfo index edf07f55335..7f8440d71a1 100644 --- a/audio/arts/distinfo +++ b/audio/arts/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2002/08/25 19:21:44 jlam Exp $ +$NetBSD: distinfo,v 1.4 2002/08/28 07:15:26 skrll Exp $ -SHA1 (arts-1.0.2.tar.bz2) = ad22ce03239de351f47e317b21050edace810fce -Size (arts-1.0.2.tar.bz2) = 1017488 bytes +SHA1 (arts-1.0.3.tar.bz2) = f0ce0361c5742d647778bac835f22fa115bac355 +Size (arts-1.0.3.tar.bz2) = 1018185 bytes SHA1 (patch-aa) = 23dd79c83f7e0905cef66e002387f44c18438fed SHA1 (patch-ab) = 5b3eb01f2e66e7533c729f64ad17bfc6d560e1da SHA1 (patch-ac) = 73cc8b5398d4191dfbf817d4b2e03917ab2ba6f6 diff --git a/audio/kdemultimedia3/Makefile b/audio/kdemultimedia3/Makefile index c887d690a20..de7b26c5c9b 100644 --- a/audio/kdemultimedia3/Makefile +++ b/audio/kdemultimedia3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2002/08/01 05:48:04 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/28 07:15:26 skrll Exp $ -DISTNAME= kdemultimedia-3.0.2 +DISTNAME= kdemultimedia-3.0.3 CATEGORIES= audio COMMENT= Audio tools for the KDE integrated X11 desktop @@ -10,23 +10,17 @@ DEPENDS+= xanim>=2.80.0:../../graphics/xanim USE_BUILDLINK_ONLY= YES -#USE_CONFIG_WRAPPER= yes # $GTK_CONFIG -#CONFIGURE_ENV+= ac_cv_path_kde_artsplug_compiles="${ARTSC_CONFIG}" - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" LIBS= -Wl,--export-dynamic .endif +PTHREAD_OPT+= require + .include "../../audio/arts/buildlink.mk" .include "../../x11/kde3/buildlink.mk" .include "../../x11/kdebase3/buildlink.mk" .include "../../mk/pthread.buildlink.mk" - -.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none" -CONFIGURE_ARGS+= --disable-threading -.endif - .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo index f3893a02f75..b4546e8f341 100644 --- a/audio/kdemultimedia3/distinfo +++ b/audio/kdemultimedia3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/07/17 07:54:04 skrll Exp $ +$NetBSD: distinfo,v 1.5 2002/08/28 07:15:26 skrll Exp $ -SHA1 (kdemultimedia-3.0.2.tar.bz2) = e8b96abc3467d680b69448878713edf01245a50f -Size (kdemultimedia-3.0.2.tar.bz2) = 5790681 bytes +SHA1 (kdemultimedia-3.0.3.tar.bz2) = 72c046f2656c01c5ece06228154912382885b9b7 +Size (kdemultimedia-3.0.3.tar.bz2) = 5791102 bytes SHA1 (patch-aa) = e7b1587d8efb48c48484ca90ed9c7d8fe8d7bc94 SHA1 (patch-ab) = 85b8216b50ab22435835b07e068d326563d0e217 SHA1 (patch-ac) = ffc738496170c34c8c3ee84544ec1eeac27992ec diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 68713057119..b8b521ec622 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -1,16 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:12 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/28 07:15:27 skrll Exp $ -DISTNAME= kdegames-3.0.2 +DISTNAME= kdegames-3.0.3 CATEGORIES= games COMMENT= Games for the KDE integrated X11 desktop .include "../../x11/kde3/Makefile.kde3" USE_BUILDLINK_ONLY= YES -PTHREAD_OPTS+= require .include "../../x11/kde3/buildlink.mk" .include "../../x11/kdebase3/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/kdegames3/distinfo b/games/kdegames3/distinfo index 868297f874b..fb30099d50d 100644 --- a/games/kdegames3/distinfo +++ b/games/kdegames3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:08 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:27 skrll Exp $ -SHA1 (kdegames-3.0.2.tar.bz2) = 14ee9c7563f1934941701c42f4be67414450adc9 -Size (kdegames-3.0.2.tar.bz2) = 7240702 bytes +SHA1 (kdegames-3.0.3.tar.bz2) = fa45e6ab86f6039e109c69f98f263ae09ccf4486 +Size (kdegames-3.0.3.tar.bz2) = 7239206 bytes SHA1 (patch-aa) = c0103abe8c12e83800c09b3e87048a0bb86b365f SHA1 (patch-ab) = 68875cb7ddd517bd65a2490143b9600001c359d2 SHA1 (patch-ac) = 8fb1279b5ffc348bf2c54186f8156c9f9680c559 diff --git a/games/kdetoys3/Makefile b/games/kdetoys3/Makefile index 7b81298ad1e..61b4f4ca6ac 100644 --- a/games/kdetoys3/Makefile +++ b/games/kdetoys3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:10 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:28 skrll Exp $ -DISTNAME= kdetoys-3.0.2 +DISTNAME= kdetoys-3.0.3 CATEGORIES= games COMMENT= Toys for the KDE integrated X11 desktop diff --git a/games/kdetoys3/distinfo b/games/kdetoys3/distinfo index 047b0f9d7a2..cfc6d74d6ad 100644 --- a/games/kdetoys3/distinfo +++ b/games/kdetoys3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:10 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:28 skrll Exp $ -SHA1 (kdetoys-3.0.2.tar.bz2) = 81f5434101cb8d59bef7e7905060e370c25bb2b6 -Size (kdetoys-3.0.2.tar.bz2) = 1424491 bytes +SHA1 (kdetoys-3.0.3.tar.bz2) = eec396c240599e130d3114c717215e7d4986faf1 +Size (kdetoys-3.0.3.tar.bz2) = 1426784 bytes diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index f9aab0b71c2..58b63c14f49 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2002/08/27 12:15:22 markd Exp $ +# $NetBSD: Makefile,v 1.4 2002/08/28 07:15:28 skrll Exp $ -DISTNAME= kdegraphics-3.0.2 +DISTNAME= kdegraphics-3.0.3 CATEGORIES= graphics COMMENT= Graphics programs for the KDE integrated X11 desktop diff --git a/graphics/kdegraphics3/PLIST b/graphics/kdegraphics3/PLIST index 4d729d7fa21..b3a58464808 100644 --- a/graphics/kdegraphics3/PLIST +++ b/graphics/kdegraphics3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/27 12:15:22 markd Exp $ +@comment $NetBSD: PLIST,v 1.3 2002/08/28 07:15:28 skrll Exp $ bin/kcolorchooser bin/kcoloredit bin/kdvi @@ -48,6 +48,11 @@ lib/libkmultipage.so.0.0 lib/libkpagetest.a lib/libkpagetest.la lib/libkpagetest.so +lib/libkuickshow_main.a +lib/libkuickshow_main.la +lib/libkuickshow_main.so +lib/libkuickshow_main.so.0 +lib/libkuickshow_main.so.0.0 lib/libkview_main.a lib/libkview_main.la lib/libkview_main.so diff --git a/graphics/kdegraphics3/distinfo b/graphics/kdegraphics3/distinfo index ffb9afda06c..adb02bb702f 100644 --- a/graphics/kdegraphics3/distinfo +++ b/graphics/kdegraphics3/distinfo @@ -1,10 +1,14 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:05 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:29 skrll Exp $ -SHA1 (kdegraphics-3.0.2.tar.bz2) = 444635125cbc1a9f9b033083f8d562bdf7a293fd -Size (kdegraphics-3.0.2.tar.bz2) = 2663586 bytes +SHA1 (kdegraphics-3.0.3.tar.bz2) = 4aa7a98e4d58a2998ffeee16dd6ea97205596bd7 +Size (kdegraphics-3.0.3.tar.bz2) = 2664776 bytes SHA1 (patch-aa) = 6abaca67ea4d0fa0a5f9ac9126adb78cc15bc287 SHA1 (patch-ab) = 2797a41da3c39cca6d39369bba767728f973e245 SHA1 (patch-ac) = 64cd943b954af8f0b2b8875f56a43ec6d175f5c7 SHA1 (patch-ad) = 5aadae5dda5ec9a6f66b3cf7870967291e73922b SHA1 (patch-ae) = f9ff03ea8e1ff92126312ef28e5d5df5a17b8e57 SHA1 (patch-af) = 9dd124174938f41124b98540da3d3548ebedbb48 +SHA1 (patch-ag) = 81c4a846763534c9fe3366bf8d571208d337e2c4 +SHA1 (patch-ah) = 3a7984280e549bc0dcf05b01f80f8367747c78c9 +SHA1 (patch-ai) = 78e82154d831918f7ebe6d4a1d89b5cb208b57f1 +SHA1 (patch-aj) = 907f78831601897aa12de00f07c2978d09b72ad5 diff --git a/graphics/kdegraphics3/patches/patch-ag b/graphics/kdegraphics3/patches/patch-ag new file mode 100644 index 00000000000..6410ca5cc83 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ag @@ -0,0 +1,48 @@ +$NetBSD: patch-ag,v 1.1 2002/08/28 07:15:30 skrll Exp $ + +--- kuickshow/src/Makefile.am.orig Fri Mar 22 01:31:08 2002 ++++ kuickshow/src/Makefile.am +@@ -1,26 +1,29 @@ + ## Makefile.am for kuickshow + + bin_PROGRAMS = kuickshow +-lib_LTLIBRARIES = kuickshow.la ++lib_LTLIBRARIES = libkuickshow_main.la kuickshow.la + + # set the include path for X, qt and KDE + INCLUDES = $(all_includes) + KDE_CXXFLAGS = $(IMLIB_CFLAGS) +-CLEANFILES = dummy.cpp + METASOURCES = AUTO + +-kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) +-kuickshow_la_SOURCES = kuickshow.cpp \ ++libkuickshow_main_la_LDFLAGS = $(all_libraries) ++libkuickshow_main_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) ++libkuickshow_main_la_SOURCES = kuickshow.cpp \ + aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \ + defaultswidget.cpp imagewindow.cpp kuickdata.cpp \ + imdata.cpp basewidget.cpp \ + filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp \ + logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp + ++kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version ++kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) libkuickshow_main.la ++kuickshow_la_SOURCES = kuickshow_main.cpp ++ + # now the kuickshow binary +-kuickshow_LDADD = kuickshow.la $(LIB_KIO) $(LIB_IMLIB) +-kuickshow_SOURCES = dummy.cpp ++kuickshow_LDADD = libkuickshow_main.la $(LIB_KIO) $(LIB_IMLIB) ++kuickshow_SOURCES = kuickshow_main.cpp + kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + +@@ -36,6 +39,3 @@ KDE_ICON = kuickshow + # this is where the kdelnk file will go + appsdir = $(kde_appsdir)/Graphics + apps_DATA = kuickshow.desktop +- +-dummy.cpp: +- echo "// generated dummy file" > dummy.cpp diff --git a/graphics/kdegraphics3/patches/patch-ah b/graphics/kdegraphics3/patches/patch-ah new file mode 100644 index 00000000000..b8e664ce9df --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ah @@ -0,0 +1,280 @@ +$NetBSD: patch-ah,v 1.1 2002/08/28 07:15:30 skrll Exp $ + +--- kuickshow/src/Makefile.in.orig Tue Aug 27 21:05:03 2002 ++++ kuickshow/src/Makefile.in +@@ -238,16 +238,15 @@ x_libraries = @x_libraries@ + KDE_CXXFLAGS = $(IMLIB_CFLAGS) + + bin_PROGRAMS = kuickshow +-lib_LTLIBRARIES = kuickshow.la ++lib_LTLIBRARIES = libkuickshow_main.la kuickshow.la + + # set the include path for X, qt and KDE + INCLUDES = $(all_includes) +-CLEANFILES = dummy.cpp + #>- METASOURCES = AUTO + +-kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version +-kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) +-kuickshow_la_SOURCES = kuickshow.cpp \ ++libkuickshow_main_la_LDFLAGS = $(all_libraries) ++libkuickshow_main_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) ++libkuickshow_main_la_SOURCES = kuickshow.cpp \ + aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \ + defaultswidget.cpp imagewindow.cpp kuickdata.cpp \ + imdata.cpp basewidget.cpp \ +@@ -255,9 +254,13 @@ kuickshow_la_SOURCES = kuickshow.cpp \ + logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp + + ++kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version ++kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) libkuickshow_main.la ++kuickshow_la_SOURCES = kuickshow_main.cpp ++ + # now the kuickshow binary +-kuickshow_LDADD = kuickshow.la $(LIB_KIO) $(LIB_IMLIB) +-kuickshow_SOURCES = dummy.cpp ++kuickshow_LDADD = libkuickshow_main.la $(LIB_KIO) $(LIB_IMLIB) ++kuickshow_SOURCES = kuickshow_main.cpp + kuickshow_LDFLAGS = $(all_libraries) $(KDE_RPATH) + + # if you "make distclean", this files get removed. If you want to remove +@@ -273,31 +276,36 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + LTLIBRARIES = $(lib_LTLIBRARIES) + +-kuickshow_la_DEPENDENCIES = +-am_kuickshow_la_OBJECTS = kuickshow.lo aboutwidget.lo generalwidget.lo \ +- kuickconfigdlg.lo main.lo defaultswidget.lo imagewindow.lo \ +- kuickdata.lo imdata.lo basewidget.lo filefinder.lo \ +- kurlwidget.lo logo.lo filewidget.lo logotabdialog.lo kuickio.lo \ +- kuick.lo imlibwidget.lo ++kuickshow_la_DEPENDENCIES = libkuickshow_main.la ++am_kuickshow_la_OBJECTS = kuickshow_main.lo + #>- kuickshow_la_OBJECTS = $(am_kuickshow_la_OBJECTS) ++#>+ 1 ++kuickshow_la_OBJECTS = kuickshow_main.lo ++libkuickshow_main_la_DEPENDENCIES = ++am_libkuickshow_main_la_OBJECTS = kuickshow.lo aboutwidget.lo \ ++ generalwidget.lo kuickconfigdlg.lo main.lo defaultswidget.lo \ ++ imagewindow.lo kuickdata.lo imdata.lo basewidget.lo \ ++ filefinder.lo kurlwidget.lo logo.lo filewidget.lo \ ++ logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo ++#>- libkuickshow_main_la_OBJECTS = $(am_libkuickshow_main_la_OBJECTS) + #>+ 9 +-kuickshow_la_final_OBJECTS = kuickshow_la.all_cpp.lo +-kuickshow_la_nofinal_OBJECTS = kuickshow.lo aboutwidget.lo generalwidget.lo \ +- kuickconfigdlg.lo main.lo defaultswidget.lo imagewindow.lo \ +- kuickdata.lo imdata.lo basewidget.lo filefinder.lo \ +- kurlwidget.lo logo.lo filewidget.lo logotabdialog.lo kuickio.lo \ +- kuick.lo imlibwidget.lo \ +- kuickshow_la_meta_unload.lo +-@KDE_USE_FINAL_FALSE@kuickshow_la_OBJECTS = $(kuickshow_la_nofinal_OBJECTS) +-@KDE_USE_FINAL_TRUE@kuickshow_la_OBJECTS = $(kuickshow_la_final_OBJECTS) ++libkuickshow_main_la_final_OBJECTS = libkuickshow_main_la.all_cpp.lo ++libkuickshow_main_la_nofinal_OBJECTS = kuickshow.lo aboutwidget.lo \ ++ generalwidget.lo kuickconfigdlg.lo main.lo defaultswidget.lo \ ++ imagewindow.lo kuickdata.lo imdata.lo basewidget.lo \ ++ filefinder.lo kurlwidget.lo logo.lo filewidget.lo \ ++ logotabdialog.lo kuickio.lo kuick.lo imlibwidget.lo \ ++ libkuickshow_main_la_meta_unload.lo ++@KDE_USE_FINAL_FALSE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_nofinal_OBJECTS) ++@KDE_USE_FINAL_TRUE@libkuickshow_main_la_OBJECTS = $(libkuickshow_main_la_final_OBJECTS) + bin_PROGRAMS = kuickshow$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) + +-am_kuickshow_OBJECTS = dummy.$(OBJEXT) ++am_kuickshow_OBJECTS = kuickshow_main.$(OBJEXT) + #>- kuickshow_OBJECTS = $(am_kuickshow_OBJECTS) + #>+ 1 +-kuickshow_OBJECTS = dummy.$(OBJEXT) +-kuickshow_DEPENDENCIES = kuickshow.la ++kuickshow_OBJECTS = kuickshow_main.$(OBJEXT) ++kuickshow_DEPENDENCIES = libkuickshow_main.la + + DEFS = @DEFS@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +@@ -307,16 +315,18 @@ LIBS = @LIBS@ + depcomp = $(SHELL) $(top_srcdir)/admin/depcomp + @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/aboutwidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/basewidget.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo $(DEPDIR)/dummy.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/defaultswidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/filefinder.Plo $(DEPDIR)/filewidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/generalwidget.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/imagewindow.Plo $(DEPDIR)/imdata.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/imlibwidget.Plo $(DEPDIR)/kuick.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kuickconfigdlg.Plo \ + @AMDEP_TRUE@ $(DEPDIR)/kuickdata.Plo $(DEPDIR)/kuickio.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo $(DEPDIR)/kurlwidget.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/logo.Plo $(DEPDIR)/logotabdialog.Plo \ +- @AMDEP_TRUE@ $(DEPDIR)/main.Plo ++ @AMDEP_TRUE@ $(DEPDIR)/kuickshow.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/kuickshow_main.Po \ ++ @AMDEP_TRUE@ $(DEPDIR)/kurlwidget.Plo $(DEPDIR)/logo.Plo \ ++ @AMDEP_TRUE@ $(DEPDIR)/logotabdialog.Plo $(DEPDIR)/main.Plo + #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + #>+ 2 +@@ -336,11 +346,12 @@ CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ +-DIST_SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) ++DIST_SOURCES = $(kuickshow_la_SOURCES) $(libkuickshow_main_la_SOURCES) \ ++ $(kuickshow_SOURCES) + DATA = $(apps_DATA) + + DIST_COMMON = Makefile.am Makefile.in +-SOURCES = $(kuickshow_la_SOURCES) $(kuickshow_SOURCES) ++SOURCES = $(kuickshow_la_SOURCES) $(libkuickshow_main_la_SOURCES) $(kuickshow_SOURCES) + + #>- all: all-am + #>+ 1 +@@ -389,6 +400,8 @@ clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + kuickshow.la: $(kuickshow_la_OBJECTS) $(kuickshow_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(kuickshow_la_LDFLAGS) $(kuickshow_la_OBJECTS) $(kuickshow_la_LIBADD) $(LIBS) ++libkuickshow_main.la: $(libkuickshow_main_la_OBJECTS) $(libkuickshow_main_la_DEPENDENCIES) ++ $(CXXLINK) -rpath $(libdir) $(libkuickshow_main_la_LDFLAGS) $(libkuickshow_main_la_OBJECTS) $(libkuickshow_main_la_LIBADD) $(LIBS) + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(bindir) +@@ -426,7 +439,6 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/aboutwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/basewidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/defaultswidget.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/dummy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filefinder.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/filewidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/generalwidget.Plo@am__quote@ +@@ -438,6 +450,8 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickdata.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickio.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow_main.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kuickshow_main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/kurlwidget.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logo.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/logotabdialog.Plo@am__quote@ +@@ -517,7 +531,7 @@ distclean-tags: + + #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + #>+ 4 +-KDE_DIST=kuickshow.h kuickshow.desktop hi16-app-kuickshow.png filewidget.h imagewindow.h aboutwidget.h kuickio.h mainwidget.h mainwidget.cpp kuickconfigdlg.h logotabdialog.h kuickglobals.h basewidget.h lo32-app-kuickshow.png imdata.h logo.h kurlwidget.h imlibwidget.h version.h generalwidget.h lo16-app-kuickshow.png kuickdata.h hi32-app-kuickshow.png defaultswidget.h filefinder.h kuick.h ++KDE_DIST=kuickshow.h kuickshow.desktop kuickio.h kuickshow mainwidget.h lo32-app-kuickshow.png imdata.h mainwidget.cpp imlibwidget.h kuickconfigdlg.h version.h lo16-app-kuickshow.png logo.h logotabdialog.h generalwidget.h hi32-app-kuickshow.png kurlwidget.h kuickdata.h kuickglobals.h defaultswidget.h basewidget.h filefinder.h hi16-app-kuickshow.png filewidget.h imagewindow.h kuick.h dummy.cpp aboutwidget.h + + DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) + +@@ -566,7 +580,6 @@ install-strip: + mostlyclean-generic: + + clean-generic: +- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + + distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* +@@ -644,9 +657,6 @@ messages: + $(XGETTEXT) *.cpp *.h -o $(podir)/kuickshow.pot + + # this is where the kdelnk file will go +- +-dummy.cpp: +- echo "// generated dummy file" > dummy.cpp + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: +@@ -739,28 +749,28 @@ force-reedit: + + + #>+ 12 +-kuickshow_la_meta_unload.cpp: kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc +- @echo 'creating kuickshow_la_meta_unload.cpp' +- @-rm -f kuickshow_la_meta_unload.cpp ++libkuickshow_main_la_meta_unload.cpp: kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc ++ @echo 'creating libkuickshow_main_la_meta_unload.cpp' ++ @-rm -f libkuickshow_main_la_meta_unload.cpp + @if test ${kde_qtver} = 2; then \ +- echo 'static const char * _metalist_kuickshow_la[] = {' > kuickshow_la_meta_unload.cpp ;\ +- cat kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> kuickshow_la_meta_unload.cpp ;\ +- echo '0};' >> kuickshow_la_meta_unload.cpp ;\ +- echo '#include <kunload.h>' >> kuickshow_la_meta_unload.cpp ;\ +- echo '_UNLOAD(kuickshow_la)' >> kuickshow_la_meta_unload.cpp ;\ +- else echo > kuickshow_la_meta_unload.cpp; fi ++ echo 'static const char * _metalist_libkuickshow_main_la[] = {' > libkuickshow_main_la_meta_unload.cpp ;\ ++ cat kuickconfigdlg.moc filefinder.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc filewidget.moc kurlwidget.moc kuickio.moc imagewindow.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> libkuickshow_main_la_meta_unload.cpp ;\ ++ echo '0};' >> libkuickshow_main_la_meta_unload.cpp ;\ ++ echo '#include <kunload.h>' >> libkuickshow_main_la_meta_unload.cpp ;\ ++ echo '_UNLOAD(libkuickshow_main_la)' >> libkuickshow_main_la_meta_unload.cpp ;\ ++ else echo > libkuickshow_main_la_meta_unload.cpp; fi + + + #>+ 3 + clean-moc-classes: +- -rm -f kuickshow_la_meta_unload.cpp ++ -rm -f libkuickshow_main_la_meta_unload.cpp + + #>+ 11 +-kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp kuickshow_la_meta_unload.cpp mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc ++kuickshow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow_main.cpp mainwidget.moc filefinder.moc kuickconfigdlg.moc basewidget.moc imlibwidget.moc generalwidget.moc defaultswidget.moc aboutwidget.moc logotabdialog.moc kuickshow.moc kurlwidget.moc filewidget.moc imagewindow.moc kuickio.moc + @echo 'creating kuickshow_la.all_cpp.cpp ...'; \ + rm -f kuickshow_la.all_cpp.files kuickshow_la.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kuickshow_la.all_cpp.final; \ +- for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp kuickshow_la_meta_unload.cpp ; do \ ++ for file in kuickshow_main.cpp ; do \ + echo "#include \"$$file\"" >> kuickshow_la.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow_la.all_cpp.final; \ + done; \ +@@ -768,11 +778,23 @@ kuickshow_la.all_cpp.cpp: $(srcdir)/Make + rm -f kuickshow_la.all_cpp.final kuickshow_la.all_cpp.files + + #>+ 11 +-kuickshow.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp ++libkuickshow_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow.cpp $(srcdir)/aboutwidget.cpp $(srcdir)/generalwidget.cpp $(srcdir)/kuickconfigdlg.cpp $(srcdir)/main.cpp $(srcdir)/defaultswidget.cpp $(srcdir)/imagewindow.cpp $(srcdir)/kuickdata.cpp $(srcdir)/imdata.cpp $(srcdir)/basewidget.cpp $(srcdir)/filefinder.cpp $(srcdir)/kurlwidget.cpp $(srcdir)/logo.cpp $(srcdir)/filewidget.cpp $(srcdir)/logotabdialog.cpp $(srcdir)/kuickio.cpp $(srcdir)/kuick.cpp $(srcdir)/imlibwidget.cpp libkuickshow_main_la_meta_unload.cpp ++ @echo 'creating libkuickshow_main_la.all_cpp.cpp ...'; \ ++ rm -f libkuickshow_main_la.all_cpp.files libkuickshow_main_la.all_cpp.final; \ ++ echo "#define KDE_USE_FINAL 1" >> libkuickshow_main_la.all_cpp.final; \ ++ for file in kuickshow.cpp aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp defaultswidget.cpp imagewindow.cpp kuickdata.cpp imdata.cpp basewidget.cpp filefinder.cpp kurlwidget.cpp logo.cpp filewidget.cpp logotabdialog.cpp kuickio.cpp kuick.cpp imlibwidget.cpp libkuickshow_main_la_meta_unload.cpp ; do \ ++ echo "#include \"$$file\"" >> libkuickshow_main_la.all_cpp.files; \ ++ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkuickshow_main_la.all_cpp.final; \ ++ done; \ ++ cat libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files > libkuickshow_main_la.all_cpp.cpp; \ ++ rm -f libkuickshow_main_la.all_cpp.final libkuickshow_main_la.all_cpp.files ++ ++#>+ 11 ++kuickshow.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kuickshow_main.cpp + @echo 'creating kuickshow.all_cpp.cpp ...'; \ + rm -f kuickshow.all_cpp.files kuickshow.all_cpp.final; \ + echo "#define KDE_USE_FINAL 1" >> kuickshow.all_cpp.final; \ +- for file in dummy.cpp ; do \ ++ for file in kuickshow_main.cpp ; do \ + echo "#include \"$$file\"" >> kuickshow.all_cpp.files; \ + test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kuickshow.all_cpp.final; \ + done; \ +@@ -781,20 +803,20 @@ kuickshow.all_cpp.cpp: $(srcdir)/Makefil + + #>+ 3 + clean-final: +- -rm -f kuickshow_la.all_cpp.cpp kuickshow.all_cpp.cpp ++ -rm -f kuickshow_la.all_cpp.cpp libkuickshow_main_la.all_cpp.cpp kuickshow.all_cpp.cpp + + #>+ 2 + final: +- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_final_OBJECTS)" all-am ++ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_final_OBJECTS)" all-am + #>+ 2 + final-install: +- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_final_OBJECTS)" install-am ++ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_final_OBJECTS)" install-am + #>+ 2 + no-final: +- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_nofinal_OBJECTS)" all-am ++ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_nofinal_OBJECTS)" all-am + #>+ 2 + no-final-install: +- $(MAKE) kuickshow_la_OBJECTS="$(kuickshow_la_nofinal_OBJECTS)" install-am ++ $(MAKE) libkuickshow_main_la_OBJECTS="$(libkuickshow_main_la_nofinal_OBJECTS)" install-am + #>+ 3 + cvs-clean: + $(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean diff --git a/graphics/kdegraphics3/patches/patch-ai b/graphics/kdegraphics3/patches/patch-ai new file mode 100644 index 00000000000..4330a358ea0 --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-ai @@ -0,0 +1,15 @@ +$NetBSD: patch-ai,v 1.1 2002/08/28 07:15:31 skrll Exp $ + +--- kuickshow/src/main.cpp.orig Wed Oct 10 18:57:48 2001 ++++ kuickshow/src/main.cpp +@@ -23,7 +23,9 @@ static KCmdLineOptions options[] = + { 0, 0, 0 } + }; + +-int main(int argc, char **argv) ++extern "C" int kdemain(int argc, char **argv); ++ ++int kdemain(int argc, char **argv) + { + KAboutData about( + "kuickshow", I18N_NOOP( "KuickShow" ), KUICKSHOWVERSION, diff --git a/graphics/kdegraphics3/patches/patch-aj b/graphics/kdegraphics3/patches/patch-aj new file mode 100644 index 00000000000..ed507540dbb --- /dev/null +++ b/graphics/kdegraphics3/patches/patch-aj @@ -0,0 +1,33 @@ +$NetBSD: patch-aj,v 1.1 2002/08/28 07:15:31 skrll Exp $ + +--- kuickshow/src/kuickshow_main.cpp.orig Tue Aug 27 21:04:50 2002 ++++ kuickshow/src/kuickshow_main.cpp +@@ -0,0 +1,28 @@ ++/* ++ * ++ * Copyright (c) 2001 Nick Hudson <skrll@netbsd.org> ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this software and associated documentation files (the "Software"), to deal ++ * in the Software without restriction, including without limitation the rights ++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell ++ * copies of the Software, and to permit persons to whom the Software is ++ * furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN ++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ */ ++ ++extern "C" int kdemain(int, char* []); ++ ++int main( int argc, char* argv[] ) ++{ ++ return kdemain(argc, argv); ++} diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile index 96373e01dd3..59bb8085289 100644 --- a/misc/kdeaddons3/Makefile +++ b/misc/kdeaddons3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:08 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:32 skrll Exp $ -DISTNAME= kdeaddons-3.0.2 +DISTNAME= kdeaddons-3.0.3 CATEGORIES= misc COMMENT= Add ons for the KDE integrated X11 desktop diff --git a/misc/kdeaddons3/distinfo b/misc/kdeaddons3/distinfo index 9ca4475c4ab..f51a161ce5c 100644 --- a/misc/kdeaddons3/distinfo +++ b/misc/kdeaddons3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:08 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:33 skrll Exp $ -SHA1 (kdeaddons-3.0.2.tar.bz2) = 9548ac1f5927ae7dc313466180ba12867e484764 -Size (kdeaddons-3.0.2.tar.bz2) = 921173 bytes +SHA1 (kdeaddons-3.0.3.tar.bz2) = 116ef0e50efe219aaa5d302dbb7c42a7d801c497 +Size (kdeaddons-3.0.3.tar.bz2) = 921314 bytes diff --git a/misc/kdeadmin3/Makefile b/misc/kdeadmin3/Makefile index 3b2edccd297..985a1ff7566 100644 --- a/misc/kdeadmin3/Makefile +++ b/misc/kdeadmin3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:10 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:33 skrll Exp $ -DISTNAME= kdeadmin-3.0.2 +DISTNAME= kdeadmin-3.0.3 CATEGORIES= misc COMMENT= System administration tools for the KDE integrated X11 desktop diff --git a/misc/kdeadmin3/distinfo b/misc/kdeadmin3/distinfo index 4f81fc3723b..4397b421599 100644 --- a/misc/kdeadmin3/distinfo +++ b/misc/kdeadmin3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:10 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:34 skrll Exp $ -SHA1 (kdeadmin-3.0.2.tar.bz2) = b40f597b95ba5475e66512e51a18ff91b8a5cbd1 -Size (kdeadmin-3.0.2.tar.bz2) = 1268257 bytes +SHA1 (kdeadmin-3.0.3.tar.bz2) = d30e1477eca4cb3fda66671f8b629e08ff20d721 +Size (kdeadmin-3.0.3.tar.bz2) = 1267652 bytes diff --git a/misc/kdeartwork3/Makefile b/misc/kdeartwork3/Makefile index 7e0a245af41..b3644aa4b75 100644 --- a/misc/kdeartwork3/Makefile +++ b/misc/kdeartwork3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:05 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:34 skrll Exp $ -DISTNAME= kdeartwork-3.0.2 +DISTNAME= kdeartwork-3.0.3 CATEGORIES= misc COMMENT= Artwork for the KDE integrated X11 desktop diff --git a/misc/kdeartwork3/distinfo b/misc/kdeartwork3/distinfo index 377cac189ed..034d4948c14 100644 --- a/misc/kdeartwork3/distinfo +++ b/misc/kdeartwork3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:06 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:35 skrll Exp $ -SHA1 (kdeartwork-3.0.2.tar.bz2) = aa2dec463514e35042f717bff373426c33a1b566 -Size (kdeartwork-3.0.2.tar.bz2) = 10909502 bytes +SHA1 (kdeartwork-3.0.3.tar.bz2) = 24c02e8e20624585da435a3d7cc5ecb0ea1a8715 +Size (kdeartwork-3.0.3.tar.bz2) = 10910264 bytes diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index 47287e41acd..2555da65274 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:09 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:35 skrll Exp $ -DISTNAME= kdeedu-3.0.2 +DISTNAME= kdeedu-3.0.3 CATEGORIES= misc COMMENT= Edu{tainment,cation} tools for the KDE integrated X11 desktop diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo index 495203894c5..de3202293b8 100644 --- a/misc/kdeedu3/distinfo +++ b/misc/kdeedu3/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:09 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:35 skrll Exp $ -SHA1 (kdeedu-3.0.2.tar.bz2) = d2a2220d228d78b4ee1c03f28ca278fecfe16e93 -Size (kdeedu-3.0.2.tar.bz2) = 9103594 bytes +SHA1 (kdeedu-3.0.3.tar.bz2) = 022cffa337ecf3727be6d72bff6951d89a4048fb +Size (kdeedu-3.0.3.tar.bz2) = 9102900 bytes SHA1 (patch-aa) = ee916dc502be8b66c3d0a95e3cdec8f787284b9c SHA1 (patch-ab) = 38336518e06cd7eb1c48c4a4dbc0667d82858bdf diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index d2fded8ed6f..3f38568c34f 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:11 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:36 skrll Exp $ -DISTNAME= kdepim-3.0.2 +DISTNAME= kdepim-3.0.3 CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop diff --git a/misc/kdepim3/PLIST b/misc/kdepim3/PLIST index ccfcdba178d..aa3bfd3a050 100644 --- a/misc/kdepim3/PLIST +++ b/misc/kdepim3/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:31:29 skrll Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/08/28 07:15:36 skrll Exp $ bin/ical2vcal bin/kabcfrontend bin/kalarm +bin/kalarmautostart bin/kalarmd bin/kandy bin/kandy_client diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo index ed5a0d7c28d..5213c6d9242 100644 --- a/misc/kdepim3/distinfo +++ b/misc/kdepim3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:11 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:36 skrll Exp $ -SHA1 (kdepim-3.0.2.tar.bz2) = 505b4ce233675c9dac947a6b289f10a0df1d5520 -Size (kdepim-3.0.2.tar.bz2) = 3150699 bytes +SHA1 (kdepim-3.0.3.tar.bz2) = feeb8f6b3e1d07e68c461735b9c667e542f52ef5 +Size (kdepim-3.0.3.tar.bz2) = 3155568 bytes diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index d7e11e68705..2b9332a0823 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2002/07/17 07:54:06 skrll Exp $ +# $NetBSD: Makefile,v 1.3 2002/08/28 07:15:37 skrll Exp $ -DISTNAME= kdeutils-3.0.2 +DISTNAME= kdeutils-3.0.3 COMMENT= Utilities for the KDE integrated X11 desktop .include "../../x11/kde3/Makefile.kde3" diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo index af7d83b3f5b..9711ef5144b 100644 --- a/misc/kdeutils3/distinfo +++ b/misc/kdeutils3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2002/07/17 07:54:06 skrll Exp $ +$NetBSD: distinfo,v 1.4 2002/08/28 07:15:37 skrll Exp $ -SHA1 (kdeutils-3.0.2.tar.bz2) = 0245b0db7aae1df723ac7c151ed162fb543b2c3c -Size (kdeutils-3.0.2.tar.bz2) = 1514616 bytes +SHA1 (kdeutils-3.0.3.tar.bz2) = 5fccce1430fc4203a03feed4e9851ba0b01cb293 +Size (kdeutils-3.0.3.tar.bz2) = 1515313 bytes SHA1 (patch-aa) = ac87861b38a93564e79e57cf5c8dc0de7f8c720a SHA1 (patch-ab) = 96c698f05666f61aa653528688535cdb33221842 SHA1 (patch-ac) = bb2f28bb4bc5d84d19ebf3a1d19aa5e7d21f61d3 diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index e5b5d3dbdc4..086a932b4a3 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2002/08/01 05:48:19 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2002/08/28 07:15:37 skrll Exp $ -DISTNAME= kdenetwork-3.0.2 +DISTNAME= kdenetwork-3.0.3 CATEGORIES= net COMMENT= Network modules for the KDE integrated X11 desktop diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index d396cf428c1..d51135a1a54 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2002/07/17 07:54:09 skrll Exp $ +$NetBSD: distinfo,v 1.3 2002/08/28 07:15:38 skrll Exp $ -SHA1 (kdenetwork-3.0.2.tar.bz2) = 39c05477c2e01aed9ed885aac8ff7c2301c16162 -Size (kdenetwork-3.0.2.tar.bz2) = 3865257 bytes +SHA1 (kdenetwork-3.0.3.tar.bz2) = ba91977beb8a99a14a5939091d9b2b77448ff7f9 +Size (kdenetwork-3.0.3.tar.bz2) = 3865560 bytes SHA1 (patch-aa) = c196d5ed0bff6ba1786c68d0b7735b63b04362b9 SHA1 (patch-ab) = a1e962fe17b16aa2d1304cc2ba327b294b5d2f7a SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855 diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile index f696763ee2d..e1292912755 100644 --- a/x11/kde3/Makefile +++ b/x11/kde3/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:33 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/28 07:15:38 skrll Exp $ -DISTNAME= kde-3.0.2 +DISTNAME= kde-3.0.3 CATEGORIES= x11 kde MASTER_SITES= # empty DISTFILES= # empty @@ -9,17 +9,17 @@ MAINTAINER= skrll@netbsd.org HOMEPAGE= http://www.kde.org/ COMMENT= "meta-package" for the KDE integrated X11 desktop -DEPENDS+= kdeartwork-3.0.2:../../misc/kdeartwork3 -DEPENDS+= kdeaddons-3.0.2:../../misc/kdeaddons3 -DEPENDS+= kdeadmin-3.0.2:../../misc/kdeadmin3 -DEPENDS+= kdeedu-3.0.2:../../misc/kdeedu3 -DEPENDS+= kdegames-3.0.2:../../games/kdegames3 -DEPENDS+= kdegraphics-3.0.2:../../graphics/kdegraphics3 -DEPENDS+= kdemultimedia-3.0.2:../../audio/kdemultimedia3 -DEPENDS+= kdenetwork-3.0.2:../../net/kdenetwork3 -DEPENDS+= kdepim-3.0.2:../../misc/kdepim3 -DEPENDS+= kdetoys-3.0.2:../../games/kdetoys3 -DEPENDS+= kdeutils-3.0.2:../../misc/kdeutils3 +DEPENDS+= kdeartwork-3.0.3:../../misc/kdeartwork3 +DEPENDS+= kdeaddons-3.0.3:../../misc/kdeaddons3 +DEPENDS+= kdeadmin-3.0.3:../../misc/kdeadmin3 +DEPENDS+= kdeedu-3.0.3:../../misc/kdeedu3 +DEPENDS+= kdegames-3.0.3:../../games/kdegames3 +DEPENDS+= kdegraphics-3.0.3:../../graphics/kdegraphics3 +DEPENDS+= kdemultimedia-3.0.3:../../audio/kdemultimedia3 +DEPENDS+= kdenetwork-3.0.3:../../net/kdenetwork3 +DEPENDS+= kdepim-3.0.3:../../misc/kdepim3 +DEPENDS+= kdetoys-3.0.3:../../games/kdetoys3 +DEPENDS+= kdeutils-3.0.3:../../misc/kdeutils3 EXTRACT_ONLY= # empty USE_X11BASE= yes diff --git a/x11/kde3/Makefile.kde3 b/x11/kde3/Makefile.kde3 index e76256a0592..3818f54a924 100644 --- a/x11/kde3/Makefile.kde3 +++ b/x11/kde3/Makefile.kde3 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.kde3,v 1.3 2002/08/25 19:23:33 jlam Exp $ +# $NetBSD: Makefile.kde3,v 1.4 2002/08/28 07:15:39 skrll Exp $ # # This Makefile fragment is included at the top of package Makefiles for # KDE3-distributed packages (they all share common configure and build # settings). CATEGORIES+= kde -_KDE_VERSION= 3.0.2 +_KDE_VERSION= 3.0.3 MASTER_SITES?= ftp://ftp.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \ ftp://ftp.us.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ \ ftp://ftp.de.kde.org/pub/kde/stable/${_KDE_VERSION}/src/ diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 12dc59b48af..3ce480be588 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2002/08/25 19:23:34 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2002/08/28 07:15:39 skrll Exp $ -DISTNAME= kdebase-3.0.2 -PKGREVISION= 2 +DISTNAME= kdebase-3.0.3 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index df57bc874be..6b0815c02be 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2002/08/25 19:23:34 jlam Exp $ +@comment $NetBSD: PLIST,v 1.6 2002/08/28 07:15:40 skrll Exp $ bin/appletproxy bin/chooser bin/conttest @@ -2698,7 +2698,6 @@ share/kde/services/searchproviders/msdn.desktop share/kde/services/searchproviders/nl-teletekst.desktop share/kde/services/searchproviders/php.desktop share/kde/services/searchproviders/python.desktop -share/kde/services/searchproviders/realnames.desktop share/kde/services/searchproviders/rfc.desktop share/kde/services/searchproviders/rpmfind.desktop share/kde/services/searchproviders/ruby_application_archive.desktop diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 0a6cc699475..38193101ad1 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2002/08/25 19:23:35 jlam Exp $ +$NetBSD: distinfo,v 1.9 2002/08/28 07:15:41 skrll Exp $ -SHA1 (kdebase-3.0.2.tar.bz2) = 763af0ddce718789fae3dfe2b67036dbc2d01a02 -Size (kdebase-3.0.2.tar.bz2) = 13115043 bytes +SHA1 (kdebase-3.0.3.tar.bz2) = 075eaa470e8927fec676613080cd7944c8f7f31f +Size (kdebase-3.0.3.tar.bz2) = 13112153 bytes SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d Size (Daemon.png) = 15725 bytes SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b @@ -76,8 +76,8 @@ SHA1 (patch-co) = 7640d199e0391afe6aa9b0d917b88dfd4a213090 SHA1 (patch-cp) = 0624d4a11fdd617309dcb711d9beabb6d7d78b36 SHA1 (patch-cq) = f0c6b4323601a1a4906feefd1e1588b6d0b9a01f SHA1 (patch-cr) = ebbd1bafaf17691084ef835ef2f08866c6815924 -SHA1 (patch-cs) = 055cb75aa6b25f6593d947d760f47b63e953af77 -SHA1 (patch-ct) = fb62a0ddffbc46dd78f6fde2d4d9c05447b71ce0 +SHA1 (patch-cs) = ddbeb2f6cb81cd01685a163cf05941f6e83c2a64 +SHA1 (patch-ct) = 22001fb43fe1eac960460549fe4a4ebf8298cf1d SHA1 (patch-cu) = 470db728e7853edefda9731fac174bf04c7fd5aa SHA1 (patch-cv) = 52611f6a834fe7eb92e80dfd41b89b0b0d871cbf SHA1 (patch-cw) = 79703f08c6f5c1690fe23b94b26ebb8c6908b29f diff --git a/x11/kdebase3/patches/patch-cs b/x11/kdebase3/patches/patch-cs index 530f876c0d0..f96099d0d5b 100644 --- a/x11/kdebase3/patches/patch-cs +++ b/x11/kdebase3/patches/patch-cs @@ -1,8 +1,8 @@ -$NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $ +$NetBSD: patch-cs,v 1.3 2002/08/28 07:15:41 skrll Exp $ ---- konsole/konsole/Makefile.am.orig Wed May 8 19:22:37 2002 +--- konsole/konsole/Makefile.am.orig Mon Aug 5 15:56:24 2002 +++ konsole/konsole/Makefile.am -@@ -12,7 +12,8 @@ +@@ -12,7 +12,8 @@ INCLUDES = $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole @@ -12,8 +12,8 @@ $NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $ # libkonsolepart is a part, but konsole.la links directly to it, so we can't # install it under kde_module -@@ -32,24 +33,34 @@ - libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @XTESTLIB@ +@@ -32,24 +33,32 @@ libkonsolepart_la_LDFLAGS = $(all_librar + libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS) # kwrited kdeinit module -kwrited_la_SOURCES = kwrited.cpp @@ -45,18 +45,14 @@ $NetBSD: patch-cs,v 1.2 2002/08/25 19:23:43 jlam Exp $ konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version # konsole executable - has all the sources, doesn't link kparts, saves startup time --konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ -- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ + konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ + TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ - konsole_wcwidth.cpp -+konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \ -+ session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \ -+ TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ -+ konsole_wcwidth.cpp konsole_main.cpp -+ - konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ ++ konsole_wcwidth.cpp konsole_main.cpp + konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI) konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -91,9 +102,6 @@ +@@ -91,9 +100,6 @@ messages: rc.cpp $(XGETTEXT) rc.cpp *.cpp -o $(podir)/konsole.pot rm -f schemas.cpp rm -f tips.cpp diff --git a/x11/kdebase3/patches/patch-ct b/x11/kdebase3/patches/patch-ct index 6b295534604..eb0d7397210 100644 --- a/x11/kdebase3/patches/patch-ct +++ b/x11/kdebase3/patches/patch-ct @@ -1,8 +1,8 @@ -$NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ +$NetBSD: patch-ct,v 1.3 2002/08/28 07:15:42 skrll Exp $ ---- konsole/konsole/Makefile.in.orig Mon May 13 23:57:52 2002 +--- konsole/konsole/Makefile.in.orig Wed Aug 7 18:19:54 2002 +++ konsole/konsole/Makefile.in -@@ -304,7 +304,9 @@ +@@ -304,7 +304,9 @@ INCLUDES = $(all_includes) # you can add here more. This one gets installed bin_PROGRAMS = konsole konsole_grantpty kwrited #kcmkonsole @@ -13,8 +13,8 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ # libkonsolepart is a part, but konsole.la links directly to it, so we can't # install it under kde_module -@@ -337,28 +339,39 @@ - libkonsolepart_la_LIBADD = $(LIB_KPARTS) $(LIBUTIL) @XTESTLIB@ +@@ -337,18 +339,26 @@ libkonsolepart_la_LDFLAGS = $(all_librar + libkonsolepart_la_LIBADD = $(LIBUTIL) @XTESTLIB@ $(LIB_KPARTS) # kwrited kdeinit module -kwrited_la_SOURCES = kwrited.cpp @@ -46,27 +46,16 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ konsole_la_LDFLAGS = $(all_libraries) -module -avoid-version # konsole executable - has all the sources, doesn't link kparts, saves startup time --#>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ --#>- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ --#>- konsole_wcwidth.cpp --#>+ 3 --konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ -- TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ +@@ -358,7 +368,7 @@ konsole_la_LDFLAGS = $(all_libraries) -m + #>+ 3 + konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp session.cpp TEWidget.cpp TEmuVt102.cpp \ + TEScreen.cpp TEmulation.cpp TEHistory.cpp keytrans.cpp \ - konsole_wcwidth.cpp konsoleiface_skel.cpp sessioniface_skel.cpp -+#>- konsole_SOURCES = TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \ -+#>- session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \ -+#>- TEHistory.cpp keytrans.cpp konsoleiface.skel sessioniface.skel \ -+#>- konsole_wcwidth.cpp konsole_main.cpp -+#>+ 4 -+konsole_SOURCES=TEPty.cpp BlockArray.cpp main.cpp konsole.cpp schema.cpp \ -+ session.cpp TEWidget.cpp TEmuVt102.cpp TEScreen.cpp TEmulation.cpp \ -+ TEHistory.cpp keytrans.cpp \ + konsole_wcwidth.cpp konsole_main.cpp konsoleiface_skel.cpp sessioniface_skel.cpp -+ - konsole_LDADD = $(LIB_KDEUI) $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ + konsole_LDADD = $(LIB_KSYCOCA) $(LIBUTIL) $(LIB_KFILE) @XTESTLIB@ $(LIB_KDEUI) konsole_LDFLAGS = $(all_libraries) $(KDE_RPATH) -@@ -392,24 +405,25 @@ +@@ -392,24 +402,25 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(lib_LTLIBRARIES) @@ -107,7 +96,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ libkonsolepart_la_DEPENDENCIES = am_libkonsolepart_la_OBJECTS = TEPty.lo BlockArray.lo konsole_part.lo \ schema.lo session.lo TEWidget.lo TEmuVt102.lo TEScreen.lo \ -@@ -423,6 +437,15 @@ +@@ -423,6 +434,15 @@ libkonsolepart_la_nofinal_OBJECTS = TEPt libkonsolepart_la_meta_unload.lo @KDE_USE_FINAL_FALSE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@libkonsolepart_la_OBJECTS = $(libkonsolepart_la_final_OBJECTS) @@ -123,7 +112,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ bin_PROGRAMS = konsole$(EXEEXT) konsole_grantpty$(EXEEXT) \ kwrited$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -@@ -431,7 +454,7 @@ +@@ -431,7 +451,7 @@ am_konsole_OBJECTS = TEPty.$(OBJEXT) Blo konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ @@ -132,7 +121,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ #>- konsole_OBJECTS = $(am_konsole_OBJECTS) #>+ 9 konsole_final_OBJECTS = konsole.all_cpp.o -@@ -439,7 +462,7 @@ +@@ -439,7 +459,7 @@ konsole_nofinal_OBJECTS = TEPty.$(OBJEXT konsole.$(OBJEXT) schema.$(OBJEXT) session.$(OBJEXT) \ TEWidget.$(OBJEXT) TEmuVt102.$(OBJEXT) TEScreen.$(OBJEXT) \ TEmulation.$(OBJEXT) TEHistory.$(OBJEXT) keytrans.$(OBJEXT) \ @@ -141,7 +130,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ konsole_meta_unload.o @KDE_USE_FINAL_FALSE@konsole_OBJECTS = $(konsole_nofinal_OBJECTS) @KDE_USE_FINAL_TRUE@konsole_OBJECTS = $(konsole_final_OBJECTS) -@@ -450,11 +473,11 @@ +@@ -450,11 +470,11 @@ am_konsole_grantpty_OBJECTS = konsole_gr konsole_grantpty_OBJECTS = konsole_grantpty.$(OBJEXT) konsole_grantpty_LDADD = $(LDADD) konsole_grantpty_DEPENDENCIES = @@ -156,7 +145,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ DEFS = @DEFS@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -469,15 +492,19 @@ +@@ -469,15 +489,19 @@ depcomp = $(SHELL) $(top_srcdir)/admin/d @AMDEP_TRUE@ $(DEPDIR)/TEWidget.Plo $(DEPDIR)/TEWidget.Po \ @AMDEP_TRUE@ $(DEPDIR)/TEmuVt102.Plo $(DEPDIR)/TEmuVt102.Po \ @AMDEP_TRUE@ $(DEPDIR)/TEmulation.Plo $(DEPDIR)/TEmulation.Po \ @@ -182,7 +171,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ -@@ -506,14 +533,15 @@ +@@ -506,14 +530,15 @@ CXXLINK = $(LIBTOOL) --mode=link --tag=C $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXFLAGS = @CXXFLAGS@ DIST_SOURCES = $(konsole_la_SOURCES) $(kwrited_la_SOURCES) \ @@ -200,7 +189,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ #>- all: all-am #>+ 1 -@@ -564,11 +592,15 @@ +@@ -564,11 +589,15 @@ konsole.la: $(konsole_la_OBJECTS) $(kons $(CXXLINK) -rpath $(libdir) $(konsole_la_LDFLAGS) $(konsole_la_OBJECTS) $(konsole_la_LIBADD) $(LIBS) kwrited.la: $(kwrited_la_OBJECTS) $(kwrited_la_DEPENDENCIES) $(CXXLINK) -rpath $(libdir) $(kwrited_la_LDFLAGS) $(kwrited_la_OBJECTS) $(kwrited_la_LIBADD) $(LIBS) @@ -216,7 +205,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) -@@ -623,16 +655,19 @@ +@@ -623,16 +652,19 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmuVt102.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/TEmulation.Po@am__quote@ @@ -237,7 +226,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/schema.Plo@am__quote@ -@@ -750,7 +785,7 @@ +@@ -750,7 +782,7 @@ distclean-tags: #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 @@ -246,7 +235,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) -@@ -892,9 +927,6 @@ +@@ -892,9 +924,6 @@ messages: rc.cpp rm -f schemas.cpp rm -f tips.cpp @@ -256,7 +245,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ konsole.lo: konsole.o # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. -@@ -978,29 +1010,16 @@ +@@ -978,29 +1007,16 @@ force-reedit: #>+ 12 @@ -295,7 +284,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ #>+ 12 -@@ -1017,6 +1036,19 @@ +@@ -1017,6 +1033,19 @@ libkonsolepart_la_meta_unload.cpp: TEmu #>+ 12 @@ -315,7 +304,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ konsole_meta_unload.cpp: TEmulation.moc TEWidget.moc TEPty.moc konsole.moc session.moc TEmuVt102.moc @echo 'creating konsole_meta_unload.cpp' @-rm -f konsole_meta_unload.cpp -@@ -1031,14 +1063,14 @@ +@@ -1031,14 +1060,14 @@ konsole_meta_unload.cpp: TEmulation.moc #>+ 3 clean-moc-classes: @@ -333,7 +322,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ echo "#include \"$$file\"" >> konsole_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole_la.all_cpp.final; \ done; \ -@@ -1046,11 +1078,11 @@ +@@ -1046,11 +1075,11 @@ konsole_la.all_cpp.cpp: $(srcdir)/Makefi rm -f konsole_la.all_cpp.final konsole_la.all_cpp.files #>+ 11 @@ -347,7 +336,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ echo "#include \"$$file\"" >> kwrited_la.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited_la.all_cpp.final; \ done; \ -@@ -1058,6 +1090,18 @@ +@@ -1058,6 +1087,18 @@ kwrited_la.all_cpp.cpp: $(srcdir)/Makefi rm -f kwrited_la.all_cpp.final kwrited_la.all_cpp.files #>+ 11 @@ -366,7 +355,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ libkonsolepart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/TEPty.cpp $(srcdir)/BlockArray.cpp $(srcdir)/konsole_part.cpp $(srcdir)/schema.cpp $(srcdir)/session.cpp $(srcdir)/TEWidget.cpp $(srcdir)/TEmuVt102.cpp $(srcdir)/TEScreen.cpp $(srcdir)/konsole_wcwidth.cpp $(srcdir)/TEmulation.cpp $(srcdir)/TEHistory.cpp $(srcdir)/keytrans.cpp konsoleiface_skel.cpp sessioniface_skel.cpp libkonsolepart_la_meta_unload.cpp @echo 'creating libkonsolepart_la.all_cpp.cpp ...'; \ rm -f libkonsolepart_la.all_cpp.files libkonsolepart_la.all_cpp.final; \ -@@ -1070,11 +1114,23 @@ +@@ -1070,11 +1111,23 @@ libkonsolepart_la.all_cpp.cpp: $(srcdir) rm -f libkonsolepart_la.all_cpp.final libkonsolepart_la.all_cpp.files #>+ 11 @@ -392,7 +381,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ echo "#include \"$$file\"" >> konsole.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> konsole.all_cpp.final; \ done; \ -@@ -1082,11 +1138,11 @@ +@@ -1082,11 +1135,11 @@ konsole.all_cpp.cpp: $(srcdir)/Makefile. rm -f konsole.all_cpp.final konsole.all_cpp.files #>+ 11 @@ -406,7 +395,7 @@ $NetBSD: patch-ct,v 1.2 2002/08/25 19:23:43 jlam Exp $ echo "#include \"$$file\"" >> kwrited.all_cpp.files; \ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kwrited.all_cpp.final; \ done; \ -@@ -1095,20 +1151,20 @@ +@@ -1095,20 +1148,20 @@ kwrited.all_cpp.cpp: $(srcdir)/Makefile. #>+ 3 clean-final: diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 196df2e4175..abde3f97a85 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2002/08/25 19:23:49 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/08/28 07:15:43 skrll Exp $ -DISTNAME= kdelibs-3.0.2 -PKGREVISION= 1 +DISTNAME= kdelibs-3.0.3 CATEGORIES= x11 COMMENT= Support libraries for the KDE integrated X11 desktop diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 59222fb92e4..a655b48508e 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2002/08/25 19:23:50 jlam Exp $ +$NetBSD: distinfo,v 1.7 2002/08/28 07:15:43 skrll Exp $ -SHA1 (kdelibs-3.0.2.tar.bz2) = 6985e289b22a728045f829cb52412270f03b10cf -Size (kdelibs-3.0.2.tar.bz2) = 7612798 bytes +SHA1 (kdelibs-3.0.3.tar.bz2) = 54284f898a9f16eb0a0f14988308f20ce32d1d2c +Size (kdelibs-3.0.3.tar.bz2) = 7623931 bytes SHA1 (patch-aa) = dc26c7d5f845e881d313745b25ef9e90ead5707f SHA1 (patch-ab) = d4f9efbd17df2ee9a5e6cbd1830e343f1b0a8abe SHA1 (patch-ac) = 491ef6e556b7ce55e9c92b2dd641e20f9c94912e @@ -31,8 +31,8 @@ SHA1 (patch-az) = a22457bc50360ae45c202469b6bb279ace249c61 SHA1 (patch-ba) = d834df468158dee2c4787e0602583d5019708197 SHA1 (patch-bb) = 523ddde2389cc19b48a2216b78fabb5dbe1d01b6 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea -SHA1 (patch-bd) = 3743da1e39eb09010afedc262612b8b280524088 -SHA1 (patch-be) = ac3f6b0a807e962440be86913579a6ecbcdc1fec +SHA1 (patch-bd) = 53f6f18a93296b05f3a7f51152b37ba98c93ff2c +SHA1 (patch-be) = 55db94a53b4a5ef10b3294b468c2844a84926d5b SHA1 (patch-bf) = 05280cdb86c11ccbe880721364598ca1a8a24ea6 SHA1 (patch-bg) = 317baf5edff5e9489c8c38b58a6948cfcfc736f7 SHA1 (patch-bh) = 92ac4dd4d340a0dd962d577300895511ea439029 @@ -53,5 +53,4 @@ SHA1 (patch-bv) = b25498d7705b1c9fae59dbe3ef68dd8bb5145419 SHA1 (patch-bw) = 246c7123c8ec52944bd99cab1ec8b1226435f5e0 SHA1 (patch-bx) = bdb54c677c9e21ecf0a67b617e17f26f5fd40019 SHA1 (patch-by) = b3eec86ae3ffbf5a17fa808c973f0968e6c680e6 -SHA1 (patch-bz) = a1c226f880b66f6e126a9021fd866a6532594cdd SHA1 (patch-ca) = ee31a9cfe62d9dd4f269bf95f2721bfb289d5d51 diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd index 1d821ad78eb..2bd59e82d1e 100644 --- a/x11/kdelibs3/patches/patch-bd +++ b/x11/kdelibs3/patches/patch-bd @@ -1,16 +1,8 @@ -$NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ +$NetBSD: patch-bd,v 1.4 2002/08/28 07:15:44 skrll Exp $ ---- kio/kssl/kopenssl.cc.orig Wed Aug 14 15:37:35 2002 +--- kio/kssl/kopenssl.cc.orig Mon Aug 12 19:33:58 2002 +++ kio/kssl/kopenssl.cc -@@ -105,6 +105,7 @@ static int (*K_SSL_CTX_use_certificate) - static int (*K_SSL_get_error) (SSL*, int) = NULL; - static STACK_OF(X509)* (*K_SSL_get_peer_cert_chain) (SSL*) = NULL; - static void (*K_X509_STORE_CTX_set_chain) (X509_STORE_CTX *, STACK_OF(X509)*) = NULL; -+static void (*K_X509_STORE_CTX_set_purpose) (X509_STORE_CTX *, int) = NULL; - static void (*K_sk_free) (STACK*) = NULL; - static int (*K_sk_num) (STACK*) = NULL; - static char* (*K_sk_pop) (STACK*) = NULL; -@@ -173,7 +174,7 @@ void KOpenSSLProxy::destroy() { +@@ -174,7 +174,7 @@ void KOpenSSLProxy::destroy() { _me = NULL; } @@ -19,7 +11,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ #include <qdir.h> #include <qstring.h> #include <qstringlist.h> -@@ -236,26 +237,22 @@ KConfig *cfg; +@@ -237,26 +237,22 @@ KConfig *cfg; delete cfg; @@ -51,7 +43,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ // FIXME: #define here for the various OS types to optimize libnamess #ifdef hpux -@@ -284,10 +281,16 @@ KConfig *cfg; +@@ -285,10 +281,16 @@ KConfig *cfg; << "libcrypto.so.0.9.6" #endif ; @@ -68,7 +60,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ for (QStringList::Iterator shit = libnamesc.begin(); shit != libnamesc.end(); ++shit) { -@@ -299,9 +302,9 @@ KConfig *cfg; +@@ -300,9 +302,9 @@ KConfig *cfg; _cryptoLib = ll->globalLibrary(alib.latin1()); if (_cryptoLib) break; } @@ -79,15 +71,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ if (_cryptoLib) { #ifdef HAVE_SSL -@@ -348,6 +351,7 @@ KConfig *cfg; - K_X509_REQ_free = (void (*)(X509_REQ*)) _cryptoLib->symbol("X509_REQ_free"); - K_X509_REQ_new = (X509_REQ* (*)()) _cryptoLib->symbol("X509_REQ_new"); - K_X509_STORE_CTX_set_chain = (void (*)(X509_STORE_CTX *, STACK_OF(X509)*)) _cryptoLib->symbol("X509_STORE_CTX_set_chain"); -+ K_X509_STORE_CTX_set_purpose = (void (*)(X509_STORE_CTX *, int)) _cryptoLib->symbol("X509_STORE_CTX_set_purpose"); - K_sk_free = (void (*) (STACK *)) _cryptoLib->symbol("sk_free"); - K_sk_num = (int (*) (STACK *)) _cryptoLib->symbol("sk_num"); - K_sk_pop = (char* (*) (STACK *)) _cryptoLib->symbol("sk_pop"); -@@ -399,16 +403,14 @@ KConfig *cfg; +@@ -401,16 +403,14 @@ KConfig *cfg; #endif } @@ -109,7 +93,7 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ for (QStringList::Iterator shit = libnamess.begin(); shit != libnamess.end(); ++shit) { -@@ -420,9 +422,9 @@ KConfig *cfg; +@@ -422,9 +422,9 @@ KConfig *cfg; _sslLib = ll->globalLibrary(alib.latin1()); if (_sslLib) break; } @@ -120,14 +104,3 @@ $NetBSD: patch-bd,v 1.3 2002/08/25 19:23:53 jlam Exp $ if (_sslLib) { #ifdef HAVE_SSL -@@ -930,6 +932,10 @@ char *KOpenSSLProxy::sk_value(STACK *s, - - void KOpenSSLProxy::X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x) { - if (K_X509_STORE_CTX_set_chain) (K_X509_STORE_CTX_set_chain)(v,x); -+} -+ -+void KOpenSSLProxy::X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose) { -+ if (K_X509_STORE_CTX_set_purpose) (K_X509_STORE_CTX_set_purpose)(v,purpose); - } - - diff --git a/x11/kdelibs3/patches/patch-be b/x11/kdelibs3/patches/patch-be index 0f7d74a122e..a2318bf1181 100644 --- a/x11/kdelibs3/patches/patch-be +++ b/x11/kdelibs3/patches/patch-be @@ -1,4 +1,4 @@ -$NetBSD: patch-be,v 1.3 2002/08/25 19:23:54 jlam Exp $ +$NetBSD: patch-be,v 1.4 2002/08/28 07:15:44 skrll Exp $ --- kio/kssl/ksslcertificate.cc.orig Wed Aug 14 15:48:38 2002 +++ kio/kssl/ksslcertificate.cc @@ -20,14 +20,3 @@ $NetBSD: patch-be,v 1.3 2002/08/25 19:23:54 jlam Exp $ #ifdef HAVE_SSL d->m_cert = NULL; setCert(KOSSL::self()->X509_dup(const_cast<KSSLCertificate&>(x).getCert())); -@@ -541,9 +541,8 @@ KSSLCertificate::KSSLValidation KSSLCert - - //kdDebug(7029) << "KSSL setting CRL.............." << endl; - // int X509_STORE_add_crl(X509_STORE *ctx, X509_CRL *x); -- // - -- // int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose); -+ d->kossl->X509_STORE_CTX_set_purpose(certStoreCTX, X509_PURPOSE_SSL_SERVER); - - //kdDebug(7029) << "KSSL verifying.............." << endl; - certStoreCTX->error = X509_V_OK; diff --git a/x11/kdelibs3/patches/patch-bz b/x11/kdelibs3/patches/patch-bz deleted file mode 100644 index 963f21bde93..00000000000 --- a/x11/kdelibs3/patches/patch-bz +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-bz,v 1.2 2002/08/25 19:23:56 jlam Exp $ - ---- kio/kssl/kopenssl.h.orig Wed Apr 10 23:00:44 2002 -+++ kio/kssl/kopenssl.h -@@ -309,6 +309,10 @@ public: - */ - void X509_STORE_CTX_set_chain(X509_STORE_CTX *v, STACK_OF(X509)* x); - -+ /* -+ * X509_STORE_CTX_set_purpose - set the purpose of the certificate -+ */ -+ void X509_STORE_CTX_set_purpose(X509_STORE_CTX *v, int purpose); - - /* - * X509_verify_cert - verify the certificate |