wok-next rev 2669

Patch libmad-dev for mad.pc
author Rohit Joshi <jozee@slitaz.org>
date Sun Apr 19 10:06:47 2009 +0000 (2009-04-19)
parents 6476aebd9888 d4d3d13d92f5
children 67aee837278b
files
line diff
     1.1 --- a/libsndfile/receipt	Sun Apr 19 09:59:44 2009 +0000
     1.2 +++ b/libsndfile/receipt	Sun Apr 19 10:06:47 2009 +0000
     1.3 @@ -9,14 +9,14 @@
     1.4  BUILD_DEPENDS="alsa-lib-dev flac-dev"
     1.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     1.6  WEB_SITE="http://www.mega-nerd.com/libsndfile/" 
     1.7 -WGET_URL="$WEBSITE/$TARBALL"
     1.8 +WGET_URL="$WEB_SITE/$TARBALL"
     1.9  
    1.10  # Rules to configure and make the package.
    1.11  compile_rules()
    1.12  {
    1.13  	cd $src
    1.14 -	./configure --prefix=/usr --disable-sqlite
    1.15 -	make
    1.16 +	./configure --prefix=/usr --disable-sqlite &&
    1.17 +	make &&
    1.18  	make DESTDIR=$PWD/_pkg install
    1.19  }
    1.20  
     2.1 --- a/perl-net-dns/receipt	Sun Apr 19 09:59:44 2009 +0000
     2.2 +++ b/perl-net-dns/receipt	Sun Apr 19 10:06:47 2009 +0000
     2.3 @@ -5,7 +5,7 @@
     2.4  CATEGORY="development"
     2.5  SHORT_DESC="Net::DNS module is a Perl extension."
     2.6  MAINTAINER="erjo@slitaz.org"
     2.7 -DEPENDS="perl"
     2.8 +DEPENDS="perl perl-io-socket-inet6"
     2.9  BUILD_DEPENDS="perl perl-io-socket-inet6"
    2.10  SOURCE="Net-DNS"
    2.11  TARBALL="$SOURCE-$VERSION.tar.gz"
    2.12 @@ -17,7 +17,7 @@
    2.13  compile_rules()
    2.14  {
    2.15  	cd $src
    2.16 -	perl Makefile.PL
    2.17 +	yes n | perl Makefile.PL
    2.18  	make
    2.19  	make DESTDIR=$PWD/_pkg install
    2.20  }
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/wvdial/receipt	Sun Apr 19 10:06:47 2009 +0000
     3.3 @@ -0,0 +1,32 @@
     3.4 +# SliTaz package receipt.
     3.5 +
     3.6 +PACKAGE="wvdial"
     3.7 +VERSION="1.41"
     3.8 +CATEGORY="network"
     3.9 +SHORT_DESC="makes modem-based connection to Internet"
    3.10 +MAINTAINER="domcox@slitaz.org"
    3.11 +DEPENDS="ppp"
    3.12 +TARBALL=$PACKAGE"_"$VERSION".tar.gz"
    3.13 +WEB_SITE="http://alumnit.ca/wiki/?WvDial"
    3.14 +WGET_URL="http://archive.debian.org/debian/dists/potato/main/source/comm/$TARBALL"
    3.15 +
    3.16 +# Rules to configure and make the package.
    3.17 +compile_rules()
    3.18 +{
    3.19 +	cd $src
    3.20 +	! grep -q DESTDIR Makefile && patch -p1 < ../stuff/wvdial-1.41-gcc4.2.diff
    3.21 +	make && make DESTDIR=$PWD/_pkg install
    3.22 +}
    3.23 +
    3.24 +# Rules to gen a SliTaz package suitable for Tazpkg.
    3.25 +genpkg_rules()
    3.26 +{
    3.27 +	mkdir -p $fs/usr/bin
    3.28 +	cp -a $_pkg/usr/bin/wvdial* $fs/usr/bin
    3.29 +	cp -a $_pkg/etc $fs
    3.30 +}
    3.31 +
    3.32 +post_remove()
    3.33 +{
    3.34 +	rm -rf /etc/ppp/peers/wvdial
    3.35 +}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/wvdial/stuff/wvdial-1.41-gcc4.2.diff	Sun Apr 19 10:06:47 2009 +0000
     4.3 @@ -0,0 +1,336 @@
     4.4 +--- wvdial-1.41/Makefile	Sat Oct  3 05:40:30 1998
     4.5 ++++ wvdial-1.41+dom/Makefile	Thu Mar 19 20:56:27 2009
     4.6 +@@ -1,10 +1,11 @@
     4.7 + TOPDIR=$(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
     4.8 + 
     4.9 + DEBUG=0
    4.10 +-PREFIX=/usr/local
    4.11 +-BINDIR=${PREFIX}/bin
    4.12 +-MANDIR=${PREFIX}/man
    4.13 +-PPPDIR=/etc/ppp/peers
    4.14 ++
    4.15 ++PREFIX=/usr
    4.16 ++BINDIR=${DESTDIR}/${PREFIX}/bin
    4.17 ++MANDIR=${DESTDIR]/${PREFIX}/man
    4.18 ++PPPDIR=${DESTDIR}/etc/ppp/peers
    4.19 + 
    4.20 + export TOPDIR DEBUG CC CXX
    4.21 + include rules.mk
    4.22 +--- wvdial-1.41/configfile/wvconf.cc	Sun Nov 28 20:39:33 1999
    4.23 ++++ wvdial-1.41+dom/configfile/wvconf.cc	Thu Mar 19 20:56:27 2009
    4.24 +@@ -130,7 +130,7 @@
    4.25 + 	    // it must be an element for the current section *sect.
    4.26 + 	    p = parse_value(from_file);
    4.27 + 	    if (!p)
    4.28 +-		p = "";		// allow empty entries
    4.29 ++		  p = (char*)"";		// allow empty entries
    4.30 + 
    4.31 + 	    from_file = trim_string(from_file);
    4.32 + 	    if (from_file[0])	// nonblank option name
    4.33 +--- wvdial-1.41/rules.mk	Thu Mar 19 21:04:33 2009
    4.34 ++++ wvdial-1.41+dom/rules.mk	Thu Oct 21 00:37:00 1999
    4.35 +@@ -47,7 +47,7 @@
    4.36 + CFLAGS += -g -O6 -DDEBUG=0 -DNDEBUG
    4.37 + #CFLAGS += -fomit-frame-pointer  # really evil
    4.38 + #CXXFLAGS += -fno-implement-inlines  # causes trouble with egcs 1.0
    4.39 +-CXXFLAGS += -fno-rtti -fno-exceptions
    4.40 ++CXXFLAGS += -fno-rtti -fno-exceptions -fno-strict-aliasing
    4.41 + LDFLAGS += -g
    4.42 + endif
    4.43 + 
    4.44 +--- wvdial-1.41/streams/wvlog.cc	Sat Jul 10 21:36:45 1999
    4.45 ++++ wvdial-1.41+dom/streams/wvlog.cc	Thu Mar 19 20:56:27 2009
    4.46 +@@ -14,16 +14,16 @@
    4.47 + WvLogRcvBase *WvLog::default_receiver = NULL;
    4.48 + 
    4.49 + char *WvLogRcv::loglevels[WvLog::NUM_LOGLEVELS] = {
    4.50 +-    "Crit",
    4.51 +-    "Err",
    4.52 +-    "Warn",
    4.53 +-    "Notice",
    4.54 +-    "Info",
    4.55 +-    "*1",
    4.56 +-    "*2",
    4.57 +-    "*3",
    4.58 +-    "*4",
    4.59 +-    "*5",
    4.60 ++  (char*)"Crit",
    4.61 ++  (char*)"Err",
    4.62 ++  (char*)"Warn",
    4.63 ++  (char*)"Notice",
    4.64 ++  (char*)"Info",
    4.65 ++  (char*)"*1",
    4.66 ++  (char*)"*2",
    4.67 ++  (char*)"*3",
    4.68 ++  (char*)"*4",
    4.69 ++  (char*)"*5",
    4.70 + };
    4.71 + 
    4.72 + 
    4.73 +--- wvdial-1.41/streams/wvlog.h	Wed Mar 24 04:41:37 1999
    4.74 ++++ wvdial-1.41+dom/streams/wvlog.h	Thu Mar 19 20:56:27 2009
    4.75 +@@ -25,7 +25,7 @@
    4.76 + // or transmits log messages.
    4.77 + class WvLogRcvBase
    4.78 + {
    4.79 +-    friend WvLog;
    4.80 ++    friend class WvLog;
    4.81 + protected:
    4.82 +     const char *appname(const WvLog *log) const;
    4.83 +     virtual void log(const WvLog *source, int loglevel,
    4.84 +@@ -43,7 +43,7 @@
    4.85 + // to all registered WvLogRcv's.
    4.86 + class WvLog : public WvStream
    4.87 + {
    4.88 +-    friend WvLogRcvBase;
    4.89 ++    friend class WvLogRcvBase;
    4.90 + public:
    4.91 +     enum LogLevel {
    4.92 + 	Critical = 0,
    4.93 +--- wvdial-1.41/streams/wvstream.cc	Thu Oct 21 00:37:04 1999
    4.94 ++++ wvdial-1.41+dom/streams/wvstream.cc	Thu Mar 19 20:56:27 2009
    4.95 +@@ -9,6 +9,7 @@
    4.96 +  * for each stream.
    4.97 +  */
    4.98 + #include "wvstream.h"
    4.99 ++#include <time.h>
   4.100 + #include <sys/time.h>
   4.101 + #include <sys/types.h>
   4.102 + #include <errno.h>
   4.103 +--- wvdial-1.41/streams/wvtimestream.h	Wed Mar 24 04:41:37 1999
   4.104 ++++ wvdial-1.41+dom/streams/wvtimestream.h	Thu Mar 19 20:56:27 2009
   4.105 +@@ -40,7 +40,7 @@
   4.106 +     virtual bool test_set(SelectInfo &si);
   4.107 +     
   4.108 +     // notify timestream that we have "ticked" once
   4.109 +-    void WvTimeStream::tick();
   4.110 ++    virtual void tick();
   4.111 +     virtual void execute();
   4.112 + };
   4.113 + 
   4.114 +--- wvdial-1.41/utils/base64.cc	Wed Mar 24 04:41:38 1999
   4.115 ++++ wvdial-1.41+dom/utils/base64.cc	Thu Mar 19 20:56:27 2009
   4.116 +@@ -16,7 +16,7 @@
   4.117 + #include "base64.h"
   4.118 + #include <string.h>
   4.119 + 
   4.120 +-static char * alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
   4.121 ++const char * alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
   4.122 + 			 "0123456789+/=";
   4.123 + 
   4.124 + char * base64_encode( char * str )
   4.125 +--- wvdial-1.41/utils/base64.h	Wed Mar 24 04:41:38 1999
   4.126 ++++ wvdial-1.41+dom/utils/base64.h	Thu Mar 19 20:56:27 2009
   4.127 +@@ -12,4 +12,4 @@
   4.128 + extern char * base64_encode( char * str );
   4.129 + extern char * base64_decode( char * str );
   4.130 + 
   4.131 +-#endif __BASE64_H
   4.132 ++#endif // __BASE64_H
   4.133 +--- wvdial-1.41/utils/wvbuffer.h	Sun Jun 20 21:45:55 1999
   4.134 ++++ wvdial-1.41+dom/utils/wvbuffer.h	Thu Mar 19 20:56:27 2009
   4.135 +@@ -10,6 +10,7 @@
   4.136 + #define __WVBUFFER_H
   4.137 + 
   4.138 + #include "wvlinklist.h"
   4.139 ++#include <string.h>
   4.140 + 
   4.141 + class WvMiniBuffer
   4.142 + {
   4.143 +--- wvdial-1.41/utils/wvhashtable.h	Thu Oct 14 23:33:38 1999
   4.144 ++++ wvdial-1.41+dom/utils/wvhashtable.h	Thu Mar 19 20:56:27 2009
   4.145 +@@ -139,7 +139,7 @@
   4.146 +     _type_##List *sl()							\
   4.147 + 	{ return (_type_##List *)slots; }				\
   4.148 +     									\
   4.149 +-    ~##_classname_()							\
   4.150 ++    ~_classname_()							\
   4.151 +         { shutdown(); delete[] sl(); }					\
   4.152 +     									\
   4.153 +     void add(_type_ *data, bool auto_free)				\
   4.154 +--- wvdial-1.41/utils/wvlinklist.h	Thu Oct 14 23:33:38 1999
   4.155 ++++ wvdial-1.41+dom/utils/wvlinklist.h	Thu Mar 19 20:56:27 2009
   4.156 +@@ -126,7 +126,7 @@
   4.157 +     _newname_()						\
   4.158 + 	{ setup(); }					\
   4.159 + 							\
   4.160 +-    ~##_newname_() 					\
   4.161 ++    ~_newname_() 					\
   4.162 + 	{ shutdown(); _zap(); }				\
   4.163 + 							\
   4.164 +     void zap()						\
   4.165 +--- wvdial-1.41/wvdial/wvdialer.cc	Fri Nov 19 06:14:46 1999
   4.166 ++++ wvdial-1.41+dom/wvdial/wvdialer.cc	Thu Mar 19 20:56:27 2009
   4.167 +@@ -21,26 +21,26 @@
   4.168 + 
   4.169 + 
   4.170 + static char *	init_responses[] = {
   4.171 +-	"ok",
   4.172 +-	"error",
   4.173 ++  (char*)"ok",
   4.174 ++  (char*)"error",
   4.175 + 	NULL
   4.176 + };
   4.177 + 
   4.178 + static char *	dial_responses[] = {
   4.179 +-	"connect",
   4.180 +-	"no carrier",
   4.181 +-	"no dialtone",
   4.182 +-	"no dial tone",
   4.183 +-	"busy",
   4.184 +-	"error",
   4.185 +-	"voice",
   4.186 +-	"fclass",
   4.187 ++  (char*)"connect",
   4.188 ++  (char*)"no carrier",
   4.189 ++  (char*)"no dialtone",
   4.190 ++  (char*)"no dial tone",
   4.191 ++  (char*)"busy",
   4.192 ++  (char*)"error",
   4.193 ++  (char*)"voice",
   4.194 ++  (char*)"fclass",
   4.195 + 	NULL
   4.196 + };
   4.197 + 
   4.198 + static char *	prompt_strings[] = {
   4.199 +-	"}!}",
   4.200 +-	"!}!",
   4.201 ++  (char*)"}!}",
   4.202 ++  (char*)"!}!",
   4.203 + 	NULL
   4.204 + };
   4.205 + 
   4.206 +@@ -51,7 +51,7 @@
   4.207 + //       WvDialer Public Functions
   4.208 + //**************************************************
   4.209 + 
   4.210 +-WvDialer::WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode = false )
   4.211 ++WvDialer::WvDialer( WvConf &_cfg, WvStringList *_sect_list, bool _chat_mode )
   4.212 + /********************************************************/
   4.213 + : WvStreamClone( (WvStream **)&modem ),
   4.214 +     cfg(_cfg), log( "WvDial", WvLog::Debug ),
   4.215 +@@ -360,40 +360,40 @@
   4.216 + {
   4.217 +     OptInfo opts[] = {
   4.218 +     // string options:
   4.219 +-    	{ "Modem",           &options.modem,        NULL, "/dev/modem",     0 },
   4.220 +-    	{ "Init1",           &options.init1,        NULL, "ATZ",            0 },
   4.221 +-    	{ "Init2",           &options.init2,        NULL, "",               0 },
   4.222 +-    	{ "Init3",           &options.init3,        NULL, "",               0 },
   4.223 +-    	{ "Init4",           &options.init4,        NULL, "",               0 },
   4.224 +-    	{ "Init5",           &options.init5,        NULL, "",               0 },
   4.225 +-    	{ "Init6",           &options.init6,        NULL, "",               0 },
   4.226 +-    	{ "Init7",           &options.init7,        NULL, "",               0 },
   4.227 +-    	{ "Init8",           &options.init8,        NULL, "",               0 },
   4.228 +-    	{ "Init9",           &options.init9,        NULL, "",               0 },
   4.229 +-    	{ "Phone",           &options.phnum,        NULL, "",               0 },
   4.230 +-    	{ "Dial Prefix",     &options.dial_prefix,  NULL, "",               0 },
   4.231 +-    	{ "Area Code",       &options.areacode,     NULL, "",               0 },
   4.232 +-    	{ "Dial Command",    &options.dial_cmd,     NULL, "ATDT",           0 },
   4.233 +-    	{ "Username",        &options.login,        NULL, "",               0 },
   4.234 +-    	{ "Login Prompt",    &options.login_prompt, NULL, "",               0 },
   4.235 +-    	{ "Password",        &options.password,     NULL, "",               0 },
   4.236 +-    	{ "Password Prompt", &options.pass_prompt,  NULL, "",               0 },
   4.237 +-    	{ "PPPD Path",       &options.where_pppd,   NULL, "/usr/sbin/pppd", 0 },
   4.238 +-    	{ "Force Address",   &options.force_addr,   NULL, "",               0 },
   4.239 +-    	{ "Remote Name",     &options.remote,       NULL, "*",              0 },
   4.240 +-    	{ "Default Reply",   &options.default_reply,NULL, "ppp",	    0 },
   4.241 +-    	{ "ISDN",	     &options.isdn,	    NULL, "",		    0 },
   4.242 ++	  { (char*)"Modem",           &options.modem,        NULL, (char*)"/dev/modem",     0 },
   4.243 ++	  { (char*)"Init1",           &options.init1,        NULL, (char*)"ATZ",            0 },
   4.244 ++	  { (char*)"Init2",           &options.init2,        NULL, (char*)"",               0 },
   4.245 ++	  { (char*)"Init3",           &options.init3,        NULL, (char*)"",               0 },
   4.246 ++	  { (char*)"Init4",           &options.init4,        NULL, (char*)"",               0 },
   4.247 ++	  { (char*)"Init5",           &options.init5,        NULL, (char*)"",               0 },
   4.248 ++	  { (char*)"Init6",           &options.init6,        NULL, (char*)"",               0 },
   4.249 ++	  { (char*)"Init7",           &options.init7,        NULL, (char*)"",               0 },
   4.250 ++	  { (char*)"Init8",           &options.init8,        NULL, (char*)"",               0 },
   4.251 ++	  { (char*)"Init9",           &options.init9,        NULL, (char*)"",               0 },
   4.252 ++	  { (char*)"Phone",           &options.phnum,        NULL, (char*)"",               0 },
   4.253 ++	  { (char*)"Dial Prefix",     &options.dial_prefix,  NULL, (char*)"",               0 },
   4.254 ++	  { (char*)"Area Code",       &options.areacode,     NULL, (char*)"",               0 },
   4.255 ++	  { (char*)"Dial Command",    &options.dial_cmd,     NULL, (char*)"ATDT",           0 },
   4.256 ++	  { (char*)"Username",        &options.login,        NULL, (char*)"",               0 },
   4.257 ++	  { (char*)"Login Prompt",    &options.login_prompt, NULL, (char*)"",               0 },
   4.258 ++	  { (char*)"Password",        &options.password,     NULL, (char*)"",               0 },
   4.259 ++	  { (char*)"Password Prompt", &options.pass_prompt,  NULL, (char*)"",               0 },
   4.260 ++	  { (char*)"PPPD Path",       &options.where_pppd,   NULL, (char*)"/usr/sbin/pppd", 0 },
   4.261 ++	  { (char*)"Force Address",   &options.force_addr,   NULL, (char*)"",               0 },
   4.262 ++	  { (char*)"Remote Name",     &options.remote,       NULL, (char*)"*",              0 },
   4.263 ++	  { (char*)"Default Reply",   &options.default_reply,NULL, (char*)"ppp",	        0 },
   4.264 ++	  { (char*)"ISDN",	     	  &options.isdn,	     NULL, (char*)"",		        0 },
   4.265 + 
   4.266 +     // int/bool options
   4.267 +-    	{ "Baud",            NULL, &options.baud,          "", DEFAULT_BAUD },
   4.268 +-    	{ "Carrier Check",   NULL, &options.carrier_check, "", true         },
   4.269 +-    	{ "Stupid Mode",     NULL, &options.stupid_mode,   "", false        },
   4.270 +-    	{ "New PPPD",	     NULL, &options.new_pppd, 	   "", true         },
   4.271 +-    	{ "Auto Reconnect",  NULL, &options.auto_reconnect,"", true	    },
   4.272 +-    	{ NULL,		     NULL, NULL,                   "", 0            }
   4.273 ++	  { (char*)"Baud",            NULL, &options.baud,          (char*)"", DEFAULT_BAUD },
   4.274 ++	  { (char*)"Carrier Check",   NULL, &options.carrier_check, (char*)"", true         },
   4.275 ++	  { (char*)"Stupid Mode",     NULL, &options.stupid_mode,   (char*)"", false        },
   4.276 ++	  { (char*)"New PPPD",	      NULL, &options.new_pppd, 	    (char*)"", true         },
   4.277 ++	  { (char*)"Auto Reconnect",  NULL, &options.auto_reconnect,(char*)"", true  	    },
   4.278 ++	  { NULL,		     		  NULL, NULL,                   (char*)"", 0            }
   4.279 +     };
   4.280 + 
   4.281 +-    char *	d = "Dialer Defaults";
   4.282 ++    char *	d = (char*)"Dialer Defaults";
   4.283 + 
   4.284 +     for( int i=0; opts[i].name != NULL; i++ ) {
   4.285 +     	if( opts[i].str_member == NULL ) {
   4.286 +--- wvdial-1.41/wvdial/wvmodemscan.cc	Mon Sep 13 22:07:35 1999
   4.287 ++++ wvdial-1.41+dom/wvdial/wvmodemscan.cc	Thu Mar 19 20:56:27 2009
   4.288 +@@ -19,9 +19,9 @@
   4.289 + // startup at atz atq0 atv1 ate1 ats0 carrier dtr fastdial
   4.290 + // baudstep reinit done
   4.291 + static char *commands[WvModemScan::NUM_STAGES] = {
   4.292 +-    NULL, "Q0 V1 E1", "Z", "S0=0",
   4.293 +-    "&C1", "&D2", "S11=55", "+FCLASS=0", NULL,
   4.294 +-    NULL, "", NULL
   4.295 ++  NULL, (char*)"Q0 V1 E1", (char*)"Z", (char*)"S0=0",
   4.296 ++  (char*)"&C1", (char*)"&D2", (char*)"S11=55", (char*)"+FCLASS=0", NULL,
   4.297 ++  NULL, (char*)"", NULL
   4.298 + };
   4.299 + 
   4.300 + 
   4.301 +--- wvdial-1.41/wvdial/wvpapchap.cc	Sun Jun  6 19:08:49 1999
   4.302 ++++ wvdial-1.41+dom/wvdial/wvpapchap.cc	Thu Mar 19 20:56:27 2009
   4.303 +@@ -25,16 +25,16 @@
   4.304 + 
   4.305 +     // PAP secrets:
   4.306 +     nuke_contents();
   4.307 +-    load_file( PAP_SECRETS );
   4.308 ++    load_file( (char*)PAP_SECRETS );
   4.309 +     do_secret( username, password, remote );
   4.310 +-    if( write_file( PAP_SECRETS ) == false )
   4.311 ++    if( write_file( (char*)PAP_SECRETS ) == false )
   4.312 + 	pap_success = false;
   4.313 + 
   4.314 +     // CHAP secrets:
   4.315 +     nuke_contents();
   4.316 +-    load_file( CHAP_SECRETS );
   4.317 ++    load_file( (char*)CHAP_SECRETS );
   4.318 +     do_secret( username, password, remote );
   4.319 +-    if( write_file( CHAP_SECRETS ) == false )
   4.320 ++    if( write_file( (char*)CHAP_SECRETS ) == false )
   4.321 + 	chap_success = false;
   4.322 + }
   4.323 + 
   4.324 +--- wvdial-1.41/wvdial/wvpapchap.h	Wed Mar 24 04:41:42 1999
   4.325 ++++ wvdial-1.41+dom/wvdial/wvpapchap.h	Thu Mar 19 20:56:27 2009
   4.326 +@@ -43,4 +43,4 @@
   4.327 + 		    const char * remote );
   4.328 + };
   4.329 + 
   4.330 +-#endif __WVPAPCHAP_H
   4.331 ++#endif // __WVPAPCHAP_H
   4.332 +--- wvdial-1.41/wvver.h	Fri Jan  7 03:55:50 2000
   4.333 ++++ wvdial-1.41+dom/wvver.h	Thu Mar 19 20:56:27 2009
   4.334 +@@ -28,4 +28,4 @@
   4.335 + #define TUNNELV_VER		0x00020000
   4.336 + #define TUNNELV_VER_STRING	"2.00"
   4.337 + 
   4.338 +-#endif __WVDEFS_H
   4.339 ++#endif // __WVDEFS_H