Index: head/archivers/gtar/files/patch-configure =================================================================== --- head/archivers/gtar/files/patch-configure (revision 387020) +++ head/archivers/gtar/files/patch-configure (revision 387021) @@ -1,16 +1,14 @@ -$FreeBSD$ - Hack to disable shared library detection, so configure won't try to link with "/usr/local/lib/libiconv.so -static". --- configure.orig 2013-10-05 21:52:03.000000000 +0200 +++ configure 2013-11-18 17:33:05.000000000 +0100 @@ -34123,7 +34123,7 @@ fi $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" + acl_shlibext="${SHLIBEXT-$acl_cv_shlibext}" acl_libname_spec="$acl_cv_libname_spec" acl_library_names_spec="$acl_cv_library_names_spec" acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" Property changes on: head/archivers/gtar/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeyword ## -0,0 +1 ## +yes \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/archivers/unace/files/patch-uac__crt.c =================================================================== --- head/archivers/unace/files/patch-uac__crt.c (revision 387020) +++ head/archivers/unace/files/patch-uac__crt.c (revision 387021) @@ -1,98 +1,95 @@ - -$FreeBSD$ - --- uac_crt.c.orig +++ uac_crt.c @@ -33,12 +33,15 @@ /* gets file name from header */ -CHAR *ace_fname(CHAR * s, thead * head, INT nopath) +CHAR *ace_fname(CHAR * s, thead * head, INT nopath, unsigned int size) { - INT i; + unsigned int i; char *cp; - strncpy(s, (*(tfhead *) head).FNAME, i = (*(tfhead *) head).FNAME_SIZE); + i = (*(tfhead *) head).FNAME_SIZE; + if (i > (size - 1)) + i = size - 1; + strncpy(s, (*(tfhead *) head).FNAME, i); s[i] = 0; if (nopath) @@ -56,22 +59,72 @@ } #endif + cp = s; + while (*cp == '/') cp++; + if (cp != s) + memmove(s, cp, strlen(cp) + 1); + return s; } +int is_directory_traversal(char *str) +{ + unsigned int mode, countdots; + /* mode 0 = fresh, 1 = just dots, 2 = not just dots */ + char ch; + + mode = countdots = 0; + + while (ch = *str++) + { + if ((ch == '/') && (mode == 1) && (countdots > 1)) + return 1; + + if (ch == '/') + { + mode = countdots = 0; + continue; + } + + if (ch == '.') + { + if (mode == 0) + mode = 1; + + countdots++; + } + else + mode = 2; + } + + if ((mode == 1) && (countdots > 1)) + return 1; + + return 0; +} + void check_ext_dir(CHAR * f) // checks/creates path of file { CHAR *cp, d[PATH_MAX]; - INT i; + unsigned int i; d[0] = 0; + if (is_directory_traversal(f)) + { + f_err = ERR_WRITE; + printf("\n Directory traversal attempt: %s\n", f); + return; + } + for (;;) { if ((cp = (CHAR *) strchr(&f[strlen(d) + 1], DIRSEP))!=NULL) { i = cp - f; + if (i > (PATH_MAX - 1)) + i = PATH_MAX - 1; strncpy(d, f, i); d[i] = 0; } Property changes on: head/archivers/unace/files/patch-uac__crt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/archivers/unace/files/patch-unace.c =================================================================== --- head/archivers/unace/files/patch-unace.c (revision 387020) +++ head/archivers/unace/files/patch-unace.c (revision 387021) @@ -1,64 +1,61 @@ - -$FreeBSD$ - --- unace.c.orig +++ unace.c @@ -240,6 +240,7 @@ INT open_archive(INT print_err) // opens archive (or volume) { CHAR av_str[80]; + unsigned int copylen; archan = open(aname, O_RDONLY | O_BINARY); // open file @@ -263,8 +264,11 @@ sprintf(av_str, "\ncreated on %d.%d.%d by ", ts_day(adat.time_cr), ts_month(adat.time_cr), ts_year(adat.time_cr)); printf(av_str); - strncpy(av_str, mhead.AV, mhead.AV_SIZE); - av_str[mhead.AV_SIZE] = 0; + copylen = mhead.AV_SIZE; + if (copylen > 79) + copylen = 79; + strncpy(av_str, mhead.AV, copylen); + av_str[copylen] = 0; printf("%s\n\n", av_str); } comment_out("Main comment:"); // print main comment @@ -300,7 +304,7 @@ INT proc_vol(void) // opens volume { INT i; - CHAR s[80]; + CHAR s[PATH_MAX + 80]; // if f_allvol_pr is 2 we have -y and should never ask if ((!fileexists_insense(aname) && f_allvol_pr != 2) || !f_allvol_pr) @@ -428,7 +432,7 @@ if (head.HEAD_TYPE == FILE_BLK) { comment_out("File comment:"); // show file comment - ace_fname(file, &head, nopath); // get file name + ace_fname(file, &head, nopath, sizeof(file)); // get file name printf("\n%s", file); flush; dcpr_init_file(); // initialize decompression of file @@ -496,7 +500,7 @@ if (head.HEAD_TYPE == FILE_BLK) { ULONG ti=fhead.FTIME; - ace_fname(file, &head, verbose ? 0 : 1); // get file name + ace_fname(file, &head, verbose ? 0 : 1, sizeof(file)); // get file name size += fhead.SIZE; psize += @@ -588,7 +592,8 @@ init_unace(); // initialize unace - strcpy(aname, argv[arg_cnt]); // get archive name + strncpy(aname, argv[arg_cnt], sizeof(aname) - 4); // get archive name + aname[sizeof(aname) - 5] = '\0'; if (!(s = (CHAR *) strrchr(aname, DIRSEP))) s = aname; if (!strrchr(s, '.')) Property changes on: head/archivers/unace/files/patch-unace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/astro/gpsman/files/patch-gpsman.tcl =================================================================== --- head/astro/gpsman/files/patch-gpsman.tcl (revision 387020) +++ head/astro/gpsman/files/patch-gpsman.tcl (revision 387021) @@ -1,22 +1,20 @@ -$FreeBSD$ - diff -ruN gpsman.tcl gpsman.tcl --- gpsman.tcl Tue May 9 02:37:24 2006 +++ gpsman.tcl Wed May 10 17:56:02 2006 @@ -1,6 +1,6 @@ #!/bin/sh # This is a Tcl/Tk script to be interpreted by wish (Tk8.3 or better): \ -exec wish "$0" -- "$@" +exec %%WISH%% "$0" -- "$@" # # gpsman --- GPS Manager: a manager for GPS receiver data @@ -247,7 +247,7 @@ } # path to directory containing program files -set SRCDIR gmsrc +set SRCDIR %%GPSMANDIR%%/gmsrc # all other defaults configuration is now done in file $SRCDIR/config.tcl Property changes on: head/astro/gpsman/files/patch-gpsman.tcl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/astro/openuniverse/files/patch-src_ou.h =================================================================== --- head/astro/openuniverse/files/patch-src_ou.h (revision 387020) +++ head/astro/openuniverse/files/patch-src_ou.h (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- src/ou.h.orig Sun Jun 4 12:35:09 2000 +++ src/ou.h Tue Nov 5 12:17:24 2002 @@ -19,6 +19,7 @@ #include #include +#include #include #ifdef WIN32 Property changes on: head/astro/openuniverse/files/patch-src_ou.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/astro/wmmoonclock/files/patch-wmMoonClock.c =================================================================== --- head/astro/wmmoonclock/files/patch-wmMoonClock.c (revision 387020) +++ head/astro/wmmoonclock/files/patch-wmMoonClock.c (revision 387021) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- wmMoonClock.c.orig Thu Aug 15 18:15:26 2002 +++ wmMoonClock.c Thu Aug 15 18:15:51 2002 @@ -162,7 +162,8 @@ int i, n, k, j, ImageNumber; int Year, Month, DayOfWeek, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; - long CurrentLocalTime, CurrentGMTTime, date; + time_t CurrentLocalTime, CurrentGMTTime; + long date; double UT, val, RA, DEC, UTRise, UTSet, LocalHour, hour24(); int D, H, M, S, sgn, A, B, q; char str[10]; Property changes on: head/astro/wmmoonclock/files/patch-wmMoonClock.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/astro/wmsun/files/patch-wmSun.c =================================================================== --- head/astro/wmsun/files/patch-wmSun.c (revision 387020) +++ head/astro/wmsun/files/patch-wmSun.c (revision 387021) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- wmSun.c.orig Thu Aug 15 18:04:04 2002 +++ wmSun.c Thu Aug 15 18:06:24 2002 @@ -76,7 +76,8 @@ int LocalDayOfMonth, DayOfMonth; int Hours, Mins, Secs, OldSecs, digit, xoff, xsize; int OldMins; - long CurrentLocalTime, CurrentGMTTime, date; + time_t CurrentLocalTime, CurrentGMTTime; + long date; double UT, val, RA, DEC, LTRise, LTSet, LocalHour, hour24(); int D, H, M, S, sgn, A, B, q; char str[10]; Property changes on: head/astro/wmsun/files/patch-wmSun.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/aureal-kmod/files/patch-10_Makefile =================================================================== --- head/audio/aureal-kmod/files/patch-10_Makefile (revision 387020) +++ head/audio/aureal-kmod/files/patch-10_Makefile (revision 387021) @@ -1,9 +1,6 @@ - -$FreeBSD$ - --- 10/Makefile.orig Tue Jan 16 15:45:02 2001 +++ 10/Makefile Tue Jan 16 15:47:38 2001 @@ -0,0 +1,3 @@ +MODEL = 10 + +.include Property changes on: head/audio/aureal-kmod/files/patch-10_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/aureal-kmod/files/patch-20_Makefile =================================================================== --- head/audio/aureal-kmod/files/patch-20_Makefile (revision 387020) +++ head/audio/aureal-kmod/files/patch-20_Makefile (revision 387021) @@ -1,9 +1,6 @@ - -$FreeBSD$ - --- 20/Makefile.orig Tue Jan 16 15:45:02 2001 +++ 20/Makefile Tue Jan 16 15:47:46 2001 @@ -0,0 +1,3 @@ +MODEL = 20 + +.include Property changes on: head/audio/aureal-kmod/files/patch-20_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/aureal-kmod/files/patch-30_Makefile =================================================================== --- head/audio/aureal-kmod/files/patch-30_Makefile (revision 387020) +++ head/audio/aureal-kmod/files/patch-30_Makefile (revision 387021) @@ -1,9 +1,6 @@ - -$FreeBSD$ - --- 30/Makefile.orig Tue Jan 16 15:45:03 2001 +++ 30/Makefile Tue Jan 16 15:47:53 2001 @@ -0,0 +1,3 @@ +MODEL = 30 + +.include Property changes on: head/audio/aureal-kmod/files/patch-30_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/aureal-kmod/files/patch-Makefile =================================================================== --- head/audio/aureal-kmod/files/patch-Makefile (revision 387020) +++ head/audio/aureal-kmod/files/patch-Makefile (revision 387021) @@ -1,9 +1,6 @@ - -$FreeBSD$ - --- Makefile.orig Mon Jan 15 18:44:49 2001 +++ Makefile Mon Jan 15 18:44:49 2001 @@ -0,0 +1,3 @@ +SUBDIR = 10 20 30 + +.include Property changes on: head/audio/aureal-kmod/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/aureal-kmod/files/patch-Makefile.inc =================================================================== --- head/audio/aureal-kmod/files/patch-Makefile.inc (revision 387020) +++ head/audio/aureal-kmod/files/patch-Makefile.inc (revision 387021) @@ -1,20 +1,17 @@ - -$FreeBSD$ - --- Makefile.inc.orig Thu Jun 21 22:34:06 2001 +++ Makefile.inc Thu Jun 21 22:37:50 2001 @@ -0,0 +1,14 @@ +.PATH: /sys/dev/sound/pci ${WRKSRC} + +KMODDIR= ${PREFIX}/lib/au88x0 +KMOD= snd_au88${MODEL} +.if ${OSVERSION} < 500000 +KMODDEPS= snd_pcm +.endif +SRCS+= au88x0.c +SRCS+= device_if.h bus_if.h isa_if.h pci_if.h +.if ${OSVERSION} > 500000 || defined(HAVE_KOBJ_PCM) +SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h +.endif +OBJS= ${WRKSRC}/asp${MODEL}.o +CFLAGS+= -I${WRKSRC} Property changes on: head/audio/aureal-kmod/files/patch-Makefile.inc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/cdplay/files/patch-cd.c =================================================================== --- head/audio/cdplay/files/patch-cd.c (revision 387020) +++ head/audio/cdplay/files/patch-cd.c (revision 387021) @@ -1,143 +1,140 @@ - -$FreeBSD$ - --- cd.c.orig Mon May 19 15:44:40 2003 +++ cd.c Mon May 19 15:53:44 2003 @@ -98,8 +98,16 @@ cd_play.end_s=cdinfo.s_sec[cdinfo.l_track-1]; cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; - if(ioctl (cd_fd, CDIOCPLAYMSF, (char *) &cd_play)<0) - per(); + if(ioctl (cd_fd, CDIOCPLAYMSF, (char *) &cd_play)<0) { + /* Hack for IDE CD-ROMs */ + if (cd_play.start_s < 2) { + cd_play.start_s=2; + if(ioctl (cd_fd, CDIOCPLAYMSF, (char *) &cd_play)<0) + per(); + } else + per(); + } + cdinfo.pause=0; } /* Skips one track forward */ @@ -111,7 +119,7 @@ /* Quess */ void prev(void) { - if(cdinfo.c_sec<1) + if(cdinfo.c_sec<4) play_track(cdinfo.c_track-1); else play_track(cdinfo.c_track); } @@ -141,17 +149,59 @@ } } +/* Softly pauses the cd, or unpauses, as appropriate */ +void cdsoftpause(void) +{ + struct ioc_vol real_vol, cur_vol; + int i; + + if(ioctl(cd_fd,CDIOCGETVOL,(char *) &real_vol)) per(); + cur_vol = real_vol; + + if(cdinfo.pause){ + message="continue"; + memset (cur_vol.vol, 0, sizeof(cur_vol.vol)); + if(ioctl(cd_fd,CDIOCSETVOL,(char *) &cur_vol)) per(); + if(ioctl(cd_fd,CDIOCRESUME)<0) per(); else cdinfo.pause=0; + for (i=0; i<20; usleep(21), i++) { + cur_vol.vol[0] += (real_vol.vol[0] / 20); + cur_vol.vol[1] += (real_vol.vol[1] / 20); + cur_vol.vol[2] += (real_vol.vol[2] / 20); + cur_vol.vol[3] += (real_vol.vol[3] / 20); + if(ioctl(cd_fd,CDIOCSETVOL,(char *) &cur_vol)) per(); + } + if(ioctl(cd_fd,CDIOCSETVOL,(char *) &real_vol)) per(); + } + else { + message="pause"; + for (i=0; i<20; usleep(21), i++) { + cur_vol.vol[0] -= (real_vol.vol[0] / 20); + cur_vol.vol[1] -= (real_vol.vol[1] / 20); + cur_vol.vol[2] -= (real_vol.vol[2] / 20); + cur_vol.vol[3] -= (real_vol.vol[3] / 20); + if(ioctl(cd_fd,CDIOCSETVOL,(char *) &cur_vol)) per(); + } + if(ioctl (cd_fd, CDIOCPAUSE)<0) per(); else cdinfo.pause=1; + if(ioctl (cd_fd, CDIOCSETVOL,(char *) &real_vol)) per(); + } +} + /* Huge kludge */ -void ff(void) +void ff(int n_times) { + int secs; struct ioc_play_msf cd_play; - if(cdinfo.c_seca%60+5>=60){ - cd_play.start_s=((cdinfo.c_seca%60)+5)%60; + secs=4*n_times; + + if (secs > 59) secs=59; + + if(cdinfo.c_seca%60+secs>=60){ + cd_play.start_s=((cdinfo.c_seca%60)+secs)%60; cd_play.start_m=cdinfo.c_seca/60+1; } else { - cd_play.start_s=(cdinfo.c_seca%60)+5; + cd_play.start_s=(cdinfo.c_seca%60)+secs; cd_play.start_m=cdinfo.c_seca/60; } cd_play.start_f=1; @@ -160,19 +210,25 @@ cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per(); + cdinfo.pause=0; } /* Hi mom!! */ -void rew(void) +void rew(int n_times) { + int secs; struct ioc_play_msf cd_play; - if(cdinfo.c_seca%60-5<0){ - cd_play.start_s=((cdinfo.c_seca%60)-5)+60; + secs=4*n_times; + + if (secs > 59) secs=59; + + if(cdinfo.c_seca%60-secs<0){ + cd_play.start_s=((cdinfo.c_seca%60)-secs)+60; cd_play.start_m=cdinfo.c_seca/60-1; } else { - cd_play.start_s=(cdinfo.c_seca%60)-5; + cd_play.start_s=(cdinfo.c_seca%60)-secs; cd_play.start_m=cdinfo.c_seca/60; } cd_play.start_f=1; @@ -181,6 +237,7 @@ cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1]; if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per(); + cdinfo.pause=0; } /* Spit cd out */ @@ -192,6 +249,7 @@ per(); close(cd_fd); cdinfo.eject=1; + cdinfo.pause=1; } Property changes on: head/audio/cdplay/files/patch-cd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/cdplay/files/patch-cdplay.h =================================================================== --- head/audio/cdplay/files/patch-cdplay.h (revision 387020) +++ head/audio/cdplay/files/patch-cdplay.h (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- ./cdplay.h.orig Mon May 19 15:44:41 2003 +++ ./cdplay.h Mon May 19 15:55:12 2003 @@ -71,8 +71,9 @@ void prev(void); void stop(void); void cdpause(void); -void ff(void); -void rew(void); +void cdsoftpause(void); +void ff(int); +void rew(int); void eject(void); /* Terminal related functions */ @@ -90,6 +91,7 @@ void hs_winch(void); void do_exit(int); void do_stop(void); +void getcommand(char *command, int *repetivity); /* Awesome!!1!!1! 2 sound functions */ void more_vol(void); Property changes on: head/audio/cdplay/files/patch-cdplay.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/cdplay/files/patch-main.c =================================================================== --- head/audio/cdplay/files/patch-main.c (revision 387020) +++ head/audio/cdplay/files/patch-main.c (revision 387021) @@ -1,85 +1,82 @@ - -$FreeBSD$ - --- ./main.c.orig Mon May 19 15:44:41 2003 +++ ./main.c Mon May 19 15:55:24 2003 @@ -35,11 +35,14 @@ int main(int argc, char **argv) { char cmd[1]; + int repetivity; fd_set rset; struct timeval stime; /* Parse arguments */ - cd_device=DEVICE; + cd_device=getenv("CDROM"); + if (cd_device==NULL) + cd_device=DEVICE; if(argc>1 && !strcmp(argv[1],"-d")) cd_device=argv[2]; else if(argc>1) @@ -68,19 +71,20 @@ while(1){ if(select(1,&rset,(fd_set *) 0,(fd_set *) 0,&stime)>0) { - read(STDIN_FILENO,cmd,FD_SETSIZE); - + getcommand(&cmd[0], &repetivity); + if(cmd[0]=='p'){message="play";play_track(1);} else if(cmd[0]=='F'){message="next";next();} else if(cmd[0]=='R'){message="prev";prev();} - else if(cmd[0]=='f'){message="ff";ff();} - else if(cmd[0]=='r'){message="rew";rew();} + else if(cmd[0]=='f'){message="ff";ff(repetivity);} + else if(cmd[0]=='r'){message="rew";rew(repetivity);} else if(cmd[0]=='s'){message="stop";stop();} - else if(cmd[0]=='e'){message="eject";eject();} - else if(cmd[0]==' ') cdpause(); + else if(cmd[0]=='E'){message="eject";eject();} + else if(cmd[0]==' ') cdsoftpause(); else if(cmd[0]=='+'){message="more vol";more_vol();} else if(cmd[0]=='-'){message="less vol";less_vol();} else if(cmd[0]=='q'){message="bye!";do_exit(0);} + else if(cmd[0]=='P') cdpause(); } update_cdinfo(); move_up(5); @@ -90,6 +94,36 @@ } exit(0); +} + +void getcommand(char *command, int *repetivity) +{ + static char stored_command; + int n; + + fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK); + + if (stored_command) { + *command=stored_command; + } else { + n=read(STDIN_FILENO,command,1); + if (n <= 0) { + *command='\0'; + *repetivity=0; + return; + } + } + + *repetivity=1; + while (read(STDIN_FILENO, &stored_command, 1) > 0) { + if (stored_command == *command) { + (*repetivity)++; + } else { + return; + } + } + stored_command='\0'; + return; } void hs_cont(void) Property changes on: head/audio/cdplay/files/patch-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/epos-devel/files/patch-configure =================================================================== --- head/audio/epos-devel/files/patch-configure (revision 387020) +++ head/audio/epos-devel/files/patch-configure (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- configure.orig +++ configure @@ -14021,9 +14021,9 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef HAVE_SYS_SOCKET_H + #include #include #endif - #include socklen_t x; int main () Property changes on: head/audio/epos-devel/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/epos-devel/files/patch-src_epos.h =================================================================== --- head/audio/epos-devel/files/patch-src_epos.h (revision 387020) +++ head/audio/epos-devel/files/patch-src_epos.h (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- src/epos.h.orig +++ src/epos.h @@ -43,6 +43,7 @@ #include #else #ifdef HAVE_REGEX_H + #include #include #else #include "rx.h" Property changes on: head/audio/epos-devel/files/patch-src_epos.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/extace/files/patch-src__color_win.c =================================================================== --- head/audio/extace/files/patch-src__color_win.c (revision 387020) +++ head/audio/extace/files/patch-src__color_win.c (revision 387021) @@ -1,35 +1,32 @@ - -$FreeBSD$ - --- src/color_win.c.orig Wed Feb 26 01:22:19 2003 +++ src/color_win.c Fri May 23 18:26:18 2003 @@ -579,12 +579,12 @@ button = gtk_button_new_with_label("Set Color"); gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - (GtkSignalFunc)color_button, (gpointer)SET_COLOR); + (GtkSignalFunc)color_button, (gint)SET_COLOR); button = gtk_button_new_with_label("Close"); gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - (GtkSignalFunc)color_button, (gpointer)CLOSE); + (GtkSignalFunc)color_button, (gint)CLOSE); hbox = gtk_hbox_new(TRUE,0); gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0); @@ -592,12 +592,12 @@ button = gtk_button_new_with_label("Save"); gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - (GtkSignalFunc)color_button, (gpointer)SAVE); + (GtkSignalFunc)color_button, (gint)SAVE); button = gtk_button_new_with_label("Load"); gtk_box_pack_start(GTK_BOX(hbox),button,TRUE,TRUE,0); gtk_signal_connect(GTK_OBJECT(button), "clicked", - (GtkSignalFunc)color_button, (gpointer)LOAD); + (GtkSignalFunc)color_button, (gint)LOAD); gtk_widget_show_all(grad_win); } Property changes on: head/audio/extace/files/patch-src__color_win.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/faad/files/patch-frontend_main.c =================================================================== --- head/audio/faad/files/patch-frontend_main.c (revision 387020) +++ head/audio/faad/files/patch-frontend_main.c (revision 387021) @@ -1,261 +1,258 @@ - -$FreeBSD$ - --- frontend/main.c.orig +++ frontend/main.c @@ -137,6 +137,31 @@ b->bytes_into_buffer = 0; } +static void lookforheader(aac_buffer *b) +{ + int i = 0; + while (!b->at_eof ) + { + if (b->bytes_into_buffer > 4) + { + if( ((b->buffer[0+i] == 0xff) && ((b->buffer[1+i] & 0xf6) == 0xf0)) || + (b->buffer[0+i] == 'A' && b->buffer[1+i] == 'D' && b->buffer[2+i] == 'I' && b->buffer[3+i] == 'F')) + { + fill_buffer(b); + break; + } else { + i++; + b->file_offset += 1; + b->bytes_consumed += 1; + b->bytes_into_buffer -= 1; + } + } else { + fill_buffer(b); + i = 0; + } + } +} + static int adts_sample_rates[] = {96000,88200,64000,48000,44100,32000,24000,22050,16000,12000,11025,8000,7350,0,0,0}; static int adts_parse(aac_buffer *b, int *bitrate, float *length) @@ -424,6 +449,8 @@ float length = 0; int first_time = 1; + int retval; + int streaminput = 0; aac_buffer b; @@ -439,17 +466,39 @@ } } - b.infile = fopen(aacfile, "rb"); - if (b.infile == NULL) + if (0 == strcmp(aacfile, "-")) { - /* unable to open file */ - faad_fprintf(stderr, "Error opening file: %s\n", aacfile); - return 1; + b.infile = stdin; +#ifdef _WIN32 + setmode(fileno(stdin), O_BINARY); +#endif + + } else + { + b.infile = fopen(aacfile, "rb"); + if (b.infile == NULL) + { + /* unable to open file */ + faad_fprintf(stderr, "Error opening file: %s\n", aacfile); + return 1; + } } - fseek(b.infile, 0, SEEK_END); - fileread = ftell(b.infile); - fseek(b.infile, 0, SEEK_SET); + retval = fseek(b.infile, 0, SEEK_END); +#ifdef _WIN32 + if (0 == strcmp(aacfile, "-")) { + retval = -1; + } +#endif + if (retval ) + { + faad_fprintf(stderr, "Input not seekable %s\n", aacfile); + fileread = -1; + streaminput = 1; + } else { + fileread = ftell(b.infile); + fseek(b.infile, 0, SEEK_SET); + }; if (!(b.buffer = (unsigned char*)malloc(FAAD_MIN_STREAMSIZE*MAX_CHANNELS))) { @@ -494,19 +543,39 @@ /* get AAC infos for printing */ header_type = 0; + if (streaminput == 1 ) + lookforheader(&b); + if ((b.buffer[0] == 0xFF) && ((b.buffer[1] & 0xF6) == 0xF0)) { - adts_parse(&b, &bitrate, &length); - fseek(b.infile, tagsize, SEEK_SET); + if (streaminput ==1) + { + int frames, frame_length; + int samplerate; + float frames_per_sec, bytes_per_frame; + samplerate = adts_sample_rates[(b.buffer[2]&0x3c)>>2]; + frame_length = ((((unsigned int)b.buffer[3] & 0x3)) << 11) + | (((unsigned int)b.buffer[4]) << 3) | (b.buffer[5] >> 5); - bread = fread(b.buffer, 1, FAAD_MIN_STREAMSIZE*MAX_CHANNELS, b.infile); - if (bread != FAAD_MIN_STREAMSIZE*MAX_CHANNELS) - b.at_eof = 1; - else - b.at_eof = 0; - b.bytes_into_buffer = bread; - b.bytes_consumed = 0; - b.file_offset = tagsize; + frames_per_sec = (float)samplerate/1024.0f; + bytes_per_frame = (float)frame_length/(float)(1000); + bitrate = (int)(8. * bytes_per_frame * frames_per_sec + 0.5); + length = 1; + faad_fprintf(stderr, "Streamed input format samplerate %d channels %d.\n",samplerate,channels); + + } else { + adts_parse(&b, &bitrate, &length); + fseek(b.infile, tagsize, SEEK_SET); + + bread = fread(b.buffer, 1, FAAD_MIN_STREAMSIZE*MAX_CHANNELS, b.infile); + if (bread != FAAD_MIN_STREAMSIZE*MAX_CHANNELS) + b.at_eof = 1; + else + b.at_eof = 0; + b.bytes_into_buffer = bread; + b.bytes_consumed = 0; + b.file_offset = tagsize; + } header_type = 1; } else if (memcmp(b.buffer, "ADIF", 4) == 0) { @@ -538,7 +607,8 @@ if (b.buffer) free(b.buffer); NeAACDecClose(hDecoder); - fclose(b.infile); + if (b.infile != stdin) + fclose(b.infile); return 1; } advance_buffer(&b, bread); @@ -564,7 +634,8 @@ if (infoOnly) { NeAACDecClose(hDecoder); - fclose(b.infile); + if (b.infile != stdin) + fclose(b.infile); if (b.buffer) free(b.buffer); return 0; @@ -621,7 +692,8 @@ if (b.buffer) free(b.buffer); NeAACDecClose(hDecoder); - fclose(b.infile); + if (b.infile != stdin) + fclose(b.infile); return 0; } } else { @@ -662,7 +734,8 @@ fclose(adtsFile); } - fclose(b.infile); + if (b.infile != stdin) + fclose(b.infile); if (!first_time && !adts_out) close_audio_file(aufile); @@ -750,6 +823,11 @@ /* initialise the callback structure */ mp4ff_callback_t *mp4cb = malloc(sizeof(mp4ff_callback_t)); + if (strcmp(mp4file, "-") == 0 ) { + faad_fprintf(stderr, "Cannot open stdin for MP4 input \n"); + return 1; + } + mp4File = fopen(mp4file, "rb"); mp4cb->read = read_callback; mp4cb->seek = seek_callback; @@ -1016,6 +1094,7 @@ int result; int infoOnly = 0; int writeToStdio = 0; + int readFromStdin = 0; int object_type = LC; int def_srate = 0; int downMatrix = 0; @@ -1229,15 +1308,30 @@ } /* check for mp4 file */ - mp4file = 0; - hMP4File = fopen(aacFileName, "rb"); - if (!hMP4File) - { - faad_fprintf(stderr, "Error opening file: %s\n", aacFileName); - return 1; + if (0 == strcmp(aacFileName, "-")) { + faad_fprintf(stderr, "Reading from stdin: %s\n", aacFileName); + readFromStdin = 1; + hMP4File = stdin; +#ifdef _WIN32 + setmode(fileno(stdin), O_BINARY); +#endif + + } else { + + mp4file = 0; + hMP4File = fopen(aacFileName, "rb"); + if (!hMP4File) + { + faad_fprintf(stderr, "Error opening file: %s\n", aacFileName); + return 1; + } } + fread(header, 1, 8, hMP4File); - fclose(hMP4File); + + if (! readFromStdin ) + fclose(hMP4File); + if (header[4] == 'f' && header[5] == 't' && header[6] == 'y' && header[7] == 'p') mp4file = 1; @@ -1246,6 +1340,18 @@ result = decodeMP4file(aacFileName, audioFileName, adtsFileName, writeToStdio, outputFormat, format, downMatrix, noGapless, infoOnly, adts_out, &length); } else { + + if (readFromStdin == 1) { + ungetc(header[7],hMP4File); + ungetc(header[6],hMP4File); + ungetc(header[5],hMP4File); + ungetc(header[4],hMP4File); + ungetc(header[3],hMP4File); + ungetc(header[2],hMP4File); + ungetc(header[1],hMP4File); + ungetc(header[0],hMP4File); + } + result = decodeAACfile(aacFileName, audioFileName, adtsFileName, writeToStdio, def_srate, object_type, outputFormat, format, downMatrix, infoOnly, adts_out, old_format, &length); Property changes on: head/audio/faad/files/patch-frontend_main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/festival/files/patch-speech_tools_install.mak =================================================================== --- head/audio/festival/files/patch-speech_tools_install.mak (revision 387020) +++ head/audio/festival/files/patch-speech_tools_install.mak (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - author: Tod McQuillin --- speech_tools/config/rules/install.mak~ Sun May 30 22:51:10 1999 +++ speech_tools/config/rules/install.mak Wed Mar 9 03:11:35 2005 @@ -39,7 +39,7 @@ -PROJECT_HOME_PATH := $(shell mkdir -p $($(PROJECT_PREFIX)_HOME); cd $($(PROJECT_PREFIX)_HOME); pwd) +PROJECT_HOME_PATH := $($(PROJECT_PREFIX)_HOME) PROJECT_TOP_PATH := $(shell (cd $(TOP); pwd)) Property changes on: head/audio/festival/files/patch-speech_tools_install.mak ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/flite/files/patch-configure =================================================================== --- head/audio/flite/files/patch-configure (revision 387020) +++ head/audio/flite/files/patch-configure (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- configure.orig 2009-08-14 22:50:59.000000000 +0200 +++ configure 2010-09-09 15:07:27.000000000 +0200 @@ -4079,7 +4079,7 @@ OTHERLIBS= if test "$shared" = true; then case "$target_os" in - linux*|k*bsd*-gnu|gnu*) + linux*|k*bsd*-gnu|gnu*|*bsd*) SHFLAGS="-fPIC" ;; solaris*) @@ -4893,7 +4893,7 @@ AUDIODEFS=-DCST_AUDIO_ALSA AUDIOLIBS=-lasound ;; - *bsd) + *bsd*) AUDIODRIVER=oss AUDIODEFS=-DCST_AUDIO_FREEBSD ;; Property changes on: head/audio/flite/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/flite/files/patch-lang-cmulex-make_cmulex =================================================================== --- head/audio/flite/files/patch-lang-cmulex-make_cmulex (revision 387020) +++ head/audio/flite/files/patch-lang-cmulex-make_cmulex (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- lang/cmulex/make_cmulex.orig +++ lang/cmulex/make_cmulex @@ -36,7 +36,7 @@ ## ## ########################################################################### -if [ "x$FLITEDIR" == "x" ] +if [ "x$FLITEDIR" = "x" ] then FLITEDIR=`pwd`/../.. fi Property changes on: head/audio/flite/files/patch-lang-cmulex-make_cmulex ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/flite/files/patch-src-audio-au_sun.c =================================================================== --- head/audio/flite/files/patch-src-audio-au_sun.c (revision 387020) +++ head/audio/flite/files/patch-src-audio-au_sun.c (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- src/audio/au_sun.c.orig +++ src/audio/au_sun.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include "cst_string.h" @@ -76,7 +77,11 @@ cst_audiodev *audio_open_sun(int sps, in cst_error(); } } +#ifdef __OpenBSD__ + AUDIO_INITINFO(&ainfo); +#else ioctl(fd,AUDIO_GETINFO,&ainfo); +#endif switch (fmt) { Property changes on: head/audio/flite/files/patch-src-audio-au_sun.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/flite/files/patch-tools-funds_sts_main.c =================================================================== --- head/audio/flite/files/patch-tools-funds_sts_main.c (revision 387020) +++ head/audio/flite/files/patch-tools-funds_sts_main.c (revision 387021) @@ -1,19 +1,16 @@ - -$FreeBSD$ - Tags: for-upstream The standard headers must be included before the behavior gets undefined by the following macro definition. --- tools/find_sts_main.c.orig 2005-01-01 15:04:43.000000000 +0100 +++ tools/find_sts_main.c 2007-01-21 04:36:17.750982588 +0100 @@ -40,6 +40,8 @@ #include #include #include +#include +#include /* To allow some normally const fields to manipulated during building */ #define const Property changes on: head/audio/flite/files/patch-tools-funds_sts_main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/glame/files/patch-Makefile.in =================================================================== --- head/audio/glame/files/patch-Makefile.in (revision 387020) +++ head/audio/glame/files/patch-Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- Makefile.in.orig Fri Oct 29 03:53:30 2004 +++ Makefile.in Fri Oct 29 21:29:55 2004 @@ -280,7 +280,7 @@ subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = intl libltdl macros src doc data po +SUBDIRS = intl macros src doc data po ACLOCAL_AMFLAGS = -I macros -I . EXTRA_DIST = TODO MAINTAINERS CREDITS BUGS autogen.sh glame.spec all: config.h Property changes on: head/audio/glame/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/glame/files/patch-src__plugins__audio_io_oss.c =================================================================== --- head/audio/glame/files/patch-src__plugins__audio_io_oss.c (revision 387020) +++ head/audio/glame/files/patch-src__plugins__audio_io_oss.c (revision 387021) @@ -1,17 +1,14 @@ - -$FreeBSD$ - --- src/plugins/audio_io_oss.c 2003/07/01 12:26:28 1.1 +++ src/plugins/audio_io_oss.c 2003/07/01 12:26:41 @@ -26,9 +26,9 @@ #ifdef HAVE_OSS_LINUX #include -#elif HAVE_OSS_SYS +#elif defined(HAVE_OSS_SYS) #include -#elif HAVE_OSS_MACHINE +#elif defined(HAVE_OSS_MACHINE) #include #else #error BUG in OSS configuration. Property changes on: head/audio/glame/files/patch-src__plugins__audio_io_oss.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc =================================================================== --- head/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc (revision 387020) +++ head/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- roboradio/audio/ogg.cc.orig +++ roboradio/audio/ogg.cc @@ -193,6 +193,7 @@ int device_id = ao_default_driver_id(); ao_sample_format output_fmt; + memset(&output_fmt, 0, sizeof(output_fmt)); output_fmt.bits = 16; output_fmt.rate = 44100; output_fmt.channels = 2; Property changes on: head/audio/gnomoradio/files/patch-roboradio_audio_ogg.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/libao/files/patch-configure =================================================================== --- head/audio/libao/files/patch-configure (revision 387020) +++ head/audio/libao/files/patch-configure (revision 387021) @@ -1,45 +1,42 @@ - -$FreeBSD$ - --- configure.orig 2011-06-08 21:32:18.000000000 +0200 +++ configure 2011-06-08 21:32:18.000000000 +0200 @@ -11059,7 +11059,7 @@ if test -z "$GCC"; then *) PLUGIN_LDFLAGS="-export-dynamic -avoid-version" DEBUG="-g" - CFLAGS="-O" + CFLAGS="" PROFILE="-g -p" ;; esac else @@ -11082,9 +11082,9 @@ else PROFILE="-g -pg -D__NO_MATH_INLINES -fsigned-char" ;; *) PLUGIN_LDFLAGS="-export-dynamic -avoid-version" - DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char" - CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char" - PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;; + DEBUG="-g -Wall -fsigned-char" + CFLAGS="-fsigned-char" + PROFILE="-g -pg -fsigned-char" ;; esac fi CFLAGS="$CFLAGS $cflags_save -DAO_BUILDING_LIBAO" @@ -12978,7 +12978,7 @@ if test "${ac_cv_lib_audio_AuOpenServer+ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-laudio -lXau $X_LIBS $LIBS" +LIBS="-laudio -lXau -lXt -lm $X_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13041,7 +13041,7 @@ fi if test "x$have_nas" = xyes; then NAS_CFLAGS="$X_CFLAGS" - NAS_LIBS="-laudio -lXau $X_LIBS" + NAS_LIBS="-laudio -lXau -lXt -lm $X_LIBS" else NAS_CFLAGS="" NAS_LIBS="" Property changes on: head/audio/libao/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/libao/files/patch-doc_Makefile.in =================================================================== --- head/audio/libao/files/patch-doc_Makefile.in (revision 387020) +++ head/audio/libao/files/patch-doc_Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- doc/Makefile.in.orig +++ doc/Makefile.in @@ -161,7 +161,7 @@ builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ -docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION) +docdir = $(datadir)/doc/$(PACKAGE) dvidir = @dvidir@ exec_prefix = @exec_prefix@ host = @host@ Property changes on: head/audio/libao/files/patch-doc_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/libogg/files/patch-configure =================================================================== --- head/audio/libogg/files/patch-configure (revision 387020) +++ head/audio/libogg/files/patch-configure (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- configure.orig Mon Nov 17 17:34:08 2003 +++ configure Mon Nov 24 18:26:28 2003 @@ -7818,7 +7819,7 @@ ;; *) DEBUG="-g" - CFLAGS="-O" + CFLAGS="" PROFILE="-g -p" ;; esac @@ -7841,8 +7842,8 @@ ;; *) DEBUG="-g -Wall -fsigned-char" - CFLAGS="-O20 -fsigned-char" - PROFILE="-O20 -g -pg -fsigned-char" + CFLAGS="-fsigned-char" + PROFILE="-g -pg -fsigned-char" ;; esac fi Property changes on: head/audio/libogg/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/mpg321/files/patch-ao.c =================================================================== --- head/audio/mpg321/files/patch-ao.c (revision 387020) +++ head/audio/mpg321/files/patch-ao.c (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- ao.c.orig +++ ao.c @@ -229,6 +229,7 @@ and restore it afterwards */ signal(SIGINT, SIG_DFL); + memset(&format, 0, sizeof(format)); format.bits = 16; format.rate = header->samplerate; format.channels = (options.opt & MPG321_FORCE_STEREO) ? 2 : MAD_NCHANNELS(header); Property changes on: head/audio/mpg321/files/patch-ao.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/mpg321/files/patch-mpg321.c =================================================================== --- head/audio/mpg321/files/patch-mpg321.c (revision 387020) +++ head/audio/mpg321/files/patch-mpg321.c (revision 387021) @@ -1,84 +1,81 @@ - -$FreeBSD$ - --- mpg321.c.orig +++ mpg321.c @@ -188,7 +188,7 @@ else { - printf(names[i]); + printf("%s", names[i]); free(names[i]); } } @@ -203,7 +203,7 @@ if (!names[i]) { fprintf (stderr, emptystring); } else { - fprintf (stderr, names[i]); + fprintf (stderr, "%s", names[i]); free (names[i]); } if (i%2) fprintf (stderr, "\n"); @@ -285,6 +285,8 @@ signal(SIGINT, SIG_DFL); playbuf.buf = NULL; + playbuf.frames = NULL; + playbuf.times = NULL; playbuf.fd = -1; playbuf.length = 0; playbuf.done = 0; @@ -410,12 +412,14 @@ if(fstat(fd, &stat) == -1) { + close(fd); mpg321_error(currentfile); continue; } if (!S_ISREG(stat.st_mode)) { + close(fd); continue; } @@ -432,6 +436,7 @@ if((playbuf.buf = mmap(0, playbuf.length, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { + close(fd); mpg321_error(currentfile); continue; } @@ -509,9 +514,6 @@ mad_decoder_finish(&decoder); - if (quit_now) - break; - if (playbuf.frames) free(playbuf.frames); @@ -521,6 +523,7 @@ if (playbuf.fd == -1) { munmap(playbuf.buf, playbuf.length); + close(fd); } else @@ -535,10 +538,6 @@ ao_close(playdevice); ao_shutdown(); - -#if defined(RAW_SUPPORT) || defined(HTTP_SUPPORT) || defined(FTP_SUPPORT) - if(fd) close(fd); -#endif return(0); } Property changes on: head/audio/mpg321/files/patch-mpg321.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/mpg321/files/patch-network.c =================================================================== --- head/audio/mpg321/files/patch-network.c (revision 387020) +++ head/audio/mpg321/files/patch-network.c (revision 387021) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- network.c.orig +++ network.c @@ -225,7 +225,8 @@ * a html page and not the stream */ snprintf(http_request, sizeof(http_request), "GET /%s HTTP/1.0\r\n" /* "User-Agent: Mozilla/2.0 (Win95; I)\r\n" */ - "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, host); + "User-Agent: mpg321/%s\r\n" + "Pragma: no-cache\r\n" "Host: %s\r\n" "Accept: */*\r\n" "\r\n", filename, VERSION, host); send(tcp_sock, http_request, strlen(http_request), 0); Property changes on: head/audio/mpg321/files/patch-network.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/mumble/files/patch-plugins-plugins.pri =================================================================== --- head/audio/mumble/files/patch-plugins-plugins.pri (revision 387020) +++ head/audio/mumble/files/patch-plugins-plugins.pri (revision 387021) @@ -1,29 +1,27 @@ -$FreeBSD$ - Disable debug; runs into cryptic errors on 9+/amd64 --- plugins/plugins.pri.orig 2013-06-04 10:06:48.955586932 -0500 +++ plugins/plugins.pri 2013-06-04 10:07:37.450613576 -0500 @@ -1,7 +1,7 @@ include(../compiler.pri) TEMPLATE = lib -CONFIG += plugin debug_and_release warn_on +CONFIG += plugin warn_on CONFIG -= qt DIST *= mumble_plugin.h @@ -10,12 +10,7 @@ CONFIG += qt_dynamic_lookup } -CONFIG(debug, debug|release) { - CONFIG += console - DESTDIR = ../../debug/plugins -} - -CONFIG(release, debug|release) { +CONFIG(release, release) { DESTDIR = ../../release/plugins } Property changes on: head/audio/mumble/files/patch-plugins-plugins.pri ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/p5-libvorbis/files/patch-Makefile.PL =================================================================== --- head/audio/p5-libvorbis/files/patch-Makefile.PL (revision 387020) +++ head/audio/p5-libvorbis/files/patch-Makefile.PL (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- Makefile.PL.orig Mon Oct 23 08:53:08 2000 +++ Makefile.PL Wed Jul 31 16:09:47 2002 @@ -4,8 +4,7 @@ WriteMakefile( 'NAME' => 'Ogg::Vorbis', 'VERSION_FROM' => 'Vorbis.pm', - 'LIBS' => ['-logg -lvorbis -lvorbisfile'], + 'LIBS' => ['-L%%PREFIX%%/lib -logg -lvorbis -lvorbisfile'], 'DEFINE' => '', - 'INC' => '-I/usr/local/include/vorbis', - 'EXE_FILES' => ['pogg'], + 'INC' => '-I%%PREFIX%%/include', ); Property changes on: head/audio/p5-libvorbis/files/patch-Makefile.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/pms/files/patch-src_pms.cpp =================================================================== --- head/audio/pms/files/patch-src_pms.cpp (revision 387020) +++ head/audio/pms/files/patch-src_pms.cpp (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- src/pms.cpp.orig +++ src/pms.cpp @@ -23,6 +23,10 @@ #include "pms.h" +#ifdef __FreeBSD__ +#include +#endif + using namespace std; Pms * pms; Property changes on: head/audio/pms/files/patch-src_pms.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/rio500/files/patch-src_rio__add__song.c =================================================================== --- head/audio/rio500/files/patch-src_rio__add__song.c (revision 387020) +++ head/audio/rio500/files/patch-src_rio__add__song.c (revision 387021) @@ -1,22 +1,19 @@ - -$FreeBSD$ - --- src/rio_add_song.c.orig Sun Aug 22 16:53:27 2004 +++ src/rio_add_song.c Sun Aug 22 16:55:17 2004 @@ -325,6 +325,7 @@ send_command (rio_dev, 0x58, 0x0, card_number); try_next: + break; } /* end of add file loop */ /* Close device */ @@ -624,7 +625,7 @@ safe_strcat(display_string, "%", DISPLAY_STRING_LEN); break; - default: /* No Action */ + default: break; /* No Action */ } } else { Property changes on: head/audio/rio500/files/patch-src_rio__add__song.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/sdl_mixer/files/patch-SDL_mixer.h =================================================================== --- head/audio/sdl_mixer/files/patch-SDL_mixer.h (revision 387020) +++ head/audio/sdl_mixer/files/patch-SDL_mixer.h (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- SDL_mixer.h 2001/05/08 07:44:56 1.1 +++ SDL_mixer.h 2001/05/08 07:48:13 @@ -222,6 +222,8 @@ /* Close the mixer, halting all playing audio */ extern DECLSPEC void Mix_CloseAudio(void); +extern DECLSPEC int Mix_GetMixerInfo(SDL_AudioSpec *, char *, int); + /* We'll use SDL for reporting errors */ #define Mix_SetError SDL_SetError #define Mix_GetError SDL_GetError Property changes on: head/audio/sdl_mixer/files/patch-SDL_mixer.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/sdl_mixer/files/patch-mixer.c =================================================================== --- head/audio/sdl_mixer/files/patch-mixer.c (revision 387020) +++ head/audio/sdl_mixer/files/patch-mixer.c (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- mixer.c 2001/05/08 07:44:26 1.1 +++ mixer.c 2001/05/08 07:47:09 @@ -865,3 +865,18 @@ } return(chan); } + +int Mix_GetMixerInfo(SDL_AudioSpec *m, char *namebuf, int maxlen) +{ + if (!audio_opened) + return -1; + if (m) + *m = mixer; /* struct copy */ + if (namebuf && maxlen > 0) + { + namebuf[0] = 0; + if (SDL_AudioDriverName(namebuf, maxlen) == NULL) + namebuf[0] = 0; + } + return 0; +} Property changes on: head/audio/sdl_mixer/files/patch-mixer.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/sidplay/files/patch-configure =================================================================== --- head/audio/sidplay/files/patch-configure (revision 387020) +++ head/audio/sidplay/files/patch-configure (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- configure.orig Mon Mar 11 11:42:18 2002 +++ configure Tue Jul 30 14:09:39 2002 @@ -1416,7 +1416,7 @@ fi done -for ac_hdr in sys/ioctl.h linux/soundcard.h machine/soundcard.h \ +for ac_hdr in sys/ioctl.h linux/soundcard.h sys/soundcard.h \ soundcard.h sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \ audio.h dmedia/audio.h do Property changes on: head/audio/sidplay/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/sphinx/files/patch-src_examples_tty-continuous.c =================================================================== --- head/audio/sphinx/files/patch-src_examples_tty-continuous.c (revision 387020) +++ head/audio/sphinx/files/patch-src_examples_tty-continuous.c (revision 387021) @@ -1,14 +1,12 @@ -$FreeBSD$ - author: Andriy Gapon --- src/examples/tty-continuous.c.orig Thu Dec 13 21:11:15 2001 +++ src/examples/tty-continuous.c Mon Oct 20 12:12:58 2003 @@ -175,7 +175,6 @@ static void utterance_loop() * listening until current utterance completely decoded */ ad_stop_rec (ad); - while (ad_read (ad, adbuf, 4096) >= 0); cont_ad_reset (cont); printf ("Stopped listening, please wait...\n"); fflush (stdout); Property changes on: head/audio/sphinx/files/patch-src_examples_tty-continuous.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c =================================================================== --- head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c (revision 387020) +++ head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c (revision 387021) @@ -1,211 +1,209 @@ -$FreeBSD$ - author: Andriy Gapon --- src/libsphinx2ad/ad_oss_bsd.c.orig Thu Dec 13 21:11:27 2001 +++ src/libsphinx2ad/ad_oss_bsd.c Fri Oct 24 04:11:22 2003 @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include "s2types.h" @@ -72,14 +72,11 @@ #define SPS_EPSILON 200 -#ifndef SNDCTL_DSP_SETDUPLEX -#define SNDCTL_DSP_SETDUPLEX -1 -#endif ad_rec_t *ad_open_sps (int32 sps) { ad_rec_t *handle; int32 dspFD, mixerFD; - int32 nonBlocking=1, sourceMic=1, inputGain=INPUT_GAIN; + int32 sourceMic=1, inputGain=INPUT_GAIN; int32 audioFormat=AUDIO_FORMAT; int32 dspCaps=0; int32 sampleRate; @@ -96,7 +93,6 @@ } sampleRate = sps; - /* Used to have O_NDELAY. */ if((dspFD = open ("/dev/dsp", O_RDONLY))<0){ if (errno == EBUSY) fprintf(stderr, "Audio device busy\n"); @@ -105,18 +101,6 @@ return NULL; } - if (ioctl (dspFD, SNDCTL_DSP_SYNC, 0) < 0){ - fprintf(stderr, "Audio ioctl(SYNC) failed: %s\n", strerror(errno)); - close (dspFD); - return NULL; - } - - if (ioctl (dspFD, SNDCTL_DSP_RESET, 0) < 0){ - fprintf(stderr, "Audio ioctl(RESET) failed: %s\n", strerror(errno)); - close (dspFD); - return NULL; - } - if (ioctl (dspFD, SNDCTL_DSP_SETFMT, &audioFormat) < 0){ fprintf(stderr, "Audio ioctl(SETFMT 0x%x) failed: %s\n", audioFormat, strerror(errno)); close (dspFD); @@ -139,12 +123,6 @@ return NULL; } - if (ioctl (dspFD, SNDCTL_DSP_NONBLOCK, &nonBlocking) < 0) { - fprintf(stderr, "ioctl(NONBLOCK) failed: %s\n", strerror(errno)); - close (dspFD); - return NULL; - } - if (ioctl (dspFD, SNDCTL_DSP_GETCAPS, &dspCaps) < 0) { fprintf(stderr, "ioctl(GETCAPS) failed: %s\n", strerror(errno)); close (dspFD); @@ -161,8 +139,6 @@ printf("DSP %s memory map capability.\n", (dspCaps&DSP_CAP_MMAP)?"has":"does not have"); #endif - if ((dspCaps & DSP_CAP_DUPLEX) && (ioctl (dspFD, SNDCTL_DSP_SETDUPLEX, 0) < 0)) - fprintf(stderr, "ioctl(SETDUPLEX) failed: %s\n", strerror(errno)); /* Patched by N. Roy (nickr@ri.cmu.edu), 99/7/23. Previously, mixer was set through dspFD. This is incorrect. Should @@ -210,10 +186,10 @@ } handle->dspFD = dspFD; - handle->recording = 0; handle->sps = sps; handle->bps = sizeof(int16); - + handle->recording = 1; + return(handle); } @@ -224,15 +200,10 @@ int32 ad_close (ad_rec_t *handle) { - if (handle->dspFD < 0) - return AD_ERR_NOT_OPEN; - if (handle->recording) { - if (ad_stop_rec (handle) < 0) - return AD_ERR_GEN; + ad_stop_rec (handle); } - close (handle->dspFD); free(handle); return(0); @@ -240,48 +211,62 @@ int32 ad_start_rec (ad_rec_t *handle) { - if (handle->dspFD < 0) - return AD_ERR_NOT_OPEN; - - if (handle->recording) - return AD_ERR_GEN; + + if (!handle->recording) { + + int32 dspFD; + int32 audioFormat=AUDIO_FORMAT; + int32 sampleRate=handle->sps; + + if((dspFD = open ("/dev/dsp", O_RDONLY))<0){ + if (errno == EBUSY) + fprintf(stderr, "Audio device busy\n"); + else + fprintf(stderr, "Failed to open audio device: %s\n", strerror(errno)); + return AD_ERR_GEN; + } - /* Sample rate, format, input mix settings, &c. are configured - * with ioctl(2) calls under Linux. It makes more sense to handle - * these at device open time and consider the state of the device - * to be fixed until closed. - */ + if (ioctl (dspFD, SNDCTL_DSP_SETFMT, &audioFormat) < 0){ + fprintf(stderr, "Audio ioctl(SETFMT 0x%x) failed: %s\n", audioFormat, strerror(errno)); + close (dspFD); + return AD_ERR_GEN; + } + if (audioFormat != AUDIO_FORMAT) { + fprintf(stderr, "Audio ioctl(SETFMT): 0x%x, expected: 0x%x\n", audioFormat, AUDIO_FORMAT); + close (dspFD); + return AD_ERR_GEN; + } - handle->recording = 1; - - /* rkm@cs: This doesn't actually do anything. How do we turn recording on/off? */ + if (ioctl (dspFD, SNDCTL_DSP_SPEED, &sampleRate) < 0) { + fprintf(stderr, "Audio ioctl(SPEED %d) failed %s\n", sampleRate, strerror(errno)); + close (dspFD); + return AD_ERR_GEN; + } + if (sampleRate != handle->sps) { + fprintf(stderr, "Audio ioctl(SPEED): %d, expected: %d\n", sampleRate, handle->sps); + close (dspFD); + return AD_ERR_GEN; + } + handle->dspFD = dspFD; + handle->recording = 1; + } return(0); } int32 ad_stop_rec (ad_rec_t *handle) { - if (handle->dspFD < 0) - return AD_ERR_NOT_OPEN; - - if (! handle->recording) - return AD_ERR_GEN; - - if (ioctl (handle->dspFD, SNDCTL_DSP_SYNC, 0) < 0) { - fprintf(stderr, "Audio ioctl(SYNC) failed: %s\n", strerror(errno)); - return AD_ERR_GEN; - } - - handle->recording = 0; - + if (handle->recording) { + close (handle->dspFD); + handle->dspFD = -1; + handle->recording = 0; + } return (0); } int32 ad_read (ad_rec_t *handle, int16 *buf, int32 max) { - int32 length; - - length = max * handle->bps; /* #samples -> #bytes */ + int32 length = max * handle->bps; /* #samples -> #bytes */ if ((length = read (handle->dspFD, buf, length)) > 0) { #if 0 @@ -292,7 +277,7 @@ } if (length < 0) { - fprintf(stderr, "Audio read error\n"); + perror("Audio read error"); return AD_ERR_GEN; } Property changes on: head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/spiralloops/files/patch-SpiralLoops.C =================================================================== --- head/audio/spiralloops/files/patch-SpiralLoops.C (revision 387020) +++ head/audio/spiralloops/files/patch-SpiralLoops.C (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- SpiralLoops.C.orig Thu Apr 19 13:48:11 2001 +++ SpiralLoops.C Thu May 23 02:16:36 2002 @@ -308,7 +308,7 @@ Run = (Sample *(*)()) dlsym(handle, "Run__Fv"); - if ((error = dlerror()) != NULL) + if ((error = (char *)dlerror()) != NULL) { cerr<<"Error linking to plugin:"<type(1); o->box(FL_UP_BOX); Property changes on: head/audio/spiralsynth/files/patch-GUI_MixerGUI.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C =================================================================== --- head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C (revision 387020) +++ head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C (revision 387021) @@ -1,27 +1,25 @@ -$FreeBSD$ - --- GUI/ScopeGUI.C.orig Sun Nov 26 15:52:39 2000 +++ GUI/ScopeGUI.C Mon Feb 9 12:14:00 2004 @@ -22,8 +22,8 @@ #include -ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l=0) : -Fl_Widget(x,y,w,h,l) +ScopeWidget::ScopeWidget(int x,int y,int w,int h,const char *l) : +Fl_Widget(x,y,w,h,0) { } @@ -53,8 +53,10 @@ void ScopeGUI::Display(short *data) if (!m_Bypass) m_Scope->redraw(); } -void ScopeGUI::CreateGUI(int xoff=0, int yoff=0, char *name) +void ScopeGUI::CreateGUI(int xoff, int yoff, char *name) { + xoff=0; + yoff=0; Fl_Group* o = GUIScopeGroup = new Fl_Group(xoff, yoff, 225, 110, name); o->type(1); o->box(FL_UP_BOX); Property changes on: head/audio/spiralsynth/files/patch-GUI_ScopeGUI.C ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx =================================================================== --- head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx (revision 387020) +++ head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx (revision 387021) @@ -1,23 +1,21 @@ -$FreeBSD$ - --- GUI/Widgets/Fl_Knob.cxx.orig Mon Sep 11 19:52:03 2000 +++ GUI/Widgets/Fl_Knob.cxx Mon Feb 9 13:22:13 2004 @@ -4,7 +4,7 @@ #include #include -Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l=0): Fl_Valuator(xx,yy,ww,hh,l) { +Fl_Knob::Fl_Knob(int xx,int yy,int ww,int hh,const char *l): Fl_Valuator(xx,yy,ww,hh,0) { a1 = 35; a2 = 325; _type = DOTLIN; @@ -40,7 +40,8 @@ unsigned char rr,gg,bb; int dam = damage(); if (dam & FL_DAMAGE_ALL) { - int col = parent()->color(); +// int col = parent()->color(); + int col = FL_BLACK; fl_color(col); fl_rectf(ox,oy,side,side); Fl::get_color((Fl_Color)col,rr,gg,bb); Property changes on: head/audio/spiralsynth/files/patch-GUI_Widgets_Fl_Knob.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h =================================================================== --- head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h (revision 387020) +++ head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- SpiralSound/RiffWav.h.orig Sun Nov 26 15:52:45 2000 +++ SpiralSound/RiffWav.h Mon Feb 9 12:05:58 2004 @@ -17,6 +17,7 @@ */ #include +using namespace std; #ifndef WAVFILE #define WAVFILE Property changes on: head/audio/spiralsynth/files/patch-SpiralSound_RiffWav.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h =================================================================== --- head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h (revision 387020) +++ head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- SpiralSound/SpiralInfo.h.orig Sun Nov 26 15:52:46 2000 +++ SpiralSound/SpiralInfo.h Mon Feb 9 13:31:38 2004 @@ -19,6 +19,7 @@ #include #include #include +using namespace std; #ifndef SpiralINFO #define SpiralINFO Property changes on: head/audio/spiralsynth/files/patch-SpiralSound_SpiralInfo.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/squeezeboxserver/files/patch-convert.conf =================================================================== --- head/audio/squeezeboxserver/files/patch-convert.conf (revision 387020) +++ head/audio/squeezeboxserver/files/patch-convert.conf (revision 387021) @@ -1,48 +1,45 @@ - -$FreeBSD$ - --- convert.conf.orig +++ convert.conf @@ -82,8 +82,8 @@ [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $BITRATE - - mov mp3 * * - # FRB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} - [mov123] $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --big-endian - - + # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} + [faad] -q -w -f 2 $FILE$ | [lame] -s 44100 --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ -r --little-endian - - alc mp3 * * # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} @@ -115,7 +115,7 @@ ape mp3 * * # FB:{BITRATE=-B %B}D:{RESAMPLE=--resample %D} - [mac] $FILE$ - -d | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - + [faad] -q -w -f 1 $FILE$ | [lame] --silent -q $QUALITY$ $RESAMPLE$ -v $BITRATE$ - - wvp mp3 * * # FB:{BITRATE=-B %B}T:{START=--skip=%t}U:{END=--until=%v}D:{RESAMPLE=--resample %D} @@ -173,9 +173,9 @@ # IF [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ -mov aif * * +mov wav * * # FR - [mov123] $FILE$ + [faad] -q -w -f 2 -b 1 -s 44100 $FILE$ wma wma * * - @@ -221,8 +221,8 @@ [faad] -q -w -f 1 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --ignore-chunk-sizes - mov flc * * - # FR - [mov123] $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian big --sign signed --channels 2 --bps 16 --sample-rate 44100 - + # F + [faad] -w -q -f 2 $FILE$ | [flac] -cs --totally-silent --compression-level-0 --endian little --sign signed --channels 2 --bps 16 --sample-rate 44100 - alc flc * * # F Property changes on: head/audio/squeezeboxserver/files/patch-convert.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/squeezeboxserver/files/patch-modules.conf =================================================================== --- head/audio/squeezeboxserver/files/patch-modules.conf (revision 387020) +++ head/audio/squeezeboxserver/files/patch-modules.conf (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- modules.conf.orig +++ modules.conf @@ -5,7 +5,7 @@ # [ ] AnyEvent 5.202 -Audio::Scan 0.87 0.87 +Audio::Scan 0.87 Cache::Cache 1.04 CGI::Cookie 1.27 Class::Data::Inheritable 0.04 Property changes on: head/audio/squeezeboxserver/files/patch-modules.conf ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/tempest_for_eliza/files/patch-configure =================================================================== --- head/audio/tempest_for_eliza/files/patch-configure (revision 387020) +++ head/audio/tempest_for_eliza/files/patch-configure (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- configure.orig Sat Dec 1 19:50:18 2001 +++ configure Wed Apr 17 16:00:28 2002 @@ -1055,7 +1055,7 @@ if test "$yyynooptimizing" = "yes"; then YYY_CXXFLAGS="$YYY_CXXFLAGS -O0" else - YYY_CXXFLAGS="$YYY_CXXFLAGS -O2" +# YYY_CXXFLAGS="$YYY_CXXFLAGS -O2" fi if test "$yyyprofiling" = "yes"; then Property changes on: head/audio/tempest_for_eliza/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/trommler/files/patch-gui.c =================================================================== --- head/audio/trommler/files/patch-gui.c (revision 387020) +++ head/audio/trommler/files/patch-gui.c (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- gui.c.orig Thu Feb 20 15:43:08 2003 +++ gui.c Thu Feb 20 15:43:21 2003 @@ -2261,7 +2261,6 @@ } else { - getcwd(Global.DrumDir,sizeof(Global.DrumDir)); strncat(Global.DrumDir,"/Drums",sizeof(Global.DrumDir) ); } Property changes on: head/audio/trommler/files/patch-gui.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c =================================================================== --- head/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c (revision 387020) +++ head/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c (revision 387021) @@ -1,12 +1,11 @@ -$FreeBSD$ --- ogg123/vorbis_comments.c.orig 2010-06-05 16:48:23.000000000 +0200 +++ ogg123/vorbis_comments.c 2010-06-05 16:55:21.000000000 +0200 @@ -72,7 +72,7 @@ char *lookup_comment_prettyprint (char * /* Use default formatting */ j = strcspn(comment, "="); - if (j) { + if (j != strlen(comment)) { *offset = j + 1; s = malloc(j + 2); if (s == NULL) { Property changes on: head/audio/vorbis-tools/files/patch-ogg123_vorbis_comments.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/vorbis-tools/files/patch-oggenc_lyrics.c =================================================================== --- head/audio/vorbis-tools/files/patch-oggenc_lyrics.c (revision 387020) +++ head/audio/vorbis-tools/files/patch-oggenc_lyrics.c (revision 387021) @@ -1,12 +1,11 @@ -$FreeBSD$ --- oggenc/lyrics.c.orig 2010-06-05 17:00:07.000000000 +0200 +++ oggenc/lyrics.c 2010-06-05 17:00:17.000000000 +0200 @@ -16,7 +16,7 @@ #endif #include -#include +#include #include #include Property changes on: head/audio/vorbis-tools/files/patch-oggenc_lyrics.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/vorbisgain/files/patch-configure =================================================================== --- head/audio/vorbisgain/files/patch-configure (revision 387020) +++ head/audio/vorbisgain/files/patch-configure (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- configure.orig Mon Oct 13 17:05:18 2003 +++ configure Mon Oct 13 17:05:36 2003 @@ -2450,7 +2450,7 @@ case $host in *) DEBUG="-g" - CFLAGS="-O" + CFLAGS="" PROFILE="-g -p" ;; esac @@ -2458,8 +2458,8 @@ case $host in *) DEBUG="-g -Wall -fsigned-char" - CFLAGS="-O2 -fsigned-char" - PROFILE="-O2 -g -pg -fsigned-char" + CFLAGS="-fsigned-char" + PROFILE="-g -pg -fsigned-char" ;; esac fi Property changes on: head/audio/vorbisgain/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-Imakefile =================================================================== --- head/audio/xcdplayer/files/patch-Imakefile (revision 387020) +++ head/audio/xcdplayer/files/patch-Imakefile (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- Imakefile.orig Tue Jan 12 19:59:29 1993 +++ Imakefile Mon Aug 25 00:47:20 2003 @@ -15,6 +15,11 @@ LOCAL_LIBRARIES = XawClientLibs LINTLIBS = -lXaw -lXt -lX11 + SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\ + cdrom_freebsd.c internals.c shuffle.c program.c leds.c debug.c + + OBJS = main.o top_setup.o logo_setup.o button_setup.o cdrom_callb.o\ + cdrom_freebsd.o internals.o shuffle.o program.o leds.o debug.o #ifdef SunArchitecture SRCS = main.c top_setup.c logo_setup.c button_setup.c cdrom_callb.c\ cdrom_sun.c internals.c shuffle.c program.c leds.c debug.c @@ -38,5 +43,4 @@ ComplexProgramTarget(xcdplayer) NormalProgramTarget(cdinfo, cdinfo.o,,,) NormalProgramTarget(cdgrab, cdgrab.o,,,) -NormalLintTarget(${SRCS}) InstallAppDefaults(XCdplayer) Property changes on: head/audio/xcdplayer/files/patch-Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-XCdplayer.ad =================================================================== --- head/audio/xcdplayer/files/patch-XCdplayer.ad (revision 387020) +++ head/audio/xcdplayer/files/patch-XCdplayer.ad (revision 387021) @@ -1,92 +1,89 @@ - -$FreeBSD$ - --- XCdplayer.ad.orig Tue Jan 12 19:59:41 1993 +++ XCdplayer.ad Mon Aug 25 00:38:35 2003 @@ -19,11 +19,10 @@ XCdplayer*logoLabel.foreground: Gold XCdplayer*logoLabel.background: Black -XCdplayer*icon*foreground: Gold XCdplayer*versionLabel.Font: -misc-fixed-medium-r-normal--8-* XCdplayer*versionLabel.foreground: Black -XCdplayer*versionLabel.width: 130 +XCdplayer*versionLabel.width: 110 XCdplayer*versionLabel.fromHoriz: logoLabel ! replayThreshold is the number of seconds that must be played before the @@ -33,16 +32,16 @@ ! scanSkipInterval is the number of seconds skipped at each fast-forward or ! reverse. -XCdplayer*scanSkipInterval: 3 +XCdplayer*scanSkipInterval: 5 ! pauseSkipInterval is the number of seconds skipped at each fast-forward or ! reverse if the CD is paused. -XCdplayer*pauseSkipInterval: 15 +XCdplayer*pauseSkipInterval: 20 ! scanPauseInterval is the number of seconds between each fast_forward or ! reverse while holding down the buttons. (Sun CDs have a dreadfully long ! start-up time for the audio to actually become audible, so "hearing the ! track" while scanning isn't very feasible.) -XCdplayer*scanPauseInterval: 0.062 +XCdplayer*scanPauseInterval: 0.25 ! pausePauseInterval does the same thing when the disc is paused. XCdplayer*pausePauseInterval: 0.5 @@ -56,7 +55,7 @@ XCdplayer*Viewport.allowHoriz: True XCdplayer*Viewport.useBottom: True XCdplayer*Viewport.forceBars: False -XCdplayer*Viewport.width: 188 +XCdplayer*Viewport.width: 160 XCdplayer*Viewport.height: 30 XCdplayer*Viewport*thickness: 8 XCdplayer*Viewport.resizable: False @@ -88,11 +87,11 @@ XCdplayer*Toggle.right: ChainLeft XCdplayer*Toggle.background: Ivory -XCdplayer*ledsLabel.horizDistance: 20 +XCdplayer*ledsLabel.horizDistance: 4 XCdplayer*ledsLabel.fromVert: versionLabel XCdplayer*ledsLabel.fromHoriz: logoLabel -XCdplayer*trackButton.horizDistance: 8 +XCdplayer*trackButton.horizDistance: 4 XCdplayer*trackButton.fromVert: versionLabel XCdplayer*trackButton.fromHoriz: ledsLabel XCdplayer*trackButton.borderWidth: 2 @@ -108,27 +107,22 @@ XCdplayer*timerButton.left: ChainRight XCdplayer*timerButton.right: ChainRight -XCdplayer*volumeScrollbar.horizDistance:8 +XCdplayer*volumeScrollbar.horizDistance:4 XCdplayer*volumeScrollbar.fromHoriz: logoLabel XCdplayer*volumeScrollbar.fromVert: trackButton XCdplayer*volumeScrollbar.orientation: horizontal -XCdplayer*volumeScrollbar.length: 120 +XCdplayer*volumeScrollbar.length: 93 XCdplayer*volumeScrollbar.right: ChainRight XCdplayer*volumeScrollbar.left: ChainRight XCdplayer*volumeScrollbar.background: green XCdplayer*volumeScrollbar.foreground: white -XCdplayer*volumeScrollbar.thumb: black +XCdplayer*volumeScrollbar.thumb: black XCdplayer*titleBarViewport.fromVert: volumeScrollbar -XCdplayer*titleBarViewport.forceBars: true XCdplayer*titleBar.borderwidth: 0 XCdplayer*titleBar.highlightThickness: 1 XCdplayer*titleBar.foreground: Red XCdplayer*titleBar.background: Ivory - -XCdplayer*titleDialog.Text.translations:#override\ - Return: done() - XCdplayer*buttonsForm.fromVert: logoForm XCdplayer*buttonsForm.borderWidth: 1 Property changes on: head/audio/xcdplayer/files/patch-XCdplayer.ad ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-button__setup.c =================================================================== --- head/audio/xcdplayer/files/patch-button__setup.c (revision 387020) +++ head/audio/xcdplayer/files/patch-button__setup.c (revision 387021) @@ -1,66 +1,65 @@ -$FreeBSD$ $NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ad,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- button_setup.c.orig Tue Jan 12 19:59:47 1993 +++ button_setup.c Mon Aug 25 00:38:35 2003 @@ -20,6 +20,9 @@ # include # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@ -44,6 +47,23 @@ # include "ff.xbm" # include "pgm.xbm" +void title_dialog_setup(); +static void play_button_setup(); +static void stop_button_setup(); +static void pause_button_setup(); +static void prev_button_setup(); +static void next_button_setup(); +static void eject_button_setup(); +#ifdef sgi +void audio_button_setup(); +#endif +static void quit_button_setup(); +static void cycle_button_setup(); +static void shuffle_button_setup(); +static void rew_button_setup(); +static void ff_button_setup(); +static void pgm_button_setup(); +void buttons_reset(); static Widget buttons_form_widget; static Widget play_button_widget; @@ -71,25 +91,6 @@ Widget parent_widget; { Arg args[1]; - - extern void title_dialog_setup(); - extern void play_button_setup(); - extern void stop_button_setup(); - extern void pause_button_setup(); - extern void prev_button_setup(); - extern void next_button_setup(); - extern void eject_button_setup(); -#ifdef sgi - extern void audio_button_setup(); -#endif - extern void quit_button_setup(); - extern void cycle_button_setup(); - extern void shuffle_button_setup(); - extern void rew_button_setup(); - extern void ff_button_setup(); - extern void pgm_button_setup(); - extern void buttons_reset(); - buttons_form_widget = XtCreateManagedWidget("buttonsForm", formWidgetClass, Property changes on: head/audio/xcdplayer/files/patch-button__setup.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-cdrom__callb.c =================================================================== --- head/audio/xcdplayer/files/patch-cdrom__callb.c (revision 387020) +++ head/audio/xcdplayer/files/patch-cdrom__callb.c (revision 387021) @@ -1,34 +1,33 @@ -$FreeBSD$ $NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ae,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- cdrom_callb.c.orig Tue Jan 12 19:59:48 1993 +++ cdrom_callb.c Mon Aug 25 00:38:35 2003 @@ -22,6 +22,9 @@ # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@ -29,6 +32,8 @@ # include "cdrom_sgi.h" #endif +extern AppData app_data; + void cdrom_new_disc(); /* @@ -287,7 +292,7 @@ * if playing less than replayThreshold seconds, back up to * previous track; otherwise start at beginning of current track: */ - if (cdi.duration < replayThreshold) + if (cdi.duration < app_data.replayThreshold) { if ((cdi.program != NULL) && (cdi.state & CDROM_STATE_PLAY) && Property changes on: head/audio/xcdplayer/files/patch-cdrom__callb.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-cdrom__globs.h =================================================================== --- head/audio/xcdplayer/files/patch-cdrom__globs.h (revision 387020) +++ head/audio/xcdplayer/files/patch-cdrom__globs.h (revision 387021) @@ -1,30 +1,27 @@ - -$FreeBSD$ - --- cdrom_globs.h.orig Tue Jan 12 19:59:31 1993 +++ cdrom_globs.h Mon Aug 25 00:38:35 2003 @@ -99,22 +99,10 @@ extern int cdrom_open(); extern int cdrom_init(); - -extern Boolean display_timer; - extern XtAppContext appc; -extern char *file; -extern char *device; +#include "app.h" + extern char info_filename[]; extern char *disc_title; extern unsigned int timer_fsecs; - - -extern float volbase; -extern float volpcent; -extern int replayThreshold; -extern float scanPauseInterval; -extern int scanSkipInterval; -extern float pausePauseInterval; -extern int pauseSkipInterval; Property changes on: head/audio/xcdplayer/files/patch-cdrom__globs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-debug.c =================================================================== --- head/audio/xcdplayer/files/patch-debug.c (revision 387020) +++ head/audio/xcdplayer/files/patch-debug.c (revision 387021) @@ -1,42 +1,39 @@ - -$FreeBSD$ - --- debug.c.orig Tue Jan 12 19:59:35 1993 +++ debug.c Mon Aug 25 01:36:43 2003 @@ -15,28 +15,29 @@ # include -# include +# include # include # include "debug.h" +#include "app.h" + +extern AppData app_data; + /* VARARGS */ void -debug_printf(va_alist) - va_dcl +debug_printf(int flag, char *fmt, ...) { va_list args; - char *fmt; - va_start(args); + va_start(args, fmt); /* * first arg is whether or not to print. */ - if ((va_arg(args, int) == 0) || (debug == False)) + if ((flag == 0) || (app_data.debug == False)) return; - fmt = va_arg(args, char *); vfprintf(stdout, fmt, args); fflush(stdout); Property changes on: head/audio/xcdplayer/files/patch-debug.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-internals.c =================================================================== --- head/audio/xcdplayer/files/patch-internals.c (revision 387020) +++ head/audio/xcdplayer/files/patch-internals.c (revision 387021) @@ -1,212 +1,211 @@ -$FreeBSD$ $NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ah,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- internals.c.orig Tue Jan 12 19:59:45 1993 +++ internals.c Wed May 30 19:20:48 2007 @@ -22,6 +22,9 @@ # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@ -29,13 +32,14 @@ # include "cdrom_sgi.h" #endif - +static void scan_update(); static XtIntervalId ivid = -1; static XtIntervalId scanivid = -1; static XtIntervalId stativid = -1; static unsigned int timer_mod = 1000 / TIMER_PERIOD; unsigned int timer_fsecs; +extern AppData app_data; int cdrom_get_curtime() { @@ -46,7 +50,7 @@ if (cdrom_open() == -1) { debug_printf(1, "cdrom_get_curtime: error from cdrom_open\n"); - return; + return 0; } switch (cdrom_status()) { @@ -54,7 +58,7 @@ case CDROM_PLAYING: if (cdrom_get_curmsf(&curmsf) == -1) { debug_printf(1, "get_curtime: error reading location\n"); - return; + return 0; } if (((curtrack = cdrom_get_curtrack()) == -1) || @@ -76,6 +80,7 @@ } } +static void update_track(); /* * we poll the cd-rom drive every TIMER_PERIOD milliseconds to see where @@ -83,7 +88,6 @@ */ void cdrom_timer_on() { - static void update_track(); if (cdi.state & CDROM_STATE_PLAY) ivid = XtAppAddTimeOut(appc, TIMER_PERIOD, update_track, NULL); @@ -170,7 +174,6 @@ struct msf track_start; struct msf start_addr, end_addr; int curtrack; - extern void scan_update(); if (cdrom_get_curmsf(&start_addr) == -1) { debug_printf(1, "rew: error reading location\n"); @@ -196,11 +199,11 @@ if (((cdi.state & CDROM_STATE_PLAY) && ((track_start.minute * 60) + track_start.second) >= ((start_addr.minute * 60) + start_addr.second - - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && ((track_start.minute * 60) + track_start.second) >= ((start_addr.minute * 60) + start_addr.second - - pauseSkipInterval))) + app_data.pauseSkipInterval))) { start_addr = track_start; start_addr.second++; /* guarantee we never back up too far */ @@ -208,9 +211,9 @@ else { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second -= pauseSkipInterval; + start_addr.second -= app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second -= scanSkipInterval; + start_addr.second -= app_data.scanSkipInterval; } if ((char) start_addr.second < 0) { @@ -223,9 +226,9 @@ else /* normal case */ { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second -= pauseSkipInterval; + start_addr.second -= app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second -= scanSkipInterval; + start_addr.second -= app_data.scanSkipInterval; } if ((char) start_addr.second < 0) { @@ -274,7 +277,7 @@ { if (scanivid == -1) scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); cdi.state &= ~CDROM_STATE_PAUSE; /* allow timer to change */ @@ -304,7 +307,6 @@ struct msf start_addr, end_addr, next_start; char t; int curtrack; - extern void scan_update(); if (cdrom_get_curmsf(&start_addr) == -1) { debug_printf(1, "ff: error reading location\n"); @@ -332,11 +334,11 @@ if (((cdi.state & CDROM_STATE_PLAY) && ((next_start.minute * 60) + next_start.second) <= ((start_addr.minute * 60) + start_addr.second + - scanSkipInterval)) || + app_data.scanSkipInterval)) || ((cdi.state & CDROM_STATE_PAUSE) && ((next_start.minute * 60) + next_start.second) <= ((start_addr.minute * 60) + start_addr.second + - pauseSkipInterval))) + app_data.pauseSkipInterval))) { /* start at end of current track */ @@ -346,9 +348,9 @@ else { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second += pauseSkipInterval; + start_addr.second += app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second += scanSkipInterval; + start_addr.second += app_data.scanSkipInterval; } if (start_addr.second >= 60) { @@ -360,9 +362,9 @@ else { if (cdi.state & CDROM_STATE_PAUSE) { - start_addr.second += pauseSkipInterval; + start_addr.second += app_data.pauseSkipInterval; } else if (cdi.state & CDROM_STATE_PLAY) { - start_addr.second += scanSkipInterval; + start_addr.second += app_data.scanSkipInterval; } if (start_addr.second >= 60) { @@ -413,7 +415,7 @@ { if (scanivid == -1) scanivid = XtAppAddTimeOut(appc, - (int)(pausePauseInterval * 1000.0), + (int)(app_data.pausePauseInterval * 1000.0), scan_update, NULL); cdi.state &= ~CDROM_STATE_PAUSE; /* allow timer to change */ @@ -557,7 +559,7 @@ cdi.state &= ~CDROM_STATE_STOP; } ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); } else @@ -574,7 +576,7 @@ } ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), scan_update, NULL); } else if (scanivid != -1) { @@ -662,7 +664,7 @@ cdi.state &= ~CDROM_STATE_STOP; } ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); } else @@ -679,7 +681,7 @@ } ivid = XtAppAddTimeOut(appc, - (int)(scanPauseInterval * 1000.0), + (int)(app_data.scanPauseInterval * 1000.0), update_track, NULL); } else Property changes on: head/audio/xcdplayer/files/patch-internals.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-logo__setup.c =================================================================== --- head/audio/xcdplayer/files/patch-logo__setup.c (revision 387020) +++ head/audio/xcdplayer/files/patch-logo__setup.c (revision 387021) @@ -1,105 +1,104 @@ -$FreeBSD$ $NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ai,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- logo_setup.c.orig Tue Jan 12 19:59:46 1993 +++ logo_setup.c Mon Aug 25 00:38:35 2003 @@ -28,6 +28,9 @@ # include # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@ -43,6 +46,8 @@ void Done(); +extern AppData app_data; + static Widget track_button_widget; static Widget timer_button_widget; static Widget volume_scroll_widget; @@ -55,19 +60,19 @@ Widget title_done_widget; static int vol; +extern void leds_label_setup(); +static void cb_track_button(); +static void cb_timer_button(); +static void volume_jump_proc(); +static void volume_scroll_proc(); +static void popup_title_dialog(); +static void popdown_title_dialog(); + void logo_setup(parent_widget) Widget parent_widget; { - extern void leds_label_setup(); - extern void cb_track_button(); - extern void cb_timer_button(); - extern void volume_jump_proc(); - extern void volume_scroll_proc(); - extern void popup_title_dialog(); - extern void popdown_title_dialog(); - Widget version_label_widget; char version_string[80]; @@ -126,15 +131,16 @@ track_button_update(); - if (display_timer == True) + if (app_data.display_timer == True) { timer_button_widget = XtCreateManagedWidget("timerButton", toggleWidgetClass, logo_form_widget, (ArgList) NULL, 0); - XtAddCallback(timer_button_widget, XtNcallback, cb_timer_button, 0); - - timer_button_update(); + XtAddCallback(timer_button_widget, XtNcallback, + cb_timer_button, 0); + timer_button_update(); + } thumb_pixmap = XCreateBitmapFromData(XtDisplay(logo_form_widget), rootwin(logo_form_widget), thumb_bits, @@ -171,10 +177,10 @@ #ifdef sgi if ((vol = cdrom_get_volume()) == 0) { - vol = (int) ((MAXVOL - volbase) * 0.75) + volbase; + vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase; } #else - vol = (int) ((MAXVOL - volbase) * 0.75) + volbase; + vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase; #endif cdrom_volume(vol, vol); #ifdef sgi @@ -356,7 +362,7 @@ Arg args[1]; Boolean state; - if (display_timer == False) + if (app_data.display_timer == False) return; if ((cdi.state & CDROM_STATE_PAUSE) == 0) @@ -413,7 +419,7 @@ vol = PCT2VAL(*(float *)percent); #else vol = (*(float *) percent) * MAXVOL; - vol = (vol * volpcent) + volbase; + vol = (vol * app_data.volpcent) + app_data.volbase; #endif if (vol > MAXVOL) Property changes on: head/audio/xcdplayer/files/patch-logo__setup.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-main.c =================================================================== --- head/audio/xcdplayer/files/patch-main.c (revision 387020) +++ head/audio/xcdplayer/files/patch-main.c (revision 387021) @@ -1,32 +1,29 @@ - -$FreeBSD$ - --- main.c.orig Tue Jan 12 19:59:36 1993 +++ main.c Wed May 30 19:19:53 2007 @@ -23,12 +23,15 @@ Widget top_form; -void +extern AppData app_data; + +static void chk_debug(); + +int main(argc, argv) int argc; char **argv; { - static void chk_debug(); chk_debug(argc, argv); @@ -66,7 +69,7 @@ /* ugly hack */ for (i = 1; i < argc; i++) { if (strcmp(argv[i], "-debug") == 0) { - debug = True; + app_data.debug = True; break; } } Property changes on: head/audio/xcdplayer/files/patch-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-program.c =================================================================== --- head/audio/xcdplayer/files/patch-program.c (revision 387020) +++ head/audio/xcdplayer/files/patch-program.c (revision 387021) @@ -1,53 +1,52 @@ -$FreeBSD$ $NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ak,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- program.c.orig Tue Jan 12 19:59:49 1993 +++ program.c Mon Aug 25 00:38:35 2003 @@ -27,10 +27,13 @@ # include # include -# include +# include # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@ -52,6 +55,15 @@ static Boolean adding_to_new_track = False; static struct prognode *current_node = NULL; +static void cb_move_program_ptr(); +static void cb_clear_program(); +static void cb_cancel_program(); +static void cb_save_program(); +static void cb_trackbuttons(); +static void cb_add_10(); +static void cb_new_track(); +static void cb_program_all(); + void program_form_setup (parent_widget) Widget parent_widget; @@ -66,15 +78,6 @@ Widget cancel_button; Widget save_button; Widget all_button; - - extern void cb_move_program_ptr(); - extern void cb_clear_program(); - extern void cb_cancel_program(); - extern void cb_save_program(); - extern void cb_trackbuttons(); - extern void cb_add_10(); - extern void cb_new_track(); - extern void cb_program_all(); /* * create program form as a non-managed widget, because this Property changes on: head/audio/xcdplayer/files/patch-program.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-shuffle.c =================================================================== --- head/audio/xcdplayer/files/patch-shuffle.c (revision 387020) +++ head/audio/xcdplayer/files/patch-shuffle.c (revision 387021) @@ -1,34 +1,33 @@ -$FreeBSD$ $NetBSD: pkgsrc/audio/xcdplayer/patches/patch-al,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- shuffle.c.orig Tue Jan 12 19:59:38 1993 +++ shuffle.c Mon Aug 25 00:38:35 2003 @@ -18,6 +18,9 @@ # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@ -29,6 +32,8 @@ static unsigned char *random_tracks; +extern AppData app_data; + void shuffle_setup() { extern char *malloc(); @@ -97,7 +102,7 @@ random_tracks[i] = try; } - if (debug == True) { + if (app_data.debug == True) { debug_printf(1, "shuffle_setup: "); for (i = 0; i < cdi.ntracks; i++) debug_printf(1, "%d ", random_tracks[i]); Property changes on: head/audio/xcdplayer/files/patch-shuffle.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xcdplayer/files/patch-top__setup.c =================================================================== --- head/audio/xcdplayer/files/patch-top__setup.c (revision 387020) +++ head/audio/xcdplayer/files/patch-top__setup.c (revision 387021) @@ -1,119 +1,116 @@ - -$FreeBSD$ - --- top_setup.c.orig Tue Jan 12 19:59:40 1993 +++ top_setup.c Mon Aug 25 00:38:35 2003 @@ -26,18 +26,8 @@ # include "logo.xbm" XtAppContext appc; -char *file; -char *device; -Boolean debug = False; -Boolean display_timer = True; -float volbase = 187.0; -float volpcent = .267; -int replayThreshold = 4; -int pauseSkipInterval = 15; -int scanSkipInterval = 1; -float scanPauseInterval = .062; -float pausePauseInterval = .500; -char *cdInfoDir = NULL; + +AppData app_data; extern char *getenv(); @@ -55,36 +45,36 @@ }; static XtResource resources[] = { - { "file", "File", XtRString, sizeof(String), (Cardinal) &file, + { "file", "File", XtRString, sizeof(String), XtOffsetOf(AppData,file), XtRString, (caddr_t) NULL }, - { "device", "Device", XtRString, sizeof(String), (Cardinal) &device, + { "device", "Device", XtRString, sizeof(String), XtOffsetOf(AppData,device), XtRString, (caddr_t) NULL }, - { "debug", "Debug", XtRBoolean, sizeof(Boolean), (Cardinal) &debug, - XtRBoolean, (caddr_t) &debug }, + { "debug", "Debug", XtRBoolean, sizeof(Boolean), XtOffsetOf(AppData,debug), + XtRBoolean, &app_data.debug }, { "displayTimer", "DisplayTimer", XtRBoolean, sizeof(Boolean), - (Cardinal) &display_timer, XtRBoolean, - (caddr_t) &display_timer }, + XtOffsetOf(AppData,display_timer), XtRBoolean, + &app_data.display_timer }, { "volBase", "VolBase", XtRFloat, sizeof(float), - (Cardinal) &volbase, XtRFloat, (caddr_t) &volbase }, + XtOffsetOf(AppData,volbase), XtRFloat, &app_data.volbase }, { "volPcent", "VolPcent", XtRFloat, sizeof(float), - (Cardinal) &volpcent, XtRFloat, (caddr_t) &volpcent }, + XtOffsetOf(AppData,volpcent), XtRFloat, &app_data.volpcent }, { "replayThreshold", "replayThreshold", XtRInt, sizeof(int), - (Cardinal) &replayThreshold, XtRInt, - (caddr_t) &replayThreshold }, + XtOffsetOf(AppData,replayThreshold), XtRInt, + &app_data.replayThreshold }, { "scanSkipInterval", "scanSkipInterval", XtRInt, sizeof(int), - (Cardinal) &scanSkipInterval, XtRInt, - (caddr_t) &scanSkipInterval }, + XtOffsetOf(AppData,scanSkipInterval), XtRInt, + &app_data.scanSkipInterval }, { "scanPauseInterval", "scanPauseInterval", XtRFloat, sizeof(float), - (Cardinal) &scanPauseInterval, XtRFloat, - (caddr_t) &scanPauseInterval }, + XtOffsetOf(AppData,scanPauseInterval), XtRFloat, + &app_data.scanPauseInterval }, { "pauseSkipInterval", "pauseSkipInterval", XtRInt, sizeof(int), - (Cardinal) &pauseSkipInterval, XtRInt, - (caddr_t) &pauseSkipInterval }, + XtOffsetOf(AppData,pauseSkipInterval), XtRInt, + &app_data.pauseSkipInterval }, { "pausePauseInterval", "pausePauseInterval", XtRFloat, sizeof(float), - (Cardinal) &pausePauseInterval, XtRFloat, - (caddr_t) &pausePauseInterval }, + XtOffsetOf(AppData,pausePauseInterval), XtRFloat, + &app_data.scanPauseInterval }, { "cdInfoDir", "cdInfoDir", XtRString, sizeof(String), - (Cardinal) &cdInfoDir, XtRString, (caddr_t) NULL }, + XtOffsetOf(AppData,cdInfoDir), XtRString, (caddr_t) NULL }, }; Widget @@ -98,6 +88,20 @@ Arg arg; char *s; + /* + * set default values + */ + + app_data.debug = False; + app_data.display_timer = True; + app_data.volbase = 187.0; + app_data.volpcent = 0.267; + app_data.replayThreshold = 4; + app_data.pauseSkipInterval = 15; + app_data.scanSkipInterval = 1; + app_data.scanPauseInterval = 0.062; + app_data.pausePauseInterval = 0.500; + XtToolkitInitialize(); appc = XtCreateApplicationContext(); @@ -123,12 +127,12 @@ XtSetValues(top_shell, &arg, 1); - (void) XtGetApplicationResources(top_shell, (caddr_t) NULL, + (void) XtGetApplicationResources(top_shell, (caddr_t) &app_data, resources, XtNumber(resources), (ArgList) NULL, 0); - if ((cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL)) - cdInfoDir = strdup(s); + if ((app_data.cdInfoDir == NULL) && ((s=getenv("XCDINFODIR")) != NULL)) + app_data.cdInfoDir = strdup(s); top_form_widget = XtCreateWidget("mainForm", formWidgetClass, top_shell, Property changes on: head/audio/xcdplayer/files/patch-top__setup.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xmixer/files/patch-scf.c =================================================================== --- head/audio/xmixer/files/patch-scf.c (revision 387020) +++ head/audio/xmixer/files/patch-scf.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- scf.c.orig Mon Sep 6 11:02:44 2004 +++ scf.c Mon Sep 6 11:03:05 2004 @@ -1009,7 +1009,7 @@ if (*(p+1) == '\0') break; } - STOP: + STOP:; } else { /* it's a int */ Property changes on: head/audio/xmixer/files/patch-scf.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/audio/xmms-xf86audio/files/patch-xf86audio.c =================================================================== --- head/audio/xmms-xf86audio/files/patch-xf86audio.c (revision 387020) +++ head/audio/xmms-xf86audio/files/patch-xf86audio.c (revision 387021) @@ -1,139 +1,136 @@ - -$FreeBSD$ - --- xf86audio.c.orig +++ xf86audio.c @@ -110,6 +110,7 @@ static void plugin_about() { static GtkWidget *about; + const gchar *s1, *s2; gchar *s; if (about != NULL) { @@ -117,8 +118,8 @@ return; } - const gchar *s1 = _("XF86Audio Keys Control Plugin"); - const gchar *s2 = _( + s1 = _("XF86Audio Keys Control Plugin"); + s2 = _( "This plugin enables the XF86Audio keysyms produced by\n" "multimedia keyboards to control XMMS playback.\n\n" "Note that this plugin will not set up the initial keysym\n" @@ -145,6 +146,11 @@ static void plugin_configure() { + GtkWidget *vbox, *playaction_frame, *pa_hbox, *pa_vbox, *pa_label, + *pa_pause, *pa_restart, *pa_label2, *volume_frame, + *v_vbox, *v_hbox, *vol_label, *vol_spin, *button_hbox, + *ok, *cancel, *apply; + GtkObject *vol_adj; if (config_window) { gdk_window_raise(config_window->window); @@ -163,29 +169,29 @@ gtk_signal_connect(GTK_OBJECT(config_window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &config_window); gtk_container_border_width(GTK_CONTAINER(config_window), 10); - GtkWidget *vbox = gtk_vbox_new(FALSE, 5); + vbox = gtk_vbox_new(FALSE, 5); gtk_container_add(GTK_CONTAINER(config_window), vbox); /* "On Play" frame */ - GtkWidget *playaction_frame = gtk_frame_new(_("On Play")); + playaction_frame = gtk_frame_new(_("On Play")); gtk_box_pack_start(GTK_BOX(vbox), playaction_frame, TRUE, TRUE, 0); - GtkWidget *pa_hbox = gtk_hbox_new(FALSE, 4); + pa_hbox = gtk_hbox_new(FALSE, 4); gtk_container_add(GTK_CONTAINER(playaction_frame), pa_hbox); - GtkWidget *pa_vbox = gtk_vbox_new(FALSE, 4); + pa_vbox = gtk_vbox_new(FALSE, 4); gtk_box_pack_start(GTK_BOX(pa_hbox), pa_vbox, TRUE, TRUE, 4); - GtkWidget *pa_label = gtk_label_new( + pa_label = gtk_label_new( _("If the Play key is pressed while a song is" " already playing:") ); gtk_misc_set_alignment(GTK_MISC(pa_label), 0.0, 0.5); gtk_box_pack_start(GTK_BOX(pa_vbox), pa_label, TRUE, TRUE, 2); - GtkWidget *pa_pause = gtk_radio_button_new_with_label(NULL, + pa_pause = gtk_radio_button_new_with_label(NULL, _("Pause playback")); - GtkWidget *pa_restart = gtk_radio_button_new_with_label_from_widget( + pa_restart = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(pa_pause), _("Restart the current song")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( @@ -198,7 +204,7 @@ gtk_box_pack_start(GTK_BOX(pa_vbox), pa_pause, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(pa_vbox), pa_restart, FALSE, FALSE, 0); - GtkWidget *pa_label2 = gtk_label_new( + pa_label2 = gtk_label_new( _("Regardless of this setting, the current song can be restarted" "\nby holding down Shift while pressing the Play key.") ); @@ -217,22 +223,22 @@ /* Volume change frame */ - GtkWidget *volume_frame = gtk_frame_new(_("On Volume Change")); + volume_frame = gtk_frame_new(_("On Volume Change")); gtk_box_pack_start(GTK_BOX(vbox), volume_frame, TRUE, TRUE, 0); - GtkWidget *v_vbox = gtk_vbox_new(FALSE, 0); - GtkWidget *v_hbox = gtk_hbox_new(FALSE, 4); + v_vbox = gtk_vbox_new(FALSE, 0); + v_hbox = gtk_hbox_new(FALSE, 4); gtk_container_add(GTK_CONTAINER(volume_frame), v_vbox); gtk_box_pack_start(GTK_BOX(v_vbox), v_hbox, TRUE, TRUE, 4); - GtkWidget *vol_label = gtk_label_new( + vol_label = gtk_label_new( _("Volume change increment (%): ") ); gtk_box_pack_start(GTK_BOX(v_hbox), vol_label, FALSE, FALSE, 4); - GtkObject *vol_adj = gtk_adjustment_new( + vol_adj = gtk_adjustment_new( cf_active.volume_increment, 0, 100, 1, 10, 10); - GtkWidget *vol_spin = gtk_spin_button_new(GTK_ADJUSTMENT(vol_adj), + vol_spin = gtk_spin_button_new(GTK_ADJUSTMENT(vol_adj), 1.0, 0); gtk_signal_connect(GTK_OBJECT(vol_spin), "changed", GTK_SIGNAL_FUNC(on_volume_increment_change), NULL); @@ -246,23 +252,23 @@ /* Button box at bottom of window */ - GtkWidget *button_hbox = gtk_hbutton_box_new(); + button_hbox = gtk_hbutton_box_new(); gtk_button_box_set_layout(GTK_BUTTON_BOX(button_hbox), GTK_BUTTONBOX_END); gtk_button_box_set_spacing(GTK_BUTTON_BOX(button_hbox), 5); gtk_box_pack_end(GTK_BOX(vbox), button_hbox, FALSE, FALSE, 0); - GtkWidget *ok = gtk_button_new_with_label("OK"); + ok = gtk_button_new_with_label("OK"); GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(ok), "clicked", on_config_ok, NULL); gtk_box_pack_start(GTK_BOX(button_hbox), ok, TRUE, TRUE, 0); gtk_widget_grab_default(ok); - GtkWidget *cancel = gtk_button_new_with_label(_("Cancel")); + cancel = gtk_button_new_with_label(_("Cancel")); GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(cancel), "clicked", on_config_cancel, NULL); gtk_box_pack_start(GTK_BOX(button_hbox), cancel, TRUE, TRUE, 0); - GtkWidget *apply = gtk_button_new_with_label(_("Apply")); + apply = gtk_button_new_with_label(_("Apply")); GTK_WIDGET_SET_FLAGS(apply, GTK_CAN_DEFAULT); gtk_signal_connect(GTK_OBJECT(apply), "clicked", on_config_apply, NULL); gtk_box_pack_start(GTK_BOX(button_hbox), apply, TRUE, TRUE, 0); Property changes on: head/audio/xmms-xf86audio/files/patch-xf86audio.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/babel/files/patch-convert.c =================================================================== --- head/biology/babel/files/patch-convert.c (revision 387020) +++ head/biology/babel/files/patch-convert.c (revision 387021) @@ -1,22 +1,19 @@ - -$FreeBSD$ - --- convert.c.orig Sun Nov 18 16:44:25 2001 +++ convert.c Sun Nov 18 16:44:54 2001 @@ -28,6 +28,7 @@ static warning wstr; static char *program_name; +extern char *__progname; int use_title = FALSE; #ifdef MSDOS @@ -47,7 +48,7 @@ #endif babel_init(); - program_name = argv[0]; + program_name = __progname; if (argc == 1) { usage(); Property changes on: head/biology/babel/files/patch-convert.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/babel/files/patch-menus.c =================================================================== --- head/biology/babel/files/patch-menus.c (revision 387020) +++ head/biology/babel/files/patch-menus.c (revision 387021) @@ -1,40 +1,37 @@ - -$FreeBSD$ - --- menus.c.orig Tue Jan 21 16:52:36 1997 +++ menus.c Sun Nov 18 16:43:32 2001 @@ -63,9 +63,9 @@ } } printf("Input file name : "); - gets(InfileName); + fgets(InfileName, BUFF_SIZE, stdin); printf("Keywords : "); - gets(InputKeywords); + fgets(InputKeywords, BUFF_SIZE, stdin); if (strlen(InputKeywords) < 1) strcpy(InputKeywords,"KEYWORDS GO HERE"); @@ -108,11 +108,11 @@ } } printf("Output file name : "); - gets(OutfileName); + fgets(OutfileName, BUFF_SIZE, stdin); if (has_keywords) { printf("Keywords : "); - gets(OutputKeywords); + fgets(OutputKeywords, BUFF_SIZE, stdin); if (strlen(OutputKeywords) < 1) strcpy(OutputKeywords,"KEYWORDS GO HERE"); } @@ -167,7 +167,7 @@ while (done == FALSE) { printf("Choice : "); - gets(choice_string); + fgets(choice_string, sizeof(choice_string), stdin); for (i = 0; i < (int) strlen(choice_string); i++) { if (!isdigit(choice_string[i])) Property changes on: head/biology/babel/files/patch-menus.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/babel/files/patch-wrmm3.c =================================================================== --- head/biology/babel/files/patch-wrmm3.c (revision 387020) +++ head/biology/babel/files/patch-wrmm3.c (revision 387021) @@ -1,92 +1,89 @@ - -$FreeBSD$ - --- wrmm3.c.orig Tue Jan 21 09:53:02 1997 +++ wrmm3.c Wed Sep 4 16:00:23 2002 @@ -33,14 +33,17 @@ int METHOD; /* 0 no cojugated pi system, 1 if conjugated pi system */ int N; /* #of atoms */ int IPRINT; /* Controls amount of printout */ + int MDERIV; /* Optimization termination; 0 for geometry, 1 for energy */ int NSTR; /* Restricted motion data */ int INIT; /* Minimize energy */ int NCONST; /* Read in new constants ? */ double TMAX; /* Max time */ + int KFIXTYP; /* Atom type check; 0 for yes, 1 for no */ int NCON; /* Number of connected atoms */ int NATTACH; /*Number of attached atoms */ - double DEL; /* Termianation of geometry optimization */ + double DEL; /* Termination of geometry optimization, convergence limit */ + int ISPEED; /* Speed up minimization of crude structures, 0 is no, 1 is yes */ int NSYMM;/* Number of symmetry matrices */ int NX; /* Number of coordiante calcualtions or replacement cards */ int NROT; /* Reorient */ @@ -62,17 +65,20 @@ strcpy(ID,OutfileName); /*------ CARD 1 -------*/ - METHOD = 1; + METHOD = 0; N = Atoms; IPRINT = 3; if (isdigit(OutputKeywords[0])) IPRINT = atoi(OutputKeywords); + MDERIV = 1; NSTR = 0; INIT = 0; - NCONST = 0; + NCONST = 1; TMAX = 999.0; /*------ CARD 2 -------*/ + KFIXTYP = 0; DEL = 0.00008; + ISPEED = 0; NCON = connections; NATTACH = attachments; NSYMM = 0; @@ -86,22 +92,23 @@ NDRIVE = 0; - fprintf(file1,"%-60s%d%4d %d %d %d %d%-5.0f\n", + fprintf(file1,"%-60s%1d%4d%2d%1d%2d%2d%3d%5.0f\n", ID, METHOD, N, IPRINT, + MDERIV, NSTR, INIT, NCONST, TMAX); - fprintf(file1,"%1d%4d%5s%4.5f%8s%5d%5d%5d%5d%5d%5d%5d%5d%10d%5d\n", - 0, + fprintf(file1,"%1d%4d%5s%10.7f%5d%5d%5d%5d%5d%5d%5d%5d%5d%5s%5d%5d\n", + KFIXTYP, NCON, "", DEL, - "", + ISPEED, NATTACH, NSYMM, NX, @@ -110,6 +117,7 @@ NDC, NCALC, HFORM, + "", MVDW, NDRIVE); @@ -145,7 +153,7 @@ get_output_type(i,"MM2",Type(i),temp_type,all_caps); type_name = atoi(temp_type); type_name = update_mm2_types(mol,i,type_name); - fprintf(file1," %8.5f %8.5f %8.5f%5d(%3d)\n", + fprintf(file1,"%10.5f%10.5f%10.5f%5d(%3d)\n", X(i), Y(i), Z(i), Property changes on: head/biology/babel/files/patch-wrmm3.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/fluctuate/files/patch-Makefile =================================================================== --- head/biology/fluctuate/files/patch-Makefile (revision 387020) +++ head/biology/fluctuate/files/patch-Makefile (revision 387021) @@ -1,43 +1,40 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -1,30 +1,28 @@ LIBS = -lm BINDIR = ./bin -CFLAGS = -O2 -funroll-loops -CC = gcc $(CFLAGS) fluctuate : fluctuate.o fluc_modellike.o getdata.o plot.o wrap.o \ coal_modellike.o - $(CC) fluctuate.o fluc_modellike.o getdata.o plot.o wrap.o \ + $(CC) $(CFLAGS) fluctuate.o fluc_modellike.o getdata.o plot.o wrap.o \ coal_modellike.o $(LIBS) -o fluctuate clean : rm fluctuate.o fluc_modellike.o coal_modellike.o getdata.o plot.o wrap.o fluctuate.o : fluctuate.c - $(CC) -c fluctuate.c + $(CC) $(CFLAGS) -c fluctuate.c fluc_modellike.o : fluc_modellike.c - $(CC) -c fluc_modellike.c + $(CC) $(CFLAGS) -c fluc_modellike.c coal_modellike.o : coal_modellike.c - $(CC) -c coal_modellike.c + $(CC) $(CFLAGS) -c coal_modellike.c getdata.o : getdata.c - $(CC) -c getdata.c + $(CC) $(CFLAGS) -c getdata.c plot.o : plot.c - $(CC) -c plot.c + $(CC) $(CFLAGS) -c plot.c wrap.o : wrap.c - $(CC) -c wrap.c + $(CC) $(CFLAGS) -c wrap.c Property changes on: head/biology/fluctuate/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/jalview/files/patch-build.xml =================================================================== --- head/biology/jalview/files/patch-build.xml (revision 387020) +++ head/biology/jalview/files/patch-build.xml (revision 387021) @@ -1,52 +1,50 @@ -$FreeBSD$ - This patch removes the webstart support. --- build.xml.orig Mon Dec 12 14:57:02 2005 +++ build.xml Fri Jan 27 12:20:52 2006 @@ -180,6 +180,10 @@ + + + Property changes on: head/biology/jalview/files/patch-build.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/povchem/files/patch-povchem.c =================================================================== --- head/biology/povchem/files/patch-povchem.c (revision 387020) +++ head/biology/povchem/files/patch-povchem.c (revision 387021) @@ -1,188 +1,185 @@ - -$FreeBSD$ - --- povchem.c.orig Fri Jul 11 11:49:07 2003 +++ povchem.c Fri Jul 11 11:59:23 2003 @@ -482,7 +482,7 @@ */ if (*fileName==NULL) { - New_String(fileName,"povchem.cfg"); + New_String(fileName,SYSCONFDIR "/povchem.cfg"); if ((config=fopen(*fileName,"r"))==NULL) { puts("Can't read the configuration file \"povchem.cfg\"!"); perror("Reason"); @@ -731,7 +731,7 @@ no_config: - if (!PERIODIC_TABLE_FILE) New_String(&PERIODIC_TABLE_FILE,"periodic.tab"); + if (!PERIODIC_TABLE_FILE) New_String(&PERIODIC_TABLE_FILE,DATADIR "/periodic.tab"); if (!FINISH) New_String(&FINISH,"Plastic"); if (!FINISH_DECLARATION) New_String(&FINISH_DECLARATION,"\ finish {\n\ @@ -742,7 +742,7 @@ phong 0.3\n\ phong_size 50\n\ specular 0.0\n\ - }\n\n"); + };\n\n"); if (POVRAY && (!POV_OPTIONS || !POV_WIDTH) ) { puts("Warning: to run POV-Ray from PovChem, you must define *all* the"); @@ -977,10 +977,10 @@ if (model==CPK || (model==BALLnSTICK && ballSizeModel==PROPORTIONAL) ) { if (model==BALLnSTICK) - fprintf(pov,"#declare Proportionality_Constant = %.*g\n",SF,ballRadius); + fprintf(pov,"#declare Proportionality_Constant = %.*g;\n",SF,ballRadius); for (Z=0;Z\n", + fprintf(pov,"#declare Atom_%s_Color = color rgb <%.5g, %.5g, %.5g>;\n", PeriodicTable[Z].name,RED(Z),GREEN(Z),BLUE(Z)); } } @@ -1003,20 +1003,20 @@ } if (sphereColorModel==ALL_THE_SAME) - fprintf(pov,"#declare All_Atom_Color = color rgb <%.5g, %.5g, %.5g>\n\n", + fprintf(pov,"#declare All_Atom_Color = color rgb <%.5g, %.5g, %.5g>;\n\n", allSphereColor.r,allSphereColor.g,allSphereColor.b); if (sphereColorModel==BY_PDB) { if (ballSizeModel==CONSTANT) { fputs("#declare Atom_All =\n sphere {\n",pov); fputs(" <0,0,0>, All_Atom_Radius\n",pov); - fprintf(pov," finish { %s }\n }\n\n",FINISH); + fprintf(pov," finish { %s }\n };\n\n",FINISH); } else { for (Z=0;Z, %s_Radius\n",PeriodicTable[Z].name); - fprintf(pov," finish { %s }\n }\n",FINISH); + fprintf(pov," finish { %s }\n };\n",FINISH); } } fputs("\n",pov); @@ -1024,7 +1024,7 @@ tag=firstSphereTag; nTags=nSphereTags; for (i=0;i\n", + fprintf(pov,"#declare Atom_%s_Color = color rgb <%.5g, %.5g, %.5g>;\n", tag->name,tag->r,tag->g,tag->b); tag=tag->next; } @@ -1051,7 +1051,7 @@ fputs( " pigment { color All_Atom_Color }\n",pov); break; } - fprintf(pov," finish { %s }\n }\n }\n",FINISH); + fprintf(pov," finish { %s }\n }\n };\n",FINISH); } } @@ -1060,7 +1060,7 @@ fputs( " <0,0,0>, All_Atom_Radius\n",pov); fputs( " texture {\n",pov); fputs( " pigment { color All_Atom_Color }\n",pov); - fprintf(pov," finish { %s }\n }\n }\n",FINISH); + fprintf(pov," finish { %s }\n }\n };\n",FINISH); } fputs("\n",pov); @@ -1080,26 +1080,26 @@ factors[4]=HIGH_ORDER_FACTOR; if (nOrders[H_BOND]) { - fprintf(pov,"#declare H_Bond_Radius = %.*g\n",SF,HBondRadius); - fprintf(pov,"#declare H_Bond_Color = color rgb <%.5g, %.5g, %.5g>\n", + fprintf(pov,"#declare H_Bond_Radius = %.*g;\n",SF,HBondRadius); + fprintf(pov,"#declare H_Bond_Color = color rgb <%.5g, %.5g, %.5g>;\n", HBondColor.r,HBondColor.g,HBondColor.b); fputs( "#declare H_Bond =\n cylinder {\n",pov); fputs( " <0,0,0>, <1,0,0>, H_Bond_Radius\n",pov); fputs( " texture {\n",pov); fputs( " pigment { H_Bond_Color }\n",pov); - fprintf(pov," finish { %s }\n }\n }\n\n",FINISH); + fprintf(pov," finish { %s }\n }\n };\n\n",FINISH); } if (model==CYLINDER) - fputs("#declare All_Bond_Radius = All_Atom_Radius\n\n",pov); + fputs("#declare All_Bond_Radius = All_Atom_Radius;\n\n",pov); else { if (cylinderSizeModel==CONSTANT) - fprintf(pov,"#declare All_Bond_Radius = %.*g\n\n",SF,cylinderRadius); + fprintf(pov,"#declare All_Bond_Radius = %.*g;\n\n",SF,cylinderRadius); else { - fprintf(pov,"#declare Single_Bond_Radius = %.*g\n",SF,cylinderRadius); + fprintf(pov,"#declare Single_Bond_Radius = %.*g;\n",SF,cylinderRadius); for (i=DOUBLE;i<=HIGH_ORDER;i++) { if (nOrders[i]) - fprintf(pov,"#declare %sBond_Radius = Single_Bond_Radius*%.*g\n", + fprintf(pov,"#declare %sBond_Radius = Single_Bond_Radius*%.*g;\n", orderTypes[i],SF,factors[i]); } fputs("\n",pov); @@ -1107,7 +1107,7 @@ } if (cylinderColorModel==ALL_THE_SAME) - fprintf(pov,"#declare All_Bond_Color = color rgb <%.5g, %.5g, %.5g>\n\n", + fprintf(pov,"#declare All_Bond_Color = color rgb <%.5g, %.5g, %.5g>;\n\n", allCylinderColor.r,allCylinderColor.g,allCylinderColor.b); fputs( "#declare Bond =\n cylinder {\n",pov); @@ -1124,12 +1124,12 @@ } else fprintf(pov," finish { %s }\n",FINISH); - fputs( " }\n\n",pov); + fputs( " };\n\n",pov); if (cylinderColorModel==BY_PDB && firstCylinderTag!=firstSphereTag) { tag=firstCylinderTag; for (i=0;i\n", + fprintf(pov,"#declare Bond_%s_Color = color rgb <%.5g, %.5g, %.5g>;\n", tag->name,tag->r,tag->g,tag->b); tag=tag->next; } @@ -2092,7 +2092,7 @@ * the origin, looking along +Z, sky along +Y. */ - fprintf(pov,"#declare Camera_Position = < %.6g, %.6g, %.6g >\n\n", + fprintf(pov,"#declare Camera_Position = < %.6g, %.6g, %.6g >;\n\n", eye.x,eye.y,eye.z); fputs( "camera{\n",pov); @@ -2317,7 +2317,7 @@ /*-------------------- the main program body --------------------------*/ -void main(int argc, char *argv[]) +int main(int argc, char *argv[]) { char *pdbName, *configName=NULL; char *tgaName=NULL, *leftTga=NULL, *rightTga=NULL; Property changes on: head/biology/povchem/files/patch-povchem.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/biology/tinker/files/patch-source_openend.f =================================================================== --- head/biology/tinker/files/patch-source_openend.f (revision 387020) +++ head/biology/tinker/files/patch-source_openend.f (revision 387021) @@ -1,19 +1,16 @@ - -$FreeBSD$ - --- source/openend.f.orig Fri Apr 18 13:31:51 2003 +++ source/openend.f Mon Jul 21 13:36:11 2003 @@ -29,11 +29,11 @@ c c standard Fortran 90, unavailable in some Fortran 77 compilers c - open (unit=iunit,file=name,status='old',position='append') +c open (unit=iunit,file=name,status='old',position='append') c c common extension supported by many Fortran 77 compilers c -c open (unit=iunit,file=name,status='old',access='append') + open (unit=iunit,file=name,status='old',access='append') c c some Fortran 77 compilers open files for append by default c Property changes on: head/biology/tinker/files/patch-source_openend.f ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/chinese/bg5ps/files/patch-Makefile =================================================================== --- head/chinese/bg5ps/files/patch-Makefile (revision 387020) +++ head/chinese/bg5ps/files/patch-Makefile (revision 387021) @@ -1,38 +1,35 @@ - -$FreeBSD$ - --- Makefile.orig 2000-02-14 21:41:27.000000000 +0100 +++ Makefile 2014-01-25 19:07:23.000000000 +0100 @@ -17,23 +17,24 @@ OBJS = ttf2psm.o b5tou8.o b5_in.o gb_in.o gbtou8.o -CC = gcc +CC ?= gcc INSTALL = install -CFLAGS = +CFLAGS += -I${LOCALBASE}/include/freetype1 -I${LOCALBASE}/include LIBS = -lttf -lm -INCLUDEDIR = +LIBSDIR = -L${LOCALBASE}/lib -prefix = /usr -BINDIR = $(prefix)/bin -ETCDIR = /etc/chinese/ + +PREFIX?= /usr/local +BINDIR = $(PREFIX)/bin +ETCDIR = $(PREFIX)/etc all: ttf2psm %.o : %.c - $(CC) -c $(CFLAGS) $(INCLUDEDIR) $< -o $@ + $(CC) -c $(CFLAGS) $< -o $@ ttf2psm: $(OBJS) - $(CC) $(CFLAGS) $(INCLUDEDIR) $(LIBS) -o ttf2psm $(OBJS) + $(CC) $(CFLAGS) $(LIBSDIR) $(LIBS) -o ttf2psm $(OBJS) install: all bg5ps bg5ps.conf mkdir -p $(ETCDIR) Property changes on: head/chinese/bg5ps/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/acfax/files/patch-RegExp.c =================================================================== --- head/comms/acfax/files/patch-RegExp.c (revision 387020) +++ head/comms/acfax/files/patch-RegExp.c (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- RegExp.c.old Sun Feb 10 05:33:07 2002 +++ RegExp.c Sun Feb 10 05:33:24 2002 @@ -23,7 +23,6 @@ */ #include "RegExp.h" -#include void RegExpCompile(regexp,fsm_ptr) char *regexp; Property changes on: head/comms/acfax/files/patch-RegExp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/acfax/files/patch-fax_funcs.c =================================================================== --- head/comms/acfax/files/patch-fax_funcs.c (revision 387020) +++ head/comms/acfax/files/patch-fax_funcs.c (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- fax_funcs.c.orig Sat Jun 8 00:39:02 2002 +++ fax_funcs.c Sat Jun 8 00:39:08 2002 @@ -37,6 +37,8 @@ #include "widgets.h" #include "fax_funcs.h" +#define PI M_PI + /* some variables that are allowed to be global */ int lpm; /* lines per minute */ int ixoc; /* number of pixels of one scan-line / PI */ Property changes on: head/comms/acfax/files/patch-fax_funcs.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/acfax/files/patch-mod_demod.c =================================================================== --- head/comms/acfax/files/patch-mod_demod.c (revision 387020) +++ head/comms/acfax/files/patch-mod_demod.c (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- mod_demod.c.orig Sat Jun 8 00:38:29 2002 +++ mod_demod.c Sat Jun 8 00:38:41 2002 @@ -29,6 +29,8 @@ #include #include "mod_demod.h" +#define PI M_PI + SHORT int firwide[] = { 6, 20, 7, -42, -74, -12, 159, 353, 440 }; SHORT int firmiddle[] = { 0, -18, -38, -39, 0, 83, 191, 284, 320 }; SHORT int firnarrow[] = { -7, -18, -15, 11, 56, 116, 177, 223, 240 }; Property changes on: head/comms/acfax/files/patch-mod_demod.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/amtterm/files/patch-redir-c =================================================================== --- head/comms/amtterm/files/patch-redir-c (revision 387020) +++ head/comms/amtterm/files/patch-redir-c (revision 387021) @@ -1,30 +1,28 @@ -$FreeBSD$ - From http://people.freebsd.org/~kib/misc/amtterm.1.patch --- redir.c 2011-05-26 12:19:45.000000000 +0300 +++ redir.c 2011-12-28 22:39:15.164012594 +0200 @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include +#include +#include +#include #include #include #include --- tcp.c 2011-05-26 12:19:45.000000000 +0300 +++ tcp.c 2011-12-28 22:39:32.276853072 +0200 @@ -18,6 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include +#include +#include +#include #include #include #include Property changes on: head/comms/amtterm/files/patch-redir-c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/birda/files/patch-Makefile.inc =================================================================== --- head/comms/birda/files/patch-Makefile.inc (revision 387020) +++ head/comms/birda/files/patch-Makefile.inc (revision 387021) @@ -1,20 +1,17 @@ - -$FreeBSD$ - --- Makefile.inc 2002/07/16 17:28:32 1.1 +++ Makefile.inc 2002/07/16 17:28:40 @@ -1,5 +1,3 @@ -.include - CFLAGS+= -I${.CURDIR}/../src PREFIX?= /usr/pkg @@ -12,8 +10,6 @@ .endif MKLINT=no - -.include LDADD+= -L${.CURDIR}/../lib -lirda DPADD+= ${.CURDIR}/../lib/libirda.a Property changes on: head/comms/birda/files/patch-Makefile.inc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/hcidump/files/patch-hcidump-Makefile =================================================================== --- head/comms/hcidump/files/patch-hcidump-Makefile (revision 387020) +++ head/comms/hcidump/files/patch-hcidump-Makefile (revision 387021) Property changes on: head/comms/hcidump/files/patch-hcidump-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-Makefile (revision 387020) +++ head/comms/mgetty+sendfax/files/patch-Makefile (revision 387021) @@ -1,205 +1,202 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -4,8 +4,8 @@ # # this is the C compiler to use (on SunOS, the standard "cc" does not # grok my code, so please use gcc there. On ISC 4.0, use "icc".). -CC=gcc -#CC=cc +#CC=gcc +CC=cc # #### C Compiler Flags #### # @@ -102,7 +102,7 @@ # USTAT - ustat(), no statfs etc. # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -CFLAGS=-O2 -Wall -pipe +#CFLAGS=-O2 -Wall -pipe #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL @@ -144,7 +144,7 @@ # For Linux, add "-lutil" if the linker complains about "updwtmp". # LDFLAGS= -LIBS= +LIBS= -lutil #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket #LIBS=-lbsd # OSF/1 @@ -164,7 +164,8 @@ # # if your systems doesn't have one, use the shell script that I provide # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 -INSTALL=install -c -o bin -g bin +INSTALL=install -c +INSTALL_PROGRAM=install -s -c #INSTALL=install -c -o root -g wheel # NeXT/BSD #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2 @@ -216,7 +217,7 @@ # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER # MUST NOT BE root or any other privileged account). # -FAX_OUT_USER=fax +FAX_OUT_USER=root # # # Where section 1 manual pages should be placed @@ -258,12 +259,12 @@ # and the "tkperl" frontends without PERL, so don't worry if you don't # have it. # If you specify command line arguments (-w), don't forget the quotes! -PERL="/usr/bin/perl -w" +PERL="$(LOCALBASE)/bin/perl -w" # # If you have Perl with TK extentions, define it here. This may be the # same as PERL=... above, or different, if you have TkPerl statically # linked. -TKPERL=/usr/bin/tkperl +#TKPERL=/usr/bin/tkperl # # # An echo program that understands escapes like "\n" for newline or @@ -275,9 +276,9 @@ # please use the "mg.echo" program provided in the compat/ subdirectory. # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo # -ECHO="echo" +ECHO="mg.echo" # -# INSTALL_MECHO=mg.echo +INSTALL_MECHO=mg.echo # # for mgetty, that's it. If you want to use the voice @@ -317,7 +318,7 @@ all: bin-all doc-all -bin-all: mgetty sendfax newslock sedscript subdirs call-back +bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty # a few C files need extra compiler arguments @@ -578,42 +579,39 @@ cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * -install: install.bin install.doc +install: install.bin install.doc install-vgetty install.bin: mgetty sendfax newslock \ - login.config mgetty.config sendfax.config + login.config #mgetty.config sendfax.config # # binaries # - -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) - $(INSTALL) -m 755 newslock $(BINDIR) + -test -d $(STAGEDIR)$(BINDIR) || ( ./mkidirs $(STAGEDIR)$(BINDIR) ; chmod 755 $(STAGEDIR)$(BINDIR) ) + $(INSTALL_PROGRAM) -m 755 newslock $(STAGEDIR)$(BINDIR) - -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) - -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old - -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old - $(INSTALL) -s -m 700 mgetty $(SBINDIR) - $(INSTALL) -s -m 755 sendfax $(SBINDIR) + -test -d $(STAGEDIR)$(SBINDIR) || ( ./mkidirs $(STAGEDIR)$(SBINDIR) ; chmod 755 $(STAGEDIR)$(SBINDIR) ) + -mv -f $(STAGEDIR)$(SBINDIR)/mgetty $(STAGEDIR)$(SBINDIR)/mgetty.old + -mv -f $(STAGEDIR)$(SBINDIR)/sendfax $(STAGEDIR)$(SBINDIR)/sendfax.old + $(INSTALL_PROGRAM) -s -m 700 mgetty $(STAGEDIR)$(SBINDIR) + $(INSTALL_PROGRAM) -s -m 755 sendfax $(STAGEDIR)$(SBINDIR) + $(INSTALL_PROGRAM) -s -m 755 callback/callback $(STAGEDIR)$(SBINDIR) # # data files + directories # - test -d $(LIBDIR) || \ - ( ./mkidirs $(LIBDIR) && chmod 755 $(LIBDIR) ) - test -d $(CONFDIR) || \ - ( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR)) - test -f $(CONFDIR)/login.config || \ - $(INSTALL) -o root -m 600 login.config $(CONFDIR)/ - test -f $(CONFDIR)/mgetty.config || \ - $(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/ - test -f $(CONFDIR)/sendfax.config || \ - $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/ - test -f $(CONFDIR)/dialin.config || \ - $(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/ - test -f $(CONFDIR)/faxrunq.config || \ - $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/ + test -d $(STAGEDIR)$(LIBDIR) || \ + ( ./mkidirs $(STAGEDIR)$(LIBDIR) && chmod 755 $(STAGEDIR)$(LIBDIR) ) + test -d $(STAGEDIR)$(CONFDIR) || \ + ( ./mkidirs $(STAGEDIR)$(CONFDIR) && chmod 755 $(STAGEDIR)$(CONFDIR)) + test -f $(STAGEDIR)$(CONFDIR)/login.config || \ + $(INSTALL) -m 600 login.config $(STAGEDIR)$(CONFDIR)/ + test -f $(STAGEDIR)$(CONFDIR)/dialin.config || \ + $(INSTALL) -m 600 dialin.config $(STAGEDIR)$(CONFDIR)/ + test -f $(STAGEDIR)$(CONFDIR)/faxrunq.config || \ + $(INSTALL) -m 644 faxrunq.config $(STAGEDIR)$(CONFDIR)/ # # test for outdated stuff # - -@if test -f $(LIBDIR)/mgetty.login ; \ + -@if test -f $(STAGEDIR)$(LIBDIR)/mgetty.login ; \ then \ echo "WARNING: the format of $(LIBDIR)/mgetty.login has " ;\ echo "been changed. Because of this, to avoid confusions, it's called " ;\ @@ -621,24 +619,9 @@ echo "" ;\ fi # -# fax spool directories -# - test -d $(spool) || \ - ( mkdir $(spool) && chmod 755 $(spool) ) - test -d $(FAX_SPOOL) || \ - ( mkdir $(FAX_SPOOL) && \ - chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ - chmod 755 $(FAX_SPOOL) ) - test -d $(FAX_SPOOL_IN) || \ - ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) - test -d $(FAX_SPOOL_OUT) || \ - mkdir $(FAX_SPOOL_OUT) - chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) - chmod 755 $(FAX_SPOOL_OUT) -# # g3 tool programs # - cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \ + cd g3 ; $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \ BINDIR=$(BINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # @@ -654,7 +637,7 @@ if [ ! -z "$(INSTALL_MECHO)" ] ; then \ cd compat ; \ $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \ - $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \ + $(INSTALL) -s -m 755 mg.echo $(STAGEDIR)$(BINDIR) ; \ fi # @@ -662,11 +645,11 @@ # install.doc: cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \ - MAN1DIR=$(MAN1DIR) \ - MAN4DIR=$(MAN4DIR) \ - MAN5DIR=$(MAN5DIR) \ - MAN8DIR=$(MAN8DIR) \ - INFODIR=$(INFODIR) + MAN1DIR=$(STAGEDIR)$(MAN1DIR) \ + MAN4DIR=$(STAGEDIR)$(MAN4DIR) \ + MAN5DIR=$(STAGEDIR)$(MAN5DIR) \ + MAN8DIR=$(STAGEDIR)$(MAN8DIR) \ + INFODIR=$(STAGEDIR)$(INFODIR) # # WWW frontend stuff Property changes on: head/comms/mgetty+sendfax/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-fax_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-fax_Makefile (revision 387020) +++ head/comms/mgetty+sendfax/files/patch-fax_Makefile (revision 387021) @@ -1,38 +1,35 @@ - -$FreeBSD$ - --- fax/Makefile.orig +++ fax/Makefile @@ -56,20 +56,16 @@ # programs / scripts # -for i in $(FAX_SCRIPTS); do \ - mv -f $(BINDIR)/$$i $(BINDIR)/$$i.old 2>/dev/null ; \ - $(INSTALL) -m 755 $$i $(BINDIR) ; \ + $(INSTALL) -m 755 $$i $(STAGEDIR)$(BINDIR) ; \ done - $(INSTALL) -m 755 faxrunqd $(SBINDIR) - $(INSTALL) faxq-helper $(LIBDIR) - chown $(FAX_OUT_USER) $(LIBDIR)/faxq-helper - chmod 4711 $(LIBDIR)/faxq-helper + $(INSTALL) -m 755 faxrunqd $(STAGEDIR)$(SBINDIR) + $(INSTALL) faxq-helper $(STAGEDIR)$(LIBDIR) # # data files # - $(INSTALL) -m 644 cour25.pbm $(LIBDIR) - $(INSTALL) -m 644 cour25n.pbm $(LIBDIR) - -test -f $(CONFDIR)/faxheader || \ - $(INSTALL) -m 644 faxheader $(CONFDIR) + $(INSTALL) -m 644 cour25.pbm $(STAGEDIR)$(LIBDIR) + $(INSTALL) -m 644 cour25n.pbm $(STAGEDIR)$(LIBDIR) + $(INSTALL) -m 644 faxheader $(STAGEDIR)$(CONFDIR) # # /etc/magic # @@ -82,4 +78,4 @@ # # faxspool.rules sample file # - $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample + $(INSTALL) -m 644 faxspool.rules $(STAGEDIR)$(CONFDIR)/faxspool.rules.sample Property changes on: head/comms/mgetty+sendfax/files/patch-fax_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-g3_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-g3_Makefile (revision 387020) +++ head/comms/mgetty+sendfax/files/patch-g3_Makefile (revision 387021) @@ -1,22 +1,19 @@ - -$FreeBSD$ - --- g3/Makefile.orig +++ g3/Makefile @@ -40,13 +40,13 @@ # install programs # for f in $(G3_PROGRAMS) ; do \ - $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ + $(INSTALL) -s -m 755 $$f $(STAGEDIR)$(BINDIR) ; \ done # # make symlink for "g3topbm" (so third-party fax viewers won't fail) # - -cd $(BINDIR) ; \ - test -x g3topbm || ln -s g32pbm g3topbm +# -cd $(BINDIR) ; \ +# test -x g3topbm || ln -s g32pbm g3topbm # test suite Property changes on: head/comms/mgetty+sendfax/files/patch-g3_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-mg__utmp.h =================================================================== --- head/comms/mgetty+sendfax/files/patch-mg__utmp.h (revision 387020) +++ head/comms/mgetty+sendfax/files/patch-mg__utmp.h (revision 387021) @@ -1,46 +1,43 @@ - -$FreeBSD$ - --- mg_utmp.h.orig +++ mg_utmp.h @@ -1,4 +1,4 @@ -#ident "$Id: mg_utmp.h,v 4.1 1997/01/12 14:53:42 gert Exp $ Copyright (c) Gert Doering" +static char sccs_mg_utmp[] = "$Id: mg_utmp.h,v 4.1 1997/01/12 14:53:42 gert Exp $ Copyright (c) Gert Doering"; /* definitions for utmp reading / writing routines, * highly SysV / BSD dependent @@ -31,6 +31,25 @@ #else /* SunOS or generic BSD */ +#if defined(__FreeBSD__) && (__FreeBSD_version >= 900007) + +# include +# define utmp utmpx +# define getutent getutxent +# define getutid getutxid +# define getutline getutxline +# define pututline pututxline +# define setutent setutxent +# define endutent endutxent +# define ut_time ut_tv +# define ut_name ut_user + +#define UT_INIT INIT_PROCESS +#define UT_LOGIN LOGIN_PROCESS +#define UT_USER USER_PROCESS + +#else + #include #include @@ -41,6 +60,8 @@ #define UT_LOGIN 1 #define UT_USER 2 +#endif /* __FreeBSD_version */ + #endif /* SysV vs. BSD */ /* prototypes */ Property changes on: head/comms/mgetty+sendfax/files/patch-mg__utmp.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-utmp.c =================================================================== --- head/comms/mgetty+sendfax/files/patch-utmp.c (revision 387020) +++ head/comms/mgetty+sendfax/files/patch-utmp.c (revision 387021) @@ -1,20 +1,17 @@ - -$FreeBSD$ - --- utmp.c.orig +++ utmp.c @@ -1,4 +1,4 @@ -#ident "$Id: utmp.c,v 4.4 2001/12/17 22:43:24 gert Exp $ Copyright (c) Gert Doering" +static char sccsid[] = "$Id: utmp.c,v 4.4 2001/12/17 22:43:24 gert Exp $ Copyright (c) Gert Doering"; /* some parts of the code (writing of the utmp entry) * is based on the "getty kit 2.0" by Paul Sutcliffe, Jr., @@ -58,7 +58,7 @@ * [NB: If we wanted to set UT_INIT, it would have to be an entry with * empty ut_name and ut_host] */ -#if defined(__FreeBSD__) || defined(__NetBSD__) +#if (defined(__FreeBSD__) && (__FreeBSD_version < 900007)) || defined(__NetBSD__) struct utmp utmp; extern void login _PROTO(( struct utmp * utmp )); Property changes on: head/comms/mgetty+sendfax/files/patch-utmp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/mgetty+sendfax/files/patch-voice_Makefile =================================================================== --- head/comms/mgetty+sendfax/files/patch-voice_Makefile (revision 387020) +++ head/comms/mgetty+sendfax/files/patch-voice_Makefile (revision 387021) @@ -1,38 +1,35 @@ - -$FreeBSD$ - --- voice/Makefile.orig +++ voice/Makefile @@ -13,6 +13,8 @@ LN=ln MV=mv RM=rm +INSTALL=install -c +INSTALL_PROGRAM=install -s -c MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o \ ../../locks.o ../../tio.o ../../modem.o \ @@ -83,16 +85,16 @@ @echo " Installing the voice extensions" @echo " -------------------------------" @echo "" - $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) - $(INSTALL) -m 755 vm/vm $(BINDIR) + $(INSTALL_PROGRAM) -m 700 vgetty/vgetty $(STAGEDIR)$(SBINDIR) + $(INSTALL_PROGRAM) -m 755 vm/vm $(STAGEDIR)$(BINDIR) for i in $(PVFTOOLS); \ do \ - $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ + $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(STAGEDIR)$(BINDIR); \ done - $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR) - cd $(MAN1DIR); \ + $(INSTALL) -m 644 man/man1/zplay.1 $(STAGEDIR)$(MAN1DIR) + $(INSTALL) -m 644 man/man1/pvf.1 $(STAGEDIR)$(MAN1DIR) + $(INSTALL) -m 644 man/man8/vgetty.8 $(STAGEDIR)$(MAN8DIR) + cd $(STAGEDIR)$(MAN1DIR); \ for i in $(PVFTOOLS); \ do \ $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ Property changes on: head/comms/mgetty+sendfax/files/patch-voice_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/obexapp/files/patch-Makefile =================================================================== --- head/comms/obexapp/files/patch-Makefile (revision 387020) +++ head/comms/obexapp/files/patch-Makefile (revision 387021) Property changes on: head/comms/obexapp/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/tits/files/patch-listener.c =================================================================== --- head/comms/tits/files/patch-listener.c (revision 387020) +++ head/comms/tits/files/patch-listener.c (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- listener.c.orig +++ listener.c @@ -189,10 +189,6 @@ NULL) context_del_client(cc->cc_ctx, ccc); - if (lc->lc_args.la_address) - (void) free(lc->lc_args.la_address); - (void) free(lc->lc_args.la_port); - (void) free(lc); } Property changes on: head/comms/tits/files/patch-listener.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/tits/files/patch-tty.c =================================================================== --- head/comms/tits/files/patch-tty.c (revision 387020) +++ head/comms/tits/files/patch-tty.c (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- tty.c 2001/04/18 14:43:52 1.1 +++ tty.c 2001/04/18 14:45:57 @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -216,8 +217,7 @@ * If this is *not* a pseudo tty, ensure DTR is asserted. * Note: This relies on TIOCGFLAGS returning ENOTTY for pty(4)'s. */ - if (ioctl(cc->cc_fd, TIOCGFLAGS, &flags) == 0 && errno == ENOTTY && - ioctl(cc->cc_fd, TIOCSDTR, 0) < 0) { + if (ioctl(cc->cc_fd, TIOCSDTR, 0) < 0 && errno != ENOTTY) { (void) close(cc->cc_fd); (void) free(tc->tc_to.to_device); (void) free(tc); Property changes on: head/comms/tits/files/patch-tty.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/comms/uartlirc/files/patch-uartlirc_lircdev.c =================================================================== --- head/comms/uartlirc/files/patch-uartlirc_lircdev.c (revision 387020) +++ head/comms/uartlirc/files/patch-uartlirc_lircdev.c (revision 387021) @@ -1,20 +1,20 @@ --- uartlirc_lircdev.c.orig +++ uartlirc_lircdev.c -@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$"); +@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: $"); #include #include #include +#include #include #include #include @@ -117,6 +118,9 @@ uartlirc_lircdev_ioctl(struct cdev *dev, case LIRC_GET_FEATURES: *arg = LIRC_CAN_REC_MODE2; return (0); + case FIONBIO: + case FIOASYNC: + return (0); default: return ENOTTY; } Property changes on: head/comms/uartlirc/files/patch-uartlirc_lircdev.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/aish/files/patch-ai_unix.c =================================================================== --- head/converters/aish/files/patch-ai_unix.c (revision 387020) +++ head/converters/aish/files/patch-ai_unix.c (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- ai_unix.c.orig Fri Jun 7 12:59:05 2002 +++ ai_unix.c Fri Jun 7 13:00:49 2002 @@ -15,7 +15,7 @@ char *ptr; { #ifdef BZ_BSD - return bzero( ptr, len ); + bzero( ptr, len ); #else return memset( ptr, '\0', len ); #endif Property changes on: head/converters/aish/files/patch-ai_unix.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv/files/patch-ces__Makefile =================================================================== --- head/converters/iconv/files/patch-ces__Makefile (revision 387020) +++ head/converters/iconv/files/patch-ces__Makefile (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ces/Makefile 2002/03/17 11:07:44 1.1 +++ ces/Makefile 2002/03/17 11:07:56 @@ -10,7 +10,7 @@ LIB= ces SRCS= ces_builtin.c ${CHARSETS_C} -LDADD = -L${.CURDIR}/../lib -liconv +LDADD = -L${.CURDIR}/../lib -lbiconv INTERNALLIB = Property changes on: head/converters/iconv/files/patch-ces__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv/files/patch-lib_Makefile =================================================================== --- head/converters/iconv/files/patch-lib_Makefile (revision 387020) +++ head/converters/iconv/files/patch-lib_Makefile (revision 387021) @@ -1,63 +1,60 @@ - -$FreeBSD$ - --- lib/Makefile.orig Tue Nov 28 01:33:49 2000 +++ lib/Makefile Mon Jun 3 14:16:50 2002 @@ -1,27 +1,28 @@ -LIB = iconv +LIB = biconv SHLIB_MAJOR = 2 SHLIB_MINOR = 0 SRCS = aliases.c ccs.c ces.c ces_euc.c ces_iso2022.c ces_table.c \ - converter.c iconv.c utils.c + converter.c iconv.c utils.c biconv.h BUILTIN_CCS != cd ${.CURDIR}/../ccs && make lib >/dev/null && ${AR} t libccs.a BUILTIN_CES != cd ${.CURDIR}/../ces && make lib >/dev/null && ${AR} t libces.a BUILTIN_CES_STATIC != cd ${.CURDIR}/../ces && make libces_static.a \ >/dev/null && ${AR} t libces_static.a -OBJS = ${BUILTIN_CCS:C|.|../ccs/&|} ${BUILTIN_CES:C|.|../ces/&|} -STATICOBJS = ${BUILTIN_CES_STATIC:C|.|../ces/&|} +OBJS = ${BUILTIN_CCS:S|^|../ccs/&|} ${BUILTIN_CES:S|^|../ces/&|} +STATICOBJS = ${BUILTIN_CES_STATIC:S|^|../ces/&|} LIBDIR = ${PREFIX}/lib -INCDIR = ${PREFIX}/include -INCS = iconv.h +INCSDIR = ${PREFIX}/include +INCDIR = ${INCSDIR} # for 4.x bsd.lib.mk +INCS = biconv.h CFLAGS += -DICONV_MODULE_PATH=\"${MODULEDIR}\" \ -DICONV_TABLE_PATH=\"${TABLEDIR}\" -MAN3 = iconv.3 iconv_open.3 iconv_close.3 +MAN3 = biconv.3 biconv_open.3 biconv_close.3 ALIASES = ${.CURDIR}/../ccs/charset.aliases \ ${.CURDIR}/../ces/charset.aliases @@ -32,13 +33,19 @@ cat ${.ALLSRC} | ${.CURDIR}/../iconv_builtin ${BUILTIN_CCS} \ ${BUILTIN_CES} PIC ${BUILTIN_CES_STATIC} > ${.TARGET} -iconv.3: iconv.3.in +biconv.3: iconv.3.in sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \ -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET} -iconv_open.3: iconv_open.3.in +biconv_open.3: iconv_open.3.in sed -e "s|@@TABLE_DIR@@|${TABLEDIR}|" \ -e "s|@@MODULE_DIR@@|${MODULEDIR}|" ${.ALLSRC} > ${.TARGET} + +biconv_close.3: iconv_close.3 + cp ${.ALLSRC} ${.TARGET} + +biconv.h: iconv.h + cp ${.ALLSRC} ${.TARGET} CLEANFILES= ${.CURDIR}/../ccs/libccs.a ${.CURDIR}/../ces/libces*.a \ aliases.h iconv.3 iconv_open.3 Property changes on: head/converters/iconv/files/patch-lib_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv/files/patch-util__Makefile =================================================================== --- head/converters/iconv/files/patch-util__Makefile (revision 387020) +++ head/converters/iconv/files/patch-util__Makefile (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- util/Makefile.orig Sun Sep 3 22:33:15 2000 +++ util/Makefile Sun Mar 17 13:08:59 2002 @@ -1,11 +1,14 @@ -PROG= iconv +PROG= biconv SRCS= iconv.c iconv_stream.c -LDADD= -L../lib -liconv -DPADD+= ../lib/libiconv.a +LDADD= -L../lib -lbiconv +DPADD+= ../lib/libbiconv.a BINDIR= ${PREFIX}/bin -MAN1= iconv.1 +MAN1= biconv.1 + +biconv.1: iconv.1 + cp ${.ALLSRC} ${.TARGET} .include Property changes on: head/converters/iconv/files/patch-util__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv-extra/files/patch-ces__iso-2022-cn.c =================================================================== --- head/converters/iconv-extra/files/patch-ces__iso-2022-cn.c (revision 387020) +++ head/converters/iconv-extra/files/patch-ces__iso-2022-cn.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ces/iso-2022-cn.c 2002/03/17 11:15:25 1.1 +++ ces/iso-2022-cn.c 2002/03/17 11:15:46 @@ -31,7 +31,7 @@ */ #define ICONV_INTERNAL -#include +#include static const iconv_ces_iso2022_ccs ccsattr[] = { {"us-ascii", "", 0, ICONV_SHIFT_SI}, Property changes on: head/converters/iconv-extra/files/patch-ces__iso-2022-cn.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c =================================================================== --- head/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c (revision 387020) +++ head/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ces/iso-2022-jp-2.c 2002/03/17 11:15:25 1.1 +++ ces/iso-2022-jp-2.c 2002/03/17 11:15:46 @@ -31,7 +31,7 @@ */ #define ICONV_INTERNAL -#include +#include static const iconv_ces_iso2022_ccs ccsattr[] = { {"us-ascii", "\x1b(B", 3, ICONV_SHIFT_SI}, Property changes on: head/converters/iconv-extra/files/patch-ces__iso-2022-jp-2.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv-extra/files/patch-ces__iso-2022-jp.c =================================================================== --- head/converters/iconv-extra/files/patch-ces__iso-2022-jp.c (revision 387020) +++ head/converters/iconv-extra/files/patch-ces__iso-2022-jp.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ces/iso-2022-jp.c 2002/03/17 11:15:25 1.1 +++ ces/iso-2022-jp.c 2002/03/17 11:15:46 @@ -31,7 +31,7 @@ */ #define ICONV_INTERNAL -#include +#include static const iconv_ces_iso2022_ccs ccsattr[] = { {"us-ascii", "\x1b(B", 3, ICONV_SHIFT_SI}, Property changes on: head/converters/iconv-extra/files/patch-ces__iso-2022-jp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv-extra/files/patch-ces__iso-2022-kr.c =================================================================== --- head/converters/iconv-extra/files/patch-ces__iso-2022-kr.c (revision 387020) +++ head/converters/iconv-extra/files/patch-ces__iso-2022-kr.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ces/iso-2022-kr.c 2002/03/17 11:15:25 1.1 +++ ces/iso-2022-kr.c 2002/03/17 11:15:46 @@ -31,7 +31,7 @@ */ #define ICONV_INTERNAL -#include +#include static const iconv_ces_iso2022_ccs ccsattr[] = { {"us-ascii", "", 0, ICONV_SHIFT_SI}, Property changes on: head/converters/iconv-extra/files/patch-ces__iso-2022-kr.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c =================================================================== --- head/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c (revision 387020) +++ head/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ces/unicode-1-1-utf-7.c 2002/03/17 11:20:12 1.1 +++ ces/unicode-1-1-utf-7.c 2002/03/17 11:20:21 @@ -33,7 +33,7 @@ #include #define ICONV_INTERNAL -#include +#include static inline int lackofbytes(int bytes, size_t *bytesleft) Property changes on: head/converters/iconv-extra/files/patch-ces__unicode-1-1-utf-7.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/converters/recode/files/patch-i18n__el.po =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Property changes on: head/converters/recode/files/patch-i18n__el.po ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Modified: svn:mime-type ## -1 +1 ## -text/plain \ No newline at end of property +application/octet-stream \ No newline at end of property Index: head/databases/mysql51-server/files/patch-include_my_tcpd.h =================================================================== --- head/databases/mysql51-server/files/patch-include_my_tcpd.h (revision 387020) +++ head/databases/mysql51-server/files/patch-include_my_tcpd.h (revision 387021) @@ -1,147 +1,147 @@ --- include/my_tcpd.h.orig Sun Jan 9 13:33:51 2005 +++ include/my_tcpd.h Sun Jan 9 13:41:42 2005 @@ -6,6 +6,25 @@ - * $FreeBSD$ + * $FreeBSD: releng/10.1/contrib/tcp_wrappers/tcpd.h 56977 2000-02-03 10:27:03Z shin $ */ +#ifndef _TCPWRAPPERS_TCPD_H +#define _TCPWRAPPERS_TCPD_H + +/* someone else may have defined this */ +#undef __P + +/* use prototypes if we have an ANSI C compiler or are using C++ */ +#if defined(__STDC__) || defined(__cplusplus) +#define __P(args) args +#else +#define __P(args) () +#endif + +/* Need definitions of struct sockaddr_in and FILE. */ +#include +#include + +__BEGIN_DECLS + /* Structure to describe one communications endpoint. */ #define STRING_LENGTH 128 /* hosts, users, processes */ @@ -31,10 +50,10 @@ char pid[10]; /* access via eval_pid(request) */ struct host_info client[1]; /* client endpoint info */ struct host_info server[1]; /* server endpoint info */ - void (*sink) (); /* datagram sink function or 0 */ - void (*hostname) (); /* address to printable hostname */ - void (*hostaddr) (); /* address to printable address */ - void (*cleanup) (); /* cleanup function or 0 */ + void (*sink) __P((int)); /* datagram sink function or 0 */ + void (*hostname) __P((struct host_info *)); /* address to printable hostname */ + void (*hostaddr) __P((struct host_info *)); /* address to printable address */ + void (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */ struct netconfig *config; /* netdir handle */ }; @@ -67,20 +86,23 @@ /* Global functions. */ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) -extern void fromhost(); /* get/validate client host info */ +extern void fromhost __P((struct request_info *)); /* get/validate client host info */ #else #define fromhost sock_host /* no TLI support needed */ #endif -extern int hosts_access(); /* access control */ -extern void shell_cmd(); /* execute shell command */ -extern char *percent_x(); /* do % expansion */ -extern void rfc931(); /* client name from RFC 931 daemon */ -extern void clean_exit(); /* clean up and exit */ -extern void refuse(); /* clean up and exit */ -extern char *xgets(); /* fgets() on steroids */ -extern char *split_at(); /* strchr() and split */ -extern unsigned long dot_quad_addr(); /* restricted inet_addr() */ +extern void shell_cmd __P((char *)); /* execute shell command */ +extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do % expansion */ +#ifdef INET6 +extern void rfc931 __P((struct sockaddr *, struct sockaddr *, char *)); /* client name from RFC 931 daemon */ +#else +extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */ +#endif +extern void clean_exit __P((struct request_info *)); /* clean up and exit */ +extern void refuse __P((struct request_info *)); /* clean up and exit */ +extern char *xgets __P((char *, int, FILE *)); /* fgets() on steroids */ +extern char *split_at __P((char *, int)); /* strchr() and split */ +extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */ /* Global variables. */ @@ -98,9 +120,14 @@ */ #ifdef __STDC__ +extern int hosts_access(struct request_info *request); +extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, + char *client_user); extern struct request_info *request_init(struct request_info *,...); extern struct request_info *request_set(struct request_info *,...); #else +extern int hosts_access(); +extern int hosts_ctl(); extern struct request_info *request_init(); /* initialize request */ extern struct request_info *request_set(); /* update request structure */ #endif @@ -123,27 +150,27 @@ * host_info structures serve as caches for the lookup results. */ -extern char *eval_user(); /* client user */ -extern char *eval_hostname(); /* printable hostname */ -extern char *eval_hostaddr(); /* printable host address */ -extern char *eval_hostinfo(); /* host name or address */ -extern char *eval_client(); /* whatever is available */ -extern char *eval_server(); /* whatever is available */ +extern char *eval_user __P((struct request_info *)); /* client user */ +extern char *eval_hostname __P((struct host_info *)); /* printable hostname */ +extern char *eval_hostaddr __P((struct host_info *)); /* printable host address */ +extern char *eval_hostinfo __P((struct host_info *)); /* host name or address */ +extern char *eval_client __P((struct request_info *)); /* whatever is available */ +extern char *eval_server __P((struct request_info *)); /* whatever is available */ #define eval_daemon(r) ((r)->daemon) /* daemon process name */ #define eval_pid(r) ((r)->pid) /* process id */ /* Socket-specific methods, including DNS hostname lookups. */ -extern void sock_host(); /* look up endpoint addresses */ -extern void sock_hostname(); /* translate address to hostname */ -extern void sock_hostaddr(); /* address to printable address */ +extern void sock_host __P((struct request_info *)); +extern void sock_hostname __P((struct host_info *)); +extern void sock_hostaddr __P((struct host_info *)); #define sock_methods(r) \ { (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; } /* The System V Transport-Level Interface (TLI) interface. */ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT) -extern void tli_host(); /* look up endpoint addresses etc. */ +extern void tli_host __P((struct request_info *)); /* look up endpoint addresses etc. */ #endif /* @@ -184,7 +211,7 @@ * behavior. */ -extern void process_options(); /* execute options */ +extern void process_options __P((char *, struct request_info *)); /* execute options */ extern int dry_run; /* verification flag */ /* Bug workarounds. */ @@ -223,3 +250,7 @@ #define strtok my_strtok extern char *my_strtok(); #endif + +__END_DECLS + +#endif /* tcpd.h */ Property changes on: head/databases/mysql51-server/files/patch-include_my_tcpd.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/databases/postgresql_autodoc/files/patch-Makefile =================================================================== --- head/databases/postgresql_autodoc/files/patch-Makefile (revision 387020) +++ head/databases/postgresql_autodoc/files/patch-Makefile (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -2,7 +2,6 @@ # install configuration DESTDIR = -PREFIX = /usr/local BINDIR = ${PREFIX}/bin DATADIR = ${PREFIX}/share/postgresql_autodoc MANDIR = ${PREFIX}/share/man/man1 @@ -25,11 +24,6 @@ all: ${BINARY} ${MANPAGE} -${MANPAGE}: ${MANPAGE_SOURCE} - ${SED} -e "s,@@TEMPLATE-DIR@@,${DATADIR}," \ - ${MANPAGE_SOURCE} > ${MANPAGE} - - ${BINARY}: ${SOURCE} ${SED} -e "s,/usr/bin/env perl,${PERL}," \ -e "s,@@TEMPLATE-DIR@@,${DATADIR}," \ Property changes on: head/databases/postgresql_autodoc/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/databases/rdfdb/files/patch-makefile =================================================================== --- head/databases/rdfdb/files/patch-makefile (revision 387020) +++ head/databases/rdfdb/files/patch-makefile (revision 387021) @@ -1,16 +1,14 @@ -$FreeBSD$ - --- makefile.orig Sun Aug 20 15:48:46 2000 +++ makefile Sat Jun 8 20:25:04 2002 @@ -1,7 +1,7 @@ -CC = gcc -g -INCLUDES = -I /usr/local/BerkeleyDB.3.1/include -I expat/xmltok -I expat/xmlparse -LIBS = -ldb -lpthread -CPPFLAGS = $(INCLUDES) -L /usr/local/BerkeleyDB.3.1/lib/ +CC ?= gcc -g +INCLUDES = -I %%BDB_INCLUDE_DIR%% -I expat/xmltok -I expat/xmlparse +LIBS = -l%%BDB_LIB_NAME%% -lpthread +CPPFLAGS += ${CFLAGS} $(INCLUDES) -L %%LOCALBASE%%/lib OBJS = utils/hash.o \ utils/utils.o \ Property changes on: head/databases/rdfdb/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/databases/rdfdb/files/patch-query-processQuery.c =================================================================== --- head/databases/rdfdb/files/patch-query-processQuery.c (revision 387020) +++ head/databases/rdfdb/files/patch-query-processQuery.c (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- query/processQuery.c.orig Mon Sep 18 17:09:01 2000 +++ query/processQuery.c Thu Dec 27 21:18:54 2001 @@ -21,6 +21,7 @@ #include "../utils/utils.h" #include "queryParser.h" #include +#include extern int DB_Flush (const char* db) ; extern int gVerbose; extern int gAssertionCount; Property changes on: head/databases/rdfdb/files/patch-query-processQuery.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/databases/slony1v2/files/patch-src_slonik_slonik.c =================================================================== --- head/databases/slony1v2/files/patch-src_slonik_slonik.c (revision 387020) +++ head/databases/slony1v2/files/patch-src_slonik_slonik.c (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- src/slonik/slonik.c.orig +++ src/slonik/slonik.c @@ -22,7 +22,6 @@ #include #include #include -#include #else #include #include Property changes on: head/databases/slony1v2/files/patch-src_slonik_slonik.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/deskutils/x-tile/files/patch-x-tile =================================================================== --- head/deskutils/x-tile/files/patch-x-tile (revision 387020) +++ head/deskutils/x-tile/files/patch-x-tile (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - Fix ctypes warning, by Ruslan Mahmatkhanov --- x-tile.orig 2011-07-04 01:41:29.000000000 +0400 +++ x-tile 2011-08-22 20:20:30.000000000 +0400 @@ -56,7 +56,7 @@ try: libc = ctypes.cdll.LoadLibrary(ctypes.util.find_library("libc")) libc.prctl(15, cons.APP_NAME, 0, 0, 0) -except: print "libc.prctl not available, the process name will be python and not x-tile" +except: pass # icons generation factory = gtk.IconFactory() Property changes on: head/deskutils/x-tile/files/patch-x-tile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/antlr/files/patch-configure =================================================================== --- head/devel/antlr/files/patch-configure (revision 387020) +++ head/devel/antlr/files/patch-configure (revision 387021) @@ -1,164 +1,162 @@ -$FreeBSD$ - --- configure.orig 2010-12-17 23:55:00.000000000 -0800 +++ configure 2010-12-17 23:56:08.000000000 -0800 @@ -2234,7 +2234,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -2299,7 +2299,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -2364,7 +2364,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -2461,7 +2461,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -2486,13 +2486,13 @@ ## right now we need to have a GNU make around, other makes are ## not supported and likely to fail. -if test "x${user_make}" == "x" ; then +if test "x${user_make}" = "x" ; then #Search all the common names for GNU make ax_gnu_make_list="${MAKE}" MAKE= for a in . ${ax_gnu_make_list} ; do - if test "$a" == "." ; then + if test "$a" = "." ; then continue fi echo "$as_me:$LINENO: checking whether ${a} is GNU make" >&5 @@ -2508,7 +2508,7 @@ fi done ## handle search result - if test "x${MAKE}" == "x" ; then + if test "x${MAKE}" = "x" ; then : { { echo "$as_me:$LINENO: error: package requires GNU make" >&5 echo "$as_me: error: package requires GNU make" >&2;} @@ -2641,7 +2641,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -2726,7 +2726,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -2811,7 +2811,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -3036,7 +3036,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -5808,7 +5808,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -5879,7 +5879,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -6122,7 +6122,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -6241,7 +6241,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -6336,7 +6336,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -6423,7 +6423,7 @@ fi done done - test "x$as_found" == "x" && { + test "x$as_found" = "x" && { echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 echo "$as_me:$LINENO: result: no" >&5 @@ -6733,7 +6733,7 @@ ## This variables can be used in antlr/Makefile file_list="${ANTLR_ACTION_FILES} ${ANTLR_ANTLR_FILES} ${ANTLR_TOKDEF_FILES}" - if test "x${file_list}" == "x" ; then + if test "x${file_list}" = "x" ; then : else ANTLR_CONFIG_FILES="" Property changes on: head/devel/antlr/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/apiextractor/files/patch-CMakeLists.txt =================================================================== --- head/devel/apiextractor/files/patch-CMakeLists.txt (revision 387020) +++ head/devel/apiextractor/files/patch-CMakeLists.txt (revision 387021) @@ -1,12 +1,11 @@ -$FreeBSD$ --- ./CMakeLists.txt.orig 2011-12-15 22:30:24.000000000 +0100 +++ ./CMakeLists.txt 2011-12-15 22:35:29.000000000 +0100 @@ -53,7 +53,7 @@ set(apiextractor_MICRO_VERSION 9) set(apiextractor_VERSION "${apiextractor_MAJOR_VERSION}.${apiextractor_MINOR_VERSION}.${apiextractor_MICRO_VERSION}") configure_file(apiextractorversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/apiextractorversion.h @ONLY) -set(apiextractor_SOVERSION ${apiextractor_MAJOR_VERSION}.${apiextractor_MINOR_VERSION}) +set(apiextractor_SOVERSION ${apiextractor_MAJOR_VERSION}) set(QT_USE_QTCORE 1) set(QT_USE_QTXML 1) include(${QT_USE_FILE}) Property changes on: head/devel/apiextractor/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/apiextractor/files/patch-data__CMakeLists.txt =================================================================== --- head/devel/apiextractor/files/patch-data__CMakeLists.txt (revision 387020) +++ head/devel/apiextractor/files/patch-data__CMakeLists.txt (revision 387021) @@ -1,12 +1,11 @@ -$FreeBSD$ --- ./data/CMakeLists.txt.orig 2011-11-18 19:10:10.000000000 +0100 +++ ./data/CMakeLists.txt 2011-12-15 22:29:55.000000000 +0100 @@ -11,7 +11,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ApiExtractorConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfig.cmake" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ApiExtractorConfigVersion.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfigVersion.cmake" @ONLY) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apiextractor${apiextractor_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig") +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apiextractor${apiextractor_SUFFIX}.pc" DESTINATION "${LIB_INSTALL_DIR}data/pkgconfig") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfig.cmake" DESTINATION "${LIB_INSTALL_DIR}/cmake/ApiExtractor-${apiextractor_VERSION}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ApiExtractorConfigVersion.cmake" Property changes on: head/devel/apiextractor/files/patch-data__CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/arduino-irremote/files/patch-IRremoteInt.h =================================================================== --- head/devel/arduino-irremote/files/patch-IRremoteInt.h (revision 387020) +++ head/devel/arduino-irremote/files/patch-IRremoteInt.h (revision 387021) @@ -1,22 +1,20 @@ -$FreeBSD$ - --- IRremoteInt.h.orig 2009-09-05 23:55:48.000000000 -0700 +++ IRremoteInt.h 2011-12-27 15:40:59.000000000 -0800 @@ -12,12 +12,16 @@ #ifndef IRremoteint_h #define IRremoteint_h +#if defined(ARDUINO) && ARDUINO >= 100 +#include +#else #include +#endif #define CLKFUDGE 5 // fudge factor for clock interrupt overhead #define CLK 256 // max value for clock (timer 2) #define PRESCALE 8 // timer2 clock prescale -#define SYSCLOCK 16000000 // main Arduino clock +#define SYSCLOCK F_CPU // main Arduino clock #define CLKSPERUSEC (SYSCLOCK/PRESCALE/1000000) // timer clocks per microsecond #define ERR 0 Property changes on: head/devel/arduino-irremote/files/patch-IRremoteInt.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/ccdoc/files/patch-mkopt_gcc.mk =================================================================== --- head/devel/ccdoc/files/patch-mkopt_gcc.mk (revision 387020) +++ head/devel/ccdoc/files/patch-mkopt_gcc.mk (revision 387021) @@ -1,29 +1,27 @@ -$FreeBSD$ - --- mkopt_gcc.mk.orig Tue Feb 17 10:33:54 2004 +++ mkopt_gcc.mk Tue Feb 17 10:36:57 2004 @@ -1,17 +1,17 @@ # ================================================ # GCC compiler, optimized mode, any platform. # ================================================ -PERL = perl +PERL = %%PERL%% PLATFORM = $(shell $(PERL) ../utils/platform.pl) CCDOC_CID = bin_opt_gcc_${PLATFORM} BIN_DIR = ../${CCDOC_CID} OBJ_EXT = o -CXX = g++ -CXX_FLAGS = -c -pedantic -Wall -O -DCCDOC_OPT -DCCDOC_CID=\"${CCDOC_CID}\" -CXX_OUT = -o +CXX = %%CXX%% +CXX_FLAGS = -c -pedantic -Wall %%CXXFLAGS%% -DCCDOC_OPT -DCCDOC_CID=\"${CCDOC_CID}\" +CXX_OUT = -o LINK_TARG = ${BIN_DIR}/ccdoc.exe -LINK = g++ -LINK_FLAGS = -g -LINK_OUT = -o +LINK = %%CXX%% +LINK_FLAGS = %%CXXFLAGS%% +LINK_OUT = -o include mktargs.mk Property changes on: head/devel/ccdoc/files/patch-mkopt_gcc.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/cl-infix/files/patch-infix.asd =================================================================== --- head/devel/cl-infix/files/patch-infix.asd (revision 387020) +++ head/devel/cl-infix/files/patch-infix.asd (revision 387021) @@ -1,11 +1,8 @@ - -$FreeBSD$ - --- infix.asd.orig +++ infix.asd @@ -16,4 +16,4 @@ (:static-file "COPYING"))) (defmethod source-file-type ((f cl-source-file) (s (eql (find-system 'infix)))) - "cl") + "lisp") Property changes on: head/devel/cl-infix/files/patch-infix.asd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/cl-infix/files/patch-infix.system =================================================================== --- head/devel/cl-infix/files/patch-infix.system (revision 387020) +++ head/devel/cl-infix/files/patch-infix.system (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- infix.system.orig +++ infix.system @@ -2,7 +2,7 @@ (mk:defsystem infix :source-pathname "cl-library:infix;" - :source-extension "cl" + :source-extension "lisp" :binary-pathname nil :binary-extension nil :components ((:file "infix"))) Property changes on: head/devel/cl-infix/files/patch-infix.system ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/common_lib/files/patch-Makefile =================================================================== --- head/devel/common_lib/files/patch-Makefile (revision 387020) +++ head/devel/common_lib/files/patch-Makefile (revision 387021) @@ -1,41 +1,38 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -1,3 +1,5 @@ +include app.mk + ###----------------------------------------------------------------------------- ### APPLICATION LAYOUT ###----------------------------------------------------------------------------- @@ -35,7 +37,10 @@ test: ./rebar ct -doc: man html pdf +doc: dirs man + +dirs: + @$(MKDIR) doc/man man: $(MANS) @$(MV) doc/man/$(APPNAME)_overview.3 doc/man/$(APPNAME).1 @@ -49,14 +54,14 @@ %.3: %.ndoc @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ - $(ERLDOC) -i - -t man --no-toc --erl -o man/$@; $(CD) .. + $(ERLDOC) -i - -t man --no-toc -o man/$@; $(CD) .. %.html: %.ndoc @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ - $(ERLDOC) -i - -t xhtml --erl -o html/$@; $(CD) .. + $(ERLDOC) -i - -t xhtml -o html/$@; $(CD) .. %.pdf: %.ndoc @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ - $(ERLDOC) -i - -t pdf --no-toc --erl -o pdf/$@; $(CD) .. + $(ERLDOC) -i - -t pdf --no-toc -o pdf/$@; $(CD) .. Property changes on: head/devel/common_lib/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/common_lib/files/patch-app.mk =================================================================== --- head/devel/common_lib/files/patch-app.mk (revision 387020) +++ head/devel/common_lib/files/patch-app.mk (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- app.mk.orig +++ app.mk @@ -25,7 +25,7 @@ CD = cd CP = cp -vf ECHO = echo -ERLDOC = ndoc +ERLDOC = txt2tags LN = ln -sf MKDIR = mkdir MV = mv -vf Property changes on: head/devel/common_lib/files/patch-app.mk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/cook/files/patch-common_ac_time.h =================================================================== --- head/devel/cook/files/patch-common_ac_time.h (revision 387020) +++ head/devel/cook/files/patch-common_ac_time.h (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- common/ac/time.h.orig Fri Nov 29 23:15:13 2002 +++ common/ac/time.h Fri Nov 29 23:15:27 2002 @@ -29,7 +29,7 @@ * Catch-22: Dec Alpha OSF/1: need to include time.h before sys/time.h * before time.h */ -#ifdef __alpha__ +#ifdef __osf1__ #ifndef _CLOCK_ID_T #define _CLOCK_ID_T typedef int clockid_t; Property changes on: head/devel/cook/files/patch-common_ac_time.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/distel/files/patch-elisp_erl-service.el =================================================================== --- head/devel/distel/files/patch-elisp_erl-service.el (revision 387020) +++ head/devel/distel/files/patch-elisp_erl-service.el (revision 387021) @@ -1,19 +1,16 @@ - -$FreeBSD$ - --- elisp/erl-service.el.orig +++ elisp/erl-service.el @@ -783,11 +783,11 @@ (defun erl-search-function (function arity) "Goto the definition of FUNCTION/ARITY in the current buffer." (let ((origin (point)) - (str (concat "\n" function "(")) + (str (concat "\n" function " *(")) (searching t)) (goto-char (point-min)) (while searching - (cond ((search-forward str nil t) + (cond ((search-forward-regexp str nil t) (backward-char) (when (or (null arity) (eq (erl-arity-at-point) arity)) Property changes on: head/devel/distel/files/patch-elisp_erl-service.el ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/erlang-msgpack/files/patch-src_msgpack.app.src =================================================================== --- head/devel/erlang-msgpack/files/patch-src_msgpack.app.src (revision 387020) +++ head/devel/erlang-msgpack/files/patch-src_msgpack.app.src (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- src/msgpack.app.src.orig +++ src/msgpack.app.src @@ -1,6 +1,6 @@ {application, msgpack, [{description, "MessagePack serializer/deserializer"}, - {vsn, git}, + {vsn, "%%PORTVERSION%%"}, {modules, [msgpack] }, Property changes on: head/devel/erlang-msgpack/files/patch-src_msgpack.app.src ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/erlang-protobuffs/files/patch-rebar.config =================================================================== --- head/devel/erlang-protobuffs/files/patch-rebar.config (revision 387020) +++ head/devel/erlang-protobuffs/files/patch-rebar.config (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- rebar.config.orig +++ rebar.config @@ -1,7 +1,6 @@ {erl_opts, [debug_info]}. {deps,[ - {meck, "0.8.2", {git, "git://github.com/basho/meck.git", {tag, "0.8.2"}}} ]}. {clean_files, ["*~","**/*~","**/*.beam","logs/*","test/Emakefile"]}. Property changes on: head/devel/erlang-protobuffs/files/patch-rebar.config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src =================================================================== --- head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src (revision 387020) +++ head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- src/protobuffs.app.src.orig +++ src/protobuffs.app.src @@ -1,6 +1,6 @@ { application, protobuffs, [ { description, "Google protobuffs implementation for Erlang." }, - { vsn, git }, + { vsn, "%%PORTVERSION%%" }, { registered, [] }, { applications, [kernel,stdlib] }, { env, [] } Property changes on: head/devel/erlang-protobuffs/files/patch-src_protobuffs.app.src ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/esdl/files/patch-Makefile =================================================================== --- head/devel/esdl/files/patch-Makefile (revision 387020) +++ head/devel/esdl/files/patch-Makefile (revision 387021) @@ -1,17 +1,14 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -51,9 +51,9 @@ ERL_DIR := $(shell erl -noshell -eval "io:format([126,115,126,110],[code:root_dir()])" -s erlang halt) ifeq ($(INSTALL_DIR), ) -INSTALLDIR = $(ERL_DIR)/addons/$(ESDL_VSN) +INSTALLDIR = $(STAGEDIR)$(ERL_DIR)/addons/$(ESDL_VSN) else -INSTALLDIR = $(INSTALL_DIR)/$(ESDL_VSN) +INSTALLDIR = $(STAGEDIR)$(INSTALL_DIR)/$(ESDL_VSN) endif ## I assume that make install are only made on unixes... :-) Property changes on: head/devel/esdl/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/esdl/files/patch-c__src_esdl__driver.c =================================================================== --- head/devel/esdl/files/patch-c__src_esdl__driver.c (revision 387020) +++ head/devel/esdl/files/patch-c__src_esdl__driver.c (revision 387021) @@ -1,54 +1,51 @@ - -$FreeBSD$ - --- c_src/esdl_driver.c.orig +++ c_src/esdl_driver.c @@ -34,11 +34,16 @@ #define TEMP_BINARY_SIZE 512 +#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2 +typedef int ErlDrvSizeT; +typedef int ErlDrvSSizeT; +#endif + static ErlDrvData sdl_driver_start(ErlDrvPort port, char *buff); static void sdl_driver_stop(ErlDrvData handle); static void sdl_driver_finish(void); -static int sdl_driver_control(ErlDrvData handle, unsigned int command, - char* buf, int count, char** res, int res_size); +static ErlDrvSSizeT sdl_driver_control(ErlDrvData handle, unsigned int command, + char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size); static void standard_outputv(ErlDrvData drv_data, ErlIOVec *ev); /* @@ -59,6 +64,17 @@ sdl_driver_control, /* F_PTR control, port_control callback */ NULL, /* F_PTR timeout, reserved */ standard_outputv, /* F_PTR outputv, reserved */ + NULL, + NULL, + NULL, + NULL, + ERL_DRV_EXTENDED_MARKER, + ERL_DRV_EXTENDED_MAJOR_VERSION, + ERL_DRV_EXTENDED_MINOR_VERSION, + 0, + NULL, + NULL, + NULL }; DRIVER_INIT(sdl_driver) @@ -148,9 +164,9 @@ { } -static int +static ErlDrvSSizeT sdl_driver_control(ErlDrvData handle, unsigned op, - char* buf, int count, char** res, int res_size) + char* buf, ErlDrvSizeT count, char** res, ErlDrvSizeT res_size) { sdl_data* sd = (sdl_data *) handle; sdl_fun func; Property changes on: head/devel/esdl/files/patch-c__src_esdl__driver.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/fhist/files/patch-common_ac_time.h =================================================================== --- head/devel/fhist/files/patch-common_ac_time.h (revision 387020) +++ head/devel/fhist/files/patch-common_ac_time.h (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- common/ac/time.h.orig Wed Dec 18 02:09:57 2002 +++ common/ac/time.h Wed Dec 18 02:10:04 2002 @@ -29,7 +29,7 @@ * Catch-22: Dec Alpha OSF/1: need to include time.h before sys/time.h * before time.h */ -#ifdef __alpha__ +#ifdef __osf1__ #ifndef _CLOCK_ID_T #define _CLOCK_ID_T typedef int clockid_t; Property changes on: head/devel/fhist/files/patch-common_ac_time.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/flickrnet/files/patch-AssemblyInfo.cs =================================================================== --- head/devel/flickrnet/files/patch-AssemblyInfo.cs (revision 387020) +++ head/devel/flickrnet/files/patch-AssemblyInfo.cs (revision 387021) @@ -1,19 +1,16 @@ - -$FreeBSD$ - --- AssemblyInfo.cs.orig +++ AssemblyInfo.cs @@ -61,10 +61,10 @@ [assembly: AssemblyKeyName("")] #if !WindowsCE -[assembly: AssemblyKeyFile("..\\..\\FlickrNet.snk")] +[assembly: AssemblyKeyFile("FlickrNet.snk")] [assembly: AllowPartiallyTrustedCallers()] [assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] #endif [assembly: CLSCompliantAttribute(true)] -[assembly: ComVisible(false)] \ No newline at end of file +[assembly: ComVisible(false)] Property changes on: head/devel/flickrnet/files/patch-AssemblyInfo.cs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/flickrnet/files/patch-flickrnet.pc.in =================================================================== --- head/devel/flickrnet/files/patch-flickrnet.pc.in (revision 387020) +++ head/devel/flickrnet/files/patch-flickrnet.pc.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- /dev/null +++ flickrnet.pc.in @@ -0,0 +1,8 @@ +prefix=@prefix@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib + +Name: Flickr .Net API Library +Description: FlickrNet +Version: 2.1.5 +Libs: -r:${libdir}/mono/flickrnet/FlickrNet.dll Property changes on: head/devel/flickrnet/files/patch-flickrnet.pc.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/gtkparasite/files/patch-USAGE =================================================================== --- head/devel/gtkparasite/files/patch-USAGE (revision 387020) +++ head/devel/gtkparasite/files/patch-USAGE (revision 387021) @@ -1,29 +1,26 @@ - -$FreeBSD$ - --- USAGE.orig +++ USAGE @@ -0,0 +1,23 @@ +Parasite is pretty easy to use. Start off by launching with an application by doing the following: + +$ GTK_MODULES=gtkparasite appname + +The Parasite window will pop up immediately, followed by the application window. + +Click the "Inspect" button and then click anywhere in your application's UI to load the widget tree for that window and focus in on the selected widget. You should then be able to browse around the widget tree. + +The properties for the selected widget appear on the right-hand side of the Parasite window. Many properties can be modified (nearly anything other than pointer addresses) by clicking on the property value. You'll either be able to type in a new value, or select from a pop-up list. + +Toggle "Show Graphic Updates" to see debug rectangles any time part of your UI redraws. This can be used to help optimize drawing performance of a widget. + +The Python shell is located at the bottom of the screen. It works like a standard Python shell. You can import modules you need (such as "gtk") and write code to manipulate the widgets. + +A special "parasite" module is imported for you that provides a "gobj" function for converting a pointer address for a widget into something you can use in the Python shell. For example: + +>>> widget = parasite.gobj(0xDEADBEEF) + + +You can get the pointer addresses from the "Pointer Address" column in the widget tree, or from right-clicking an item in the widget tree and choosing "Send Widget to Shell." + +You can then use any PyGTK functions on the widget. + Property changes on: head/devel/gtkparasite/files/patch-USAGE ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/ipython/files/patch-setupbase.py =================================================================== --- head/devel/ipython/files/patch-setupbase.py (revision 387020) +++ head/devel/ipython/files/patch-setupbase.py (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- setupbase.py.orig +++ setupbase.py @@ -272,7 +272,7 @@ Just man pages at this point. """ - manpagebase = pjoin('share', 'man', 'man1') + manpagebase = pjoin('man', 'man1') # Simple file lists can be made by hand manpages = [f for f in glob(pjoin('docs','man','*.1.gz')) if isfile(f)] Property changes on: head/devel/ipython/files/patch-setupbase.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/jna/files/patch-build.xml =================================================================== --- head/devel/jna/files/patch-build.xml (revision 387020) +++ head/devel/jna/files/patch-build.xml (revision 387021) @@ -1,32 +1,29 @@ - -$FreeBSD$ - --- ./build.xml.orig +++ ./build.xml @@ -99,7 +99,7 @@ - + @@ -805,9 +805,6 @@ - - - JNA API Documentation
${header}
${footer} - Property changes on: head/devel/jna/files/patch-build.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/libdict/files/patch-GNUmakefile =================================================================== --- head/devel/libdict/files/patch-GNUmakefile (revision 387020) +++ head/devel/libdict/files/patch-GNUmakefile (revision 387021) @@ -1,20 +1,17 @@ - -$FreeBSD$ - --- GNUmakefile.orig +++ GNUmakefile @@ -58,10 +58,10 @@ install : $(A_LIB) $(P_LIB) $(S_LIB) [ -d $(INCDIR) ] || mkdir -m 755 $(INCDIR) - $(INSTALL) -o $(USER) -g $(GROUP) -m 644 $(HDR) $(INCDIR) - $(INSTALL) -s -o $(USER) -g $(GROUP) -m 644 $(A_LIB) $(LIBDIR) - $(INSTALL) -s -o $(USER) -g $(GROUP) -m 644 $(P_LIB) $(LIBDIR) - $(INSTALL) -s -o $(USER) -g $(GROUP) -m 755 $(S_LIB) $(LIBDIR)/$(SHLIB) + $(INSTALL) -m 644 $(HDR) $(INCDIR) + $(INSTALL) -s -m 644 $(A_LIB) $(LIBDIR) + $(INSTALL) -s -m 644 $(P_LIB) $(LIBDIR) + $(INSTALL) -s -m 755 $(S_LIB) $(LIBDIR)/$(SHLIB) $(SHELL) -ec 'cd $(LIBDIR) && ln -sf $(SHLIB) $(S_LIB)' uninstall : Property changes on: head/devel/libdict/files/patch-GNUmakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/libmsocket/files/patch-file.c =================================================================== --- head/devel/libmsocket/files/patch-file.c (revision 387020) +++ head/devel/libmsocket/files/patch-file.c (revision 387021) @@ -1,55 +1,52 @@ - -$FreeBSD$ - --- file.c.orig +++ file.c @@ -171,6 +171,7 @@ gid_t l; register unsigned int i; int grpcnt; + long ngroups_max; if (!fs) { @@ -212,13 +213,14 @@ return(1); } - glist = (gid_t *)malloc(NGROUPS + 1); + ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1; + glist = (gid_t *)malloc(sizeof(gid_t) * ngroups_max); if (!glist) { return(-1); } - if ((grpcnt = getgroups((NGROUPS + 1), glist)) < 0) + if ((grpcnt = getgroups(ngroups_max, glist)) < 0) { free(glist); return(-1); @@ -257,6 +259,7 @@ gid_t l; register unsigned int i; int grpcnt; + long ngroups_max; if (!fs) { @@ -298,13 +301,14 @@ return(1); } - glist = (gid_t *)malloc(NGROUPS + 1); + ngroups_max = sysconf(_SC_NGROUPS_MAX) + 1; + glist = (gid_t *)malloc(sizeof(gid_t) * ngroups_max); if (!glist) { return(-1); } - if ((grpcnt = getgroups((NGROUPS + 1), glist)) < 0) + if ((grpcnt = getgroups(ngroups_max, glist)) < 0) { free(glist); return(-1); Property changes on: head/devel/libmsocket/files/patch-file.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/libpthread-stubs/files/patch-Makefile.in =================================================================== --- head/devel/libpthread-stubs/files/patch-Makefile.in (revision 387020) +++ head/devel/libpthread-stubs/files/patch-Makefile.in (revision 387021) @@ -1,28 +1,25 @@ - -$FreeBSD$ - --- Makefile.in.orig +++ Makefile.in @@ -75,9 +75,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libpthread_stubs_la_LIBADD = am__libpthread_stubs_la_SOURCES_DIST = stubs.c -@BUILD_LIB_TRUE@am_libpthread_stubs_la_OBJECTS = stubs.lo +am_libpthread_stubs_la_OBJECTS = stubs.lo libpthread_stubs_la_OBJECTS = $(am_libpthread_stubs_la_OBJECTS) -@BUILD_LIB_TRUE@am_libpthread_stubs_la_rpath = -rpath $(libdir) +am_libpthread_stubs_la_rpath = -rpath $(libdir) DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -221,8 +221,8 @@ top_srcdir = @top_srcdir@ pkgconfigdir = $(prefix)/libdata/pkgconfig pkgconfig_DATA = pthread-stubs.pc -@BUILD_LIB_TRUE@lib_LTLIBRARIES = libpthread-stubs.la -@BUILD_LIB_TRUE@libpthread_stubs_la_SOURCES = stubs.c +lib_LTLIBRARIES = libpthread-stubs.la +libpthread_stubs_la_SOURCES = stubs.c all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am Property changes on: head/devel/libpthread-stubs/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py =================================================================== --- head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387020) +++ head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- utils/llvm-build/llvmbuild/main.py.orig +++ utils/llvm-build/llvmbuild/main.py @@ -660,7 +660,17 @@ # We handle a few special cases of target names here for historical # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', + native_target_name = { 'amd64' : 'X86', + 'arm' : 'ARM', + 'armeb' : 'ARM', + 'armv6' : 'ARM', + 'armv6hf' : 'ARM', + 'i386' : 'X86', + 'mips' : 'Mips', + 'powerpc' : 'PowerPC', + 'powerpc64' : 'PowerPC', + 'sparc64' : 'Sparc', + 'x86' : 'X86', 'x86_64' : 'X86', 'Unknown' : None }.get(opts.native_target, opts.native_target) Property changes on: head/devel/llvm-devel/files/patch-utils_llvm-build_llvmbuild_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/llvm33/files/patch-svn-182446 =================================================================== --- head/devel/llvm33/files/patch-svn-182446 (revision 387020) +++ head/devel/llvm33/files/patch-svn-182446 (revision 387021) @@ -1,35 +1,34 @@ -$FreeBSD$ ------------------------------------------------------------------------ r182446 | rafael | 2013-05-22 03:30:47 +0100 (Wed, 22 May 2013) | 4 lines Attempt to fix the mingw32 bot. This should hopefully fix http://lab.llvm.org:8011/builders/clang-x86_64-darwin11-self-mingw32 ------------------------------------------------------------------------ Index: lib/Target/R600/SIISelLowering.cpp =================================================================== --- lib/Target/R600/SIISelLowering.cpp (revision 182445) +++ lib/Target/R600/SIISelLowering.cpp (revision 182446) @@ -338,7 +338,7 @@ return Chain; } -#define RSRC_DATA_FORMAT 0xf00000000000 +const uint64_t RSRC_DATA_FORMAT = 0xf00000000000LL; SDValue SITargetLowering::LowerSTORE(SDValue Op, SelectionDAG &DAG) const { StoreSDNode *StoreNode = cast(Op); @@ -351,9 +351,9 @@ return SDValue(); } - SDValue SrcSrc = DAG.getNode(ISD::BUILD_PAIR, DL, MVT::i128, - DAG.getConstant(0, MVT::i64), - DAG.getConstant(RSRC_DATA_FORMAT, MVT::i64)); + SDValue Zero = DAG.getConstant(0, MVT::i64); + SDValue Format = DAG.getConstant(RSRC_DATA_FORMAT, MVT::i64); + SDValue SrcSrc = DAG.getNode(ISD::BUILD_PAIR, DL, MVT::i128, Zero, Format); SDValue Ops[2]; Ops[0] = DAG.getNode(AMDGPUISD::BUFFER_STORE, DL, MVT::Other, Chain, Property changes on: head/devel/llvm33/files/patch-svn-182446 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py =================================================================== --- head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387020) +++ head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- utils/llvm-build/llvmbuild/main.py.orig +++ utils/llvm-build/llvmbuild/main.py @@ -660,7 +660,17 @@ # We handle a few special cases of target names here for historical # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', + native_target_name = { 'amd64' : 'X86', + 'arm' : 'ARM', + 'armeb' : 'ARM', + 'armv6' : 'ARM', + 'armv6hf' : 'ARM', + 'i386' : 'X86', + 'mips' : 'Mips', + 'powerpc' : 'PowerPC', + 'powerpc64' : 'PowerPC', + 'sparc64' : 'Sparc', + 'x86' : 'X86', 'x86_64' : 'X86', 'Unknown' : None }.get(opts.native_target, opts.native_target) Property changes on: head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py =================================================================== --- head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387020) +++ head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- utils/llvm-build/llvmbuild/main.py.orig +++ utils/llvm-build/llvmbuild/main.py @@ -660,7 +660,17 @@ # We handle a few special cases of target names here for historical # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', + native_target_name = { 'amd64' : 'X86', + 'arm' : 'ARM', + 'armeb' : 'ARM', + 'armv6' : 'ARM', + 'armv6hf' : 'ARM', + 'i386' : 'X86', + 'mips' : 'Mips', + 'powerpc' : 'PowerPC', + 'powerpc64' : 'PowerPC', + 'sparc64' : 'Sparc', + 'x86' : 'X86', 'x86_64' : 'X86', 'Unknown' : None }.get(opts.native_target, opts.native_target) Property changes on: head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py =================================================================== --- head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387020) +++ head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- utils/llvm-build/llvmbuild/main.py.orig +++ utils/llvm-build/llvmbuild/main.py @@ -660,7 +660,17 @@ # We handle a few special cases of target names here for historical # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', + native_target_name = { 'amd64' : 'X86', + 'arm' : 'ARM', + 'armeb' : 'ARM', + 'armv6' : 'ARM', + 'armv6hf' : 'ARM', + 'i386' : 'X86', + 'mips' : 'Mips', + 'powerpc' : 'PowerPC', + 'powerpc64' : 'PowerPC', + 'sparc64' : 'Sparc', + 'x86' : 'X86', 'x86_64' : 'X86', 'Unknown' : None }.get(opts.native_target, opts.native_target) Property changes on: head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/llvm36/files/patch-utils_llvm-build_llvmbuild_main.py =================================================================== --- head/devel/llvm36/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387020) +++ head/devel/llvm36/files/patch-utils_llvm-build_llvmbuild_main.py (revision 387021) @@ -1,24 +1,21 @@ - -$FreeBSD$ - --- utils/llvm-build/llvmbuild/main.py.orig +++ utils/llvm-build/llvmbuild/main.py @@ -660,7 +660,17 @@ # We handle a few special cases of target names here for historical # reasons, as these are the names configure currently comes up with. - native_target_name = { 'x86' : 'X86', + native_target_name = { 'amd64' : 'X86', + 'arm' : 'ARM', + 'armeb' : 'ARM', + 'armv6' : 'ARM', + 'armv6hf' : 'ARM', + 'i386' : 'X86', + 'mips' : 'Mips', + 'powerpc' : 'PowerPC', + 'powerpc64' : 'PowerPC', + 'sparc64' : 'Sparc', + 'x86' : 'X86', 'x86_64' : 'X86', 'Unknown' : None }.get(opts.native_target, opts.native_target) Property changes on: head/devel/llvm36/files/patch-utils_llvm-build_llvmbuild_main.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/loki/files/patch-Makefile.common =================================================================== --- head/devel/loki/files/patch-Makefile.common (revision 387020) +++ head/devel/loki/files/patch-Makefile.common (revision 387021) @@ -1,11 +1,9 @@ -$FreeBSD$ - --- Makefile.common.orig +++ Makefile.common @@ -4,4 +4,4 @@ CXXWARNFLAGS := -Wall -Wold-style-cast -Wundef -Wsign-compare -Wconversion -Wpointer-arith -pedantic CXXFLAGS := $(CXXWARNFLAGS) -g -O2 -prefix := /usr +prefix := ${PREFIX} Property changes on: head/devel/loki/files/patch-Makefile.common ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/loki/files/patch-src-Makefile =================================================================== --- head/devel/loki/files/patch-src-Makefile (revision 387020) +++ head/devel/loki/files/patch-src-Makefile (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/Makefile.orig +++ src/Makefile @@ -20,7 +20,7 @@ override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC LDLIBS := -lpthread else -ifeq ($(OS), GNU/kFreeBSD) +ifeq ($(OS), $(filter $(OS),GNU/kFreeBSD FreeBSD)) SHARED_LIB_BASE := libloki.so SHARED_LIB_VERSIONED := libloki.so.$(VERSION) override LDFLAGS += --shared -Wl,-soname=$(SHARED_LIB_VERSIONED) -fPIC Property changes on: head/devel/loki/files/patch-src-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/loki/files/patch-test_SingletonDll_Makefile =================================================================== --- head/devel/loki/files/patch-test_SingletonDll_Makefile (revision 387020) +++ head/devel/loki/files/patch-test_SingletonDll_Makefile (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- test/SingletonDll/Makefile.orig +++ test/SingletonDll/Makefile @@ -5,6 +5,11 @@ LIB2 := libsingletondll.dylib SHARED_LIB_FLAG := -dynamiclib -fPIC else +ifeq ($(OS),FreeBSD) + LIB1 := libfoo.so + LIB2 := libsingletondll.so + SHARED_LIB_FLAG := --shared -fPIC +else ifeq ($(OS),Linux) LIB1 := libfoo.so LIB2 := libsingletondll.so @@ -15,6 +20,7 @@ SHARED_LIB_FLAG := --shared endif endif +endif BIN1 := client$(BIN_SUFFIX) SRC1 := client.cpp Property changes on: head/devel/loki/files/patch-test_SingletonDll_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs =================================================================== --- head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs (revision 387020) +++ head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- src/addins/MonoDevelop.Autotools/SolutionDeployer.cs.orig +++ src/addins/MonoDevelop.Autotools/SolutionDeployer.cs @@ -171,7 +171,7 @@ chainedOutput.ChainWriter (monitor.Log); chainedOutput.ChainWriter (sw); - ProcessWrapper process = Runtime.ProcessService.StartProcess ( "make", + ProcessWrapper process = Runtime.ProcessService.StartProcess ( "gmake", "dist", baseDir, chainedOutput, @@ -180,7 +180,7 @@ process.WaitForOutput (); if ( process.ExitCode > 0 ) - throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "make dist") ); + throw new Exception ( GettextCatalog.GetString ("An unspecified error occurred while running '{0}'", "gmake dist") ); monitor.Step ( 1 ); Property changes on: head/devel/monodevelop/files/patch-src_addins_MonoDevelop.Autotools_SolutionDeployer.cs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/monodevelop/files/patch-theme-icons_icon-theme-installer =================================================================== --- head/devel/monodevelop/files/patch-theme-icons_icon-theme-installer (revision 387020) +++ head/devel/monodevelop/files/patch-theme-icons_icon-theme-installer (revision 387021) @@ -1,20 +1,17 @@ - -$FreeBSD$ - --- theme-icons/icon-theme-installer.orig +++ theme-icons/icon-theme-installer @@ -101,12 +101,12 @@ exit 1 fi -if test ! -x $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then +if ! which $(echo "$MKINSTALLDIRS_EXEC" | cut -f1 -d' '); then echo "Cannot find '$MKINSTALLDIRS_EXEC'; You probably want to pass -m \$(mkinstalldirs)" exit 1 fi -if test ! -x $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then +if ! which $(echo "$INSTALL_DATA_EXEC" | cut -f1 -d' '); then echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)" exit 1 fi Property changes on: head/devel/monodevelop/files/patch-theme-icons_icon-theme-installer ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/motor/files/patch-src__Makefile.in =================================================================== --- head/devel/motor/files/patch-src__Makefile.in (revision 387020) +++ head/devel/motor/files/patch-src__Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/Makefile.in 2002/05/16 11:05:11 1.1 +++ src/Makefile.in 2002/05/16 11:05:22 @@ -90,7 +90,7 @@ INCLUDES = -I$(top_srcdir)/kkstrtext -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/kkconsui/include -I$(top_srcdir)/intl -I$(top_srcdir)/src/ui -I$(top_srcdir)/src/ui/ncurses -I$(top_srcdir)/src/debugger -I$(top_srcdir)/src/executor -I$(top_srcdir)/src/project -I$(top_srcdir)/src/configuration -I$(top_srcdir)/src/manager -I$(top_srcdir)/src/grepper -I$(top_srcdir)/src/tagbrowser -I$(top_srcdir)/src/vcs -I$(top_srcdir)/parser/include -CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\" +CPPFLAGS = @CPPFLAGS@ -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\" bin_PROGRAMS = motor motor_SOURCES = main.cc motormisc.cc Property changes on: head/devel/motor/files/patch-src__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/motor/files/patch-src__configuration__Makefile.in =================================================================== --- head/devel/motor/files/patch-src__configuration__Makefile.in (revision 387020) +++ head/devel/motor/files/patch-src__configuration__Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/configuration/Makefile.in 2002/05/16 11:01:44 1.1 +++ src/configuration/Makefile.in 2002/05/16 11:02:59 @@ -89,7 +89,7 @@ INCLUDES = -I$(top_srcdir)/kkstrtext -I$(top_srcdir)/kkconsui/include -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/intl -I$(top_srcdir)/src/ui/ncurses -I$(top_srcdir)/src/debugger -I$(top_srcdir)/src/executor -I$(top_srcdir)/src/project -I$(top_srcdir)/src/ui -I$(top_srcdir)/src/tagbrowser -I$(top_srcdir)/src -I$(top_srcdir)/parser/include -CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\" +CPPFLAGS = @CPPFLAGS@ -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\" libconfiguration_a_SOURCES = motorconfiguration.cc extkey.cc Property changes on: head/devel/motor/files/patch-src__configuration__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/motor/files/patch-src__manager__Makefile.in =================================================================== --- head/devel/motor/files/patch-src__manager__Makefile.in (revision 387020) +++ head/devel/motor/files/patch-src__manager__Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/manager/Makefile.in 2002/05/16 11:03:39 1.1 +++ src/manager/Makefile.in 2002/05/16 11:03:53 @@ -89,7 +89,7 @@ INCLUDES = -I$(top_srcdir)/kkstrtext -I$(top_srcdir)/kkconsui/include -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/intl -I$(top_srcdir)/src/ui/ncurses -I$(top_srcdir)/src/debugger -I$(top_srcdir)/src/executor -I$(top_srcdir)/src/project -I$(top_srcdir)/src/configuration -I$(top_srcdir)/src -I$(top_srcdir)/src/tagbrowser -I$(top_srcdir)/parser/include -CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\" +CPPFLAGS = @CPPFLAGS@ -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\" libmanager_a_SOURCES = motormanager.cc Property changes on: head/devel/motor/files/patch-src__manager__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/mpatrol/files/patch-..__..__src__mpatrol.h =================================================================== --- head/devel/mpatrol/files/patch-..__..__src__mpatrol.h (revision 387020) +++ head/devel/mpatrol/files/patch-..__..__src__mpatrol.h (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- ../../src/mpatrol.h +++ ../../src/mpatrol.h @@ -32,6 +32,7 @@ #include #include #include +#include #if !MP_NOCPLUSPLUS #ifdef __cplusplus #include Property changes on: head/devel/mpatrol/files/patch-..__..__src__mpatrol.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/mpatrol/files/patch-..__..__src__mptrace.c =================================================================== --- head/devel/mpatrol/files/patch-..__..__src__mptrace.c (revision 387020) +++ head/devel/mpatrol/files/patch-..__..__src__mptrace.c (revision 387021) @@ -1,44 +1,41 @@ - -$FreeBSD$ - --- ../../src/mptrace.c +++ ../../src/mptrace.c @@ -268,27 +268,27 @@ static XtResource resources[] = { {"alloc", XmCColor, XmRPixel, sizeof(Pixel), - (Cardinal) &alcol, XmRString, (XtPointer) "black"}, + (long) &alcol, XmRString, (XtPointer) "black"}, {"base", "Base", XmRInt, sizeof(void *), - (Cardinal) &addrbase, XmRImmediate, (XtPointer) NULL}, + (long) &addrbase, XmRImmediate, (XtPointer) NULL}, {"delay", "Delay", XmRInt, sizeof(unsigned long), - (Cardinal) &delay, XmRImmediate, (XtPointer) 0}, + (long) &delay, XmRImmediate, (XtPointer) 0}, {"free", XmCColor, XmRPixel, sizeof(Pixel), - (Cardinal) &frcol, XmRString, (XtPointer) "white"}, + (long) &frcol, XmRString, (XtPointer) "white"}, {"height", XmCHeight, XmRShort, sizeof(Dimension), - (Cardinal) &height, XmRImmediate, (XtPointer) 512}, + (long) &height, XmRImmediate, (XtPointer) 512}, {"internal", XmCColor, XmRPixel, sizeof(Pixel), - (Cardinal) &incol, XmRString, (XtPointer) "red"}, + (long) &incol, XmRString, (XtPointer) "red"}, {"space", "Space", XmRInt, sizeof(unsigned long), - (Cardinal) &addrspace, XmRImmediate, (XtPointer) 4}, + (long) &addrspace, XmRImmediate, (XtPointer) 4}, {"unalloc", XmCColor, XmRPixel, sizeof(Pixel), - (Cardinal) &uncol, XmRString, (XtPointer) "blue"}, + (long) &uncol, XmRString, (XtPointer) "blue"}, {"view-height", XmCHeight, XmRShort, sizeof(Dimension), - (Cardinal) &vheight, XmRImmediate, (XtPointer) 256}, + (long) &vheight, XmRImmediate, (XtPointer) 256}, {"view-width", XmCWidth, XmRShort, sizeof(Dimension), - (Cardinal) &vwidth, XmRImmediate, (XtPointer) 256}, + (long) &vwidth, XmRImmediate, (XtPointer) 256}, {"width", XmCWidth, XmRShort, sizeof(Dimension), - (Cardinal) &width, XmRImmediate, (XtPointer) 512} + (long) &width, XmRImmediate, (XtPointer) 512} }; Property changes on: head/devel/mpatrol/files/patch-..__..__src__mptrace.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/mpatrol/files/patch-..__..__src__symbol.c =================================================================== --- head/devel/mpatrol/files/patch-..__..__src__symbol.c (revision 387020) +++ head/devel/mpatrol/files/patch-..__..__src__symbol.c (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- ../../src/symbol.c 2003/07/12 11:33:10 1.1 +++ ../../src/symbol.c 2003/07/12 11:33:29 @@ -72,7 +72,7 @@ #include #endif /* SYSTEM */ #elif FORMAT == FORMAT_ELF32 || FORMAT == FORMAT_ELF64 -#include +#include #elif FORMAT == FORMAT_BFD #include #endif /* FORMAT */ @@ -113,7 +113,7 @@ * symbols from the object files and libraries. However, we still need the ELF * definitions for reading the internal structures of the dynamic linker. */ -#include +/*#include */ #elif DYNLINK == DYNLINK_WINDOWS /* We use the imagehlp library on Windows platforms to obtain information about * the symbols loaded from third-party and system DLLs. We can also use it to Property changes on: head/devel/mpatrol/files/patch-..__..__src__symbol.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/mpatrol/files/patch-..__..__tools__dbmalloc.c =================================================================== --- head/devel/mpatrol/files/patch-..__..__tools__dbmalloc.c (revision 387020) +++ head/devel/mpatrol/files/patch-..__..__tools__dbmalloc.c (revision 387021) @@ -1,21 +1,18 @@ - -$FreeBSD$ - --- ../../tools/dbmalloc.c 2003/07/12 11:39:21 1.1 +++ ../../tools/dbmalloc.c 2003/07/12 11:39:30 @@ -27,7 +27,6 @@ #include "config.h" -#include "dbmalloc.h" #include #if TARGET == TARGET_WINDOWS #include @@ -35,6 +34,7 @@ #include #endif /* TARGET */ +#include "dbmalloc.h" #if MP_IDENT_SUPPORT #ident "$Id: dbmalloc.c,v 1.1 2003/07/12 11:39:21 root Exp root $" Property changes on: head/devel/mpatrol/files/patch-..__..__tools__dbmalloc.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/mpatrol/files/patch-Makefile =================================================================== --- head/devel/mpatrol/files/patch-Makefile (revision 387020) +++ head/devel/mpatrol/files/patch-Makefile (revision 387021) @@ -1,88 +1,85 @@ - -$FreeBSD$ - --- Makefile.orig Tue Jan 8 22:41:01 2002 +++ Makefile Sun Jul 13 21:17:49 2003 @@ -27,7 +27,7 @@ # Definitions SHELL = /bin/sh -CC = g++ +CC = $(CXX) AR = ar LD = $(CC) LINT = lint @@ -41,12 +41,12 @@ ifeq ($(GUISUP),true) CFLAGS = -I$(SOURCE) -I$(TOOLS) -I/usr/X11R6/include -I/usr/X11R5/include -I/usr/X11/include -I/usr/X/include -DMP_GUI_SUPPORT=1 else -CFLAGS = -I$(SOURCE) -I$(TOOLS) +CFLAGS += -I$(SOURCE) -I$(TOOLS) -I$(LOCALBASE)/include endif -OFLAGS = -O3 -fno-inline-functions +OFLAGS = -fno-inline-functions -fpermissive SFLAGS = -fPIC -TFLAGS = -DMP_THREADS_SUPPORT -LDFLAGS = -shared +TFLAGS = -DMP_THREADS_SUPPORT -pthread +LDFLAGS = -shared -L$(LOCALBASE)/lib -lelf -lintl MPATROL = mpatrol MPALLOC = mpalloc @@ -123,10 +123,10 @@ $(ARCHIVE_MPATROL): $(ARCHIVE_MPTOBJS) $(AR) cr $@ $(ARCHIVE_MPTOBJS) -$(SHARED_MPATROL).$(VERSION).$(REVISION): $(SHARED_MPTOBJS) +$(SHARED_MPATROL).$(VERSION): $(SHARED_MPTOBJS) $(LD) $(LDFLAGS) -o $@ $(SHARED_MPTOBJS) -$(SHARED_MPATROL): $(SHARED_MPATROL).$(VERSION).$(REVISION) +$(SHARED_MPATROL): $(SHARED_MPATROL).$(VERSION) @ ln -f -s $< $@ $(OBJECT_MPATROL): $(SOURCE)/library.c @@ -138,10 +138,10 @@ $(ARCHTS_MPATROL): $(ARCHTS_MPTOBJS) $(AR) cr $@ $(ARCHTS_MPTOBJS) -$(SHARTS_MPATROL).$(VERSION).$(REVISION): $(SHARTS_MPTOBJS) - $(LD) $(LDFLAGS) -o $@ $(SHARTS_MPTOBJS) +$(SHARTS_MPATROL).$(VERSION): $(SHARTS_MPTOBJS) + $(LD) $(LDFLAGS) -pthread -o $@ $(SHARTS_MPTOBJS) -$(SHARTS_MPATROL): $(SHARTS_MPATROL).$(VERSION).$(REVISION) +$(SHARTS_MPATROL): $(SHARTS_MPATROL).$(VERSION) @ ln -f -s $< $@ $(OBJTS_MPATROL): $(SOURCE)/library.c @@ -153,10 +153,10 @@ $(ARCHIVE_MPALLOC): $(ARCHIVE_MPAOBJS) $(AR) cr $@ $(ARCHIVE_MPAOBJS) -$(SHARED_MPALLOC).$(VERSION).$(REVISION): $(SHARED_MPAOBJS) +$(SHARED_MPALLOC).$(VERSION): $(SHARED_MPAOBJS) $(LD) $(LDFLAGS) -o $@ $(SHARED_MPAOBJS) -$(SHARED_MPALLOC): $(SHARED_MPALLOC).$(VERSION).$(REVISION) +$(SHARED_MPALLOC): $(SHARED_MPALLOC).$(VERSION) @ ln -f -s $< $@ $(OBJECT_MPALLOC): $(SOURCE)/library2.c @@ -224,13 +224,13 @@ clobber: clean -@ rm -f $(ARCHIVE_MPATROL) $(ARCHTS_MPATROL) 2>&1 >/dev/null - -@ rm -f $(SHARED_MPATROL).$(VERSION).$(REVISION) 2>&1 >/dev/null - -@ rm -f $(SHARTS_MPATROL).$(VERSION).$(REVISION) 2>&1 >/dev/null + -@ rm -f $(SHARED_MPATROL).$(VERSION) 2>&1 >/dev/null + -@ rm -f $(SHARTS_MPATROL).$(VERSION) 2>&1 >/dev/null -@ rm -f $(SHARED_MPATROL) $(SHARTS_MPATROL) 2>&1 >/dev/null -@ rm -f $(OBJECT_MPATROL) $(OBJTS_MPATROL) 2>&1 >/dev/null -@ rm -f $(LINT_MPATROL) $(LINTTS_MPATROL) 2>&1 >/dev/null -@ rm -f $(ARCHIVE_MPALLOC) 2>&1 >/dev/null - -@ rm -f $(SHARED_MPALLOC).$(VERSION).$(REVISION) 2>&1 >/dev/null + -@ rm -f $(SHARED_MPALLOC).$(VERSION) 2>&1 >/dev/null -@ rm -f $(SHARED_MPALLOC) $(OBJECT_MPALLOC) 2>&1 >/dev/null -@ rm -f $(LINT_MPALLOC) 2>&1 >/dev/null -@ rm -f $(ARCHIVE_MPTOOLS) $(LINT_MPTOOLS) 2>&1 >/dev/null Property changes on: head/devel/mpatrol/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/newt/files/patch-newt.c =================================================================== --- head/devel/newt/files/patch-newt.c (revision 387020) +++ head/devel/newt/files/patch-newt.c (revision 387021) @@ -1,12 +1,9 @@ - -$FreeBSD$ - --- newt.c 2009-09-24 11:03:09.000000000 -0400 +++ newt.c 2010-01-06 01:04:01.000000000 -0500 @@ -99,4 +99,6 @@ { "\033V", NEWT_KEY_PGUP, NULL }, { "\033v", NEWT_KEY_PGUP, NULL }, + { "\033[G", NEWT_KEY_PGDN, NULL }, + { "\033[I", NEWT_KEY_PGUP, NULL }, { "\026", NEWT_KEY_PGDN, NULL }, Property changes on: head/devel/newt/files/patch-newt.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/oserl/files/patch-Makefile =================================================================== --- head/devel/oserl/files/patch-Makefile (revision 387020) +++ head/devel/oserl/files/patch-Makefile (revision 387021) @@ -1,50 +1,47 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -10,6 +10,13 @@ TEXS = $(DOCS:.ndoc=.tex) PDFS = $(DOCS:.ndoc=.pdf) +CD = cd +ERLDOC = txt2tags +MKDIR = mkdir +MV = mv -vf +RM = rm -vf +SED = sed + ### Dependecy Search Paths VPATH = src:include:ebin:doc @@ -35,7 +42,11 @@ @$(RM) -R doc/man @$(RM) -R doc/pdf -doc: man html pdf +doc: dirs man html + +dirs: + @$(MKDIR) doc/man + @$(MKDIR) doc/html man: $(MANS) @$(MV) doc/man/$(APPNAME)_overview.3 doc/man/$(APPNAME).1 @@ -49,14 +60,14 @@ %.3: %.ndoc @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ - $(ERLDOC) -i - -t man --no-toc --erl -o man/$@; $(CD) .. + $(ERLDOC) -i - -t man --no-toc -o man/$@; $(CD) .. %.html: %.ndoc @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ - $(ERLDOC) -i - -t xhtml --erl -o html/$@; $(CD) .. + $(ERLDOC) -i - -t xhtml -o html/$@; $(CD) .. %.pdf: %.ndoc @$(CD) doc; $(SED) "s|%MODULES%|`echo $(MODS)`|g" ../$^ | \ $(SED) "s|%VSN%|$(VSN)|g" | $(SED) "s|%APPLICATION%|$(APPNAME)|g" | \ - $(ERLDOC) -i - -t pdf --no-toc --erl -o pdf/$@; $(CD) .. + $(ERLDOC) -i - -t pdf --no-toc -o pdf/$@; $(CD) .. Property changes on: head/devel/oserl/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/oserl/files/patch-rebar.config =================================================================== --- head/devel/oserl/files/patch-rebar.config (revision 387020) +++ head/devel/oserl/files/patch-rebar.config (revision 387021) @@ -1,17 +1,14 @@ - -$FreeBSD$ - --- rebar.config.orig +++ rebar.config @@ -1,10 +1,7 @@ -{lib_dirs, ["deps"]}. +{lib_dirs, ["deps", ".."]}. {erl_opts, [warnings_as_errors, debug_info]}. -{deps, [{common_lib, "3.3.4", - {git, "git://github.com/iamaleksey/common_lib.git", {tag, "3.3.4"}}}]}. - {erl_first_files, ["src/gen_esme_session.erl", "src/gen_mc_session.erl", "src/gen_esme.erl", Property changes on: head/devel/oserl/files/patch-rebar.config ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/oserl/files/patch-src_smpp__param.hrl =================================================================== --- head/devel/oserl/files/patch-src_smpp__param.hrl (revision 387020) +++ head/devel/oserl/files/patch-src_smpp__param.hrl (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/smpp_param.hrl.orig +++ src/smpp_param.hrl @@ -159,7 +159,7 @@ %% destination_addr %% %% %@doc Specifies the destination SME address. For mobile terminated -%% messages, this is the directory number of the recipient MS. IP addresses ç +%% messages, this is the directory number of the recipient MS. IP addresses %% are specified in "aaa.bbb.ccc.ddd" notation. C-Octet String, Var. max 21 %% octets. %% %@end Property changes on: head/devel/oserl/files/patch-src_smpp__param.hrl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/p5-Getopt-Long/files/patch-Makefile.PL =================================================================== --- head/devel/p5-Getopt-Long/files/patch-Makefile.PL (revision 387020) +++ head/devel/p5-Getopt-Long/files/patch-Makefile.PL (revision 387021) @@ -1,39 +1,37 @@ -$FreeBSD$ - --- Makefile.PL.orig Fri May 24 17:51:36 2002 +++ Makefile.PL Fri May 24 17:52:52 2002 @@ -5,6 +5,7 @@ require "./lib/Getopt/Long.pm"; my $version = $Getopt::Long::VERSION_STRING || $Getopt::Long::VERSION; +my $leave_alone = 1; sub MY::postamble { my $ret = ""; @@ -18,7 +19,7 @@ I can add instructions to the Makefile to remove it when you install this version. EOD - my $ans = prompt ("Shall I add the remove instructions?"); + my $ans = $leave_alone ? "no" : "yes"; if ( $ans =~ /^y/i ) { $ret .= < 'Module to handle parsing command line options', ), - INSTALLDIRS => 'perl', + INSTALLDIRS => ($leave_alone ? 'site' : 'perl'), PM => { "lib/newgetopt.pl" => '$(INST_LIB)/newgetopt.pl', "lib/Getopt/Long.pm" => '$(INST_LIB)/Getopt/Long.pm', # "perlcmdline.pod" => '$(INST_LIB)/pod/perlcmdline.pod', Property changes on: head/devel/p5-Getopt-Long/files/patch-Makefile.PL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/p5-Shape/files/patch-Shape.xs =================================================================== --- head/devel/p5-Shape/files/patch-Shape.xs (revision 387020) +++ head/devel/p5-Shape/files/patch-Shape.xs (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- Shape.xs.orig Tue Mar 4 14:18:00 2003 +++ Shape.xs Mon Aug 23 16:42:18 2004 @@ -2,7 +2,7 @@ #include "perl.h" #include "XSUB.h" -#include +#include MODULE = Shape PACKAGE = Shape @@ -389,7 +389,7 @@ case FTDouble: if (!(sv = newSVnv(DBFReadDoubleAttribute(hDBF,record,field)))) goto BREAK; break; - default: + default: break; } hv_store(hv2, field_name, strlen(field_name), sv, 0); Property changes on: head/devel/p5-Shape/files/patch-Shape.xs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-README.md =================================================================== --- head/devel/phpsh/files/patch-README.md (revision 387020) +++ head/devel/phpsh/files/patch-README.md (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- README.md.orig +++ README.md @@ -25,7 +25,7 @@ Installing Globally =================== -_Note that this install currently clobbers any previous /etc/phpsh/rc.php_ +_Note that this install currently clobbers any previous %%ETCDIR%%/rc.php_ * `python setup.py build` * `sudo python setup.py install` * `phpsh` @@ -56,7 +56,7 @@ Autoloading ----------- -* Modify /etc/phpsh/rc.php. Then: +* Modify %%ETCDIR%%/rc.php. Then: * `cd ~/www` * `phpsh` * And for times when you just want vanilla php: Property changes on: head/devel/phpsh/files/patch-README.md ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-setup.py =================================================================== --- head/devel/phpsh/files/patch-setup.py (revision 387020) +++ head/devel/phpsh/files/patch-setup.py (revision 387021) @@ -1,36 +1,33 @@ - -$FreeBSD$ - --- setup.py.orig +++ setup.py @@ -7,15 +7,15 @@ sys.path.insert(0, 'src') from phpsh import __version__ -if len(sys.argv) > 1 and sys.argv[1] == "build": - build_root = os.path.dirname(os.path.realpath(__file__)) - make_dir = os.path.join(build_root, "src/xdebug-clients/geben") - p = Popen(["make", "-C", make_dir]) - os.waitpid(p.pid, 0) +### EMACS:if len(sys.argv) > 1 and sys.argv[1] == "build": +### EMACS: build_root = os.path.dirname(os.path.realpath(__file__)) +### EMACS: make_dir = os.path.join(build_root, "src/xdebug-clients/geben") +### EMACS: p = Popen(["gmake", "-C", make_dir]) +### EMACS: os.waitpid(p.pid, 0) # something better than this? if os.getenv("USER") == "root": - config_dir = "/etc/phpsh" + config_dir = "%%ETCDIR%%" else: config_dir = os.getenv("HOME") + "/.phpsh" @@ -33,7 +33,7 @@ "xdebug-clients/geben/LICENSE", "xdebug-clients/geben/Makefile", "xdebug-clients/geben/geben.el", - "xdebug-clients/geben/geben.elc", +### EMACS: "xdebug-clients/geben/geben.elc", "xdebug-clients/geben/help", "xdebug-clients/geben/tree-widget/geben/*.png"]}, scripts=["src/phpsh", "src/dbgp-phpsh.py"], Property changes on: head/devel/phpsh/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_doc_phpsh.1 =================================================================== --- head/devel/phpsh/files/patch-src_doc_phpsh.1 (revision 387020) +++ head/devel/phpsh/files/patch-src_doc_phpsh.1 (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- src/doc/phpsh.1.orig +++ src/doc/phpsh.1 @@ -56,7 +56,7 @@ .TP \-c, \-\-codebase\-mode -Use "\-c none" to load no codebase\&. See /etc/phpsh/phpshrc\&.php for other codebase modes\&. +Use "\-c none" to load no codebase\&. See %%ETCDIR%%/phpshrc\&.php for other codebase modes\&. .TP \-t, \-\-test\-file Run a saved\-phpsh\-session unit test file\&. See test/ in the phpsh distribution for examples\&. @@ -141,7 +141,7 @@ .SH "CONFIGURATION" -Config file support was added in phpsh\-1\&.2\&. When phpsh starts up it tries to read its configuration from /etc/phpsh/config, then from $HOME/\&.phpsh/config\&. If either file is not present or not readable, it is ignored\&. Entries in the per\-user config file $HOME/\&.phpsh/config override the corresponding entries in the host\-wide config file /etc/phpsh/config\&. +Config file support was added in phpsh\-1\&.2\&. When phpsh starts up it tries to read its configuration from %%ETCDIR%%/config, then from $HOME/\&.phpsh/config\&. If either file is not present or not readable, it is ignored\&. Entries in the per\-user config file $HOME/\&.phpsh/config override the corresponding entries in the host\-wide config file %%ETCDIR%%/config\&. The config file consists of sections containing key:value pairs\&. Lines starting with # are ignored\&. All settings are optional and have reasonable default values\&. Section names are in brackets\&. A section name must be present in the config file if any settings in that section are present\&. The following configuration settings are supported: Property changes on: head/devel/phpsh/files/patch-src_doc_phpsh.1 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_doc_phpsh.1.html =================================================================== --- head/devel/phpsh/files/patch-src_doc_phpsh.1.html (revision 387020) +++ head/devel/phpsh/files/patch-src_doc_phpsh.1.html (revision 387021) @@ -1,28 +1,25 @@ - -$FreeBSD$ - --- src/doc/phpsh.1.html.orig +++ src/doc/phpsh.1.html @@ -58,7 +58,7 @@

- Use "-c none" to load no codebase. See /etc/phpsh/phpshrc.php for + Use "-c none" to load no codebase. See %%ETCDIR%%/phpshrc.php for other codebase modes.

@@ -404,11 +404,11 @@ without X Windows by starting emacs with geben manually in another terminal.

CONFIGURATION

Config file support was added in phpsh-1.2. When phpsh starts up it -tries to read its configuration from /etc/phpsh/config, then from +tries to read its configuration from %%ETCDIR%%/config, then from $HOME/.phpsh/config. If either file is not present or not readable, it is ignored. Entries in the per-user config file $HOME/.phpsh/config override the corresponding entries in the host-wide config file -/etc/phpsh/config.

+%%ETCDIR%%/config.

The config file consists of sections containing key:value pairs. Lines starting with # are ignored. All settings are optional and have reasonable default values. Section names are in brackets. A section Property changes on: head/devel/phpsh/files/patch-src_doc_phpsh.1.html ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_doc_phpsh.1.txt =================================================================== --- head/devel/phpsh/files/patch-src_doc_phpsh.1.txt (revision 387020) +++ head/devel/phpsh/files/patch-src_doc_phpsh.1.txt (revision 387021) @@ -1,28 +1,25 @@ - -$FreeBSD$ - --- src/doc/phpsh.1.txt.orig +++ src/doc/phpsh.1.txt @@ -51,7 +51,7 @@ ------- -c:: --codebase-mode:: - Use "-c none" to load no codebase. See /etc/phpsh/phpshrc.php for + Use "-c none" to load no codebase. See %%ETCDIR%%/phpshrc.php for other codebase modes. -t:: @@ -221,11 +221,11 @@ CONFIGURATION ------------- Config file support was added in phpsh-1.2. When phpsh starts up it -tries to read its configuration from /etc/phpsh/config, then from +tries to read its configuration from %%ETCDIR%%/config, then from $HOME/.phpsh/config. If either file is not present or not readable, it is ignored. Entries in the per-user config file $HOME/.phpsh/config override the corresponding entries in the host-wide config file -/etc/phpsh/config. +%%ETCDIR%%/config. The config file consists of sections containing key:value pairs. Lines starting with # are ignored. All settings are optional and have Property changes on: head/devel/phpsh/files/patch-src_doc_phpsh.1.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_manual.py =================================================================== --- head/devel/phpsh/files/patch-src_manual.py (revision 387020) +++ head/devel/phpsh/files/patch-src_manual.py (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/manual.py.orig +++ src/manual.py @@ -69,7 +69,7 @@ manual_file = "php_manual.db" manual_path = os.path.join(os.getenv("HOME"), ".phpsh", manual_file) if not os.path.exists(manual_path): - manual_path = os.path.join("/etc/phpsh", manual_file) + manual_path = os.path.join("%%ETCDIR%%", manual_file) conn = sqlite.connect(manual_path) cursor = conn.cursor() Property changes on: head/devel/phpsh/files/patch-src_manual.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_phpsh =================================================================== --- head/devel/phpsh/files/patch-src_phpsh (revision 387020) +++ head/devel/phpsh/files/patch-src_phpsh (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/phpsh.orig +++ src/phpsh @@ -10,7 +10,7 @@ p = OptionParser(usage=usage, version="%prog " + __version__) p.add_option("-c", "--codebase-mode", help="""Use "-c none" to load no codebase. -See /etc/phpsh/rc.php for other codebase modes.""") +See %%ETCDIR%%/rc.php for other codebase modes.""") p.add_option("-t", "--test-file", help="""Run a saved-phpsh-session unit test file. See test/ in the phpsh distribution for examples.""") Property changes on: head/devel/phpsh/files/patch-src_phpsh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_phpsh.php =================================================================== --- head/devel/phpsh/files/patch-src_phpsh.php (revision 387020) +++ head/devel/phpsh/files/patch-src_phpsh.php (revision 387021) @@ -1,32 +1,29 @@ - -$FreeBSD$ - --- src/phpsh.php.orig +++ src/phpsh.php @@ -10,7 +10,7 @@ // usage: this is only called from phpsh (the python end), as: // phpsh.php [-c] // -// use '' for default codebase-mode, define others in /etc/phpsh/rc.php +// use '' for default codebase-mode, define others in %%ETCDIR%%/rc.php // -c turns off color // set the TFBENV to script @@ -46,7 +46,7 @@ if (file_exists($___phpsh___homerc)) { require_once $___phpsh___homerc; } else { - require_once '/etc/phpsh/rc.php'; + require_once '%%ETCDIR%%/rc.php'; } $___phpsh___do_color = true; @@ -547,7 +547,7 @@ $err_msg = 'Not executing input: Possible call to undefined function '. $undefd_func."()\n". - 'See /etc/phpsh/config.sample to disable UndefinedFunctionCheck.'; + 'See %%ETCDIR%%/config.sample to disable UndefinedFunctionCheck.'; } } if ($err_msg) { Property changes on: head/devel/phpsh/files/patch-src_phpsh.php ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/phpsh/files/patch-src_phpsh.py =================================================================== --- head/devel/phpsh/files/patch-src_phpsh.py (revision 387020) +++ head/devel/phpsh/files/patch-src_phpsh.py (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/phpsh.py.orig +++ src/phpsh.py @@ -274,7 +274,7 @@ self.config.add_section("Emacs") def read(self): - config_files = ["/etc/phpsh/config"] + config_files = ["%%ETCDIR%%/config"] home = os.getenv("HOME") if home: homestr = home.strip() Property changes on: head/devel/phpsh/files/patch-src_phpsh.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/pwlib/files/patch-make__lib.mak =================================================================== --- head/devel/pwlib/files/patch-make__lib.mak (revision 387020) +++ head/devel/pwlib/files/patch-make__lib.mak (revision 387021) @@ -1,51 +1,48 @@ - -$FreeBSD$ - --- make/lib.mak +++ make/lib.mak @@ -130,12 +127,18 @@ # ifneq ($(OSTYPE),Darwin) - LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION) - LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION) - ifeq ($(BUILD_TYPE),.) - LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER) + ifeq ($(OSTYPE),FreeBSD) + LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION) + LIBNAME_MIN = $(LIBNAME_MAJ) + LIBNAME_PAT = $(LIBNAME_MAJ) else - LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER) + LIBNAME_MAJ = $(LIB_FILENAME).$(MAJOR_VERSION) + LIBNAME_MIN = $(LIBNAME_MAJ).$(MINOR_VERSION) + ifeq ($(BUILD_TYPE),.) + LIBNAME_PAT = $(LIBNAME_MIN).$(BUILD_NUMBER) + else + LIBNAME_PAT = $(LIBNAME_MIN)-$(BUILD_TYPE)$(BUILD_NUMBER) + endif endif else LIBNAME_MAJ = $(subst .$(LIB_SUFFIX),.$(MAJOR_VERSION).$(LIB_SUFFIX),$(LIB_FILENAME)) @@ -212,8 +215,10 @@ $(LIBDIR)/$(LIB_FILENAME): $(LIBDIR)/$(LIBNAME_PAT) cd $(LIBDIR) ; rm -f $(LIB_FILENAME) ; ln -sf $(LIBNAME_PAT) $(LIB_FILENAME) +ifneq ($(OSTYPE),FreeBSD) cd $(LIBDIR) ; rm -f $(LIBNAME_MAJ) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MAJ) cd $(LIBDIR) ; rm -f $(LIBNAME_MIN) ; ln -sf $(LIBNAME_PAT) $(LIBNAME_MIN) +endif $(LIBDIR)/$(LIBNAME_PAT): $(STATIC_LIB_FILE) @echo EXTLIBS = $(EXTLIBS) @@ -224,8 +229,10 @@ install: $(LIBDIR)/$(LIBNAME_PAT) $(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT) ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIB_FILENAME) +ifneq ($(OSTYPE),FreeBSD) ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ) ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN) +endif endif # P_SHAREDLIB Property changes on: head/devel/pwlib/files/patch-make__lib.mak ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/py-dal/files/patch-dal_dbapi_db__row.py =================================================================== --- head/devel/py-dal/files/patch-dal_dbapi_db__row.py (revision 387020) +++ head/devel/py-dal/files/patch-dal_dbapi_db__row.py (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- dal/dbapi/db_row.py +++ dal/dbapi/db_row.py @@ -699,7 +699,6 @@ assert '__init__' not in cls_dict def __init__(self, fields): - super(row_class, self).__init__(fields) self.fields = field_class(fields) row_class.__init__ = __init__ Property changes on: head/devel/py-dal/files/patch-dal_dbapi_db__row.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/py-dialog/files/patch-dialog.py =================================================================== --- head/devel/py-dialog/files/patch-dialog.py (revision 387020) +++ head/devel/py-dialog/files/patch-dialog.py (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- dialog.py.orig +++ dialog.py @@ -214,6 +214,10 @@ "create_rc": lambda file: ("--create-rc", file), "defaultno": lambda enable: _simple_option("--defaultno", enable), "default_item": lambda string: ("--default-item", string), + "yes_label": lambda string: ("--yes-label", string), + "no_label": lambda string: ("--no-label", string), + "exit_label": lambda string: ("--exit-label", string), + "extra_button": lambda enable: _simple_option("--extra-button", enable), "help": lambda enable: _simple_option("--help", enable), "help_button": lambda enable: _simple_option("--help-button", enable), "help_label": lambda string: ("--help-label", string), @@ -524,7 +528,7 @@ """ - def __init__(self, dialog="dialog", DIALOGRC=None, compat="dialog", + def __init__(self, dialog="cdialog", DIALOGRC=None, compat="dialog", use_stdout=None): """Constructor for Dialog instances. Property changes on: head/devel/py-dialog/files/patch-dialog.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/py-ncurses/files/patch-ncurses___panel_wrap.c =================================================================== --- head/devel/py-ncurses/files/patch-ncurses___panel_wrap.c (revision 387020) +++ head/devel/py-ncurses/files/patch-ncurses___panel_wrap.c (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- ncurses/_panel_wrap.c 2001/03/13 17:00:02 1.1 +++ ncurses/_panel_wrap.c 2001/03/13 17:00:26 @@ -588,8 +588,8 @@ extern PANEL *new_panel(WINDOW *); extern PANEL *panel_above(const PANEL *); extern PANEL *panel_below(const PANEL *); -extern int set_panel_userptr(PANEL *,const void *); -extern const void *panel_userptr(const PANEL *); +/*extern int set_panel_userptr(PANEL *,const void *);*/ +/*extern const void *panel_userptr(const PANEL *);*/ extern int move_panel(PANEL *,int ,int ); extern int replace_panel(PANEL *,WINDOW *); extern int panel_hidden(const PANEL *); Property changes on: head/devel/py-ncurses/files/patch-ncurses___panel_wrap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/pychecker/files/patch-setup.py =================================================================== --- head/devel/pychecker/files/patch-setup.py (revision 387020) +++ head/devel/pychecker/files/patch-setup.py (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- setup.py +++ setup.py @@ -187,7 +187,6 @@ 'url' : "http://pychecker.sourceforge.net/", 'packages' : [ 'pychecker', ], 'scripts' : [ "pychecker" ], # note: will be replaced by customized action - 'data_files' : [ ( "pychecker", DATA_FILES, ) ], 'long_description' : LONG_DESCRIPTION, 'cmdclass' : CUSTOMIZED_ACTIONS, } Property changes on: head/devel/pychecker/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/sdlmm/files/patch-configure =================================================================== --- head/devel/sdlmm/files/patch-configure (revision 387020) +++ head/devel/sdlmm/files/patch-configure (revision 387021) @@ -1,77 +1,74 @@ - -$FreeBSD$ - --- configure 2001/09/03 14:45:25 1.1 +++ configure 2001/09/03 14:47:10 @@ -5888,7 +5888,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - CXXFLAGS="$OLD_CXXFLAGS -O3" +# CXXFLAGS="$OLD_CXXFLAGS -O3" if test "$cross_compiling" = yes; then sdlmm_cv_option_O3=no else @@ -5919,7 +5919,7 @@ CXXFLAGS="$OLD_CXXFLAGS" if test x"$sdlmm_cv_option_O3" = "xyes" ; then - OPTIMIZE="$OPTIMIZE -O3" +# OPTIMIZE="$OPTIMIZE -O3" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -5934,7 +5934,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - CXXFLAGS="$OLD_CXXFLAGS -O2" +# CXXFLAGS="$OLD_CXXFLAGS -O2" if test "$cross_compiling" = yes; then sdlmm_cv_option_O2=yes else @@ -5965,7 +5965,7 @@ CXXFLAGS="$OLD_CXXFLAGS" if test x"$sdlmm_cv_option_O2" = "xyes" ; then - OPTIMIZE="$OPTIMIZE -O2" +# OPTIMIZE="$OPTIMIZE -O2" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -7813,7 +7813,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - CXXFLAGS="$OLD_CXXFLAGS -O3" +# CXXFLAGS="$OLD_CXXFLAGS -O3" if test "$cross_compiling" = yes; then sdlmm_cv_option_O3=no else @@ -7844,7 +7844,7 @@ CXXFLAGS="$OLD_CXXFLAGS" if test x"$sdlmm_cv_option_O3" = "xyes" ; then - OPTIMIZE="$OPTIMIZE -O3" +# OPTIMIZE="$OPTIMIZE -O3" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 @@ -7859,7 +7859,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else - CXXFLAGS="$OLD_CXXFLAGS -O2" +# CXXFLAGS="$OLD_CXXFLAGS -O2" if test "$cross_compiling" = yes; then sdlmm_cv_option_O2=yes else @@ -7890,7 +7890,7 @@ CXXFLAGS="$OLD_CXXFLAGS" if test x"$sdlmm_cv_option_O2" = "xyes" ; then - OPTIMIZE="$OPTIMIZE -O2" +# OPTIMIZE="$OPTIMIZE -O2" echo "$ac_t""yes" 1>&6 else echo "$ac_t""no" 1>&6 Property changes on: head/devel/sdlmm/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/sdlmm/files/patch-src__Makefile.in =================================================================== --- head/devel/sdlmm/files/patch-src__Makefile.in (revision 387020) +++ head/devel/sdlmm/files/patch-src__Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/Makefile.in 2001/09/03 14:43:41 1.1 +++ src/Makefile.in 2001/09/03 14:43:55 @@ -99,7 +99,7 @@ libSDLmm_la_SOURCES = sdlmm_global.cpp sdlmm_basesurface.cpp sdlmm_surface.cpp sdlmm_display.cpp sdlmm_pixelformat.cpp sdlmm_srect.cpp sdlmm_event.cpp sdlmm_audio.cpp sdlmm_timer.cpp sdlmm_joystick.cpp sdlmm_cd.cpp sdlmm_videoinfo.cpp -libSDLmm_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libSDLmm_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) # The directory where the include files will be installed Property changes on: head/devel/sdlmm/files/patch-src__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/shmap/files/patch-shmap_shmap.c =================================================================== --- head/devel/shmap/files/patch-shmap_shmap.c (revision 387020) +++ head/devel/shmap/files/patch-shmap_shmap.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- shmap/shmap.c.orig Mon Dec 30 22:56:29 2002 +++ shmap/shmap.c Mon Dec 30 22:59:36 2002 @@ -706,7 +706,7 @@ /* returns the amount of items in hashmap */ -unsigned int shmap_items ( shmap * map ) +size_t shmap_items ( shmap * map ) { CHECK_NULL0(map) Property changes on: head/devel/shmap/files/patch-shmap_shmap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/devel/ucpp/files/patch-Makefile =================================================================== --- head/devel/ucpp/files/patch-Makefile (revision 387020) +++ head/devel/ucpp/files/patch-Makefile (revision 387021) @@ -1,26 +1,24 @@ -$FreeBSD$ - Fixes clang build --- Makefile.orig 2011-08-09 05:13:15.000000000 +0000 +++ Makefile 2011-08-29 21:10:34.000000000 +0000 @@ -56,8 +56,8 @@ #FLAGS = -O -m -DMEM_CHECK # for gcc -CC = gcc -FLAGS = -O3 -W -Wall -ansi +CC ?= cc +FLAGS = -ansi -DAUDIT -DMEM_DEBUG #FLAGS = -g -W -Wall -ansi -DAUDIT -DMEM_DEBUG #FLAGS = -O3 -mcpu=pentiumpro -fomit-frame-pointer -W -Wall -ansi -DMEM_CHECK #FLAGS = -O -pg -W -Wall -ansi -DMEM_CHECK @@ -88,7 +88,7 @@ # ----- nothing should be changed below this line ----- COBJ = mem.o nhash.o cpp.o lexer.o assert.o macro.o eval.o -CFLAGS = $(FLAGS) +CFLAGS += $(FLAGS) all: ucpp @ar cq libucpp.a *.o Property changes on: head/devel/ucpp/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/dns/ez-ipupdate/files/patch-ez-ipupdate.c =================================================================== --- head/dns/ez-ipupdate/files/patch-ez-ipupdate.c (revision 387020) +++ head/dns/ez-ipupdate/files/patch-ez-ipupdate.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- ez-ipupdate.c.orig +++ ez-ipupdate.c @@ -798,7 +798,7 @@ sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); #endif - syslog(LOG_NOTICE, buf); + syslog(LOG_NOTICE, "%s", buf); } else { Property changes on: head/dns/ez-ipupdate/files/patch-ez-ipupdate.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/dns/geta/files/patch-geta_geta.c =================================================================== --- head/dns/geta/files/patch-geta_geta.c (revision 387020) +++ head/dns/geta/files/patch-geta_geta.c (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- geta/geta.c.orig Wed Dec 18 02:18:00 2002 +++ geta/geta.c Wed Dec 18 02:18:16 2002 @@ -7,6 +7,7 @@ #include #include #include +#include char *progname; int errors = 0; /* number of errors */ Property changes on: head/dns/geta/files/patch-geta_geta.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/dns/libidn/files/patch-po_LINGUAS =================================================================== --- head/dns/libidn/files/patch-po_LINGUAS (revision 387020) +++ head/dns/libidn/files/patch-po_LINGUAS (revision 387021) @@ -1,11 +1,8 @@ - -$FreeBSD$ - --- po/LINGUAS.orig +++ po/LINGUAS @@ -1,5 +1,3 @@ -en@boldquot -en@quot cs da de Property changes on: head/dns/libidn/files/patch-po_LINGUAS ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/dns/py-namebench/files/patch-libnamebench-util-py =================================================================== --- head/dns/py-namebench/files/patch-libnamebench-util-py (revision 387020) +++ head/dns/py-namebench/files/patch-libnamebench-util-py (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - Missing comma causes two strings below to be concatenated, making /usr/local/share/namebench and /usr/local/etc/namebench useless. Not great for us! --- libnamebench/util.py.orig 2011-08-15 19:59:22.000000000 +0100 +++ libnamebench/util.py 2011-08-15 19:59:37.000000000 +0100 @@ -85,7 +85,7 @@ os.path.join(os.getcwd(), 'namebench.app', 'Contents', 'Resources'), os.path.join(os.getcwd(), '..'), os.path.join(sys.prefix, 'namebench'), - '/usr/local/share/namebench' + '/usr/local/share/namebench', '/usr/local/etc/namebench', '/usr/local/namebench', '/etc/namebench', Property changes on: head/dns/py-namebench/files/patch-libnamebench-util-py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/emacs/files/patch-sources.el =================================================================== --- head/editors/emacs/files/patch-sources.el (revision 387020) +++ head/editors/emacs/files/patch-sources.el (revision 387021) @@ -1,10 +1,7 @@ - -$FreeBSD$ - --- /dev/null +++ sources.el @@ -0,0 +1,4 @@ +;;; Path to Emacs C Sources. +(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version) + (setq find-function-C-source-directory + "%%DATADIR%%/%%EMACS_VER%%/src")) Property changes on: head/editors/emacs/files/patch-sources.el ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/emacs-devel/files/patch-sources.el =================================================================== --- head/editors/emacs-devel/files/patch-sources.el (revision 387020) +++ head/editors/emacs-devel/files/patch-sources.el (revision 387021) @@ -1,10 +1,7 @@ - -$FreeBSD$ - --- /dev/null +++ sources.el @@ -0,0 +1,4 @@ +;;; Path to Emacs C Sources. +(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version) + (setq find-function-C-source-directory + "%%DATADIR%%/%%EMACS_VER%%/src")) Property changes on: head/editors/emacs-devel/files/patch-sources.el ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/led/files/patch-src__file.c =================================================================== --- head/editors/led/files/patch-src__file.c (revision 387020) +++ head/editors/led/files/patch-src__file.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/file.c 2002/07/15 11:40:21 1.1 +++ src/file.c 2002/07/15 11:42:31 @@ -192,6 +192,8 @@ putc('\r', fp); putc('\n', fp); } + fflush(fp); + fsync(fileno(fp)); return 0; } Property changes on: head/editors/led/files/patch-src__file.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/led/files/patch-src_color.c =================================================================== --- head/editors/led/files/patch-src_color.c (revision 387020) +++ head/editors/led/files/patch-src_color.c (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- src/color.c.orig Mon Aug 23 17:16:34 2004 +++ src/color.c Mon Aug 23 17:16:57 2004 @@ -206,6 +206,7 @@ } } out: + ; } /* read in color configuration file */ Property changes on: head/editors/led/files/patch-src_color.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/led/files/patch-src_complete.c =================================================================== --- head/editors/led/files/patch-src_complete.c (revision 387020) +++ head/editors/led/files/patch-src_complete.c (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- src/complete.c.orig Mon Aug 23 17:17:13 2004 +++ src/complete.c Mon Aug 23 17:17:24 2004 @@ -183,6 +183,7 @@ sizeof(u_char *)); } next: + ; } comps[i] = NULL; Property changes on: head/editors/led/files/patch-src_complete.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/p5-Padre/files/patch-lib_Padre_Wx.pm =================================================================== --- head/editors/p5-Padre/files/patch-lib_Padre_Wx.pm (revision 387020) +++ head/editors/p5-Padre/files/patch-lib_Padre_Wx.pm (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- lib/Padre/Wx.pm.orig +++ lib/Padre/Wx.pm @@ -67,6 +67,7 @@ sub launch_browser { require Padre::Task::LaunchDefaultBrowser; + Wx::LaunchDefaultBrowser( $_[0] ); return 1; Padre::Task::LaunchDefaultBrowser->new( url => $_[0], )->schedule; Property changes on: head/editors/p5-Padre/files/patch-lib_Padre_Wx.pm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/ted/files/patch-appUtil-utilPrinter.c =================================================================== --- head/editors/ted/files/patch-appUtil-utilPrinter.c (revision 387020) +++ head/editors/ted/files/patch-appUtil-utilPrinter.c (revision 387021) @@ -1,20 +1,18 @@ - $FreeBSD$ - --- appUtil/utilPrinter.c Sun Aug 17 19:14:01 2003 +++ appUtil/utilPrinter.c Sun Aug 17 19:15:54 2003 @@ -331,14 +331,14 @@ /* 1 */ if ( count == 0 ) { - utilPrinterGetLprPrinters( "( lpc status ) 2>/dev/null", + utilPrinterGetLprPrinters( "( lpc status all) 2>/dev/null", &defaultPrinter, &count, &pd ); } /* 1b */ if ( count == 0 ) { - utilPrinterGetLprPrinters( "( /usr/sbin/lpc status ) 2>/dev/null", + utilPrinterGetLprPrinters( "( /usr/sbin/lpc status all) 2>/dev/null", &defaultPrinter, &count, &pd ); } Property changes on: head/editors/ted/files/patch-appUtil-utilPrinter.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/darcnes/files/patch-video__x.c =================================================================== --- head/emulators/darcnes/files/patch-video__x.c (revision 387020) +++ head/emulators/darcnes/files/patch-video__x.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- video_x.c.orig Tue Aug 24 10:46:40 2004 +++ video_x.c Tue Aug 24 10:46:55 2004 @@ -365,7 +365,7 @@ ui_joypad->data &= ~ui_joypad->button_template->buttons[0]; } - default: + default: break; } } Property changes on: head/emulators/darcnes/files/patch-video__x.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/frodo/files/patch-Display.h =================================================================== --- head/emulators/frodo/files/patch-Display.h (revision 387020) +++ head/emulators/frodo/files/patch-Display.h (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- Display.h.orig Sat Nov 30 01:14:14 2002 +++ Display.h Sat Nov 30 01:14:37 2002 @@ -112,7 +112,7 @@ #ifdef __unix void draw_led(int num, int state); // Draw one LED - static void pulse_handler(...); // LED error blinking + static void pulse_handler(int sig); // LED error blinking #endif #ifdef WIN32 Property changes on: head/emulators/frodo/files/patch-Display.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/frodo/files/patch-Display__x.i =================================================================== --- head/emulators/frodo/files/patch-Display__x.i (revision 387020) +++ head/emulators/frodo/files/patch-Display__x.i (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- Display_x.i.orig Sat Nov 30 01:11:07 2002 +++ Display_x.i Sat Nov 30 01:11:41 2002 @@ -525,7 +525,7 @@ * LED error blink */ -void C64Display::pulse_handler(...) +void C64Display::pulse_handler(int sig) { for (int i=0; i<4; i++) switch (c64_disp->led_state[i]) { Property changes on: head/emulators/frodo/files/patch-Display__x.i ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/frodo/files/patch-SAM.cpp =================================================================== --- head/emulators/frodo/files/patch-SAM.cpp (revision 387020) +++ head/emulators/frodo/files/patch-SAM.cpp (revision 387021) @@ -1,23 +1,20 @@ - -$FreeBSD$ - --- SAM.cpp.orig Sat Nov 30 01:25:40 2002 +++ SAM.cpp Sat Nov 30 01:26:38 2002 @@ -205,7 +205,7 @@ // Prototypes static void error(char *s); -static void handle_abort(...); +static void handle_abort(int sig); static void init_abort(void); static void exit_abort(void); static bool aborted(void); @@ -470,7 +470,7 @@ struct sigaction my_sa; #endif -static void handle_abort(...) +static void handle_abort(int sig) { WasAborted = true; #if !defined(HAVE_SIGACTION) && defined(HAVE_SIGNAL) Property changes on: head/emulators/frodo/files/patch-SAM.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/mtools/files/patch-a =================================================================== --- head/emulators/mtools/files/patch-a (revision 387020) +++ head/emulators/mtools/files/patch-a (revision 387021) @@ -1,44 +1,41 @@ - -$FreeBSD$ - --- Makefile.in.orig +++ Makefile.in @@ -72,10 +72,13 @@ .SUFFIXES: .o .c .SUFFIXES: .o .c -MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ +MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 minfo.1 \ mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \ mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1 +ifndef WITHOUT_X11 +MAN1 += floppyd.1 floppyd_installtest.1 +endif MAN1EXT = 1 MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT} MAN5 = mtools.5 @@ -132,7 +135,7 @@ xdf_io.c mkmanifest.c -SCRIPTS = mcheck mxtar uz tgz mcomp amuFormat.sh +SCRIPTS = mcheck mxtar mcomp amuFormat.sh LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \ mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \ @@ -269,11 +272,11 @@ install-scripts: $(DESTDIR)$(bindir)/mtools @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) @for j in $(SCRIPTS) ; do \ - $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ + $(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \ echo $(DESTDIR)$(bindir)/$$j ; \ done - rm -f $(DESTDIR)$(bindir)/lz - $(LN_S) uz $(DESTDIR)$(bindir)/lz + #rm -f $(DESTDIR)$(bindir)/lz + #$(LN_S) uz $(DESTDIR)$(bindir)/lz install-man: @$(top_srcdir)/mkinstalldirs $(MAN1DIR) Property changes on: head/emulators/mtools/files/patch-a ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/virtio-kmod/files/extra-patch-virtio.h =================================================================== --- head/emulators/virtio-kmod/files/extra-patch-virtio.h (revision 387020) +++ head/emulators/virtio-kmod/files/extra-patch-virtio.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- sys/dev/virtio/virtio.h.orig 2012-08-22 09:25:24.732287379 +0900 +++ sys/dev/virtio/virtio.h 2012-08-22 09:27:32.411327803 +0900 @@ -150,4 +150,8 @@ VIRTIO_RDWR_DEVICE_CONFIG(2, uint16_t); VIRTIO_RDWR_DEVICE_CONFIG(4, uint32_t); +#ifndef DEVMETHOD_END +#define DEVMETHOD_END { NULL, NULL } +#endif + #endif /* _VIRTIO_H_ */ Property changes on: head/emulators/virtio-kmod/files/extra-patch-virtio.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/yape/files/patch-Makefile =================================================================== --- head/emulators/yape/files/patch-Makefile (revision 387020) +++ head/emulators/yape/files/patch-Makefile (revision 387021) @@ -1,26 +1,23 @@ - -$FreeBSD$ - --- Makefile.orig +++ Makefile @@ -23,8 +23,8 @@ hasnoheader = main.h dos.h sourcefiles = $(filter-out $(hasnoheader),$(allfiles)) device.h mem.h roms.h types.h -CC = g++ -cflags = -O3 -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags` +CC = $(CXX) +cflags = $(CFLAGS) -finline -frerun-loop-opt -Winline -fomit-frame-pointer `sdl-config --cflags` libs = `sdl-config --libs` #SDL_CFLAGS := $(shell sdl-config --cflags) @@ -72,6 +72,9 @@ prg.o : prg.cpp prg.h $(CC) $(cflags) -c $< +serial.o : serial.cpp serial.h + $(CC) $(cflags) -c $< + sound.o : sound.cpp sound.h $(CC) $(cflags) -c $< Property changes on: head/emulators/yape/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/yape/files/patch-README.SDL =================================================================== --- head/emulators/yape/files/patch-README.SDL (revision 387020) +++ head/emulators/yape/files/patch-README.SDL (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- README.SDL.orig +++ README.SDL @@ -80,7 +80,7 @@ LALT + W : toggle between unlimited speed and 50 Hz frame rate (original speed) Internal disk LOAD/SAVE operations are supported to the current - file system directory, which is usually '/home//yape'. + file system directory, which is usually '/home//.yape'. Any PRG files you may wish to load, should go there, although you can browse the directory tree from the user interface, too. Property changes on: head/emulators/yape/files/patch-README.SDL ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/yape/files/patch-archdep.cpp =================================================================== --- head/emulators/yape/files/patch-archdep.cpp (revision 387020) +++ head/emulators/yape/files/patch-archdep.cpp (revision 387021) @@ -1,32 +1,29 @@ - -$FreeBSD$ - --- archdep.cpp.orig +++ archdep.cpp @@ -75,7 +75,7 @@ int ad_makedirs(char *path) { strcpy(temp,path); - strcat(temp, "/yape"); + strcat(temp, "/.yape"); CreateDirectory(temp, NULL); return 1; @@ -296,7 +296,7 @@ // Possible buffer overflow fixed. strncpy(temp, path, 512); if (strlen(temp) > 506) return 0; - strcat(temp, "/yape"); + strcat(temp, "/.yape"); mkdir(temp, 0777); return 1; @@ -307,7 +307,7 @@ // Possible buffer overflow fixed. strncpy(temp, tmpchr, 512); if (strlen(temp) > 496) return NULL; - strcat( temp, "/yape/yape.conf"); + strcat( temp, "/.yape/yape.conf"); return temp; } Property changes on: head/emulators/yape/files/patch-archdep.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/yape/files/patch-interface.cpp =================================================================== --- head/emulators/yape/files/patch-interface.cpp (revision 387020) +++ head/emulators/yape/files/patch-interface.cpp (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- interface.cpp.orig +++ interface.cpp @@ -10,7 +10,7 @@ (c) 2000, 2001 Attila Grósz */ -#include "SDL/SDL.h" +#include "SDL.h" #include "tedmem.h" #include "interface.h" #include "archdep.h" Property changes on: head/emulators/yape/files/patch-interface.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/yape/files/patch-serial.h =================================================================== --- head/emulators/yape/files/patch-serial.h (revision 387020) +++ head/emulators/yape/files/patch-serial.h (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- serial.h.orig +++ serial.h @@ -1,7 +1,7 @@ #ifndef _SERIAL_H #define _SERIAL_H -#include "SDL/SDL.h" +#include "SDL.h" class CSerial { Property changes on: head/emulators/yape/files/patch-serial.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/emulators/yape/files/patch-sound.h =================================================================== --- head/emulators/yape/files/patch-sound.h (revision 387020) +++ head/emulators/yape/files/patch-sound.h (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- sound.h.orig +++ sound.h @@ -1,7 +1,7 @@ #ifndef _SOUND_H #define _SOUND_H -#include +#include #include "types.h" extern void init_audio(unsigned int sampleFrq = 48000); Property changes on: head/emulators/yape/files/patch-sound.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/french/tvdownloader/files/patch-tvdownloader.sh =================================================================== --- head/french/tvdownloader/files/patch-tvdownloader.sh (revision 387020) +++ head/french/tvdownloader/files/patch-tvdownloader.sh (revision 387021) @@ -1,27 +1,26 @@ --- tvdownloader.sh.orig 2010-10-16 16:27:16.000000000 +0200 +++ tvdownloader.sh 2010-12-19 23:38:13.000000000 +0100 -@@ -1,20 +1,5 @@ +@@ -1,20 +1,4 @@ -#!/bin/bash +#! /bin/sh -+# $FreeBSD$ cd "__DATADIR__/tvdownloader/" - -if [ ! -z "`python --version 2>&1 | grep 'Python 2'`" ] -then - python main.py "$*" -else - if [ -x "/usr/bin/python2.7" ] - then - python2.7 main.py "$*" - else - if [ -x "/usr/bin/python2.6" ] - then - python2.6 main.py "$*" - else - echo "Erreur : impossible de trouver une version de Python 2" - fi - fi -fi \ No newline at end of file +exec %%PYTHON_CMD%% main.py Property changes on: head/french/tvdownloader/files/patch-tvdownloader.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/ftp/cftp/files/patch-ftp.c =================================================================== --- head/ftp/cftp/files/patch-ftp.c (revision 387020) +++ head/ftp/cftp/files/patch-ftp.c (revision 387021) @@ -1,41 +1,38 @@ - -$FreeBSD$ - --- ftp.c.orig Tue Sep 17 16:58:18 2002 +++ ftp.c Sat Sep 28 15:49:05 2002 @@ -311,7 +311,7 @@ rftp_list(char *path) { directory *dir; - int fd; + int fd, resp; FILE *f; if (ftp_mode('a') == -1 || ftp_cwd(path) == -1) @@ -321,7 +321,7 @@ return NULL; ftp_put("list"); - if (ftp_resp() != 150) { + if ((resp=ftp_resp()) != 150 && resp != 125) { close(fd); dir = (directory *)malloc(sizeof(directory)); dir->line = (direntry *)malloc(sizeof(direntry)); @@ -379,7 +379,7 @@ void * rftp_retr(char *file, int mode, long *startp, long *sizep) { - int fd; + int fd, resp; char *dir, *name, *can, *p; FILE *fin; @@ -400,7 +400,7 @@ } ftp_put("retr %s", name); - if (ftp_resp() != 150) { + if ((resp=ftp_resp()) != 150 && resp != 125) { close(fd); return NULL; } Property changes on: head/ftp/cftp/files/patch-ftp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/bomberinstinct/files/patch-data__Sprites__Makefile.in =================================================================== --- head/games/bomberinstinct/files/patch-data__Sprites__Makefile.in (revision 387020) +++ head/games/bomberinstinct/files/patch-data__Sprites__Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- data/Sprites/Makefile.in 2002/07/02 12:58:45 1.1 +++ data/Sprites/Makefile.in 2002/07/02 13:05:49 @@ -66,7 +66,7 @@ VERSION = @VERSION@ spritesdir = $(pkgdatadir)/Sprites -sprites_DATA = 1.spr 2.spr 3.spr 4.spr 5.spr 6.spr 7.spr 8.spr TeraSoft1.spr TeraSoft2.spr barbare.spr bombe.spr bonus.spr bouton.spr caillou.spr circuit.spr citrouille.spr condens.spr court-circuit.spr etoiles.spr faille.spr flammes.spr fleche.spr flechrouge.spr fontaine.spr grotte.spr infos.spr intro.spr louis.spr maagus.spr magus.spr menu.spr miroirs.spr murlave.spr murnul.spr nived.spr pschit.spr puce.spr rien.spr ruines.spr telgris.spr telrouge.spr troll.spr tunnel.spr +sprites_DATA = 1.spr 2.spr 3.spr 4.spr 5.spr 6.spr 7.spr 8.spr TeraSoft1.spr TeraSoft2.spr barbare.spr barbareb.spr bombe.spr bonus.spr bouton.spr caillou.spr circuit.spr citrouille.spr condens.spr court-circuit.spr etoiles.spr faille.spr flammes.spr fleche.spr flechrouge.spr fontaine.spr grotte.spr infos.spr intro.spr louis.spr louisb.spr maagus.spr magus.spr magusb.spr menu.spr miroirs.spr murlave.spr murnul.spr nived.spr pschit.spr puce.spr rien.spr ruines.spr telgris.spr telrouge.spr troll.spr trollb.spr tunnel.spr EXTRA_DIST = $(sprites_DATA) Property changes on: head/games/bomberinstinct/files/patch-data__Sprites__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/digger-vgl/files/patch-fbsd__kbd.c =================================================================== --- head/games/digger-vgl/files/patch-fbsd__kbd.c (revision 387020) +++ head/games/digger-vgl/files/patch-fbsd__kbd.c (revision 387021) @@ -1,129 +1,126 @@ - -$FreeBSD$ - --- fbsd_kbd.c.orig +++ fbsd_kbd.c @@ -1,6 +1,8 @@ #include #include #include +#include +#include #include #include "def.h" @@ -20,6 +22,14 @@ 'a','s','d','f','g','h','j','k','l',';','\'','z','x',\ 'c','v','b','n','m',',','.','/',' '}; +#define F1KEY (59+128) +#define F10KEY (68+128) +#define LALTKEY (56+128) +#define RALTKEY (93+128) +#define altpressed (states[LALTKEY] || states[RALTKEY]) + +extern bool started, pausef; + void initkeyb(void) { VGLKeyboardInit(VGL_CODEKEYS); @@ -31,33 +41,80 @@ VGLKeyboardEnd(); } +bool UpdateStates(Sint4* result) +{ + Sint4 i; + bool isasymbol, state; + + if(*result < 128) + state = TRUE; + else { + state = FALSE; + *result -= 128; + } + + isasymbol = FALSE; + for(i=0;quertycodes[i]!=0;i++) + if(*result == quertycodes[i]) { + *result = chars[i]; + isasymbol = TRUE; + break; + } + + if (isasymbol == FALSE) + *result+=128; + + states[*result] = state; + return state; +} + void ProcessKbd(void) { - Sint4 result, i; - bool isasymbol; + Sint4 result; + static bool newconsf=FALSE; bool state; while((result = VGLKeyboardGetCh()) != 0) { - if(result < 128) - state = TRUE; - else { - state = FALSE; - result -= 128; - } + state=UpdateStates(&result); - isasymbol = FALSE; - for(i=0;quertycodes[i]!=0;i++) - if(result == quertycodes[i]) { - result = chars[i]; - isasymbol = TRUE; - break; + if(newconsf==TRUE && pausef==TRUE) /* return to game ? */ + if(state==FALSE) + continue; + else newconsf=FALSE; /* yes */ + + while(newconsf==FALSE && state==TRUE && + result>=F1KEY && result<=F10KEY && altpressed) { + /* Alt-Fn pressed to switch consoles */ + int activecons=0; + int newcons=result-F1KEY+1; + ioctl(0, VT_GETACTIVE, &activecons); + if(newcons==activecons) /* to another console ? */ + break; + + newconsf=TRUE; + /* do switch */ + ioctl(0,VT_ACTIVATE,(caddr_t)(long)newcons); + if(started==TRUE && pausef==FALSE) { + pausef=TRUE; + testpause(); /* force pause if game active */ + } + else { + VGLCheckSwitch(); /* game not active - just switch */ + /* now wait for another keyboard strike */ + result=VGLKeyboardGetCh(); + while(1) { + if(result!=0) { + state=UpdateStates(&result); + if(state==TRUE) /* ignore releases */ + break; + } + usleep(500); /* don't waste CPU when idle */ + result=VGLKeyboardGetCh(); } - - if (isasymbol == FALSE) - result+=128; - - states[result] = state; + } + newconsf=FALSE; /* switched back */ + } if(state == TRUE) continue; Property changes on: head/games/digger-vgl/files/patch-fbsd__kbd.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/digger-vgl/files/patch-main.c =================================================================== --- head/games/digger-vgl/files/patch-main.c (revision 387020) +++ head/games/digger-vgl/files/patch-main.c (revision 387021) @@ -1,21 +1,18 @@ - -$FreeBSD$ - --- main.c.orig +++ main.c @@ -561,7 +561,6 @@ { int i; if (pausef) { - pausef=FALSE; soundpause(); sett2val(40); setsoundt2(); @@ -575,6 +574,7 @@ drawlives(); if (!synchvid) curtime=gethrt(); + pausef=FALSE; } else soundpauseoff(); Property changes on: head/games/digger-vgl/files/patch-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/heretic/files/patch-graphics__i_sdl.c =================================================================== --- head/games/heretic/files/patch-graphics__i_sdl.c (revision 387020) +++ head/games/heretic/files/patch-graphics__i_sdl.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- graphics/i_sdl.c 2002/04/17 17:57:00 1.1 +++ graphics/i_sdl.c 2002/04/17 17:57:08 @@ -7,7 +7,7 @@ #include #include "doomdef.h" -#include "SDL/SDL.h" +#include "SDL.h" static int lastmousex = 0; static int lastmousey = 0; Property changes on: head/games/heretic/files/patch-graphics__i_sdl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/heretic/files/patch-graphics__i_sdl_gl.c =================================================================== --- head/games/heretic/files/patch-graphics__i_sdl_gl.c (revision 387020) +++ head/games/heretic/files/patch-graphics__i_sdl_gl.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- graphics/i_sdl_gl.c 2002/04/17 17:57:00 1.1 +++ graphics/i_sdl_gl.c 2002/04/17 17:57:14 @@ -4,7 +4,7 @@ #include #include "doomdef.h" -#include +#include #include "gl_struct.h" Property changes on: head/games/heretic/files/patch-graphics__i_sdl_gl.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/heroes/files/patch-configure =================================================================== --- head/games/heroes/files/patch-configure (revision 387020) +++ head/games/heroes/files/patch-configure (revision 387021) @@ -1,32 +1,29 @@ - -$FreeBSD$ - --- configure.orig Sat Mar 30 19:36:16 2002 +++ configure Sat Apr 6 16:11:51 2002 @@ -13339,7 +13339,7 @@ CFLAGS="$CFLAGS -ggdb3" else if test "${ac_cv_prog_cc_g}" = yes; then - CFLAGS="$CFLAGS -g" + CFLAGS="$CFLAGS" fi fi ;; @@ -13347,7 +13347,7 @@ ;; *) if test "${ac_cv_prog_cc_g}" = yes; then - CFLAGS="$CFLAGS -g" + CFLAGS="$CFLAGS" fi ;; esac @@ -13367,7 +13367,7 @@ int main(int argc, char *argv[]) { return argv[argc-1] == 0; } EOF cf_save_CFLAGS="$CFLAGS" - ac_cv_prog_gcc_opt_flags="-O3" + ac_cv_prog_gcc_opt_flags="" for cf_opt in \ ffast-math \ fstrict-aliasing \ Property changes on: head/games/heroes/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-doc__Makefile =================================================================== --- head/games/moria/files/patch-doc__Makefile (revision 387020) +++ head/games/moria/files/patch-doc__Makefile (revision 387021) @@ -1,17 +1,15 @@ -$FreeBSD$ - --- doc/Makefile Sat Aug 10 17:45:46 2002 +++ doc/Makefile Sat Aug 10 17:48:23 2002 @@ -0,0 +1,12 @@ +FILES= ERRORS FEATURES.NEW dragon.inf exp.doc faq history moria.ms moria.txt \ + pronounc spells.doc where.inf + +moria.ms: moria1.ms moria2.ms + cat moria1.ms moria2.ms > moria.ms + +moria.txt: moria1.txt moria2.txt + cat moria1.txt moria2.txt > moria.txt + +install: moria.ms moria.txt + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${BSD_INSTALL_DATA} ${FILES} ${STAGEDIR}${DOCSDIR} Property changes on: head/games/moria/files/patch-doc__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__config.h =================================================================== --- head/games/moria/files/patch-source__config.h (revision 387020) +++ head/games/moria/files/patch-source__config.h (revision 387021) @@ -1,40 +1,38 @@ -$FreeBSD$ - --- source/config.h Thu Jul 21 19:47:13 1994 +++ source/config.h Tue Aug 5 10:04:39 2003 @@ -14,7 +14,7 @@ /* Person to bother if something goes wrong. */ /* Recompile files.c and misc2.c if this changes. */ -#define WIZARD "David Grabiner" +#define WIZARD "root" /* The wizard password and wizard uid are no longer used. */ @@ -200,16 +200,16 @@ /* This must be unix; change MORIA_LIB as appropriate. */ #define MORIA_SAV "moria.save" -#define MORIA_LIB(xxx) "/home/math/grabiner/moria/files/xxx" -#define MORIA_HOU MORIA_LIB(hours) -#define MORIA_MOR MORIA_LIB(news) -#define MORIA_TOP MORIA_LIB(scores) -#define MORIA_HELP MORIA_LIB(roglcmds.hlp) -#define MORIA_ORIG_HELP MORIA_LIB(origcmds.hlp) -#define MORIA_WIZ_HELP MORIA_LIB(rwizcmds.hlp) -#define MORIA_OWIZ_HELP MORIA_LIB(owizcmds.hlp) -#define MORIA_WELCOME MORIA_LIB(welcome.hlp) -#define MORIA_VER MORIA_LIB(version.hlp) +#define MORIA_LIB(xxx) "%%DATADIR%%/" xxx +#define MORIA_HOU MORIA_LIB("hours") +#define MORIA_MOR MORIA_LIB("news") +#define MORIA_TOP MORIA_LIB("scores") +#define MORIA_HELP MORIA_LIB("roglcmds.hlp") +#define MORIA_ORIG_HELP MORIA_LIB("origcmds.hlp") +#define MORIA_WIZ_HELP MORIA_LIB("rwizcmds.hlp") +#define MORIA_OWIZ_HELP MORIA_LIB("owizcmds.hlp") +#define MORIA_WELCOME MORIA_LIB("welcome.hlp") +#define MORIA_VER MORIA_LIB("version.hlp") #endif #endif Property changes on: head/games/moria/files/patch-source__config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__death.c =================================================================== --- head/games/moria/files/patch-source__death.c (revision 387020) +++ head/games/moria/files/patch-source__death.c (revision 387021) @@ -1,34 +1,32 @@ -$FreeBSD$ - --- source/death.c.orig Thu Aug 7 16:02:45 2003 +++ source/death.c Thu Aug 7 16:06:12 2003 @@ -123,6 +123,7 @@ #include #endif +#ifndef __FreeBSD__ #ifndef VMS #ifndef MAC #if !defined(ATARIST_MWC) && !defined(AMIGA) @@ -130,18 +131,19 @@ #endif #endif #endif +#endif static void date(day) char *day; { register char *tmp; -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) time_t clockvar; #else long clockvar; #endif -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) clockvar = time((time_t *) 0); #else clockvar = time((long *) 0); Property changes on: head/games/moria/files/patch-source__death.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__io.c =================================================================== --- head/games/moria/files/patch-source__io.c (revision 387020) +++ head/games/moria/files/patch-source__io.c (revision 387021) @@ -1,167 +1,165 @@ -$FreeBSD$ - --- source/io.c.orig 1994-07-21 18:47:26.000000000 -0700 +++ source/io.c 2008-06-18 23:29:02.000000000 -0700 @@ -13,6 +13,11 @@ #include "config.h" +#ifdef __FreeBSD__ +#include +#define USG +#endif + #ifdef HPUX #include #endif @@ -201,7 +206,7 @@ #if !defined(MAC) && !defined(MSDOS) && !defined(ATARI_ST) && !defined(VMS) #ifndef AMIGA #ifdef USG -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) static struct termios save_termio; #else static struct termio save_termio; @@ -245,7 +250,9 @@ struct ltchars lcbuf; struct tchars cbuf; int lbuf; +#ifndef __FreeBSD__ long time(); +#endif py.misc.male |= 2; (void) ioctl(0, TIOCGETP, (char *)&tbuf); @@ -306,14 +313,16 @@ #endif #else #if !defined(VMS) && !defined(MSDOS) && !defined(ATARI_ST) -#ifndef AMIGA +#if !defined(AMIGA) && !defined(__FreeBSD__) (void) ioctl(0, TCGETA, (char *)&save_termio); +#else + (void) tcgetattr(0, &save_termio); #endif #endif #endif /* PC curses returns ERR */ -#if defined(USG) && !defined(PC_CURSES) && !defined(AMIGA) +#if (defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)) || defined(__FreeBSD__) if (initscr() == NULL) #else if (initscr() == ERR) @@ -331,7 +340,7 @@ #if defined(atarist) && defined(__GNUC__) (void) signal (SIGTSTP, (__Sigfunc)suspend); #else -#ifdef __386BSD__ +#if defined(__386BSD__) || defined(__FreeBSD__) (void) signal (SIGTSTP, (sig_t)suspend); #else (void) signal (SIGTSTP, suspend); @@ -385,7 +394,7 @@ #if !defined(MSDOS) && !defined(ATARI_ST) && !defined(VMS) #ifndef AMIGA #ifdef USG -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) struct termios tbuf; #else struct termio tbuf; @@ -420,7 +429,11 @@ #else #if !defined(ATARI_ST) && !defined(VMS) #ifdef USG +#ifdef __FreeBSD__ + (void) tcgetattr(0, &tbuf); +#else (void) ioctl(0, TCGETA, (char *)&tbuf); +#endif /* disable all of the normal special control characters */ tbuf.c_cc[VINTR] = (char)3; /* control-C */ tbuf.c_cc[VQUIT] = (char)-1; @@ -438,7 +451,11 @@ tbuf.c_cc[VMIN] = 1; /* Input should wait for at least 1 char */ tbuf.c_cc[VTIME] = 0; /* no matter how long that takes. */ +#ifdef __FreeBSD__ + (void) tcsetattr(0, TCSANOW, &tbuf); +#else (void) ioctl(0, TCSETA, (char *)&tbuf); +#endif #else /* disable all of the special characters except the suspend char, interrupt char, and the control flow start/stop characters */ @@ -552,9 +569,13 @@ #ifdef USG #if !defined(MSDOS) && !defined(ATARI_ST) && !defined(VMS) #ifndef AMIGA +#ifdef __FreeBSD__ + (void) tcsetattr(0, TCSANOW, &save_termio); +#else (void) ioctl(0, TCSETA, (char *)&save_termio); #endif #endif +#endif #else (void) ioctl(0, TIOCSLTC, (char *)&save_special_chars); (void) ioctl(0, TIOCSETP, (char *)&save_ttyb); @@ -646,7 +667,7 @@ { #ifdef USG #if !defined(MSDOS) && !defined(ATARI_ST) && !defined(AMIGA) -#ifdef __linux__ +#if defined(__linux__) || defined(__FreeBSD__) struct termios tbuf; #else struct termio tbuf; @@ -683,8 +704,12 @@ #ifdef USG #if !defined(MSDOS) && !defined(ATARI_ST) && !defined(AMIGA) +#ifdef __FreeBSD__ + (void) tcgetattr(0, &tbuf); +#else (void) ioctl(0, TCGETA, (char *)&tbuf); #endif +#endif #else (void) ioctl(0, TIOCGETP, (char *)&tbuf); (void) ioctl(0, TIOCGETC, (char *)&cbuf); @@ -725,8 +750,12 @@ default_signals(); #ifdef USG #if !defined(MSDOS) && !defined(ATARI_ST) && !defined(AMIGA) +#ifdef __FreeBSD__ + (void) tcsetattr(0, TCSANOW, &save_termio); +#else (void) ioctl(0, TCSETA, (char *)&save_termio); #endif +#endif #else (void) ioctl(0, TIOCSLTC, (char *)&save_special_chars); (void) ioctl(0, TIOCSETP, (char *)&save_ttyb); @@ -757,7 +786,7 @@ msg_print("Fork failed. Try again."); return; } -#if defined(USG) || defined(__386BSD__) +#if defined(USG) || defined(__386BSD__) || defined(__FreeBSD__) (void) wait((int *) 0); #else (void) wait((union wait *) 0); @@ -785,8 +814,12 @@ /* have to disable ^Y for tunneling */ #ifdef USG #if !defined(MSDOS) && !defined(ATARI_ST) +#ifdef __FreeBSD__ + (void) tcsetattr(0, TCSANOW, &tbuf); +#else (void) ioctl(0, TCSETA, (char *)&tbuf); #endif +#endif #else (void) ioctl(0, TIOCSLTC, (char *)&lcbuf); (void) ioctl(0, TIOCSETP, (char *)&tbuf); Property changes on: head/games/moria/files/patch-source__io.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__main.c =================================================================== --- head/games/moria/files/patch-source__main.c (revision 387020) +++ head/games/moria/files/patch-source__main.c (revision 387021) @@ -1,31 +1,29 @@ -$FreeBSD$ - --- source/main.c.orig Thu Jul 21 19:47:27 1994 +++ source/main.c Thu Aug 7 16:12:13 2003 @@ -88,6 +88,7 @@ #include #endif +#ifndef __FreeBSD__ #ifndef VMS #ifndef MAC #ifndef GEMDOS @@ -98,6 +99,9 @@ char *getenv(); #endif #endif +#else +#include +#endif #ifndef MAC #ifndef AMIGA @@ -360,7 +364,7 @@ else { /* Create character */ create_character(); -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) birth_date = time ((time_t *)0); #else birth_date = time ((long *)0); Property changes on: head/games/moria/files/patch-source__main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__misc1.c =================================================================== --- head/games/moria/files/patch-source__misc1.c (revision 387020) +++ head/games/moria/files/patch-source__misc1.c (revision 387021) @@ -1,38 +1,36 @@ -$FreeBSD$ - --- source/misc1.c.orig Thu Aug 7 16:07:21 2003 +++ source/misc1.c Thu Aug 7 16:08:58 2003 @@ -28,7 +28,7 @@ #endif #endif -#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) +#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) && !defined(__FreeBSD__) long time(); #endif struct tm *localtime(); @@ -45,7 +45,7 @@ register int32u clock_var; if (seed == 0) -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) clock_var = time((time_t *)0); #else clock_var = time((long *)0); @@ -89,10 +89,14 @@ int check_time() { #ifdef MORIA_HOU +#if defined(MAC) || defined(__FreeBSD__) + time_t clock_var; +#else long clock_var; +#endif register struct tm *tp; -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) clock_var = time((time_t *)0); #else clock_var = time((long *)0); Property changes on: head/games/moria/files/patch-source__misc1.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__misc3.c =================================================================== --- head/games/moria/files/patch-source__misc3.c (revision 387020) +++ head/games/moria/files/patch-source__misc3.c (revision 387021) @@ -1,40 +1,38 @@ -$FreeBSD$ - --- source/misc3.c.orig Fri Jul 22 11:47:30 1994 +++ source/misc3.c Sat Oct 16 16:59:14 1999 @@ -283,7 +283,7 @@ { vtype out_val; - (void) sprintf(out_val, "%s: %6ld", header, num); + (void) sprintf(out_val, "%s:%7ld", header, num); put_buffer(out_val, row, column); } @@ -317,7 +317,7 @@ { vtype out_val; - (void) sprintf(out_val, "%6ld", num); + (void) sprintf(out_val, "%7ld", num); put_buffer(out_val, row, column); } @@ -481,7 +481,7 @@ /* Prints current gold -RAK- */ void prt_gold() { - prt_long(py.misc.au, 20, STAT_COLUMN+6); + prt_long(py.misc.au, 20, STAT_COLUMN+5); } @@ -2070,7 +2070,7 @@ if (p_ptr->exp > p_ptr->max_exp) p_ptr->max_exp = p_ptr->exp; - prt_long(p_ptr->exp, 14, STAT_COLUMN+6); + prt_long(p_ptr->exp, 14, STAT_COLUMN+5); } Property changes on: head/games/moria/files/patch-source__misc3.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__save.c =================================================================== --- head/games/moria/files/patch-source__save.c (revision 387020) +++ head/games/moria/files/patch-source__save.c (revision 387021) @@ -1,40 +1,38 @@ -$FreeBSD$ - --- source/save.c.orig Thu Aug 7 16:24:56 2003 +++ source/save.c Thu Aug 7 16:26:16 2003 @@ -102,7 +102,7 @@ #endif #if !defined(ATARIST_MWC) -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) #include #else long time(); @@ -331,7 +331,7 @@ } /* save the current time in the savefile */ -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) l = time((time_t *)0); #else l = time((long *)0); @@ -1029,7 +1029,7 @@ || (version_min == 2 && patch_level >= 2)) rd_long ((int32u *)&birth_date); else -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) birth_date = time((time_t *)0); #else birth_date = time((long *)0); @@ -1253,7 +1253,7 @@ /* rotate store inventory, depending on how old the save file */ /* is foreach day old (rounded up), call store_maint */ /* calculate age in seconds */ -#ifdef MAC +#if defined(MAC) || defined(__FreeBSD__) start_time = time((time_t *)0); #else start_time = time((long *)0); Property changes on: head/games/moria/files/patch-source__save.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-source__signals.c =================================================================== --- head/games/moria/files/patch-source__signals.c (revision 387020) +++ head/games/moria/files/patch-source__signals.c (revision 387021) @@ -1,22 +1,20 @@ -$FreeBSD$ - --- source/signals.c Thu Jul 21 19:47:42 1994 +++ source/signals.c Tue Aug 5 10:00:36 2003 @@ -89,7 +89,7 @@ /*ARGSUSED*/ #ifndef USG -#ifdef __386BSD__ +#if defined(__386BSD__) || defined(__FreeBSD__) static void signal_handler(sig, code, scp) #else static int signal_handler(sig, code, scp) @@ -217,7 +217,7 @@ #if defined(atarist) && defined(__GNUC__) (void) signal(SIGTSTP, (__Sigfunc)suspend); #else -#ifdef __386BSD__ +#if defined(__386BSD__) || defined(__FreeBSD__) (void) signal(SIGTSTP, (sig_t)suspend); #else (void) signal(SIGTSTP, suspend); Property changes on: head/games/moria/files/patch-source__signals.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/moria/files/patch-unix__unix.c =================================================================== --- head/games/moria/files/patch-unix__unix.c (revision 387020) +++ head/games/moria/files/patch-unix__unix.c (revision 387021) @@ -1,25 +1,23 @@ -$FreeBSD$ - --- unix/unix.c.orig Tue Aug 12 10:36:13 2003 +++ unix/unix.c Tue Aug 12 10:38:47 2003 @@ -14,6 +14,10 @@ /* defines TRUE and FALSE */ #include +#ifdef __FreeBSD__ +#include +#endif + #include "config.h" #include "constant.h" #include "types.h" @@ -276,7 +280,9 @@ void user_name(buf) char *buf; { +#ifndef __FreeBSD__ extern char *getlogin(); +#endif struct passwd *pwline; register char *p; Property changes on: head/games/moria/files/patch-unix__unix.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nadar/files/patch-server_Game.c =================================================================== --- head/games/nadar/files/patch-server_Game.c (revision 387020) +++ head/games/nadar/files/patch-server_Game.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- server/Game.c.orig Sun Aug 22 16:35:40 2004 +++ server/Game.c Sun Aug 22 16:35:50 2004 @@ -226,7 +226,7 @@ case PLAYER_DESTROY : /* Destroy ¾õÂ֤ΠPlayer ¤òºï½ü¤¹¤ë */ current = ObjList_DeleteObjToPrev(game->player_list, current); break; - default : + default : break; } } Property changes on: head/games/nadar/files/patch-server_Game.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-dgn_comp.6 =================================================================== --- head/games/nethack33/files/patch-dgn_comp.6 (revision 387020) +++ head/games/nethack33/files/patch-dgn_comp.6 (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- doc/dgn_comp.6.orig Mon Apr 12 09:28:09 2004 +++ doc/dgn_comp.6 Mon Apr 12 09:28:33 2004 @@ -396,7 +396,7 @@ M. Stephenson (from the level compiler by Jean-Christophe Collet). .SH "SEE ALSO" .PP -lev_comp(6), nethack(6) +lev_comp%%HACKEXT%%(6), %%HACKNAME%%(6) .SH BUGS .PP Probably infinite. Property changes on: head/games/nethack33/files/patch-dgn_comp.6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-dlb.6 =================================================================== --- head/games/nethack33/files/patch-dlb.6 (revision 387020) +++ head/games/nethack33/files/patch-dlb.6 (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- doc/dlb.6.orig Mon Apr 12 09:28:09 2004 +++ doc/dlb.6 Mon Apr 12 09:28:54 2004 @@ -74,7 +74,7 @@ Kenneth Lorber .SH "SEE ALSO" .PP -nethack(6), tar(1) +%%HACKNAME%%(6), tar(1) .SH BUGS .PP Not a good tar emulation; - does not mean stdin or stdout. Property changes on: head/games/nethack33/files/patch-dlb.6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-include-config.h =================================================================== --- head/games/nethack33/files/patch-include-config.h (revision 387020) +++ head/games/nethack33/files/patch-include-config.h (revision 387021) @@ -1,38 +1,36 @@ -$FreeBSD$ - --- include/config.h.orig Sat Jul 22 10:13:51 2000 +++ include/config.h Sat May 18 06:27:54 2002 @@ -110,7 +110,7 @@ * would allow: * xpmtoppm x11tiles_big.xpm */ -/* # define USE_XPM */ /* Disable if you do not have the XPM library */ +# define USE_XPM /* Disable if you do not have the XPM library */ # ifdef USE_XPM # define GRAPHIC_TOMBSTONE /* Use graphical tombstone (rip.xpm) */ # endif @@ -151,11 +151,11 @@ #ifdef UNIX /* path and file name extension for compression program */ -#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ -#define COMPRESS_EXTENSION ".Z" /* compress's extension */ +/* #define COMPRESS "/usr/bin/compress"*/ /* Lempel-Ziv compression */ +/* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */ /* An example of one alternative you might want to use: */ -/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ -/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ +#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ +#define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif #ifndef COMPRESS @@ -186,7 +186,7 @@ * otherwise it will be the current directory. */ # ifndef HACKDIR -# define HACKDIR "/usr/games/lib/nethackdir" /* nethack directory */ +# define HACKDIR "%%HACKDIR%%" /* nethack directory */ # endif /* Property changes on: head/games/nethack33/files/patch-include-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-lev_comp.6 =================================================================== --- head/games/nethack33/files/patch-lev_comp.6 (revision 387020) +++ head/games/nethack33/files/patch-lev_comp.6 (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- doc/lev_comp.6.orig Mon Apr 12 09:28:09 2004 +++ doc/lev_comp.6 Mon Apr 12 09:29:20 2004 @@ -563,7 +563,7 @@ Jean-Christophe Collet, David Cohrs. .SH "SEE ALSO" .PP -dgn_comp(6), nethack(6) +dgn_comp%%HACKEXT%%(6), %%HACKNAME%%(6) .SH BUGS .PP Probably infinite. Property changes on: head/games/nethack33/files/patch-lev_comp.6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-nethack.6 =================================================================== --- head/games/nethack33/files/patch-nethack.6 (revision 387020) +++ head/games/nethack33/files/patch-nethack.6 (revision 387021) @@ -1,40 +1,38 @@ -$FreeBSD$ - --- doc/nethack.6.orig Mon Apr 12 09:28:09 2004 +++ doc/nethack.6 Mon Apr 12 09:30:52 2004 @@ -3,7 +3,7 @@ .SH NAME nethack \- Exploring The Mazes of Menace .SH SYNOPSIS -.B nethack +.B %%HACKNAME%% [ .B \-d .I directory @@ -149,7 +149,7 @@ supplies a directory which is to serve as the playground. It overrides the value from NETHACKDIR, HACKDIR, or the directory specified by the game administrator during compilation -(usually /usr/games/lib/nethackdir). +(usually %%HACKDIR%%). This option is usually only useful to the game administrator. The playground must contain several auxiliary files such as help files, the list of top scorers, and a subdirectory @@ -174,7 +174,7 @@ distinction, as he may eventually release a new version of his own. .SH FILES .PP -All files are in the playground, normally /usr/games/lib/nethackdir. +All files are in the playground, normally %%HACKDIR%%. If DLB was defined during the compile, the data files and special levels will be inside a larger file, normally nhdat, instead of being separate files. @@ -247,7 +247,7 @@ In addition, SHOPTYPE is used in debugging (wizard) mode. .SH "SEE ALSO" .PP -dgn_comp(6), lev_comp(6), recover(6) +dgn_comp%%HACKEXT%%(6), lev_comp%%HACKEXT%%(6), recover%%HACKEXT%%(6) .SH BUGS .PP Probably infinite. Property changes on: head/games/nethack33/files/patch-nethack.6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-recover.6 =================================================================== --- head/games/nethack33/files/patch-recover.6 (revision 387020) +++ head/games/nethack33/files/patch-recover.6 (revision 387021) @@ -1,22 +1,20 @@ -$FreeBSD$ - --- doc/recover.6.orig Mon Apr 12 09:28:09 2004 +++ doc/recover.6 Mon Apr 12 09:31:27 2004 @@ -31,7 +31,7 @@ supplies a directory which is the NetHack playground. It overrides the value from NETHACKDIR, HACKDIR, or the directory specified by the game administrator during compilation -(usually /usr/games/lib/nethackdir). +(usually %%HACKDIR%%). .PP For recovery to be possible, .I nethack @@ -103,7 +103,7 @@ .I nethack will find them in the uncompressed form. .SH "SEE ALSO" -nethack(6) +%%HACKNAME%%(6) .SH BUGS .PP .I recover Property changes on: head/games/nethack33/files/patch-recover.6 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack33/files/patch-system.h =================================================================== --- head/games/nethack33/files/patch-system.h (revision 387020) +++ head/games/nethack33/files/patch-system.h (revision 387021) @@ -1,26 +1,24 @@ -$FreeBSD$ - --- include/system.h.orig Mon Apr 19 23:27:53 2004 +++ include/system.h Mon Apr 19 23:31:54 2004 @@ -86,7 +86,7 @@ # endif #else E long lrand48(); -E void srand48(); +E void FDECL(srand48, (long)); #endif /* BSD || ULTRIX || RANDOM */ #if !defined(BSD) || defined(ultrix) @@ -340,10 +340,10 @@ #if defined(BSD) && defined(ultrix) /* i.e., old versions of Ultrix */ E void sleep(); #endif -#if defined(ULTRIX) || defined(SYSV) +#if !defined(__FreeBSD__) && (defined(ULTRIX) || defined(SYSV)) E unsigned sleep(); #endif -#if defined(HPUX) +#if defined(HPUX) || defined(__FreeBSD__) E unsigned int FDECL(sleep, (unsigned int)); #endif #ifdef VMS Property changes on: head/games/nethack33/files/patch-system.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/nethack34/files/patch-win-tty-termcap.c =================================================================== --- head/games/nethack34/files/patch-win-tty-termcap.c (revision 387020) +++ head/games/nethack34/files/patch-win-tty-termcap.c (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- win/tty/termcap.c.orig Thu Jun 19 16:12:47 2003 +++ win/tty/termcap.c Thu Jun 19 16:13:00 2003 @@ -217,10 +217,6 @@ error("Terminal must backspace."); # else if(!(BC = Tgetstr("bc"))) { /* termcap also uses bc/bs */ -# ifndef MINIMAL_TERM - if(!tgetflag("bs")) - error("Terminal must backspace."); -# endif BC = tbufptr; tbufptr += 2; *BC = '\b'; Property changes on: head/games/nethack34/files/patch-win-tty-termcap.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/searchandrescue/files/patch-sar__Makefile =================================================================== --- head/games/searchandrescue/files/patch-sar__Makefile (revision 387020) +++ head/games/searchandrescue/files/patch-sar__Makefile (revision 387021) @@ -1,39 +1,36 @@ - -$FreeBSD$ - --- ./sar/Makefile.orig 2011-08-07 16:06:58.000000000 -0300 +++ ./sar/Makefile 2011-08-11 20:36:24.000000000 -0300 @@ -1,18 +1,18 @@ # Platform Configurator generated Makefile # -PREFIX = $(DESTDIR)/usr/ +PREFIX = %%PREFIX%% -CFLAGS = -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math -finline-functions -fexpensive-optimizations -D__USE_BSD -DHAVE_SDL_MIXER -Wno-write-strings -DUSE_XSHM -DHAVE_MWMUTIL_H -DHAVE_LIBXPM -DHAVE_XF86_VIDMODE +CFLAGS = -O2 -pipe -fno-strict-aliasing -O2 -pipe -fno-strict-aliasing -Wall -O6 -funroll-loops -fomit-frame-pointer -ffast-math -D__USE_BSD -DUSE_XSHM -DHAVE_MWMUTIL_H -DUSE_LIBXPM -DHAVE_XF86_VIDMOD -DHAVE_SDL_MIXER -DNEW_GRAPHICS -I/usr/local/include #-DOLD_GRAPHICS INC_DIRS = -LIBS = -lm -lSDL -lSDL_mixer -lSM -lICE -lX11 -lXext -lXmu -lXpm -lXxf86vm -lGL -lGLU -lpthread +LIBS = -lm -lSM -lICE -lX11 -lXext -lXmu -lXpm -lXxf86vm -lGL -lGLU -lSDL -lSDL_mixer -LIB_DIRS = -L/usr/X11R6/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib/ +LIB_DIRS = -L/usr/local/lib/ -L/usr/local/lib/ -L/usr/local/lib/ -CC = gcc +CC = cc -CPP = g++ +CPP = c++ # Appended stuff starts here # @@ -39,7 +39,7 @@ # Programs LS = ls -LSFLAGS = -s -h -c --color=auto +LSFLAGS = -s -h -c RM = rm RMFLAGS = -f Property changes on: head/games/searchandrescue/files/patch-sar__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/slashem-tty/files/patch-config.h =================================================================== --- head/games/slashem-tty/files/patch-config.h (revision 387020) +++ head/games/slashem-tty/files/patch-config.h (revision 387021) @@ -1,39 +1,37 @@ -$FreeBSD$ - --- include/config.h.orig Sat Dec 30 05:08:31 2006 +++ include/config.h Fri Aug 17 23:09:31 2007 @@ -230,12 +230,12 @@ #ifdef UNIX /* path and file name extension for compression program */ -# define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */ -# define COMPRESS_EXTENSION ".Z" /* compress's extension */ +/* # define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */ +/* # define COMPRESS_EXTENSION ".Z" */ /* compress's extension */ /* An example of one alternative you might want to use: */ -/* # define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */ -/* # define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */ +# define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ +# define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ /* # define COMPRESS "/usr/bin/bzip2" *//* bzip2 compression */ /* # define COMPRESS_EXTENSION ".bz2" *//* bzip2 extension */ @@ -249,7 +249,7 @@ * a tar-like file, thus making a neater installation. See *conf.h * for detailed configuration. */ -/* #define DLB */ /* not supported on all platforms */ +#define DLB /* not supported on all platforms */ /* * Defining INSURANCE slows down level changes, but allows games that @@ -271,7 +271,7 @@ # ifdef __APPLE__ # define HACKDIR "nethackdir" /* nethack directory */ # else -# define HACKDIR "." +# define HACKDIR "%%DATADIR%%" /* nethack directory */ # endif # endif Property changes on: head/games/slashem-tty/files/patch-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/slashem-tty/files/patch-makefile.src =================================================================== --- head/games/slashem-tty/files/patch-makefile.src (revision 387020) +++ head/games/slashem-tty/files/patch-makefile.src (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - --- sys/unix/Makefile.src.good Thu Nov 23 00:24:58 2000 +++ sys/unix/Makefile.src Thu Nov 23 00:26:13 2000 @@ -144,8 +144,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +CFLAGS += -O -I../include -I${PREFIX}/include +LFLAGS = -L${PREFIX}/lib # QT windowing system # SuSE 6.1 Property changes on: head/games/slashem-tty/files/patch-makefile.src ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/slashem-tty/files/patch-makefile.utl =================================================================== --- head/games/slashem-tty/files/patch-makefile.utl (revision 387020) +++ head/games/slashem-tty/files/patch-makefile.utl (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - --- sys/unix/Makefile.utl.good Thu Nov 23 13:55:38 2000 +++ sys/unix/Makefile.utl Thu Nov 23 13:56:54 2000 @@ -89,8 +89,8 @@ # flags for debugging: # CFLAGS = -g -I../include -CFLAGS = -O -I../include -LFLAGS = +CFLAGS += -O -I../include -I${PREFIX}/include +LFLAGS = -L${PREFIX}/lib LIBS = Property changes on: head/games/slashem-tty/files/patch-makefile.utl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/slashem-tty/files/patch-system.h =================================================================== --- head/games/slashem-tty/files/patch-system.h (revision 387020) +++ head/games/slashem-tty/files/patch-system.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- include/system.h.good Wed Nov 22 23:38:44 2000 +++ include/system.h Wed Nov 22 23:41:03 2000 @@ -522,7 +522,7 @@ E time_t FDECL(time, (time_t *)); # endif # else -E long FDECL(time, (time_t *)); +E time_t FDECL(time, (time_t *)); # endif /* ULTRIX */ #ifdef VMS Property changes on: head/games/slashem-tty/files/patch-system.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/slashem-tty/files/patch-unixconf.h =================================================================== --- head/games/slashem-tty/files/patch-unixconf.h (revision 387020) +++ head/games/slashem-tty/files/patch-unixconf.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- include/unixconf.h.good Wed Nov 22 23:42:39 2000 +++ include/unixconf.h Wed Nov 22 23:43:42 2000 @@ -206,7 +206,7 @@ * A stat system call is done on the mailbox every MAILCKFREQ moves. */ -#define MAIL /* Deliver mail during the game */ +/* #define MAIL */ /* Deliver mail during the game */ /* The Andrew Message System does mail a little differently from normal * UNIX. Mail is deposited in the user's own directory in ~/Mailbox Property changes on: head/games/slashem-tty/files/patch-unixconf.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/uhexen/files/patch-Makefile =================================================================== --- head/games/uhexen/files/patch-Makefile (revision 387020) +++ head/games/uhexen/files/patch-Makefile (revision 387021) @@ -1,59 +1,56 @@ - -$FreeBSD$ - --- Makefile.orig Tue Dec 4 17:49:22 2001 +++ Makefile Mon Feb 10 16:55:40 2003 @@ -2,14 +2,14 @@ #For FreeBSD -#CC=gcc -#BINARY=uhexen -#SDL_INCLUDES=-I/usr/local/include/SDL -#SDL_LIBS=-L/usr/local/lib +CC?=gcc +BINARY=uhexen +SDL_INCLUDES=$(shell $(SDL_CONFIG) --cflags) +SDL_LIBS=$(shell $(SDL_CONFIG) --libs) #EXTRA_INCLUDES= #EXTRA_LIBS=-L/usr/local/kde/lib -L/usr/local/qt/lib #EXTRA_INCLUDES= -#EXTRA_CFLAGS=-DUSE_SDL -DFBSD_CONSOLE -pthread +EXTRA_CFLAGS=-DUSE_SDL -DFBSD_CONSOLE #For Linux #CC=gcc @@ -22,14 +22,14 @@ #EXTRA_CFLAGS=-DUSE_SDL #For OpenBSD -CC=gcc -BINARY=uhexen -SDL_INCLUDES=-I/usr/local/include/SDL -SDL_LIBS=-L/usr/local/lib -EXTRA_INCLUDES= -EXTRA_LIBS=-L/usr/local/kde/lib -L/usr/local/qt/lib -L/usr/X11R6/lib -EXTRA_INCLUDES= -EXTRA_CFLAGS=-DUSE_SDL -pthread +#CC=gcc +#BINARY=uhexen +#SDL_INCLUDES=-I/usr/local/include/SDL +#SDL_LIBS=-L/usr/local/lib +#EXTRA_INCLUDES= +#EXTRA_LIBS=-L/usr/local/kde/lib -L/usr/local/qt/lib -L/usr/X11R6/lib +#EXTRA_INCLUDES= +#EXTRA_CFLAGS=-DUSE_SDL -pthread # For Windows (cross-compiler) #CC=/usr/local/cross-tools/i386-mingw32msvc/bin/gcc @@ -41,8 +41,8 @@ #EXTRA_CFLAGS=-mwindows -DUSE_SDL -DMUSTDIE -Dmain=SDL_main -DHAVE_OPENGL -CFLAGS=-Iinclude -O3 -fomit-frame-pointer -Wall -DNORMALUNIX $(SDL_INCLUDES) $(EXTRA_INCLUDES) $(EXTRA_CFLAGS) -LIBS=-lm -lSDL -lSDL_mixer +CFLAGS+=-DPREFIX=\"${PREFIX}\" -Iinclude -fomit-frame-pointer -Wall -DNORMALUNIX $(SDL_INCLUDES) $(EXTRA_INCLUDES) $(EXTRA_CFLAGS) +LIBS=-lSDL_mixer LDFLAGS=$(SDL_LIBS) $(LIBS) $(EXTRA_LIBS) # subdirectory for objects Property changes on: head/games/uhexen/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/uhexen/files/patch-include__h2def.h =================================================================== --- head/games/uhexen/files/patch-include__h2def.h (revision 387020) +++ head/games/uhexen/files/patch-include__h2def.h (revision 387021) @@ -1,17 +1,14 @@ - -$FreeBSD$ - --- include/h2def.h 2003/02/10 14:43:33 1.1 +++ include/h2def.h 2003/02/10 14:46:37 @@ -26,7 +26,11 @@ /* XXX ifdefs */ +#ifndef __FreeBSD__ typedef unsigned int uint; +#else +#include +#endif // Uncomment, to enable all timebomb stuff //#define TIMEBOMB Property changes on: head/games/uhexen/files/patch-include__h2def.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/uhexen/files/patch-src__h2_main.c =================================================================== --- head/games/uhexen/files/patch-src__h2_main.c (revision 387020) +++ head/games/uhexen/files/patch-src__h2_main.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/h2_main.c.orig Tue Dec 4 18:11:47 2001 +++ src/h2_main.c Mon Feb 10 16:56:31 2003 @@ -127,7 +127,7 @@ static char *wadfiles[MAXWADFILES] = { "hexen.wad", - "/usr/local/share/games/uhexen/hexen.wad" + PREFIX "/share/doom/hexen.wad" }; #else static char *wadfiles[MAXWADFILES] = Property changes on: head/games/uhexen/files/patch-src__h2_main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/uhexen/files/patch-src__i_video.c =================================================================== --- head/games/uhexen/files/patch-src__i_video.c (revision 387020) +++ head/games/uhexen/files/patch-src__i_video.c (revision 387021) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- src/i_video.c 2003/02/10 15:10:49 1.1 +++ src/i_video.c 2003/02/10 15:11:08 @@ -54,7 +54,8 @@ } void I_ShutdownGraphics(void) { - SW_ShutdownGraphics(); + if (SW_ShutdownGraphics) + SW_ShutdownGraphics(); } void I_StartTic(void) { Property changes on: head/games/uhexen/files/patch-src__i_video.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/uhexen/files/patch-src__w_wad.c =================================================================== --- head/games/uhexen/files/patch-src__w_wad.c (revision 387020) +++ head/games/uhexen/files/patch-src__w_wad.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- src/w_wad.c 2003/02/10 14:47:45 1.1 +++ src/w_wad.c 2003/02/10 14:47:58 @@ -13,7 +13,7 @@ // HEADER FILES ------------------------------------------------------------ #include -#include +#include #include #include #include Property changes on: head/games/uhexen/files/patch-src__w_wad.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/unnethack/files/patch-config.h =================================================================== --- head/games/unnethack/files/patch-config.h (revision 387020) +++ head/games/unnethack/files/patch-config.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- include/config.h.orig 2012-04-01 23:34:10.000000000 +0900 +++ include/config.h 2012-08-17 16:37:54.135991792 +0900 @@ -191,7 +191,7 @@ /* #define COMPRESS "/usr/bin/compress" */ /* Lempel-Ziv compression */ /* #define COMPRESS_EXTENSION ".Z" */ /* compress's extension */ /* An example of one alternative you might want to use: */ -#define COMPRESS "/bin/gzip" /* FSF gzip compression */ +#define COMPRESS "/usr/bin/gzip" /* FSF gzip compression */ #define COMPRESS_EXTENSION ".gz" /* normal gzip extension */ #endif Property changes on: head/games/unnethack/files/patch-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/unnethack/files/patch-unixconf.h =================================================================== --- head/games/unnethack/files/patch-unixconf.h (revision 387020) +++ head/games/unnethack/files/patch-unixconf.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- include/unixconf.h.good Wed Nov 22 23:42:39 2000 +++ include/unixconf.h Wed Nov 22 23:43:42 2000 @@ -206,7 +206,7 @@ * A stat system call is done on the mailbox every MAILCKFREQ moves. */ -#define MAIL /* Deliver mail during the game */ +/* #define MAIL */ /* Deliver mail during the game */ /* The Andrew Message System does mail a little differently from normal * UNIX. Mail is deposited in the user's own directory in ~/Mailbox Property changes on: head/games/unnethack/files/patch-unixconf.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xcheckers/files/patch-simplech.src_Imakefile =================================================================== --- head/games/xcheckers/files/patch-simplech.src_Imakefile (revision 387020) +++ head/games/xcheckers/files/patch-simplech.src_Imakefile (revision 387021) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- simplech.src/Imakefile.orig Mon Oct 9 14:27:40 2000 +++ simplech.src/Imakefile Wed Jul 30 20:46:21 2003 @@ -3,9 +3,7 @@ # CDEBUGFLAGS = -g -Wall -O3 CDEBUGFLAGS = -Wall -O3 - CC = gcc - PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man6 MANSUFFIX = 6 Property changes on: head/games/xcheckers/files/patch-simplech.src_Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xcheckers/files/patch-xcheckers.src_Imakefile =================================================================== --- head/games/xcheckers/files/patch-xcheckers.src_Imakefile (revision 387020) +++ head/games/xcheckers/files/patch-xcheckers.src_Imakefile (revision 387021) @@ -1,21 +1,18 @@ - -$FreeBSD$ - --- xcheckers.src/Imakefile.orig Sun Dec 9 19:43:13 2001 +++ xcheckers.src/Imakefile Wed Jul 30 20:46:21 2003 @@ -3,7 +3,6 @@ # Imakefile for xcheckers # Don Okt 21 12:38:50 CEST 1999 - PREFIX = /usr/local BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/man/man6 MANSUFFIX = 6 @@ -13,7 +12,6 @@ CDEBUGFLAGS = -g -Wall -O2 # CDEBUGFLAGS = -Wall -O3 - CC = gcc INCLUDES = -I./ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) Property changes on: head/games/xcheckers/files/patch-xcheckers.src_Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xcheckers/files/patch-xcheckers.src_xcheckers.man =================================================================== --- head/games/xcheckers/files/patch-xcheckers.src_xcheckers.man (revision 387020) +++ head/games/xcheckers/files/patch-xcheckers.src_xcheckers.man (revision 387021) @@ -1,29 +1,26 @@ - -$FreeBSD$ - --- xcheckers.src/xcheckers.man.orig Thu Aug 10 14:18:52 2000 +++ xcheckers.src/xcheckers.man Wed Jul 30 20:46:21 2003 @@ -89,7 +89,7 @@ in .I ~/.xcheckersrc and in -.I /usr/lib/X11/app-defaults/XCheckers. +.I @LOCALBASE@/lib/X11/app-defaults/XCheckers. (First mentioned places overriding) .TP @@ -131,11 +131,11 @@ Read in at startup to determine player name. .SH FILES -.I /usr/lib/X11/app-defaults/XCheckers, +.I @LOCALBASE@/lib/X11/app-defaults/XCheckers, .br -.I /usr/lib/X11/xcheckers/scene.xpm, +.I @LOCALBASE@/share/xcheckers/scene.xpm, .br -.I /usr/lib/X11/xcheckers/stars.xpm +.I @LOCALBASE@/share/xcheckers/stars.xpm .SH SEE ALSO .BR simplech (6), Property changes on: head/games/xcheckers/files/patch-xcheckers.src_xcheckers.man ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xmulti/files/patch-html_frame__add.c =================================================================== --- head/games/xmulti/files/patch-html_frame__add.c (revision 387020) +++ head/games/xmulti/files/patch-html_frame__add.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- html/frame_add.c.orig Sun Aug 22 18:00:16 2004 +++ html/frame_add.c Sun Aug 22 18:00:27 2004 @@ -215,7 +215,7 @@ case SSTERM_LENGTH_PX: bfi->next_linesep = bsi->line_height.num - linesep; break; - default: + default: break; } bfi->cur_x = 0; Property changes on: head/games/xmulti/files/patch-html_frame__add.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xmulti/files/patch-html_style__term.c =================================================================== --- head/games/xmulti/files/patch-html_style__term.c (revision 387020) +++ head/games/xmulti/files/patch-html_style__term.c (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- html/style_term.c.orig Sun Aug 22 17:59:45 2004 +++ html/style_term.c Sun Aug 22 17:59:56 2004 @@ -102,6 +102,7 @@ case SSTERM_HEXCOLOR: case SSTERM_URL: case SSTERM_RGB: + break; } return 0; } Property changes on: head/games/xmulti/files/patch-html_style__term.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xmulti/files/patch-html_style__y.y =================================================================== --- head/games/xmulti/files/patch-html_style__y.y (revision 387020) +++ head/games/xmulti/files/patch-html_style__y.y (revision 387021) @@ -1,15 +1,12 @@ - -$FreeBSD$ - --- html/style_y.y.orig Sun Aug 22 17:59:06 2004 +++ html/style_y.y Sun Aug 22 17:59:22 2004 @@ -255,7 +255,8 @@ case SSTERM_HEXCOLOR: case SSTERM_URL: case SSTERM_RGB: - } + break; + } $$ = $2; } | '+' term_base { $$ = $2; } Property changes on: head/games/xmulti/files/patch-html_style__y.y ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xshisen/files/patch-readxpm.C =================================================================== --- head/games/xshisen/files/patch-readxpm.C (revision 387020) +++ head/games/xshisen/files/patch-readxpm.C (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- readxpm.C.orig Sun Jul 7 01:34:47 2002 +++ readxpm.C Thu Sep 15 13:56:38 2005 @@ -12,7 +12,7 @@ char buffer[1024]; for(int i=0; i */ +#include #include "image.h" #include "xsoldier.h" #include "manage.h" Property changes on: head/games/xsoldier/files/patch-enemyshot.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xsoldier/files/patch-game.c =================================================================== --- head/games/xsoldier/files/patch-game.c (revision 387020) +++ head/games/xsoldier/files/patch-game.c (revision 387021) @@ -1,66 +1,63 @@ - -$FreeBSD$ - --- game.c.orig +++ game.c @@ -275,24 +275,24 @@ /* shoot down bonus message */ if (manage->BossTime >= 1) { - sprintf(Percent,"shoot down %02d%%",player->Percent); + snprintf(Percent, sizeof(Percent), "shoot down %02d%%",player->Percent); draw_string(210, 370, Percent, strlen(Percent)); - sprintf(Bonus,"Bonus %d pts", shoot_down_bonus(player->Percent, manage->Loop, manage->Stage)); + snprintf(Bonus, sizeof(Bonus), "Bonus %d pts", shoot_down_bonus(player->Percent, manage->Loop, manage->Stage)); draw_string(260 + manage->Appear*3 , 400, Bonus, strlen(Bonus)); if (player->Percent >= 100) { - sprintf(Perfect,"Perfect!!"); + snprintf(Perfect, sizeof(Perfect), "Perfect!!"); draw_string(170 - manage->Appear*3 , 420, Perfect, strlen(Perfect)); } } else { - snprintf(Percent, 32, "the boss escaped"); + snprintf(Percent, sizeof(Percent), "the boss escaped"); draw_string(200 ,370 ,Percent, strlen(Percent)); } @@ -335,19 +335,19 @@ int i; - sprintf(Score,"Score % 8d",player->Rec[0].score); - sprintf(Stage,"Stage %2d",manage->Stage); - sprintf(Ships,"Ships %3d",player->Ships); + snprintf(Score, sizeof(Score), "Score % 8d",player->Rec[0].score); + snprintf(Stage, sizeof(Stage), "Stage %2d",manage->Stage); + snprintf(Ships, sizeof(Ships), "Ships %3d",player->Ships); #ifdef DEBUG - sprintf(ObjectE,"Enemy Object %3d",manage->EnemyNum); - sprintf(ObjectP,"Player Object %3d",manage->PlayerNum); - sprintf(Loop,"Loop %2d",manage->Loop); - sprintf(Level,"Level %3d",manage->Level); - sprintf(Weapon,"Weapon %d",manage->player[0]->Data.Cnt[5]); - sprintf(Pow,"Pow %2d",manage->player[0]->Data.Cnt[6]); - sprintf(Speed,"Speed %2d",manage->player[0]->Data.Speed); - sprintf(Enemy,"Enemy %3d",manage->StageEnemy); - sprintf(EnemyKill,"EnemyKill %3d",manage->StageShotDown); + snprintf(ObjectE, sizeof(ObjectE), "Enemy Object %3d",manage->EnemyNum); + snprintf(ObjectP, sizeof(ObjectP), "Player Object %3d",manage->PlayerNum); + snprintf(Loop, sizeof(Loop), "Loop %2d",manage->Loop); + snprintf(Level, sizeof(Level), "Level %3d",manage->Level); + snprintf(Weapon, sizeof(Weapon), "Weapon %d",manage->player[0]->Data.Cnt[5]); + snprintf(Pow, sizeof(Pow), "Pow %2d",manage->player[0]->Data.Cnt[6]); + snprintf(Speed, sizeof(Speed), "Speed %2d",manage->player[0]->Data.Speed); + snprintf(Enemy, sizeof(Enemy), "Enemy %3d",manage->StageEnemy); + snprintf(EnemyKill, sizeof(EnemyKill), "EnemyKill %3d",manage->StageShotDown); #endif draw_string(10, 20, Score, strlen(Score)); Property changes on: head/games/xsoldier/files/patch-game.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xsoldier/files/patch-main.c =================================================================== --- head/games/xsoldier/files/patch-main.c (revision 387020) +++ head/games/xsoldier/files/patch-main.c (revision 387021) @@ -1,22 +1,19 @@ - -$FreeBSD$ - --- main.c.orig +++ main.c @@ -33,7 +33,6 @@ /* DeleteAllStar */ #include "star.h" #include "score.h" -#include "wait.h" #include "graphic.h" #include "input.h" @@ -175,7 +174,7 @@ i + 1); display[sizeof(display) - 1] = '\0'; fprintf(stderr, "truncated to %d chars\n", - sizeof(display) - 1); + (int)sizeof(display) - 1); } i++; } Property changes on: head/games/xsoldier/files/patch-main.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xsoldier/files/patch-manage.c =================================================================== --- head/games/xsoldier/files/patch-manage.c (revision 387020) +++ head/games/xsoldier/files/patch-manage.c (revision 387021) @@ -1,22 +1,19 @@ - -$FreeBSD$ - --- manage.c.orig +++ manage.c @@ -17,7 +17,6 @@ #include #include -#include /* #include #include @@ -393,7 +392,7 @@ New = (PlayerData *)malloc(sizeof(PlayerData)); - sprintf(New->Rec[0].name,name); + snprintf(New->Rec[0].name, sizeof(New->Rec[0].name), name); New->Rec[0].score = 0; New->Rec[0].stage = 0; New->Rec[0].loop = 0; Property changes on: head/games/xsoldier/files/patch-manage.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xsoldier/files/patch-opening.c =================================================================== --- head/games/xsoldier/files/patch-opening.c (revision 387020) +++ head/games/xsoldier/files/patch-opening.c (revision 387021) @@ -1,18 +1,15 @@ - -$FreeBSD$ - --- opening.c.orig +++ opening.c @@ -95,10 +95,10 @@ { draw_string(120, 330+i*25, player->Rec[i].name, strlen(player->Rec[i].name)); - sprintf(buff,"%2d-%2d",player->Rec[i].loop, + snprintf(buff, sizeof(buff), "%2d-%2d",player->Rec[i].loop, player->Rec[i].stage); draw_string(270, 330+i*25, buff, strlen(buff)); - sprintf(buff,"%8d",player->Rec[i].score); + snprintf(buff, sizeof(buff), "%8d",player->Rec[i].score); draw_string(350, 330+i*25, buff, strlen(buff)); } } Property changes on: head/games/xsoldier/files/patch-opening.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/games/xsoldier/files/patch-xsoldier.h =================================================================== --- head/games/xsoldier/files/patch-xsoldier.h (revision 387020) +++ head/games/xsoldier/files/patch-xsoldier.h (revision 387021) @@ -1,16 +1,13 @@ - -$FreeBSD$ - --- xsoldier.h.orig +++ xsoldier.h @@ -33,8 +33,8 @@ #define WAIT 35000 #endif /* WAIT */ -#define PIXMAP DATADIR "/games/xsoldier/" -#define SCORE LOCALSTATEDIR "/games/xsoldier/" +#define PIXMAP DATADIR "/xsoldier/" +#define SCORE LOCALSTATEDIR "/games/" #define SCOREFILE "xsoldier.scores" #define MaxStage 8 Property changes on: head/games/xsoldier/files/patch-xsoldier.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/SciPlot/files/patch-Imakefile =================================================================== --- head/graphics/SciPlot/files/patch-Imakefile (revision 387020) +++ head/graphics/SciPlot/files/patch-Imakefile (revision 387021) @@ -1,60 +1,55 @@ --- Imakefile.orig Thu Sep 5 04:32:58 1996 +++ Imakefile Sun Nov 28 18:14:34 2004 -@@ -1,3 +1,4 @@ -+# $FreeBSD$ - XCOMM Imakefile for widget demo programs - - #ifdef LinuxArchitecture @@ -14,13 +15,13 @@ HDOC = hdoc #endif #ifdef AlphaArchitecture - CC = cc -std1 +# CC = cc -std1 #endif -MOTIF = $(LESSTIF) -lXm +# MOTIF = $(LESSTIF) -lXm MOTIFDEPS = $(DEPXMLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) -MOTIFLIBS = $(MOTIF) $(XMULIB) $(XTOOLLIB) $(XLIB) +MOTIFLIBS = $(MOTIFLIB) $(XTOOLONLYLIB) $(XONLYLIB) SYS_LIBRARIES = -lm CDEBUGFLAGS = @@ -28,6 +29,9 @@ PROGRAMS = sciplot realtime TARFILE = sciplot +SONUM = 0 +SONAME = $(LIBNAME).so + SRCS = SciPlot.c SciPlotUtil.c xyplot.c realtime.c HDRS = SciPlot.h SciPlotP.h SciPlotUtil.h OBJS = $(SRCS:.c=.o) @@ -54,7 +58,7 @@ $(HDOC) $*.hdoc > $*.html -AllTarget(sciplot realtime) +AllTarget(sciplot realtime libs) NormalProgramTarget(sciplot,$(PLOTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) NormalProgramTarget(realtime,$(RTOBJS),$(MOTIFDEPS),$(MOTIFLIBS),$(SYS_LIBRARIES)) @@ -79,9 +83,16 @@ tar cfv $(TARFILE).tar $(TARFILES) compress $(TARFILE).tar +libs: $(PLOTOBJS) + $(AR) $(LIBNAME).a $(WIDGET).o $(WIDGET)Util.o + $(RANLIB) $(LIBNAME).a + $(CC) $(SHLIBLDFLAGS) -o $(SONAME).$(SONUM) $(WIDGET).o $(WIDGET)Util.o \ + $(LDFLAGS) $(MOTIFLIBS) $(LDLIBS) + # Dependencies: SciPlot.o: SciPlot.c SciPlotP.h SciPlot.h SciPlotUtil.o: SciPlotUtil.c SciPlotUtil.h xyplot.o: xyplot.c SciPlot.h SciPlotUtil.h realtime.o: realtime.c SciPlot.h SciPlotUtil.h +libsciplot.a: SciPlot.h SciPlotP.h SciPlotUtil.h SciPlot.c SciPlotUtil.c Property changes on: head/graphics/SciPlot/files/patch-Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/gplot/files/patch-drawcgm_Makefile =================================================================== --- head/graphics/gplot/files/patch-drawcgm_Makefile (revision 387020) +++ head/graphics/gplot/files/patch-drawcgm_Makefile (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- drawcgm/Makefile.orig Sat Oct 26 02:58:37 2002 +++ drawcgm/Makefile Sat Oct 26 02:58:44 2002 @@ -25,7 +25,7 @@ # Here ends the section the installer should have to modify #---------------------------------------------------------------------------- -CFLAGS = -O +#CFLAGS = -O # DrawCGM and CGMGen, and test routines cgmgen.o: /usr/include/stdio.h \ Property changes on: head/graphics/gplot/files/patch-drawcgm_Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-configure =================================================================== --- head/graphics/grads/files/patch-configure (revision 387020) +++ head/graphics/grads/files/patch-configure (revision 387021) @@ -1,125 +1,123 @@ -$FreeBSD$ - --- configure.orig 2005-05-23 08:04:40.000000000 -0700 +++ configure 2009-11-08 19:19:24.000000000 -0800 @@ -6835,7 +6835,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -9156,13 +9156,13 @@ if test $ac_cv_header_netcdf_h = yes; then if test "${ga_dyn_supplibs}" = "yes" ; then - echo "$as_me:$LINENO: checking for utInit in -ludunits" >&5 -echo $ECHO_N "checking for utInit in -ludunits... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for utInit in -ludunits2" >&5 +echo $ECHO_N "checking for utInit in -ludunits2... $ECHO_C" >&6 if test "${ac_cv_lib_udunits_utInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ludunits $LIBS" +LIBS="-ludunits2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -9752,13 +9752,13 @@ if test $ac_cv_lib_z_compress = yes; then if test "${ga_dyn_supplibs}" = "yes" ; then - echo "$as_me:$LINENO: checking for utInit in -ludunits" >&5 -echo $ECHO_N "checking for utInit in -ludunits... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for utInit in -ludunits2" >&5 +echo $ECHO_N "checking for utInit in -ludunits2... $ECHO_C" >&6 if test "${ac_cv_lib_udunits_utInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ludunits $LIBS" +LIBS="-ludunits2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -9866,7 +9866,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldf $LIBS" +LIBS="-ldf -ljpeg -lsz -lz $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -9917,7 +9917,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lmfhdf $LIBS" +LIBS="-lmfhdf -ldf -ljpeg -lsz -lz $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -10818,13 +10818,13 @@ echo "${ECHO_T}yes" >&6 if test "${ga_dyn_supplibs}" = "yes" ; then - echo "$as_me:$LINENO: checking for utInit in -ludunits" >&5 -echo $ECHO_N "checking for utInit in -ludunits... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for utInit in -ludunits2" >&5 +echo $ECHO_N "checking for utInit in -ludunits2... $ECHO_C" >&6 if test "${ac_cv_lib_udunits_utInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ludunits $LIBS" +LIBS="-ludunits2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -11916,7 +11916,7 @@ ga_lib_suffix='.a' fi - for ga_lib_name in mfhdf df jpeg udunits z ; do + for ga_lib_name in mfhdf df jpeg sz udunits z ; do hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -12263,13 +12263,13 @@ if test $ac_cv_lib_z_compress = yes; then if test "${ga_dyn_supplibs}" = "yes" ; then - echo "$as_me:$LINENO: checking for utInit in -ludunits" >&5 -echo $ECHO_N "checking for utInit in -ludunits... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for utInit in -ludunits2" >&5 +echo $ECHO_N "checking for utInit in -ludunits2... $ECHO_C" >&6 if test "${ac_cv_lib_udunits_utInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ludunits $LIBS" +LIBS="-ludunits2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ @@ -14449,13 +14449,13 @@ echo "${ECHO_T}yes" >&6 if test "${ga_dyn_supplibs}" = "yes" ; then - echo "$as_me:$LINENO: checking for utInit in -ludunits" >&5 -echo $ECHO_N "checking for utInit in -ludunits... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for utInit in -ludunits2" >&5 +echo $ECHO_N "checking for utInit in -ludunits2... $ECHO_C" >&6 if test "${ac_cv_lib_udunits_utInit+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ludunits $LIBS" +LIBS="-ludunits2 $LIBS" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ Property changes on: head/graphics/grads/files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_bufrscan.c =================================================================== --- head/graphics/grads/files/patch-src_bufrscan.c (revision 387020) +++ head/graphics/grads/files/patch-src_bufrscan.c (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- src/bufrscan.c.orig 2009-01-20 21:16:09.000000000 -0800 +++ src/bufrscan.c 2009-01-20 21:16:20.000000000 -0800 @@ -5,6 +5,7 @@ /* bufrscan.c written by Joe Wielgosz */ +#include #include #include #include Property changes on: head/graphics/grads/files/patch-src_bufrscan.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_gagui.c =================================================================== --- head/graphics/grads/files/patch-src_gagui.c (revision 387020) +++ head/graphics/grads/files/patch-src_gagui.c (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - --- src/gagui.c.orig Fri Mar 25 15:20:19 2005 +++ src/gagui.c Fri Mar 25 15:20:47 2005 @@ -37,8 +37,8 @@ #include -#include "libsx.h" -#include "freq.h" +#include "X11/libsx/libsx.h" +#include "X11/libsx/freq.h" #include "grads.h" #include "gx.h" Property changes on: head/graphics/grads/files/patch-src_gagui.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_gagui.h =================================================================== --- head/graphics/grads/files/patch-src_gagui.h (revision 387020) +++ head/graphics/grads/files/patch-src_gagui.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- src/gagui.h.orig Fri Mar 25 15:17:42 2005 +++ src/gagui.h Fri Mar 25 15:18:16 2005 @@ -11,7 +11,7 @@ */ /* kk --- 020619 added List and Free_List --- kk */ -#include "libsx.h" +#include "X11/libsx/libsx.h" int init_display(int argc, char **argv, void *data); int Custom_GUI( char *fname ); Property changes on: head/graphics/grads/files/patch-src_gagui.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_grads.h =================================================================== --- head/graphics/grads/files/patch-src_grads.h (revision 387020) +++ head/graphics/grads/files/patch-src_grads.h (revision 387021) @@ -1,12 +1,10 @@ -$FreeBSD$ - --- src/grads.h.orig 2009-01-20 21:06:54.000000000 -0800 +++ src/grads.h 2009-01-20 21:07:06.000000000 -0800 @@ -11,6 +11,7 @@ /* kk 020624 --- change for 64bit seek K.Komine mf */ +#include #include #include #include Property changes on: head/graphics/grads/files/patch-src_grads.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_gsgui.c =================================================================== --- head/graphics/grads/files/patch-src_gsgui.c (revision 387020) +++ head/graphics/grads/files/patch-src_gsgui.c (revision 387021) @@ -1,15 +1,13 @@ -$FreeBSD$ - --- src/gsgui.c.orig Fri Mar 25 15:21:29 2005 +++ src/gsgui.c Fri Mar 25 15:21:42 2005 @@ -28,8 +28,8 @@ #include #include -#include "libsx.h" -#include "freq.h" +#include "X11/libsx/libsx.h" +#include "X11/libsx/freq.h" #include "gagui.h" /* Supported widget types */ Property changes on: head/graphics/grads/files/patch-src_gsgui.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_gx.h =================================================================== --- head/graphics/grads/files/patch-src_gx.h (revision 387020) +++ head/graphics/grads/files/patch-src_gx.h (revision 387021) @@ -1,13 +1,11 @@ -$FreeBSD$ - --- src/gx.h.orig Fri Mar 25 15:37:16 2005 +++ src/gx.h Fri Mar 25 15:37:53 2005 @@ -45,7 +45,7 @@ /* Default directory containing the stroke and map data sets. User can override this default via setenv GADDIR */ -static char *datad = "/usr/local/lib/grads"; +static char *datad = "%%DATADIR%%"; /* Option flag. If 0, map data set is only read once into a dynamically allocated memory area. The memory is held onto Property changes on: head/graphics/grads/files/patch-src_gx.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/grads/files/patch-src_gxhpng.c =================================================================== --- head/graphics/grads/files/patch-src_gxhpng.c (revision 387020) +++ head/graphics/grads/files/patch-src_gxhpng.c (revision 387021) @@ -1,17 +1,15 @@ -$FreeBSD$ - --- src/gxhpng.c.orig Fri Mar 25 15:23:06 2005 +++ src/gxhpng.c Fri Mar 25 15:23:48 2005 @@ -377,7 +377,11 @@ return (retcod); } -int gdCompareInt(const void *a, const void *b); +int gdCompareInt(const void *a, const void *b) +{ + return (*(const int *)a) - (*(const int *)b); +} + /* Version of gdImageFilledPolygon to invoke my local version of gdImageLne. Nothing else changed... B.Doty 5/31/01 */ Property changes on: head/graphics/grads/files/patch-src_gxhpng.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/libaux/files/patch-Imakefile =================================================================== --- head/graphics/libaux/files/patch-Imakefile (revision 387020) +++ head/graphics/libaux/files/patch-Imakefile (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- Imakefile 2001/03/14 10:33:44 1.1 +++ Imakefile 2001/03/14 10:34:01 @@ -42,3 +42,7 @@ DependTarget() CleanTarget() +.c.o: + $(RM) $@ + $(CC) -c $(CFLAGS) $(_NOOP_) $*.c -o $@ + Property changes on: head/graphics/libaux/files/patch-Imakefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/libaux/files/patch-font.c =================================================================== --- head/graphics/libaux/files/patch-font.c (revision 387020) +++ head/graphics/libaux/files/patch-font.c (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- font.c 2001/03/14 10:51:36 1.1 +++ font.c 2001/03/14 10:51:48 @@ -32,7 +32,7 @@ void auxCreateFont(void) { bitmapBase = glGenLists(256); - if (auxCreateBitmapFont(bitmapBase) == GL_FALSE) { + if (tkCreateBitmapFont(bitmapBase) == GL_FALSE) { auxQuit(); } } Property changes on: head/graphics/libaux/files/patch-font.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/plasma-kmod/files/patch-plasma_saver.h =================================================================== --- head/graphics/plasma-kmod/files/patch-plasma_saver.h (revision 387020) +++ head/graphics/plasma-kmod/files/patch-plasma_saver.h (revision 387021) Property changes on: head/graphics/plasma-kmod/files/patch-plasma_saver.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/povray36/files/patch-Makefile.in =================================================================== --- head/graphics/povray36/files/patch-Makefile.in (revision 387020) +++ head/graphics/povray36/files/patch-Makefile.in (revision 387021) @@ -1,33 +1,31 @@ -$FreeBSD$ - --- Makefile.in~ 2004-08-03 08:20:09.000000000 +0900 +++ Makefile.in 2013-03-05 11:42:15.000000000 +0900 @@ -813,17 +813,17 @@ for f in $$filelist ; do \ $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f ; \ done - @echo "Copying user configuration and INI files..."; \ - $(mkinstalldirs) $(povconfuser); \ - filelist='povray.conf povray.ini'; \ - for f in $$filelist ; do \ - if test -e $(povconfuser)/$$f; then \ - echo "Creating backup of $(povconfuser)/$$f"; \ - mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ - fi; \ - done; \ - $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf ; \ - $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini +# @echo "Copying user configuration and INI files..."; \ +# $(mkinstalldirs) $(povconfuser); \ +# filelist='povray.conf povray.ini'; \ +# for f in $$filelist ; do \ +# if test -e $(povconfuser)/$$f; then \ +# echo "Creating backup of $(povconfuser)/$$f"; \ +# mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ +# fi; \ +# done; \ +# $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf ; \ +# $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini # For 'make uninstall' we remove the whole POV-Ray data directory. # We have to use uninstall-local and not uninstall-data-local. Property changes on: head/graphics/povray36/files/patch-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/py-graph-dot/files/patch-setup.py =================================================================== --- head/graphics/py-graph-dot/files/patch-setup.py (revision 387020) +++ head/graphics/py-graph-dot/files/patch-setup.py (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- setup.py.orig +++ setup.py @@ -20,7 +15,6 @@ version = appversion, namespace_packages = ["pygraph"], packages = ["pygraph"] + [ os.path.join("pygraph", a) for a in find_packages("pygraph") ], - install_requires = [ 'python-graph-core==%s' % appversion, 'pydot' ], author = "Pedro Matiello", author_email = "pmatiello@gmail.com", description = "DOT support for python-graph", Property changes on: head/graphics/py-graph-dot/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c =================================================================== --- head/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c (revision 387020) +++ head/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c (revision 387021) @@ -1,63 +1,60 @@ - -$FreeBSD$ - --- plugins_src/accel/perlin_noise_drv.c.orig +++ plugins_src/accel/perlin_noise_drv.c @@ -22,6 +22,11 @@ #include #include +#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2 +typedef int ErlDrvSizeT; +typedef int ErlDrvSSizeT; +#endif + #define PNOISE3 3 #define SNOISE1 4 #define SNOISE2 5 @@ -57,9 +62,9 @@ */ static ErlDrvData perlin_noise_start(ErlDrvPort port, char *buff); static void perlin_noise_stop(ErlDrvData handle); -static int control(ErlDrvData handle, unsigned int command, - char* buff, int count, - char** res, int res_size); +static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command, + char* buff, ErlDrvSizeT count, + char** res, ErlDrvSizeT res_size); /* * Internal routines @@ -82,7 +87,18 @@ NULL, /* void * that is not used (BC) */ control, /* F_PTR control, port_control callback */ NULL, /* F_PTR timeout, driver_set_timer callback */ - NULL /* F_PTR outputv, reserved */ + NULL, /* F_PTR outputv, reserved */ + NULL, + NULL, + NULL, + NULL, + ERL_DRV_EXTENDED_MARKER, + ERL_DRV_EXTENDED_MAJOR_VERSION, + ERL_DRV_EXTENDED_MINOR_VERSION, + 0, + NULL, + NULL, + NULL }; /* @@ -114,9 +130,9 @@ } -static int control(ErlDrvData handle, unsigned int command, - char* buff, int count, - char** res, int res_size) +static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command, + char* buff, ErlDrvSizeT count, + char** res, ErlDrvSizeT res_size) { ErlDrvBinary* bin; Property changes on: head/graphics/wings/files/patch-plugins__src-accel-perlin__noise__drv.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c =================================================================== --- head/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c (revision 387020) +++ head/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c (revision 387021) @@ -1,67 +1,64 @@ - -$FreeBSD$ - --- plugins_src/accel/wings_pick_drv.c.orig +++ plugins_src/accel/wings_pick_drv.c @@ -20,14 +20,19 @@ #endif #include +#if ERL_DRV_EXTENDED_MAJOR_VERSION < 2 +typedef int ErlDrvSizeT; +typedef int ErlDrvSSizeT; +#endif + /* * Interface routines. */ static ErlDrvData wings_file_start(ErlDrvPort port, char *buff); static void wings_file_stop(ErlDrvData handle); -static int control(ErlDrvData handle, unsigned int command, - char* buff, int count, - char** res, int res_size); +static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command, + char* buff, ErlDrvSizeT count, + char** res, ErlDrvSizeT res_size); static void outputv(ErlDrvData drv_data, ErlIOVec* ev); /* @@ -47,7 +52,18 @@ NULL, /* void * that is not used (BC) */ control, /* F_PTR control, port_control callback */ NULL, /* F_PTR timeout, driver_set_timer callback */ - outputv /* F_PTR outputv, reserved */ + outputv, /* F_PTR outputv, reserved */ + NULL, + NULL, + NULL, + NULL, + ERL_DRV_EXTENDED_MARKER, + ERL_DRV_EXTENDED_MAJOR_VERSION, + ERL_DRV_EXTENDED_MINOR_VERSION, + 0, + NULL, + NULL, + NULL }; struct vertex_struct { @@ -107,14 +123,14 @@ * Handle commands. */ -static int +static ErlDrvSSizeT control(ErlDrvData handle, unsigned int command, - char* buf, int count, - char** res, int res_size) + char* buf, ErlDrvSizeT count, + char** res, ErlDrvSizeT res_size) { switch (command) { case 0: { /* Define matrix */ - memcpy((void *) m, (void *) buf, count); + memcpy((void *) m, (void *) buf, (size_t) count); #if 0 { int i, j; Property changes on: head/graphics/wings/files/patch-plugins__src-accel-wings__pick__drv.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/graphics/wmicons/files/patch-Icons__Makefile.in =================================================================== --- head/graphics/wmicons/files/patch-Icons__Makefile.in (revision 387020) +++ head/graphics/wmicons/files/patch-Icons__Makefile.in (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- Icons/Makefile.in 2001/05/27 14:13:57 1.1 +++ Icons/Makefile.in 2001/05/27 14:14:26 @@ -64,7 +64,7 @@ defsdatadir = @ICONSDIR@ -defsdata_DATA = Ant.xpm Antennae.xpm Bee48x48.xpm Beer.xpm Bird.xpm Book.xpm Bookshelf.xpm Brain.xpm BulletHole.xpm CashRegister.xpm Clipboard.xpm Cola.xpm ColorGNU.xpm Correspondence.dir.xpm CrystalSkull.dir.xpm Daemon.xpm Detergent.dir.xpm DoomII.xpm Draw.xpm EscherCube.xpm EscherTriangle.xpm Fish5.dir.xpm Football.xpm FootballUS.xpm Gear.xpm Ghost.xpm HP-16C-48.xpm HandOpen.xpm HandPointing.xpm HandPointingLeft.xpm HandPunch.xpm HandReach.xpm HeroSandwich.dir.xpm LadyBug48x48.xpm Microphone.xpm Netscape.xpm NewsAgent.xpm PDF.xpm Padlock.xpm Paint.xpm Pencils.24.xpm Penguin.xpm Radio.xpm Reference.xpm Rumi.xpm Snail.xpm T2-Film.xpm TagIcon.xpm TapeIcon1.xpm TrueDie48.xpm WheelbarrowFull.xpm WordEditor.xpm Wrench-12bit.xpm bomb2.xpm inspect.xpm monitor.xpm paint.xpm tile.black.xpm tile.snow.xpm tile.xpm tile2.xpm xv.xpm +defsdata_DATA = Ant.xpm Antennae.xpm Bee48x48.xpm Beer.xpm Bird.xpm Book.xpm Bookshelf.xpm Brain.xpm BulletHole.xpm CashRegister.xpm Clipboard.xpm Cola.xpm ColorGNU.xpm Correspondence.dir.xpm CrystalSkull.dir.xpm Daemon.xpm Detergent.dir.xpm DoomII.xpm Draw.xpm EscherCube.xpm EscherTriangle.xpm Fish5.dir.xpm Football.xpm FootballUS.xpm Gear.xpm Ghost.xpm HP-16C-48.xpm HandOpen.xpm HandPointing.xpm HandPointingLeft.xpm HandPunch.xpm HandReach.xpm HeroSandwich.dir.xpm LadyBug48x48.xpm Microphone.xpm Netscape.xpm NewsAgent.xpm PDF.xpm Padlock.xpm Paint.xpm Pencils.24.xpm Penguin.xpm Radio.xpm Reference.xpm Rumi.xpm Snail.xpm T2-Film.xpm TagIcon.xpm TapeIcon1.xpm TrueDie48.xpm WheelbarrowFull.xpm WordEditor.xpm Wrench-12bit.xpm bomb2.xpm inspect.xpm monitor.xpm paint.xpm tile.black.xpm tile.snow.xpm tile.xpm tile2.xpm EXTRA_DIST = $(defsdata_DATA) mkMakefile Property changes on: head/graphics/wmicons/files/patch-Icons__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/irc/ctrlproxy/files/patch-Makefile.settings.in =================================================================== --- head/irc/ctrlproxy/files/patch-Makefile.settings.in (revision 387020) +++ head/irc/ctrlproxy/files/patch-Makefile.settings.in (revision 387021) @@ -1,13 +1,10 @@ - -$FreeBSD$ - --- Makefile.settings.in.orig +++ Makefile.settings.in @@ -40,6 +40,6 @@ XSLTPROC = @XSLTPROC@ EXTRA_INSTALL_TARGETS = @EXTRA_INSTALL_TARGETS@ DEFAULT_CONFIG_DIR = $(sysconfdir)/ctrlproxy -HELPFILE = $(cdatadir)/help +HELPFILE = $(cdatadir)/help.txt CHECK_CFLAGS = @CHECK_CFLAGS@ CHECK_LIBS = @CHECK_LIBS@ Property changes on: head/irc/ctrlproxy/files/patch-Makefile.settings.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/irc/ctrlproxy/files/patch-lib_connection.c =================================================================== --- head/irc/ctrlproxy/files/patch-lib_connection.c (revision 387020) +++ head/irc/ctrlproxy/files/patch-lib_connection.c (revision 387021) @@ -1,18 +1,15 @@ - -$FreeBSD$ - --- lib/connection.c.orig +++ lib/connection.c @@ -676,8 +676,12 @@ pid_t pid; int sock[2]; +#ifdef __FreeBSD__ + if (socketpair(PF_LOCAL, SOCK_STREAM, 0, sock) == -1) { +#else if (socketpair(PF_UNIX, SOCK_STREAM, AF_LOCAL, sock) == -1) { +#endif network_log(LOG_ERROR, s, "socketpair: %s", strerror(errno)); return -1; } Property changes on: head/irc/ctrlproxy/files/patch-lib_connection.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/irc/ctrlproxy/files/patch-lib_listener.h =================================================================== --- head/irc/ctrlproxy/files/patch-lib_listener.h (revision 387020) +++ head/irc/ctrlproxy/files/patch-lib_listener.h (revision 387021) @@ -1,18 +1,15 @@ - -$FreeBSD$ - --- lib/listener.h.orig +++ lib/listener.h @@ -5,8 +5,12 @@ #include "ctrlproxy.h" #ifdef HAVE_GSSAPI +#if (__FreeBSD__ >= 7) +#include +#else #include #endif +#endif #ifndef G_MODULE_EXPORT #define G_MODULE_EXPORT Property changes on: head/irc/ctrlproxy/files/patch-lib_listener.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/irc/slirc/files/patch-lru.c =================================================================== --- head/irc/slirc/files/patch-lru.c (revision 387020) +++ head/irc/slirc/files/patch-lru.c (revision 387021) @@ -1,25 +1,22 @@ - -$FreeBSD$ - --- lru.c.orig Sun Aug 22 13:14:28 1999 +++ lru.c Sun Aug 22 17:15:12 2004 @@ -253,8 +253,9 @@ if (el) { do { if (!(p = index(el->str, '!'))) - p = "NoBang"; - len = p - el->str; + len = strlen(el->str); + else + len = p - el->str; if (ix + len > SLtt_Screen_Cols - 2) break; if (ix) { @@ -283,6 +284,7 @@ Col = ColLRUmesg; break; case 'm': + break; } SLsmg_set_color(Col); } Property changes on: head/irc/slirc/files/patch-lru.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jakarta-commons-beanutils/files/patch-build.xml =================================================================== --- head/java/jakarta-commons-beanutils/files/patch-build.xml (revision 387020) +++ head/java/jakarta-commons-beanutils/files/patch-build.xml (revision 387021) @@ -1,14 +1,11 @@ - -$FreeBSD$ - --- build.xml.orig +++ build.xml @@ -212,8 +212,6 @@ todir="${dist.home}"/> - Property changes on: head/java/jakarta-commons-beanutils/files/patch-build.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jgrapht/files/patch-build.xml =================================================================== --- head/java/jgrapht/files/patch-build.xml (revision 387020) +++ head/java/jgrapht/files/patch-build.xml (revision 387021) @@ -1,14 +1,12 @@ -$FreeBSD$ - Patch to allow the JDK API location to be passed to Ant using -Djdk.api --- build.xml.orig Mon Jul 3 00:53:38 2006 +++ build.xml Sun Mar 11 12:16:31 2007 @@ -400,6 +400,7 @@ + Property changes on: head/java/jgrapht/files/patch-build.xml ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jlint/files/patch-Makefile =================================================================== --- head/java/jlint/files/patch-Makefile (revision 387020) +++ head/java/jlint/files/patch-Makefile (revision 387021) @@ -1,24 +1,22 @@ -$FreeBSD$ - --- Makefile.orig Wed Jan 14 17:23:41 2004 +++ Makefile Thu Oct 28 14:17:10 2004 @@ -3,8 +3,8 @@ # Makefile for Unix and GNU/Linux with gcc/g++ compiler # Edit here: -CC=gcc -CPP=g++ +CC?=gcc +CPP=$(CXX) # Hints: # if you use egcs-2.90.* version of GCC please add option -fno-exceptions @@ -20,7 +20,7 @@ # Optimized version -CFLAGS = -c -Wall -O2 -g +CFLAGS+= -c -Wall -g # -DSLIST removed because it wouldn't compile under gcc 3.x # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results) Property changes on: head/java/jlint/files/patch-Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jmf/files/patch-jmfcustomizer =================================================================== --- head/java/jmf/files/patch-jmfcustomizer (revision 387020) +++ head/java/jmf/files/patch-jmfcustomizer (revision 387021) @@ -1,16 +1,14 @@ -$FreeBSD$ - --- bin/jmfcustomizer.orig Mon Jan 26 17:10:32 2004 +++ bin/jmfcustomizer Mon Jan 26 17:27:39 2004 @@ -64,9 +64,9 @@ TMPDIR=`dirname $PROGPATH` JMFHOME=`( cd $TMPDIR/.. && /bin/pwd )`; export JMFHOME -CLASSPATH=${JMFHOME}/lib/jmf.jar:${JMFHOME}/lib/sound.jar:${JMFHOME}/lib/customizer.jar:${CLASSPATH}; export CLASSPATH +CLASSPATH=%%JAVAJARDIR%%/jmf.jar:%%JAVAJARDIR%%/customizer.jar:${CLASSPATH}; export CLASSPATH -LD_LIBRARY_PATH=.:/usr/openwin/lib:${JMFHOME}/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH +LD_LIBRARY_PATH=.:/usr/X11R6/lib:%%PREFIX%%/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH # Use this to run with native threads: # THREADS_FLAG=native; export THREADS_FLAG Property changes on: head/java/jmf/files/patch-jmfcustomizer ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jmf/files/patch-jmfinit =================================================================== --- head/java/jmf/files/patch-jmfinit (revision 387020) +++ head/java/jmf/files/patch-jmfinit (revision 387021) @@ -1,16 +1,14 @@ -$FreeBSD$ - --- bin/jmfinit.orig Mon Jan 26 17:10:39 2004 +++ bin/jmfinit Mon Jan 26 17:28:13 2004 @@ -64,9 +64,9 @@ TMPDIR=`dirname $PROGPATH` JMFHOME=`( cd $TMPDIR/.. && /bin/pwd )`; export JMFHOME -CLASSPATH=${JMFHOME}/lib/jmf.jar:${JMFHOME}/lib/sound.jar:${CLASSPATH}; export CLASSPATH +CLASSPATH=%%JAVAJARDIR%%/jmf.jar:${CLASSPATH}; export CLASSPATH -LD_LIBRARY_PATH=.:/usr/openwin/lib:${JMFHOME}/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH +LD_LIBRARY_PATH=.:/usr/X11R6/lib:%%PREFIX%%/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH # Use this to run with native threads: # THREADS_FLAG=native; export THREADS_FLAG Property changes on: head/java/jmf/files/patch-jmfinit ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jmf/files/patch-jmfregistry =================================================================== --- head/java/jmf/files/patch-jmfregistry (revision 387020) +++ head/java/jmf/files/patch-jmfregistry (revision 387021) @@ -1,16 +1,14 @@ -$FreeBSD$ - --- bin/jmfregistry.orig Mon Jan 26 17:10:47 2004 +++ bin/jmfregistry Mon Jan 26 17:28:58 2004 @@ -64,9 +64,9 @@ TMPDIR=`dirname $PROGPATH` JMFHOME=`( cd $TMPDIR/.. && /bin/pwd )`; export JMFHOME -CLASSPATH=${JMFHOME}/lib/jmf.jar:${JMFHOME}/lib:${JMFHOME}/lib/sound.jar:${CLASSPATH}; export CLASSPATH +CLASSPATH=%%JAVAJARDIR%%/jmf.jar:%%JAVAJARDIR%%:${CLASSPATH}; export CLASSPATH -LD_LIBRARY_PATH=.:/usr/openwin/lib:${JMFHOME}/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH +LD_LIBRARY_PATH=.:/usr/X11R6/lib:%%PREFIX%%/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH # Use this to run with native threads: # THREADS_FLAG=native; export THREADS_FLAG Property changes on: head/java/jmf/files/patch-jmfregistry ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/jmf/files/patch-jmstudio =================================================================== --- head/java/jmf/files/patch-jmstudio (revision 387020) +++ head/java/jmf/files/patch-jmstudio (revision 387021) @@ -1,16 +1,14 @@ -$FreeBSD$ - --- bin/jmstudio.orig Mon Jan 26 17:10:53 2004 +++ bin/jmstudio Mon Jan 26 17:15:31 2004 @@ -64,9 +64,9 @@ TMPDIR=`dirname $PROGPATH` JMFHOME=`( cd $TMPDIR/.. && /bin/pwd )`; export JMFHOME -CLASSPATH=${JMFHOME}/lib/jmf.jar:${JMFHOME}/lib:${JMFHOME}/lib/sound.jar:${CLASSPATH}; export CLASSPATH +CLASSPATH=%%JAVAJARDIR%%/jmf.jar:%%JAVAJARDIR%%:${CLASSPATH}; export CLASSPATH -LD_LIBRARY_PATH=.:/usr/openwin/lib:${JMFHOME}/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH +LD_LIBRARY_PATH=.:/usr/X11R6/lib:%%PREFIX%%/lib:${LD_LIBRARY_PATH}; export LD_LIBRARY_PATH # Use this to run with native threads: # THREADS_FLAG=native; export THREADS_FLAG Property changes on: head/java/jmf/files/patch-jmstudio ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/netrexx/files/patch-NetRexxC.sh-classpath =================================================================== --- head/java/netrexx/files/patch-NetRexxC.sh-classpath (revision 387020) +++ head/java/netrexx/files/patch-NetRexxC.sh-classpath (revision 387021) @@ -1,31 +1,29 @@ -$FreeBSD$ - Add ${JAVA_HOME}/lib/tools.jar to the CLASSPATH. NOTE: JAVA_HOME is overridable but the default value is selected by bsd.java.mk when isntalling the port. --- bin/NetRexxC.sh.orig Sun Aug 20 12:47:22 2000 +++ bin/NetRexxC.sh Tue Apr 5 23:52:45 2005 @@ -29,6 +29,8 @@ # ----------------------------------------------------------------- # 2000.08.20 -- initial version derived from NetRexxC.bat +JAVA_HOME="${JAVA_HOME:-"%%JAVA_HOME%%"}" + if test $# -eq 0; then echo 'Usage:' $0 '[-run] [other options] filename' echo ' ' @@ -40,10 +42,10 @@ netrexx_run=yes fi -java -ms4M $NETREXX_JAVA COM.ibm.netrexx.process.NetRexxC $* +"${JAVA_HOME}/bin/java" -ms4M $NETREXX_JAVA -cp "${JAVA_HOME}/lib/tools.jar":"%%JAVAJARDIR%%/NetRexxC.jar" COM.ibm.netrexx.process.NetRexxC $* if test $? -eq 0; then if test "$netrexx_run" = "yes"; then echo "Running $1..." - java $1 + "${JAVA_HOME}/bin/java" $1 fi fi Property changes on: head/java/netrexx/files/patch-NetRexxC.sh-classpath ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/openjdk6/files/patch-ZoneInfoFile.java =================================================================== --- head/java/openjdk6/files/patch-ZoneInfoFile.java (revision 387020) +++ head/java/openjdk6/files/patch-ZoneInfoFile.java (revision 387021) @@ -1,14 +1,12 @@ -$FreeBSD$ - --- jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java.orig 2012-05-01 18:59:17.000000000 -0700 +++ jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2012-05-01 19:02:16.000000000 -0700 @@ -476,7 +476,8 @@ static { String zi = (String) AccessController.doPrivileged( new sun.security.action.GetPropertyAction("java.home")) - + File.separator + "lib" + File.separator + "zi"; + + File.separator + "lib" + File.separator + "." + + File.separator + "zi"; try { zi = new File(zi).getCanonicalPath(); } catch (Exception e) { Property changes on: head/java/openjdk6/files/patch-ZoneInfoFile.java ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp =================================================================== --- head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp (revision 387020) +++ head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp (revision 387021) @@ -1,40 +1,38 @@ -$FreeBSD$ - --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig 2014-10-06 17:10:00.000000000 -0400 +++ hotspot/src/os/bsd/vm/os_bsd.cpp 2014-10-08 10:23:14.000000000 -0400 @@ -458,7 +458,7 @@ * 7: The default directories, normally /lib and /usr/lib. */ #ifndef DEFAULT_LIBPATH -#define DEFAULT_LIBPATH "/lib:/usr/lib" +#define DEFAULT_LIBPATH "/lib:/usr/lib:%%LOCALBASE%%/lib" #endif #define EXTENSIONS_DIR "/lib/ext" @@ -2947,7 +2947,7 @@ if (::write(fd, "", 1) == 1) { mmap(base, size, PROT_READ|PROT_WRITE|PROT_EXEC, - MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE, fd, 0); + MAP_PRIVATE|MAP_FIXED, fd, 0); } } ::close(fd); @@ -3196,7 +3196,7 @@ return ::mprotect(addr, size, PROT_NONE) == 0; #else uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE, - MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0); + MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0); return res != (uintptr_t) MAP_FAILED; #endif } @@ -3223,7 +3223,7 @@ char * addr; int flags; - flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS; + flags = MAP_PRIVATE | MAP_ANONYMOUS; if (fixed) { assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address"); flags |= MAP_FIXED; Property changes on: head/java/openjdk7/files/patch-src-os-bsd-vm-os_bsd.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property