From d7ccf63375cb9961620931e39632202210c407a0 Mon Sep 17 00:00:00 2001 From: Andrew Gallatin Date: Sat, 1 Jun 2002 22:03:31 +0000 Subject: [PATCH] Make this build and install cleanly on alpha so as to unblock the kde build. Approved by: kris --- graphics/xanim/Makefile | 16 +++++++++++++++- graphics/xanim/files/patch-ab | 12 +++++------- graphics/xanim/pkg-plist | 30 +++++++++++++++--------------- multimedia/xanim/Makefile | 16 +++++++++++++++- multimedia/xanim/files/patch-ab | 12 +++++------- multimedia/xanim/pkg-plist | 30 +++++++++++++++--------------- 6 files changed, 70 insertions(+), 46 deletions(-) diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile index 29266b79fe43..0b829719d1dd 100644 --- a/graphics/xanim/Makefile +++ b/graphics/xanim/Makefile @@ -18,6 +18,7 @@ PATCHFILES= xanim-2801-to-2802-patch.gz 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 @@ EXTRA_FILES= vid_cvid_2.1_freebsdELFx86.tgz \ 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 diff --git a/graphics/xanim/files/patch-ab b/graphics/xanim/files/patch-ab index 48a6abd19637..8e3d9076c495 100644 --- a/graphics/xanim/files/patch-ab +++ b/graphics/xanim/files/patch-ab @@ -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) diff --git a/graphics/xanim/pkg-plist b/graphics/xanim/pkg-plist index cf26d8c7ab7e..20542ee19e24 100644 --- a/graphics/xanim/pkg-plist +++ b/graphics/xanim/pkg-plist @@ -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 diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile index 29266b79fe43..0b829719d1dd 100644 --- a/multimedia/xanim/Makefile +++ b/multimedia/xanim/Makefile @@ -18,6 +18,7 @@ PATCHFILES= xanim-2801-to-2802-patch.gz 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 @@ EXTRA_FILES= vid_cvid_2.1_freebsdELFx86.tgz \ 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 diff --git a/multimedia/xanim/files/patch-ab b/multimedia/xanim/files/patch-ab index 48a6abd19637..8e3d9076c495 100644 --- a/multimedia/xanim/files/patch-ab +++ b/multimedia/xanim/files/patch-ab @@ -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) diff --git a/multimedia/xanim/pkg-plist b/multimedia/xanim/pkg-plist index cf26d8c7ab7e..20542ee19e24 100644 --- a/multimedia/xanim/pkg-plist +++ b/multimedia/xanim/pkg-plist @@ -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