5 files changed, 87 insertions, 15 deletions
diff --git a/graphics/avifile/distinfo b/graphics/avifile/distinfo
index 050d4ed4fca..6a26dec451c 100644
--- a/graphics/avifile/distinfo
+++ b/graphics/avifile/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/21 09:54:08 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/01/23 16:52:10 skrll Exp $
 
 SHA1 (avifile-0.53.5.tar.gz) = bc9d27c65ab4f8df9006c6037d539ff71adb0ad7
 Size (avifile-0.53.5.tar.gz) = 848382 bytes
@@ -16,5 +16,7 @@ SHA1 (patch-al) = 218f2f2da4ad82ccced63ad00873f186f9924201
 SHA1 (patch-am) = 8c9ffd2dc38ed38058102afa0af13258f89415d4
 SHA1 (patch-an) = 3e9857a9e52fce6f51d7cdf99db82b48fc4cbfe9
 SHA1 (patch-ao) = 01e418460da9ffa59b0d1799845049a8aa4bf7c9
-SHA1 (patch-ap) = 9ee5f5e1aae764e10068d65529af85e7d08b6dc0
-SHA1 (patch-aq) = 457bda578eb94bbfc2105eb38b029e4be0070ab8
+SHA1 (patch-ap) = fd8b4ec6e53ef4ef87983fc63bd7636c7653ebe4
+SHA1 (patch-aq) = bbae73f76390f5e27d9f3135f2ddb4230b47121f
+SHA1 (patch-ar) = 6a302643818a478003d75d2ff7ab1133a90fc412
+SHA1 (patch-as) = 140bea8a63ccd109c00b6f8eb0a40dc42161adbb
diff --git a/graphics/avifile/patches/patch-ap b/graphics/avifile/patches/patch-ap
index 40407858c99..4fa8e290456 100644
--- a/graphics/avifile/patches/patch-ap
+++ b/graphics/avifile/patches/patch-ap
@@ -1,11 +1,10 @@
-$NetBSD: patch-ap,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+$NetBSD: patch-ap,v 1.2 2002/01/23 16:52:10 skrll Exp $
 
---- lib/loader/Makefile.am.orig	Fri Jan 26 17:06:42 2001
+--- lib/loader/Makefile.am.orig	Fri Jan 26 16:06:42 2001
 +++ lib/loader/Makefile.am
-@@ -7,6 +7,3 @@
- -D__WINE__ -Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer -fno-inline
- 
+@@ -9,4 +9,4 @@
  LIBS=
--
--stubs.lo: stubs.s
+ 
+ stubs.lo: stubs.s
 -	$(CC) -c ./stubs.s -o stubs.lo
++	$(LIBTOOL) $(CC) -c ./stubs.s -o stubs.o
diff --git a/graphics/avifile/patches/patch-aq b/graphics/avifile/patches/patch-aq
index cda92623159..20d21070dfa 100644
--- a/graphics/avifile/patches/patch-aq
+++ b/graphics/avifile/patches/patch-aq
@@ -1,12 +1,12 @@
-$NetBSD: patch-aq,v 1.1.1.1 2001/04/12 21:26:21 zuntum Exp $
+$NetBSD: patch-aq,v 1.2 2002/01/23 16:52:10 skrll Exp $
 
---- lib/videocodec/Makefile.am.orig	Wed Jan 10 19:00:05 2001
+--- lib/videocodec/Makefile.am.orig	Wed Jan 10 18:00:05 2001
 +++ lib/videocodec/Makefile.am
-@@ -4,7 +4,5 @@
-     ldt_keeper.cpp image.cpp
+@@ -5,6 +5,6 @@
  libvideocodec_la_LIBADD=codeckeeper.lo
  CXXFLAGS=-I../../include
--codeckeeper.lo: codeckeeper.cpp
+ codeckeeper.lo: codeckeeper.cpp
 -	$(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c codeckeeper.cpp -o codeckeeper.lo
++	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c codeckeeper.cpp -o codeckeeper.o
  
  LIBS=
diff --git a/graphics/avifile/patches/patch-ar b/graphics/avifile/patches/patch-ar
new file mode 100644
index 00000000000..82013dc07a5
--- /dev/null
+++ b/graphics/avifile/patches/patch-ar
@@ -0,0 +1,31 @@
+$NetBSD: patch-ar,v 1.1 2002/01/23 16:52:10 skrll Exp $
+
+--- lib/loader/Makefile.in.orig	Wed Jan 23 16:35:05 2002
++++ lib/loader/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -332,7 +332,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$/$$file $(distdir)/$$file; \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -449,7 +449,7 @@
+ 
+ 
+ stubs.lo: stubs.s
+-	$(CC) -c ./stubs.s -o stubs.lo
++	$(LIBTOOL) $(CC) -c ./stubs.s -o stubs.o
+ 
+ # 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.
diff --git a/graphics/avifile/patches/patch-as b/graphics/avifile/patches/patch-as
new file mode 100644
index 00000000000..2978d75100b
--- /dev/null
+++ b/graphics/avifile/patches/patch-as
@@ -0,0 +1,40 @@
+$NetBSD: patch-as,v 1.1 2002/01/23 16:52:10 skrll Exp $
+
+--- lib/videocodec/Makefile.in.orig	Wed Jan 23 16:35:05 2002
++++ lib/videocodec/Makefile.in
+@@ -1,6 +1,6 @@
+-# Makefile.in generated automatically by automake 1.4 from Makefile.am
++# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+ 
+-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -328,7 +328,7 @@
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" = "." && dot_seen=yes; \
++	  test "$$subdir" != "." || dot_seen=yes; \
+ 	done; \
+ 	test "$$dot_seen" = "no" && rev=". $$rev"; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+@@ -394,7 +394,7 @@
+ 	@for file in $(DISTFILES); do \
+ 	  d=$(srcdir); \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$/$$file $(distdir)/$$file; \
++	    cp -pr $$d/$$file $(distdir)/$$file; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+ 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+@@ -545,7 +545,7 @@
+ mostlyclean distclean maintainer-clean
+ 
+ codeckeeper.lo: codeckeeper.cpp
+-	$(CXX) $(CXXFLAGS) $(DEFINES) -O0 -fPIC -c codeckeeper.cpp -o codeckeeper.lo
++	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) $(DEFINES) -O0 -c codeckeeper.cpp -o codeckeeper.o
+ 
+ # 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.