[pkgsrc/trunk]: pkgsrc/multimedia/libmpeg3 Fix build (gmake update related?).

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cc3fa02e3de
branches:  trunk
changeset: 511696:8cc3fa02e3de
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Apr 19 17:03:26 2006 +0000

description:
Fix build (gmake update related?).

diffstat:

 multimedia/libmpeg3/distinfo         |   4 +-
 multimedia/libmpeg3/patches/patch-aa |  37 ++++++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r f8b268df2562 -r 8cc3fa02e3de multimedia/libmpeg3/distinfo
--- a/multimedia/libmpeg3/distinfo      Wed Apr 19 17:02:22 2006 +0000
+++ b/multimedia/libmpeg3/distinfo      Wed Apr 19 17:03:26 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/12/06 17:47:56 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/04/19 17:03:26 wiz Exp $
 
 SHA1 (libmpeg3-1.3.tar.gz) = e7e8b03ab45d5593558b0d19e31f0694cfdfa2b5
 RMD160 (libmpeg3-1.3.tar.gz) = b1751f681d26758873746aa38368150eb0a4bafd
 Size (libmpeg3-1.3.tar.gz) = 154062 bytes
-SHA1 (patch-aa) = 88e1c193bb00056f757830c98f6bbbc58c1b16da
+SHA1 (patch-aa) = 65ce6f7bddb393a9c051a030bd8e9c3a9d791dd1
 SHA1 (patch-ab) = 3223b9f7d81dd73eec6767f9e1bb2cb26b4bcd80
 SHA1 (patch-ac) = 68576efb30a0d6f4cfe23fd543a04c4f3ada8936
 SHA1 (patch-ad) = 86edf9af264370bf89050b02e956b5bacc86881e
diff -r f8b268df2562 -r 8cc3fa02e3de multimedia/libmpeg3/patches/patch-aa
--- a/multimedia/libmpeg3/patches/patch-aa      Wed Apr 19 17:02:22 2006 +0000
+++ b/multimedia/libmpeg3/patches/patch-aa      Wed Apr 19 17:03:26 2006 +0000
@@ -1,22 +1,47 @@
-$NetBSD: patch-aa,v 1.2 2005/07/13 13:16:36 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2006/04/19 17:03:26 wiz Exp $
 
 --- Makefile.orig      2001-05-20 05:05:26.000000000 +0200
 +++ Makefile
-@@ -2,7 +2,7 @@ include global_config
+@@ -2,12 +2,7 @@ include global_config
  
  CFLAGS += 
  
 -OBJDIR = $(shell uname --machine)
+-
+-$(shell sh -c 'if ! test -d $(OBJDIR)\; then \
+-      mkdir $(OBJDIR)\; \
+-      mkdir $(OBJDIR)/audio\; \
+-      mkdir $(OBJDIR)/video\; fi' )
 +OBJDIR = work
  
- $(shell sh -c 'if ! test -d $(OBJDIR)\; then \
-       mkdir $(OBJDIR)\; \
-@@ -69,7 +69,7 @@ OBJS = \
+ ifeq ($(OBJDIR), alpha)
+   USE_MMX = 0
+@@ -69,11 +64,16 @@ OBJS = \
  
  OUTPUT = $(OBJDIR)/libmpeg3.a
  UTILS = $(OBJDIR)/dump $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3toc $(OBJDIR)/mpeg3split
 -LIBS = -lm -lpthread
 +LIBS = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lm ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
++
++all: prepare $(OUTPUT) util
  
- all: $(OUTPUT) util
+-all: $(OUTPUT) util
++prepare:
++      mkdir -p $(OBJDIR)
++      mkdir -p $(OBJDIR)/audio
++      mkdir -p $(OBJDIR)/video
+ 
+-$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
++$(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) prepare
+       ar rcs $(OUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS)
  
+ $(OBJDIR)/dump: $(OBJDIR)/dump.o $(OUTPUT)
+@@ -88,7 +88,7 @@ $(OBJDIR)/mpeg3toc: $(OBJDIR)/mpeg3toc.o
+ $(OBJDIR)/mpeg3split: $(OBJDIR)/mpeg3split.o $(OUTPUT)
+       $(CC) -o $(OBJDIR)/mpeg3split $(OBJDIR)/mpeg3split.o $(OUTPUT) $(LIBS)
+ 
+-util: $(UTILS)
++util: $(UTILS) prepare
+ 
+ clean:
+       find \( -name core \