Fix trivial broken build. Then, fix extensive but straightforward LP64

issues reported by gcc. PKGREVISION -> 6.

33 files changed, 1281 insertions, 29 deletions

diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 2b007b38853..a3d98250c32 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2011/04/22 13:44:43 obache Exp $
+# $NetBSD: Makefile,v 1.25 2011/10/02 01:20:55 dholland Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
 PKGNAME=	gnometoaster-1.0Beta5
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	# http://gnometoaster.rulez.org/archive/
 EXTRACT_SUFX=	.tgz
diff --git a/sysutils/gnometoaster/distinfo b/sysutils/gnometoaster/distinfo
index 5aa7bc3c1e4..8efa1b06cd4 100644
--- a/sysutils/gnometoaster/distinfo
+++ b/sysutils/gnometoaster/distinfo
@@ -1,11 +1,38 @@
-$NetBSD: distinfo,v 1.7 2008/06/20 01:09:36 joerg Exp $
+$NetBSD: distinfo,v 1.8 2011/10/02 01:20:55 dholland Exp $
 
 SHA1 (gtoaster1.0Beta5.tgz) = c55bf7e8e532956a8907cd29cbfb98a721c5bb3a
 RMD160 (gtoaster1.0Beta5.tgz) = f8c7386497c56b8e1bf924e099ddf68cbcbd02a0
 Size (gtoaster1.0Beta5.tgz) = 781796 bytes
-SHA1 (patch-aa) = 618fc9b23d0ea9ad1be737dbb836e5ddcc8dd759
-SHA1 (patch-ab) = 8d3d500572dbfac5263f7902655ff3269db4102f
-SHA1 (patch-ac) = 8bbb117badd4430eb2fc0eb2ad130671ceb46f47
+SHA1 (patch-aa) = 6ae7c9aaf606256111c908f429761877238c4a17
+SHA1 (patch-ac) = 761bb56e22e82d7c9b82698f5c0f1147b6e4bc83
 SHA1 (patch-ad) = b8b5349fe092cbf9d8a40da272d379e5fae7ef91
 SHA1 (patch-ae) = b1a6f1f9bbaa605b9782f67dd8f6cdaf6770a438
 SHA1 (patch-af) = ca8bb1aa0b5eb267448dc8761ccfcd8428d00503
+SHA1 (patch-audiotrack_c) = 9fcd4edb86405db91e6a7b2902b344f9b92f1fbb
+SHA1 (patch-audiotrack_h) = 83757fbecfa059a4103099bf63c8544b0b7e1cff
+SHA1 (patch-cddb_c) = 18ade5a23408c0eaab0a0604b390abcd55d8ebf8
+SHA1 (patch-cddb_h) = bb49ee918f00e5f94f7733422b09a0e8a6ba22e3
+SHA1 (patch-cddrives_c) = 6f870d1c3cc7f756575dacde85a8346d886439fb
+SHA1 (patch-cdromlow_h) = 201c5578d2beaa133e3ac05fe24f639f6124736f
+SHA1 (patch-datacopydlg_c) = 03f04abc74a3604babd215c60b0ade77cec533ab
+SHA1 (patch-datacopydlg_h) = 458bd156a2c8c081caf76e845a4f1de0ff240553
+SHA1 (patch-datatrack_c) = 3b3c763229a4695154f951c7586db02119746f44
+SHA1 (patch-defaultentries_h) = c5c6748b93580f90e59bd514ffea204f14b6e08b
+SHA1 (patch-dialog_c) = 71884bf907425a5d726138b89045ed8e2a8423b2
+SHA1 (patch-filelist_c) = bf185c8dc1532668aebe1ce932eac48cf0f9ffe6
+SHA1 (patch-fileman_c) = 6427c8b101567a2eda1f7974d25b34f983374fa7
+SHA1 (patch-fsedit_c) = 142a4b98d307668ea265260c274e454746319b99
+SHA1 (patch-getdir_c) = 95acbb1e331f71002a6c59f7542238e1c317b85c
+SHA1 (patch-menusys_gtk_c) = cbadeb453ba22dfe8f488659c2655183059e5b17
+SHA1 (patch-mp3func_c) = 07f59b8925689c83e5713845e58fb20b4c6b3dc4
+SHA1 (patch-piping_c) = 3c6525e696e051c714835199de3fe7a2f167d712
+SHA1 (patch-piping_h) = eda90cd11772bcb218dcd70698333bdd266fa2ed
+SHA1 (patch-preferences_c) = 135d510c6f247bd0681d3d9c86751ee280eb0abc
+SHA1 (patch-selectlist_c) = 863472c181469eebb0582003a861207e67724090
+SHA1 (patch-stdfiletrack_c) = 61d678e82b67b14c3e9f8e53f6dc6291786a5e87
+SHA1 (patch-streams_c) = 0b6754ec345b92f8c2ff6db3d0bac6d7243ee7dd
+SHA1 (patch-trackedit_c) = 1e94fd3ccc3ccb7cd244161179b743baf74258d7
+SHA1 (patch-tracklist_c) = 72cbbf3777d1259b764d106f273ebe303cbdc80a
+SHA1 (patch-vfs_c) = 430fd869275f386c0d4729573f10cfdf8db5171e
+SHA1 (patch-vfs_h) = 85a50786f15278cc4f22a4f2eaa199651b14593e
+SHA1 (patch-vfs_unixtree_c) = 08b7c094d8928cda3ac1cc4c0d8f7460ce52a257
diff --git a/sysutils/gnometoaster/patches/patch-aa b/sysutils/gnometoaster/patches/patch-aa
index f8dde8dbf0b..894f39a3862 100644
--- a/sysutils/gnometoaster/patches/patch-aa
+++ b/sysutils/gnometoaster/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2011/10/02 01:20:55 dholland Exp $
+
+- netbsd/dragonfly cdrom support
+- fix LP64 problems
 
 --- cdromlow.c.orig	2001-10-27 09:23:21.000000000 +0000
 +++ cdromlow.c
@@ -56,7 +59,50 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  #elif __svr4__
  # define CD_FRAMESIZE 2048
  # define CD_FRAMESIZE_RAW 2352
-@@ -138,6 +154,11 @@ int cdromlow_hasdatatrack(int handle)
+@@ -94,15 +110,14 @@
+ 
+ #define CDROMLOW_MAXCDTEXTOUT 16384
+ 
+-typedef struct
++struct cdromlow_tochandle
+ {
+    char *cdda2wavoutput;
+    char *devicename;
+    int  filedescriptor;
+-}
+-cdromlow_tochandle;
++};
+ 
+-int cdromlow_gettochandle(const char *device)
++cdromlow_tochandle *cdromlow_gettochandle(const char *device)
+ {
+    cdromlow_tochandle *handle=(cdromlow_tochandle*)malloc(sizeof(cdromlow_tochandle));
+    /* no cd text output is generated until needed */
+@@ -112,12 +127,11 @@ int cdromlow_gettochandle(const char *de
+ #ifdef DEBUG
+    printf("cdromlow_gettochandle result is %i\n",(int)handle);
+ #endif
+-   return (int)handle;
++   return handle;
+ };
+ 
+-void cdromlow_closetochandle(int handle)
++void cdromlow_closetochandle(cdromlow_tochandle *info)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+    /* free cd text output if it was generated */
+    if (info->cdda2wavoutput)
+      free (info->cdda2wavoutput);
+@@ -130,14 +144,18 @@ void cdromlow_closetochandle(int handle)
+ /* reimplemented using direct cdrom access:
+  * does the current cd have one or more data tracks ? *
+  * returns -1 or data track of cd */
+-int cdromlow_hasdatatrack(int handle)
++int cdromlow_hasdatatrack(cdromlow_tochandle *info)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+    cdromlow_definecdromheader header;
+    cdromlow_definecdromhentry entry;
  
     int x;
     int hasdatatrack=-1;
@@ -68,7 +114,7 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  
     if (info->filedescriptor!=-1)
       {
-@@ -147,8 +168,12 @@ int cdromlow_hasdatatrack(int handle)
+@@ -147,8 +165,12 @@ int cdromlow_hasdatatrack(int handle)
  	       entry.cdromlow_tocent_track=x;
  	       entry.cdromlow_tocent_format=CDROM_LBA;
  	       ioctl(info->filedescriptor,CDROMREADTOCENTRY,&entry);
@@ -82,8 +128,25 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  #else
  		 if (entry.entry.control & CDROM_DATA_TRACK)
  #endif
-@@ -191,6 +216,11 @@ int cdromlow_trackoffset(int handle,int 
-    cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+@@ -166,9 +188,8 @@ int cdromlow_hasdatatrack(int handle)
+ ;
+ 
+ /* return number of tracks on cd,reimplemented using ioctl()s */
+-int cdromlow_tracks(int handle)
++int cdromlow_tracks(cdromlow_tochandle *info)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+    cdromlow_definecdromheader header;
+    int tracknum;
+ 
+@@ -186,16 +207,20 @@ int cdromlow_tracks(int handle)
+ ;
+ 
+ /* returns the offset of a track's starting position in LBA format */
+-int cdromlow_trackoffset(int handle,int num)
++int cdromlow_trackoffset(cdromlow_tochandle *info,int num)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
     cdromlow_definecdromhentry entry;
     int offset=-1;
 +#ifdef __NetBSD__
@@ -94,7 +157,21 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  
     if (info->filedescriptor!=-1)
       {
-@@ -223,6 +253,13 @@ int cdromlow_tracksize_sectors(int handl
+ 	/* Return offset of leadout if track > last track is requested */
+-	if (num>cdromlow_tracks(handle))
++	if (num>cdromlow_tracks(info))
+ 	  entry.cdromlow_tocent_track=CDROM_LEADOUT;
+ 	else
+ 	  entry.cdromlow_tocent_track=num;
+@@ -216,13 +241,19 @@ int cdromlow_trackoffset(int handle,int 
+ ;
+ 
+ /* return tracksize of track num in sectors (LBA) */
+-int cdromlow_tracksize_sectors(int handle,int num)
++int cdromlow_tracksize_sectors(cdromlow_tochandle *info,int num)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+    cdromlow_definecdromhentry track;
     cdromlow_definecdromhentry tracknext;
     int tracksize;
     int ok=1;
@@ -108,7 +185,42 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  
     tracksize=0;
     if (info->filedescriptor!=-1)
-@@ -278,6 +315,11 @@ int cdromlow_cddbnumber(int handle)
+@@ -232,7 +263,7 @@ int cdromlow_tracksize_sectors(int handl
+ 	if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1)
+ 	  ok=0;
+ 
+-	if (num==cdromlow_tracks(handle))
++	if (num==cdromlow_tracks(info))
+ 	  tracknext.cdromlow_tocent_track=CDROM_LEADOUT;
+ 	else
+ 	  tracknext.cdromlow_tocent_track=num+1;
+@@ -251,14 +282,14 @@ int cdromlow_tracksize_sectors(int handl
+ ;
+ 
+ /* return tracksize for audiotrack n in bytes,reimplemented using ioctl()s */
+-int cdromlow_tracksize(int handle,int num)
++int cdromlow_tracksize(cdromlow_tochandle *handle,int num)
+ {
+    return cdromlow_tracksize_sectors(handle,num)*CD_FRAMESIZE_RAW;
+ }
+ ;
+ 
+ /* return tracksize of datatrack in bytes,reimplemented using ioctl()s */
+-int cdromlow_datatracksize(int handle,int tracknum)
++int cdromlow_datatracksize(cdromlow_tochandle *handle,int tracknum)
+ {
+    if (cdromlow_hasdatatrack(handle)!=-1)
+      return cdromlow_tracksize_sectors(handle,
+@@ -270,14 +301,17 @@ int cdromlow_datatracksize(int handle,in
+ ;
+ 
+ /* return cddb number of cdrom */
+-int cdromlow_cddbnumber(int handle)
++int cdromlow_cddbnumber(cdromlow_tochandle *info)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+-
+    cdromlow_definecdromheader header;
     cdromlow_definecdromhentry entry;
     int x,secs;
     int cddbnum=0;
@@ -120,7 +232,14 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  
     cddbnum=0;
     if (info->filedescriptor!=-1)
-@@ -317,6 +359,11 @@ cdromlow_tracktype cdromlow_gettracktype
+@@ -311,12 +345,16 @@ int cdromlow_cddbnumber(int handle)
+ ;
+ 
+ /* return the tracktype of specified track */
+-cdromlow_tracktype cdromlow_gettracktype(int handle,int num)
++cdromlow_tracktype cdromlow_gettracktype(cdromlow_tochandle *info,int num)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
     cdromlow_definecdromhentry track;
     int ok=1;
     cdromlow_tracktype result=TRACKTYPE_UNKNOWN;
@@ -132,7 +251,7 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  
     if (info->filedescriptor!=-1)
       {
-@@ -324,8 +371,12 @@ cdromlow_tracktype cdromlow_gettracktype
+@@ -324,8 +362,12 @@ cdromlow_tracktype cdromlow_gettracktype
  	track.cdromlow_tocent_format=CDROM_LBA;
  	if (ioctl(info->filedescriptor,CDROMREADTOCENTRY,&track)==-1)
  	  ok=0;
@@ -146,3 +265,57 @@ $NetBSD: patch-aa,v 1.3 2006/05/21 23:02:29 wiz Exp $
  #else
  	  if (track.entry.control & CDROM_DATA_TRACK)
  #endif
+@@ -338,9 +380,8 @@ cdromlow_tracktype cdromlow_gettracktype
+ }
+ ;
+ 
+-void cdromlow_createcdtextoutput(int handle)
++void cdromlow_createcdtextoutput(cdromlow_tochandle *info)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+    if (!info->cdda2wavoutput)
+      {
+ 	char *call=varman_getvar_copy(global_defs,
+@@ -362,13 +403,12 @@ void cdromlow_createcdtextoutput(int han
+      };
+ };
+ 
+-char *cdromlow_getcdtext(int handle, int num,const char *parse)
++char *cdromlow_getcdtext(cdromlow_tochandle *info, int num,const char *parse)
+ {
+-   cdromlow_tochandle *info=(cdromlow_tochandle*)handle;
+    char buffer[256];
+    char *func=(char*)malloc(((parse)?strlen(parse):0)+11);
+ 
+-   cdromlow_createcdtextoutput(handle);
++   cdromlow_createcdtextoutput(info);
+      
+    strcpy(buffer,"");
+    strcpy(func,((parse)?parse:""));
+@@ -390,22 +430,22 @@ char *cdromlow_getcdtext(int handle, int
+    return (strlen(buffer)?strdup(buffer):NULL);
+ };
+ 
+-char *cdromlow_gettitle(int handle,int num)
++char *cdromlow_gettitle(cdromlow_tochandle *handle,int num)
+ {
+    return cdromlow_getcdtext(handle,num,varman_getvar(global_defs,"audiotrack_parsecdtext_title"));
+ };
+ 
+-char *cdromlow_getperformer(int handle,int num)
++char *cdromlow_getperformer(cdromlow_tochandle *handle,int num)
+ {
+    return cdromlow_getcdtext(handle,num,varman_getvar(global_defs,"audiotrack_parsecdtext_performer"));
+ };
+ 
+-char *cdromlow_getdisctitle(int handle)
++char *cdromlow_getdisctitle(cdromlow_tochandle *handle)
+ {
+    return cdromlow_getcdtext(handle,0,varman_getvar(global_defs,"audiotrack_parsecdtext_cdtitle"));
+ };
+ 
+-char *cdromlow_getdiscperformer(int handle)
++char *cdromlow_getdiscperformer(cdromlow_tochandle *handle)
+ {
+    return cdromlow_getcdtext(handle,0,varman_getvar(global_defs,"audiotrack_parsecdtext_cdperformer"));
+ };
diff --git a/sysutils/gnometoaster/patches/patch-ab b/sysutils/gnometoaster/patches/patch-ab
deleted file mode 100644
index f5ccaeab67d..00000000000
--- a/sysutils/gnometoaster/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2006/03/06 22:16:53 joerg Exp $
-
---- cddb.c.orig	Wed Jun  6 00:47:58 2001
-+++ cddb.c	Sat Mar 23 20:13:05 2002
-@@ -45,7 +45,7 @@
- #include <stdlib.h>
- #include <sys/socket.h>
- #include <sys/types.h>
--#ifndef __FreeBSD__
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- # include <arpa/inet.h>
- #else
- # include <netinet/in.h>
diff --git a/sysutils/gnometoaster/patches/patch-ac b/sysutils/gnometoaster/patches/patch-ac
index 80f4adce0e2..6d537cee685 100644
--- a/sysutils/gnometoaster/patches/patch-ac
+++ b/sysutils/gnometoaster/patches/patch-ac
@@ -1,4 +1,11 @@
-$NetBSD: patch-ac,v 1.2 2006/03/06 22:16:53 joerg Exp $
+$NetBSD: patch-ac,v 1.3 2011/10/02 01:20:55 dholland Exp $
+
+- netbsd/dragonfly/openbsd cdrom support
+- silence LP64 warnings; these seem to be ok
+
+Caution: part of the second hunk contains DEVOSSAUDIO to be
+substituted from the pkgsrc Makefile. Don't commit a presubstituted
+version of the patch by accident.
 
 --- audio_oss.c.orig	2000-12-09 11:12:15.000000000 +0000
 +++ audio_oss.c
@@ -34,3 +41,27 @@ $NetBSD: patch-ac,v 1.2 2006/03/06 22:16:53 joerg Exp $
  	     ioctl(driver->descriptor,SNDCTL_DSP_SPEED,&speed);
  	     ioctl(driver->descriptor,SNDCTL_DSP_CHANNELS,&channels);
  	     ioctl(driver->descriptor,SNDCTL_DSP_GETFMTS,&format_mask);
+@@ -73,7 +74,7 @@ int audio_oss_open(gpointer data)
+ 	      * little Endian (like all Soundblaster devices etc.) */
+ 	     if (format==AFMT_S16_LE)
+ 	       {		  
+-		  driver->data=(gpointer)piping_create_function(stdfiletrack_byteswap,		
++		  driver->data=(gpointer)(intptr_t)piping_create_function(stdfiletrack_byteswap,		
+ 								NULL,
+ 								&inp,
+ 								&driver->descriptor,
+@@ -99,11 +100,11 @@ void audio_oss_close(gpointer data)
+ 	close(driver->descriptor);
+ 	driver->descriptor=-1;
+ 	/* wait for byteswap to finish */
+-	if ((int)driver->data!=-1)
++	if ((int)(intptr_t)driver->data!=-1)
+ 	  {
+ 	     /* say good by, byteswap */
+-	     kill((int)driver->data,SIGTERM);
+-	     waitpid((int)driver->data,&status,0);
++	     kill((int)(intptr_t)driver->data,SIGTERM);
++	     waitpid((int)(intptr_t)driver->data,&status,0);
+ 	  };	     
+      };
+ };
diff --git a/sysutils/gnometoaster/patches/patch-audiotrack_c b/sysutils/gnometoaster/patches/patch-audiotrack_c
new file mode 100644
index 00000000000..73eaf916031
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-audiotrack_c
@@ -0,0 +1,24 @@
+$NetBSD: patch-audiotrack_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- Fix LP64 problems
+
+--- audiotrack.c~	2001-10-28 11:28:09.000000000 +0000
++++ audiotrack.c
+@@ -220,7 +220,7 @@ tracks_trackinfo *audiotrack_create(char
+    tracks_trackinfo *at;
+    audiotrack_info *info;
+    char name[255];
+-   int tochandle=cdromlow_gettochandle(device);
++   cdromlow_tochandle *tochandle=cdromlow_gettochandle(device);
+ 
+    info=(audiotrack_info*)malloc(sizeof(audiotrack_info));
+    strcpy(info->device,device);
+@@ -286,7 +286,7 @@ tracks_trackinfo *audiotrack_create(char
+ ;
+ 
+ /* configure the cdda audio stream from cdrom tracktype */
+-void audiotrack_init()
++void audiotrack_init(void)
+ {
+    GtkWidget *audiotrack_prefs;
+    GtkWidget *label;
diff --git a/sysutils/gnometoaster/patches/patch-audiotrack_h b/sysutils/gnometoaster/patches/patch-audiotrack_h
new file mode 100644
index 00000000000..76eb26c4bf5
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-audiotrack_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-audiotrack_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- audiotrack.h~	2001-03-17 21:28:35.000000000 +0000
++++ audiotrack.h
+@@ -16,7 +16,7 @@ typedef struct 
+ 	int  cdda2wavpipe;
+ 	int  cdda2wavpid;
+ 	int  cdda2wavstatus;
+-        int  cddbrequestid;
++        cddb_infostruct *cddbrequestid;
+ } audiotrack_info;
+ 	
+ tracks_trackinfo *audiotrack_create(char *device,
diff --git a/sysutils/gnometoaster/patches/patch-cddb_c b/sysutils/gnometoaster/patches/patch-cddb_c
new file mode 100644
index 00000000000..b536c300d28
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-cddb_c
@@ -0,0 +1,60 @@
+$NetBSD: patch-cddb_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix include silliness
+- fix LP64 problems
+
+--- cddb.c.orig	2001-10-28 11:41:51.000000000 +0000
++++ cddb.c
+@@ -45,10 +45,7 @@
+ #include <stdlib.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+-#ifndef __FreeBSD__
+ # include <arpa/inet.h>
+-#else
+ # include <netinet/in.h>
+-#endif
+ #include <netdb.h>
+ #include <string.h>
+@@ -431,7 +431,7 @@ GList *cddb_serverrequest(gchar *server,
+ 		  if (result==210)
+ 		    {
+ 		       /* the first line is the corresponding cddb_key */
+-		       entry=g_list_append(entry,(gpointer)es->cddb_key);
++		       entry=g_list_append(entry,(gpointer)(intptr_t)es->cddb_key);
+ 		       /* store a response line */
+ 		       while (cddb_poll(cddb_sfd,resstr))
+ 			 entry=g_list_append(entry,g_strdup(resstr));
+@@ -458,7 +458,7 @@ GList *cddb_cachelookup(cddb_essentials 
+    while ((current!=NULL)&&(result==NULL))
+      {
+ 	GList *entry=(GList*)current->data;
+-	if ((int)entry->data==es->cddb_key)
++	if ((int)(intptr_t)entry->data==es->cddb_key)
+ 	  result=entry;
+ 	current=current->next;
+      };
+@@ -754,7 +754,7 @@ void *cddb_commthread(void *s)
+  * cancelled.
+  * data can point to additional informations passed to the callback
+  * but may otherwise safely be set to NULL */
+-int cddb_lookup(cddb_essentials *es,
++cddb_infostruct *cddb_lookup(cddb_essentials *es,
+ 		int tracknum,
+ 		cddb_datahandler callback,
+ 		gpointer data)
+@@ -786,12 +786,12 @@ int cddb_lookup(cddb_essentials *es,
+ 	pthread_mutex_unlock(&cddb_sem);
+ 
+      };
+-   return (int)info;
++   return info;
+ };
+ 
+ /* kill a cddb lookup job. this is done e.g. in tracks.c when the last reference
+  * to a track has been cleared and the track is about to be deleted */
+-void cddb_killjob(int jobid)
++void cddb_killjob(cddb_infostruct *jobid)
+ {
+    if (jobid)
+      {
diff --git a/sysutils/gnometoaster/patches/patch-cddb_h b/sysutils/gnometoaster/patches/patch-cddb_h
new file mode 100644
index 00000000000..8ef537dc124
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-cddb_h
@@ -0,0 +1,34 @@
+$NetBSD: patch-cddb_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+- declare functions properly
+
+--- cddb.h~	2000-08-16 06:22:06.000000000 +0000
++++ cddb.h
+@@ -67,20 +67,20 @@ typedef void (*cddb_datahandler)(cddb_in
+  * cancelled. 
+  * data can point to additional informations passed to the callback
+  * but may otherwise safely be set to NULL */
+-int cddb_lookup(cddb_essentials *es,
++cddb_infostruct *cddb_lookup(cddb_essentials *es,
+ 		int tracknum,
+ 		cddb_datahandler callback,
+ 		gpointer data);
+ /* kill a cddb lookup job. this is done e.g. in tracks.c when the last reference
+  * to a track has been cleared and the track is about to be deleted */
+-void cddb_killjob(int jobid);
++void cddb_killjob(cddb_infostruct *jobid);
+ /* The following two functions are primarily used to restart the
+  * cddb lookup process in case the server adress has been changed in
+  * the preferences setup */
+-void cddb_start_lookup();
+-void cddb_kill_lookup();
++void cddb_start_lookup(void);
++void cddb_kill_lookup(void);
+ /* control functions called by main.c to bring up/down cddb interface */
+-void cddb_init();
+-void cddb_destroy();
++void cddb_init(void);
++void cddb_destroy(void);
+ 
+ #endif // CDDB_H
diff --git a/sysutils/gnometoaster/patches/patch-cddrives_c b/sysutils/gnometoaster/patches/patch-cddrives_c
new file mode 100644
index 00000000000..110ff3c59ab
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-cddrives_c
@@ -0,0 +1,69 @@
+$NetBSD: patch-cddrives_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+- add const for a clean build
+
+--- cddrives.c.orig	2002-01-05 12:02:40.000000000 +0000
++++ cddrives.c
+@@ -76,7 +76,7 @@ void cddrives_updatemediachangeflags()
+ 	LOCKDB;
+ 	for (x=0;x<cddrives_drives.drivecount;x++)
+ 	  {
+-	     int tochandle=0;
++	     struct cdromlow_tochandle *tochandle;
+ #ifdef DEBUG
+ 	     printf ("cddrives_updatemediachangeflags: checking drive #%i\n",x);
+ #endif
+@@ -154,7 +154,7 @@ void cddrives_destroy()
+    cddrives_disablecdchangedetection();
+ };
+ 
+-char *cddrives_dltitles[]=
++const char *cddrives_dltitles[]=
+ {
+    "",
+      N_("Drive Type"),
+@@ -529,7 +529,7 @@ void cddrives_removebutton(GtkWidget *w,
+    cddrives_cdinfo *i;
+    if (GTK_CLIST(cddrives_drives.drivelist)->selection!=NULL)
+      {
+-	sl=(int)(GTK_CLIST(cddrives_drives.drivelist)->selection)->data;
++	sl=(int)(intptr_t)(GTK_CLIST(cddrives_drives.drivelist)->selection)->data;
+ 	i=gtk_clist_get_row_data(GTK_CLIST(cddrives_drives.drivelist),sl);
+ 
+ 	LOCKDB;
+@@ -549,7 +549,7 @@ void cddrives_editbutton(GtkWidget *w,
+    cddrives_cdinfo *i;
+    if (GTK_CLIST(cddrives_drives.drivelist)->selection!=NULL)
+      {
+-	sl=(int)(GTK_CLIST(cddrives_drives.drivelist)->selection)->data;
++	sl=(int)(intptr_t)(GTK_CLIST(cddrives_drives.drivelist)->selection)->data;
+ 	i=gtk_clist_get_row_data(GTK_CLIST(cddrives_drives.drivelist),sl);
+ 
+ 	cddrives_displayform(i);
+@@ -697,7 +697,7 @@ void cddrives_init()
+ 
+ void cddrives_cdinfo_update(cddrives_cdinfo *info)
+ {
+-   int tochandle=cdromlow_gettochandle(info->device);
++   cdromlow_tochandle *tochandle=cdromlow_gettochandle(info->device);
+ 
+    int tracksoncd;
+    int trackcount;
+@@ -1040,14 +1040,14 @@ void cddrives_recorderselect_done(gint r
+ 	/* Now activate all selected recorders */
+ 	for (current=recorderlist->selection;current!=NULL;current=current->next)
+ 	  {
+-	     cddrives_cdinfo *info=gtk_clist_get_row_data(recorderlist,(int)current->data);
++	     cddrives_cdinfo *info=gtk_clist_get_row_data(recorderlist,(int)(intptr_t)current->data);
+ 	     if (info)
+ 	       info->is_active=1;
+ 	  };
+      };
+ };
+ 
+-char *cddrives_recseltitles[]=
++const char *cddrives_recseltitles[]=
+ {
+    N_("Model"),
+    N_("Manufacturer")
diff --git a/sysutils/gnometoaster/patches/patch-cdromlow_h b/sysutils/gnometoaster/patches/patch-cdromlow_h
new file mode 100644
index 00000000000..182b1d8ce9e
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-cdromlow_h
@@ -0,0 +1,47 @@
+$NetBSD: patch-cdromlow_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- cdromlow.h.orig	2001-10-27 08:40:04.000000000 +0000
++++ cdromlow.h
+@@ -7,24 +7,26 @@ typedef enum 
+    TRACKTYPE_UNKNOWN
+ } cdromlow_tracktype;
+ 
++typedef struct cdromlow_tochandle cdromlow_tochandle;
++
+ /* use this function to get a handle for TOC access */
+-int cdromlow_gettochandle(const char *device);
++cdromlow_tochandle *cdromlow_gettochandle(const char *device);
+ /* use this function to free the TOC access handle */
+-void cdromlow_closetochandle(int handle);
++void cdromlow_closetochandle(cdromlow_tochandle *handle);
+ 
+-int cdromlow_hasdatatrack(int handle);
+-int cdromlow_tracks(int handle);
+-int cdromlow_tracksize_sectors(int handle,int num);
+-int cdromlow_tracksize(int handle,int num);
+-int cdromlow_datatracksize(int handle,int num);
+-int cdromlow_cddbnumber(int handle);
+-int cdromlow_trackoffset(int handle,int num);
++int cdromlow_hasdatatrack(cdromlow_tochandle *handle);
++int cdromlow_tracks(cdromlow_tochandle *handle);
++int cdromlow_tracksize_sectors(cdromlow_tochandle *handle,int num);
++int cdromlow_tracksize(cdromlow_tochandle *handle,int num);
++int cdromlow_datatracksize(cdromlow_tochandle *handle,int num);
++int cdromlow_cddbnumber(cdromlow_tochandle *handle);
++int cdromlow_trackoffset(cdromlow_tochandle *handle,int num);
+ 
+-cdromlow_tracktype cdromlow_gettracktype(int handle,int num);
++cdromlow_tracktype cdromlow_gettracktype(cdromlow_tochandle *handle,int num);
+ 
+ /* retrieve CD Text informations */
+ 
+-char *cdromlow_gettitle(int handle,int num);
+-char *cdromlow_getperformer(int handle,int num);
+-char *cdromlow_getdisctitle(int handle);
+-char *cdromlow_getdiscperformer(int handle);
++char *cdromlow_gettitle(cdromlow_tochandle *handle,int num);
++char *cdromlow_getperformer(cdromlow_tochandle *handle,int num);
++char *cdromlow_getdisctitle(cdromlow_tochandle *handle);
++char *cdromlow_getdiscperformer(cdromlow_tochandle *handle);
diff --git a/sysutils/gnometoaster/patches/patch-datacopydlg_c b/sysutils/gnometoaster/patches/patch-datacopydlg_c
new file mode 100644
index 00000000000..84da939bf44
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-datacopydlg_c
@@ -0,0 +1,59 @@
+$NetBSD: patch-datacopydlg_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix severe time_t abuse
+
+--- datacopydlg.c~	2001-05-06 11:25:08.000000000 +0000
++++ datacopydlg.c
+@@ -57,7 +57,7 @@ void datacopydlg_restartthread(datacopyd
+ {
+    dlg->threads[threadnum]->bytesdone=0;
+    dlg->threads[threadnum]->totalsize=totalsize;
+-   time((time_t*)&dlg->threads[threadnum]->starttime);
++   dlg->threads[threadnum]->starttime = time(NULL);
+    datacopydlg_updatedisplay(dlg);
+ };
+ 
+@@ -100,14 +100,14 @@ void datacopydlg_configurethread(datacop
+ 
+ void datacopydlg_updatedisplay(datacopydlg_dlginfo *dlg)
+ {
+-   int newtime;
++   time_t newtime;
+    char buf[256];
+    int remaining;
+    gfloat done;
+    
+    int i;
+    
+-   time((time_t*)&newtime);
++   time(&newtime);
+    /* update our "threads" */
+    for (i=0;i<dlg->numthreads;i++)
+      {	     
+@@ -181,7 +181,7 @@ void datacopydlg_updatedisplay(datacopyd
+  * processed */
+ void datacopydlg_newdatablock(datacopydlg_dlginfo *dlg,int size)
+ {
+-   int newtime;
++   time_t newtime;
+    
+    int i;
+    
+@@ -195,7 +195,7 @@ void datacopydlg_newdatablock(datacopydl
+      };
+ 
+    /* keep an update interval of >1 sec. */
+-   time((time_t*)&newtime);
++   time(&newtime);
+    if (difftime(newtime,dlg->lastmeasure)>=1)
+      {
+ 	/* calculate current throughput */	
+@@ -247,7 +247,7 @@ datacopydlg_dlginfo *datacopydlg_create(
+    strcpy(dlg->title,title);
+ 
+    /* initialize throughput meter */
+-   time((time_t*)&dlg->lastmeasure);
++   time(&dlg->lastmeasure);
+    dlg->bytessincelastmeasure=0;
+    dlg->currentthroughput=0;
+    
diff --git a/sysutils/gnometoaster/patches/patch-datacopydlg_h b/sysutils/gnometoaster/patches/patch-datacopydlg_h
new file mode 100644
index 00000000000..cd5ad5fbaf3
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-datacopydlg_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-datacopydlg_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix severe time_t abuse
+
+--- datacopydlg.h~	2001-02-12 01:02:19.000000000 +0000
++++ datacopydlg.h
+@@ -55,7 +55,7 @@ typedef struct 
+         datacopydlg_threadinfo *threads[DATACOPYDLG_MAXTHREADS];
+    
+ 	int bytessincelastmeasure;
+-	int lastmeasure;
++	time_t lastmeasure;
+ 	float currentthroughput;
+ } datacopydlg_dlginfo;
+ 	
diff --git a/sysutils/gnometoaster/patches/patch-datatrack_c b/sysutils/gnometoaster/patches/patch-datatrack_c
new file mode 100644
index 00000000000..819a2270df7
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-datatrack_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-datatrack_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- datatrack.c~	2001-03-20 07:58:08.000000000 +0000
++++ datatrack.c
+@@ -125,7 +125,7 @@ tracks_trackinfo *datatrack_create(char 
+    tracks_trackinfo *dt;
+    datatrack_info *info;
+    char description[256];
+-   int tochandle=cdromlow_gettochandle(device);
++   cdromlow_tochandle *tochandle=cdromlow_gettochandle(device);
+ 
+    info=(datatrack_info*)malloc(sizeof(datatrack_info));
+    strcpy(info->device,device);
diff --git a/sysutils/gnometoaster/patches/patch-defaultentries_h b/sysutils/gnometoaster/patches/patch-defaultentries_h
new file mode 100644
index 00000000000..1929c93cb13
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-defaultentries_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-defaultentries_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix broken regexp-within-C-string
+
+--- defaultentries.h~	2001-12-15 11:06:42.000000000 +0000
++++ defaultentries.h
+@@ -35,7 +35,7 @@
+ #define DEFAULTENTRIES_REC_SPEED "2"
+ #define DEFAULTENTRIES_REC_INQDRIVE "rec_client -inq dev=$scsiid"
+ #define DEFAULTENTRIES_REC_SCANBUS  "cdrecord -scanbus"
+-#define DEFAULTENTRIES_REC_SBGETID  "regexp(\"[\t ]*([0-9,]*)[\t ]*[0-9]\).*Removable CD-ROM$\")"
++#define DEFAULTENTRIES_REC_SBGETID  "regexp(\"[\t ]*([0-9,]*)[\t ]*[0-9]\\).*Removable CD-ROM$\")"
+ #define DEFAULTENTRIES_REC_INQDRIVE_GETVENDOR "regexp(\"Vendor_info *: '(.*)'\")"
+ #define DEFAULTENTRIES_REC_INQDRIVE_GETMODEL "regexp(\"Identifikation *: '(.*)'\")"
+ #define DEFAULTENTRIES_REC_INQDRIVE_GETTYPE "regexp(\"Device seems to be *: (.*)\")"
diff --git a/sysutils/gnometoaster/patches/patch-dialog_c b/sysutils/gnometoaster/patches/patch-dialog_c
new file mode 100644
index 00000000000..5c8d51520db
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-dialog_c
@@ -0,0 +1,23 @@
+$NetBSD: patch-dialog_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- silence LP64 warning, appears ok (!)
+
+--- dialog.c.orig	2002-01-05 12:02:44.000000000 +0000
++++ dialog.c
+@@ -1,6 +1,7 @@
+ /* Gnometoaster's dialog routines */
+ 
+ #include <stdlib.h>
++#include <stdint.h>
+ #include "config.h"
+ #ifdef HAVE_GNOME
+ #include <gnome.h>
+@@ -115,7 +116,7 @@ GtkWidget *dialog_question(const gchar *
+ 
+ void dialog_string_callback_ok(GtkWidget *w,dialog_question_info *info)
+ {
+-   info->cb((int)gtk_entry_get_text(GTK_ENTRY(info->entry)),
++   info->cb((int)(intptr_t)gtk_entry_get_text(GTK_ENTRY(info->entry)),
+ 	    info->data);
+    gtk_widget_destroy(info->dialog);
+    free(info);
diff --git a/sysutils/gnometoaster/patches/patch-filelist_c b/sysutils/gnometoaster/patches/patch-filelist_c
new file mode 100644
index 00000000000..58aeff15f17
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-filelist_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-filelist_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- Fix LP64 problems
+
+--- filelist.c~	2002-01-05 12:02:44.000000000 +0000
++++ filelist.c
+@@ -130,7 +130,7 @@ filelist_info *filelist_create(char *pat
+    GtkWidget *column;
+    char header[1024];
+ 
+-   int dir;
++   vfs_dirhandle *dir;
+ 
+    char *file[3];
+    char fsbuf[25];
diff --git a/sysutils/gnometoaster/patches/patch-fileman_c b/sysutils/gnometoaster/patches/patch-fileman_c
new file mode 100644
index 00000000000..534ab7a548e
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-fileman_c
@@ -0,0 +1,24 @@
+$NetBSD: patch-fileman_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- fileman.c.orig	2001-10-28 13:22:43.000000000 +0000
++++ fileman.c
+@@ -209,7 +209,7 @@ typedef struct
+    fileman_additems_continuecb cb;
+    fileman_additems_state *cbdata;
+    datacopydlg_dlginfo *progress;
+-   int copy_handle;
++   vfs_recurse_copy_info *copy_handle;
+ }
+ fileman_addfile_generic_callback_info;
+ 
+@@ -292,7 +292,7 @@ void fileman_addfile_generic(char *i,
+ 					       info,
+ 
+ 					       // can't link when moving files
+-					       ((((int)user_data==DNDSETUP_LINK)
++					       ((((int)(intptr_t)user_data==DNDSETUP_LINK)
+ 						 &&(destfs!=sourcefs))
+ 						?1:0),
+ 					       // move if called with source fs == dest fs
diff --git a/sysutils/gnometoaster/patches/patch-fsedit_c b/sysutils/gnometoaster/patches/patch-fsedit_c
new file mode 100644
index 00000000000..d98e886533f
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-fsedit_c
@@ -0,0 +1,33 @@
+$NetBSD: patch-fsedit_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- add const for clean build
+
+--- fsedit.c.orig	2001-08-19 22:03:06.000000000 +0000
++++ fsedit.c
+@@ -115,7 +115,7 @@ void fsedit_genericdrop_callback(int sta
+    free(info);
+ };
+ 
+-void fsedit_genericdrop(char *itemlist,
++void fsedit_genericdrop(const char *itemlist,
+ 			char *path,
+ 			fileman_additems_donecallback donecb,
+ 			gpointer cbdata,
+@@ -165,7 +165,7 @@ void fsedit_genericdrop(char *itemlist,
+ 
+ /* drophandler now takes x and y coordinates of the pointer.
+  * Those are not required here,though */
+-int fsedit_drophandler(char *s,int x,int y,int dragtype,gpointer data)
++int fsedit_drophandler(const char *s,int x,int y,int dragtype,gpointer data)
+ {
+    fsedit_genericdrop(s,content->path,
+ 		      fsedit_dnddone,
+@@ -327,7 +327,7 @@ void fsedit_treednddone(int status,gpoin
+    updatehandlers_call(fsedit_updatehandlers);
+ };
+ 
+-int fsedit_treedrop(char *s,
++int fsedit_treedrop(const char *s,
+ 		    int x,int y,
+ 		    int dragtype,
+ 		    gpointer data)
diff --git a/sysutils/gnometoaster/patches/patch-getdir_c b/sysutils/gnometoaster/patches/patch-getdir_c
new file mode 100644
index 00000000000..b03c431b045
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-getdir_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-getdir_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- getdir.c~	2001-10-26 21:06:25.000000000 +0000
++++ getdir.c
+@@ -244,7 +244,7 @@ GtkWidget *getdir_tree(GtkTreeItem *host
+ {
+    GtkWidget *dirtree;
+    GtkWidget *entrytree;
+-   int dir;
++   vfs_dirhandle *dir;
+    char *newdir;
+    getdir_dirinfo *getdir_expanddirinfo;
+ 
diff --git a/sysutils/gnometoaster/patches/patch-menusys_gtk_c b/sysutils/gnometoaster/patches/patch-menusys_gtk_c
new file mode 100644
index 00000000000..40a33280960
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-menusys_gtk_c
@@ -0,0 +1,14 @@
+$NetBSD: patch-menusys_gtk_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- include missing own header file.
+
+--- menusys.gtk.c~	2002-01-05 12:02:44.000000000 +0000
++++ menusys.gtk.c
+@@ -6,6 +6,7 @@
+ 
+ #include "main.h"
+ #include "menusys.h"
++#include "helpings.h"
+ 
+ GtkWidget *menusys_buildmenu(menusys_menu *menu,gpointer data);
+ 
diff --git a/sysutils/gnometoaster/patches/patch-mp3func_c b/sysutils/gnometoaster/patches/patch-mp3func_c
new file mode 100644
index 00000000000..ce2714fcd8e
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-mp3func_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-mp3func_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix minor LP64 problem
+
+--- mp3func.c~	2001-12-16 12:21:53.000000000 +0000
++++ mp3func.c
+@@ -245,7 +245,7 @@ unsigned int mp3func_playingtime_rawbyte
+      {	
+ 	filesize=lseek(fd,0,SEEK_END);
+ 	mp3=(unsigned char*)mmap(0,filesize,PROT_READ,MAP_PRIVATE,fd,0);
+-	if ((int)mp3!=-1)
++	if ((intptr_t)mp3!=-1)
+ 	  {	     	
+ 	     counter=0;
+ 	     do 
diff --git a/sysutils/gnometoaster/patches/patch-piping_c b/sysutils/gnometoaster/patches/patch-piping_c
new file mode 100644
index 00000000000..90b5fda2478
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-piping_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-piping_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix foolish pointer manipulation that breaks on LP64
+
+--- piping.c~	2001-12-15 11:07:34.000000000 +0000
++++ piping.c
+@@ -590,7 +590,7 @@ int piping_isvalid_exec(char *exec)
+ 		       char *absolute;
+ 		       char *next=strchr(current,':');
+ 		       if (!next)
+-			 next=(char*)(strlen(current)+(unsigned int)current);
++			 next = current + strlen(current);
+ 		       *next=0;
+ 		       next++;
+ 
diff --git a/sysutils/gnometoaster/patches/patch-piping_h b/sysutils/gnometoaster/patches/patch-piping_h
new file mode 100644
index 00000000000..9aa97084ca3
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-piping_h
@@ -0,0 +1,12 @@
+$NetBSD: patch-piping_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- silence annoying warning
+
+--- piping.h~	2001-12-15 10:49:03.000000000 +0000
++++ piping.h
+@@ -79,4 +79,4 @@ int piping_isvalid_command(char *command
+  * that couldn't get found */
+ int piping_isvalid_commandchain(char *chain,const char *message);
+ 
+-#endif PIPING_H
++#endif /* PIPING_H */
diff --git a/sysutils/gnometoaster/patches/patch-preferences_c b/sysutils/gnometoaster/patches/patch-preferences_c
new file mode 100644
index 00000000000..78285cf8510
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-preferences_c
@@ -0,0 +1,25 @@
+$NetBSD: patch-preferences_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- Remove horrible code that tries to test for platform alignment
+requirements by crashing.
+
+--- preferences.c~	2001-12-15 11:01:38.000000000 +0000
++++ preferences.c
+@@ -130,6 +130,7 @@ int preferences_isbigendian()
+  * platforms */
+ int preferences_need32bitalign()
+ {
++#if 0 /* total bollocks - fortunately result is unused */
+    unsigned long long int test=0x0011223344556677;
+    unsigned int temp;
+    temp=*((unsigned int*)(((int)(&test))+1));
+@@ -138,6 +139,9 @@ int preferences_need32bitalign()
+     * or 0x66 (for little Endian systems) and return TRUE if
+     * it is not */
+    return (!((temp==0x11)||(temp==0x66)));
++#else
++   return 1;
++#endif
+ };
+ 
+ void preferences_setupsymlinkarea()
diff --git a/sysutils/gnometoaster/patches/patch-selectlist_c b/sysutils/gnometoaster/patches/patch-selectlist_c
new file mode 100644
index 00000000000..b3c99abe088
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-selectlist_c
@@ -0,0 +1,88 @@
+$NetBSD: patch-selectlist_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix foolish pointer manipulation that breaks on LP64
+- silence other LP64 warnings; they appear to be ok
+
+--- selectlist.c~	2001-12-16 11:38:04.000000000 +0000
++++ selectlist.c
+@@ -146,7 +146,7 @@ void selectlist_removeselection(char *s,
+    foundpos=strstr(cmpcopy,entry);
+    while (foundpos!=NULL)
+      {
+-	strcpy(foundpos,(char*)((int)foundpos+strlen(entry)-2));
++	strcpy(foundpos,foundpos+strlen(entry)-2);
+ 	foundpos=strstr(cmpcopy,entry);
+      }
+    ;
+@@ -164,8 +164,8 @@ void selectlist_select(GtkCList *clist,g
+    selectlist_clipboard_activate(info);
+ 
+    /* only mark row as selected if this has not already happened */
+-   if (g_list_find(info->selected_lines,(gpointer)row)==NULL)
+-     info->selected_lines=g_list_prepend(info->selected_lines,(gpointer)row);
++   if (g_list_find(info->selected_lines,(gpointer)(intptr_t)row)==NULL)
++     info->selected_lines=g_list_prepend(info->selected_lines,(gpointer)(intptr_t)row);
+ #ifdef DEBUG
+    printf ("selectlist_select: selected row %i\n",row);
+    printf ("selectlist.c: selectlist_select current selection:\n\"%s\"\n",
+@@ -187,7 +187,7 @@ void selectlist_unselect(GtkCList *clist
+ 	   row);
+ #endif
+    info->selected_lines=g_list_remove(info->selected_lines,
+-				      (gpointer)row);
++				      (gpointer)(intptr_t)row);
+ #ifdef DEBUG
+    printf ("selectlist.c: selectlist_unselect current selection:\n\"%s\"\n",
+ 	   selectlist_getselection(info));
+@@ -308,7 +308,7 @@ int selectlist_isselected(selectlist_inf
+    GList *i=NULL;
+    int result = 0;
+    for (i=info->selected_lines;(i!=NULL)&&(!result);i=i->next)
+-     if (row==(int)i->data)
++     if (row==(int)(intptr_t)i->data)
+        result = 1;
+    return result;
+ };
+@@ -375,7 +375,7 @@ void selectlist_modifiedselect_internal(
+ 	       gtk_clist_unselect_row(GTK_CLIST(widget), row, 0);
+ 	     break;
+ 	   case Shift:
+-	     x = ((info&&info->selected_lines)?(int)info->selected_lines->data:row);
++	     x = ((info&&info->selected_lines)?(int)(intptr_t)info->selected_lines->data:row);
+ 	     upper_bound = MAX(x,row);
+ 	     lower_bound = MIN(x,row);
+ 	     for (x = lower_bound; x<=upper_bound; ++x)
+@@ -573,7 +573,7 @@ char *selectlist_getselection(selectlist
+    /* create the selection string of all rows marked as selected */
+    for (i=info->selected_lines;i!=NULL;i=i->next)
+      {
+-	row=(int)i->data; /* get row */
++	row=(int)(intptr_t)i->data; /* get row */
+    	/* if significant_column is set to -1,a string addressed by the
+ 	 * hidden gpointer data field of the clist is taken as selection
+ 	 * information */
+@@ -607,7 +607,7 @@ void selectlist_insert(selectlist_info *
+ 	current!=NULL;
+ 	current=current->next)
+      {
+-	if ((int)current->data>=row)
++	if ((int)(intptr_t)current->data>=row)
+ 	  current->data++;
+      };
+ };
+@@ -618,13 +618,13 @@ void selectlist_remove(selectlist_info *
+    /* remove an item */
+    gtk_clist_remove(info->self,row);
+    /* remove item from selection list */
+-   info->selected_lines=g_list_remove(info->selected_lines,(gpointer)row);
++   info->selected_lines=g_list_remove(info->selected_lines,(gpointer)(intptr_t)row);
+    /* step through the list of selections */
+    for (current=info->selected_lines;
+ 	current!=NULL;
+ 	current=current->next)
+      {
+-	if ((int)current->data>row)
++	if ((int)(intptr_t)current->data>row)
+ 	  current->data--;
+      };
+ };
diff --git a/sysutils/gnometoaster/patches/patch-stdfiletrack_c b/sysutils/gnometoaster/patches/patch-stdfiletrack_c
new file mode 100644
index 00000000000..d2e5fcd36f1
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-stdfiletrack_c
@@ -0,0 +1,17 @@
+$NetBSD: patch-stdfiletrack_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- remove private decl of standard function swab()
+
+--- stdfiletrack.c~	2001-12-16 12:22:34.000000000 +0000
++++ stdfiletrack.c
+@@ -20,10 +20,6 @@
+ #include "preferences.h"
+ #include "dependencies.h"
+ 
+-#ifndef __svr4__
+-void swab(const void *from,void *to,size_t n);
+-#endif
+-
+ #include "tracks.h"
+ #include "stdfiletrack.h"
+ #include "varman.h"
diff --git a/sysutils/gnometoaster/patches/patch-streams_c b/sysutils/gnometoaster/patches/patch-streams_c
new file mode 100644
index 00000000000..df8c435ad21
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-streams_c
@@ -0,0 +1,27 @@
+$NetBSD: patch-streams_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- patch up LP64 problem
+
+--- streams.c~	2000-08-16 06:22:06.000000000 +0000
++++ streams.c
+@@ -39,7 +39,7 @@ char *streams_getstreamid(tracks_trackin
+ 	pid=getpid();
+ 	sprintf(streamid,"%#x",pid);
+ 	strcat(streamid,":");		
+-	sprintf(&streamid[strlen(streamid)],"%#x",(unsigned int)track);
++	sprintf(&streamid[strlen(streamid)],"%#lx",(uintptr_t)track);
+ #ifdef DEBUG
+ 	printf ("calculated stream id: %s\n",streamid);
+ #endif
+@@ -80,7 +80,10 @@ tracks_trackinfo *streams_getstreambyid(
+ #endif	
+ 	if (pid==getpid()) /* if local */
+ 	  {
+-		  sscanf(mempos,"%x",(unsigned int*)&track);
++		  unsigned long tmp;
++
++		  sscanf(mempos,"%lx", &tmp);
++		  track = (tracks_trackinfo *)tmp;
+ 	  }
+ 	else
+ 	  {
diff --git a/sysutils/gnometoaster/patches/patch-trackedit_c b/sysutils/gnometoaster/patches/patch-trackedit_c
new file mode 100644
index 00000000000..6dda6722654
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-trackedit_c
@@ -0,0 +1,78 @@
+$NetBSD: patch-trackedit_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- silence LP64 warnings; all appear to be ok
+
+--- trackedit.c~	2001-12-15 12:19:08.000000000 +0000
++++ trackedit.c
+@@ -52,7 +52,7 @@ void trackedit_renametrack(GtkWidget *w,
+ 	c=c->next)
+      {
+ 	tracks_trackinfo *track=
+-	  tracklist_gettrack(trackedit,(int)c->data);
++	  tracklist_gettrack(trackedit,(int)(intptr_t)c->data);
+ 	/* FIXME: claim track and unclaim it when dialog gets closed */
+ 	if (track)
+ 	  forms_create(_("Rename track"),
+@@ -87,7 +87,7 @@ void trackedit_removehandler(GtkWidget *
+ 	c!=NULL;
+ 	c=trackedit->selectlistinfo->selected_lines)
+      tracklist_removetrack(trackedit,
+-			   (int)c->data);
++			   (int)(intptr_t)c->data);
+ };
+ 
+ void trackedit_streamdrop(char *s,
+@@ -97,8 +97,8 @@ void trackedit_streamdrop(char *s,
+ 			  fileman_additems_state *contdata)
+ {
+ 
+-   int dragtype=(int)generic_userdata;
+-   int pos=(int)user_data;
++   int dragtype=(int)(intptr_t)generic_userdata;
++   int pos=(int)(intptr_t)user_data;
+ 
+    tracks_trackinfo *newtrack;
+ 
+@@ -113,7 +113,7 @@ void trackedit_streamdrop(char *s,
+ #ifdef DEBUG
+ 	printf ("trackedit_streamdrop: added stream to tracklist at position %i\n",
+ 		pos);
+-#endif DEBUG
++#endif /* DEBUG */
+      }
+    else
+      {
+@@ -153,8 +153,8 @@ void trackedit_filedrop(char *s,
+ 			fileman_additems_state *contdata)
+ {
+ 
+-   int dragtype=(int)generic_userdata;
+-   int pos=(int)user_data;
++   int dragtype=(int)(intptr_t)generic_userdata;
++   int pos=(int)(intptr_t)user_data;
+ 
+    char *path=strdup(s);
+    vfs_filesystem *fs=vfs_parseuri(s,path);
+@@ -346,7 +346,7 @@ int trackedit_drophandler(const char *s,
+ 			    trackedit_dnddone,
+ 			    NULL,
+ 
+-			    (gpointer)dragtype,
++			    (gpointer)(intptr_t)dragtype,
+ 
+ 			    2,
+ 
+@@ -355,11 +355,11 @@ int trackedit_drophandler(const char *s,
+ 			    /* everything else */
+ 			    "",
+ 			    trackedit_filedrop,
+-			    (gpointer)listpos,
++			    (gpointer)(intptr_t)listpos,
+ 
+ 			    "stream:",
+ 			    trackedit_streamdrop,
+-			    (gpointer)listpos
++			    (gpointer)(intptr_t)listpos
+ 
+ 			    );
+      };
diff --git a/sysutils/gnometoaster/patches/patch-tracklist_c b/sysutils/gnometoaster/patches/patch-tracklist_c
new file mode 100644
index 00000000000..0b1f32bc808
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-tracklist_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-tracklist_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- silence LP64 warning, appears ok
+
+--- tracklist.c~	2001-10-27 09:26:47.000000000 +0000
++++ tracklist.c
+@@ -111,7 +111,7 @@ int tracklist_handleinternaldrop(trackli
+ 		  p);
+ 	#endif
+ 
+-       	linetomove=(int)i->selectlistinfo->selected_lines->data;
++       	linetomove=(int)(intptr_t)i->selectlistinfo->selected_lines->data;
+ 	
+ 	/* if item was dropped outside the tracklist,simply append it */
+ 	if (p==-1)
diff --git a/sysutils/gnometoaster/patches/patch-vfs_c b/sysutils/gnometoaster/patches/patch-vfs_c
new file mode 100644
index 00000000000..270d0aad475
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-vfs_c
@@ -0,0 +1,140 @@
+$NetBSD: patch-vfs_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- vfs.c.orig	2001-05-06 18:44:25.000000000 +0000
++++ vfs.c
+@@ -92,7 +92,7 @@ int vfs_createdir (vfs_filesystem *fs,ch
+      return 1;
+ };
+ /* Open a directory, returns directory handle */
+-int vfs_opendir (vfs_filesystem *fs,char* dir)
++vfs_dirhandle *vfs_opendir (vfs_filesystem *fs,char* dir)
+ {
+ #ifdef DEBUG
+    printf("vfs_opendir: %s\n",dir);
+@@ -105,7 +105,7 @@ int vfs_opendir (vfs_filesystem *fs,char
+ /* will return the full path of the next directory item or
+  * NULL if the end of the directory has been reached.
+  * caller frees string */
+-char *vfs_readdirentry(vfs_filesystem *fs,int handle)
++char *vfs_readdirentry(vfs_filesystem *fs, vfs_dirhandle *handle)
+ {
+    char *result=NULL;
+    if ((fs->readdirentry)&&(handle))
+@@ -115,7 +115,7 @@ char *vfs_readdirentry(vfs_filesystem *f
+ #endif
+    return result;
+ };
+-void vfs_closedir (vfs_filesystem *fs,int handle)
++void vfs_closedir (vfs_filesystem *fs, vfs_dirhandle *handle)
+ {
+    if ((fs->closedir)&&(handle))
+      fs->closedir((gpointer)fs,handle);
+@@ -384,14 +384,14 @@ typedef struct
+    /* path of the current destination directory */
+    char *destinationpath;
+    /* directory handle for current source directory */
+-   int  sourcedir;
++   vfs_dirhandle *sourcedir;
+    /* path of current source directory.
+     * used for deleting it if the move option was set */
+    char *sourcepath;
+ }
+ vfs_dirstack;
+ 
+-typedef struct
++struct vfs_recurse_copy_info
+ {
+    /* input parameters of the initial function call (unmodified throughout
+     * the recursion) */
+@@ -419,8 +419,7 @@ typedef struct
+    /* will be set true by the cancel function.
+     * If set to true, function will exit immediately */
+    int exit_request;
+-}
+-vfs_recurse_copy_info;
++};
+ 
+ void vfs_fixdatacopydisplay(datacopydlg_dlginfo *progress,
+ 			    int progress_thread,
+@@ -546,7 +545,7 @@ void vfs_copy_recurse_callback(int resul
+      };
+ };
+ 
+-int vfs_copy_recursively(vfs_filesystem*destinationfs,
++vfs_recurse_copy_info *vfs_copy_recursively(vfs_filesystem*destinationfs,
+ 			 char *destinationpath,
+ 			 vfs_filesystem*sourcefs,
+ 			 char *sourcepath,
+@@ -631,13 +630,11 @@ int vfs_copy_recursively(vfs_filesystem*
+ 					    (gpointer)info,
+ 					    link_requested,copy_move);
+      };
+-   return (int)info;
++   return info;
+ };
+ 
+-void vfs_copy_recursively_cancel(int handle)
++void vfs_copy_recursively_cancel(vfs_recurse_copy_info *info)
+ {
+-   vfs_recurse_copy_info *info=(vfs_recurse_copy_info*)handle;
+-
+    /* Ask recursion handler to exit */
+    info->exit_request=1;
+ 
+@@ -659,7 +656,7 @@ typedef struct
+ }
+ vfs_delete_dirstack;
+ 
+-typedef struct
++struct vfs_recurse_delete_info
+ {
+    /* input parameters of the initial function call (unmodified throughout
+     * the recursion) */
+@@ -675,8 +672,7 @@ typedef struct
+    int errors;
+    vfs_operationcomplete callback;
+    gpointer data;
+-}
+-vfs_recurse_delete_info;
++};
+ 
+ /* read the directory given in path into a GList and return it */
+ GList *vfs_readdirectory(vfs_filesystem *fs,char *path)
+@@ -684,7 +680,7 @@ GList *vfs_readdirectory(vfs_filesystem 
+    GList *list=NULL;
+    char *ci;
+ 
+-   int dir=vfs_opendir(fs,path);
++   vfs_dirhandle *dir=vfs_opendir(fs,path);
+    while ((ci=vfs_readdirentry(fs,dir)))
+      list=g_list_prepend(list,ci);
+    vfs_closedir(fs,dir);
+@@ -789,7 +785,7 @@ void vfs_delete_recurse_callback(int res
+      };
+ };
+ 
+-int vfs_remove_recursively(vfs_filesystem *fs,
++vfs_recurse_delete_info *vfs_remove_recursively(vfs_filesystem *fs,
+ 			   char *path,
+ 			   vfs_operationcomplete callback,
+ 			   gpointer data,
+@@ -832,7 +828,7 @@ int vfs_remove_recursively(vfs_filesyste
+ 	free(info);
+ 	info=NULL;
+      };
+-   return (int)info;
++   return info;
+ };
+ 
+ int vfs_remove_recursively_blocking(vfs_filesystem *fs,
+@@ -840,7 +836,7 @@ int vfs_remove_recursively_blocking(vfs_
+ 				    int content_only)
+ {
+    int result=0;
+-   int dir=vfs_opendir(fs,path);
++   vfs_dirhandle *dir=vfs_opendir(fs,path);
+    char *entry;
+    while ((entry=vfs_readdirentry(fs,dir)))
+      {
diff --git a/sysutils/gnometoaster/patches/patch-vfs_h b/sysutils/gnometoaster/patches/patch-vfs_h
new file mode 100644
index 00000000000..d9d00d7b697
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-vfs_h
@@ -0,0 +1,70 @@
+$NetBSD: patch-vfs_h,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- fix LP64 problems
+
+--- vfs.h.orig	2001-06-04 09:38:24.000000000 +0000
++++ vfs.h
+@@ -41,11 +41,13 @@ vfs_direntry;
+  * status is 0 on success */
+ typedef void (*vfs_operationcomplete)(int status,gpointer data);
+ 
++typedef struct vfs_dirhandle vfs_dirhandle;
++
+ /* Type declarations for function pointers */
+ typedef int (*createdir_t)(gpointer fs,char *path);
+-typedef int (*opendir_t)(gpointer fs,char *path);
+-typedef char *(*readdirentry_t)(gpointer fs,int handle);
+-typedef void (*closedir_t)(gpointer fs,int handle);
++typedef vfs_dirhandle *(*opendir_t)(gpointer fs,char *path);
++typedef char *(*readdirentry_t)(gpointer fs, vfs_dirhandle *handle);
++typedef void (*closedir_t)(gpointer fs, vfs_dirhandle *handle);
+ typedef vfs_direntry *(*filestat_t)(gpointer fs,const char *path,int getfilelinks);
+ typedef char *(*getlinkdestination_t)(gpointer fs,char *path);
+ typedef int  (*symlink_t)(gpointer fs,char *linkdest,char *linkname);
+@@ -123,12 +125,12 @@ void vfs_adderrorstring(vfs_filesystem*,
+ /* Create a directory, return 0 on success */
+ int vfs_createdir (vfs_filesystem*,char* newdir);
+ /* Open a directory, returns directory handle or 0 on failure */
+-int vfs_opendir (vfs_filesystem*,char* dir);
++vfs_dirhandle *vfs_opendir (vfs_filesystem*,char* dir);
+ /* will return the full path of the next directory item or
+  * NULL if the end of the directory has been reached.
+  * caller frees string */
+-char *vfs_readdirentry(vfs_filesystem*,int handle);
+-void vfs_closedir (vfs_filesystem*,int handle);
++char *vfs_readdirentry(vfs_filesystem*,vfs_dirhandle *handle);
++void vfs_closedir (vfs_filesystem*,vfs_dirhandle *handle);
+ /* this will retrieve the file statistics of a specific file.
+  * caller frees structure.
+  * returns NULL on failure */
+@@ -269,7 +271,8 @@ vfs_filesystem *vfs_parseuri(char *uri,c
+  *
+  * This function and the  vfs_remove_recursively function below
+  * return a handle which can be used to cancel the current process */
+-int vfs_copy_recursively(vfs_filesystem*destinationfs,
++typedef struct vfs_recurse_copy_info vfs_recurse_copy_info;
++vfs_recurse_copy_info *vfs_copy_recursively(vfs_filesystem*destinationfs,
+ 			 char *destinationpath,
+ 			 vfs_filesystem*sourcefs,
+ 			 char *sourcepath,
+@@ -281,16 +284,17 @@ int vfs_copy_recursively(vfs_filesystem*
+ 			 int copy_move);
+ 
+ /* Filesystem is the destination filesystem */
+-void vfs_copy_recursively_cancel(int handle);
++void vfs_copy_recursively_cancel(vfs_recurse_copy_info *handle);
+ 
+-int vfs_remove_recursively(vfs_filesystem*fs,
++typedef struct vfs_recurse_delete_info vfs_recurse_delete_info;
++vfs_recurse_delete_info *vfs_remove_recursively(vfs_filesystem*fs,
+ 			   char*path,
+ 			   vfs_operationcomplete callback,
+ 			   gpointer data,
+ 			   int content_only);
+ 
+ /* Filesystem is the destination filesystem */
+-void vfs_remove_recursively_cancel(int handle);
++void vfs_remove_recursively_cancel(vfs_recurse_delete_info *handle);
+ 
+ int vfs_remove_recursively_blocking(vfs_filesystem*fs,
+ 				    char *path,
diff --git a/sysutils/gnometoaster/patches/patch-vfs_unixtree_c b/sysutils/gnometoaster/patches/patch-vfs_unixtree_c
new file mode 100644
index 00000000000..55cc4f2e90b
--- /dev/null
+++ b/sysutils/gnometoaster/patches/patch-vfs_unixtree_c
@@ -0,0 +1,55 @@
+$NetBSD: patch-vfs_unixtree_c,v 1.1 2011/10/02 01:20:55 dholland Exp $
+
+- Fix LP64 problems
+
+--- vfs_unixtree.c.orig	2001-10-28 13:19:31.000000000 +0000
++++ vfs_unixtree.c
+@@ -47,7 +47,7 @@ typedef struct
+ }
+ vfs_unixtree_dirhandle;
+ 
+-int vfs_unixtree_opendir(gpointer fs,char *rpath)
++vfs_dirhandle *vfs_unixtree_opendir(gpointer fs,char *rpath)
+ {
+    DIR *handle;
+    vfs_unixtree_dirhandle *result;
+@@ -63,10 +63,10 @@ int vfs_unixtree_opendir(gpointer fs,cha
+ 	result->vhandle=NULL;
+      };
+    free(path);
+-   return (int)result;
++   return (vfs_dirhandle *)result;
+ };
+ 
+-char *vfs_unixtree_readdirentry(gpointer fs,int handle)
++char *vfs_unixtree_readdirentry(gpointer fs,vfs_dirhandle *handle)
+ {
+    struct dirent *current;
+    char *result=NULL;
+@@ -136,7 +136,7 @@ char *vfs_unixtree_readdirentry(gpointer
+    return result;
+ };
+ 
+-void vfs_unixtree_closedir(gpointer fs,int handle)
++void vfs_unixtree_closedir(gpointer fs,vfs_dirhandle *handle)
+ {
+    vfs_unixtree_dirhandle *myhandle=(vfs_unixtree_dirhandle*)handle;
+    if (myhandle->handle)
+@@ -273,7 +273,7 @@ int vfs_unixtree_dummycb(gpointer data)
+ {
+    vfs_unixtree_copyinfo *info=(vfs_unixtree_copyinfo*)data;
+    /* abuse the copyprocess field for status report here */
+-   info->callback((int)info->copyprocess,info->callback_data);
++   info->callback((int)(intptr_t)info->copyprocess,info->callback_data);
+    free(info);
+    return 0;
+ };
+@@ -286,7 +286,7 @@ void vfs_unixtree_queuecallback(vfs_oper
+ 
+    info->callback=callback;
+    info->callback_data=data;
+-   info->copyprocess=(streamcopy_state*)result;
++   info->copyprocess=(streamcopy_state*)(intptr_t)result;
+ 
+    /* add a 20 ms timeout roughly every 8th file, so's the display
+     * can be updated */