* This should fix the build error on bento.

* Cleanup.

PR:		53202

3 files changed, 20 insertions, 50 deletions

diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 543042d8244e..287e2e1925b6 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	xbl
 PORTVERSION=	1.0k
-PORTREVISION=	0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp710.univ-lyon1.fr/pub/xbl/
 
@@ -16,8 +15,6 @@ COMMENT=	A 3D block-dropping game
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LIBS="-L${X11BASE}/lib"
 MANN=		xbl.n
 
 .include <bsd.port.mk>
diff --git a/games/xbl/files/patch-aa b/games/xbl/files/patch-aa
index 0228ee2c6e8d..70781aaed31a 100644
--- a/games/xbl/files/patch-aa
+++ b/games/xbl/files/patch-aa
@@ -1,36 +1,8 @@
---- Makefile.in.orig	Tue Dec 11 22:13:49 2001
-+++ Makefile.in	Tue Dec 11 22:18:05 2001
-@@ -30,26 +30,26 @@
- # Directory who contain X Resource Database
- # The default value if overrided by configure if xmkmf or imake exists.
- #
--RESOURCEDIR=/usr/lib/X11/app-defaults
-+RESOURCEDIR=${X11BASE}/lib/X11/app-defaults
- @XAPPLOADDIR@
- 
- # Directory where install binary
- # The default value if overrided by configure if xmkmf or imake exists.
- #
--BINDIR=/usr/local/bin
-+BINDIR=${PREFIX}/bin
- @BINDIR@
- 
- # Directory who contain score
- # Put your HOME if you have a private use of the game
- # The default value if overrided by configure if xmkmf or imake exists.
- #
--SCOREDIR=/usr/local/lib/xbl
-+SCOREDIR=${PREFIX}/lib/X11/xbl
- @SCOREDIR@
- 
- # Directory where put man pages.
- # The default value if overrided by configure if xmkmf or imake exists.
- #
--MANPATH=/usr/local/man
-+MANPATH=${PREFIX}/man
- @MANPATH@
- 
- ###########################################################################
+
+$FreeBSD$
+
+--- Makefile.in.orig	Thu Jun 19 03:01:36 2003
++++ Makefile.in	Thu Jun 19 03:04:15 2003
 @@ -83,7 +83,7 @@
  
  # For linking (configure script will modify this line)
@@ -40,25 +12,13 @@
  
  all:demo
  
-@@ -94,7 +94,7 @@
- 	 -DRESOURCEDIR=\"$(RESOURCEDIR)\" \
- 	 -DXBLVERSION=\"$(XBLVERSION)\" \
- 	 -DGROUP_GID=$(GROUP_GID) \
--	  $(USE_SETGID) @DEFS@ @CFLA@ -g
-+	  $(USE_SETGID) @DEFS@ @CFLA@ @CFLAGS@ @CPPFLAGS@
- # For link edit options
- LDOPTIONS=$(CFLAGS)
- LDOPTIONS=@LDOPTIONS@
-@@ -128,25 +128,20 @@
+@@ -128,25 +128,17 @@
  	@-if [ "" != "$(USE_SETGID)" ] ; then \
  		echo "You use GID=$(GROUP_GID) protection" ; \
  		fi
 -	@echo "Type <Return> to continue installation"
 -	@echo "Type NO       to stop installation"
 -	@read LINE && test "" = "$$LINE"
-+#	@echo "Type <Return> to continue installation"
-+#	@echo "Type NO       to stop installation"
-+#	@read LINE && test "" = "$$LINE"
  	#
  	# Remove old score file
  	#
@@ -80,7 +40,7 @@
  	-if [ "" = "$(USE_SETGID)" ] ; then \
  	     chmod 755  $(BINDIR)/xbl ;\
  	   else \
-@@ -160,7 +155,6 @@
+@@ -160,7 +152,6 @@
  	-mkdir $(SCOREDIR) 2>/dev/null
  	$(CP) Xbl.ad  $(RESOURCEDIR)/Xbl ;	chmod 644 $(RESOURCEDIR)/Xbl
  	$(CP) Xbl.ad  $(SCOREDIR)/Xbl ;		chmod 644 $(SCOREDIR)/Xbl
diff --git a/games/xbl/files/patch-configure b/games/xbl/files/patch-configure
new file mode 100644
index 000000000000..9b2711510847
--- /dev/null
+++ b/games/xbl/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure.orig	Thu Jun 19 03:05:17 2003
++++ configure	Thu Jun 19 03:05:31 2003
+@@ -774,7 +774,6 @@
+ 	@echo LN=\"LN=$(LN)\"
+ 	@echo COMPRESS=\"COMPRESS=$(COMPRESS)\"
+ 	@echo MANPATH=\"MANPATH=$(MANPATH)\"
+-	@echo CC=\"$(CC)\"
+ 	@echo LDOPTIONS=\"$(LDOPTIONS)\"
+ 	@echo LINT=\"LINT=$(LINT)\"
+ 	@echo LINTFLAGS=\"LINTFLAGS=$(LINTFLAGS)\"