CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jacob Meuser
CVSROOT:/cvs
Module name:ports
Changes by: jake...@cvs.openbsd.org 2010/01/03 01:58:07

Modified files:
games/gtkpool  : Makefile 
games/gtkpool/patches: patch-gtkpool_ball_cpp 
   patch-gtkpool_sound_cpp 
   patch-gtkpool_sound_h 
games/gtkpool/pkg: PLIST 

Log message:
- use sndio instead of ossaudio
- regen patches
- @bin marker



Re: CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jacob Meuser
On Sun, Jan 03, 2010 at 01:58:07AM -0700, Jacob Meuser wrote:
 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   jake...@cvs.openbsd.org 2010/01/03 01:58:07
 
 Modified files:
   games/gtkpool  : Makefile 
   games/gtkpool/patches: patch-gtkpool_ball_cpp 
  patch-gtkpool_sound_cpp 
  patch-gtkpool_sound_h 
   games/gtkpool/pkg: PLIST 
 
 Log message:
 - use sndio instead of ossaudio
 - regen patches
 - @bin marker

that was ok pvalchev@ (MAINTAINER)

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org



CVS: cvs.openbsd.org: ports

2010-01-03 Thread joshua stein
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2010/01/03 09:40:42

Modified files:
geo/openbsd-developers: Makefile 
geo/openbsd-developers/files: OpenBSD 

Log message:
i moved, stop sending missiles to my old house



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2010/01/03 10:29:36

Log message:
import statusnet 0.8.2

StatusNet (formerly Laconica) is a Free and Open Source microblogging
platform. It helps people in a community, company or group to exchange
short (140 character) messages over the Web. Users can choose which
people to follow and receive only their friends' or colleagues' status
messages. It provides a similar service to sites like Twitter, Jaiku,
Yammer, and Plurk.

not hooking it up to the builds yet, as it will need some more tweaking
to set up.

Status:

Vendor Tag: jasper
Release Tags:   jasper_20100103

N ports/www/statusnet/distinfo
N ports/www/statusnet/Makefile
N ports/www/statusnet/pkg/MESSAGE
N ports/www/statusnet/pkg/DESCR
N ports/www/statusnet/pkg/PLIST
N ports/www/statusnet/files/README.OpenBSD

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jacob Meuser
CVSROOT:/cvs
Module name:ports
Changes by: jake...@cvs.openbsd.org 2010/01/03 14:51:29

Modified files:
games/xscavenger: Makefile 
games/xscavenger/patches: patch-src-Imakefile patch-src-sound_c 
games/xscavenger/pkg: PLIST 

Log message:
- use sndio instead of ossaudio
- license marker
- @bin marker
ok landry@, ratchov@



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2010/01/03 14:49:06

Modified files:
x11/xfm: Makefile 
x11/xfm/patches: patch-src_FmFw_c patch-src_FmMain_c 
x11/xfm/pkg: PLIST 
Added files:
x11/xfm/patches: patch-src_FmBitmaps_c patch-src_FmChmod_c 
 patch-src_FmHistory_c patch-src_FmLog_c 
 patch-src_FmSelection_c patch-src_TextField_c 

Log message:
- fix seg. faults on amd64  due to many
vararg libXt calls (XtVa...) being terminated with 0 instead of with NULL.

from nima hoda, thanks!



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2010/01/03 15:39:08

Modified files:
textproc/libxml: Makefile 

Log message:
- let libxml build on mips64 too.



null pointers (was: Re: CVS: cvs.openbsd.org: ports)

2010-01-03 Thread Christian Weisgerber
Jasper Lievisse Adriaanse jas...@cvs.openbsd.org wrote:

 CVSROOT:  /cvs
 Module name:  ports
 Changes by:   jas...@cvs.openbsd.org  2010/01/03 14:49:06
 
 Modified files:
   x11/xfm: Makefile 
   x11/xfm/patches: patch-src_FmFw_c patch-src_FmMain_c 
   x11/xfm/pkg: PLIST 
 Added files:
   x11/xfm/patches: patch-src_FmBitmaps_c patch-src_FmChmod_c 
patch-src_FmHistory_c patch-src_FmLog_c 
patch-src_FmSelection_c patch-src_TextField_c 
 
 Log message:
 - fix seg. faults on amd64  due to many
 vararg libXt calls (XtVa...) being terminated with 0 instead of with NULL.

This is wrong.
If you pass a null pointer to a vararg function, you need an explicit
cast to a pointer context.  NULL is just a pretty name for 0, it
is not guaranteed to be null pointer constant.

Instead of replacing 0 with NULL, you need to replace it with (void *)0.
(Or (void *)NULL if you like, but that doesn't make any difference.)

http://www.c-faq.com/null/null2.html

-- 
Christian naddy Weisgerber  na...@mips.inka.de



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2010/01/03 15:53:32

Modified files:
x11/xfm: Makefile 
x11/xfm/patches: patch-src_FmBitmaps_c patch-src_FmChmod_c 
 patch-src_FmFw_c patch-src_FmHistory_c 
 patch-src_FmLog_c patch-src_FmMain_c 
 patch-src_FmSelection_c patch-src_TextField_c 

Log message:
- tweak previous, spotted by naddy@, thanks.
- add missing rcs id's



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2010/01/03 15:56:42

Modified files:
misc/openbabel : Makefile distinfo 

Log message:
- bugfix update of openbabel to 2.2.3

ok ajacoutot@ (MAINTAINER)



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Federico G. Schwindt
CVSROOT:/cvs
Module name:ports
Changes by: fg...@cvs.openbsd.org   2010/01/03 16:50:31

Modified files:
games/gnugo: Makefile distinfo 
games/gnugo/pkg: PLIST 

Log message:
Update to gnugo 3.8



CVS: cvs.openbsd.org: ports

2010-01-03 Thread Matthias Kilian
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2010/01/03 23:35:31

Modified files:
sysutils/dmassage: Makefile 
sysutils/dmassage/patches: patch-dmassage 

Log message:
Don't assume everything is attached to mainbus0.

This should satisfy some whiners on misc@, but please be aware that
the use of this program may actually hurt satisfaction,  especially
if your udildo(4) wasn't attached when you created your super small
and fast and broken kernel config.

Remove jasper@ as MAINTAINER at his request.

ok jasper@



Recuperam datorii

2010-01-03 Thread Recuperam datorii
SC VESTIMPEX SRL
 
Registrul Comertului : J33/107/1997 :   
  
Cod Unic de Inregistrare Fiscala : RO9173501 ,  
  
Adresa sediu social : str. Bujorilor , nr.12 , bl.105 ,sc.B , ap.37 , Suceava , 
cod postal 720164 ,
Judetul Suceava .
 
Tel/Fax : 0230 257760 ,  
Tel. mobil : 0722 728192.   www.recuperamdatorii.ro
 Domnului Director  General 
,
Societatea noastra ,VESTIMPEX SRL Suceava recupereaza , in conditii legale , 
pentru DVS orice fel de datorii , garantii de buna executie , garantii bancare 
,impozite cladiri si teren,alte taxe,amenzi, salarii etc.
Pentru recuperarea datoriilor , DVS nu cheltuiti nimic , toate taxele judiciare 
de timbru , onorarii avocat , cheltuieli de reprezentare in instanta , alte 
cheltuieli le suportam noi , iar in caz ca datornicul DVS este insolvabil si nu 
are bunuri patrimoniale de valorificat nu pierdeti nimic pentru ca , asa cum 
v-am spus ,toate cheltuielile ocazionate de procese le suporta firma noastra 
VESTIMPEX SRL , care , pe langa alte activitati este specializata in recuperari 
de creante , litigii comerciale . expertizari , evaluari , lichidari.
In decursul activitatii noastre am recuperat in instanta de judecata ,  cu 
succes deosebit pentru clientii nostrii , datorii de multe miliarde de lei 
vechi.
 In relatiile contractuale dintre noi pastram o confidentialitate deosebita 
protejandu-va relatiile DVS comerciale  chiar si cu datornicii DVS .
 Pentru informare DVS completa, prezentei scrisori am anexat si un contract de 
cesiune de creanta.
 Asigurandu-va de respectul nostru deosebit va multumim anticipat pentru 
atentia acordata acestei oferte.
 Director , administrator , Ing.ec. Constantin Popescu
Potrivit art. 6 din Legea 365/2002 , acest mesaj este PRIMA CERERE LEGALA  DE 
ACCEPTARE COMUNICARI COMERCIALE privind consimtamantul DVS expres , exprimat 
prealabil de a primi asemenea comunicari. Daca nu sunteti interesat de 
serviciile noastre , prezentate in continuare va rugam sa ignorati acest mesaj 
si sa va dezabonati printr-un reply cu mesajul „dezabonare” , adresa DVS de 
email va fi radiata definitiv din newsletterul nostru si nu veti mai primi 
niciodata un mesaj din partea noastra.
Daca ati dorit in trecut sa fiti abonat la newsletterul nostru si intre timp 
v-ati razgandit , atunci va puteti dezabona analog procedurilor descrise mai 
sus.
In art. 1 , punctul 8 , din Legea 365/2002 este prevazut ca nu constituie prin 
ele insele , comunicari comercialae , informatiile permitand accesul direct la 
activitatea unei persoane juridice. Conform acestei prevederi legale mesajul 
nostru va transmite informatii care sa va permita accesul direct la activitatea 
persoanei juridice VESTIMPEX SRL , prin site-ul www.recuperamdatorii.ro.
In cazul cand un prieten v-a inscris abuziv , fara cunostiinta DVS , in 
newsletterul nostru , atunci va rugam sa ne scuzati si sa trimiteti un reply cu 
mesajul „dezabonare”.
 
 
CONTRACT  DE  CESIUNE  DE  CREANTA
 
I  N  T  R  E   :
 
1.  Societatea Comerciala ……...denumita in 
continuare cedent  , inscrisa la  Registrul  Comertului  cu nr. 
J../.../.avand Codul Unic de Inregistrare 
Fiscala .cu sediul social in str. 
... 
..nr.………localitate:cod postal : ……… 
judet reprezentata legal de Domnul 
...
  .cu functia 
de ..
  SI :
2.  Societatea Comerciala VESTIMPEX  SRL denumita in continuare cesionar 
(Cedentul si Cesionarul denumiti in continuare Parti Contractante) , inscrisa 
la Registrul Comertului cu nr. J33/107/1997 avand Codul Unic de Inregistrare 
Fiscala RO 9173501, cu sediul in str. Bujorilor , nr. 12 , bl.105 , sc. B ap. 
37 , Suceava , cod postal 720164 , judetul Suceava , reprezentata legal de 
domnul ing.ec. Constantin Popescu ,cu functia de administrator , director 
general.
Art.1. Obiectul Contractului :
(1)Obiectul prezentului contract consta in cedarea  de catre Cedent  , 
respectiv de catre  Societatea Comerciala 
..
in favoarea cesionarului adica in favoarea Societatii Comerciale VESTIMPEX SRL  
a dreptului de creanta impotriva 

games/xboing broken?

2010-01-03 Thread Jacob Meuser

*sigh*

I spent quite some brain cycles on sndio backend for xboing, then went
to test it only to find out xboing doesn't run on my machine.  tracked
it down to failures with XLoadQueryFont() in xboing/init.c.

does it work for anyone else?

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org



Re: games/xboing broken?

2010-01-03 Thread Benoit Lecocq
Jacob Meuser wrote:
 *sigh*
 
 I spent quite some brain cycles on sndio backend for xboing, then went
 to test it only to find out xboing doesn't run on my machine.  tracked
 it down to failures with XLoadQueryFont() in xboing/init.c.
 
 does it work for anyone else?
 

Hi,

Same for me on amd64.



Re: games/xboing broken?

2010-01-03 Thread Stuart Henderson
On 2010/01/03 08:48, Jacob Meuser wrote:
 
 *sigh*
 
 I spent quite some brain cycles on sndio backend for xboing, then went
 to test it only to find out xboing doesn't run on my machine.  tracked
 it down to failures with XLoadQueryFont() in xboing/init.c.
 
 does it work for anyone else?

DESCR mentions it needs an 8-bit colour mode; though actually it seems
to work if you start it as 'xboing -usedefcmap'.



sndio for games/xscavenger

2010-01-03 Thread Jacob Meuser
ok?
-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===
RCS file: /cvs/ports/games/xscavenger/Makefile,v
retrieving revision 1.12
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:43 -  1.12
+++ Makefile3 Jan 2009 09:56:04 -
@@ -1,16 +1,17 @@
 # $OpenBSD: Makefile,v 1.12 2009/08/10 06:31:43 kili Exp $
 
 DISTNAME=  xscavenger-1.4.4
-PKGNAME=   ${DISTNAME}p1
+PKGNAME=   ${DISTNAME}p2
 EXTRACT_SUFX=  .tgz
 CATEGORIES=games
 
+# GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   X11 Xau Xdmcp Xext c ossaudio pthread-stubs xcb
+WANTLIB=   X11 Xau Xdmcp Xext c pthread-stubs sndio xcb
 
 COMMENT=   Lode Runner clone
 HOMEPAGE=  http://www.xdr.com/dash/scavenger.html
Index: patches/patch-src-Imakefile
===
RCS file: /cvs/ports/games/xscavenger/patches/patch-src-Imakefile,v
retrieving revision 1.1.1.1
diff -N -u -p patches/patch-src-Imakefile
--- patches/patch-src-Imakefile 16 Jul 2001 13:03:57 -  1.1.1.1
+++ patches/patch-src-Imakefile 3 Jan 2009 09:56:04 -
@@ -1,5 +1,5 @@
 src/Imakefile.orig Mon Jan 10 06:15:30 2000
-+++ src/Imakefile  Mon Jul 16 14:58:25 2001
+--- src/Imakefile.orig Sun Jan  9 21:15:30 2000
 src/Imakefile  Sun Jan  3 01:35:51 2010
 @@ -1,7 +1,7 @@
  # set this to the path where data files should be stored.  LIBDIR
  # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so
@@ -14,7 +14,7 @@
../data/victory.raw
  
 -LOCAL_LIBRARIES = $(XLIB)
-+LOCAL_LIBRARIES = $(XLIB) -lossaudio
++LOCAL_LIBRARIES = $(XLIB) -lsndio
  EXTRA_DEFINES = -DLIBNAME=\$(LIBNAME)\
  
  ComplexProgramTarget(scavenger)
Index: patches/patch-src-sound_c
===
RCS file: /cvs/ports/games/xscavenger/patches/patch-src-sound_c,v
retrieving revision 1.3
diff -N -u -p patches/patch-src-sound_c
--- patches/patch-src-sound_c   21 Mar 2002 02:18:21 -  1.3
+++ patches/patch-src-sound_c   3 Jan 2009 09:56:04 -
@@ -1,25 +1,92 @@
 $OpenBSD: patch-src-sound_c,v 1.3 2002/03/21 02:18:21 jcs Exp $
 src/sound.c.orig   Wed Mar 20 20:06:22 2002
-+++ src/sound.cWed Mar 20 20:07:17 2002
-@@ -5,7 +5,7 @@
+--- src/sound.c.orig   Sun Dec  1 22:03:54 2002
 src/sound.cSun Jan  3 01:53:43 2010
+@@ -4,8 +4,7 @@
+ #include stdlib.h
  #include unistd.h
  #include fcntl.h
- #include sys/ioctl.h
+-#include sys/ioctl.h
 -#include linux/soundcard.h
-+#include soundcard.h
++#include sndio.h
  #include sys/time.h
  #include signal.h
  #include string.h
-@@ -14,7 +14,7 @@
+@@ -14,8 +13,6 @@
  #include scav.h
  #include sound.h
  
 -#define SOUNDDEV /dev/dsp
-+#define SOUNDDEV /dev/audio
- 
+-
  char dirlist[512];
  
-@@ -207,7 +207,7 @@
+ #define NUMSOUNDS (sizeof(soundnames)/sizeof(char*))
+@@ -42,7 +39,8 @@ sample samples[NUMSOUNDS];
+ 
+ int soundworking=0;
+ int fragment;
+-int dsp;
++struct sio_hdl *hdl;
++struct sio_par par;
+ int soundwrite,soundread;
+ int *soundbuffer;
+ int soundbufferlen;
+@@ -52,7 +50,6 @@ int soundbufferlen;
+ void soundinit(void)
+ {
+ int fd[2];
+-char devname[256];
+ int value;
+ 
+   sprintf(dirlist,%s/%s,%s,localname,localdirname,libname);
+@@ -67,17 +64,29 @@ int value;
+   }
+   close(soundwrite);
+   memset(samples,0,sizeof(samples));
+-  strcpy(devname,SOUNDDEV);
+-  dsp=open(devname,O_WRONLY);
+-  if(dsp0) goto failed;
+-  fragment=0x20009;
+-  ioctl(dsp,SNDCTL_DSP_SETFRAGMENT,fragment);
+-  value=1;
+-  ioctl(dsp,SNDCTL_DSP_SPEED,value);
+-  value=0;
+-  ioctl(dsp,SNDCTL_DSP_STEREO,value);
+-  ioctl(dsp,SNDCTL_DSP_GETBLKSIZE,fragment);
+-  if(!fragment) {close(dsp);goto failed;}
++  hdl=sio_open(NULL,SIO_PLAY,0);
++  if(hdl==NULL) goto failed;
++  sio_initpar(par);
++  par.bits=8;
++  par.sig=0;
++  par.rate=1;
++par.pchan=1;
++  par.le=SIO_LE_NATIVE;
++  par.appbufsz=par.rate/20;
++  if(!sio_setpar(hdl,par) || !sio_getpar(hdl,par)) {
++sio_close(hdl);
++goto failed;
++  }
++  if(par.bits!=8 || par.sig!=0 || par.rate!=1 || par.pchan!=1) {
++sio_close(hdl);
++goto failed;
++  }
++  if(!sio_start(hdl)) {
++sio_close(hdl);
++goto failed;
++  }
++  fragment=par.round*par.bps*par.pchan;
++  if(!fragment) {sio_close(hdl);goto failed;}
+   soundbufferlen=fragment*sizeof(int);
+   soundbuffer=malloc(soundbufferlen);
+   if(!soundbuffer) goto failed;
+@@ -207,13 +216,13 @@ int which;
+   ip=soundbuffer;
+   p=(char *) soundbuffer;
+   while(j--) *p++ = clip[4096+*ip++];
+-  write(dsp,(char *)soundbuffer,fragment);
++ 

Re: games/xboing broken?

2010-01-03 Thread Jacob Meuser
On Sun, Jan 03, 2010 at 09:28:04AM +, Stuart Henderson wrote:
 On 2010/01/03 08:48, Jacob Meuser wrote:
  
  *sigh*
  
  I spent quite some brain cycles on sndio backend for xboing, then went
  to test it only to find out xboing doesn't run on my machine.  tracked
  it down to failures with XLoadQueryFont() in xboing/init.c.
  
  does it work for anyone else?
 
 DESCR mentions it needs an 8-bit colour mode; though actually it seems
 to work if you start it as 'xboing -usedefcmap'.

yep, -usedefcmap does the trick.  thanks.

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org



sndio for games/xboing

2010-01-03 Thread Jacob Meuser
also added license marker and moved the note about 8-bit displays
to MESSAGE.

ok?

-- 
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org

Index: Makefile
===
RCS file: /cvs/ports/games/xboing/Makefile,v
retrieving revision 1.24
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:43 -  1.24
+++ Makefile3 Jan 2009 11:01:20 -
@@ -4,18 +4,19 @@ COMMENT=  blockout style game for X11
 
 V= 2.4
 DISTNAME=  xboing${V}
-PKGNAME=   xboing-${V}p2
+PKGNAME=   xboing-${V}p3
 
 CATEGORIES=games
 
 HOMEPAGE=  http://www.techrescue.org/xboing/
 
+# X Consortium
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   X11 Xau Xdmcp Xext Xpm c m ossaudio pthread-stubs xcb
+WANTLIB=   X11 Xau Xdmcp Xext Xpm c m pthread-stubs sndio xcb
 
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=games/}
 
Index: patches/patch-Imakefile
===
RCS file: /cvs/ports/games/xboing/patches/patch-Imakefile,v
retrieving revision 1.5
diff -N -u -p patches/patch-Imakefile
--- patches/patch-Imakefile 7 Dec 2007 10:25:46 -   1.5
+++ patches/patch-Imakefile 3 Jan 2009 11:01:20 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Imakefile,v 1.5 2007/12/07 10:25:46 ajacoutot Exp $
 Imakefile.orig Fri Nov 22 02:28:46 1996
-+++ Imakefile  Fri Dec  7 09:53:24 2007
+--- Imakefile.orig Thu Nov 21 17:28:46 1996
 Imakefile  Sat Jan  2 23:47:56 2010
 @@ -24,23 +24,23 @@ XCOMM 
  XCOMM This is the directory where the highscore, level  sound data will be 
  XCOMM placed. Default will be the current directory.
@@ -29,7 +29,7 @@ $OpenBSD: patch-Imakefile,v 1.5 2007/12/07 10:25:46 aj
  AUDIO_INCLUDE =
 -AUDIO_LIB =
 -  CDEBUGFLAGS = -g
-+AUDIO_LIB = -lossaudio
++AUDIO_LIB = -lsndio
  
  XCOMM Uncomment this if you want to use ANY of the AUDIO sound systems
  #define COMPILE_IN_AUDIO
Index: patches/patch-audio-LINUXaudio.c
===
RCS file: /cvs/ports/games/xboing/patches/patch-audio-LINUXaudio.c,v
retrieving revision 1.2
diff -N -u -p patches/patch-audio-LINUXaudio.c
--- patches/patch-audio-LINUXaudio.c5 Mar 2004 22:56:42 -   1.2
+++ patches/patch-audio-LINUXaudio.c3 Jan 2009 11:01:20 -
@@ -1,13 +1,128 @@
 $OpenBSD: patch-audio-LINUXaudio.c,v 1.2 2004/03/05 22:56:42 naddy Exp $
 audio/LINUXaudio.c.orig1996-11-22 02:28:33.0 +0100
-+++ audio/LINUXaudio.c 2004-03-05 23:30:39.0 +0100
-@@ -55,7 +55,8 @@
+--- audio/LINUXaudio.c.origThu Nov 21 17:28:33 1996
 audio/LINUXaudio.c Sun Jan  3 02:36:53 2010
+@@ -52,11 +52,13 @@
+  *  Include file dependencies:
+  */
+ 
++#include fcntl.h
  #include unistd.h
  #include stdio.h
- #include fcntl.h
+-#include fcntl.h
 -#include linux/soundcard.h
-+#include sys/ioctl.h
-+#include soundcard.h
++#include sndio.h
  
++#include include/ulaw.h
++
  #include include/error.h
  #include include/audio.h
+ 
+@@ -77,10 +79,11 @@ static int snd_pipes[2];
+  *  Internal variable declarations:
+  */
+ 
+-static char   *Audio_dev = /dev/audio;
+-static intAudio_fd;
++static struct sio_hdl *hdl;
++
+ /* size should depend on sample_rate */
+ static unsigned char  buf[BUFFER_SIZE];   
++static short  linBuf[BUFFER_SIZE];
+ static char   errorString[255];
+ 
+ #if NeedFunctionPrototypes
+@@ -90,7 +93,9 @@ int SetUpAudioSystem(display)
+   Display *display;
+ #endif
+ {
+-  int err, cnt;
++  struct sio_par par;
++  int i,err, cnt;
++  uint32_t pos = 0;
+   
+ 
+   if (child_pid == 0)
+@@ -124,17 +129,30 @@ int SetUpAudioSystem(display)
+ 
+   if (!strcmp(string, EXIT))
+{
+- /* Make sure that the audio device is flushed and reset 
*/
+-   ioctl(Audio_fd, SNDCTL_DSP_RESET, 0);
+-
+exit(0); 
+}  
+ 
+ /* Try to open the audio device */
+-if (!(Audio_fd = open(Audio_dev, O_WRONLY)))
++if (!(hdl = sio_open(NULL, SIO_PLAY, 0)))
+ { 
++fprintf(stderr, sio_open failed\n);
+continue;
+ }
++sio_initpar(par);
++par.bits = 16;
++par.sig = 1;
++par.rate = 8000;
++par.le = SIO_LE_NATIVE;
++if (!sio_setpar(hdl, par) || !sio_getpar(hdl, par)) {
++  sprintf(errorString, Unable to configure sndio 
device.);
++

Re: games/xboing broken?

2010-01-03 Thread Stuart Henderson
On 2010/01/03 10:14, Jacob Meuser wrote:
 On Sun, Jan 03, 2010 at 09:28:04AM +, Stuart Henderson wrote:
  On 2010/01/03 08:48, Jacob Meuser wrote:
   
   *sigh*
   
   I spent quite some brain cycles on sndio backend for xboing, then went
   to test it only to find out xboing doesn't run on my machine.  tracked
   it down to failures with XLoadQueryFont() in xboing/init.c.
   
   does it work for anyone else?
  
  DESCR mentions it needs an 8-bit colour mode; though actually it seems
  to work if you start it as 'xboing -usedefcmap'.
 
 yep, -usedefcmap does the trick.  thanks.

I suppose it would make sense to do something like this then..

Index: Makefile
===
RCS file: /cvs/ports/games/xboing/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile10 Aug 2009 06:31:43 -  1.24
+++ Makefile3 Jan 2010 11:11:38 -
@@ -4,7 +4,7 @@ COMMENT=blockout style game for X11
 
 V= 2.4
 DISTNAME=  xboing${V}
-PKGNAME=   xboing-${V}p2
+PKGNAME=   xboing-${V}p3
 
 CATEGORIES=games
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=   Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
 
-WANTLIB=   X11 Xau Xdmcp Xext Xpm c m ossaudio pthread-stubs xcb
+WANTLIB=   X11 Xau Xdmcp Xext Xpm c m ossaudio
 
 MASTER_SITES=  ${MASTER_SITE_XCONTRIB:=games/}
 
Index: patches/patch-init_c
===
RCS file: /cvs/ports/games/xboing/patches/patch-init_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-init_c
--- patches/patch-init_c7 Dec 2007 10:25:46 -   1.2
+++ patches/patch-init_c3 Jan 2010 11:11:38 -
@@ -1,6 +1,6 @@
 $OpenBSD: patch-init_c,v 1.2 2007/12/07 10:25:46 ajacoutot Exp $
 init.c.origFri Nov 22 02:28:46 1996
-+++ init.c Fri Dec  7 09:53:24 2007
+--- init.c.origFri Nov 22 01:28:46 1996
 init.c Sun Jan  3 11:07:53 2010
 @@ -438,7 +438,7 @@ static void HandleDisplayErrors(displayName)
WarningMessage(Your X Window system display variable is not 
set.);
else
@@ -10,3 +10,46 @@ $OpenBSD: patch-init_c,v 1.2 2007/12/07 
WarningMessage(string);
}
  }
+@@ -474,7 +474,7 @@ static void PrintUsage()
+ [-speed 1-9] [-scores] [-keys] [-sound] 
[-setup],
+[-nosfx],
+ [-grab] [-maxvol 1-100] [-startlevel 1-MAX],
+-   [-usedefcmap],
++   [-no-usedefcmap],
+ [-nickname name] [-noicon]);
+ 
+   /* Exit now */
+@@ -551,7 +551,7 @@ static void PrintHelp()
+ -setup  - Print setup information.\n,
+ -nosfx  - Do not use some special effects.\n,
+ -grab   - Turn ON pointer grab.\n,
+--usedefcmap - Use the default colourmap.\n,
++-no-usedefcmap  - Don't use the default colourmap.\n,
+   -nickname name- Use nickname instead of real 
name.\n,
+ -noicon - Do not create a custom icon.\n,
+ -display display  - Set the display for the game.\n);
+@@ -599,7 +599,7 @@ static void InitialiseSettings()
+   syncOn = False;
+   debug = False;
+   grabPointer = False;
+-  useDefaultColourmap = False;
++  useDefaultColourmap = True;
+ 
+   /* This will force the use of the users real name */
+   SetNickName();
+@@ -744,12 +744,12 @@ static void ParseCommandLine(argv, argc)
+   SetNickName(argv[i]);
+   } else PrintUsage();
+ 
+-  } else if (!compareArgument(argv[i], -usedefcmap, 10))
++  } else if (!compareArgument(argv[i], -no-usedefcmap, 10))
+   {
+   /* Try to use the default colourmap */
+-  useDefaultColourmap = True;
++  useDefaultColourmap = False;
+ 
+-  DEBUG(Using default colourmap please.)
++  DEBUG(Not using default colourmap.)
+ 
+   } else if (!compareArgument(argv[i], -speed, 5))
+   {
Index: patches/patch-xboing_man
===
RCS file: patches/patch-xboing_man
diff -N patches/patch-xboing_man
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-xboing_man3 Jan 2010 11:11:38 -
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- xboing.man.origSun Jan  3 11:09:12 2010
 xboing.man Sun Jan  3 11:10:26 2010
+@@ -45,7 +45,7 @@
+ xboing \- An X Window System based blockout clone. V2.4
+ .SH SYNOPSIS
+ .B xboing 
+-[-version] [-usage] [-help] [-sync] [-display displayName] [-speed 1-10] 
[-scores] [-keys] [-sound] [-setup] [-nosfx] [-grab] [-maxvol 1-100] 
[-startlevel 1-MAXLEVELS] [-usedefcmap] [-nickname name] 

Re: jdk-1.7.0.00b72 doesn't build jdk-1.6 anymore (jdk17_bootstrap flavor)

2010-01-03 Thread Jonathan Armani

Hi,

Exactly the same problem here, 4.6 amd64 current, updated today.

David Coppa wrote:

Hi,

Recent update of jdk-1.7 (early access build 72) broke compilation of 
jdk-1.6 using jdk17_bootstrap PSEUDO_FLAVOR:


ln -s ../libjsig.so 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/i386/server/libjsig.so
ln -s ../libjsig.so 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/i386/client/libjsig.so
cp ../../tools/crypto/jce/US_export_policy.jar 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/security/US_export_policy.jar
cp ../../tools/crypto/jce/local_policy.jar 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/security/local_policy.jar
cp ../../tools/crypto/jce/jce.jar 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/jce.jar
cp ../../tools/crypto/jce/sunjce_provider.jar 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/ext/sunjce_provider.jar
cp ../../tools/crypto/jsse/jsse.jar 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/jsse.jar
/usr/local/jdk-1.7.0/bin/javac -J-XX:ThreadStackSize=768 -J-client -J-Xmx512m 
-J-Xms256m -J-Xbootclasspath/p:../../../make/sun/javac/javac/gjc.jar -target 5 
-d 
/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/tmp/java/jsum
 ../../tools/sharing/AddJsum.java
../../tools/sharing/AddJsum.java:16: cannot access java.lang.Object
bad class file: /usr/local/jdk-1.7.0/jre/lib/rt.jar(java/lang/Object.class)
class file has wrong version 51.0, should be 50.0
Please remove or make sure it appears in the correct subdirectory of the 
classpath.
public class AddJsum {
   ^
1 error
gmake[3]: *** 
[/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/tmp/java/jsum/AddJsum.class]
 Error 1
gmake[3]: Leaving directory 
`/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/j2se/make/java/redist'
gmake[2]: *** [all] Error 1
gmake[2]: Leaving directory 
`/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/j2se/make/java'
gmake[1]: *** [all] Error 1
gmake[1]: Leaving directory 
`/usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/j2se/make'
gmake: *** [j2se-build] Error 2
*** Error code 2

Stop in /usr/ports/devel/jdk/1.6 (line 2193 of 
/usr/ports/infrastructure/mk/bsd.port.mk).

Reverting to b59 solved the issue.

Unfortunately, I was not able to fix the problem myself, so I'm sending 
this report.


My system is the latest -current and the ports tree was checked out 
yesterday.


cheers,
David



  




[NEW] math/geogebra

2010-01-03 Thread Azwaw OUSADOU
Hi,

I'm trying to port geogebra to OpenBSD. But I Have a problem when i lunch 
geogebra i have this error:

./toz
bash-4.0$ export LAX_DEBUG=./toz
bash-4.0$ geogebra

= Analyzing UNIX Environment =
Setting UNIX (openbsd) flavor specifics.
Importing UNIX environment into LAX properties.
Checking for POSIX awk.

= Analyzing LAX ==
LAX found OK.
LAX properties read.. OK.

= Finding VM =
Valid VM types.. 1.4.2+
Absolute LAX_VM path /usr/local/jdk-1.7.0/jre/bin/java
Expanded Valid VM types.  1.4.2+
* Using VM.(lax.nl.current.vm).. /usr/local/jdk-1.7.0/jre/bin/java

= Virtual Machine Options 
LAX properties incorporated. OK.
classpath... 
/usr/local/share/geogebra/geogebra.jar:/usr/local/bin/../share/geogebra/lax.jar
main class.. geogebra.GeoGebra
.lax file path.. 
/usr/local/bin/../share/geogebra/geogebra.lax
user directory.. .
stdout to... console
sterr to console
install directory... /usr/local/share/geogebra/
JIT. none
option (verify). none
option (verbosity).. none
option (garbage collection extent).. none
option (garbage collection thread).. none
option (native stack max size).. none
option (java stack max size) none
option (java heap max size). none
option (java heap initial size). none
option (lax.nl.java.option.additional).. none

= Display settings ===
X display... local
UI mode. not set
= VM Command Line 
options:
CLASSPATH:/usr/local/share/geogebra/geogebra.jar:/usr/local/bin/../share/geogebra/lax.jar:

= Forking JAVA =
LAX Version = 10.0
GeoGebra 3.2.0.0, June 2, 2009, Java 1.7.0-internal
java.lang.Exception: Sorry, there is no font for this language available on 
your computer.
at geogebra.e.t.a(Unknown Source)
at geogebra.e.t.d(Unknown Source)
at geogebra.e.t.b(Unknown Source)
at geogebra.e.t.a(Unknown Source)
at geogebra.e.t.init(Unknown Source)
at geogebra.e.t.init(Unknown Source)
at geogebra.e.b.init(Unknown Source)
at geogebra.gui.f.a.a(Unknown Source)
at geogebra.gui.f.a.a(Unknown Source)
at geogebra.GeoGebra.a(Unknown Source)
at geogebra.GeoGebra.main(Unknown Source)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:617)
at com.zerog.lax.LAX.launch(DashoA10*..)
at com.zerog.lax.LAX.main(DashoA10*..)
java.lang.NullPointerException
at geogebra.e.t.I(Unknown Source)
at geogebra.e.t.b(Unknown Source)
at geogebra.e.t.c(Unknown Source)
at geogebra.e.t.b(Unknown Source)
at geogebra.e.t.b(Unknown Source)
at geogebra.e.t.a(Unknown Source)
at geogebra.e.t.init(Unknown Source)
at geogebra.e.t.init(Unknown Source)
at geogebra.e.b.init(Unknown Source)
at geogebra.gui.f.a.a(Unknown Source)
at geogebra.gui.f.a.a(Unknown Source)
at geogebra.GeoGebra.a(Unknown Source)
at geogebra.GeoGebra.main(Unknown Source)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:617)
at com.zerog.lax.LAX.launch(DashoA10*..)
at com.zerog.lax.LAX.main(DashoA10*..)

If I search in /usr/local/jdk-1.7.0/jre/lib/fontconfig.properties.src. I found 
fonts dir is /usr/share/fonts but it's directory is empty.

Thanks
-- 
Azwaw OUSADOU bsdman...@gmail.com


geogebra.tar.gz
Description: Binary data


pure-ftpd-ldap: unusable on 4.6, both i386 and amd64

2010-01-03 Thread Toni Mueller

Hi,

I'm having a problem with pure-ftpd-ldap from packages, and I am now
out of my wits. Sorry. :(

The problem: After upgrading from 4.4 and 4.5, I cannot log in to any
account on any of my FTP servers anymore because the passwords are
rejected. Using lftp, I can see this:


$ lftp -d -u testing 192.168.1.10
Password: 
lftp test...@192.168.1.10:~ ls   
 Connecting to 192.168.1.10 (192.168.1.10) port 21
--- 220-- Welcome to Pure-FTPd [privsep] [TLS] --
--- 220-You are user number 1 of 50 allowed.
--- 220-Local time is now 18:08. Server port: 21.
--- 220-This is a private system - No anonymous login
--- 220 You will be disconnected after 15 minutes of inactivity.
--- FEAT
--- 211-Extensions supported:
---  EPRT
---  IDLE
---  MDTM
---  SIZE
---  REST STREAM
---  MLST type*;size*;sizd*;modify*;UNIX.mode*;UNIX.uid*;UNIX.gid*;unique*;
---  MLSD
---  AUTH TLS
---  PBSZ
---  PROT
---  UTF8
---  TVFS
---  ESTA
---  PASV
---  EPSV
---  SPSV
---  ESTP
--- 211 End.
--- AUTH TLS
--- 234 AUTH TLS OK.
--- OPTS UTF8 ON
Certificate: C=DE,ST=Nordrhein-Westfalen,L=Wiehl,O=Oeko.neT Mueller  Brandt 
GbR,OU=Technik,CN=*.oeko.net,email=supp...@oeko.net
 Issued by: C=DE,ST=Nordrhein-Westfalen,L=Wiehl,O=Oeko.neT Mueller  Brandt 
GbR,OU=CA,cn...@oeko.net,email...@oeko.net
WARNING: Certificate verification: Not trusted
WARNING: Certificate verification: The certificate's owner does not match 
hostname '192.168.1.10'

--- 200 OK, UTF-8 enabled 
--- OPTS MLST type;size;modify;UNIX.mode;UNIX.uid;UNIX.gid;
--- 200  MLST OPTS type;size;sizd;modify;UNIX.mode;UNIX.uid;UNIX.gid;unique;
--- USER testing
--- 331 User testing OK. Password required
--- PASS 
--- 530 Login authentication failed
 Closing control socket
ls: Login failed: 530 Login authentication failed


On the server side, I was unable to make pure-ftpd log specifics, but
the OpenLDAP logs show something strange:

With debug level 511, the entry is logged in hex, and then:

@40004b40cc9027ed4a64  cache_return_entry_r( 262 ): returned (0)
@40004b40cc9027ed5dec send_ldap_result: conn=1 op=1 p=3
@40004b40cc9027ed6d8c send_ldap_result: err=0 matched= text=
@40004b40cc9027ed8114 send_ldap_response: msgid=2 tag=101 err=0
@40004b40cc9027ed949c ber_flush: 14 bytes to sd 13
@40004b40cc9027eda43c   :  30 0c 02 01 02 65 07 0a  01 00 04 00 04 00   
  0e
@40004b40cc9027edb7c4 ldap_write: want=14, written=14
@40004b40cc9027edcb4c   :  30 0c 02 01 02 65 07 0a  01 00 04 00 04 00   
  0e
@40004b40cc9027edded4 conn=1 op=1 SEARCH RESULT tag=101 err=0 nentries=1 
text=
@40004b40cc9027edf25c daemon: activity on 1 descriptor
@40004b40cc9027ee01fc daemon: activity on: 13r
@40004b40cc9027ee119c daemon: read activity on 13
@40004b40cc9027ee2524 connection_get(13)
@40004b40cc9027ee34c4 connection_get(13): got connid=1
@40004b40cc9027ee484c connection_read(13): checking for input on id=1
@40004b40cc9027ee57ec ber_get_next
@40004b40cc9027ee6b74 ldap_read: want=8, got=7
@40004b40cc9027ee7b14   :  30 05 02 01 03 42 00 
  0B.   
@40004b40cc9027ee8e9c ber_get_next: tag 0x30 len 5 contents:
@40004b40cc9027eea224 ber_dump: buf=0x20070cbc0 ptr=0x20070cbc0 
end=0x20070cbc5 len=5
@40004b40cc9027eeb1c4   :  02 01 03 42 00   
  ...B. 
@40004b40cc9027eec54c ber_get_next
@40004b40cc9027eed4ec ldap_read: want=8, got=0
@40004b40cc9027eee874 
@40004b40cc9027eef814 ber_get_next on fd 13 failed errno=0 (Undefined 
error: 0)
@40004b40cc9027ef26f4 connection_read(13): input error=-2 id=1, closing.
@40004b40cc9027ef3694 connection_closing: readying conn=1 sd=13 for close
@40004b40cc9027ef4a1c connection_close: deferring conn=1 sd=13
@40004b40cc9027ef5da4 daemon: select: listen=8 active_threads=0 tvp=NULL
@40004b40cc9027ef6d44 daemon: activity on 1 descriptor
@40004b40cc9027ef80cc daemon: waked
@40004b40cc9027ef906c daemon: select: listen=8 active_threads=0 tvp=NULL
@40004b40cc9027efa3f4 do_unbind


I guessed that this is a pure-ftpd problem because using other entries
in the same LDAP server for email works like before, without any visible
problem.

I have completely reloaded the directory, and also used db4.2_recover
on it in a vain attempt to get things working.

Using Google also didn't turn up useful info so far...



TIA!


-- 
Kind regards,
--Toni++



[FIX] x11/xfm bad varargs calls

2010-01-03 Thread Nima Hoda
Hello:

x11/xfm file manager segfaults on OpenBSD 4.6-stable/amd64 due to many
vararg libXt calls (XtVa...) being terminated with 0 instead of with
NULL. A backtrace of the problem follows. A fixed port is attached (I
would have sent it as a patch, but there are new files in the port). I
sent a patch to the author as well.

I'm not a member of this list so pleace CC me in your responses.

-Nima

Program received signal SIGSEGV, Segmentation fault.
0x000202eb0a03 in _XtCountVaList () from /usr/X11R6/lib/libXt.so.10.0
(gdb) bt
#0  0x000202eb0a03 in _XtCountVaList () from /usr/X11R6/lib/libXt.so.10.0
#1  0x000202eaf241 in XtVaCreateManagedWidget ()
   from /usr/X11R6/lib/libXt.so.10.0
#2  0x00428806 in FmCreateLog (parent=0x20aeac400, font=0x20aeab300)
at FmLog.c:190
#3  0x00405c84 in main (argc=1, argv=0x7f7c58e8) at FmMain.c:542

(Note this backtrace was produced from a modified port disabling gcc
optimization and symbol stripping and enabling the gcc -g debug
flag. The original port produced a bus error instead.)


xfm.fix-XtVa.tar.gz
Description: application/gzip


Re: UPDATE: devel/boost

2010-01-03 Thread Markus Hennecke

Markus Hennecke wrote:

Federico G. Schwindt wrote:

On Sun, Dec 13, 2009 at 11:24:28AM +, Stuart Henderson wrote:

On 2009/12/13 08:23, Andrej Elizarov wrote:

if you're still interested
mind to update it to the latest version and send it again?
i have made step in past.

Stuart Henderson wrote about boost 1.39:
unfortunately this update breaks graphics/hugin, 
editors/openoffice3 and

net/powerdns; build logs attached

donno 'bout hugin.
this might be fixed in newer upstream code, but that requires newer 
cmake.



i made patch for powerdns,

this needs re-testing, PowerDNS has been updated since then. there's a
reasonable chance that the new one will just work.


  i will test with boost 1.41 and see if it's fixed.


Attached is a diff for boost 1.41, graphics/hugin still does not build, 
editors/openoffice3 with the no_java flavor and net/powerdns build fine 
here on amd64.
I used the 1.39 version that was posted here on the list as base, the 
diff is against -current in cvs.


Just an update: To unbreak graphics/hugin when using boost-1.41 someone 
would have to backport this fix from gcc 3.4: 
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17327


I have done a patch for gcc, but I think it is not complete as gcc-3.3.5 
is missing the parser.c file. I can't see the consequences of this, so I 
keep away from it. hugin builds with that patch, if someone is 
interested please mail me.


Has someone tried boost-1.41 with other ports than mentioned above?

Kind regards,
  Markus



UPDATE misc/mc

2010-01-03 Thread Max Varencov

Hi,

Here is a diff for mc 4.7.0.1.

Changelog: http://www.midnight-commander.org/wiki/NEWS-4.7.0.1

Tested on OpenBSD current amd64.
Index: Makefile
===
RCS file: /cvs/ports/misc/mc/Makefile,v
retrieving revision 1.30
diff -N -u -r1.30 Makefile
--- Makefile1 Jan 2009 19:21:05 -   1.30
+++ Makefile3 Jan 2009 19:05:31 -
@@ -2,7 +2,7 @@
 
 COMMENT=   free Norton Commander clone with many useful features
 
-DISTNAME=  mc-4.7.0
+DISTNAME=  mc-4.7.0.1
 CATEGORIES=misc
 
 HOMEPAGE=  http://www.midnight-commander.org/
Index: distinfo
===
RCS file: /cvs/ports/misc/mc/distinfo,v
retrieving revision 1.6
diff -N -u -r1.6 distinfo
--- distinfo1 Jan 2009 19:21:05 -   1.6
+++ distinfo3 Jan 2009 19:05:31 -
@@ -1,5 +1,5 @@
-MD5 (mc-4.7.0.tar.gz) = O+h1x2A6tF54QCal0T1LsA==
-RMD160 (mc-4.7.0.tar.gz) = zwEAKuBr0qEmVOFwE9iY/mwGUD0=
-SHA1 (mc-4.7.0.tar.gz) = vUW8V229U+PsNeA0kFGG95r65Mo=
-SHA256 (mc-4.7.0.tar.gz) = 9fhr8yZfBJ/kyPIh3DTWXzMGpodKlIax1tVfCoK8EIY=
-SIZE (mc-4.7.0.tar.gz) = 3983623
+MD5 (mc-4.7.0.1.tar.gz) = E56OjUKK4LtUQsnQ3Nc0Jw==
+RMD160 (mc-4.7.0.1.tar.gz) = 2qQ1GFE7Wgg45qPwak44aGJyQBY=
+SHA1 (mc-4.7.0.1.tar.gz) = SHQIPiwEUHM19ncib6xhDnIEnpo=
+SHA256 (mc-4.7.0.1.tar.gz) = eqFK9ed/AmgZ2DoLMf+SDjyTcUahc+CbcpkelVsXIbo=
+SIZE (mc-4.7.0.1.tar.gz) = 3952246


Re: pure-ftpd-ldap: unusable on 4.6, both i386 and amd64

2010-01-03 Thread Frank Denis
  Hi Toni,

Le Sun, Jan 03, 2010 at 06:26:24PM +0100, Toni Mueller ecrivait :
 I'm having a problem with pure-ftpd-ldap from packages, and I am now
 out of my wits. Sorry. :(
 
 The problem: After upgrading from 4.4 and 4.5, I cannot log in to any
 account on any of my FTP servers anymore because the passwords are
 rejected.

  Unfortunately, the OpenLDAP log messages are just as unbearable as the
code :)

  But it looks like the query returns no matches.
  
  There were some changes in the pureftpd-ldap.conf file in order to support
new features (TLS and ability to authenticate through binding).

  Try to compare the /usr/local/share/example/pure-ftpd/pureftpd-ldap.conf
file with the one you are using.

  Also try to issue some queries using ldapsearch, with exactly the same
credentials.

  Best regards,
  
-- 
Frank Denis - j [at] pureftpd.org - http://00f.net - http://www.cotery.com



Re: pure-ftpd-ldap: unusable on 4.6, both i386 and amd64

2010-01-03 Thread Henning Brauer
no, the 4.6 pureftpd package is NOT unusable. works just fine here,
with LDAP backend as well.

-- 
Henning Brauer, h...@bsws.de, henn...@openbsd.org
BS Web Services, http://bsws.de
Full-Service ISP - Secure Hosting, Mail and DNS Services
Dedicated Servers, Rootservers, Application Hosting



UPDATE net/xmlrpc-c

2010-01-03 Thread Max Varencov

Hi,

Here is a diff for latest super stable version 1.06.38 of the xmlrpc-c.

Tested on OpenBSD current amd64.

Changelog http://xmlrpc-c.sourceforge.net/change_super_stable.html
Index: Makefile
===
RCS file: /cvs/ports/net/xmlrpc-c/Makefile,v
retrieving revision 1.7
diff -N -u -r1.7 Makefile
--- Makefile31 May 2009 15:54:18 -  1.7
+++ Makefile3 Jan 2009 19:57:06 -
@@ -3,7 +3,7 @@
 COMMENT=   XML-RPC C/C++ client-server implementation
 CATEGORIES=net devel textproc
 
-V= 1.06.35
+V= 1.06.38
 DISTNAME=  xmlrpc-c-${V}
 
 EXTRACT_SUFX=  .tgz
Index: distinfo
===
RCS file: /cvs/ports/net/xmlrpc-c/distinfo,v
retrieving revision 1.5
diff -N -u -r1.5 distinfo
--- distinfo31 May 2009 15:54:18 -  1.5
+++ distinfo3 Jan 2009 19:57:06 -
@@ -1,5 +1,5 @@
-MD5 (xmlrpc-c-1.06.35.tgz) = r0XWOlKWlf7DgHR1js1Wuw==
-RMD160 (xmlrpc-c-1.06.35.tgz) = JoYOfxjuiWnvB78Lgdsz3dI0PV4=
-SHA1 (xmlrpc-c-1.06.35.tgz) = 1IimoDlzt98tSDO5uy3T75VTQMw=
-SHA256 (xmlrpc-c-1.06.35.tgz) = b8DcmiGUD9WHlbXB+cVL+WM+Gcv0jmKmrmWcgO6fceo=
-SIZE (xmlrpc-c-1.06.35.tgz) = 701970
+MD5 (xmlrpc-c-1.06.38.tgz) = Pd/agrExy72KXQuApDCdjQ==
+RMD160 (xmlrpc-c-1.06.38.tgz) = jZ+FobG+kf3FyKqrVXHQJw3b32c=
+SHA1 (xmlrpc-c-1.06.38.tgz) = QDMvDzY7nKeSQrKNTL8TUWcC2s8=
+SHA256 (xmlrpc-c-1.06.38.tgz) = iE8MVSa2la5GZYrWvmDZb26tdfrTiN+zhmgrEfu7A1c=
+SIZE (xmlrpc-c-1.06.38.tgz) = 702092
Index: patches/patch-src_xmlrpc_datetime_c
===
RCS file: /cvs/ports/net/xmlrpc-c/patches/patch-src_xmlrpc_datetime_c,v
retrieving revision 1.2
diff -N -u -r1.2 patches/patch-src_xmlrpc_datetime_c
--- patches/patch-src_xmlrpc_datetime_c 31 May 2009 15:54:20 -  1.2
+++ /dev/null   3 Jan 2009 19:35:17 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_xmlrpc_datetime_c,v 1.2 2009/05/31 15:54:20 benoit Exp $
 src/xmlrpc_datetime.c.orig Wed Apr 22 00:42:03 2009
-+++ src/xmlrpc_datetime.c  Tue May 26 01:12:35 2009
-@@ -251,7 +251,11 @@ static void
- restoreTimezone(const char * const oldTz) {
- 
- if (haveSetenv) {
--setenv(TZ, oldTz, 1);
-+  if (oldTz) {
-+  setenv(TZ, oldTz, 1);
-+  } else {
-+  unsetenv(TZ);
-+  }
- free((char*)oldTz);
- }
- }
-@@ -397,6 +401,7 @@ parseDatetime(xmlrpc_env * const envP,
- else {
- struct tm brokenTime;
- 
-+  memset(brokenTime, 0, sizeof(struct tm));
- brokenTime.tm_sec   = s;
- brokenTime.tm_min   = m;
- brokenTime.tm_hour  = h;


Re: UPDATE misc/mc

2010-01-03 Thread Alexandr Shadchin
On Mon, Jan 04, 2010 at 0:11:43 +0600, Max Varencov wrote:
 Hi,
 
 Here is a diff for mc 4.7.0.1.
 
 Changelog: http://www.midnight-commander.org/wiki/NEWS-4.7.0.1
 
 Tested on OpenBSD current amd64.

Work fine on i386.

-- 
Alexandr Shadchin



Re: pure-ftpd-ldap: unusable on 4.6, both i386 and amd64

2010-01-03 Thread Toni Mueller
Hi Frank,

thanks for your quick answer!

On Sun, 03.01.2010 at 20:21:10 +0100, Frank Denis obsd-po...@pureftpd.org 
wrote:
 Le Sun, Jan 03, 2010 at 06:26:24PM +0100, Toni Mueller ecrivait :
  The problem: After upgrading from 4.4 and 4.5, I cannot log in to any
  account on any of my FTP servers anymore because the passwords are
  rejected.
 
   Unfortunately, the OpenLDAP log messages are just as unbearable as the
 code :)
 
   But it looks like the query returns no matches.

It said nentries=1 in the debug log, and repeating the exercise on
the console with ldapsearch yields exactly the one entry that pure-ftpd
would have required, for the two accounts that I tried. But in the
OpenLDAP log, it says something about an ber_get_next on fd 13 failed
errno=0 (Undefined error: 0) (near the end of the logs I pasted),
whereas on the console, I get result: 0 Success. I verified with
ktrace that pure-ftpd gets the result it should be getting.

   There were some changes in the pureftpd-ldap.conf file in order to support
 new features (TLS and ability to authenticate through binding).

I've now installed this package on the one machine where I also
successfully queried the LDAP database (I didn't try on other hosts):

 ftp://ftp.spline.de/pub/OpenBSD/4.6/packages/amd64/pure-ftpd-1.0.22-ldap.tgz

But the behaviour didn't change.

   Try to compare the /usr/local/share/example/pure-ftpd/pureftpd-ldap.conf
 file with the one you are using.

My pure-ftpd config file is empty, and I set all options on the command
line like this (in my 'run' script):

exec /usr/local/sbin/pure-ftpd -1 -4 -a 20 -C 4 -D -E -H -j -k 90 -T 500 -l 
ldap:/etc/pure-ftpd/db/ldap.conf -m 5 -O stats:/var/log/pure-ftpd/traffic.log 
-u 2000 -y 4:0 -Z -Y 1 -d -d -d 

   Also try to issue some queries using ldapsearch, with exactly the same
 credentials.

This was successful. I now reinstalled openldap-client, pure-ftpd, and
a number of other stuff, but without any success.

What gives?


-- 
Kind regards,
--Toni++



Re: pure-ftpd-ldap: unusable on 4.6, both i386 and amd64

2010-01-03 Thread Toni Mueller

Hi,

On Sun, 03.01.2010 at 20:59:52 +0100, Henning Brauer 
lists-openbsdpo...@bsws.de wrote:
 no, the 4.6 pureftpd package is NOT unusable. works just fine here,
 with LDAP backend as well.

as distributed, the package has a discrepancy between the FTPStatus
field in the schema, where the comment says that the value should be
'enabled', and the code, which says that the value should be 'TRUE'. I
just created and installed a package for 1.0.27, which has 'enabled' in
the code as well, and things started to work again immediately.

I'll upload the 1.0.27 package to my repo RSN.


-- 
Kind regards,
--Toni++



Re: pure-ftpd-ldap: unusable on 4.6, both i386 and amd64

2010-01-03 Thread Frank Denis
Le Sun, Jan 03, 2010 at 10:21:55PM +0100, Toni Mueller ecrivait :
 as distributed, the package has a discrepancy between the FTPStatus
 field in the schema, where the comment says that the value should be
 'enabled', and the code, which says that the value should be 'TRUE'.

  Indeed, that was a discrepancy in 1.0.22 that has been fixed in the
following release (the schema has been changed and in addition, both TRUE
and enabled are accepted in the code).  

 I
 just created and installed a package for 1.0.27, which has 'enabled' in
 the code as well, and things started to work again immediately.

  There was a lot of improvement since 1.0.22 but the LDAP issue in 1.0.22 can
be worked around by adding this trivial patch (from 1.0.23):

--- src/log_ldap.c~ 2009-04-30 07:51:04.0 +0200
+++ src/log_ldap.c  2010-01-03 22:41:39.0 +0100
@@ -282,7 +282,8 @@
 pw_ldap_getpwnam_freefields(pwret);
 pwret.pw_name = (char *) name;
 pw_enabled = pw_ldap_getvalue(ld, res, LDAP_FTPSTATUS);
-if ((pw_enabled != NULL)  (strcasecmp(pw_enabled, TRUE) != 0)) {
+if (pw_enabled != NULL  strcasecmp(pw_enabled, enabled) != 0 
+strcasecmp(pw_enabled, TRUE) != 0) {
 goto error;
 }
 #ifdef QUOTAS



Re: [FIX] x11/xfm bad varargs calls

2010-01-03 Thread Christian Weisgerber
Nima Hoda nimah...@gmail.com wrote:

 x11/xfm file manager segfaults on OpenBSD 4.6-stable/amd64 due to many
 vararg libXt calls (XtVa...) being terminated with 0

Good catch.

 instead of with NULL.

But this is wrong.  They need to be terminated with (void *)0.
Or (void *)NULL if you like.  Plain NULL is _not_ a null pointer
constant.

http://www.c-faq.com/null/index.html

-- 
Christian naddy Weisgerber  na...@mips.inka.de



Re: [FIX] x11/xfm bad varargs calls

2010-01-03 Thread Nima Hoda
Christian Weisgerber wrote:
 Nima Hoda nimah...@gmail.com wrote:
 
 x11/xfm file manager segfaults on OpenBSD 4.6-stable/amd64 due to
 many vararg libXt calls (XtVa...) being terminated with 0 instead
 of with NULL.
 
 But this is wrong.  They need to be terminated with (void *)0.
 Or (void *)NULL if you like.  Plain NULL is _not_ a null pointer
 constant.
 

But it's not a null pointer constant that the spec calls for but
rather NULL itself:

  Each procedure named XtVasomething takes as its last arguments ...
  a variable parameter list of resource name and value pairs where
  each name is of type String and each value is of type XtArgVal. The
  end of the list is identified by a name entry containing NULL.

--X Toolkit Intrinsics - C Language Interface (pg.44) [1]

Looking at the OpenBSD header files, I notice that NULL is defined
alternatively as 0L or __null. I'm not sure where __null is defined,
but integer literals in C code are by default given type int and not
long, and therein seems to lie the problem.

-Nima

[1] HTML: http://lesstif.sourceforge.net/doc/Xt/spec/xt.html
PDF: http://tinyurl.com/ya2a83o



Re: sndio for games/cgoban

2010-01-03 Thread Federico G. Schwindt
On Sat, Dec 26, 2009 at 02:13:15AM +, Jacob Meuser wrote:
 I didn't realize until I started working on it that the port currently
 doesn't build sound support.  I went ahead and made it compile sndio
 support anyway.  but when I went to test it, afaics, cgoban never
 even tries to open the audio device.  I'm not familiar with this
 program (no do I know how to play Go).  anyone know how to get cgoban
 to make sounds?
 
 oh, I also made it respect CFLAGS during configure, so at least it
 wasn't a total waste of time ;)

  Sorry for the delay.  I just double checked and the original code does
not have sounds.  Furthermore, it's in the TODO, so it cannot be tested
without changing the code.  As cgoban is not longer maintained upstreams,
I'll say it's your call.
  A few other comments on your diff.

  - Add spaces around = as per Makefile.template 
  - pthreads-stubs and xcb are not longer needed as per
port-lib-depends-check
  
  Rest looks good. I've played a few games against gnugo without problems.
  Ok by me.

  f.-



Re: UPDATE: devel/boost

2010-01-03 Thread Federico G. Schwindt
Hi,

 Just an update: To unbreak graphics/hugin when using boost-1.41
 someone would have to backport this fix from gcc 3.4:
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=17327

  Nice finding.

 I have done a patch for gcc, but I think it is not complete as
 gcc-3.3.5 is missing the parser.c file. I can't see the consequences
 of this, so I keep away from it. hugin builds with that patch, if
 someone is interested please mail me.

  From the link above, pt.c should be enough. The other is not
required (see the 3.4.3 vs current commit in that link).
  Applying the diff below fixes the unimplemented error and makes the
test code in the bug report compile:
  
Index: egcs/gcc/cp/pt.c
===
RCS file: /cvs/src/gnu/egcs/gcc/cp/pt.c,v
retrieving revision 1.2
diff -N -u -p -p egcs/gcc/cp/pt.c
--- egcs/gcc/cp/pt.c21 Aug 2003 08:13:21 -  1.2
+++ egcs/gcc/cp/pt.c4 Jan 2010 00:38:18 -
@@ -8351,6 +8351,7 @@ unify (tparms, targs, parm, arg, strict)
 case COMPLEX_TYPE:
 case INTEGER_TYPE:
 case BOOLEAN_TYPE:
+case ENUMERAL_TYPE:
 case VOID_TYPE:
   if (TREE_CODE (arg) != TREE_CODE (parm))
return 1;
Index: usr.bin/gcc/gcc/cp/pt.c
===
RCS file: /cvs/src/gnu/usr.bin/gcc/gcc/cp/pt.c,v
retrieving revision 1.1.1.2
diff -N -u -p -p usr.bin/gcc/gcc/cp/pt.c
--- usr.bin/gcc/gcc/cp/pt.c 24 Dec 2004 23:52:00 -  1.1.1.2
+++ usr.bin/gcc/gcc/cp/pt.c 4 Jan 2010 00:38:26 -
@@ -9253,6 +9253,7 @@ unify (tparms, targs, parm, arg, strict)
 case VECTOR_TYPE:
 case INTEGER_TYPE:
 case BOOLEAN_TYPE:
+case ENUMERAL_TYPE:
 case VOID_TYPE:
   if (TREE_CODE (arg) != TREE_CODE (parm))
return 1;

 Has someone tried boost-1.41 with other ports than mentioned above?

  Haven't tried building boost yet. I will try it soon.

  f.-



Re: UPDATE: lang/ecl

2010-01-03 Thread Edd Barrett
On Mon, Dec 28, 2009 at 10:05:09AM +0500, Alexandr Shadchin wrote:
 Hi, Ports!
 
 This update package ECL to the latest release 9.12.3.
 Tested on i386.
 
 Comments ? OK ?

This builds and runs on sparc64.

I can't really go as far as to OK this, as I have no idea how it works.

(maxima tests to follow)

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: jdk-1.7.0.00b72 doesn't build jdk-1.6 anymore (jdk17_bootstrap flavor)

2010-01-03 Thread Kurt Miller
Hi David,

David Coppa wrote:
 Hi,
 
 Recent update of jdk-1.7 (early access build 72) broke compilation of 
 jdk-1.6 using jdk17_bootstrap PSEUDO_FLAVOR:
 
 ln -s ../libjsig.so 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/i386/server/libjsig.so
 ln -s ../libjsig.so 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/i386/client/libjsig.so
 cp ../../tools/crypto/jce/US_export_policy.jar 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/security/US_export_policy.jar
 cp ../../tools/crypto/jce/local_policy.jar 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/security/local_policy.jar
 cp ../../tools/crypto/jce/jce.jar 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/jce.jar
 cp ../../tools/crypto/jce/sunjce_provider.jar 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/ext/sunjce_provider.jar
 cp ../../tools/crypto/jsse/jsse.jar 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/lib/jsse.jar
 /usr/local/jdk-1.7.0/bin/javac -J-XX:ThreadStackSize=768 -J-client -J-Xmx512m 
 -J-Xms256m -J-Xbootclasspath/p:../../../make/sun/javac/javac/gjc.jar -target 
 5 -d 
 /usr/ports/pobj/jdk-1.6.0.03-jdk17_bootstrap/control/build/bsd-i586/tmp/java/jsum
  ../../tools/sharing/AddJsum.java
 ../../tools/sharing/AddJsum.java:16: cannot access java.lang.Object
 bad class file: /usr/local/jdk-1.7.0/jre/lib/rt.jar(java/lang/Object.class)
 class file has wrong version 51.0, should be 50.0

Thanks for the report...

As it turns out using 1.7 to bootstrap 1.6 worked only because 1.7 is
'early access' and was using the same internal class file version as
1.6. Now that 1.7 has progressed further and its class file version
has been bumped, I'm afraid that this bootstrap method is no longer
valid for 1.6. More specifically the problem is that 1.7's rt.jar
has class file version 51.0 and 1.6's gjc.jar is expecting a 1.6
rt.jar with class file version 50.0.

Regards,
-Kurt



Re: [FIX] x11/xfm bad varargs calls

2010-01-03 Thread Nima Hoda
Nima Hoda wrote:
 But it's not a null pointer constant that the spec calls for but
 rather NULL itself:
 
   Each procedure named XtVasomething takes as its last arguments ...
   a variable parameter list of resource name and value pairs where
   each name is of type String and each value is of type XtArgVal.
   The end of the list is identified by a name entry containing NULL.
 
   --X Toolkit Intrinsics - C Language Interface (pg.44) [1]
 

Sorry to reply to myself, but I did a bit more research. Looking at
the code in Xt functions that process variadic arguments, they
generally look like this:

  for(attr = va_arg(var, String) ; attr != NULL;
  attr = va_arg(var, String)) {
  if (strcmp(attr, XtVaTypedArg) == 0) {
  typed_arg.name = va_arg(var, String);
  typed_arg.type = va_arg(var, String);
  
  .
  .
  .
  
  --from xenocara/lib/libXt/src/Varargs.c line 368

So, the list-ending argument must have the same size as String, which
is typedef as char * (in Intrinsic.h) and it must have the null
pointer value (since it's compared to NULL in pointer context).
However, the source you sent me on null pointers states that

  ...there is a null pointer for each pointer type, and the internal
  values of null pointers for different types may be different.
  Although programmers need not know the internal values, the compiler
  must always be informed which type of null pointer is required, so
  that it can make the distinction if necessary.
--http://www.c-faq.com/null/null1.html

Then shouldn't the correct value for the final argument be
(String)NULL as (void *)NULL may have a different internal
representation?

That said, I took a broad sampling through the xenocara tree for
variadic Xt calls and with very few exceptions the list-ending
argument used is NULL. The one exception that I found was in the xterm
code which uses (XtPointer) 0.

So, I'm really not sure which is correct anymore.

-Nima



webkit-current on -stable

2010-01-03 Thread Andrej Elizarov
while compiling webkit-1.1.15.4v0 from current ports  on 4.6-stable i still
need
patch-JavaScriptCore_jit_JITStubs_cpp .
here it is. it just works for me.


--- JavaScriptCore/jit/JITStubs.cpp.origMon Jan  4 06:03:57 2010
+++ JavaScriptCore/jit/JITStubs.cpp Mon Jan  4 06:17:10 2010
@@ -81,10 +81,10 @@

 // These ASSERTs remind you that, if you change the layout of
JITStackFrame, you
 // need to change the assembly trampolines below to match.
-COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 16 == 0x0,
JITStackFrame_maintains_16byte_stack_alignment);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c,
JITStackFrame_stub_argument_space_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58,
JITStackFrame_callFrame_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50,
JITStackFrame_code_offset_matches_ctiTrampoline);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 16 == 0x0,
JITStackFrame_maintains_16byte_stack_alignment);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x3c,
JITStackFrame_stub_argument_space_matches_ctiTrampoline);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x58,
JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x50,
JITStackFrame_code_offset_matches_ctiTrampoline);

 asm volatile (
 .globl  SYMBOL_STRING(ctiTrampoline) \n
@@ -140,10 +140,10 @@

 // These ASSERTs remind you that, if you change the layout of
JITStackFrame, you
 // need to change the assembly trampolines below to match.
-COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 32 == 0x0,
JITStackFrame_maintains_32byte_stack_alignment);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48,
JITStackFrame_stub_argument_space_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90,
JITStackFrame_callFrame_offset_matches_ctiTrampoline);
-COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80,
JITStackFrame_code_offset_matches_ctiTrampoline);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) % 32 == 0x0,
JITStackFrame_maintains_32byte_stack_alignment);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48,
JITStackFrame_stub_argument_space_matches_ctiTrampoline);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90,
JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80,
JITStackFrame_code_offset_matches_ctiTrampoline);

 asm volatile (
 .globl  SYMBOL_STRING(ctiTrampoline) \n