Fix build when using gcc3.

5 files changed, 216 insertions, 9 deletions

diff --git a/archivers/unrar/distinfo b/archivers/unrar/distinfo
index 9f5cdfb399e..7eda23f6208 100644
--- a/archivers/unrar/distinfo
+++ b/archivers/unrar/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2003/05/23 09:19:01 wiz Exp $
+$NetBSD: distinfo,v 1.12 2003/07/17 20:28:30 jmmv Exp $
 
 SHA1 (unrarsrc-3.2.2.tar.gz) = 82f65634e12c289804cdb75222b98028d4c16a1f
 Size (unrarsrc-3.2.2.tar.gz) = 114963 bytes
 SHA1 (patch-aa) = 612a31f767de48b574cd916d600005f5613eaefd
+SHA1 (patch-ab) = 04ffdd82b51a337b2f4e9cac9c193bbc4305083a
diff --git a/archivers/unrar/patches/patch-ab b/archivers/unrar/patches/patch-ab
new file mode 100644
index 00000000000..d019d35fd5d
--- /dev/null
+++ b/archivers/unrar/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.4 2003/07/17 20:28:32 jmmv Exp $
+
+--- rar.hpp.orig	2003-05-15 10:38:00.000000000 +0200
++++ rar.hpp
+@@ -18,6 +18,7 @@
+ #include "errhnd.hpp"
+ #include "array.hpp"
+ #include "timefn.hpp"
++#include "global.hpp"
+ #include "headers.hpp"
+ #include "rarfn.hpp"
+ #include "pathfn.hpp"
+@@ -71,7 +72,6 @@
+ #include "smallfn.hpp"
+ #include "ulinks.hpp"
+ 
+-#include "global.hpp"
+ 
+ 
+ #endif
diff --git a/graphics/fxtv/Makefile b/graphics/fxtv/Makefile
index 0c536482f19..8c19789f56a 100644
--- a/graphics/fxtv/Makefile
+++ b/graphics/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/06/11 20:50:54 abs Exp $
+# $NetBSD: Makefile,v 1.22 2003/07/17 20:21:30 jmmv Exp $
 
 DISTNAME=	fxtv-1.03
 PKGREVISION=	2
@@ -32,7 +32,7 @@ XAW_TYPE=	3d
 post-extract:
 	@${RM} -f ${WRKSRC}/videolib/videolib.o
 
-post-patch:
+pre-configure:
 	cd ${WRKSRC}; for file in app_rsrc.h Fxtv; do			\
 		${SED}	-e "s,/dev/dsp,${DEVOSSAUDIO},g"		\
 			$${file} > $${file}.fixed;			\
diff --git a/graphics/fxtv/distinfo b/graphics/fxtv/distinfo
index f2f08c200fd..be9a3a50e5f 100644
--- a/graphics/fxtv/distinfo
+++ b/graphics/fxtv/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.7 2003/01/10 01:27:43 mjl Exp $
+$NetBSD: distinfo,v 1.8 2003/07/17 20:21:30 jmmv Exp $
 
 SHA1 (fxtv-1.03.tgz) = 2ed9f2bee879a931c7f963a4ad7d07ef9cd297f9
 Size (fxtv-1.03.tgz) = 198669 bytes
 SHA1 (patch-aa) = cd994d512fe99e962cc9c505285da63d1421f81e
 SHA1 (patch-ab) = a62c497255063a88b7d240e902a45c85f59f84b0
 SHA1 (patch-ac) = 27a825287c17d1cc957fb89ba2f665c01f998c15
-SHA1 (patch-ad) = d1f72544dd7878d43d6975edcae5d3098f940faa
+SHA1 (patch-ad) = 63426b2b5c25556fe21fc2fa02e5c041da22096d
 SHA1 (patch-ae) = aa7689ff62388d4d50f89501f2c3084bc04409d8
 SHA1 (patch-af) = 50ab2d960955a8e97b6b56265195ec325b206cf9
 SHA1 (patch-ag) = 13655a94cd6200d12e25d406d7c1923f89000c80
diff --git a/graphics/fxtv/patches/patch-ad b/graphics/fxtv/patches/patch-ad
index a90ea476ec0..15ac4742225 100644
--- a/graphics/fxtv/patches/patch-ad
+++ b/graphics/fxtv/patches/patch-ad
@@ -1,8 +1,194 @@
-$NetBSD: patch-ad,v 1.6 2002/12/21 11:10:00 wiz Exp $
+$NetBSD: patch-ad,v 1.7 2003/07/17 20:21:31 jmmv Exp $
 
---- app_rsrc.h.orig	Sat Dec 21 11:57:15 2002
+--- app_rsrc.h.orig	2001-02-12 22:17:53.000000000 +0100
 +++ app_rsrc.h
-@@ -789,6 +789,7 @@ static String fallback_resources[] = { 
+@@ -525,96 +525,95 @@ static XtResource Resources[] = {
+ };
+ 
+ 
+-#define OPTION_HELP_STR "\
+-                      BSD X TV (fxtv), Version " VERS_STR ".  
+-                         Written by Randall Hopper
+-
+-Please mail Fxtv and Bt848 driver-related comments and help requests to the
+-multimedia@freebsd.org list.  Feel free to subscribe and contribute 
+-(listserv: majordomo@freebsd.org).
+-
+-Available options:
+-
+--driverDefaults             - Use appearance parms from driver on startup
+--colorbars                  - Turn on colorbar display (for testing)
+--hue [-90...90]             - Initial Hue           ; def=0
+--brightness [-50..50]       - Initial Brightness (%); def=0
+--contrast [0..200]          - Initial Contrast   (%); def=100
+--satU [0..200]              - U Saturation       (%); def=100
+--satV [0..284]              - V Saturation       (%); def=100
+--aspectlock                 - Enable 4:3 aspect lock on video window
+-
+--deviceNumber <#>           - bktr/tuner device numbers; def=0      
+--inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,
+-                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)
+-
+--tunerMode [cable|antenna]  - Tuner Mode
+--defaultInput <input>       - Startup tuner signal input 
+-                                 [tuner|video|svideo|csvideo|dev3]
+--defaultAudioInput <input>  - Startup TV card audio input 
+-                                 [tuner|external|internal|auto]
+--defaultChannel <#>         - Startup Channel Number
+--cableStationList   <...>   - List of cable station presets (see rsrc file)
+--antennaStationList <...>   - List of antenna station presets
+--cableFreqSet   <freqset>   - Freq set for cable   (def = cableirc)
+-                              [nabcst|cableirc|cablehrc|weurope|jpnbcst|
+-                               jpncable|xussr|australia|france]
+--antennaFreqSet <freqset>   - Freq set for antenna (def = nabcst)
+-
+--noAudio                    - Suppress playing audio through soundcard
+--dspDevice                  - Override default DSP device   (def=/dev/dsp)
+--mixerDevice                - Override default mixer device (def=/dev/mixer)
+--mixerChannel               - Audio mixer (line,line1/2/3,cd,mic,video)
+-
+--stationInWinTitle          - Display station text in window title
+--stationInWinIcon           - Display station text in window icon
+-
+--stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)
+--stationAnnotColor <color>  - Color for station annot
+--stationAnnotDelay <msec>   - How long to display (0 = never; -1 = always)
+--stationAnnotIDOnly         - Display station ID alone (when available)
+-
+--tunerModeAnnot{Font,Color,Delay}
+--inputDevAnnot{Font,Color,Delay}
+--volumeDevAnnot{Font,Color,Delay}
+--muteDevAnnot{Font,Color,Delay}
+-                            - Other annotation options (see stationAnnot)
+-
+--remoteType                 - Type of attached remote control 
+-                              [None|X10|Hauppauge|PixelView]
+-
+--recCmdMpeg2                - MPEG-2 Audio record command 
+--recCmdMpeg3                - MPEG-3 Audio record command
+--playCmdMpeg2               - MPEG-2 Audio play   command
+--playCmdMpeg3               - MPEG-3 Audio play   command
+-
+--videoCnvtScript            - Video conversion workhorse script for vid encod.
+-
+--bswap2Bpp                  - Byte/word swap options for direct video
+--nobswap2Bpp                  (used to match driver's pixel format with
+--bswap3Bpp                    the video card's)
+--nobswap3Bpp
+--bswap4Bpp                        2Bpp - 15/16-bpp modes
+--nobswap4Bpp                      3Bpp - packed 24bpp modes
+--bwwap4Bpp                        4Bpp - unpacked 24bpp modes
+--nowswap4Bpp
+-
+--Bpp24bit [3|4]             - Set frame buffer Bytes-per-pixel for 24bpp mode
+--Bpp32bit [3|4]             - Set frame buffer Bytes-per-pixel for 32bpp mode
+-
+--videoCapFile[1-4]          - Optional paths (0-4) to scratch file paths to 
+-                              use for video capture; spreads load across disks
+-
+--noafc                      - Disable AFC
+--disableDirectV             - Disable DMA transfers straight to video card
+--debug <area>               - Debug Msgs 
+-                              {startup,driver,subproc,events,video,frame}
+--help                       - Display program options
+-
+-NOTE:  All command line options are accessible as X resources as well.
+-       The X resources have the same names as the command-line options.
+-       See the sample Fxtv class resource file for details.
+-"
++#define OPTION_HELP_STR \
++"                      BSD X TV (fxtv), Version " VERS_STR ".\n" \
++"                         Written by Randall Hopper\n" \
++"\n" \
++"Please mail Fxtv and Bt848 driver-related comments and help requests to the\n" \
++"multimedia@freebsd.org list.  Feel free to subscribe and contribute\n" \
++"(listserv: majordomo@freebsd.org).\n" \
++"\n" \
++"Available options:\n" \
++"\n" \
++"-driverDefaults             - Use appearance parms from driver on startup\n" \
++"-colorbars                  - Turn on colorbar display (for testing)\n" \
++"-hue [-90...90]             - Initial Hue           ; def=0\n" \
++"-brightness [-50..50]       - Initial Brightness (%); def=0\n" \
++"-contrast [0..200]          - Initial Contrast   (%); def=100\n" \
++"-satU [0..200]              - U Saturation       (%); def=100\n" \
++"-satV [0..284]              - V Saturation       (%); def=100\n" \
++"-aspectlock                 - Enable 4:3 aspect lock on video window\n" \
++"\n" \
++"-deviceNumber <#>           - bktr/tuner device numbers; def=0\n" \
++"-inputFormat <fmt>          - Tuner signal input format (ntsc,ntscm,ntscj,\n" \
++"                                 palbdghi,pal,palm,paln,secam,palncomb,rsvd)\n" \
++"\n" \
++"-tunerMode [cable|antenna]  - Tuner Mode\n" \
++"-defaultInput <input>       - Startup tuner signal input\n" \
++"                                 [tuner|video|svideo|csvideo|dev3]\n" \
++"-defaultAudioInput <input>  - Startup TV card audio input\n" \
++"                                 [tuner|external|internal|auto]\n" \
++"-defaultChannel <#>         - Startup Channel Number\n" \
++"-cableStationList   <...>   - List of cable station presets (see rsrc file)\n" \
++"-antennaStationList <...>   - List of antenna station presets\n" \
++"-cableFreqSet   <freqset>   - Freq set for cable   (def = cableirc)\n" \
++"                              [nabcst|cableirc|cablehrc|weurope|jpnbcst|\n" \
++"                               jpncable|xussr|australia|france]\n" \
++"-antennaFreqSet <freqset>   - Freq set for antenna (def = nabcst)\n" \
++"\n" \
++"-noAudio                    - Suppress playing audio through soundcard\n" \
++"-dspDevice                  - Override default DSP device   (def=/dev/dsp)\n" \
++"-mixerDevice                - Override default mixer device (def=/dev/mixer)\n" \
++"-mixerChannel               - Audio mixer (line,line1/2/3,cd,mic,video)\n" \
++"\n" \
++"-stationInWinTitle          - Display station text in window title\n" \
++"-stationInWinIcon           - Display station text in window icon\n" \
++"\n" \
++"-stationAnnotFont <fontpat> - Font pattern for station annot (see rsrc file)\n" \
++"-stationAnnotColor <color>  - Color for station annot\n" \
++"-stationAnnotDelay <msec>   - How long to display (0 = never; -1 = always)\n" \
++"-stationAnnotIDOnly         - Display station ID alone (when available)\n" \
++"\n" \
++"-tunerModeAnnot{Font,Color,Delay}\n" \
++"-inputDevAnnot{Font,Color,Delay}\n" \
++"-volumeDevAnnot{Font,Color,Delay}\n" \
++"-muteDevAnnot{Font,Color,Delay}\n" \
++"                            - Other annotation options (see stationAnnot)\n" \
++"\n" \
++"-remoteType                 - Type of attached remote control\n" \
++"                              [None|X10|Hauppauge|PixelView]\n" \
++"\n" \
++"-recCmdMpeg2                - MPEG-2 Audio record command\n" \
++"-recCmdMpeg3                - MPEG-3 Audio record command\n" \
++"-playCmdMpeg2               - MPEG-2 Audio play   command\n" \
++"-playCmdMpeg3               - MPEG-3 Audio play   command\n" \
++"\n" \
++"-videoCnvtScript            - Video conversion workhorse script for vid encod.\n" \
++"\n" \
++"-bswap2Bpp                  - Byte/word swap options for direct video\n" \
++"-nobswap2Bpp                  (used to match driver's pixel format with\n" \
++"-bswap3Bpp                    the video card's)\n" \
++"-nobswap3Bpp\n" \
++"-bswap4Bpp                        2Bpp - 15/16-bpp modes\n" \
++"-nobswap4Bpp                      3Bpp - packed 24bpp modes\n" \
++"-bwwap4Bpp                        4Bpp - unpacked 24bpp modes\n" \
++"-nowswap4Bpp\n" \
++"\n" \
++"-Bpp24bit [3|4]             - Set frame buffer Bytes-per-pixel for 24bpp mode\n" \
++"-Bpp32bit [3|4]             - Set frame buffer Bytes-per-pixel for 32bpp mode\n" \
++"\n" \
++"-videoCapFile[1-4]          - Optional paths (0-4) to scratch file paths to\n" \
++"                              use for video capture; spreads load across disks\n" \
++"\n" \
++"-noafc                      - Disable AFC\n" \
++"-disableDirectV             - Disable DMA transfers straight to video card\n" \
++"-debug <area>               - Debug Msgs\n" \
++"                              {startup,driver,subproc,events,video,frame}\n" \
++"-help                       - Display program options\n" \
++"\n" \
++"NOTE:  All command line options are accessible as X resources as well.\n" \
++"       The X resources have the same names as the command-line options.\n" \
++"       See the sample Fxtv class resource file for details.\n"
+ 
+ static String fallback_resources[] = { 
+  /*"Fxtv.geometry: +10+10",*/
+@@ -789,6 +788,7 @@ static String fallback_resources[] = { 
     "*imageSaveDialog*suffixLabel.label:            Append Img # Suffix",
     "*imageSaveDialog*formatLabel.label:            Format:",
     "*imageSaveDialog*formatMenuBox*tiffCmd.label:  TIFF",
@@ -10,7 +196,7 @@ $NetBSD: patch-ad,v 1.6 2002/12/21 11:10:00 wiz Exp $
     "*imageSaveDialog*formatMenuBox*ppmCmd.label:   PPM",
     "*imageSaveDialog*okCmd.label:                  OK",
  
-@@ -902,6 +903,7 @@ static String fallback_resources[] = { 
+@@ -902,6 +902,7 @@ static String fallback_resources[] = { 
     "*videoSaveDialog*imageEncLabel.label:           IMAGE ENCODE",
     "*videoSaveDialog*iFileFmtLabel.label:           Format:",
     "*videoSaveDialog*iFileFmtMenuBox*tiffCmd.label: TIFF",