Date: Sat, 1 Jun 2002 17:25:32 -0400 (EDT) From: Andrew Gallatin <gallatin@cs.duke.edu> To: Kris Kennaway <kris@obsecurity.org> Cc: portmgr@FreeBSD.ORG, kde@FreeBSD.ORG, alpha@FreeBSD.ORG, re@FreeBSD.ORG Subject: Re: xanim still killing alpha kde builds Message-ID: <15609.15308.231996.450596@moe.cs.duke.edu> In-Reply-To: <20020601134409.A82516@xor.obsecurity.org> References: <20020601134409.A82516@xor.obsecurity.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Kris Kennaway writes: > Is anyone planning to look at fixing this? I've been pointing this > out for a while now. > > http://beta.freebsd.org/errorlogs/4-latest/xanim-2.80.2.log Try the following patch. Most of it was sitting in my tree since last year. I'm not sure if I submitted it before or not. The plist fixup is new & removes refs to the binary x86 codes which aren't available for non-x86 FreeBSD (I generally don't bother fixing plists, all I care about is getting the port compiling ;) Drew Index: Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/xanim/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 16 Jan 2001 17:31:01 -0000 1.26 +++ Makefile 1 Jun 2002 21:12:06 -0000 @@ -18,6 +18,7 @@ MAINTAINER= ports@FreeBSD.org +.if (${MACHINE_ARCH} == "i386") EXTRA_FILES= vid_cvid_2.1_freebsdELFx86.tgz \ vid_cyuv_1.0_freebsdELFx86.tgz \ vid_h261_1.0_freebsdELFx86.tgz \ @@ -25,19 +26,32 @@ vid_iv32_2.1_freebsdELFx86.tgz \ vid_iv41_1.1_freebsdELFx86.tgz \ vid_iv50_1.0_freebsdELFx86.tgz + +DLLDIR= ${PREFIX}/lib/X11/xanim + +PLIST_SUB+= CODECS="" + +.else + +PLIST_SUB+= CODECS="@comment " + +.endif + USE_IMAKE= yes MAN1= xanim.1 -DLLDIR= ${PREFIX}/lib/X11/xanim MAKE_ARGS+= -j 2 # safe and helps even the single-CPU machines post-extract: ${CP} ${WRKSRC}/docs/xanim.man ${WRKSRC} +.if (${MACHINE_ARCH} == "i386") post-install: @${MKDIR} ${DLLDIR} ${INSTALL_DATA} ${WRKDIR}/*.readme ${DLLDIR} ${INSTALL_DATA} ${WRKDIR}/*.xa ${DLLDIR} +.endif + .include <bsd.port.mk> Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/graphics/xanim/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 31 May 1999 09:51:45 -0000 1.5 +++ pkg-plist 1 Jun 2002 21:15:26 -0000 @@ -1,16 +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 +%%CODECS%%lib/X11/xanim/cvid.readme +%%CODECS%%lib/X11/xanim/cyuv.readme +%%CODECS%%lib/X11/xanim/h261.readme +%%CODECS%%lib/X11/xanim/h263.readme +%%CODECS%%lib/X11/xanim/iv32.readme +%%CODECS%%lib/X11/xanim/iv41.readme +%%CODECS%%lib/X11/xanim/iv50.readme +%%CODECS%%lib/X11/xanim/vid_cvid_2.1_freebsdELFx86.xa +%%CODECS%%lib/X11/xanim/vid_cyuv_1.0_freebsdELFx86.xa +%%CODECS%%lib/X11/xanim/vid_h261_1.0_freebsdELFx86.xa +%%CODECS%%lib/X11/xanim/vid_h263_1.0_freebsdELFx86.xa +%%CODECS%%lib/X11/xanim/vid_iv32_2.1_freebsdELFx86.xa +%%CODECS%%lib/X11/xanim/vid_iv41_1.1_freebsdELFx86.xa +%%CODECS%%lib/X11/xanim/vid_iv50_1.0_freebsdELFx86.xa +%%CODECS%%@dirrm lib/X11/xanim Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/graphics/xanim/files/patch-ab,v retrieving revision 1.10 diff -u -r1.10 patch-ab --- files/patch-ab 22 Jun 1999 17:32:53 -0000 1.10 +++ files/patch-ab 2 Aug 2001 18:49:46 -0000 @@ -1,5 +1,5 @@ ---- Imakefile.orig Sun Mar 21 16:36:26 1999 -+++ Imakefile Sat Jun 19 19:23:26 1999 +--- Imakefile.orig Sun Mar 21 17:36:26 1999 ++++ Imakefile Thu Aug 2 14:48:37 2001 @@ -116,12 +116,12 @@ XCOMM XA_DLL_DEF = -DXA_DLL XCOMM @@ -35,20 +35,18 @@ XCOMM XCOMM -- Linux PC's with OLD Rev sound drivers ------------------------------- XCOMM XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND -@@ -314,8 +314,10 @@ +@@ -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 -+#ifdef i386Architecture +XA_AUDIO_DEFS = -DXA_LINUX_AUDIO +XA_AUDIO_LIBS = -lc -+#endif XCOMM XCOMM -- TOWNS Linux 16 bit PCM ---------------------------------------------- XCOMM XA_AUDIO_DEFS = -DXA_TOWNS_AUDIO -@@ -442,7 +444,7 @@ +@@ -442,7 +442,7 @@ XCOMM -- following symbols(XmbufDisplayBuffers, XmbufQueryExtension, XCOMM -- XmbufCreateBuffers). XCOMM -- NOTE_8: HP-UX machines need to comment this out. @@ -57,7 +55,7 @@ XCOMM XCOMM ########### XCOMM -@@ -465,7 +467,7 @@ +@@ -465,7 +465,7 @@ PROGRAMS = $(XANIM) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-alpha" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15609.15308.231996.450596>