* New upstream release.

- Fix backgammon scoring bug related to peices on the bar and gammons.
       Closes: #185101
     - Fix backgammon tutorial text. Closes: #212478
     - Advertising clause is gone from most, but not all licenses.
     - Apparently better fix for boggle man page.
     - Incorporates nearly all changes in Debian diff.

git-svn-id: file:///srv/svn/joey/trunk/src/packages/bsdgames@9782 a4a2c43b-8ac3-0310-8836-e0e880c912e2

wtf/Makefrag

@@ -1,6 +1,6 @@
 # Makefrag - makefile fragment for wtf
 #
-# Copyright (c) 1999 Joseph Samuel Myers.
+# Copyright (c) 1999, 2003 Joseph Samuel Myers.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -34,4 +34,5 @@ wtf_install:	wtf_all
 	$(INSTALL_SCRIPT) wtf/wtf $(INSTALL_PREFIX)$(GAMESDIR)/wtf
 	$(HIDE_GAME) wtf
 	$(INSTALL_DATA) wtf/acronyms $(INSTALL_PREFIX)$(WTF_ACRONYMFILE)
+	$(INSTALL_DATA) wtf/acronyms.comp $(INSTALL_PREFIX)$(WTF_ACRONYMFILE).comp
 	$(INSTALL_MANUAL) wtf/wtf.6

wtf/acronyms

@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.113 2003/02/05 20:11:04 mason Exp $
+$NetBSD: acronyms,v 1.129 2003/11/22 18:01:46 jschauma Exp $
 
 AFAICR	as far as I can recall
 AFAICT	as far as I can tell
@@ -7,13 +7,17 @@ AFAIR	as far as I recall
 AFAIU	as far as I understand
 AFD	away from desktop
 AFK	away from keyboard
+AFU	all fucked up
 AFW	away from window
 AIU	as I understand
 AIUI	as I understand it
 AKA	also known as
+ASAIC	as soon as I can
 ASAP	as soon as possible
+ATM	at the moment
 AWOL	absent without official leave
 AYBABTU	all your base are belong to us
+B/C	because
 BBL	[I'll] be back later
 BBS	be back soon
 BBT	be back tomorrow
@@ -34,6 +38,8 @@ CMIIW	correct me if I'm wrong
 CNP	continued [in my] next post
 COB	close of business [day]
 CYA	see you around
+D/L	download
+DIY	do it yourself
 DKDC	don't know, don't care
 DSTM	don't shoot the messenger
 DTRT	do the right thing
@@ -42,10 +48,12 @@ DWIM	do what I mean
 EG	evil grin
 EMSG	email message
 EOB	end of business [day]
+EOD	end of discussion
 EOL	end of life
 ETLA	extended three letter acronym
 EWAG	experienced wild-ass guess
 FAQ	frequently asked question
+FCFS	first come first served
 FIIK	fuck[ed] if I know
 FIIR	fuck[ed] if I remember
 FM	fucking magic
@@ -58,17 +66,28 @@ FUD	fear, uncertainty and doubt
 FWIW	for what it's worth
 FYI	for your information
 G	grin
+G/C	garbage collect
+GAC	get a clue
+GAL	get a life
 GIGO	garbage in, garbage out
 GMTA	great minds think alike
 GTFO	get the fuck out
+GTG	got to go
 HAND	have a nice day
 HHIS	hanging head in shame
+HICA	here it comes again
 HTH	hope this helps
+IAC	in any case
 IANAL	I am not a lawyer
+IC	I see
+ICBW	I could be wrong
+ICCL	I couldn't care less
 IHAFC	I haven't a fucking clue
+IHBW	I have been wrong
 IHNFC	I have no fucking clue
 IIANM	if I am not mistaken
 IIRC	if I recall correctly
+IIUC	if I understand correctly
 IMAO	in my arrogant opinion
 IMCO	in my considered opinion
 IMHO	in my humble opinion
@@ -80,7 +99,8 @@ ISAGN	I see a great need
 ISTM	it seems to me
 ISTR	I seem to recall
 ITYM	I think you mean
-IYSS	If you say so
+IYSS	if you say so
+J/K	just kidding
 JIC	just in case
 JK	just kidding
 JMO	just my opinion
@@ -95,25 +115,31 @@ LMAO	laughing my ass off
 LMSO	laughing my socks off
 LOL	laughing out loud
 LTNS	long time no see
-MMU	memory management unit
+MIA	missing in action
 MOTAS	member of the appropriate sex
 MOTOS	member of the opposite sex
 MOTSS	member of the same sex
 MTF	more to follow
 MYOB	mind your own business
+N/M	never mind
 NBD	no big deal
 NFC	no fucking clue
 NFI	no fucking idea
 NFW	no fucking way
 NIH	not invented here
+NOYB	none of your business
+NOYFB	none of your fucking business
 NP	no problem
 NRFPT	not ready for prime time
 NRN	no reply necessary
 OIC	oh, I see
+OMG	oh, my god
+OT	off topic
 OTL	out to lunch
 OTOH	on the other hand
 OTT	over the top
 OTTOMH	off the top of my head
+PEBKAC	problem exists between keyboard and chair
 PFO	please fuck off
 PFY	pimply faced youth
 PITA	pain in the ass
@@ -135,6 +161,7 @@ ROTFL	rolling on the floor laughing
 RP	responsible person
 RSN	real soon now
 RTFB	read the fine/fucking book
+RTFC	read the fine/fucking code
 RTFM	read the fine/fucking manual
 RTFMP	read the fine/fucking man page
 RTFS	read the fine/fucking source
@@ -147,37 +174,54 @@ SMLSFB	so many losers, so few bullets
 SMOP	simple matter of programming
 SNAFU	situation normal, all fucked up
 SNERT	snot-nosed egotistical rude teenager
+SNR	signal to noise ratio
 SO	significant other
 SOB	son of [a] bitch
 SOL	shit out [of] luck
 SOP	standard operating procedure
 SSIA	subject says it all
+STFA	search the fucking archives
+STFU	shut the fuck up
 SUS	stupid user syndrome
 SWAG	silly, wild-assed guess
 SWAHBI	silly, wild-assed hare-brained idea
 SWMBO	she who must be obeyed
 TANSTAAFL	there ain't no such thing as a free lunch
+TBC	to be continued
 TBD	to be {decided,determined,done}
+TBOMK	the best of my knowledge
 TIA	thanks in advance
+TINC	there is no cabal
 TLA	three letter acronym
 TLB	translation lookaside buffer
 TMA	too many abbreviations
 TMI	too much information
 TOEFL	test of english as a foreign language
+TRT	the right thing
+TTBOMK	to the best of my knowledge
 TTFN	ta ta for now
 TTYL	talk to you later
 TWIAVBP	the world is a very big place
 TYVM	thank you very much
+U/L	upload
 UTSL	use the source, Luke
 VEG	very evil grin
+W/	with
+W/O	without
 WAG	wild-ass guess
+WB	welcome back
+WFM	works for me
 WIBNI	wouldn't it be nice if
+WIP	work in progress
 WOFTAM	waste of fucking time and money
 WOMBAT	waste of money, brain, and time
 WRT	with respect to
 WTF	{what,where,who,why} the fuck
 WTH	{what,where,who,why} the hell
 WYSIWYG	what you see is what you get
+YHBT	you have been trolled
+YHL	you have lost
 YKWIM	you know what I mean
 YMA	yo momma's ass
 YMMV	your mileage may vary
+YW	you're welcome

wtf/acronyms.comp

@@ -0,0 +1,185 @@
+$NetBSD: acronyms.comp,v 1.28 2003/12/02 18:14:17 sketch Exp $
+
+ABI	application binary interface
+ACPI	advanced configuration and power interface
+ADC	analog [to] digital converter
+AGP	accelerated graphics port
+ANSI	American National Standards Institute
+API	application programming interface
+APIC	advanced programmable interrupt controller
+AT	advanced technology
+ATA	advanced technology attachment
+ATAPI	advanced technology attachment packet interface
+ATX	advanced technology extended
+BEDO	burst extended data output
+BGP	border gateway protocol
+BIOS	basic input/output system
+BLOB	binary large object
+BSD	berkeley software distribution
+CAD	computer-aided design
+CAV	constant angular velocity (as opposed to CLV)
+CD	compact disc
+CDRAM	cache dynamic random access memory
+CGA	color graphics array
+CHS	cylinder/head/sector
+CIDR	classless inter-domain routing
+CLI	command line interface
+CLV	constant linear velocity (as opposed to CAV)
+CPU	central processing unit
+CRLF	carriage return line feed
+CRT	cathode ray tube
+CSS	cascading style sheets
+CVS	concurrent versions system
+DAC	digital [to] analog converter
+DDC	display data channel
+DDR	double data rate
+DDWG	digital display working group
+DMA	direct memory access
+DNS	domain name system
+DRAM	dynamic random access memory
+DSL	digital subscriber line
+DTD	document type definition
+DVD	digital versatile disc
+DVI	digital visual interface
+ECP	enhanced capability port
+EDID	extended display identification data
+EDO	extended data out
+EEPROM	electrically erasable programmable read only memory
+EGA	enhanced graphics array
+EISA	extended industry standard architecture
+EPP	enhanced parallel port
+EPROM	erasable programmable read only memory
+ESDRAM	enhanced synchronous dynamic random access memory
+FBRAM	frame buffer random access memory
+FFS	fast file system
+FLOPS	floating [point] operations per second
+FPM	fast page mode
+FQDN	fully qualified domain name
+FTP	file transfer protocol
+GIF	graphics interchange format
+GNU	gnu's not unix
+GPL	gnu/general public license
+GPU	graphics processing unit
+GUI	graphics user interface
+HDCP	high-bandwidth digital content protection
+HTML	hyper-text markup language
+HTTP	hyper-text transfer protocol
+I2O	intelligent input/output
+IANA	internet assigned number authority
+IC	integrated circuit
+ICB	internet citizen's band
+ICMP	internet control message protocol
+IDE	integrated drive electronics
+IEC	International Electrotechnical Commission
+IEEE	institute [of] electrical [and] electronics engineers
+IESG	internet engineering steering group
+IETF	internet engineering task force
+IKE	internet key exchange
+IMAP	internet mail access protocol
+INCITS	InterNational Committee on Information Technology Standards
+IO	input/output
+IOCTL	input/output control
+IP	internet protocol
+IPNG	internet protocol, next generation
+IPSEC	internet protocol security
+IRC	internet relay chat
+IRQ	interrupt request
+IRTF	internet research task force
+ISA	industry standard architecture
+ISDN	integrated services digital network
+ISO	International Standards Organization
+ISOC	internet society
+ISP	internet service provider
+JPEG	joint photographic experts group
+KVA	kernel virtual address
+LAN	local area network
+LBA	logical block addressing
+LCD	liquid crystal display
+LDAP	lightweight directory access protocol
+LSB	least significant bit [or: byte]
+LUN	logical unit number
+MAC	media access control
+MBR	master boot record
+MDRAM	multibank dynamic random access memory
+MIPS	million instructions per second
+MMU	memory management unit
+MSB	most significant bit [or: byte]
+MTA	mail transfer agent
+MTU	maximum transmission unit
+MUA	mail user agent
+NAT	network address translation
+NIC	network interface card
+NIS	network information service
+NUMA	non uniform memory access
+OTP	one time password
+PAX	portable archive exchange
+PCI	peripheral component interconnect
+PCMCIA	Personal Computer Memory Card International Association
+PDP	page descriptor page
+PERL	practical extraction [and] report language
+PGP	pretty good privacy
+PIC	programmable interrupt controller
+PID	process id
+PIO	programmed input/output
+PNG	portable network graphics
+POP	post office protocol
+POSIX	portable operating system interface [for] unix
+POST	power on self test
+PPP	point-to-point protocol
+PPPOE	point-to-point protocol over ethernet
+PROM	programmable read only memory
+PTE	page table entry
+PTLA	pseudo top level aggregator
+PTP	page table page
+RAID	redundant array of inexpensive disks
+RAM	random access memory
+RCS	revision control system
+RFC	request for comments
+RGB	red green blue
+RISC	reduced instruction set computing
+ROM	read only memory
+RPM	revolutions per minute
+RTF	rich text format
+S/PDIF	sony/phillips digital interface
+SAM	serial access memory
+SASI	Shugart Associates system interface (predecessor to SCSI)
+SATA	serial advanced technology attachment
+SCSI	small computer system interface
+SDRAM	synchronous dynamic random access memory
+SGRAM	synchronous graphics random access memory
+SLDRAM	synchronous-link dynamic random access memory
+SMART	self-monitoring analysis and reporting technology
+SMP	symmetric multiprocessing
+SMTP	simple mail transfer protocol
+SPD	serial presence detect
+SRAM	static random access memory
+SSH	secure shell
+SSL	secure sockets layer
+SVGA	super video graphics array
+TCL	tool command language
+TCP	transmission control protocol
+TFT	thin film transistor
+TLA	top level aggregator
+TLD	top level domain
+TMDS	transition minimized differential signaling
+TTY	teletype
+TZ	time zone
+UC	uncacheable
+UDP	user datagram protocol
+UPS	uninterruptible power supply
+URI	uniform resource identifier
+URL	uniform resource locator
+USB	universal serial bus
+USWC	uncacheable speculative write combining
+UUCP	unix-to-unix copy protocol
+VCM	virtual channel memory
+VESA	video electronics standards association
+VGA	video graphics array
+VPN	virtual private network
+VRAM	video random access memory
+WRAM	window random access memory
+WWW	world wide web
+XGA	extended graphics array
+XML	extensible markup language
+XSL	extensible stylesheet language
+XT	extended technology

wtf/wtf.6.in

@@ -1,8 +1,8 @@
-.\"	$NetBSD: wtf.6,v 1.5 2002/09/26 16:12:44 wiz Exp $
+.\"	$NetBSD: wtf.6,v 1.8 2003/04/25 19:08:31 jmmv Exp $
 .\"
 .\" Public Domain
 .\"
-.Dd July 21, 1999
+.Dd April 25, 2003
 .Dt WTF 6
 .Os
 .Sh NAME
@@ -10,6 +10,8 @@
 .Nd translates acronyms for you
 .Sh SYNOPSIS
 .Nm
+.Op Fl f Ar dbfile
+.Op Fl t Ar type
 .Op Ar is
 .Ar acronym Ar ...
 .Sh DESCRIPTION
@@ -29,6 +31,21 @@ is specified on the command line, it will be ignored, allowing the
 fairly natural
 .Dq wtf is WTF
 usage.
+.Pp
+The following options are available:
+.Bl -tag -width flag
+.It Fl f Ar dbfile
+Overrides the default acronym database, bypassing the value of the
+.Ev ACRONYMDB
+variable.
+.It Fl t Ar type
+Specifies the acronym's type.
+Simply put, it makes the program use the acronyms database named
+.Pa @wtf_acronymfile@.type ,
+where
+.Ar type
+is given by the argument.
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width ACRONYMDB
 .It Ev ACRONYMDB
@@ -38,9 +55,11 @@ environment variable
 to the name of a file in the proper format (acronym[tab]meaning).
 .El
 .Sh FILES
-.Bl -tag -width @wtf_acronymfile@ -compact
+.Bl -tag -width @wtf_acronymfile@.XXXX -compact
 .It Pa @wtf_acronymfile@
 default acronym database.
+.It Pa @wtf_acronymfile@.comp
+computer-related acronym database.
 .El
 .Sh SEE ALSO
 .Xr whatis 1

wtf/wtf.in

@@ -1,18 +1,48 @@
 #!/bin/sh
 #
-#	$NetBSD: wtf,v 1.8 2003/02/06 15:17:01 salo Exp $
+#	$NetBSD: wtf,v 1.11 2003/04/25 19:08:31 jmmv Exp $
 #
 # Public domain
 #
 
+usage() {
+	echo "usage: `basename $0` [-f dbfile] [-t type] [is] <acronym>"
+	exit 1
+}
+
 acronyms=${ACRONYMDB:-@wtf_acronymfile@}
 
+args=`getopt f:t: $*`
+if [ $? -ne 0 ]; then
+	usage
+fi
+set -- $args
+while [ $# -gt 0 ]; do
+	case "$1" in
+		-f)
+			acronyms=$2; shift
+			;;
+		-t)
+			acronyms=@wtf_acronymfile@.$2; shift
+			;;
+		--)
+			shift; break
+			;;
+	esac
+	shift
+done
+
 if [ X"$1" = X"is" ] ; then
 	shift
 fi
 
 if [ $# -lt 1 ] ; then
-	echo "Usage: `basename $0` [is] <acronym>"
+	usage
+fi
+
+if [ ! -f $acronyms ]; then
+	echo "`basename $0`: cannot open acronyms database file \`$acronyms'"
+	exit 1
 fi
 
 rv=0