NOGAMES -> NO_GAMES

Craig Dooley xlnxminusx at gmail.com
Mon Mar 14 06:28:57 PST 2005


Following FreeBSD's example, I'm going through and changing all NO*
make variables to NO_* for consistancy.  This patch changes NOGAMES to
NO_GAMES.  It is relative to the patch I just sent that removed the
two lines for PERL options.  (make.conf manpage should be the only
common file).  I can keep sending it as one switch at a time, or I can
do it all as one big patch if requested.  Thanks

-Craig
-- 
-----------------------------------------------------------------------
Craig Dooley <xlnxminusx at xxxxxxxxx>
Index: Makefile.inc1
===================================================================
RCS file: /home/dcvs/src/Makefile.inc1,v
retrieving revision 1.59
diff -u -r1.59 Makefile.inc1
--- Makefile.inc1	13 Mar 2005 19:05:23 -0000	1.59
+++ Makefile.inc1	14 Mar 2005 09:15:13 -0000
@@ -9,7 +9,7 @@
 #	-DNOCRYPT will prevent building of crypt versions
 #	-DNOMAN do not build the manual pages
 #	-DNOPROFILE do not build profiled libraries
-#	-DNOGAMES do not go into games subdir
+#	-DNO_GAMES do not go into games subdir
 #	-DNOSHARE do not go into share subdir
 #	-DNOINFO do not make or install info files
 #	-DNOLIBC_R do not build libc_r.
@@ -66,7 +66,7 @@
 .if exists(${.CURDIR}/bin)
 SUBDIR+= bin
 .endif
-.if exists(${.CURDIR}/games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/games) && !defined(NO_GAMES)
 SUBDIR+= games
 .endif
 .if exists(${.CURDIR}/gnu)
@@ -759,7 +759,7 @@
 # rpcgen:	old rpcgen used a hardwired cpp path, newer OBJFORMAT_PATH
 #		envs are not compatible with older objformat binaries.
 #
-.if exists(${.CURDIR}/games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/games) && !defined(NO_GAMES)
 _strfile=	games/fortune/strfile
 .endif
 
@@ -799,7 +799,7 @@
 # XXX we may be able to remove or consolidate this into bootstrap-tools
 # now that we have the native helper (.nx/.no) infrastructure.
 #
-.if exists(${.CURDIR}/games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/games) && !defined(NO_GAMES)
 _games=	games/adventure games/hack games/phantasia
 .endif
 
Index: etc/defaults/make.conf
===================================================================
RCS file: /home/dcvs/src/etc/defaults/make.conf,v
retrieving revision 1.12
diff -u -r1.12 make.conf
--- etc/defaults/make.conf	1 Mar 2005 18:45:37 -0000	1.12
+++ etc/defaults/make.conf	14 Mar 2005 09:16:02 -0000
@@ -102,6 +102,7 @@
 #NO_CVS=	true	# do not build CVS
 #NO_BIND=	true	# do not build BIND
 #NO_FORTRAN=	true	# do not build g77 and related libraries
+#NO_GAMES=	true	# do not build games (games/ subdir)
 #NO_I4B=	true	# do not build isdn4bsd package
 #NO_IPFILTER=	true	# do not build IP Filter package
 #NO_LPR=	true	# do not build lpr and related programs
@@ -114,7 +115,6 @@
 #NO_SHAREDOCS=	true	# do not build the 4.4BSD legacy docs
 #NO_X=		true	# do not compile in XWindows support (e.g. doscmd)
 #NOCRYPT=	true	# do not build any crypto code
-#NOGAMES=	true	# do not build games (games/ subdir)
 #NOINFO=	true	# do not make or install info files
 #NOLIBC_R=	true	# do not build libc_r (re-entrant version of libc)
 #NOMAN=		true	# do not build manual pages
Index: share/doc/usd/Makefile
===================================================================
RCS file: /home/dcvs/src/share/doc/usd/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- share/doc/usd/Makefile	20 Sep 2004 22:03:16 -0000	1.3
+++ share/doc/usd/Makefile	14 Mar 2005 09:16:28 -0000
@@ -13,7 +13,7 @@
 SUBDIR=	title contents 04.csh 05.dc 06.bc 07.mail 10.exref 11.vitut 12. vi \
 	13.viref 18.msdiffs 19.memacros 20.meref
 
-.if exists(${.CURDIR}/../../../games) && !defined(NOGAMES)
+.if exists(${.CURDIR}/../../../games) && !defined(NO_GAMES)
 SUBDIR+=30.rogue 31.trek
 .endif
 
Index: share/man/man5/make.conf.5
===================================================================
RCS file: /home/dcvs/src/share/man/man5/make.conf.5,v
retrieving revision 1.9
diff -u -r1.9 make.conf.5
--- share/man/man5/make.conf.5	14 Mar 2005 09:10:17 -0000	1.9
+++ share/man/man5/make.conf.5	14 Mar 2005 09:16:47 -0000
@@ -512,7 +512,7 @@
 .It Va NOCRYPT
 .Pq Vt bool
 Set to not build any crypto code.
-.It Va NOGAMES
+.It Va NO_GAMES
 .Pq Vt bool
 Set to not build games.
 .It Va NOINFO




More information about the Submit mailing list