diff options
| -rw-r--r-- | multimedia/xanim/Makefile | 18 | ||||
| -rw-r--r-- | multimedia/xanim/Makefile.codecs | 38 | ||||
| -rw-r--r-- | multimedia/xanim/distinfo | 48 | ||||
| -rw-r--r-- | multimedia/xanim/patches/patch-ab | 63 |
4 files changed, 57 insertions, 110 deletions
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index a5506b2f8a3..5624616b166 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -1,21 +1,13 @@ -# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:52 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/10/11 10:06:35 tron Exp $ -DISTNAME= xanim2801 -PKGNAME= xanim-2.80.1 -PKGREVISION= 2 +DISTNAME= xanim2920 +PKGNAME= xanim-2.92.0 CATEGORIES= multimedia x11 -MASTER_SITES= ftp://xanim.va.pubnix.com/\ - ftp://xanim.va.pubnix.com/modules/ \ - ftp://ftp.ut.ee/pub/graphics/xanim/ \ - ftp://ftp.ut.ee/pub/graphics/xanim/modules/ \ - ftp://ftp.ba-stuttgart.de/Mirrors/xanim/ \ - ftp://ftp.ba-stuttgart.de/Mirrors/xanim/modules/ \ - http://smurfland.cit.buffalo.edu/xanim/files/ \ - http://smurfland.cit.buffalo.edu/xanim/files/modules/ +MASTER_SITES= ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/ \ + ftp://ftp.informatik.uni-hamburg.de/pub/soft/graphics/xanim/modules/ DISTFILES= ${EXTRACT_ONLY} ${CODEC_FILES} MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://xanim.va.pubnix.com/ COMMENT= Play most popular animation formats and show pictures EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/multimedia/xanim/Makefile.codecs b/multimedia/xanim/Makefile.codecs index 80042507a36..ba48347eaf5 100644 --- a/multimedia/xanim/Makefile.codecs +++ b/multimedia/xanim/Makefile.codecs @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.codecs,v 1.1.1.1 2004/01/26 15:19:52 jmmv Exp $ +# $NetBSD: Makefile.codecs,v 1.2 2005/10/11 10:06:35 tron Exp $ .include "../../mk/bsd.prefs.mk" @@ -11,28 +11,28 @@ XANIM_CODECS?= ${_XANIM_UNRESTRICTED_CODECS} _XANIM_RESTRICTED_CODECS= cyuv iv32 _XANIM_UNRESTRICTED_CODECS= cvid -_XANIM_CODEC.cvid.i386-a.out= xa2.0_cvid_netbsd386.o.Z -_XANIM_CODEC.cyuv.i386-a.out= xa1.0_cyuv_netbsd386.o.Z -_XANIM_CODEC.iv32.i386-a.out= xa2.0_iv32_netbsd386.o.Z +_XANIM_CODEC.cvid.i386-a.out= xa2.0_cvid_netbsd386.o.gz +_XANIM_CODEC.cyuv.i386-a.out= xa1.0_cyuv_netbsd386.o.gz +_XANIM_CODEC.iv32.i386-a.out= xa2.0_iv32_netbsd386.o.gz -_XANIM_CODEC.cvid.m68k-a.out= xa2.0_cvid_netbsd68k.o.Z -_XANIM_CODEC.cyuv.m68k-a.out= xa1.0_cyuv_netbsd68k.o.Z -_XANIM_CODEC.iv32.m68k-a.out= xa2.0_iv32_netbsd68k.o.Z +_XANIM_CODEC.cvid.m68k-a.out= xa2.0_cvid_netbsd68k.o.gz +_XANIM_CODEC.cyuv.m68k-a.out= xa1.0_cyuv_netbsd68k.o.gz +_XANIM_CODEC.iv32.m68k-a.out= xa2.0_iv32_netbsd68k.o.gz -_XANIM_CODEC.cvid.i386-ELF= xa2.0_cvid_linuxELF.o.Z -_XANIM_CODEC.cyuv.i386-ELF= xa1.0_cyuv_linuxELF.o.Z -_XANIM_CODEC.iv32.i386-ELF= xa2.0_iv32_linuxELF.o.Z +_XANIM_CODEC.cvid.i386-ELF= xa2.0_cvid_linuxELF.o.gz +_XANIM_CODEC.cyuv.i386-ELF= xa1.0_cyuv_linuxELF.o.gz +_XANIM_CODEC.iv32.i386-ELF= xa2.0_iv32_linuxELF.o.gz -_XANIM_CODEC.cvid.sparc-a.out= xa2.0_cvid_sparcCOFF.o.Z -_XANIM_CODEC.cyuv.sparc-a.out= xa1.0_cyuv_sparcAOUT.o.Z -_XANIM_CODEC.iv32.sparc-a.out= xa2.0_iv32_sparcCOFF.o.Z +_XANIM_CODEC.cvid.sparc-a.out= xa2.0_cvid_sparcCOFF.o.gz +_XANIM_CODEC.cyuv.sparc-a.out= xa1.0_cyuv_sparcAOUT.o.gz +_XANIM_CODEC.iv32.sparc-a.out= xa2.0_iv32_sparcCOFF.o.gz -_XANIM_CODEC.cvid.sparc-ELF= xa2.0_cvid_sparcELF.o.Z -_XANIM_CODEC.cyuv.sparc-ELF= xa1.0_cyuv_sparcELF.o.Z -_XANIM_CODEC.iv32.sparc-ELF= xa2.0_iv32_sparcELF.o.Z +_XANIM_CODEC.cvid.sparc-ELF= xa2.0_cvid_sparcELF.o.gz +_XANIM_CODEC.cyuv.sparc-ELF= xa1.0_cyuv_sparcELF.o.gz +_XANIM_CODEC.iv32.sparc-ELF= xa2.0_iv32_sparcELF.o.gz -_XANIM_CODEC.cvid.powerpc-ELF= xa2.0_cvid_linuxPPC.o.Z -_XANIM_CODEC.cyuv.powerpc-ELF= xa1.0_cyuv_linuxPPC.o.Z +_XANIM_CODEC.cvid.powerpc-ELF= xa2.0_cvid_linuxPPC.o.gz +_XANIM_CODEC.cyuv.powerpc-ELF= xa1.0_cyuv_linuxPPC.o.gz _XANIM_DEF.cvid= XA_CVID_DEF="-DXA_CVID" _XANIM_DEF.cyuv= XA_CYUV_DEF="-DXA_CYUV" @@ -49,7 +49,7 @@ _XANIM_MACH_TYPE= ${MACHINE_ARCH}-${OBJECT_FMT} CODECS+= ${_codec_} CODEC_FILES+= ${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}} MAKE_ENV+= ${_XANIM_DEF.${_codec_}} -MAKE_ENV+= ${_XANIM_LIB.${_codec_}}="mods/${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}:S/.Z$//}" +MAKE_ENV+= ${_XANIM_LIB.${_codec_}}="mods/${_XANIM_CODEC.${_codec_}.${_XANIM_MACH_TYPE}:S/.gz$//}" . if !empty(_XANIM_RESTRICTED_CODECS:M${_codec_}) _RESTRICTED_CODECS+= ${_codec_} . endif diff --git a/multimedia/xanim/distinfo b/multimedia/xanim/distinfo index 9a74d1c1ec4..b9f98213beb 100644 --- a/multimedia/xanim/distinfo +++ b/multimedia/xanim/distinfo @@ -1,42 +1,10 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $ +$NetBSD: distinfo,v 1.3 2005/10/11 10:06:35 tron Exp $ -SHA1 (xanim2801.tar.gz) = 1966880880c3779d02199fbcd1acb771bc57f754 -RMD160 (xanim2801.tar.gz) = d6cf77cb288d17866c569cb6cb571f87115ae6c0 -Size (xanim2801.tar.gz) = 441250 bytes -SHA1 (xa2.0_cvid_netbsd386.o.Z) = eea4f7c94bd7dcfd7e592add0fa415cb1514efa0 -Size (xa2.0_cvid_netbsd386.o.Z) = 4067 bytes -SHA1 (xa2.0_iv32_netbsd386.o.Z) = e096322d85c21a8bf6afb5c8cd066c52cdd6e132 -Size (xa2.0_iv32_netbsd386.o.Z) = 46631 bytes -SHA1 (xa1.0_cyuv_netbsd386.o.Z) = 08ad405baeffb1f72b9f9d960d0c11f6d81e7c07 -Size (xa1.0_cyuv_netbsd386.o.Z) = 937 bytes -SHA1 (xa2.0_cvid_linuxELF.o.Z) = 7ce0db7c2007f13294342a863a90000a5d097b4f -RMD160 (xa2.0_cvid_linuxELF.o.Z) = ab6589c8147ccaf9e236549956334cb57bbbbb35 -Size (xa2.0_cvid_linuxELF.o.Z) = 4382 bytes -SHA1 (xa2.0_iv32_linuxELF.o.Z) = 937368f4f90f9023955b59e54c1182804e40d7ed -Size (xa2.0_iv32_linuxELF.o.Z) = 46511 bytes -SHA1 (xa1.0_cyuv_linuxELF.o.Z) = 71a81709b161a48e75d05a2a612f1f62034fee15 -Size (xa1.0_cyuv_linuxELF.o.Z) = 1242 bytes -SHA1 (xa2.0_cvid_netbsd68k.o.Z) = 1e56d834c6bb3a0e26e2872601dfa9082487345c -Size (xa2.0_cvid_netbsd68k.o.Z) = 3779 bytes -SHA1 (xa2.0_iv32_netbsd68k.o.Z) = 9de53c2225d0ae117c7b23fa7415017611058441 -Size (xa2.0_iv32_netbsd68k.o.Z) = 44353 bytes -SHA1 (xa1.0_cyuv_netbsd68k.o.Z) = 8478c3240581c2887dc63a7a9eac2cdb79f610a2 -Size (xa1.0_cyuv_netbsd68k.o.Z) = 942 bytes -SHA1 (xa2.0_cvid_sparcCOFF.o.Z) = 1306ee5c88415b4a67b65247d41fa03101526a64 -Size (xa2.0_cvid_sparcCOFF.o.Z) = 4535 bytes -SHA1 (xa2.0_iv32_sparcCOFF.o.Z) = 0307f18f02763b2b3229ed4b3a00eeec7bc2c56d -Size (xa2.0_iv32_sparcCOFF.o.Z) = 48525 bytes -SHA1 (xa1.0_cyuv_sparcAOUT.o.Z) = c31c60ac3a519bbdce9e4d9652f274b1194e880a -Size (xa1.0_cyuv_sparcAOUT.o.Z) = 1048 bytes -SHA1 (xa2.0_cvid_sparcELF.o.Z) = 7c256a74a389a7ef4b455a9f6d9e9a3d084cfe3c -Size (xa2.0_cvid_sparcELF.o.Z) = 4730 bytes -SHA1 (xa2.0_iv32_sparcELF.o.Z) = 3837819a50d3d430149ac0f498db30cdec6245f3 -Size (xa2.0_iv32_sparcELF.o.Z) = 48813 bytes -SHA1 (xa1.0_cyuv_sparcELF.o.Z) = 6ad551439086a5c884d9a88971261cc7e60aad60 -Size (xa1.0_cyuv_sparcELF.o.Z) = 1277 bytes -SHA1 (xa2.0_cvid_linuxPPC.o.Z) = d6736d7fe65008293863c31b8f4c28e13152afda -Size (xa2.0_cvid_linuxPPC.o.Z) = 5192 bytes -SHA1 (xa1.0_cyuv_linuxPPC.o.Z) = b9af24646b46d94ccfb5e042ca20f32006a8b0af -Size (xa1.0_cyuv_linuxPPC.o.Z) = 1513 bytes -SHA1 (patch-ab) = b55ebcb351152de078b7dd167b82a59cf5f61eb1 +SHA1 (xanim2920.tar.gz) = 8adb5948cc6fd9bba5417aee4d319b5f041830e8 +RMD160 (xanim2920.tar.gz) = dae33cdbd9f20388a067df8269b625f2594cdfb9 +Size (xanim2920.tar.gz) = 431258 bytes +SHA1 (xa2.0_cvid_linuxELF.o.gz) = ee89eac0b33bcee81093464824eed75aa52213f3 +RMD160 (xa2.0_cvid_linuxELF.o.gz) = a3835a5f07b5eaeafcc8dea9766c8e0d49a60746 +Size (xa2.0_cvid_linuxELF.o.gz) = 3174 bytes +SHA1 (patch-ab) = 09b48077c2d7e524727aee911e8346b2a391a53a SHA1 (patch-ae) = 6023e76bc0471a0810b0789cd24355c06eac02b8 diff --git a/multimedia/xanim/patches/patch-ab b/multimedia/xanim/patches/patch-ab index d5ed69a126e..c8363d72d18 100644 --- a/multimedia/xanim/patches/patch-ab +++ b/multimedia/xanim/patches/patch-ab @@ -1,31 +1,16 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 15:19:53 jmmv Exp $ +$NetBSD: patch-ab,v 1.2 2005/10/11 10:06:35 tron Exp $ ---- Imakefile.orig Sun Mar 21 14:36:26 1999 -+++ Imakefile -@@ -96,9 +96,10 @@ XCOMM Specify any Linker flags needed - XCOMM to link against symbols inside xanim. - XCOMM - XCOMM ## Linux --LD_FLAGS = -rdynamic -+XCOMM LD_FLAGS = -rdynamic - XCOMM ## SunOS/Solaris use: - XCOMM LD_FLAGS = -+LD_FLAGS = - - - XCOMM ######################################################################### -@@ -111,17 +112,17 @@ XCOMM - XCOMM NOTE: not all machines need the XA_DLL_LIB define. - XCOMM ######################################################################### - XCOMM --XA_DLL_DEF = -DXA_DLL -DXA_PRINT -+XCOMM XA_DLL_DEF = -DXA_DLL -DXA_PRINT - XCOMM ### Use this only if the above doesn't work - XCOMM XA_DLL_DEF = -DXA_DLL +--- Imakefile.orig 2002-04-21 00:25:06.000000000 +0100 ++++ Imakefile 2005-10-11 10:56:41.000000000 +0100 +@@ -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 ### You may need this library. --XA_DLL_LIB = -ldl -+XCOMM XA_DLL_LIB = -ldl XCOMM XCOMM If you'd like to change the default directory that XAnim searches while XCOMM looking for dlls, then change the directory below. @@ -34,19 +19,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/01/26 15:19:53 jmmv Exp $ +XA_DLL_PATH = ${PREFIX}/lib/xanim - -@@ -267,8 +268,8 @@ XCOMM -- NOTE_9 Since xanim doesn't yet - 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 ######################################################################### +@@ -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 -- Linux PC's with OLD Rev sound drivers ------------------------------- - XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND -@@ -465,7 +466,7 @@ DEFINES = $(XA_DEFS) + XCOMM ------ AF (AudioFile) Support ------------------------------------------ + XCOMM -- You need to indicate where the AF libraries libAFUtil.a and libAF.a +@@ -470,7 +470,7 @@ PROGRAMS = $(XANIM) |