diff options
Diffstat (limited to 'audio/gkrellmvolume2')
| -rw-r--r-- | audio/gkrellmvolume2/Makefile | 14 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/distinfo | 2 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/files/patch-aa | 46 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/files/patch-ab | 14 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/files/patch-unix_mixer.c | 47 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/pkg-descr | 2 | ||||
| -rw-r--r-- | audio/gkrellmvolume2/pkg-plist | 2 |
7 files changed, 70 insertions, 57 deletions
diff --git a/audio/gkrellmvolume2/Makefile b/audio/gkrellmvolume2/Makefile index 2831f8a80619..1199f8e269ed 100644 --- a/audio/gkrellmvolume2/Makefile +++ b/audio/gkrellmvolume2/Makefile @@ -6,20 +6,20 @@ # PORTNAME= gkrellmvolume -PORTVERSION= 0.8 +PORTVERSION= 2.0.1 CATEGORIES= audio MASTER_SITES= http://gkrellm.luon.net/files/ -DISTNAME= volume-${PORTVERSION} +DISTNAME= gkrellm-volume-${PORTVERSION} MAINTAINER= ume@FreeBSD.org -BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm -RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm +BUILD_DEPENDS= ${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2 +RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 -WRKSRC= ${WRKDIR}/volume +WRKSRC= ${WRKDIR}/gkrellm-volume2-${PORTVERSION} USE_X_PREFIX= yes -USE_GNOMENG= yes -USE_GNOME= imlib + +MAKE_ENV+= PLUGIN_DIR=${PREFIX}/libexec/gkrellm2/plugins .include <bsd.port.mk> diff --git a/audio/gkrellmvolume2/distinfo b/audio/gkrellmvolume2/distinfo index 8b3d3087f7c5..81a68c0733fb 100644 --- a/audio/gkrellmvolume2/distinfo +++ b/audio/gkrellmvolume2/distinfo @@ -1 +1 @@ -MD5 (volume-0.8.tar.gz) = fae9f15afb750735e0201e2ef32a1638 +MD5 (gkrellm-volume-2.0.1.tar.gz) = 9c85cc520819fdbc6dc03e9b1b3ad79b diff --git a/audio/gkrellmvolume2/files/patch-aa b/audio/gkrellmvolume2/files/patch-aa index 0815a07610c9..4b561de154a2 100644 --- a/audio/gkrellmvolume2/files/patch-aa +++ b/audio/gkrellmvolume2/files/patch-aa @@ -1,34 +1,20 @@ Index: Makefile diff -u Makefile.orig Makefile ---- Makefile.orig Thu Jun 15 21:02:13 2000 -+++ Makefile Tue Jun 27 00:34:00 2000 -@@ -1,15 +1,15 @@ - # Makefile for GKrellM volume plugin +--- Makefile.orig Fri Aug 30 03:01:56 2002 ++++ Makefile Fri Aug 30 22:00:06 2002 +@@ -3,17 +3,15 @@ + GTK_CONFIG = pkg-config gtk+-2.0 - # Linux --GTK_CONFIG = gtk-config --SYSLIB = -lpthread -+#GTK_CONFIG = gtk-config -+#SYSLIB = -lpthread - - # FreeBSD - #GTK_CONFIG = gtk12-config - #SYSLIB = - --PLUGIN_DIR = /usr/share/gkrellm/plugins + PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins -GKRELLM_INCLUDE = -I/usr/local/include -+PLUGIN_DIR = $(PREFIX)/libexec/gkrellm/plugins -+GKRELLM_INCLUDE = -I$(PREFIX)/include ++GKRELLM_INCLUDE = -I${PREFIX}/include - GTK_INCLUDE = `$(GTK_CONFIG) --cflags` + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` GTK_LIB = `$(GTK_CONFIG) --libs` -@@ -17,12 +17,10 @@ - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) -+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) - LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) +-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) ++CFLAGS += -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) LFLAGS = -shared -CC = gcc $(CFLAGS) $(FLAGS) @@ -36,18 +22,12 @@ diff -u Makefile.orig Makefile INSTALL = install -c INSTALL_PROGRAM = $(INSTALL) -s -@@ -34,12 +32,13 @@ - make GTK_CONFIG=gtk12-config SYSLIB= all +@@ -22,7 +20,7 @@ + all: volume.so volume.so: $(OBJS) - $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) -+ $(CC) $(CFLAGS) $(OBJS) -o volume.so $(LFLAGS) $(LIBS) ++ $(CC) $(CFLAGS) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) clean: rm -f *.o core *.so* *.bak *~ - - install: -+ mkdir -p $(PLUGIN_DIR) - $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) - - volume.c.o: volume.c diff --git a/audio/gkrellmvolume2/files/patch-ab b/audio/gkrellmvolume2/files/patch-ab deleted file mode 100644 index cee7f1cc2c03..000000000000 --- a/audio/gkrellmvolume2/files/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -Index: volume.c -diff -u volume.c.orig volume.c ---- volume.c.orig Thu Nov 23 05:35:42 2000 -+++ volume.c Sat Jun 29 17:55:08 2002 -@@ -17,7 +17,8 @@ - | Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#ifdef __FreeBSD__ -+#include <sys/param.h> -+#if defined(__FreeBSD__) && __FreeBSD_version < 500000 - #include <machine/soundcard.h> - #else - #include <sys/soundcard.h> diff --git a/audio/gkrellmvolume2/files/patch-unix_mixer.c b/audio/gkrellmvolume2/files/patch-unix_mixer.c new file mode 100644 index 000000000000..9f933eb0bd77 --- /dev/null +++ b/audio/gkrellmvolume2/files/patch-unix_mixer.c @@ -0,0 +1,47 @@ +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; diff --git a/audio/gkrellmvolume2/pkg-descr b/audio/gkrellmvolume2/pkg-descr index 846ebc2fc426..12f027d99151 100644 --- a/audio/gkrellmvolume2/pkg-descr +++ b/audio/gkrellmvolume2/pkg-descr @@ -2,7 +2,7 @@ GKrellM volume plugin Author: Sjoerd Simons <Sjoerd@donald-duck.ele.tue.nl> WWW: http://gkrellm.luon.net/volume.phtml -A plugin for GKrellM, that let's you control your mixer.. +A plugin for gkrellm 2.0 , that let's you control your mixer.. - Hajimu UMEMOTO <ume@FreeBSD.org> diff --git a/audio/gkrellmvolume2/pkg-plist b/audio/gkrellmvolume2/pkg-plist index df108a97623d..edb3d90f1a52 100644 --- a/audio/gkrellmvolume2/pkg-plist +++ b/audio/gkrellmvolume2/pkg-plist @@ -1 +1 @@ -libexec/gkrellm/plugins/volume.so +libexec/gkrellm2/plugins/volume.so |