Use Linux ELF object files for NetBSD-i386 ELF as suggested by

Klaus Klein in PR pkg/7355.

3 files changed, 45 insertions, 25 deletions

diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index afac0549025..16d7c4c83fd 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/03/28 07:55:05 rh Exp $
+# $NetBSD: Makefile,v 1.15 1999/07/07 23:11:18 tron Exp $
 #
 
 DISTNAME=	xanim2801
@@ -22,19 +22,6 @@ HOMEPAGE=	http://xanim.va.pubnix.com/
 
 EXTRACT_ONLY=   ${DISTNAME}.tar.gz
 
-.if (${MACHINE_ARCH} == "i386")
-EXTRA_FILES=	xa2.0_cvid_netbsd386.o.Z \
-		xa2.0_iv32_netbsd386.o.Z \
-		xa1.0_cyuv_netbsd386.o.Z
-.elif (${MACHINE_ARCH} == "m68k")
-EXTRA_FILES=	xa2.0_cvid_netbsd68k.o.Z \
-		xa2.0_iv32_netbsd68k.o.Z \
-		xa1.0_cyuv_netbsd68k.o.Z
-.elif (${MACHINE_ARCH} == "sparc")
-EXTRA_FILES=	xa2.0_cvid_sparcCOFF.o.Z \
-		xa2.0_iv32_sparcCOFF.o.Z \
-		xa1.0_cyuv_sparcAOUT.o.Z
-.endif
 # we can't mirror/distribute iv32 or cyuv object modules
 MIRROR_DISTFILE=	no
 
@@ -48,8 +35,32 @@ post-extract:
 	  ${GUNZIP_CMD} ${WRKSRC}/mods/$$file; \
 	done
 
+pre-configure:
+	@${ECHO} >${WRKSRC}/objarch.tmpl \
+	  "MACHINE_OBJ_ARCH = ${MACHINE_OBJ_ARCH}"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xanim ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xanim.0 ${PREFIX}/man/cat1
 
 .include "../../mk/bsd.pkg.mk"
+
+MACHINE_OBJ_ARCH=	${MACHINE_ARCH}-${OBJECT_FMT}
+
+.if (${MACHINE_OBJ_ARCH} == "i386-a.out")
+EXTRA_FILES=	xa2.0_cvid_netbsd386.o.Z \
+		xa2.0_iv32_netbsd386.o.Z \
+		xa1.0_cyuv_netbsd386.o.Z
+.elif (${MACHINE_OBJ_ARCH} == "i386-ELF")
+EXTRA_FILES=	xa2.0_cvid_linuxELF.o.Z \
+		xa2.0_iv32_linuxELF.o.Z \
+		xa1.0_cyuv_linuxELF.o.Z
+.elif (${MACHINE_OBJ_ARCH} == "m68k-a.out")
+EXTRA_FILES=	xa2.0_cvid_netbsd68k.o.Z \
+		xa2.0_iv32_netbsd68k.o.Z \
+		xa1.0_cyuv_netbsd68k.o.Z
+.elif (${MACHINE_OBJ_ARCH} == "sparc-a.out")
+EXTRA_FILES=	xa2.0_cvid_sparcCOFF.o.Z \
+		xa2.0_iv32_sparcCOFF.o.Z \
+		xa1.0_cyuv_sparcAOUT.o.Z
+.endif
diff --git a/graphics/xanim/files/md5 b/graphics/xanim/files/md5
index 26915b97f6b..42ca947176a 100644
--- a/graphics/xanim/files/md5
+++ b/graphics/xanim/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.6 1999/03/28 07:55:05 rh Exp $
+$NetBSD: md5,v 1.7 1999/07/07 23:11:19 tron Exp $
 
 MD5 (xanim2801.tar.gz) = e2ecd086c160f18dd7cc3cac438758c2
 MD5 (xa2.0_cvid_netbsd386.o.Z) = 80a70d69ea532c7f32a074381fff8468
@@ -10,3 +10,6 @@ MD5 (xa1.0_cyuv_netbsd68k.o.Z) = 2f96a0dd71bd8b55524d6f9a069ac574
 MD5 (xa2.0_cvid_sparcCOFF.o.Z) = 185589de06545d83abeb8298a0811267
 MD5 (xa2.0_iv32_sparcCOFF.o.Z) = 95fa08efd7d9982814b51c9bf01417fa
 MD5 (xa1.0_cyuv_sparcAOUT.o.Z) = d5be03b7dcb60b2d9be6e6892fb1c7aa
+MD5 (xa2.0_cvid_linuxELF.o.Z) = 3b4e0575227a595267f8ea8c8dc389d4
+MD5 (xa2.0_iv32_linuxELF.o.Z) = 6d96884a3ab902efb3315388c5091c42
+MD5 (xa1.0_cyuv_linuxELF.o.Z) = 1485e89ede4f392229b3dbee0015b59d
diff --git a/graphics/xanim/patches/patch-ab b/graphics/xanim/patches/patch-ab
index 9a8b7fc1cf0..7227c2427e0 100644
--- a/graphics/xanim/patches/patch-ab
+++ b/graphics/xanim/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $
+$NetBSD: patch-ab,v 1.7 1999/07/07 23:11:19 tron Exp $
 
 --- Imakefile.orig	Sun Mar 21 23:36:26 1999
-+++ Imakefile	Sun Mar 28 09:14:27 1999
++++ Imakefile	Thu Jul  8 00:55:07 1999
 @@ -96,9 +96,9 @@
  XCOMM   to link against symbols inside xanim.
  XCOMM 
@@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $
  
  
  
-@@ -186,13 +186,29 @@
+@@ -186,13 +186,35 @@
  XCOMM  
  XCOMM  Again don't use these if you are using the dynamically loadable modules.
  XCOMM 
@@ -46,21 +46,27 @@ $NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $
 -XCOMM XA_IV32_LIB = mods/xa2.1_iv32_linuxELF.o
 -XCOMM XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
 -XCOMM XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
-+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "m68k") || (${MACHINE_ARCH} == "sparc")
++#include "objarch.tmpl"
++
++.if (${MACHINE_OBJ_ARCH} == "i386-a.out") || (${MACHINE_OBJ_ARCH} == "i386-ELF") || (${MACHINE_OBJ_ARCH} == "m68k-a.out") || (${MACHINE_OBJ_ARCH} == "sparc-a.out")
 +XA_IV32_DEF = -DXA_IV32 
 +XA_CVID_DEF = -DXA_CVID
 +XA_CYUV_DEF = -DXA_CYUV
 +.endif
 +XCOMM
-+.if (${MACHINE_ARCH} == "i386")
++.if (${MACHINE_OBJ_ARCH} == "i386-a.out")
 +XA_IV32_LIB = mods/xa2.0_iv32_netbsd386.o
 +XA_CVID_LIB = mods/xa2.0_cvid_netbsd386.o
 +XA_CYUV_LIB = mods/xa1.0_cyuv_netbsd386.o
-+.elif (${MACHINE_ARCH} == "m68k")
++.elif (${MACHINE_OBJ_ARCH} == "i386-ELF")
++XA_IV32_LIB = mods/xa2.0_iv32_linuxELF.o
++XA_CVID_LIB = mods/xa2.0_cvid_linuxELF.o
++XA_CYUV_LIB = mods/xa1.0_cyuv_linuxELF.o
++.elif (${MACHINE_OBJ_ARCH} == "m68k-a.out")
 +XA_IV32_LIB = mods/xa2.0_iv32_netbsd68k.o
 +XA_CVID_LIB = mods/xa2.0_cvid_netbsd68k.o
 +XA_CYUV_LIB = mods/xa1.0_cyuv_netbsd68k.o
-+.elif (${MACHINE_ARCH} == "sparc")
++.elif (${MACHINE_OBJ_ARCH} == "sparc-a.out")
 +XA_IV32_LIB = mods/xa2.0_iv32_sparcCOFF.o
 +XA_CVID_LIB = mods/xa2.0_cvid_sparcCOFF.o
 +XA_CYUV_LIB = mods/xa1.0_cyuv_sparcAOUT.o
@@ -72,7 +78,7 @@ $NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $
  XCOMM 
  XCOMM ##########################
  XCOMM  NOTE: SGI Machines Only: 
-@@ -267,8 +283,8 @@
+@@ -267,8 +289,8 @@
  XCOMM  XA_AUDIO_DEFS =
  XCOMM 
  XCOMM ## -- Linux PCs ---------------------------------------------------------
@@ -83,7 +89,7 @@ $NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $
  XCOMM 
  XCOMM  -- Linux PC's with OLD Rev sound drivers -------------------------------
  XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_LINUX_OLDER_SND
-@@ -307,7 +323,7 @@
+@@ -307,7 +329,7 @@
  XCOMM  XA_AUDIO_DEFS = -DXA_SONY_AUDIO
  XCOMM 
  XCOMM  -- NetBSD-current (as of 30/April 1995)---------------------------------
@@ -92,7 +98,7 @@ $NetBSD: patch-ab,v 1.6 1999/03/28 07:55:05 rh Exp $
  XCOMM 
  XCOMM  -- QNX 4.2 PC's --------------------------------------------------------
  XCOMM  XA_AUDIO_DEFS = -DXA_LINUX_AUDIO -DXA_SELECT
-@@ -465,7 +481,7 @@
+@@ -465,7 +487,7 @@
  
  PROGRAMS = $(XANIM)