Patch src/Makefile.am instead of src/Makefile.in now that we are using

autoreconf

2 files changed, 24 insertions, 30 deletions

diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index c76b858eda3..8b19e2377fa 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/12/20 16:10:25 ahoka Exp $
+$NetBSD: distinfo,v 1.4 2008/12/20 16:50:50 jmcneill Exp $
 
 SHA1 (pulseaudio-0.9.13.tar.gz) = c8482f1bb42d5213bfdbe2154e1a55b7bc04c915
 RMD160 (pulseaudio-0.9.13.tar.gz) = 07cea9939dfb4fc76f13bf01dfe22ab6d0fd8459
@@ -6,7 +6,7 @@ Size (pulseaudio-0.9.13.tar.gz) = 1308493 bytes
 SHA1 (patch-aa) = 8cc076c1301fa90ee0bb113ec3fee885ba99fbb4
 SHA1 (patch-ab) = b894cf1797a2f02e8131be8abc8250774bfec1ec
 SHA1 (patch-ac) = 8f61cf7c4a6681ab53c9ddf1007acb1bf524fe15
-SHA1 (patch-ad) = 63571597ba707679142b45b2daaffade7f094bb0
+SHA1 (patch-ad) = 40474c4e04dffe836c41ff348d959c821da527fd
 SHA1 (patch-ae) = 1cd31d18c133fdd5e8db59be319ba5b7a45fe0fe
 SHA1 (patch-af) = 31b8564cb91aabb5de5490659e77de984fd1920b
 SHA1 (patch-ba) = 518d23027fc9467a8bae2385233c2991136ee905
diff --git a/audio/pulseaudio/patches/patch-ad b/audio/pulseaudio/patches/patch-ad
index 38019bda285..cbb549d79f0 100644
--- a/audio/pulseaudio/patches/patch-ad
+++ b/audio/pulseaudio/patches/patch-ad
@@ -1,38 +1,32 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/12/18 14:42:56 jmcneill Exp $
-
---- src/Makefile.in.orig	2008-10-05 21:09:32.000000000 -0400
-+++ src/Makefile.in
-@@ -2296,7 +2296,7 @@ pulseincludedir = $(includedir)/pulse
- pulsecoreincludedir = $(includedir)/pulsecore
- pulseconfdir = $(sysconfdir)/pulse
- pulselibexecdir = $(libexecdir)/pulse
--xdgautostartdir = $(sysconfdir)/xdg/autostart
-+xdgautostartdir = $(PREFIX)/share/gnome/autostart
+--- src/Makefile.am.orig	2008-12-20 11:45:28.000000000 -0500
++++ src/Makefile.am	2008-12-20 11:47:47.000000000 -0500
+@@ -26,9 +26,9 @@
+ 
+ pulseincludedir=$(includedir)/pulse
+ pulsecoreincludedir=$(includedir)/pulsecore
+-pulseconfdir=$(sysconfdir)/pulse
++pulseconfdir=$(EGDIR)
+ pulselibexecdir=$(libexecdir)/pulse
+-xdgautostartdir=$(sysconfdir)/xdg/autostart
++xdgautostartdir=$(PREFIX)/share/gnome/autostart
  
  ###################################
  #            Defines              #
-@@ -3091,7 +3091,7 @@ module_x11_xsmp_la_LIBADD = $(AM_LIBADD)
+@@ -38,7 +38,7 @@
+ if OS_IS_WIN32
+ PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT%
+ else
+-PA_DEFAULT_CONFIG_DIR=$(pulseconfdir)
++PA_DEFAULT_CONFIG_DIR=$(sysconfdir)/pulse
+ endif
  
+ ###################################
+@@ -1396,7 +1396,7 @@
  # OSS
+ 
  liboss_util_la_SOURCES = modules/oss-util.c modules/oss-util.h
 -liboss_util_la_LDFLAGS = -avoid-version
 +liboss_util_la_LDFLAGS = -avoid-version $(LIBOSSAUDIO)
  liboss_util_la_LIBADD = libpulsecore.la
- module_oss_la_SOURCES = modules/module-oss.c
- module_oss_la_LDFLAGS = -module -avoid-version
-@@ -7776,12 +7776,12 @@ uninstall-policyDATA:
- 	done
- install-pulseconfDATA: $(pulseconf_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(pulseconfdir)" || $(MKDIR_P) "$(DESTDIR)$(pulseconfdir)"
-+	test -z "$(EGDIR)" || $(MKDIR_P) "$(DESTDIR)$(EGDIR)"
- 	@list='$(pulseconf_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(pulseconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pulseconfdir)/$$f'"; \
--	  $(pulseconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pulseconfdir)/$$f"; \
-+	  echo " $(pulseconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EGDIR)/$$f'"; \
-+	  $(pulseconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EGDIR)/$$f"; \
- 	done
  
- uninstall-pulseconfDATA:
+ module_oss_la_SOURCES = modules/module-oss.c