4 files changed, 49 insertions, 34 deletions

diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index b56a74e42f9a..6138f587fc32 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -1,48 +1,38 @@
 # New ports collection makefile for:	xanim
-# Version required:     2.70.6.4
+# Version required:     2.80.1
 # Date created:         Sat Nov 5 11:43:03 PST 1994
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.17 1998/11/21 07:27:36 steve Exp $
+# $Id: Makefile,v 1.18 1999/03/31 13:32:24 flathill Exp $
 #
 
 DISTNAME=       xanim2801
 PKGNAME=        xanim-2.80.1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://xanim.va.pubnix.com/ \
-		ftp://xanim.va.pubnix.com/modules/
-DISTFILES=	${EXTRACT_ONLY} ${EXTRA_FILES}
+		ftp://xanim.va.pubnix.com/dlls/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
 
 MAINTAINER=	ports@FreeBSD.ORG
 
-EXTRACT_ONLY=   ${DISTNAME}.tar.gz
+EXTRA_FILES=    vid_cvid_2.1_freebsdELFx86.tgz \
+		vid_cyuv_1.0_freebsdELFx86.tgz \
+		vid_h261_1.0_freebsdELFx86.tgz \
+		vid_h263_1.0_freebsdELFx86.tgz \
+		vid_iv32_2.1_freebsdELFx86.tgz \
+		vid_iv41_1.1_freebsdELFx86.tgz \
+		vid_iv50_1.0_freebsdELFx86.tgz
 USE_IMAKE=	yes
 MAN1=		xanim.1
-MAKE_ENV=	XA_IV32_DEF=-DXA_INDEO \
-		XA_CVID_DEF=-DXA_CINEPAK \
-		XA_CYUV_DEF=-DXA_CYUV
 
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-EXTRA_FILES=    xa2.0_cvid_netbsd386.o.Z xa2.0_iv32_netbsd386.o.Z \
-		xa1.0_cyuv_netbsd386.o.Z
-MAKE_ENV+=	XA_IV32_LIB=xa2.0_cvid_netbsd386.o \
-		XA_CVID_LIB=xa2.0_iv32_netbsd386.o \
-		XA_CYUV_LIB=xa1.0_cyuv_netbsd386.o
-.else
-EXTRA_FILES=    xa2.0_cvid_linuxELF.o.Z xa2.0_iv32_linuxELF.o.Z \
-		xa1.0_cyuv_linuxELF.o.Z
-MAKE_ENV+=	XA_IV32_LIB=xa2.0_cvid_linuxELF.o \
-		XA_CVID_LIB=xa2.0_iv32_linuxELF.o \
-		XA_CYUV_LIB=xa1.0_cyuv_linuxELF.o
-.endif
+DLLDIR=		${PREFIX}/lib/X11/xanim
 
 post-extract:
-	@for file in ${EXTRA_FILES}; do \
-	  ${CP} ${DISTDIR}/$$file ${WRKSRC}; \
-	  uncompress ${WRKSRC}/$$file; \
-	done
 	${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC}
 
-.include <bsd.port.post.mk>
+post-install:
+	@${MKDIR} ${DLLDIR}
+	${INSTALL_DATA} ${WRKDIR}/*.readme ${DLLDIR}
+	${INSTALL_DATA} ${WRKDIR}/*.xa ${DLLDIR}
+
+.include <bsd.port.mk>
diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo
index c360bdcda7e4..c738feb85dd1 100644
--- a/multimedia/xanim/distinfo
+++ b/multimedia/xanim/distinfo
@@ -1,4 +1,8 @@
 MD5 (xanim2801.tar.gz) = e2ecd086c160f18dd7cc3cac438758c2
-MD5 (xa2.0_cvid_linuxELF.o.Z) = 3b4e0575227a595267f8ea8c8dc389d4
-MD5 (xa2.0_iv32_linuxELF.o.Z) = 6d96884a3ab902efb3315388c5091c42
-MD5 (xa1.0_cyuv_linuxELF.o.Z) = 1485e89ede4f392229b3dbee0015b59d
+MD5 (vid_cvid_2.1_freebsdELFx86.tgz) = 964ac87b45c85c97d4c86a5f98fbbf71
+MD5 (vid_cyuv_1.0_freebsdELFx86.tgz) = ccdf14f08c9e989f18e25eb06a5053b7
+MD5 (vid_h261_1.0_freebsdELFx86.tgz) = 7b5ee2ea93e365fd12efcb29321720bd
+MD5 (vid_h263_1.0_freebsdELFx86.tgz) = 8c9b389944ee853b7b3469bde714729b
+MD5 (vid_iv32_2.1_freebsdELFx86.tgz) = 04ae2a4e86f28927e9d4adc1bf143861
+MD5 (vid_iv41_1.1_freebsdELFx86.tgz) = f2b3f2bc8e6763581a2c8aceba632930
+MD5 (vid_iv50_1.0_freebsdELFx86.tgz) = 47b8ec7a998386807b564666c6b0ea34
diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-ab
index 4f9e8ee43b93..6b75d3202398 100644
--- a/multimedia/xanim/files/patch-ab
+++ b/multimedia/xanim/files/patch-ab
@@ -1,6 +1,6 @@
---- Imakefile.orig	Sun Mar 21 14:36:26 1999
-+++ Imakefile	Mon Mar 29 12:01:48 1999
-@@ -116,7 +116,7 @@
+--- Imakefile.orig	Sun Mar 21 23:36:26 1999
++++ Imakefile	Fri May 28 15:57:16 1999
+@@ -116,12 +116,12 @@
  XCOMM XA_DLL_DEF = -DXA_DLL
  XCOMM
  XCOMM ### You may need this library.
@@ -9,6 +9,12 @@
  XCOMM
  XCOMM If you'd like to change the default directory that XAnim searches while
  XCOMM looking for dlls, then change the directory below.
+ XCOMM
+-XA_DLL_PATH = /usr/local/xanim/mods
++XA_DLL_PATH = $(LIBDIR)/xanim/mods
+ 
+ 
+ 
 @@ -190,7 +190,7 @@
  XCOMM XA_CVID_DEF = -DXA_CVID
  XCOMM XA_CYUV_DEF = -DXA_CYUV
diff --git a/multimedia/xanim/pkg-plist b/multimedia/xanim/pkg-plist
index efa140f5669d..cf26d8c7ab7e 100644
--- a/multimedia/xanim/pkg-plist
+++ b/multimedia/xanim/pkg-plist
@@ -1 +1,16 @@
 bin/xanim
+lib/X11/xanim/cvid.readme
+lib/X11/xanim/cyuv.readme
+lib/X11/xanim/h261.readme
+lib/X11/xanim/h263.readme
+lib/X11/xanim/iv32.readme
+lib/X11/xanim/iv41.readme
+lib/X11/xanim/iv50.readme
+lib/X11/xanim/vid_cvid_2.1_freebsdELFx86.xa
+lib/X11/xanim/vid_cyuv_1.0_freebsdELFx86.xa
+lib/X11/xanim/vid_h261_1.0_freebsdELFx86.xa
+lib/X11/xanim/vid_h263_1.0_freebsdELFx86.xa
+lib/X11/xanim/vid_iv32_2.1_freebsdELFx86.xa
+lib/X11/xanim/vid_iv41_1.1_freebsdELFx86.xa
+lib/X11/xanim/vid_iv50_1.0_freebsdELFx86.xa
+@dirrm lib/X11/xanim