Fix compilation on a.out platforms.

3 files changed, 21 insertions, 25 deletions

diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 9056cddd5d5..8fbe0f8d4a9 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2001/12/10 10:02:53 skrll Exp $
+$NetBSD: distinfo,v 1.13 2001/12/16 20:33:40 skrll Exp $
 
 SHA1 (kdelibs-2.2.2.tar.bz2) = 6ae1096ffb547f317adca6b29cb9ce9dcaf1863c
 Size (kdelibs-2.2.2.tar.bz2) = 5955592 bytes
@@ -8,8 +8,8 @@ SHA1 (patch-ac) = 06841064266659d9773c1d8728c9affc3d9c09cd
 SHA1 (patch-ad) = 52fe9cdc53496ecbde42ff4a6c46a5bb104738a0
 SHA1 (patch-ae) = 55feaee4a2c1bcedbd135d8f4ed49a9fdc487247
 SHA1 (patch-af) = 0c70385a39340b6d9af67415d761e79c638e7a26
-SHA1 (patch-ag) = 14d75d761888ff56058f305853cf29244d9a3878
-SHA1 (patch-ah) = f15c29a64f49e8a0727d2dd4d7bded99356884b3
+SHA1 (patch-ag) = 14f1dfadc1697e4fc731ee1d3fbd4df863ed82a8
+SHA1 (patch-ah) = ee323d1faea7782507aa97d7bc1e1f467793e48c
 SHA1 (patch-ai) = 02a985d9032412fc98f6497ea81d524a063e3115
 SHA1 (patch-aj) = 4b44ac3b1783b40cdda8e4d60ad0e43c698d2e57
 SHA1 (patch-ak) = 22a5b302970d76b745cb46ec69b65741461e05b3
diff --git a/x11/kdelibs2/patches/patch-ag b/x11/kdelibs2/patches/patch-ag
index 6e92f3f266a..7b97f32201b 100644
--- a/x11/kdelibs2/patches/patch-ag
+++ b/x11/kdelibs2/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2001/10/15 22:46:22 skrll Exp $
+$NetBSD: patch-ag,v 1.3 2001/12/16 20:33:41 skrll Exp $
 
 --- dcop/Makefile.am.orig	Wed Apr 18 17:19:12 2001
 +++ dcop/Makefile.am
@@ -17,18 +17,16 @@ $NetBSD: patch-ag,v 1.2 2001/10/15 22:46:22 skrll Exp $
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = -version-info 1:0 $(all_libraries) -no-undefined
  
-@@ -44,13 +44,17 @@
+@@ -44,13 +44,16 @@
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
  
--dcopserver_la_LDFLAGS = -module -avoid-version
--dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
--dcopserver_la_LIBADD   = libDCOP.la
-+#libdcopserver_main_la_LDFLAGS = -export-dynamic
 +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
 +libdcopserver_main_la_LIBADD = libDCOP.la
 +
-+dcopserver_la_LDFLAGS = -Wl,-export-dynamic -module -avoid-version
+ dcopserver_la_LDFLAGS = -module -avoid-version
+-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+-dcopserver_la_LIBADD   = libDCOP.la
 +dcopserver_la_SOURCES = dcopserver_main.cpp
 +dcopserver_la_LIBADD  = libdcopserver_main.la
  
@@ -40,7 +38,7 @@ $NetBSD: patch-ag,v 1.2 2001/10/15 22:46:22 skrll Exp $
  
  testdcop_SOURCES = testdcop.cpp
  testdcop_LDADD = ../kdecore/libkdecore.la
-@@ -59,6 +63,3 @@
+@@ -59,6 +62,3 @@
  testdcopc_LDADD =  KDE-ICE/libkICE.la $(LIBSM)
  
  EXTRA_DIST = HOWTO ICE
diff --git a/x11/kdelibs2/patches/patch-ah b/x11/kdelibs2/patches/patch-ah
index 0f4e5b593c2..acbe2a18c5a 100644
--- a/x11/kdelibs2/patches/patch-ah
+++ b/x11/kdelibs2/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
+$NetBSD: patch-ah,v 1.4 2001/12/16 20:33:41 skrll Exp $
 
 --- dcop/Makefile.in.orig	Tue Nov 13 20:57:03 2001
 +++ dcop/Makefile.in
@@ -17,18 +17,16 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  libDCOP_la_LIBADD = KDE-ICE/libkICE.la $(LIB_QT)
  libDCOP_la_LDFLAGS = -version-info 1:0 $(all_libraries) -no-undefined
  
-@@ -303,13 +303,17 @@
+@@ -303,13 +303,16 @@
  # dcopstub needs to go first for --enable-final to work
  libDCOP_la_SOURCES = dcopstub.cpp dcopclient.cpp dcopobject.cpp dcopref.cpp
  
--dcopserver_la_LDFLAGS = -module -avoid-version
--dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
--dcopserver_la_LIBADD = libDCOP.la
-+#libdcopserver_main_la_LDFLAGS = -export-dynamic
 +libdcopserver_main_la_SOURCES = dcopserver.cpp dcopsignals.cpp
 +libdcopserver_main_la_LIBADD = libDCOP.la
 +
-+dcopserver_la_LDFLAGS = -Wl,-export-dynamic -module -avoid-version
+ dcopserver_la_LDFLAGS = -module -avoid-version
+-dcopserver_la_SOURCES = dcopserver.cpp dcopsignals.cpp
+-dcopserver_la_LIBADD = libDCOP.la
 +dcopserver_la_SOURCES = dcopserver_main.cpp
 +dcopserver_la_LIBADD = libdcopserver_main.la
  
@@ -40,7 +38,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  
  testdcop_SOURCES = testdcop.cpp
  testdcop_LDADD = ../kdecore/libkdecore.la
-@@ -334,21 +338,26 @@
+@@ -334,21 +337,26 @@
  libDCOP_la_nofinal_OBJECTS = dcopstub.lo dcopclient.lo dcopobject.lo dcopref.lo
  @KDE_USE_FINAL_FALSE@libDCOP_la_OBJECTS = $(libDCOP_la_nofinal_OBJECTS)
  @KDE_USE_FINAL_TRUE@libDCOP_la_OBJECTS = $(libDCOP_la_final_OBJECTS)
@@ -76,7 +74,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  #>- testdcop_OBJECTS =  testdcop.$(OBJEXT)
  #>+ 1
  testdcop_OBJECTS = testdcop.$(OBJEXT)
-@@ -392,8 +401,8 @@
+@@ -392,8 +400,8 @@
  
  TAR = tar
  GZIP_ENV = --best
@@ -87,7 +85,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  
  #>- all: all-redirect
  #>+ 1
-@@ -486,6 +495,9 @@
+@@ -486,6 +494,9 @@
  @KDE_USE_CLOSURE_FALSE@libDCOP.la: $(libDCOP_la_OBJECTS) $(libDCOP_la_DEPENDENCIES)
  	$(CXXLINK) -rpath $(libdir) $(libDCOP_la_LDFLAGS) $(libDCOP_la_OBJECTS) $(libDCOP_la_LIBADD) $(LIBS)
  
@@ -97,7 +95,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  dcopserver.la: $(dcopserver_la_OBJECTS) $(dcopserver_la_DEPENDENCIES)
  	$(CXXLINK) -rpath $(libdir) $(dcopserver_la_LDFLAGS) $(dcopserver_la_OBJECTS) $(dcopserver_la_LIBADD) $(LIBS)
  
-@@ -770,9 +782,6 @@
+@@ -770,9 +781,6 @@
  	maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
  
@@ -107,7 +105,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  # 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:
-@@ -828,11 +837,23 @@
+@@ -828,11 +836,23 @@
  	rm -f libDCOP_la.all_cpp.final libDCOP_la.all_cpp.files
  
  #>+ 11
@@ -133,7 +131,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  	  echo "#include \"$$file\"" >> dcopserver_la.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver_la.all_cpp.final; \
  	done; \
-@@ -840,11 +861,11 @@
+@@ -840,11 +860,11 @@
  	rm -f dcopserver_la.all_cpp.final dcopserver_la.all_cpp.files
  
  #>+ 11
@@ -147,7 +145,7 @@ $NetBSD: patch-ah,v 1.3 2001/12/03 15:37:21 skrll Exp $
  	  echo "#include \"$$file\"" >> dcopserver.all_cpp.files; \
  	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> dcopserver.all_cpp.final; \
  	done; \
-@@ -865,20 +886,20 @@
+@@ -865,20 +885,20 @@
  
  #>+ 3
  clean-final: