Update to version 15.18 and ELF'ize.

PR:		7887, 7909
Submitted by:	maintainer

3 files changed, 57 insertions, 78 deletions

diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 3e2e2b8f8f8f..04044cf1d978 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,23 +1,23 @@
 # New ports collection makefile for:	crafty
-# Version required:			15.17
+# Version required:			15.18
 # Date created:				31 May 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
-# $Id: Makefile,v 1.4 1998/06/30 03:19:21 mph Exp $
+# $Id: Makefile,v 1.5 1998/08/09 23:57:50 steve Exp $
 #
 
-DISTNAME=	crafty-15.17
+DISTNAME=	crafty-15.18
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/ \
 		ftp://ftp.cis.uab.edu/pub/hyatt/common/ \
 		ftp://ftp.cis.uab.edu/pub/hyatt/v15/
-DISTFILES=	crafty-15.17.tar.gz crafty.doc crafty.faq read.me start.zip
+DISTFILES=	crafty-15.18.tar.gz crafty.doc crafty.faq read.me start.zip
 
 MAINTAINER=	seggers@semyam.dinoco.de
 
 ALL_TARGET=	crafty
 DIST_SUBDIR=	crafty
-EXTRACT_ONLY=	crafty-15.17.tar.gz
+EXTRACT_ONLY=	crafty-15.18.tar.gz
 
 MAN6=		crafty.6
 NO_WRKSUBDIR=	yes
diff --git a/games/crafty/distinfo b/games/crafty/distinfo
index 212d10808730..372b2f618ac3 100644
--- a/games/crafty/distinfo
+++ b/games/crafty/distinfo
@@ -1,5 +1,5 @@
-MD5 (crafty/crafty-15.17.tar.gz) = a22c30f24e888bdb9bce1725023bbb1a
-MD5 (crafty/crafty.doc) = 61cc664d63dec6a7bdbff04e7b591b80
+MD5 (crafty/crafty-15.18.tar.gz) = ed88f0789ca2e5ed612d540672ff13a3
+MD5 (crafty/crafty.doc) = daa3a11b55bcc4ad2f71807edcb8f404
 MD5 (crafty/crafty.faq) = f744727e291b6dec7e7c69bb3586b6dd
-MD5 (crafty/read.me) = ca5440ede2e34b290d7a5c3f7fb2cfaf
+MD5 (crafty/read.me) = ab8ebad0b0b5c78ad3ee304d7ceea681
 MD5 (crafty/start.zip) = 7a9faa5c4c0af5a2defa4dca942daf3d
diff --git a/games/crafty/files/patch-aa b/games/crafty/files/patch-aa
index 19d8eefb6878..58e6f2fbe6a3 100644
--- a/games/crafty/files/patch-aa
+++ b/games/crafty/files/patch-aa
@@ -1,70 +1,49 @@
-*** Makefile.orig	Fri May 22 17:52:39 1998
---- Makefile	Mon Jun  1 00:37:27 1998
-***************
-*** 68,80 ****
-  #           -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B
-  # asm     = X86.o
-  
-! # FreeBSD (gcc 2.6.3)
-! #target  = FreeBSD
-  #CC      = gcc
-  #CFLAGS  = -fomit-frame-pointer -m486 -O3 -Wall
-  #LDFLAGS = 
-! #opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
-! #          -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST
-  
-  # FreeBSD (pgcc)
-  #target  = FreeBSD
---- 68,80 ----
-  #           -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B
-  # asm     = X86.o
-  
-! # FreeBSD (gcc 2.7.2.1)
-! target  = FreeBSD
-  #CC      = gcc
-  #CFLAGS  = -fomit-frame-pointer -m486 -O3 -Wall
-  #LDFLAGS = 
-! opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
-!           -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST
-  
-  # FreeBSD (pgcc)
-  #target  = FreeBSD
-***************
-*** 94,111 ****
-   
-  # LINUX
-  # Note: You have to uncomment exactly ONE of the `asm' lines below.
-! target  = LINUX
-! CC      = gcc
-! CFLAGS  = -pipe -D_REENTRANT -mpentiumpro -O -Wall
-! LDFLAGS = -lpthread
-! opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
-!           -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST -DSMP -DCPUS=4
-  
-  # Uncomment the FIRST `asm' line for a.out systems.
-  # Uncomment the SECOND `asm' line for ELF systems.
-  #
-! #asm     = X86-aout.o
-! asm     = X86-elf.o
-  
-  # NEXT
-  #target  = NEXT
---- 94,111 ----
-   
-  # LINUX
-  # Note: You have to uncomment exactly ONE of the `asm' lines below.
-! #target  = LINUX
-! #CC      = gcc
-! #CFLAGS  = -pipe -D_REENTRANT -mpentiumpro -O -Wall
-! #LDFLAGS = -lpthread
-! #opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
-! #          -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST -DSMP -DCPUS=4
-  
-  # Uncomment the FIRST `asm' line for a.out systems.
-  # Uncomment the SECOND `asm' line for ELF systems.
-  #
-! asm     = X86-aout.o
-! #asm     = X86-elf.o
-  
-  # NEXT
-  #target  = NEXT
+--- Makefile.ORIG	Mon Jun 29 21:19:02 1998
++++ Makefile	Sat Sep 12 21:49:58 1998
+@@ -69,13 +69,13 @@
+ #           -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B
+ # asm     = X86.o
+ 
+-# FreeBSD (gcc 2.6.3)
+-#target  = FreeBSD
++# FreeBSD (gcc 2.7.2.1)
++target  = FreeBSD
+ #CC      = gcc
+ #CFLAGS  = -fomit-frame-pointer -m486 -O3 -Wall
+ #LDFLAGS = 
+-#opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
+-#          -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST
++opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
++          -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST
+ 
+ # FreeBSD (pgcc)
+ #target  = FreeBSD
+@@ -95,18 +95,21 @@
+  
+ # LINUX
+ # Note: You have to uncomment exactly ONE of the `asm' lines below.
+-target  = LINUX
+-CC      = gcc
+-CFLAGS  = -pipe -D_REENTRANT -mpentiumpro -O -Wall
+-LDFLAGS = -lpthread
+-opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
+-          -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST -DSMP -DCPUS=4
++#target  = LINUX
++#CC      = gcc
++#CFLAGS  = -pipe -D_REENTRANT -mpentiumpro -O -Wall
++#LDFLAGS = -lpthread
++#opt     = -DCOMPACT_ATTACKS -DUSE_SPLIT_SHIFTS -DUSE_ATTACK_FUNCTIONS \
++#          -DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST -DSMP -DCPUS=4
+ 
+ # Uncomment the FIRST `asm' line for a.out systems.
+ # Uncomment the SECOND `asm' line for ELF systems.
+ #
+-#asm     = X86-aout.o
++.if ${PORTOBJFORMAT} == "aout"
++asm     = X86-aout.o
++.else
+ asm     = X86-elf.o
++.endif
+ 
+ # NEXT
+ #target  = NEXT