1 files changed, 9 insertions, 66 deletions
diff --git a/x11/kdelibs3/patches/patch-cd b/x11/kdelibs3/patches/patch-cd
index 388734c0bd1..f6d4fb64cc7 100644
--- a/x11/kdelibs3/patches/patch-cd
+++ b/x11/kdelibs3/patches/patch-cd
@@ -1,70 +1,13 @@
-$NetBSD: patch-cd,v 1.5 2003/05/22 02:42:43 markd Exp $
+$NetBSD: patch-cd,v 1.6 2004/01/15 09:52:51 markd Exp $
 
---- kdefx/Makefile.in.orig	Thu May  8 05:24:05 2003
+--- kdefx/Makefile.in.orig	2003-12-29 11:16:54.000000000 +1300
 +++ kdefx/Makefile.in
-@@ -476,12 +476,15 @@ DIST_COMMON = $(include_HEADERS) $(srcdi
- 	Makefile.am Makefile.in
- SOURCES = $(libkdefx_la_SOURCES)
+@@ -660,7 +660,7 @@ distclean-tags:
+ 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
+-KDE_DIST=configure.in.in 
++KDE_DIST=configure.in.in Makefile.in.rej 
  
-+CXXCOMPILE_NOOPT=${CXXCOMPILE:-O%=}
-+LTCXXCOMPILE_NOOPT=${LTCXXCOMPILE:-O%=}
-+
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
+ DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
- .SUFFIXES:
--.SUFFIXES: .cpp .lo .o .obj
-+.SUFFIXES: .cc .cpp .lo .o .obj
- $(srcdir)/Makefile.in:  Makefile.am $(srcdir)/../admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- #>- 	cd $(top_srcdir) && \
- #>- 	  $(AUTOMAKE) --foreign  kdefx/Makefile
-@@ -574,6 +577,42 @@ distclean-depend:
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
-+.cc.o:
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
-+.cc.obj:
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-+@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE_NOOPT) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-+
-+.cc.lo:
-+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE_NOOPT) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCXX_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-+
-+.cpp.cc:
-+	cp -f $< $@
-+
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
-@@ -1025,3 +1064,5 @@ kde-rpo-clean:
- #>+ 3
- kstyle.lo: kstyle.moc 
- kstyle.o: kstyle.moc 
-+
-+kpixmap.o: kpixmap.cc