Improve the patch to admin/am_edit. No affect for this pkg.

3 files changed, 24 insertions, 15 deletions

diff --git a/audio/kdemultimedia3/distinfo b/audio/kdemultimedia3/distinfo
index dbe58eb22d6..377076b8573 100644
--- a/audio/kdemultimedia3/distinfo
+++ b/audio/kdemultimedia3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/06/25 06:34:33 skrll Exp $
+$NetBSD: distinfo,v 1.3 2002/06/25 19:38:28 skrll Exp $
 
 SHA1 (kdemultimedia-3.0.1.tar.bz2) = 0d957474431d636d429f64003f38beee48dd97f3
 Size (kdemultimedia-3.0.1.tar.bz2) = 5789849 bytes
@@ -12,7 +12,7 @@ SHA1 (patch-ag) = aee2716c219e7e6c977cf74b0640ae7528f0755e
 SHA1 (patch-ah) = 1dd023976df014a217fcaf39f7ea4280b9f011d8
 SHA1 (patch-ai) = 6d4ff2feecbe66380dc3d08f7a95076c0b0524e2
 SHA1 (patch-aj) = 4da67d4d4a509f933335baa4395d08ae406958ab
-SHA1 (patch-ak) = c55b86b33aadc563360b4dfddf46ef1110a79765
+SHA1 (patch-ak) = 1506500cee20b4bc304a4c16acd1e18c9e7c66ca
 SHA1 (patch-al) = dece03fdff70a1414fb2bb566170092188285536
 SHA1 (patch-am) = a2119b0882b3d4790c8dcfe925e05157844478fa
 SHA1 (patch-an) = 2ec87bdfea4d19c71bfece3a58ce2bd8c5c1eee6
@@ -65,4 +65,4 @@ SHA1 (patch-ch) = 86e18855242a489661371228fd8691897464181b
 SHA1 (patch-ci) = 49d1caddd97ba8f00a78561f7fd3813c109b95ed
 SHA1 (patch-cj) = 163aad2ee9120a3754e4b94c8c775058b370d2ba
 SHA1 (patch-ck) = 4afe5b8ffca5a1989e5bf34f73b7b7ca8f64726c
-SHA1 (patch-cl) = d4017218fc3782b01322aae2077f143a3a0e8b3b
+SHA1 (patch-cl) = 1c918a14435bde2d50c2de15d2db75534bde5591
diff --git a/audio/kdemultimedia3/patches/patch-ak b/audio/kdemultimedia3/patches/patch-ak
index 30295e92c63..978c9f13669 100644
--- a/audio/kdemultimedia3/patches/patch-ak
+++ b/audio/kdemultimedia3/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
+$NetBSD: patch-ak,v 1.2 2002/06/25 19:38:30 skrll Exp $
 
 --- kmix/Makefile.in.orig	Tue May 14 01:53:26 2002
 +++ kmix/Makefile.in
@@ -209,6 +209,15 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
+@@ -860,7 +891,7 @@
+ 
+ #>- install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+ #>+ 1
+-install-exec-am: install-kde_moduleLTLIBRARIES install-binPROGRAMS install-libLTLIBRARIES
++install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-kde_moduleLTLIBRARIES
+ 
+ install-info: install-info-recursive
+ 
 @@ -914,9 +945,6 @@
  
  messages: rc.cpp
@@ -284,7 +293,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
  
  #>+ 11
 -kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kmix.cpp $(srcdir)/kmixdockwidget.cpp $(srcdir)/kmixprefdlg.cpp $(srcdir)/kmixerwidget.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/ksmallslider.cpp $(srcdir)/volume.cpp $(srcdir)/kledbutton.cpp $(srcdir)/mixdevicewidget.cpp kmix_la_meta_unload.cpp  
-+kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp  
++kmix_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmix_main.cpp  
  	@echo 'creating kmix_la.all_cpp.cpp ...'; \
  	rm -f kmix_la.all_cpp.files kmix_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kmix_la.all_cpp.final; \
@@ -298,7 +307,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
  
  #>+ 11
 -kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl.cpp $(srcdir)/channel.cpp $(srcdir)/mixer.cpp $(srcdir)/volume.cpp kmixctrl_la_meta_unload.cpp  
-+kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp  
++kmixctrl_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl_main.cpp  
  	@echo 'creating kmixctrl_la.all_cpp.cpp ...'; \
  	rm -f kmixctrl_la.all_cpp.files kmixctrl_la.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kmixctrl_la.all_cpp.final; \
@@ -336,7 +345,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
 +	rm -f libkmixctrl_main_la.all_cpp.final libkmixctrl_main_la.all_cpp.files
 +
 +#>+ 11
-+kmix.all_cpp.cpp: $(srcdir)/Makefile.in kmix_main.cpp  
++kmix.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmix_main.cpp  
  	@echo 'creating kmix.all_cpp.cpp ...'; \
  	rm -f kmix.all_cpp.files kmix.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kmix.all_cpp.final; \
@@ -350,7 +359,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2002/05/31 14:46:49 skrll Exp $
  
  #>+ 11
 -kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in dummy.cpp  
-+kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in kmixctrl_main.cpp  
++kmixctrl.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kmixctrl_main.cpp  
  	@echo 'creating kmixctrl.all_cpp.cpp ...'; \
  	rm -f kmixctrl.all_cpp.files kmixctrl.all_cpp.final; \
  	echo "#define KDE_USE_FINAL 1" >> kmixctrl.all_cpp.final; \
diff --git a/audio/kdemultimedia3/patches/patch-cl b/audio/kdemultimedia3/patches/patch-cl
index c4126946130..7fa70add4f8 100644
--- a/audio/kdemultimedia3/patches/patch-cl
+++ b/audio/kdemultimedia3/patches/patch-cl
@@ -1,21 +1,21 @@
-$NetBSD: patch-cl,v 1.1 2002/06/25 06:34:42 skrll Exp $
+$NetBSD: patch-cl,v 1.2 2002/06/25 19:38:30 skrll Exp $
 
---- admin/am_edit.orig	Mon Jun 24 18:10:00 2002
+--- admin/am_edit.orig	Wed May  8 19:28:50 2002
 +++ admin/am_edit
 @@ -384,7 +384,16 @@
      # all modules are installed.  automake doesn't know this, so we need to move
      # this here from install-data to install-exec.
      if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) {
 -      $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
-+      my $lookup2 = 'install-exec-am:\s*(.*)';
++      my $lookup2 = 'install-exec-am:\s*([^\n]*)';
 +      if ($MakefileData =~ /\n$lookup2\n/) {
 +        my $newdeps = $1;
-+        if ($newdeps =~ m/.*install-libLTLIBRARIES.*/) {
-+	  $newdeps =~ s/install-libLTLIBRARIES/install-libLTLIBRARIES install-kde_moduleLTLIBRARIES/g;
++        if ($newdeps =~ m/\s*install-libLTLIBRARIES\s*/) {
++	  $newdeps =~ s/(install-libLTLIBRARIES)/$1 install-kde_moduleLTLIBRARIES/g;
++	  substituteLine($lookup2, "install-exec-am: " . $newdeps);
 +        } else {
-+          $newdeps .= "kde_module_LTLIBRARIES";
++          $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES";
 +        }
-+	substituteLine($lookup2, "install-exec-am: " . $newdeps);
 +      }
        my $lookup = 'install-data-am:\s*(.*)';
        if ($MakefileData =~ /\n$lookup\n/) {