Fix a patch to be MAKE_JOBS_SAFE=yes.

Reported by PR 41491.

3 files changed, 32 insertions, 19 deletions

diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index bf6bb912e29..28dea7a35a0 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2009/05/26 08:14:15 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2009/05/26 08:49:27 obache Exp $
 #
 
 DISTNAME=	libmpeg3-1.8-src
@@ -13,7 +13,6 @@ HOMEPAGE=	http://heroines.sourceforge.net/libmpeg3.php3
 COMMENT=	MPEG decoding library
 
 PKG_DESTDIR_SUPPORT=	user-destdir
-MAKE_JOBS_SAFE=		no
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/multimedia/libmpeg3/distinfo b/multimedia/libmpeg3/distinfo
index 2819a8773cd..131a50b98c3 100644
--- a/multimedia/libmpeg3/distinfo
+++ b/multimedia/libmpeg3/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2009/02/23 13:24:30 wiz Exp $
+$NetBSD: distinfo,v 1.20 2009/05/26 08:49:27 obache Exp $
 
 SHA1 (libmpeg3-1.8-src.tar.bz2) = dae3fc1d68533e71cb9f77adf124bfbfb4e13ae6
 RMD160 (libmpeg3-1.8-src.tar.bz2) = bc01d72b1e1b3e91ff206bae7a314b939c44b192
 Size (libmpeg3-1.8-src.tar.bz2) = 2452350 bytes
-SHA1 (patch-aa) = 482586a3735b4b7a1d3eb23324e9dc9db11eefeb
+SHA1 (patch-aa) = 6afb72af6ce53e7eb26bfebc056060b99b2612cf
 SHA1 (patch-ab) = 4ca251c445658ad2844b7202ae3a4e1690573f18
 SHA1 (patch-ac) = cfee202be3b9ec53e597a53dc8a6708506c053ad
 SHA1 (patch-ad) = e7d5164de3303346b2e92994fc25858323d455b5
diff --git a/multimedia/libmpeg3/patches/patch-aa b/multimedia/libmpeg3/patches/patch-aa
index 2fcb72555ce..939baa71d1a 100644
--- a/multimedia/libmpeg3/patches/patch-aa
+++ b/multimedia/libmpeg3/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2009/01/29 17:53:49 abs Exp $
+$NetBSD: patch-aa,v 1.6 2009/05/26 08:49:27 obache Exp $
 
---- Makefile.orig	2008-08-07 04:33:09.000000000 +0100
+--- Makefile.orig	2008-08-07 03:33:09.000000000 +0000
 +++ Makefile
 @@ -1,7 +1,7 @@
  CC = gcc
@@ -21,15 +21,22 @@ $NetBSD: patch-aa,v 1.5 2009/01/29 17:53:49 abs Exp $
  
  
  
-@@ -147,19 +147,19 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp
+@@ -147,17 +147,17 @@ UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mp
  #$(OBJDIR)/mpeg3split
  
  
 -LIBS = -lm -lpthread
+-
+-$(shell mkdir -p $(OBJDIR) )
+-
+-$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
+-$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
+-$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+-$(shell mkdir -p $(DIRS) )
+-
 +LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
-+all: prepare $(OUTPUT) $(UTILS)
+ all: $(OUTPUT) $(UTILS)
  
--$(shell mkdir -p $(OBJDIR) )
 +prepare:
 +	mkdir -p $(OBJDIR)
 +	mkdir -p $(OBJDIR)/audio
@@ -39,16 +46,23 @@ $NetBSD: patch-aa,v 1.5 2009/01/29 17:53:49 abs Exp $
 +	echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs
 +	mkdir -p $(DIRS)
  
--$(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
--$(shell echo $(A52CFLAGS) > $(OBJDIR)/a52_flags)
--$(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
--$(shell mkdir -p $(DIRS) )
--
--all: $(OUTPUT) $(UTILS)
--
--
--$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
-+$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS) prepare
+ $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
  	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+@@ -203,13 +203,13 @@ backup: clean
+ wc:
+ 	cat *.c *.h audio/*.c audio/*.h video/*.c video/*.h | wc
  
+-$(OBJS): 
++$(OBJS): prepare
+ 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
+-$(ASMOBJS): 
++$(ASMOBJS): prepare
+ 	$(CC) -c `cat $(OBJDIR)/c_flags` $(subst $(OBJDIR)/,, $*.S) -o $*.o
+-$(NASMOBJS): 
++$(NASMOBJS): prepare
+ 	$(NASM) -f elf $(subst $(OBJDIR)/,, $*.s) -o $*.o
+-$(A52OBJS):
++$(A52OBJS): prepare
+ 	$(CC) -c `cat $(OBJDIR)/a52_flags` $(subst $(OBJDIR)/,, $*.c) -o $*.o
  
+ $(OBJDIR)/libmpeg3.o: 				    libmpeg3.c