Re: Is it possible to compile apache2 without mod_proxy, mod_cache, and disk_cache? errors....
On Sat, 26 Dec 2009 23:24:43 -0600
Andres Salazar wrote:
> Hello,
>
> I have editted the Makefile for apache2.2.14 in 4.6 ports so that the
> optional modules specifically tagged as enabled are actually disabled
> because i dont need them:
>
> CONFIGURE_ARGS+=--enable-layout=OpenBSD \
> --prefix=${HTTPD_DIR} \
> --exec-prefix=${LOCALBASE} \
> --sysconfdir=${CONFDIR} \
> --with-apr=${LOCALBASE}/bin/apr-1-mt-config \
> --with-apr-util=${LOCALBASE}/bin/apu-1-mt-config
> \ --enable-ssl --with-ssl=/usr \
> --with-mpm=prefork \
> --with-program-name=httpd2 \
> --enable-modules=all \
> --disable-cache \
> --disable-disk-cache \
> --disable-proxy \
> --enable-mods-shared=all \
> --enable-suexec \
> --with-suexec-caller=_apache2 \
> --with-suexec-bin=${TRUEPREFIX}/sbin/suexec2 \
> --with-suexec-logfile=/var/log/suexec2_log \
> --with-pcre=${LOCALBASE}
>
>
>
> However... when i do the final part of the compiling make install it
> gives these errors:
>
> ===> Building package for apache-httpd-2.2.14
> Create /usr/ports/packages/i386/all/apache-httpd-2.2.14.tgz
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_cache.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_disk_cache.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_ajp.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_balancer.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_connect.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_ftp.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_http.so
> does not exist
> Error in package:
> /usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_scgi.so
> does not exist
> ===> Cleaning for apache-httpd-2.2.14
> rm -f /usr/ports/packages/i386/all/apache-httpd-2.2.14.tgz
> /usr/ports/packages/i386/ftp/apache-httpd-2.2.14.tgz
> /usr/ports/packages/i386/cdrom/apache-httpd-2.2.14.tgz
> *** Error code 1
>
> Stop in /usr/ports/www/apache-httpd (line 1444 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
> *** Error code 1
>
> Stop in /usr/ports/www/apache-httpd (line 1984 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
> *** Error code 1
>
> Stop in /usr/ports/www/apache-httpd (line 1474 of
> /usr/ports/infrastructure/mk/bsd.port.mk).
> #
>
>
> Is there anyway I can actually compiled the apache2.2.14 without these
> optional extras??
>
> Thanks
>
> Andres
If you change the Makefile like that, you have to update the PLIST
files, before you can build the package.
The command for that is 'make update-plist'.
You have to run that after 'make fake', or after your build failed like
above.
This is documented in the bsd.port.mk manpage.
- Robert
Is it possible to compile apache2 without mod_proxy, mod_cache, and disk_cache? errors....
Hello,
I have editted the Makefile for apache2.2.14 in 4.6 ports so that the
optional modules specifically tagged as enabled are actually disabled
because i dont need them:
CONFIGURE_ARGS+=--enable-layout=OpenBSD \
--prefix=${HTTPD_DIR} \
--exec-prefix=${LOCALBASE} \
--sysconfdir=${CONFDIR} \
--with-apr=${LOCALBASE}/bin/apr-1-mt-config \
--with-apr-util=${LOCALBASE}/bin/apu-1-mt-config \
--enable-ssl --with-ssl=/usr \
--with-mpm=prefork \
--with-program-name=httpd2 \
--enable-modules=all \
--disable-cache \
--disable-disk-cache \
--disable-proxy \
--enable-mods-shared=all \
--enable-suexec \
--with-suexec-caller=_apache2 \
--with-suexec-bin=${TRUEPREFIX}/sbin/suexec2 \
--with-suexec-logfile=/var/log/suexec2_log \
--with-pcre=${LOCALBASE}
However... when i do the final part of the compiling make install it
gives these errors:
===> Building package for apache-httpd-2.2.14
Create /usr/ports/packages/i386/all/apache-httpd-2.2.14.tgz
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_cache.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_disk_cache.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_ajp.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_balancer.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_connect.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_ftp.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_http.so
does not exist
Error in package:
/usr/ports/obj/apache-httpd-2.2.14/fake-i386/usr/local/lib/apache2/mod_proxy_scgi.so
does not exist
===> Cleaning for apache-httpd-2.2.14
rm -f /usr/ports/packages/i386/all/apache-httpd-2.2.14.tgz
/usr/ports/packages/i386/ftp/apache-httpd-2.2.14.tgz
/usr/ports/packages/i386/cdrom/apache-httpd-2.2.14.tgz
*** Error code 1
Stop in /usr/ports/www/apache-httpd (line 1444 of
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1
Stop in /usr/ports/www/apache-httpd (line 1984 of
/usr/ports/infrastructure/mk/bsd.port.mk).
*** Error code 1
Stop in /usr/ports/www/apache-httpd (line 1474 of
/usr/ports/infrastructure/mk/bsd.port.mk).
#
Is there anyway I can actually compiled the apache2.2.14 without these
optional extras??
Thanks
Andres
Why does apache2 need the db package? Anyway to avoid that?
Hello, When compiling apache2.2.14 from ports I noticed that it needs the db-4.6.21p0 Berkeley DB package, revision 4. Is this actually needed by the apache core? or is it a result of enabling a certain module i can actually disable?? I have compiled apache.2.2.14 from source directly from apache.org in a test machine and i dont recall having to satisfy this one. Please advise. Thanks Andres
enigmail dependency check failed
Hi, I'm unable to build enigmail, and I cannot see anything wrong with it ports-wise. I think that enigmail-seamonkey may have the same issue. Does that mean package version needs as well to be in sync with thunderbird, like so version? Base and ports quite up to date. ... ===> Returning to build of enigmail-0.96.0p0 ===> Verifying update for unzip-* in archivers/unzip ===> Returning to build of enigmail-0.96.0p0 ===> enigmail-0.96.0p0 depends on: unzip-* - found ===> Verifying update for gmake-* in devel/gmake ===> Returning to build of enigmail-0.96.0p0 ===> enigmail-0.96.0p0 depends on: gmake-* - found ===> Verifying update for mozilla-thunderbird-2.0.0.23p0 in mail/mozilla-thunderbird ===> Returning to build of enigmail-0.96.0p0 ===> enigmail-0.96.0p0 depends on: mozilla-thunderbird-2.0.0.23p0 - not found ===> Verifying install for mozilla-thunderbird-2.0.0.23p0 in mail/mozilla-thunderbird ===> Returning to build of enigmail-0.96.0p0 ===> Verifying update for mozilla-thunderbird-2.0.0.23p0 in mail/mozilla-thunderbird ===> Returning to build of enigmail-0.96.0p0 ===> enigmail-0.96.0p0 depends on: mozilla-thunderbird-2.0.0.23p0 - not found ===> Verifying install for mozilla-thunderbird-2.0.0.23p0 in mail/mozilla-thunderbird ===> Returning to build of enigmail-0.96.0p0 Dependency check failed *** Error code 1 ... $ pkg_info -I mozilla-thunderbird mozilla-thunderbird-2.0.0.23p1 redesign of Mozilla's mail component $ sysctl -n kern.version OpenBSD 4.6-current (GENERIC.MP) #363: Sun Dec 20 10:20:00 MST 2009 dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC.MP -- best regards q#
Re: update: audio/mp3blaster
On Sat, Dec 26, 2009 at 11:01:58PM +, Jacob Meuser wrote: > On Sat, Dec 26, 2009 at 07:59:19PM +, Christian Weisgerber wrote: > > Jacob Meuser wrote: > > > > > > (It also retains the problem from previous versions that playing > > > > MP3s sucks all the CPU it can get.) > > > > > > it's cpu usage can be halved (in my testing, anyway) by using > > > 'mp3blaster -t=0'. would it make sense to make that the default? > > > > It used to be in a busy loop, now the behavior is much more reasonable. > > But you are right, -t=0 reduces the CPU usage even further. I don't > > know if it helps or hinders on people's old 486, though. Elsewhere > > it probably doesn't matter either way. > > it worked fine on my 195MHz sgi. slowest machine I have access to. oh, heh. -t=0 completely fixes the 100% cpu usage (as in 100%->1%) in the current ports version. threads here are just adding overhead. the threads aren't notified to do work. they just do something like 'while(!do_work) sleep'. it also shows that the SDL backend is quite inefficient compared to the oss backend. I'm kinda starting to like mp3blaster in some ways, so I'll probably just go ahead and make a sndio backend. -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audio/mp3blaster
On Sat, Dec 26, 2009 at 07:56:18PM +, Christian Weisgerber wrote: > Jacob Meuser wrote: > > > > > > - update to mp3blaster-3.2.5 > > > > > - use SDL audio output instead of ossaudio > > > > > > > > Regression: Ogg Vorbis files now skip badly. > > > > > > > > (It also retains the problem from previous versions that playing > > > > MP3s sucks all the CPU it can get.) > > > > > > this version takes care of both issues for me. > > > > but it cut off the last bytes of ogg streams. this one is beter. > > mp3blaster proper works for me. > > nmixer is useless now. > splay, which I don't remember using before, exits with "Unsupported > audiodriver!". any objection to simply not installing nmixer and splay? -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: update: audio/mp3blaster
On Sat, Dec 26, 2009 at 07:59:19PM +, Christian Weisgerber wrote: > Jacob Meuser wrote: > > > > (It also retains the problem from previous versions that playing > > > MP3s sucks all the CPU it can get.) > > > > it's cpu usage can be halved (in my testing, anyway) by using > > 'mp3blaster -t=0'. would it make sense to make that the default? > > It used to be in a busy loop, now the behavior is much more reasonable. > But you are right, -t=0 reduces the CPU usage even further. I don't > know if it helps or hinders on people's old 486, though. Elsewhere > it probably doesn't matter either way. it worked fine on my 195MHz sgi. slowest machine I have access to. -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
NEW: games/criticalmass
Hi, A new port tested on amd64/sparc64. $cat pkg/DESCR Your world has been infested by an aggressive army of space critters. Overrun and unprepared, your government was unable to defend its precious resources. As a last effort to recapture some of the "goodies", you have been placed into a tiny spacecraft and sent after them. Comments ? OK ? Cheers, benoit criticalmass.tgz Description: Binary data
Re: update: audio/mp3blaster
Jacob Meuser wrote: > > (It also retains the problem from previous versions that playing > > MP3s sucks all the CPU it can get.) > > it's cpu usage can be halved (in my testing, anyway) by using > 'mp3blaster -t=0'. would it make sense to make that the default? It used to be in a busy loop, now the behavior is much more reasonable. But you are right, -t=0 reduces the CPU usage even further. I don't know if it helps or hinders on people's old 486, though. Elsewhere it probably doesn't matter either way. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: update: audio/mp3blaster
Jacob Meuser wrote: > > > > - update to mp3blaster-3.2.5 > > > > - use SDL audio output instead of ossaudio > > > > > > Regression: Ogg Vorbis files now skip badly. > > > > > > (It also retains the problem from previous versions that playing > > > MP3s sucks all the CPU it can get.) > > > > this version takes care of both issues for me. > > but it cut off the last bytes of ogg streams. this one is beter. mp3blaster proper works for me. nmixer is useless now. splay, which I don't remember using before, exits with "Unsupported audiodriver!". -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: xfce4-mixer problem
On Sun, Dec 20, 2009 at 07:28:35PM +0100, Andreas Bartelt wrote: > Hello, > > since today's update to CURRENT (src, xenocara and ports), > xfce4-mixer doesn't give me an option to change the volume anymore: > "HD-Audio (OSS-Mixer)" is set as sound card and "Microphone" is the > only available mixer track option. My last known good build, where > xfce4-mixer worked just fine, was from 12/11/2009. > > I am still able to change the volume via CLI, i.e. "mixerctl -w > outputs.master=255,255" works as expected. > > Did I miss some required configuration changes or is there a problem > with xfce4-mixer? > > I'm using an azalia(4) onboard audio chip: > azalia0 at pci0 dev 27 function 0 "Intel 82801JI HD Audio" rev 0x00: > apic 2 int 22 (irq 3) > azalia0: codecs: Realtek ALC888 > audio0 at azalia0 My azalia laptop is broken atm, so i can't debug this right now, sorry. This is most probably a fallout of gstreamer-* update.. do you have other controls available if you click the 'controls' button at the bottom left of xfce4-mixer ? What gstreamer-* packages do you have installed ? landry
Diplomado Internacional en Man agement Estratégico - 7ta edi ción del.
Posgrado ALTA solo UB web.GIF Estimado Profesional: Aprendiendo a Emprender y Gerenciar Nuevos Negocios Le informamos que está abierta la inscripción a la 7ta edición del Diplomado Internacional en Management Estratégico. Este Diplomado es el único programa dictado en forma superintensiva (2 semanas), enfocado en herramientas y capacidades para la transformación estratégica y profesional. Funciona desde hace tres años como un espacio de encuentro, reflexión y acción para empresarios y ejecutivos de toda Latinoamérica. Han asistido alumnos de más de trece países, que conjugan una experiencia educativa intensa con la posibilidad de disfrutar de Buenos Aires. Este Diplomado tiene tres modalidades de cursado: - 2 semanas consecutivas: 12 de Abril al 23 de Abril de 2010, inversión $6.500 (aprox. US$1.750) - 2 semanas separadas: 12 de Abril al 16 de Abril de 2010 y Septiembre de 2010, inversión $6.500 (aprox. US$1.750) - 1 semana (Programa Ejecutivo): 12 de Abril al 16 de Abril de 2010, inversión $3.465 (aprox. US$990) Horario: lunes a viernes de 9 a 18 hs. Cierre de inscripción: 22 de Diciembre. Vacantes limitadas. Para anotarse solicite hoy la ficha de inscripción y el programa haciendo clic aquí Aproveche esta oportunidad única de aprendizaje concentrado e internacional para desarrollarse como decisor de negocios y profesional humanista. Conozca más de la propuesta académica ingresa al blog del equipo docente: http://managementestrategico.blogspot.com Comuníquese directamente al email posgrado.managem...@ub.edu.ar o al tel (54-11) 4618-5424 ó 15-5995-3851, para cualquier consulta. Atentamente, Maximiliano Berra Coord. Comercial Diplomado Internacional en Management Estratégico UNIVERSIDAD DE BELGRANO Buenos Aires, Argentina Tel: (54-11) 4981-4107 / 4618-5424 e-mail: posgrado.managem...@ub.edu.ar http://executive.ub.edu.ar Este es un e-mail directo, legal, libre de virus y que consideramos de su interés, debido a que Ud. se ha contactado alguna vez con nuestra organización, ha sido referido por alguien o nos ha enviado algún tipo de información, tanto Ud. como otros citando su nombre. De acuerdo con la nueva Ley argentina Nº 26.032, cuyo texto se encuentra en: http://infoleg.mecon.gov.ar/infolegInternet/anexos/105000-10/107145/norma.htm, la libre distribución este e-mail está autorizada por tratarse de propósitos de información, sin embargo, y si le hemos causado alguna molestia por el mismo, le rogamos acepte nuestras disculpas; este e-mail incluye una forma de ser sacado y si Ud. clickea donde se indica al final del mismo será sacado de nuestra Base de Datos dentro de las 48 Hs. subsiguientes. Si continúa recibiendo información de nuestra organización, puede que esté registrado con otra cuenta de e-mail diferente. hacer click aqui y en el asunto poner REMOVER
Re: Can't make x11/openmotif
On Sat, Dec 26, 2009 at 06:10:36PM +0200, Thanos Tsouanas wrote: > Am I the only one getting this error? Any ideas? Use packages. Or deinstall openmotif before trying to build it.
Can't make x11/openmotif
Hello. I attempted to make x11/openmotif on -current (of 26 Dec), on i386. It started compiling but then died with the following error: cc -DHAVE_CONFIG_H -I. -I../../include -I/usr/local/include -I.. -I./.. -DXMBINDDIR_FALLBACK=\"/usr/local/lib/X11/bindings\" -DINCDIR=\"/usr/local/include/X11\" -DLIBDIR=\"/usr/local/lib/X11\" -I/usr/X11R6/include -I/usr/local/include -I/usr/local/include/libpng -I/usr/X11R6/include -O2 -pipe -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 -MT Text.lo -MD -MP -MF .deps/Text.Tpo -c Text.c -fPIC -DPIC -o .libs/Text.o Text.c: In function `_XmTextUpdateLineTable': Text.c:1760: warning: passing arg 1 of `_XmTextShowPosition' from incompatible pointer type Text.c: In function `Initialize': Text.c:2194: error: structure has no member named `tm_table' Text.c: In function `InitializeHook': Text.c:2306: error: structure has no member named `tm_table' Text.c:2308: error: structure has no member named `tm_table' Text.c: In function `Destroy': Text.c:2461: error: structure has no member named `tm_table' Text.c:2462: error: structure has no member named `tm_table' *** Error code 1 Stop in /usr/local/pobj/openmotif-2.3.2/openmotif-2.3.2/lib/Xm (line 907 of Makefile). *** Error code 1 Stop in /usr/local/pobj/openmotif-2.3.2/openmotif-2.3.2/lib/Xm (line 593 of Makefile). *** Error code 1 Stop in /usr/local/pobj/openmotif-2.3.2/openmotif-2.3.2/lib (line 276 of Makefile). *** Error code 1 Stop in /usr/local/pobj/openmotif-2.3.2/openmotif-2.3.2 (line 328 of Makefile). *** Error code 1 Stop in /usr/ports/x11/openmotif (line 2193 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/openmotif (line 1448 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/openmotif (line 1988 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/x11/openmotif (line 1498 of /usr/ports/infrastructure/mk/bsd.port.mk). Am I the only one getting this error? Any ideas? Thank you. -- Thanos Tsouanas http://mpla.math.uoa.gr/~thanos/
UPDATE: misc/mc
Hi, Ports!
This update package Midnight Commander to the latest release 4.7.0.
Tested on i386.
Comments ? OK ?
--
Alexandr Shadchin
Index: mc/Makefile
===
RCS file: /cvs/ports/misc/mc/Makefile,v
retrieving revision 1.29
diff -N -u -p mc/Makefile
--- mc/Makefile 15 Sep 2007 23:54:17 - 1.29
+++ mc/Makefile 26 Dec 2009 14:50:24 -
@@ -1,31 +1,57 @@
# $OpenBSD: Makefile,v 1.29 2007/09/15 23:54:17 merdely Exp $
-COMMENT= free Norton Commander clone with many useful features
+COMMENT= free Norton Commander clone with many useful features
-DISTNAME= mc-4.6.1
-PKGNAME= ${DISTNAME}p1
-CATEGORIES=misc
+DISTNAME= mc-4.7.0
+CATEGORIES=misc
-HOMEPAGE= http://www.ibiblio.org/mc/
-MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/
-MAINTAINER=Robert Nagy
+HOMEPAGE= http://www.midnight-commander.org/
+MASTER_SITES= http://www.midnight-commander.org/downloads/
+MAINTAINER=Robert Nagy
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c termcap
-MODULES= devel/gettext
-LIB_DEPENDS= glib-2.0.>=0.8,gmodule-2.0.>=0.8::devel/glib2
-RUN_DEPENDS= :unzip-*:archivers/unzip \
- :zip-*:archivers/zip
+WANTLIB= c m pcre termcap
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-vfs --with-samba --without-mcfs --enable-charset
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
+USE_GMAKE= Yes
+
+FLAVORS= no_x11
+FLAVOR?=
+
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+= --without-x
+.endif
+
+MODULES= devel/gettext
+
+LIB_DEPENDS= glib-2.0.>=0.8,gmodule-2.0.>=0.8::devel/glib2 \
+ slang::devel/libslang
+RUN_DEPENDS= :unzip-*:archivers/unzip \
+ :zip-*:archivers/zip
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --with-confdir=${SYSCONFDIR}/mc \
+ --with-screeen=slang \
+ --with-subshell \
+ --with-vfs \
+ --with-samba \
+ --enable-charset
+CONFIGURE_ENV= LOCALBASE=${LOCALBASE} \
+ LIBS="-lm"
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config
-USE_GMAKE= Yes
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mc
+ @cp -R ${WRKINST}${SYSCONFDIR}/mc/* ${PREFIX}/share/examples/mc
+ @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/mc
+ @find ${PREFIX}/share/examples/mc -type f | \
+ xargs chmod ${SHAREMODE}
+ @find ${PREFIX}/share/examples/mc -type d | \
+ xargs chmod ${DIRMODE}
+ @rm -r ${WRKINST}${SYSCONFDIR}/mc
.include
Index: mc/distinfo
===
RCS file: /cvs/ports/misc/mc/distinfo,v
retrieving revision 1.5
diff -N -u -p mc/distinfo
--- mc/distinfo 5 Apr 2007 17:41:07 - 1.5
+++ mc/distinfo 26 Dec 2009 14:50:24 -
@@ -1,5 +1,5 @@
-MD5 (mc-4.6.1.tar.gz) = GLINtuQEgKU7rChwxW/DxA==
-RMD160 (mc-4.6.1.tar.gz) = 1WXulaiRbXP61eDe/rny9X5Qlis=
-SHA1 (mc-4.6.1.tar.gz) = kr4IAhQyReD7fjhH1w2mFMrX1fs=
-SHA256 (mc-4.6.1.tar.gz) = CGqwPaqsKKKMDduacJBAtZ4TIva/po450ATZxmsRnn4=
-SIZE (mc-4.6.1.tar.gz) = 3928370
+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
Index: mc/patches/patch-configure
===
RCS file: /cvs/ports/misc/mc/patches/patch-configure,v
retrieving revision 1.1
diff -N -u -p mc/patches/patch-configure
--- mc/patches/patch-configure 11 Apr 2004 00:40:59 - 1.1
+++ mc/patches/patch-configure 26 Dec 2009 14:50:24 -
@@ -1,18 +1,18 @@
-$OpenBSD: patch-configure,v 1.1 2004/04/11 00:40:59 naddy Exp $
configure.orig 2003-12-24 18:14:58.0 +0100
-+++ configure 2004-04-11 02:36:03.0 +0200
-@@ -16495,7 +16495,7 @@ do
+$OpenBSD$
+--- configure.orig Fri Dec 25 23:37:22 2009
configure Sat Dec 26 17:37:39 2009
+@@ -32015,7 +32015,7 @@ done
done
- done
+ IFS=$as_save_IFS
- test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="/usr/bin/zip"
+ ac_cv_path_ZIP="${LOCALBASE}/bin/zip"
;;
esac
fi
-@@ -16535,7 +16535,7 @@ do
+@@ -32056,7 +32056,7 @@ done
done
- done
+ IFS=$as_save_IFS
- test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="/usr/bin/unzip"
+ ac_cv_path_UNZIP="${LOCALBASE}/bin/unzip"
Index: mc/patches/patch-edit_editcmd_c
===
RCS file: /cvs/ports/misc/mc/patches/patch-edit_editcmd_c,v
retrieving revision 1.1
diff
[PATCH] fix path in www/firefox35/pkg/MESSAGE
Howdy, all-
This patch corrects the path to README.OpenBSD in www/firefox35/pkg/MESSAGE
Best,
Kent
Index: pkg/MESSAGE
===
RCS file: /cvs/ports/www/firefox35/pkg/MESSAGE,v
retrieving revision 1.1.1.1
diff -u pkg/MESSAGE
--- pkg/MESSAGE 21 Jun 2009 01:31:26 - 1.1.1.1
+++ pkg/MESSAGE 24 Dec 2009 01:37:47 -
@@ -1,2 +1,2 @@
-Please see ${PREFIX}/mozilla-firefox/README.OpenBSD for information
-about running Firefox on OpenBSD.
+Please see ${PREFIX}/firefox35/README.OpenBSD for information about running
+Firefox on OpenBSD.
sndio for games/eboard
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/games/eboard/Makefile,v
retrieving revision 1.36
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:42 - 1.36
+++ Makefile26 Dec 2009 12:46:21 -
@@ -3,7 +3,7 @@
COMMENT= gtk+2 chess board interface
DISTNAME= eboard-1.0.4
-PKGNAME= ${DISTNAME}p4
+PKGNAME= ${DISTNAME}p5
CATEGORIES=games x11
HOMEPAGE= http://www.bergo.eng.br/eboard/
@@ -18,7 +18,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xex
Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
- png pthread pthread-stubs stdc++ xcb z
+ png pthread pthread-stubs sndio stdc++ xcb z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=eboard/}
Index: patches/patch-configure
===
RCS file: /cvs/ports/games/eboard/patches/patch-configure,v
retrieving revision 1.3
diff -N -u -p patches/patch-configure
--- patches/patch-configure 19 Dec 2007 09:01:25 - 1.3
+++ patches/patch-configure 26 Dec 2009 12:46:21 -
@@ -1,15 +1,17 @@
$OpenBSD: patch-configure,v 1.3 2007/12/19 09:01:25 fgsch Exp $
configure.orig Wed May 23 20:57:45 2007
-+++ configure Sun Dec 16 02:26:41 2007
-@@ -6,7 +6,7 @@ my $prefix = "/usr/local";
+--- configure.orig Wed May 23 11:57:45 2007
configure Sat Dec 26 03:23:34 2009
+@@ -6,8 +6,8 @@ my $prefix = "/usr/local";
my $package = "eboard";
my $version = "1.0.4";
my $cxx = "g++";
-my @cxxflags= ("-O6");
+-my @ldflags = ("-lpthread");
+my @cxxflags= ();
- my @ldflags = ("-lpthread");
++my @ldflags = ("-pthread");
my @libs= ();
my $configh = "config.h";
+ my $configmake = "config.make";
@@ -236,7 +236,7 @@ sub append_flags {
my $x = shift @_;
my @y;
@@ -37,7 +39,18 @@ $OpenBSD: patch-configure,v 1.3 2007/12/19 09:01:25 fg
} else {
$program = "#include <$z>\nint main() { return 0; }\n";
}
-@@ -536,7 +538,7 @@ if ($t2 != 0) {
+@@ -512,6 +514,10 @@ if (!header_check("stdio.h","stdlib.h","string.h","uni
+ #optional headers
+
header_check("strings.h","sys/soundcard.h","sys/audioio.h","linux/joystick.h");
+
++if (header_check("sndio.h")) {
++append_libs("sndio");
++}
++
+ $t1=macro_check("netinet/in.h","IPPROTO_TCP","HAVE_IPPROTO_TCP_ON_IN_H");
+ $t2=macro_check("netinet/in.h","TCP_NODELAY","HAVE_TCP_NODELAY_ON_IN_H");
+ $t3=macro_check("netinet/in.h","SOL_TCP","HAVE_SOL_TCP_ON_IN_H");
+@@ -536,7 +542,7 @@ if ($t2 != 0) {
print "netinet/tcp.h not required, SOL_TCP present.\n";
}
} else {
Index: patches/patch-sound_cc
===
RCS file: /cvs/ports/games/eboard/patches/patch-sound_cc,v
retrieving revision 1.6
diff -N -u -p patches/patch-sound_cc
--- patches/patch-sound_cc 3 Dec 2007 18:54:58 - 1.6
+++ patches/patch-sound_cc 26 Dec 2009 12:46:21 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-sound_cc,v 1.6 2007/12/03 18:54:58 fgsch Exp $
sound.cc.orig Wed May 23 19:57:45 2007
-+++ sound.cc Mon Dec 3 11:58:00 2007
-@@ -46,6 +46,7 @@
+--- sound.cc.orig Wed May 23 11:57:45 2007
sound.cc Sat Dec 26 04:11:49 2009
+@@ -46,14 +46,25 @@
#include "eboard.h"
#define SOME_DRIVER 1
@@ -9,8 +9,16 @@ $OpenBSD: patch-sound_cc,v 1.6 2007/12/03 18:54:58 fgs
#ifdef HAVE_SYS_SOUNDCARD_H
-@@ -54,6 +55,9 @@
+ #define OSS_DRIVER 1
+ #include
++#elif defined HAVE_SNDIO_H
++
++#define SNDIO_DRIVER 1
++#include
++#undef SOUND_DEV
++#define SOUND_DEV "default"
++
#elif defined HAVE_SYS_AUDIOIO_H
+#undef SOUND_DEV
@@ -19,7 +27,7 @@ $OpenBSD: patch-sound_cc,v 1.6 2007/12/03 18:54:58 fgs
#define OPENBSD_DRIVER 1
#include
-@@ -74,7 +78,7 @@ SoundEvent::SoundEvent() {
+@@ -74,7 +85,7 @@ SoundEvent::SoundEvent() {
Pitch=800;
Duration=250;
Count=1;
@@ -28,7 +36,7 @@ $OpenBSD: patch-sound_cc,v 1.6 2007/12/03 18:54:58 fgs
ExtraData[0]=0;
enabled = true;
}
-@@ -157,7 +161,7 @@ ostream & operator<<(ostream &s, SoundEvent e) {
+@@ -157,7 +168,7 @@ ostream & operator<<(ostream &s, SoundEvent e) {
s << e.Device << ',' << e.Count << ',' << (e.enabled?1:0);
break;
case EXT_WAVE:
@@ -37,3 +45,92 @@ $OpenBSD: patch-sound_cc,v 1.6 2007/12/03 18:54:58 fgs
s << "1," << e.Device << ',' << e.ExtraData;
s << ',' << (e.enabled?1:0);
break;
+@@ -200,8 +211,12 @@ void SoundEvent::play() {
+
+ switch(type) {
+ case EXT_WAVE:
++#ifdef SNDIO_DRIVER
++ execlp("aucat","aucat","-i",ExtraData,(char *)NULL);
++#else
+ execlp("play",
UPDATE: games/defendguin
Hi, This diff updates defendguin to the release 0.0.12. Tested on amd64/sparc64. Comments ? OK ? Cheers, benoit Index: Makefile === RCS file: /cvs/ports/games/defendguin/Makefile,v retrieving revision 1.6 diff -N -u Makefile --- Makefile4 Dec 2007 15:27:35 - 1.6 +++ Makefile26 Dec 2009 12:20:34 - @@ -2,11 +2,12 @@ COMMENT= clone of arcade game 'Defender' with a Linux theme -DISTNAME= defendguin-0.0.11 +DISTNAME= defendguin-0.0.12 CATEGORIES=games x11 + HOMEPAGE= http://www.newbreedsoftware.com/defendguin/ -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP=Yes PERMIT_DISTFILES_CDROM=Yes Index: distinfo === RCS file: /cvs/ports/games/defendguin/distinfo,v retrieving revision 1.4 diff -N -u distinfo --- distinfo4 Dec 2007 15:27:35 - 1.4 +++ distinfo26 Dec 2009 12:20:34 - @@ -1,5 +1,5 @@ -MD5 (defendguin-0.0.11.tar.gz) = yAQOOfGZxTOGJQZgJewjlQ== -RMD160 (defendguin-0.0.11.tar.gz) = ODxA1QkarZF7KQUGzR4VJ1MeEGw= -SHA1 (defendguin-0.0.11.tar.gz) = 59njGuvl1D2FQXD8u/gur42qTqQ= -SHA256 (defendguin-0.0.11.tar.gz) = 9EXNEG8C6qI1JFCo+fdTUyAIcmd0vp4bfOecUUZmjX0= -SIZE (defendguin-0.0.11.tar.gz) = 2233817 +MD5 (defendguin-0.0.12.tar.gz) = pUPj9fTpNVRhFjhMbyDXgg== +RMD160 (defendguin-0.0.12.tar.gz) = RoBWqTNH7EtHbWstr/M3YmoeOSE= +SHA1 (defendguin-0.0.12.tar.gz) = vbzUlyn4edNNkyvsLj7nmRaXomY= +SHA256 (defendguin-0.0.12.tar.gz) = PCSL7UgLKRkBt1CVJdyVK+bSjfpH/W+OP7mHP0YBczA= +SIZE (defendguin-0.0.12.tar.gz) = 2235694 Index: pkg/PLIST === RCS file: /cvs/ports/games/defendguin/pkg/PLIST,v retrieving revision 1.3 diff -N -u pkg/PLIST --- pkg/PLIST 4 Dec 2007 15:27:35 - 1.3 +++ pkg/PLIST 26 Dec 2009 12:20:34 - @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST,v 1.3 2007/12/04 15:27:35 ajacoutot Exp $ -bin/defendguin +...@bin bin/defendguin @man man/man6/defendguin.6 share/defendguin/ share/defendguin/images/
sndio for comms/gmfsk
I have no way to test this, so testing would be much appreciated.
also removed current MAINTAINER address since it bounces.
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/comms/gmfsk/Makefile,v
retrieving revision 1.17
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:30:30 - 1.17
+++ Makefile26 Dec 2009 09:48:49 -
@@ -4,7 +4,7 @@ COMMENT=GNOME multimode HF terminal
GNOME_PROJECT= gmfsk
GNOME_VERSION= 0.6
-PKGNAME= ${DISTNAME}p13
+PKGNAME= ${DISTNAME}p14
CATEGORIES=comms hamradio
HOMEPAGE= http://gmfsk.connect.fi/
@@ -12,8 +12,6 @@ MASTER_SITES= ${HOMEPAGE} \
http://he.fi/pub/ham/unix/linux/hfmodems/
EXTRACT_SUFX= .tar.gz
-MAINTAINER=Jason Wright
-
# GPLv2 - FDL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
@@ -26,8 +24,8 @@ WANTLIB += bonobo-2 bonobo-activation bonoboui-2 c cai
WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0
WANTLIB += glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2
WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pixman-1 png popt pthread pthread-stubs stdc++ xcb
-WANTLIB += xml2 z
+WANTLIB += pangoft2-1.0 pixman-1 png popt pthread pthread-stubs sndio
+WANTLIB += stdc++ xcb xml2 z
MODULES= devel/gettext \
x11/gnome \
@@ -46,7 +44,8 @@ LIB_DEPENDS= fftw.>=2::math/fftw \
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS=--enable-hamlib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib" \
+ LIBS="-lsndio"
USE_X11= Yes
Index: patches/patch-src_snd_c
===
RCS file: /cvs/ports/comms/gmfsk/patches/patch-src_snd_c,v
retrieving revision 1.1.1.1
diff -N -u -p patches/patch-src_snd_c
--- patches/patch-src_snd_c 28 May 2007 18:47:06 - 1.1.1.1
+++ patches/patch-src_snd_c 26 Dec 2009 09:48:49 -
@@ -1,41 +1,63 @@
$OpenBSD: patch-src_snd_c,v 1.1.1.1 2007/05/28 18:47:06 jason Exp $
src/snd.c.orig Sat Apr 17 13:24:11 2004
-+++ src/snd.c Wed Nov 23 11:04:58 2005
-@@ -36,7 +36,12 @@
+--- src/snd.c.orig Sat Apr 17 10:24:11 2004
src/snd.c Sat Dec 26 01:23:04 2009
+@@ -36,8 +36,7 @@
#include
#include
-#include
-+#ifdef __OpenBSD__
-+# include
-+#else
-+# include
-+#endif
-+
- #include
+-#include
++#include
#include "snd.h"
-@@ -139,9 +144,11 @@ static gint opensnd(gint direction)
+ #include "misc.h"
+@@ -55,6 +54,7 @@
+ static snd_config_t config;
+ static snd_config_t newconfig;
+
++static struct sio_hdl *hdl;
+ static gint snd_fd = -1;
+ static gint snd_dir = 0;
+
+@@ -133,18 +133,18 @@ static void dprintf(const char *fmt, ...)
+
+ /* -- */
+
+-static gint opensnd(gint direction)
++static struct sio_hdl * opensnd(gint direction)
+ {
+ #ifdef SND_DEBUG
audio_buf_info info;
gchar *str;
#endif
- guint sndparam, wanted;
-+ audio_info_t ainfo;
- gint fd;
+- gint fd;
++ struct sio_hdl *h;
++ struct sio_par par, gpar;
-+ AUDIO_INITINFO(&ainfo);
-+
if (!config.device) {
snderr("opensnd: device not set");
- return -1;
-@@ -166,17 +173,11 @@ static gint opensnd(gint direction)
+- return -1;
++ return NULL;
+ }
+
+ #ifdef SND_DEBUG
+@@ -165,18 +165,16 @@ static gint opensnd(gint direction)
+ dprintf("Opening %s for %s...\n", config.device, str);
#endif
- /* non-blocking open */
+- /* non-blocking open */
- if ((fd = open(config.device, direction | O_NONBLOCK)) < 0) {
-+ if ((fd = open(config.device, direction)) < 0) {
- snderr("opensnd: open: %s: %m", config.device);
- return -1;
+- snderr("opensnd: open: %s: %m", config.device);
+- return -1;
++if (!strncmp(config.device, "", 1) ||
++ !strncmp(config.device, "default", 8))
++ h = sio_open(NULL, direction, 0);
++ else
++ h = sio_open(config.device, direction, 0);
++ if (!h) {
++ snderr("opensnd: open: %s", config.device);
++ return NULL;
}
- /* make it block again - (SNDCTL_DSP_NONBLOCK ???) */
@@ -47,7 +69,7 @@ $OpenBSD: patch-src_snd_c,v 1.1.1.1 2007/05/28 18:47:0
#ifdef SND_DEBUG
if (config.flags & SND_FLAG_8BIT)
str = "8 bit unsigned";
-@@ -186,20 +187,15 @@ static gint opensnd(gint direction)
+@@ -186,20 +184,15 @@ static gint opensnd(gint direction)
dprintf("Setting sample format (%s)...\n", str);
#endif
sndio for games/crossfire-client
we don't ship the sound files for this. I found them in the crossfire
svn. but I can't seem to get the client to try to play them, probably
because I have no idea how this game works.
anyway, if someone is has audio working with this port, can you please
test this?
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/games/crossfire-client/Makefile,v
retrieving revision 1.22
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:41 - 1.22
+++ Makefile26 Dec 2009 07:59:51 -
@@ -4,7 +4,7 @@ COMMENT=graphical networked AD&D style game
VERSION= 1.11.0
DISTNAME= crossfire-client-${VERSION}
-PKGNAME= ${DISTNAME}p3
+PKGNAME= ${DISTNAME}p4
CATEGORIES=games x11
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -20,9 +20,10 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= GL GLU SDL X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
Xext Xfixes Xi Xinerama Xmu Xrandr Xrender atk-1.0 c \
- cairo crypto expat fontconfig freetype gio-2.0 glib-2.0 glitz \
- gmodule-2.0 gobject-2.0 idn m pango-1.0 pangocairo-1.0 \
- pangoft2-1.0 pixman-1 png pthread pthread-stubs ssl xcb z
+ cairo crypto expat fontconfig freetype gio-2.0 glib-2.0 \
+ glitz gmodule-2.0 gobject-2.0 idn m pango-1.0 \
+ pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread \
+ pthread-stubs sndio ssl xcb z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=crossfire/}
@@ -33,7 +34,7 @@ LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x
glut.>=4::graphics/freeglut \
curl.>=8::net/curl
-USE_X11= Yes
+USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
@@ -41,7 +42,8 @@ CONFIGURE_ENV=CPPFLAGS="-I${LOCALBASE}/include \
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib \
-L${X11BASE}/lib -lm -lXi -lXmu" \
- ac_cv_path_SVNVERSION=""
+ ac_cv_path_SVNVERSION="" \
+ sndio_sound="yes"
CONFIGURE_ARGS=--enable-gtkv2 \
--disable-gtkv1
Index: patches/patch-configure
===
RCS file: /cvs/ports/games/crossfire-client/patches/patch-configure,v
retrieving revision 1.2
diff -N -u -p patches/patch-configure
--- patches/patch-configure 1 Apr 2008 09:14:31 - 1.2
+++ patches/patch-configure 26 Dec 2009 07:59:51 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.2 2008/04/01 09:14:31 ajacoutot Exp $
configure.orig Sat Feb 12 19:09:25 2005
-+++ configure Sat Feb 12 19:09:27 2005
+--- configure.orig Mon Jan 28 23:29:08 2008
configure Fri Dec 25 22:50:32 2009
@@ -7688,13 +7688,13 @@ fi
@@ -27,3 +27,23 @@ $OpenBSD: patch-configure,v 1.2 2008/04/01 09:14:31 aj
fi
+@@ -9164,6 +9164,11 @@ fi
+
+ SOUND_SRC="sound-src";
+ else
++ if eval "test x$sndio_sound = xyes"; then
++CFLAGS="$CFLAGS -DSNDIO_SOUND"
++SND_LIBS="-lsndio -lm"
++SOUND_SRC="sound-src";
++ else
+ if eval "test x$sun_sound = xyes"; then
+ echo "Using solaris sound system"
+ CFLAGS="$CFLAGS -DSUN_SOUND"
+@@ -9172,6 +9177,7 @@ fi
+ else
+ echo "No suitable sound system found."
+ sound="no"
++ fi
+ fi
+ fi
+ fi
Index: patches/patch-sound-src_cfsndserv_c
===
RCS file: patches/patch-sound-src_cfsndserv_c
diff -N -u -p patches/patch-sound-src_cfsndserv_c
--- /dev/null 26 Dec 2009 00:59:51 -
+++ patches/patch-sound-src_cfsndserv_c 26 Dec 2009 07:59:51 -
@@ -0,0 +1,230 @@
+$OpenBSD$
+--- sound-src/cfsndserv.c.orig Mon Jan 28 23:29:08 2008
sound-src/cfsndserv.c Fri Dec 25 23:14:53 2009
+@@ -93,6 +93,10 @@ static char *rcsid_cfsndserv_c =
+ #elif defined(SGI_SOUND)
+ # include
+ # define AUDIODEV "/foo/bar"
++#elif defined(SNDIO_SOUND)
++# include
++# include
++# define AUDIODEV "default"
+ #elif defined(SUN_SOUND)
+ # include
+ # define AUDIODEV "/dev/audio"
+@@ -135,7 +139,11 @@ int *sounds_in_buffer=NULL;
+ int current_buffer=0; /* Next buffer we will write out */
+ int first_free_buffer=0; /* So we know when to stop playing sounds */
+
++#ifdef SNDIO_SOUND
++struct sio_hdl *hdl;
++#else
+ int soundfd=0;
++#endif
+
+ /* sound device parameters */
+ int stereo=0,bit8=0,sample_size=0,frequency=0,sign=0,zerolevel=0;
+@@ -514,6 +522,70 @@ int audio_play(int buffer,int off)
+ return settings.buflen-off;
+ }
+
++#elif defined(SNDIO_SOUND)
++
++int init_audio(){
++
++ struct sio_par par;
++ const char *audiodev;
++
++ printf("
