Update to 2.80.1

PR: ports/10864
Submitted by: mharo@area51.fremont.ca.us

1 files changed, 49 insertions, 42 deletions

diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-ab
index 794adc1a59c2..4f9e8ee43b93 100644
--- a/multimedia/xanim/files/patch-ab
+++ b/multimedia/xanim/files/patch-ab
@@ -1,53 +1,60 @@
---- Imakefile.orig	Tue Mar 24 01:55:08 1998
-+++ Imakefile	Mon Sep 14 22:22:19 1998
-@@ -95,9 +95,9 @@
- XCOMM XA_CVID_DEF = -DXA_CINEPAK
- XCOMM XA_CYUV_DEF = -DXA_CYUV
- XCOMM
--XA_IV32_LIB = 
--XA_CVID_LIB = 
--XA_CYUV_LIB = 
-+XCOMM XA_IV32_LIB = xa2.0_cvid_netbsd386.o
-+XCOMM XA_CVID_LIB = xa2.0_iv32_netbsd386.o
-+XCOMM XA_CYUV_LIB = xa1.0_cyuv_netbsd386.o
+--- Imakefile.orig	Sun Mar 21 14:36:26 1999
++++ Imakefile	Mon Mar 29 12:01:48 1999
+@@ -116,7 +116,7 @@
+ XCOMM XA_DLL_DEF = -DXA_DLL
  XCOMM
- XCOMM NOTE: SGI Machines Only:
- XCOMM    if your linker core dumps then you'll need to uncomment the following
-@@ -165,7 +165,7 @@
- XCOMM XA_AUDIO_DEFS =
+ XCOMM ### You may need this library.
+-XA_DLL_LIB = -ldl
++XCOMM XA_DLL_LIB = -ldl
  XCOMM
- XCOMM -- Sun Sparcs -----------------------------------------------------------
--XA_AUDIO_DEFS = -DXA_SPARC_AUDIO
-+XCOMM XA_AUDIO_DEFS = -DXA_SPARC_AUDIO
- XCOMM
- XCOMM NOTE: Imakefile should add the -DSVR4 to Sun Solaris machines, if not
- XCOMM       use the following:
-@@ -210,8 +210,8 @@
- XCOMM XA_MACH_LIBS = -lc
+ XCOMM If you'd like to change the default directory that XAnim searches while
+ XCOMM looking for dlls, then change the directory below.
+@@ -190,7 +190,7 @@
+ XCOMM XA_CVID_DEF = -DXA_CVID
+ XCOMM XA_CYUV_DEF = -DXA_CYUV
+ XCOMM 
+-XCOMM XA_IV32_LIB = mods/xa2.1_iv32_linuxELF.o
++XCOMM XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o
+ XCOMM XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
+ XCOMM XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
+ XCOMM 
+@@ -267,8 +267,8 @@
+ XCOMM  XA_AUDIO_DEFS =
+ XCOMM 
+ XCOMM ## -- Linux PCs ---------------------------------------------------------
+-XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+-XA_AUDIO_LIBS = -lc
++XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
++XCOMM XA_AUDIO_LIBS = -lc
  XCOMM 
- XCOMM -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)-------
--XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND
--XCOMM XA_AUDIO_LIBS = -lc
-+XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_NEWER_SND
+ XCOMM  -- Linux PC's with OLD Rev sound drivers -------------------------------
+ XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND
+@@ -314,8 +314,8 @@
+ XCOMM  XA_AUDIO_LIBS = -lc
+ XCOMM  
+ XCOMM  -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
+-XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
+-XCOMM  XA_AUDIO_LIBS = -lc
++XA_AUDIO_DEFS = -DXA_LINUX_AUDIO
 +XA_AUDIO_LIBS = -lc
- XCOMM
- XCOMM -- SGI Indigo -----------------------------------------------------------
- XCOMM XA_AUDIO_DEFS = -DXA_SGI_AUDIO
-@@ -325,7 +325,7 @@
- XCOMM   -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
- XCOMM   --  XmbufCreateBuffers).
- XCOMM   -- NOTE_7: HP-UX machines need to comment this out.
--XCOMM XA_MULTIBUF = -DXMBUF
+ XCOMM 
+ XCOMM  -- TOWNS Linux 16 bit PCM ----------------------------------------------
+ XCOMM  XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
+@@ -442,7 +442,7 @@
+ XCOMM    -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
+ XCOMM    --  XmbufCreateBuffers).
+ XCOMM    -- NOTE_8: HP-UX machines need to comment this out.
+-XCOMM  XA_MULTIBUF = -DXMBUF
 +XA_MULTIBUF = -DXMBUF
- XCOMM
- XCOMM ********************
-  
-@@ -345,7 +345,7 @@
+ XCOMM 
+ XCOMM ###########
+ XCOMM 
+@@ -465,7 +465,7 @@
  
- PROGRAMS = xanim
+ PROGRAMS = $(XANIM)
  
 -INCLUDES = -I$(INCDIR) $(XA_INCS)
 +INCLUDES = -I$(INCDIR)/X11 $(XA_INCS)
  
- 
     LIBS1 = $(XA_LIBS) $(EXTENSIONLIB) $(XTOOLLIB) $(XLIB) -lm
+ DEPLIBS1 = $(DEPEXTENSIONLIB) $(DEPXTOOLLIB) $(DEPXLIB)