As notified by naddy, extace is linked to the build ... and I said gkrellmms
in the mail but it is gkrellmss (ok in the diff).
New diff with x11/Makefile and Quirks adjusted for extace
Index: x11/Makefile
===================================================================
RCS file: /cvs/ports/x11/Makefile,v
retrieving revision 1.542
diff -u -p -r1.542 Makefile
--- x11/Makefile 5 Oct 2014 18:31:53 -0000 1.542
+++ x11/Makefile 3 Nov 2014 21:44:04 -0000
@@ -54,7 +54,6 @@
SUBDIR += eterm
SUBDIR += eterm,kanji
SUBDIR += evilwm
- SUBDIR += extace
SUBDIR += faenza-icon-theme
SUBDIR += fbpanel
SUBDIR += fleditor
Index: x11/extace/Makefile
===================================================================
RCS file: x11/extace/Makefile
diff -N x11/extace/Makefile
--- x11/extace/Makefile 9 Aug 2013 23:12:20 -0000 1.19
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-# $OpenBSD: Makefile,v 1.19 2013/08/09 23:12:20 ajacoutot Exp $
-
-COMMENT= audio visualization plugin for the X-Window System
-
-DISTNAME= extace-1.9.9
-REVISION= 8
-CATEGORIES= x11 audio
-
-HOMEPAGE= http://extace.sourceforge.net/
-
-# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=extace/}
-
-WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes fftw3
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 audiofile c cairo esd
-WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread sndio z
-WANTLIB += pthread-stubs xcb gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
-
-MODULES= devel/gettext
-LIB_DEPENDS= x11/gtk+2 \
- audio/esound \
- math/fftw3
-
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= ${CONFIGURE_SHARED}
-
-.include <bsd.port.mk>
Index: x11/extace/distinfo
===================================================================
RCS file: x11/extace/distinfo
diff -N x11/extace/distinfo
--- x11/extace/distinfo 3 Feb 2008 20:18:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-MD5 (extace-1.9.9.tar.gz) = de7tZ1mDYK42RXl8pA53yg==
-RMD160 (extace-1.9.9.tar.gz) = 21WnTazFpewiftmoLmGvLpTXUBY=
-SHA1 (extace-1.9.9.tar.gz) = prVzKuutxbGD9WefUp4ayFgkH4o=
-SHA256 (extace-1.9.9.tar.gz) = HR4xricJwOQzCi6Lcfk0FNUnRP/j/ZEMJrj1V63RDxg=
-SIZE (extace-1.9.9.tar.gz) = 425480
Index: x11/extace/patches/patch-configure
===================================================================
RCS file: x11/extace/patches/patch-configure
diff -N x11/extace/patches/patch-configure
--- x11/extace/patches/patch-configure 9 Aug 2013 23:12:20 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2013/08/09 23:12:20 ajacoutot Exp $
---- configure.orig Wed Jan 23 00:58:14 2008
-+++ configure Wed Jan 23 11:40:35 2008
-@@ -20026,8 +20026,6 @@ fi
- fi
-
-
--
--CFLAGS="-O2 "
-
-
- EFENCE=""
Index: x11/extace/patches/patch-src_color_win_c
===================================================================
RCS file: x11/extace/patches/patch-src_color_win_c
diff -N x11/extace/patches/patch-src_color_win_c
--- x11/extace/patches/patch-src_color_win_c 16 Jul 2008 13:53:35 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_color_win_c,v 1.1 2008/07/16 13:53:35 sthen Exp $
---- src/color_win.c.orig Mon Jul 14 11:14:44 2008
-+++ src/color_win.c Mon Jul 14 11:16:51 2008
-@@ -25,6 +25,7 @@
- #include <globals.h>
- #include <gtk/gtk.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <string.h>
-
-
Index: x11/extace/patches/patch-src_input_c
===================================================================
RCS file: x11/extace/patches/patch-src_input_c
diff -N x11/extace/patches/patch-src_input_c
--- x11/extace/patches/patch-src_input_c 3 Feb 2008 20:18:09 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_input_c,v 1.2 2008/02/03 20:18:09 ajacoutot Exp $
---- src/input.c.orig Fri Dec 14 02:41:08 2007
-+++ src/input.c Sun Feb 3 21:09:47 2008
-@@ -67,7 +67,7 @@ int open_datasource(DataSource source)
- /* esd rate is rate for each channel */
- ring_rate=ESD_DEFAULT_RATE;
- update_ring_channels(2); /* since ESD_STEREO is set */
--
handle.fd=esd_monitor_stream(ESD_BITS16|ESD_STEREO|ESD_STREAM|ESD_RECORD,ring_rate,"127.0.0.1","eXtace");
-+
handle.fd=esd_monitor_stream(ESD_BITS16|ESD_STEREO|ESD_STREAM|ESD_RECORD,ring_rate,NULL,"eXtace");
- if (handle.fd > 0)
- handle.open = 1;
- break;
-@@ -91,7 +91,7 @@ int open_datasource(DataSource source)
-
- errbox = gtk_message_dialog_new(NULL,GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,
-- "Error, Cannot connect to input source!!\nPLease check
settings in the options panel.\n");
-+ "Error, Cannot connect to input source!!\nPlease check
settings in the options panel.\n");
-
-
- gtk_dialog_run(GTK_DIALOG(errbox));
Index: x11/extace/pkg/DESCR
===================================================================
RCS file: x11/extace/pkg/DESCR
diff -N x11/extace/pkg/DESCR
--- x11/extace/pkg/DESCR 14 Mar 2011 09:15:34 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-eXtace is an audio visualization plugin for the X-Window System. It
-connects to ESD (Enlightened Sound Daemon) and displays the audio data
-as either a pseudo 3D flying landscape, pseudo 3D pointed landscape,
-16-256 channel graphic EQ, multi-mode oscilloscopes, horizontal
-spectrogram, or a combination of hi-res FFT with a vertical spectrogram.
-
-All modes are fully scalable to nearly any resolution (within your
-CPU/X11 capabilities). Resolutions up to 1600x1200 at 40 FPS use
-typically less than 30% CPU, depending on your host CPU/X11
-capabilities.
Index: x11/extace/pkg/PLIST
===================================================================
RCS file: x11/extace/pkg/PLIST
diff -N x11/extace/pkg/PLIST
--- x11/extace/pkg/PLIST 16 Jul 2008 13:53:35 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/07/16 13:53:35 sthen Exp $
-@bin bin/extace
-share/gnome/
-share/gnome/apps/
-share/gnome/apps/Multimedia/
-share/gnome/apps/Multimedia/extace.desktop
Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.338
diff -u -p -r1.338 Makefile
--- audio/Makefile 3 Oct 2014 07:23:40 -0000 1.338
+++ audio/Makefile 3 Nov 2014 21:44:04 -0000
@@ -39,7 +39,6 @@
SUBDIR += disc-cover
SUBDIR += dumb
SUBDIR += easytag
- SUBDIR += esound
SUBDIR += espeak
SUBDIR += exaile
SUBDIR += faac
Index: audio/esound/Makefile
===================================================================
RCS file: audio/esound/Makefile
diff -N audio/esound/Makefile
--- audio/esound/Makefile 23 Mar 2014 16:06:37 -0000 1.56
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-# $OpenBSD: Makefile,v 1.56 2014/03/23 16:06:37 naddy Exp $
-
-COMMENT= sound library for Enlightenment
-
-DISTNAME= esound-0.2.41
-REVISION= 1
-EPOCH= 0
-CATEGORIES= audio
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/esound/0.2/}
-
-SHARED_LIBS += esd 2.40 # .2.38
-
-HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html
-
-LIB_DEPENDS= devel/libaudiofile
-
-# LGPLv2+ and GPLv2+
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB= FLAC audiofile c m ogg sndio
-
-USE_GROFF= Yes
-SEPARATE_BUILD= Yes
-AUTOCONF_VERSION=2.61
-CONFIGURE_STYLE= autoconf
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
- --disable-alsa \
- --disable-oss
-# broken, relies upon v4-mapped addresses
-CONFIGURE_ARGS+= --disable-ipv6
-
-FAKE_FLAGS= DESTDIR=${WRKINST} \
- esdconfdir=${PREFIX}/share/examples/esound
-
-post-extract:
- @cp -f ${FILESDIR}/audio_sndio.c ${WRKSRC}
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/test-script
-
-.include <bsd.port.mk>
Index: audio/esound/distinfo
===================================================================
RCS file: audio/esound/distinfo
diff -N audio/esound/distinfo
--- audio/esound/distinfo 20 Dec 2008 08:58:32 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,5 +0,0 @@
-MD5 (esound-0.2.41.tar.gz) = PYlz7YcFPXrMH01EryxGiA==
-RMD160 (esound-0.2.41.tar.gz) = 6TxjJLSj6DIFcCsGLcFKwQ2Kxso=
-SHA1 (esound-0.2.41.tar.gz) = sq9p63wKBpdyCqGrkoXBbcvYvIY=
-SHA256 (esound-0.2.41.tar.gz) = KjLev/636gdKZlckHwIq8CrF6xYPiyepmr+qXWnOI84=
-SIZE (esound-0.2.41.tar.gz) = 518632
Index: audio/esound/files/audio_sndio.c
===================================================================
RCS file: audio/esound/files/audio_sndio.c
diff -N audio/esound/files/audio_sndio.c
--- audio/esound/files/audio_sndio.c 20 Dec 2008 08:58:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,134 +0,0 @@
-/* $OpenBSD: audio_sndio.c,v 1.1 2008/12/20 08:58:32 jakemsr Exp $ */
-
-/*
- * Copyright (c) 2008 Jacob Meuser <jake...@sdf.lonestar.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "config.h"
-
-#include <sndio.h>
-
-struct sio_hdl *hdl = NULL;
-
-#define ARCH_esd_audio_close
-void esd_audio_close()
-{
- if (hdl != NULL) {
- sio_close(hdl);
- hdl = NULL;
- }
-}
-
-#define ARCH_esd_audio_open
-int esd_audio_open()
-{
- char *device;
- struct sio_par par;
- int mode = SIO_PLAY;
-
- if (hdl != NULL) {
- fprintf(stderr, "sndio already opened\n");
- return(1);
- }
-
- sio_initpar(&par);
-
- if ((esd_audio_format & ESD_MASK_FUNC) == ESD_RECORD)
- mode |= SIO_REC;
-
- device = esd_audio_device ? esd_audio_device : getenv("AUDIODEVICE");
- if ((hdl = sio_open(device, mode, 0)) == NULL) {
- fprintf(stderr, "sio_open failed\n");
- goto bad;
- }
-
- par.le = (BYTE_ORDER == 4321) ? 0 : 1;
- if ((esd_audio_format & ESD_MASK_BITS) == ESD_BITS16) {
- par.bits = 16;
- par.sig = 1;
- } else {
- par.bits = 8;
- par.sig = 0;
- }
-
- par.pchan = (((esd_audio_format & ESD_MASK_CHAN) == ESD_STEREO) ? 2 : 1);
- if (mode & SIO_REC)
- par.rchan = par.pchan;
-
- par.appbufsz = ESD_BUF_SIZE;
-
- par.rate = esd_audio_rate;
-
- if (!sio_setpar(hdl, &par)) {
- fprintf(stderr, "sio_setpar failed\n");
- goto bad;
- }
-
- if (!sio_getpar(hdl, &par)) {
- fprintf(stderr, "sio_getpar failed\n");
- goto bad;
- }
-
- /* check that the actual parameters are what we asked for */
- if (fabs(par.rate - esd_audio_rate) > esd_audio_rate * 0.05) {
- fprintf(stderr, "Unsupported rate: %i Hz\n", esd_audio_rate);
- goto bad;
- }
- if ((esd_audio_format & ESD_MASK_BITS) == ESD_BITS16) {
- if (par.sig != 1 || par.bits != 16) {
- fprintf(stderr, "Unsupported bits: 16\n");
- goto bad;
- }
- } else {
- if (par.sig != 0 || par.bits != 8) {
- fprintf(stderr, "Unsupported bits: 8\n");
- goto bad;
- }
- }
- if ((esd_audio_format & ESD_MASK_CHAN) == ESD_STEREO) {
- if (par.pchan != 2) {
- fprintf(stderr, "Unsupported channels: 2\n");
- goto bad;
- }
- } else {
- if (par.pchan != 1) {
- fprintf(stderr, "Unsupported channels: 1\n");
- goto bad;
- }
- }
-
- if (!sio_start(hdl)) {
- fprintf(stderr, "sio_start failed\n");
- goto bad;
- }
-
- return(1);
-
-bad:
- esd_audio_close();
- return(-1);
-}
-
-#define ARCH_esd_audio_write
-int esd_audio_write(void *buffer, int buf_size)
-{
- return sio_write(hdl, buffer, buf_size);
-}
-
-#define ARCH_esd_audio_read
-int esd_audio_read(void *buffer, int buf_size)
-{
- return sio_read(hdl, buffer, buf_size);
-}
Index: audio/esound/patches/patch-audio_c
===================================================================
RCS file: audio/esound/patches/patch-audio_c
diff -N audio/esound/patches/patch-audio_c
--- audio/esound/patches/patch-audio_c 20 Dec 2008 08:58:32 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-audio_c,v 1.6 2008/12/20 08:58:32 jakemsr Exp $
---- audio.c.orig Sat Dec 20 00:19:22 2008
-+++ audio.c Sat Dec 20 00:19:22 2008
-@@ -31,6 +31,8 @@ static int esd_write_size = ESD_BUF_SIZE;
- # include "audio_alsa.c"
- #elif defined(DRIVER_OSS)
- # include "audio_oss.c"
-+#elif defined(DRIVER_SNDIO)
-+# include "audio_sndio.c"
- #elif defined(DRIVER_AIX)
- # include "audio_aix.c"
- #elif defined(DRIVER_IRIX)
Index: audio/esound/patches/patch-clients_c
===================================================================
RCS file: audio/esound/patches/patch-clients_c
diff -N audio/esound/patches/patch-clients_c
--- audio/esound/patches/patch-clients_c 20 Dec 2008 08:58:32 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-clients_c,v 1.2 2008/12/20 08:58:32 jakemsr Exp $
---- clients.c.orig Sun Dec 14 13:33:21 2008
-+++ clients.c Sun Dec 14 13:35:02 2008
-@@ -143,9 +143,9 @@ int get_new_clients( int listen )
- struct sockaddr_in incoming;
- #if defined (ENABLE_IPV6)
- struct sockaddr_in6 incoming6;
-- size_t size_in6 = sizeof(struct sockaddr_in6);
-+ socklen_t size_in6 = sizeof(struct sockaddr_in6);
- #endif
-- size_t size_in = sizeof(struct sockaddr_in);
-+ socklen_t size_in = sizeof(struct sockaddr_in);
- esd_client_t *new_client = NULL;
-
- short port;
Index: audio/esound/patches/patch-configure_ac
===================================================================
RCS file: audio/esound/patches/patch-configure_ac
diff -N audio/esound/patches/patch-configure_ac
--- audio/esound/patches/patch-configure_ac 20 Dec 2008 08:58:32 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.4 2008/12/20 08:58:32 jakemsr Exp $
---- configure.ac.orig Sat Dec 20 00:22:32 2008
-+++ configure.ac Sat Dec 20 00:22:38 2008
-@@ -202,6 +202,7 @@ if test "x$enable_local_sound" = "xyes"; then
- echo
"---------------------------------------------------------------------"
- echo "--- Checking to see which audio header files your system uses.";
- echo "--- Most of these checks should fail. Do not be alarmed.";
-+ AC_CHECK_HEADERS(sndio.h)
- AC_CHECK_HEADERS(soundcard.h sys/soundcard.h machine/soundcard.h
sys/audio.h)
- AC_CHECK_HEADERS(sys/audioio.h sys/audio.io.h sun/audioio.h)
- AC_CHECK_HEADERS(dmedia/audio.h sys/soundlib.h sys/asoundlib.h
alsa/asoundlib.h)
-@@ -215,6 +216,12 @@ if test "x$enable_local_sound" = "xyes"; then
-
- dnl Define the driver needed based on the first header file found
-
-+ if test "${ac_cv_header_sndio_h}" = "yes"; then
-+ found_sound=yes
-+ AC_DEFINE(DRIVER_SNDIO, 1, [Defined if libsndio backend is enabled])
-+ SOUND_LIBS="-lsndio"
-+ fi
-+
- if test x"$enable_oss" = xyes ; then
- if test "${ac_cv_header_sys_soundcard_h}" = "yes" || \
- test "${ac_cv_header_soundcard_h}" = "yes" || \
-@@ -299,7 +306,7 @@ if test "x$enable_local_sound" = "xyes"; then
- if test "x$HAVE_ARTS" = "xyes"; then
- found_sound=yes
- CFLAGS="$CFLAGS $ARTSC_CFLAGS"
-- LIBS="$LIBS $ARTS_LIBS"
-+ LIBS="$LIBS $ARTS_LIBS -lstdc++"
- AC_DEFINE(DRIVER_ARTS, 1, [Defined if Arts backend is enabled])
- fi
- fi
-@@ -313,7 +320,9 @@ if test "x$enable_local_sound" = "xyes"; then
- echo
"---------------------------------------------------------------------"
- echo "--- Checking to see which audio libraries are required for linking.";
- echo "--- Most of these checks should also fail. Do not be alarmed.";
-- AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
-+ if test "x$enable_oss" = "xyes"; then
-+ AC_CHECK_FUNC(_oss_ioctl,,[AC_CHECK_LIB(ossaudio,_oss_ioctl)])
-+ fi
- AC_CHECK_FUNC(ALnewconfig,,[AC_CHECK_LIB(audio,ALnewconfig)])
- if test "x$enable_alsa" = "xyes"; then
- AC_CHECK_FUNC(snd_cards,,[AC_CHECK_LIB(sound,snd_cards)])
-@@ -391,7 +400,8 @@ if test "x$with_libwrap" = "xyes"; then
-
- wrap_ok=no
- AC_TRY_LINK(
--[#include <tcpd.h>
-+[#include <stdio.h>
-+#include <tcpd.h>
- #include <syslog.h>
- int allow_severity = LOG_INFO;
- int deny_severity = LOG_WARNING;],
-@@ -401,7 +411,8 @@ int deny_severity = LOG_WARNING;],
- wrap_ok=yes],
- [LIBS="$LIBS -lnsl"
- AC_TRY_LINK(
--[#include <tcpd.h>
-+[#include <stdio.h>
-+#include <tcpd.h>
- #include <syslog.h>
- int allow_severity = LOG_INFO;
- int deny_severity = LOG_WARNING;],
Index: audio/esound/patches/patch-esd_c
===================================================================
RCS file: audio/esound/patches/patch-esd_c
diff -N audio/esound/patches/patch-esd_c
--- audio/esound/patches/patch-esd_c 20 Dec 2008 08:58:32 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-$OpenBSD: patch-esd_c,v 1.4 2008/12/20 08:58:32 jakemsr Exp $
---- esd.c.orig Tue Nov 18 21:35:19 2008
-+++ esd.c Sun Dec 14 13:40:03 2008
-@@ -287,12 +287,12 @@ struct stat dir_stats;
-
- #if defined(S_ISVTX)
- #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
-- S_IRGRP|S_IWGRP|S_IXGRP|\
-- S_IROTH|S_IWOTH|S_IXOTH|S_ISVTX)
-+ S_IRGRP|S_IXGRP|\
-+ S_IROTH|S_IXOTH|S_ISVTX)
- #else
- #define ESD_UNIX_SOCKET_DIR_MODE (S_IRUSR|S_IWUSR|S_IXUSR|\
-- S_IRGRP|S_IWGRP|S_IXGRP|\
-- S_IROTH|S_IWOTH|S_IXOTH)
-+ S_IRGRP|S_IXGRP|\
-+ S_IROTH|S_IXOTH)
- #endif
-
- if (mkdir(ESD_UNIX_SOCKET_DIR, ESD_UNIX_SOCKET_DIR_MODE) == 0) {
Index: audio/esound/patches/patch-test-script
===================================================================
RCS file: audio/esound/patches/patch-test-script
diff -N audio/esound/patches/patch-test-script
--- audio/esound/patches/patch-test-script 20 Dec 2008 08:58:32 -0000
1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-test-script,v 1.6 2008/12/20 08:58:32 jakemsr Exp $
---- test-script.orig Thu Apr 19 07:43:59 2007
-+++ test-script Sun Mar 9 16:23:07 2008
-@@ -1,4 +1,4 @@
--#!/bin/tcsh
-+#!${LOCALBASE}/bin/tcsh
- echo welcome to the test.
-
- echo ""
-@@ -40,7 +40,7 @@ echo $< >& /dev/null
- esdmon > sample.raw &
- esdcat -b -m -r 11025 test.wav
- sleep 3
--killall esdmon
-+pkill esdmon
-
- echo press enter to continue...
- echo $< >& /dev/null
Index: audio/esound/patches/patch-util_c
===================================================================
RCS file: audio/esound/patches/patch-util_c
diff -N audio/esound/patches/patch-util_c
--- audio/esound/patches/patch-util_c 20 Dec 2008 08:58:32 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,68 +0,0 @@
-$OpenBSD: patch-util_c,v 1.6 2008/12/20 08:58:32 jakemsr Exp $
---- util.c.orig Sun Dec 14 13:35:48 2008
-+++ util.c Sun Dec 14 13:39:45 2008
-@@ -1,5 +1,8 @@
- #include "config.h"
- #include "esd.h"
-+#include <limits.h>
-+#include <pwd.h>
-+#include <stdio.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <stdlib.h>
-@@ -24,36 +27,31 @@ have_ipv6(void) {
- const char*
- esd_get_socket_dirname (void)
- {
-- const char *audiodev = NULL;
-- static char *dirname = NULL;
-+ static char *sockdir = NULL, sockdirbuf[PATH_MAX];
-+ struct passwd *pw;
-
-- if (dirname == NULL) {
-- if ((audiodev = getenv("AUDIODEV"))) {
-- char *newdev = strrchr(audiodev, '/');
-- if (newdev != NULL) {
-- audiodev = newdev++;
-- }
-- } else
-- audiodev = "";
-- dirname = malloc(strlen(audiodev) + 40);
-- sprintf (dirname, "/tmp/.esd%s-%i", audiodev, getuid());
-+ if (sockdir != NULL)
-+ return sockdir;
-+ pw = getpwuid(getuid());
-+ if (pw == NULL || pw->pw_dir == NULL) {
-+ fprintf(stderr, "esd: could not find home directory\n");
-+ exit(1);
- }
--
-- return dirname;
-+ snprintf(sockdirbuf, sizeof(sockdirbuf), "%s/.esd", pw->pw_dir);
-+ endpwent();
-+ sockdir = sockdirbuf;
-+ return sockdir;
- }
-
- const char*
- esd_get_socket_name (void)
- {
-- const char *dirname;
-- static char *name = NULL;
-+ static char *sockname = NULL, socknamebuf[PATH_MAX];
-
-- if (name == NULL) {
-- dirname = esd_get_socket_dirname();
-- name = malloc(strlen(dirname) + sizeof("/socket"));
-- strcpy(name, dirname);
-- strcat(name, "/socket");
-- }
--
-- return name;
-+ if (sockname != NULL)
-+ return sockname;
-+ snprintf(socknamebuf, sizeof(socknamebuf), "%s/socket",
-+ esd_get_socket_dirname());
-+ sockname = socknamebuf;
-+ return sockname;
- }
Index: audio/esound/pkg/DESCR
===================================================================
RCS file: audio/esound/pkg/DESCR
diff -N audio/esound/pkg/DESCR
--- audio/esound/pkg/DESCR 18 Oct 2011 08:44:01 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-Esound is an audio mixing server that allows multiple applications
-to output sound to the same audio device.
-
-Esound is seriously lacking in features required for a modern desktop
-environment, particularly for multi-channel audio and audio/video
-synchronization.
Index: audio/esound/pkg/PFRAG.shared
===================================================================
RCS file: audio/esound/pkg/PFRAG.shared
diff -N audio/esound/pkg/PFRAG.shared
--- audio/esound/pkg/PFRAG.shared 23 Dec 2005 16:57:17 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/23 16:57:17 espie Exp $
-@lib lib/libesd.so.${LIBesd_VERSION}
Index: audio/esound/pkg/PLIST
===================================================================
RCS file: audio/esound/pkg/PLIST
diff -N audio/esound/pkg/PLIST
--- audio/esound/pkg/PLIST 18 Oct 2011 08:44:01 -0000 1.20
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.20 2011/10/18 08:44:01 ajacoutot Exp $
-@pkgpath audio/esound,arts
-@bin bin/esd
-bin/esd-config
-@bin bin/esdcat
-@bin bin/esdctl
-@bin bin/esdfilt
-@bin bin/esdloop
-@bin bin/esdmon
-@bin bin/esdplay
-@bin bin/esdrec
-@bin bin/esdsample
-include/esd.h
-lib/libesd.a
-lib/libesd.la
-lib/pkgconfig/
-lib/pkgconfig/esound.pc
-@man man/man1/esd-config.1
-@man man/man1/esd.1
-@man man/man1/esdcat.1
-@man man/man1/esdctl.1
-@man man/man1/esdfilt.1
-@man man/man1/esdloop.1
-@man man/man1/esdmon.1
-@man man/man1/esdplay.1
-@man man/man1/esdrec.1
-@man man/man1/esdsample.1
-share/aclocal/
-share/aclocal/esd.m4
-share/examples/esound/
-share/examples/esound/esd.conf
-@sample ${SYSCONFDIR}/esd.conf
-%%SHARED%%
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.190
diff -u -p -r1.190 Makefile
--- devel/quirks/Makefile 1 Nov 2014 10:41:05 -0000 1.190
+++ devel/quirks/Makefile 3 Nov 2014 21:44:06 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.36
+PKGNAME = quirks-2.37
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.195
diff -u -p -r1.195 Quirks.pm
--- devel/quirks/files/Quirks.pm 1 Nov 2014 10:41:05 -0000 1.195
+++ devel/quirks/files/Quirks.pm 3 Nov 2014 21:44:06 -0000
@@ -467,6 +467,9 @@ my $obsolete_reason = {
'emacs-zenirc' => 3,
'emacs-zenirc-el' => 3,
'newsfetch' => 2,
+ 'esound' => 3,
+ 'extace' => 3,
+ 'gkrellmss' => 3,
};
# ->is_base_system($handle, $state):
Index: sysutils/gkrellm/plugins/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/gkrellm/plugins/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- sysutils/gkrellm/plugins/Makefile 1 Feb 2010 17:00:14 -0000 1.2
+++ sysutils/gkrellm/plugins/Makefile 3 Nov 2014 21:44:06 -0000
@@ -10,7 +10,6 @@
SUBDIR += mailwatch
SUBDIR += mms
SUBDIR += moon
- SUBDIR += mss
SUBDIR += reminder
SUBDIR += shoot
SUBDIR += stock
Index: sysutils/gkrellm/plugins/mss/patches/patch-Makefile
===================================================================
RCS file: sysutils/gkrellm/plugins/mss/patches/patch-Makefile
diff -N sysutils/gkrellm/plugins/mss/patches/patch-Makefile
--- sysutils/gkrellm/plugins/mss/patches/patch-Makefile 3 Nov 2003 20:34:17
-0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
---- Makefile.orig Tue Dec 24 10:02:35 2002
-+++ Makefile Tue Dec 24 10:03:11 2002
-@@ -1,6 +1,6 @@
--PLUGIN_INSTALLDIR=/usr/local/lib/gkrellm/plugins
-+PLUGIN_INSTALLDIR=${PREFIX}/lib/gkrellm2/plugins
-
--LOCALEDIR ?= /usr/share/locale
-+LOCALEDIR ?= ${PREFIX}/locale
-
- export PLUGIN_INSTALLDIR LOCALEDIR
-
Index: sysutils/gkrellm/plugins/mss/patches/patch-po_Makefile
===================================================================
RCS file: sysutils/gkrellm/plugins/mss/patches/patch-po_Makefile
diff -N sysutils/gkrellm/plugins/mss/patches/patch-po_Makefile
--- sysutils/gkrellm/plugins/mss/patches/patch-po_Makefile 3 Nov 2003
20:34:17 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-po_Makefile,v 1.1.1.1 2003/11/03 20:34:17 sturm Exp $
---- po/Makefile.orig Tue Dec 24 10:04:28 2002
-+++ po/Makefile Tue Dec 24 10:05:05 2002
-@@ -6,7 +6,7 @@ SUB_DIRS =
- FILES_PO:=$(wildcard *.po)
- FILES_MO:=$(FILES_PO:.po=.mo)
-
--LOCALEDIR ?= /usr/share/locale
-+LOCALEDIR ?= ${PREFIX}/share/locale
-
- ifeq ($(enable_nls),1)
- all: mo-files
Index: sysutils/gkrellm/plugins/mss/patches/patch-src_Makefile
===================================================================
RCS file: sysutils/gkrellm/plugins/mss/patches/patch-src_Makefile
diff -N sysutils/gkrellm/plugins/mss/patches/patch-src_Makefile
--- sysutils/gkrellm/plugins/mss/patches/patch-src_Makefile 4 May 2005
08:49:36 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,58 +0,0 @@
-$OpenBSD: patch-src_Makefile,v 1.3 2005/05/04 08:49:36 espie Exp $
---- src/Makefile.orig Fri Feb 20 20:40:10 2004
-+++ src/Makefile Wed May 4 10:47:35 2005
-@@ -8,8 +8,8 @@ INSTALLDIR ?= $(INSTALLROOT)/lib/gkrellm
- INSTALL ?= install
-
-
--GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags`
--GTK_LIB = `pkg-config gtk+-2.0 --libs`
-+GTK_INCLUDE = `pkg-config gtk+-2.0 gthread-2.0 --cflags`
-+GTK_LIB = `pkg-config gtk+-2.0 gthread-2.0 --libs`
-
- OS_NAME=$(shell uname -s)
-
-@@ -17,14 +17,6 @@ SD_INCLUDE ?=
- SD_LIB ?=
-
-
--ifeq ($(without-alsa),yes)
-- CONFIGURE_ARGS += --without-alsa
--endif
--ifeq ($(without-esd),yes)
-- CONFIGURE_ARGS += --without-esd
--endif
--
--DUMMY_VAR := $(shell ./configure $(CONFIGURE_ARGS))
- HAVE_FFTW3 = $(shell grep -c HAVE_FFTW3 configure.h)
- HAVE_FFTW2 = $(shell grep -c HAVE_FFTW2 configure.h)
- HAVE_ALSA = $(shell grep -c HAVE_ALSA configure.h)
-@@ -66,15 +58,15 @@ ifeq ($(HAVE_ESOUND),1)
- endif
-
-
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
--LIBS = $(GTK_LIB) $(SD_LIB) $(FFTW_LIB) -lm
-+FLAGS += -fPIC $(GTK_INCLUDE) $(SD_INCLUDE) -I${LOCALBASE}/include
-+LIBS += $(GTK_LIB) $(SD_LIB) $(FFTW_LIB) -lm
-
- ifeq ($(OS_NAME),Darwin)
- LFLAGS = -bundle -bundle_loader `which gkrellm`
- STRIP =
- FLAGS += -DDARWIN
- else
--LFLAGS = -shared
-+LFLAGS += -shared -pthread
- STRIP ?= -s
- endif
-
-@@ -90,8 +82,7 @@ ifeq ($(alsa),1)
- FLAGS += -DGKRELLM_ALSA
- endif
-
--CC = gcc $(FLAGS) $(CFLAGS)
--
-+CFLAGS += $(FLAGS)
- OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o option.o
-
- all: gkrellmss.so
Index: sysutils/gkrellm/plugins/mss/pkg/DESCR
===================================================================
RCS file: sysutils/gkrellm/plugins/mss/pkg/DESCR
diff -N sysutils/gkrellm/plugins/mss/pkg/DESCR
--- sysutils/gkrellm/plugins/mss/pkg/DESCR 3 Nov 2003 20:34:17 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Sound scope plugin for GkrellM2. Uses ESD.
Index: sysutils/gkrellm/plugins/mss/pkg/PLIST
===================================================================
RCS file: sysutils/gkrellm/plugins/mss/pkg/PLIST
diff -N sysutils/gkrellm/plugins/mss/pkg/PLIST
--- sysutils/gkrellm/plugins/mss/pkg/PLIST 20 Jan 2005 20:19:40 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2005/01/20 20:19:40 sturm Exp $
-lib/gkrellm2/
-lib/gkrellm2/plugins/
-lib/gkrellm2/plugins/gkrellmss.so
