4 files changed, 86 insertions, 38 deletions

diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 2176081d93c3..d837fe46745c 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -6,15 +6,12 @@
 #
 
 PORTNAME=	xanim
-PORTVERSION=	2.80.2
+PORTVERSION=	2.92.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://xanim.va.pubnix.com/ \
+MASTER_SITES=	ftp://xanim.va.pubnix.com/:main \
 		ftp://xanim.va.pubnix.com/dlls/
-DISTNAME=	xanim2801
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
-
-PATCH_SITES=	http://virtual-estates.net/port-stuff/
-PATCHFILES=	xanim-2801-to-2802-patch.gz
+DISTNAME=	xanim2920
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main ${EXTRA_FILES}
 
 MAINTAINER=	dinoex@FreeBSD.org
 
diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo
index f9720ba9118d..b2fcbe610781 100644
--- a/multimedia/xanim/distinfo
+++ b/multimedia/xanim/distinfo
@@ -1,4 +1,4 @@
-MD5 (xanim2801.tar.gz) = e2ecd086c160f18dd7cc3cac438758c2
+MD5 (xanim2920.tar.gz) = 3613e6256857f7270d39bba8efd3a5dc
 MD5 (vid_cvid_2.1_freebsdELFx86.tgz) = 964ac87b45c85c97d4c86a5f98fbbf71
 MD5 (vid_cyuv_1.0_freebsdELFx86.tgz) = ccdf14f08c9e989f18e25eb06a5053b7
 MD5 (vid_h261_1.0_freebsdELFx86.tgz) = 7b5ee2ea93e365fd12efcb29321720bd
diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-ab
index 8e3d9076c495..20268744731c 100644
--- a/multimedia/xanim/files/patch-ab
+++ b/multimedia/xanim/files/patch-ab
@@ -1,11 +1,32 @@
---- Imakefile.orig	Sun Mar 21 17:36:26 1999
-+++ Imakefile	Thu Aug  2 14:48:37 2001
-@@ -116,12 +116,12 @@
+--- Imakefile.orig	Sun Apr 21 01:25:06 2002
++++ Imakefile	Thu Jan  2 07:53:41 2003
+@@ -96,7 +96,7 @@
+ XCOMM   to link against symbols inside xanim.
+ XCOMM 
+ XCOMM ## Linux
+-XCOMM LD_FLAGS = -rdynamic
++LD_FLAGS = -rdynamic
+ XCOMM
+ XCOMM ## SunOS/Solaris use:
+ XCOMM LD_FLAGS =
+@@ -112,7 +112,7 @@
+ XCOMM NOTE: not all machines need the XA_DLL_LIB define.
+ XCOMM #########################################################################
+ XCOMM 
+-XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT
++XA_DLL_DEF = -DXA_DLL -DXA_PRINT
+ XCOMM ### Use this only if the above doesn't work
  XCOMM XA_DLL_DEF = -DXA_DLL
  XCOMM
- XCOMM ### You may need this library.
--XA_DLL_LIB = -ldl
-+XCOMM XA_DLL_LIB = -ldl
+@@ -120,14 +120,14 @@
+ XCOMM XA_DLL_LIB = -ldl
+ XCOMM
+ XCOMM HP/UX should use the following:
+-XA_DLL_DEF = -DXA_HPDLL
+-XA_DLL_LIB = -Wl,-E -ldld
++XCOMM XA_DLL_DEF = -DXA_HPDLL
++XCOMM XA_DLL_LIB = -Wl,-E -ldld
+ XCOMM
  XCOMM
  XCOMM If you'd like to change the default directory that XAnim searches while
  XCOMM looking for dlls, then change the directory below.
@@ -14,28 +35,8 @@
 +XA_DLL_PATH = $(LIBDIR)/xanim
  
  
- 
-@@ -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  -- Linux PC's with OLD Rev sound drivers -------------------------------
- XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND
-@@ -314,8 +314,8 @@
+ XCOMM #########################################################################
+@@ -319,8 +319,8 @@
  XCOMM  XA_AUDIO_LIBS = -lc
  XCOMM  
  XCOMM  -- Also FreeBSD, and BSDI with SBlast-BSD-1.5 (development stages)------
@@ -46,7 +47,20 @@
  XCOMM 
  XCOMM  -- TOWNS Linux 16 bit PCM ----------------------------------------------
  XCOMM  XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO
-@@ -442,7 +442,7 @@
+@@ -351,9 +351,9 @@
+ XCOMM  XA_AUDIO_LIBS = -lAlib
+ XCOMM  --
+ XCOMM  -- HP/UX 10.x AServer
+-XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
+-XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
+-XA_AUDIO_INCS = -I/opt/audio/include
++XCOMM  XA_AUDIO_DEFS = -DXA_HP_AUDIO -DXA_HP10
++XCOMM  XA_AUDIO_LIBS = -L/opt/audio/lib -lAlib
++XCOMM  XA_AUDIO_INCS = -I/opt/audio/include
+ XCOMM 
+ XCOMM  ------ AF (AudioFile) Support ------------------------------------------
+ XCOMM  -- You need to indicate where the AF libraries libAFUtil.a and libAF.a
+@@ -447,7 +447,7 @@
  XCOMM    -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension,
  XCOMM    --  XmbufCreateBuffers).
  XCOMM    -- NOTE_8: HP-UX machines need to comment this out.
@@ -55,7 +69,7 @@
  XCOMM 
  XCOMM ###########
  XCOMM 
-@@ -465,7 +465,7 @@
+@@ -470,7 +470,7 @@
  
  PROGRAMS = $(XANIM)
  
diff --git a/multimedia/xanim/files/patch-xa_vid_codec.c b/multimedia/xanim/files/patch-xa_vid_codec.c
new file mode 100644
index 000000000000..36e13f53bb22
--- /dev/null
+++ b/multimedia/xanim/files/patch-xa_vid_codec.c
@@ -0,0 +1,37 @@
+--- xa_vid_codec.c.orig	Sun Apr 21 01:20:46 2002
++++ xa_vid_codec.c	Thu Jan  2 07:30:36 2003
+@@ -169,7 +169,9 @@
+   if ((mod_path == 0) || (*mod_path==0))
+ 			mod_path = "/usr/local/xanim/mods";
+ 
++#ifndef __FreeBSD__
+   fprintf(stderr,"ModPath: %s\n",mod_path);/*CLEAN*/
++#endif
+ 
+   len = strlen( mod_path );
+   what_fun = (double)cos(45.0);
+@@ -186,7 +188,9 @@
+ 
+   dp = path_buf;
+ 
++#ifndef __FreeBSD__
+   fprintf(stderr,"PathBuf: %s\n",dp);/*CLEAN*/
++#endif
+ 
+   while( dp && *dp )
+   { char *t1p, *t2p;
+@@ -211,10 +215,14 @@
+   char *end_of_dir;
+   int len;
+ 
++#ifndef __FreeBSD__
+   fprintf(stderr,"ScanDir: a\n");/*CLEAN*/
++#endif
+   if (dir_name == 0) return;
+ 
++#ifndef __FreeBSD__
+   fprintf(stderr,"ScanDir: %s\n",dir_name);/*CLEAN*/
++#endif
+ 
+   DEBUG_LEVEL1 fprintf(stderr,"dirname: %s\n", dir_name );
+