diff options
Diffstat (limited to 'audio/gkrellmvolume2')
| -rw-r--r-- | audio/gkrellmvolume2/Makefile | 4 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/distinfo | 2 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/files/patch-unix_mixer.c | 47 |
3 files changed, 3 insertions, 50 deletions
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile index 1199f8e269ed..63c80d201500 100644 --- a/audio/gkrellmvolume2/Makefile +++ b/audio/gkrellmvolume2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gkrellmvolume -PORTVERSION= 2.0.1 +PORTVERSION= 2.1.4 CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ DISTNAME= gkrellm-volume-${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= ume@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 -WRKSRC= ${WRKDIR}/gkrellm-volume2-${PORTVERSION} +WRKSRC= ${WRKDIR}/gkrellm-volume USE_X_PREFIX= yes diff --git a/audio/gkrellmvolume2/distinfo b/audio/gkrellmvolume2/distinfo index 81a68c0733fb..6d03c8684e15 100644 --- a/audio/gkrellmvolume2/distinfo +++ b/audio/gkrellmvolume2/distinfo @@ -1 +1 @@ -MD5 (gkrellm-volume-2.0.1.tar.gz) = 9c85cc520819fdbc6dc03e9b1b3ad79b +MD5 (gkrellm-volume-2.1.4.tar.gz) = 34368b3713a56ead63adfb678aba9186 diff --git a/audio/gkrellmvolume2/files/patch-unix_mixer.c b/audio/gkrellmvolume2/files/patch-unix_mixer.c deleted file mode 100644 index 9f933eb0bd77..000000000000 --- a/audio/gkrellmvolume2/files/patch-unix_mixer.c +++ /dev/null @@ -1,47 +0,0 @@ -Index: unix_mixer.c -diff -u unix_mixer.c.orig unix_mixer.c ---- unix_mixer.c.orig Fri Aug 30 03:01:56 2002 -+++ unix_mixer.c Fri Aug 30 21:56:54 2002 -@@ -27,7 +27,8 @@ - #include <string.h> - #include <glob.h> - --#ifdef __FreeBSD__ -+#include <sys/param.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 - #include <machine/soundcard.h> - #else - #include <sys/soundcard.h> -@@ -41,19 +42,30 @@ - mixer_t *mixer_open(char *id) { - mixer_t *result; - int fd,devices,nr,i; -+#ifdef SOUND_MIXER_INFO - mixer_info minfo; -+#endif - char *sound_labels[] = SOUND_DEVICE_LABELS; - - if ((fd = open(id,O_RDWR)) == -1) return NULL; -- if ( (ioctl(fd,SOUND_MIXER_READ_DEVMASK,&devices) < 0) || -- (ioctl(fd,SOUND_MIXER_INFO,&minfo) < 0)) { -+ if (ioctl(fd,SOUND_MIXER_READ_DEVMASK,&devices) < 0) { -+ close(fd); -+ return NULL; -+ } -+#ifdef SOUND_MIXER_INFO -+ if (ioctl(fd,SOUND_MIXER_INFO,&minfo) < 0) { - close(fd); - return NULL; - } -+#endif - - result = malloc(sizeof(mixer_t)); - result->fd = fd; -+#ifdef SOUND_MIXER_INFO - result->name = strdup(minfo.name); -+#else -+ result->name = strdup("mixer"); -+#endif - - /* get the nr of devices */ - nr = 0; |