I am a dozy whatnot...

Fix build problems in kicker reported by several people. Closes pkg/14279
from Mark Davies <mark@mcs.vuw.ac.nz>

4 files changed, 129 insertions, 47 deletions

diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index 5e52f534053..948db4fb8f8 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2001/10/15 22:45:59 skrll Exp $
+$NetBSD: distinfo,v 1.10 2001/10/18 08:17:49 skrll Exp $
 
 SHA1 (kdebase-2.2.1.tar.bz2) = 5c3a300829fee66bfe26faea39112050fc4cd1e9
 Size (kdebase-2.2.1.tar.bz2) = 12696643 bytes
@@ -47,8 +47,8 @@ SHA1 (patch-bl) = dc3a589816c7c5681c09c9ef962178ff9e37409d
 SHA1 (patch-bm) = 5675e1672697461011657b492f2ca18babcec3f6
 SHA1 (patch-bn) = 93c8f8a3bb6aaf1a5c852eac73441ea868aacf98
 SHA1 (patch-bo) = 3ed1b9b2bd2870c80aad7a0b39aee9ac3bdc9238
-SHA1 (patch-bp) = dbab7f40f19758f9967c2082ad105e678af010c1
-SHA1 (patch-bq) = 6c83d70a7ac5ad65c7bcfb909bae4a005e060dbe
+SHA1 (patch-bp) = d49ecab8f1802a7e74d90ac89d2da6da477ef104
+SHA1 (patch-bq) = aa7b7c37b0188ff43b198d615cf7d41d9fa5099b
 SHA1 (patch-br) = ccb960d5b9f43f70e17bde094ffa1b49f0d89d2b
 SHA1 (patch-bs) = ce2eeeb511591fec68f96cf246c324debfd2690d
 SHA1 (patch-bt) = 19dad64a5f030d502116934618e62913318eb272
@@ -63,7 +63,7 @@ SHA1 (patch-cb) = b55ec33208f56ac784c5fce3b386f17f158f752c
 SHA1 (patch-cc) = eca19e5c3f0efbcb919a5c2d570079ea17c1ea58
 SHA1 (patch-cd) = 0b0c2f7f9f5608500be781d5bd56a0b4a608e5a9
 SHA1 (patch-ce) = 59abadb4bcd1b194dfab07ebf667afb0b85bcfc8
-SHA1 (patch-cf) = 759a4c5179806c07e797fcf8427eb929f6e42db0
+SHA1 (patch-cf) = 88fe3064f75881f55227c90fbfb185672907f5bb
 SHA1 (patch-cg) = 909c29002c494c2d04dbb01fa6ab8c981e7ea349
 SHA1 (patch-ch) = b8fb2688192c61778d79f8fbd1c4fb5fc3fe409d
 SHA1 (patch-ci) = 12e515c4517a59c3c5f529162ea66c44cbcdd69c
diff --git a/x11/kdebase2/patches/patch-bp b/x11/kdebase2/patches/patch-bp
index f9f1457b282..50ddc6ed177 100644
--- a/x11/kdebase2/patches/patch-bp
+++ b/x11/kdebase2/patches/patch-bp
@@ -1,24 +1,25 @@
-$NetBSD: patch-bp,v 1.1 2001/10/15 22:46:02 skrll Exp $
+$NetBSD: patch-bp,v 1.2 2001/10/18 08:17:49 skrll Exp $
 
 --- kicker/Makefile.am.orig	Sat Jun  2 19:01:03 2001
 +++ kicker/Makefile.am
-@@ -3,15 +3,15 @@
+@@ -3,7 +3,7 @@
  SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data
  
  bin_PROGRAMS = kicker
 -lib_LTLIBRARIES = kicker.la
-+lib_LTLIBRARIES = libkicker.la
++lib_LTLIBRARIES = kicker.la libkicker.la
  
  CLEANFILES = dummy.cpp
  
--kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
--kicker_la_SOURCES = dummy.cpp
--kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
-+libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
-+libkicker_la_SOURCES = dummy.cpp
-+libkicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
+@@ -11,7 +11,11 @@
+ kicker_la_SOURCES = dummy.cpp
+ kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
  
 -kicker_LDADD = kicker.la
++libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
++libkicker_la_SOURCES = dummy.cpp
++libkicker_la_LDFLAGS = $(KDE_PLUGIN)
++
 +kicker_LDADD = libkicker.la
  kicker_SOURCES = dummy.cpp
  kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
diff --git a/x11/kdebase2/patches/patch-bq b/x11/kdebase2/patches/patch-bq
index 707b01575fe..c97dfb0c214 100644
--- a/x11/kdebase2/patches/patch-bq
+++ b/x11/kdebase2/patches/patch-bq
@@ -1,4 +1,4 @@
-$NetBSD: patch-bq,v 1.1 2001/10/15 22:46:03 skrll Exp $
+$NetBSD: patch-bq,v 1.2 2001/10/18 08:17:49 skrll Exp $
 
 --- kicker/Makefile.in.orig	Sat Sep  8 01:36:32 2001
 +++ kicker/Makefile.in
@@ -13,7 +13,7 @@ $NetBSD: patch-bq,v 1.1 2001/10/15 22:46:03 skrll Exp $
  
  bindir = @bindir@
  sbindir = @sbindir@
-@@ -276,15 +271,18 @@
+@@ -276,7 +271,7 @@
  SUBDIRS = share core ui . proxy taskmanager taskbar applets extensions data
  
  bin_PROGRAMS = kicker
@@ -22,19 +22,20 @@ $NetBSD: patch-bq,v 1.1 2001/10/15 22:46:03 skrll Exp $
  
  CLEANFILES = dummy.cpp
  
-+libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
-+libkicker_la_SOURCES = dummy.cpp
-+libkicker_la_LDFLAGS = $(KDE_PLUGIN)
-+
- kicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
+@@ -284,7 +279,11 @@
  kicker_la_SOURCES = dummy.cpp
  kicker_la_LDFLAGS = $(KDE_PLUGIN) -no-undefined -module
  
 -kicker_LDADD = kicker.la
++libkicker_la_LIBADD = share/libkicker_share.la core/libkicker_core.la  ui/libkicker_ui.la $(LIB_KSYCOCA) $(LIB_KFILE)
++libkicker_la_SOURCES = dummy.cpp
++libkicker_la_LDFLAGS = $(KDE_PLUGIN)
++
++kicker_LDADD = libkicker.la
  kicker_SOURCES = dummy.cpp
  kicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
  
-@@ -304,54 +302,38 @@
+@@ -304,54 +303,37 @@
  X_LIBS = @X_LIBS@
  kicker_la_DEPENDENCIES =  share/libkicker_share.la \
  core/libkicker_core.la ui/libkicker_ui.la
@@ -53,8 +54,7 @@ $NetBSD: patch-bq,v 1.1 2001/10/15 22:46:03 skrll Exp $
 -kicker_OBJECTS = dummy.$(OBJEXT)
 -kicker_DEPENDENCIES =  kicker.la
 +kicker_OBJECTS =  dummy.$(OBJEXT)
-+kicker_LDADD = $(LDADD)
-+kicker_DEPENDENCIES = 
++kicker_DEPENDENCIES =  libkicker.la
  CXXFLAGS = @CXXFLAGS@
 -#>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -#>+ 1
diff --git a/x11/kdebase2/patches/patch-cf b/x11/kdebase2/patches/patch-cf
index 46bde611abe..df295d4cc3d 100644
--- a/x11/kdebase2/patches/patch-cf
+++ b/x11/kdebase2/patches/patch-cf
@@ -1,10 +1,14 @@
-$NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
+$NetBSD: patch-cf,v 1.2 2001/10/18 08:17:49 skrll Exp $
 
 --- klipper/Makefile.in.orig	Sat Sep  8 01:36:37 2001
 +++ klipper/Makefile.in
+@@ -273,18 +273,19 @@
+ INCLUDES = $(all_includes)
+ 
+ bin_PROGRAMS = klipper
 -lib_LTLIBRARIES = klipper.la
 +lib_LTLIBRARIES = libklipper_main.la klipper.la
-@@ -278,4 +278,3 @@
+ 
 -CLEANFILES = dummy.cpp
 -
 -klipper_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
@@ -12,15 +16,23 @@ $NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
 +libklipper_main_la_LIBADD = $(LIB_KDEUI) $(LIB_KSYCOCA)
 +libklipper_main_la_SOURCES = main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp
 +libklipper_main_la_LDFLAGS = $(all_libraries) -module -avoid-version
-@@ -282,0 +282,2 @@
+ 
 +klipper_la_LIBADD = libklipper_main.la
 +klipper_la_SOURCES = klipper_main.cpp
-@@ -286,2 +287,2 @@
+ #>- klipper_la_METASOURCES = AUTO
+ klipper_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ 
 -klipper_LDADD = klipper.la $(LIB_KSYCOCA)
 -klipper_SOURCES = dummy.cpp
 +klipper_LDADD = libklipper_main.la $(LIB_KSYCOCA)
 +klipper_SOURCES = klipper_main.cpp
-@@ -317,8 +318,14 @@
+ klipper_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+ 
+ appsdir = $(kde_appsdir)/Utilities
+@@ -314,21 +315,27 @@
+ LIBS = @LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
 -klipper_la_DEPENDENCIES = 
 -#>- klipper_la_OBJECTS =  main.lo toplevel.lo urlgrabber.lo configdialog.lo
 -#>+ 5
@@ -43,27 +55,52 @@ $NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
 +#>- klipper_la_OBJECTS =  klipper_main.lo
 +#>+ 1
 +klipper_la_OBJECTS = klipper_main.lo
-@@ -328 +335 @@
+ bin_PROGRAMS =  klipper$(EXEEXT)
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
 -#>- klipper_OBJECTS =  dummy.$(OBJEXT)
 +#>- klipper_OBJECTS =  klipper_main.$(OBJEXT)
-@@ -330,2 +337,2 @@
+ #>+ 1
 -klipper_OBJECTS = dummy.$(OBJEXT)
 -klipper_DEPENDENCIES =  klipper.la
 +klipper_OBJECTS = klipper_main.$(OBJEXT)
 +klipper_DEPENDENCIES =  libklipper_main.la
-@@ -350 +357 @@
+ CXXFLAGS = @CXXFLAGS@
+ #>- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ #>+ 1
+@@ -347,15 +354,15 @@
+ 
+ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+ #>+ 4
 -KDE_DIST=klipperrc hi16-app-klipper.png hi32-app-klipper.png klipper-1-2.pl klipperrc.upd klipperbindings.cpp urlgrabber.h toplevel.h klipper.desktop hi48-app-klipper.png configdialog.h 
-+KDE_DIST=klipperrc hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h 
-@@ -357,2 +364,2 @@
++KDE_DIST=klipperrc klipper hi48-app-klipper.png toplevel.h hi16-app-klipper.png hi32-app-klipper.png klipperbindings.cpp configdialog.h klipper-1-2.pl klipper.desktop klipperrc.upd urlgrabber.h libklipper_main_la_meta_unload.cpp 
+ 
+ DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
+ 
+ 
+ TAR = tar
+ GZIP_ENV = --best
 -SOURCES = $(klipper_la_SOURCES) $(klipper_SOURCES)
 -OBJECTS = $(klipper_la_OBJECTS) $(klipper_OBJECTS)
 +SOURCES = $(libklipper_main_la_SOURCES) $(klipper_la_SOURCES) $(klipper_SOURCES)
 +OBJECTS = $(libklipper_main_la_OBJECTS) $(klipper_la_OBJECTS) $(klipper_OBJECTS)
-@@ -444,0 +452,3 @@
+ 
+ #>- all: all-redirect
+ #>+ 1
+@@ -442,6 +449,9 @@
+ 
+ maintainer-clean-libtool:
+ 
 +libklipper_main.la: $(libklipper_main_la_OBJECTS) $(libklipper_main_la_DEPENDENCIES)
 +	$(CXXLINK) -rpath $(libdir) $(libklipper_main_la_LDFLAGS) $(libklipper_main_la_OBJECTS) $(libklipper_main_la_LIBADD) $(LIBS)
 +
-@@ -593,11 +602,0 @@
+ klipper.la: $(klipper_la_OBJECTS) $(klipper_la_DEPENDENCIES)
+ 	$(CXXLINK) -rpath $(libdir) $(klipper_la_LDFLAGS) $(klipper_la_OBJECTS) $(klipper_la_LIBADD) $(LIBS)
+ 
+@@ -590,17 +600,6 @@
+ subdir = klipper
+ 
+ distdir: $(DISTFILES)
 -#>- 	@for file in $(DISTFILES); do \
 -#>- 	  d=$(srcdir); \
 -#>- 	  if test -d $$d/$$file; then \
@@ -75,13 +112,31 @@ $NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
 -#>- 	  fi; \
 -#>- 	done
 -#>+ 10
-@@ -656 +654,0 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+@@ -653,7 +652,6 @@
+ mostlyclean-generic:
+ 
+ clean-generic:
 -	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-@@ -718,3 +715,0 @@
+ 
+ distclean-generic:
+ 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+@@ -715,9 +713,6 @@
+ messages:
+ 	$(XGETTEXT) $(klipper_la_SOURCES) klipperbindings.cpp -o $(podir)/klipper.pot
+ 
 -dummy.cpp:
 -	echo > dummy.cpp
 -
-@@ -765,8 +760,8 @@
+ # 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:
+@@ -762,26 +757,38 @@
+ 
+ 
+ #>+ 10
 -klipper_la_meta_unload.cpp:  urlgrabber.moc toplevel.moc configdialog.moc
 -	@echo 'creating klipper_la_meta_unload.cpp'
 -	@-rm -f klipper_la_meta_unload.cpp
@@ -98,12 +153,15 @@ $NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
 +	@echo '0};' >> libklipper_main_la_meta_unload.cpp
 +	@echo '#include <kunload.h>' >> libklipper_main_la_meta_unload.cpp
 +	@echo '_UNLOAD(libklipper_main_la)' >> libklipper_main_la_meta_unload.cpp
-@@ -777 +772,13 @@
+ 
+ 
+ #>+ 3
+ clean-moc-classes:
 -	-rm -f  klipper_la_meta_unload.cpp
 +	-rm -f  libklipper_main_la_meta_unload.cpp
 +
 +#>+ 11
-+libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp libklipper_main_la_meta_unload.cpp  
++libklipper_main_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp $(srcdir)/libklipper_main_la_meta_unload.cpp  
 +	@echo 'creating libklipper_main_la.all_cpp.cpp ...'; \
 +	rm -f libklipper_main_la.all_cpp.files libklipper_main_la.all_cpp.final; \
 +	echo "#define KDE_USE_FINAL 1" >> libklipper_main_la.all_cpp.final; \
@@ -113,24 +171,47 @@ $NetBSD: patch-cf,v 1.1 2001/10/15 22:46:04 skrll Exp $
 +	done; \
 +	cat libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files  > libklipper_main_la.all_cpp.cpp; \
 +	rm -f libklipper_main_la.all_cpp.final libklipper_main_la.all_cpp.files
-@@ -780 +787 @@
+ 
+ #>+ 11
 -klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/toplevel.cpp $(srcdir)/urlgrabber.cpp $(srcdir)/configdialog.cpp klipper_la_meta_unload.cpp   urlgrabber.moc toplevel.moc configdialog.moc 
 +klipper_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp   urlgrabber.moc toplevel.moc configdialog.moc 
-@@ -784 +791 @@
+ 	@echo 'creating klipper_la.all_cpp.cpp ...'; \
+ 	rm -f klipper_la.all_cpp.files klipper_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> klipper_la.all_cpp.final; \
 -	for file in main.cpp toplevel.cpp urlgrabber.cpp configdialog.cpp klipper_la_meta_unload.cpp ; do \
 +	for file in klipper_main.cpp ; do \
-@@ -792 +799 @@
+ 	  echo "#include \"$$file\"" >> klipper_la.all_cpp.files; \
+ 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper_la.all_cpp.final; \
+ 	done; \
+@@ -789,11 +796,11 @@
+ 	rm -f klipper_la.all_cpp.final klipper_la.all_cpp.files
+ 
+ #>+ 11
 -klipper.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
 +klipper.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/klipper_main.cpp  
-@@ -796 +803 @@
+ 	@echo 'creating klipper.all_cpp.cpp ...'; \
+ 	rm -f klipper.all_cpp.files klipper.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> klipper.all_cpp.final; \
 -	for file in dummy.cpp ; do \
 +	for file in klipper_main.cpp ; do \
-@@ -805 +812 @@
+ 	  echo "#include \"$$file\"" >> klipper.all_cpp.files; \
+ 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> klipper.all_cpp.final; \
+ 	done; \
+@@ -802,14 +809,14 @@
+ 
+ #>+ 3
+ clean-final:
 -	-rm -f klipper_la.all_cpp.cpp klipper.all_cpp.cpp
 +	-rm -f libklipper_main_la.all_cpp.cpp klipper_la.all_cpp.cpp klipper.all_cpp.cpp
-@@ -809 +816 @@
+ 
+ #>+ 2
+ final:
 -	$(MAKE) klipper_la_OBJECTS="$(klipper_la_final_OBJECTS)" all-am
 +	$(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_final_OBJECTS)" all-am
-@@ -812 +819 @@
+ #>+ 2
+ no-final:
 -	$(MAKE) klipper_la_OBJECTS="$(klipper_la_nofinal_OBJECTS)" all-am
 +	$(MAKE) libklipper_main_la_OBJECTS="$(libklipper_main_la_nofinal_OBJECTS)" all-am
+ #>+ 3
+ cvs-clean:
+ 	$(MAKE) -f $(top_srcdir)/admin/Makefile.common cvs-clean