From owner-freebsd-ports Fri Mar 20 23:30:08 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA05783 for freebsd-ports-outgoing; Fri, 20 Mar 1998 23:30:08 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: (from gnats@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA05760; Fri, 20 Mar 1998 23:30:06 -0800 (PST) (envelope-from gnats) Received: (from nobody@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA05271; Fri, 20 Mar 1998 23:24:45 -0800 (PST) (envelope-from nobody) Message-Id: <199803210724.XAA05271@hub.freebsd.org> Date: Fri, 20 Mar 1998 23:24:45 -0800 (PST) From: giffunip@asme.org To: freebsd-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: www-1.0 Subject: ports/6082: Minor fix to xbl port Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 6082 >Category: ports >Synopsis: Minor fix to xbl port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 20 23:30:04 PST 1998 >Last-Modified: >Originator: Pedro F. Giffuni >Organization: U. Nacional de Colombia >Release: 2.2.5-Release >Environment: >Description: This minor change will add -lcompat so that cuserid() doesn't have to be commented out. patch-ab is therefore unnecessary. >How-To-Repeat: >Fix: diff -urN /cdrom/ports/games/xbl/patches/patch-aa xbl/patches/patch-aa --- /cdrom/ports/games/xbl/patches/patch-aa Tue Jun 3 20:38:15 1997 +++ xbl/patches/patch-aa Sat Mar 21 02:02:40 1998 @@ -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 diff -urN /cdrom/ports/games/xbl/patches/patch-ab xbl/patches/patch-ab --- /cdrom/ports/games/xbl/patches/patch-ab Tue Jun 3 20:38:15 1997 +++ xbl/patches/patch-ab Wed Dec 31 19:00:00 1969 @@ -1,12 +0,0 @@ -*** score.c.orig Wed Apr 30 11:59:02 1997 ---- score.c Wed Apr 30 11:59:24 1997 -*************** -*** 312,318 **** - if ( i!=MAXSCORE-1 ) - { - if ( tryname( name , getlogin() ) ) -- if ( tryname( name , cuserid(0L) ) ) - if ( tryname( name , getenv("LOGNAME") ) ) - if ( tryname( name , getenv("USER") ) ) - { ---- 312,317 ---- >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message