Make this build and install on NetBSD/amd64

4 files changed, 20 insertions, 12 deletions

diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index 067eb7b5200..9dc6c5a8bc1 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2005/04/05 13:16:50 jschauma Exp $
 #
 
 DISTNAME=		teem-1.8.0-src
@@ -15,11 +15,19 @@ USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386"
-TEEM_ARCH=netbsd.32
+.if ${OPSYS} == "NetBSD"
+.  if ${MACHINE_ARCH} == "i386"
+NARCH=32
+LARCH=32
+.  elif ${MACHINE_ARCH} == "x86_64"
+NARCH=64
+LARCH=amd64
+.  endif
+
+TEEM_ARCH=netbsd.${NARCH}
 
 do-configure:
-	cd ${WRKSRC} && ${CP} -pR linux.32 netbsd.32
+	cd ${WRKSRC} && ${CP} -pR linux.${LARCH} ${TEEM_ARCH}
 
 .elif ${OPSYS} == "Linux" && ${MACHINE_ARCH} == "i386"
 TEEM_ARCH=linux.32
diff --git a/devel/teem/distinfo b/devel/teem/distinfo
index e79551751e1..a1a8a094785 100644
--- a/devel/teem/distinfo
+++ b/devel/teem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2005/04/05 13:16:50 jschauma Exp $
 
 SHA1 (teem-1.8.0-src.tar.gz) = fd57c40136d877d33cb45b2afc54a95564e67225
 RMD160 (teem-1.8.0-src.tar.gz) = 7154b1a7b12a08f7267017e213794673f6192827
 Size (teem-1.8.0-src.tar.gz) = 1127914 bytes
-SHA1 (patch-aa) = fc35c563837dee860a532af78f00fd39af0f3ce4
-SHA1 (patch-ab) = 80831c5833b274ea904d1966872b34aac79df808
+SHA1 (patch-aa) = 6e1ace1828ad71f9ee9c2d395f2cc3fa17f7d4af
+SHA1 (patch-ab) = 0dbbe8290711e18d4c1312a452aaee19a13b5a04
diff --git a/devel/teem/patches/patch-aa b/devel/teem/patches/patch-aa
index 39eab90e155..0e83813cc5e 100644
--- a/devel/teem/patches/patch-aa
+++ b/devel/teem/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2005/04/05 13:16:50 jschauma Exp $
 
 --- /dev/null	2005-04-01 11:19:18.000000000 -0500
 +++ src/make/netbsd.mk	2005-04-01 11:14:31.000000000 -0500
@@ -40,7 +40,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
 +  ARCH_CFLAG = -fPIC -W -Wall -Wno-unused-parameter
 +  ARCH_LDFLAG =
 +else
-+  ifeq ($(SUBARCH),amd64)
++  ifeq ($(SUBARCH),64)
 +    TEEM_32BIT = 0
 +    ARCH_CFLAG = -fPIC -W -Wall -Wno-unused-parameter
 +    ARCH_LDFLAG =
@@ -50,7 +50,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
 +      ARCH_CFLAG = -W -Wall -Wno-unused-parameter
 +      ARCH_LDFLAG = 
 +    else
-+      $(error linux sub-architecture "$(SUBARCH)" not recognized)
++      $(error netbsd sub-architecture "$(SUBARCH)" not recognized)
 +    endif
 +  endif
 +endif
diff --git a/devel/teem/patches/patch-ab b/devel/teem/patches/patch-ab
index e6e495a3440..b39be01ddbd 100644
--- a/devel/teem/patches/patch-ab
+++ b/devel/teem/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2005/04/05 13:16:50 jschauma Exp $
 
 --- src/make/errorCheck.mk.orig	2005-04-01 11:33:01.000000000 -0500
 +++ src/make/errorCheck.mk	2005-04-01 11:33:13.000000000 -0500
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/04/01 18:35:35 jschauma Exp $
  # all the architectures currently supported
  KNOWN_ARCH = irix6.n32 irix6.64 linux.32 linux.ia64 linux.amd64 \
 -  darwin.32 darwin.64 cygwin solaris aix
-+  darwin.32 darwin.64 cygwin solaris aix netbsd.32
++  darwin.32 darwin.64 cygwin solaris aix netbsd.32 netbsd.64
  
  # there is no default architecture
  checkArchSet = $(if $(TEEM_ARCH),,\