From 1fc55c79234fa2b683becba02efcc79bdbe1e034 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sat, 28 Mar 1998 14:26:02 +0000 Subject: Add -lcompat so that cuserid() doesn't have to be commented out. PR: 6082 Submitted by: Pedro F. Giffuni --- games/xbl/files/patch-aa | 196 +++++++++++++++++++++++++++++++---------------- 1 file changed, 129 insertions(+), 67 deletions(-) (limited to 'games/xbl') diff --git a/games/xbl/files/patch-aa b/games/xbl/files/patch-aa index 44b8bb3da65b..e157d714e51c 100644 --- a/games/xbl/files/patch-aa +++ b/games/xbl/files/patch-aa @@ -1,67 +1,129 @@ ---- ./Makefile.in.org Sun Jan 12 11:03:54 1997 -+++ ./Makefile.in Tue Jun 3 18:07:01 1997 -@@ -14,7 +14,7 @@ - USE_SETGID=-DUSE_SETGID - - # group owner of games file --GROUP_GID=2 -+GROUP_GID=13 - - ########################################################################### - # You don't need to read below if you have xmkmf or imake -@@ -29,26 +29,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=$(X11_BASE)/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/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@ - - ########################################################################### -@@ -127,20 +127,15 @@ - @-if [ "" != "$(USE_SETGID)" ] ; then \ - echo "You use GID=$(GROUP_GID) protection" ; \ - fi -- @echo "Type to continue installation" -- @echo "Type NO to stop installation" -- @read LINE && test "" = "$$LINE" -+# @echo "Type to continue installation" -+# @echo "Type NO to stop installation" -+# @read LINE && test "" = "$$LINE" - # - # Remove old score file - # - @-if [ -d "$(SCOREDIR)" ] ; \ - then \ -- echo "The scoring method and speeds of Xbl had change" ; \ -- echo "If your version is older than 0.2e, destroy score." ; \ -- echo "Type to destroy old score files" ; \ -- echo "Type NO to hold old score files" ; \ -- read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \ -- exit 0 ; \ -+ rm $(SCOREDIR)/[1-9]* ; \ - fi - # - # Install executable +*** Makefile.in.orig Sun Jan 12 14:03:54 1997 +--- Makefile.in Sat Mar 21 01:46:43 1998 +*************** +*** 14,20 **** + USE_SETGID=-DUSE_SETGID + + # group owner of games file +! GROUP_GID=2 + + ########################################################################### + # You don't need to read below if you have xmkmf or imake +--- 14,20 ---- + USE_SETGID=-DUSE_SETGID + + # group owner of games file +! GROUP_GID=13 + + ########################################################################### + # You don't need to read below if you have xmkmf or imake +*************** +*** 29,54 **** + # Directory who contain X Resource Database + # The default value if overrided by configure if xmkmf or imake exists. + # +! RESOURCEDIR=/usr/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@ + + # 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@ + + # Directory where put man pages. + # The default value if overrided by configure if xmkmf or imake exists. + # +! MANPATH=/usr/local/man + @MANPATH@ + + ########################################################################### +--- 29,54 ---- + # Directory who contain X Resource Database + # The default value if overrided by configure if xmkmf or imake exists. + # +! RESOURCEDIR=$(X11BASE)/lib/X11/app-defaults + @XAPPLOADDIR@ + + # Directory where install binary + # The default value if overrided by configure if xmkmf or imake exists. + # +! 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=$(PREFIX)/lib/xbl + @SCOREDIR@ + + # Directory where put man pages. + # The default value if overrided by configure if xmkmf or imake exists. + # +! MANPATH=$(PREFIX)/man + @MANPATH@ + + ########################################################################### +*************** +*** 82,88 **** + + # For linking (configure script will modify this line) + # xmkmf et imake informations are take into account. +! LIBS = @LIBS@ -lm + + all:demo + +--- 82,88 ---- + + # For linking (configure script will modify this line) + # xmkmf et imake informations are take into account. +! LIBS = @LIBS@ -lm -lcompat + + all:demo + +*************** +*** 127,146 **** + @-if [ "" != "$(USE_SETGID)" ] ; then \ + echo "You use GID=$(GROUP_GID) protection" ; \ + fi +! @echo "Type to continue installation" +! @echo "Type NO to stop installation" +! @read LINE && test "" = "$$LINE" + # + # Remove old score file + # + @-if [ -d "$(SCOREDIR)" ] ; \ + then \ +! echo "The scoring method and speeds of Xbl had change" ; \ +! echo "If your version is older than 0.2e, destroy score." ; \ +! echo "Type to destroy old score files" ; \ +! echo "Type NO to hold old score files" ; \ +! read LINE && test "" = "$$LINE" && rm $(SCOREDIR)/[1-9]* ; \ +! exit 0 ; \ + fi + # + # Install executable +--- 127,141 ---- + @-if [ "" != "$(USE_SETGID)" ] ; then \ + echo "You use GID=$(GROUP_GID) protection" ; \ + fi +! # @echo "Type to continue installation" +! # @echo "Type NO to stop installation" +! # @read LINE && test "" = "$$LINE" + # + # Remove old score file + # + @-if [ -d "$(SCOREDIR)" ] ; \ + then \ +! rm $(SCOREDIR)/[1-9]* ; \ + fi + # + # Install executable -- cgit v1.2.3