From owner-freebsd-ports  Tue Jul  1 03:53:46 1997
Return-Path: <owner-ports>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id DAA23971
          for ports-outgoing; Tue, 1 Jul 1997 03:53:46 -0700 (PDT)
Received: from ixagate.elelab.nsc.co.jp (ixagate.elelab.nsc.co.jp [202.230.50.99])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id DAA23964;
          Tue, 1 Jul 1997 03:53:42 -0700 (PDT)
Received: from vesta.elelab.nsc.co.jp by ixagate.elelab.nsc.co.jp (8.8.6/ixagate-1.37) with SMTP
	id TAA00456; Tue, 1 Jul 1997 19:53:40 +0900 (JST)
Received: from oedipus.elelab.nsc.co.jp by vesta.elelab.nsc.co.jp
	id AA07245; Tue, 1 Jul 97 19:53:38 JST
Received: from localhost by oedipus.elelab.nsc.co.jp (8.6.12+2.4W2/elelab-4.2) with SMTP
	id TAA03580; Tue, 1 Jul 1997 19:53:37 +0900
Message-Id: <199707011053.TAA03580@oedipus.elelab.nsc.co.jp>
To: asami@FreeBSD.ORG
Cc: freebsd-ports@FreeBSD.ORG
Subject: Re: ports/4001
In-Reply-To: Your message of "Tue, 1 Jul 1997 02:49:53 -0700 (PDT)"
References: <199707010949.CAA26442@freefall.freebsd.org>
X-Mailer: Mew version 1.70 on Emacs 19.28.1 / Mule 2.3
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Date: Tue, 01 Jul 1997 19:53:35 +0900
From: Yukihiro Nakai <nakai@elelab.nsc.co.jp>
Sender: owner-ports@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

asami> Re-opened to catch a followup (that I sent hours ago!).

Here is the fixed patch
xbat-1.10 -> xbat-1.11

- No confusion between context diff and unified diff
- Well sorted PLIST

Please ignore the previous patch.

Yukihiro Nakai


-----CUT HERE-----CUT HERE-----CUT HERE-----CUT HERE-----
diff -ruN xbat.orig/Makefile xbat/Makefile
--- xbat.orig/Makefile	Tue Jul  1 13:28:08 1997
+++ xbat/Makefile	Mon Jun 16 14:15:16 1997
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   xbat
-# Version required:    1.10
+# Version required:    1.11
 # Date created:        30 January 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $Id: Makefile,v 1.2 1997/05/21 04:46:20 asami Exp $
 #
 
-DISTNAME=	xev110
-PKGNAME=        xbat-1.10
+DISTNAME=	xev111
+PKGNAME=        xbat-1.11
 CATEGORIES=     games
 MASTER_SITES=   http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
 
@@ -16,7 +16,7 @@
 NO_CDROM=	Possible copyright infringement
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/Xev110
+WRKSRC=		${WRKDIR}/Xev111
 ALL_TARGET=	xbat
 
 .include <bsd.port.mk>
diff -ruN xbat.orig/files/md5 xbat/files/md5
--- xbat.orig/files/md5	Tue Jul  1 13:28:08 1997
+++ xbat/files/md5	Mon Jun 16 14:15:16 1997
@@ -1 +1 @@
-MD5 (xev110.tar.gz) = 5f5292f7e838a825a06cf842935ac6b0
+MD5 (xev111.tar.gz) = e4fca002c01516eb475b45244f92682b
diff -ruN xbat.orig/patches/patch-aa xbat/patches/patch-aa
--- xbat.orig/patches/patch-aa	Tue Jul  1 13:28:08 1997
+++ xbat/patches/patch-aa	Tue Jul  1 18:38:30 1997
@@ -1,9 +1,6 @@
---- Imakefile.orig	Thu Dec  5 18:00:58 1996
-+++ Imakefile	Fri Jan 24 22:17:03 1997
-@@ -1,24 +1,26 @@
-+# Installation prefix
-+PREFIX?= /usr/X11R6
-+
+--- Imakefile.orig	Mon Mar 17 12:32:22 1997
++++ Imakefile	Tue Jul  1 18:37:39 1997
+@@ -1,24 +1,24 @@
  # TOP10 DIR : directory for socre files
  #
 -SCORE_DIR  = /usr/local/games/Xbat/Score
@@ -11,7 +8,7 @@
  
  # IMAGE DIR : directory for image files
 -IMAGE_DIR = /usr/local/games/Xbat/Image
-+IMAGE_DIR = ${PREFIX}/lib/X11/Xbat/Image
++IMAGE_DIR = /usr/X11R6/lib/X11/Xbat/Image
  
  # MAP DIR : directory for map files
 -MAP_DIR = /usr/local/games/Xbat/Map
@@ -26,6 +23,7 @@
  # compile union_check.c and run.
 -UNION = 0
 -#UNION = 1 
++#UNION = 0
 +UNION = 1 
  
  #BIN DIR