aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/gkrellmss/Makefile3
-rw-r--r--audio/gkrellmss/distinfo2
-rw-r--r--audio/gkrellmss/files/patch-src::Makefile40
-rw-r--r--audio/gkrellmss/pkg-plist9
4 files changed, 33 insertions, 21 deletions
diff --git a/audio/gkrellmss/Makefile b/audio/gkrellmss/Makefile
index fc50cb65f97..a5bf75472bc 100644
--- a/audio/gkrellmss/Makefile
+++ b/audio/gkrellmss/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gkrellmss
-PORTVERSION= 0.3
+PORTVERSION= 0.5
CATEGORIES= audio
MASTER_SITES= http://web.wt.net/~billw/gkrellmss/
@@ -14,6 +14,7 @@ MAINTAINER= hmendes_br@yahoo.com
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
LIB_DEPENDS= gdk_pixbuf_xlib.2:${PORTSDIR}/graphics/gdk-pixbuf
+LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
USE_X_PREFIX= yes
diff --git a/audio/gkrellmss/distinfo b/audio/gkrellmss/distinfo
index bdcccb10f86..88c4feb34ac 100644
--- a/audio/gkrellmss/distinfo
+++ b/audio/gkrellmss/distinfo
@@ -1 +1 @@
-MD5 (gkrellmss-0.3.tar.gz) = 12b4de4b4d2ce5c4e34af22a8f4fbbfa
+MD5 (gkrellmss-0.5.tar.gz) = 75cd3ba50b7eeba0f5596aace23811ff
diff --git a/audio/gkrellmss/files/patch-src::Makefile b/audio/gkrellmss/files/patch-src::Makefile
index d84008f36eb..e211f8eaa13 100644
--- a/audio/gkrellmss/files/patch-src::Makefile
+++ b/audio/gkrellmss/files/patch-src::Makefile
@@ -1,6 +1,6 @@
---- src/Makefile.orig Sat Aug 25 14:33:25 2001
-+++ src/Makefile Sun Sep 30 18:26:49 2001
-@@ -1,13 +1,13 @@
+--- src/Makefile.orig Sun Aug 4 18:00:06 2002
++++ src/Makefile Sun Aug 4 18:02:29 2002
+@@ -1,22 +1,22 @@
-INSTALLDIR ?= /usr/local/lib/gkrellm/plugins
-INSTALL ?= install
+INSTALLDIR ?= ${PREFIX}/libexec/gkrellm/plugins
@@ -11,26 +11,36 @@
+GTK_INCLUDE = `${GTK_CONFIG} --cflags`
+GTK_LIB = `${GTK_CONFIG} --libs`
--ESD_INCLUDE = `esd-config --cflags`
--ESD_LIB = `esd-config --libs`
-+ESD_INCLUDE = `${ESD_CONFIG} --cflags`
-+ESD_LIB = `${ESD_CONFIG} --libs`
+ ifeq ($(alsa5),1)
+ SD_INCLUDE =
+ SD_LIB = -lasound
+ else
+-SD_INCLUDE = `esd-config --cflags`
+-SD_LIB = `esd-config --libs`
++SD_INCLUDE = `${ESD_CONFIG} --cflags`
++SD_LIB = `${ESD_CONFIG} --libs`
+ endif
+
+-FFTW_LIB_DIR ?=
++FFTW_LIB_DIR ?= -L${LOCALBASE}/lib
--FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(ESD_INCLUDE)
-+FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(ESD_INCLUDE)
- LIBS = $(GTK_LIB) $(ESD_LIB)
+ FFTW_LIB = $(FFTW_LIB_DIR) -lrfftw -lfftw
+
+-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
++FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(SD_INCLUDE)
+ LIBS = $(GTK_LIB) $(SD_LIB) $(FFTW_LIB) -lm
LFLAGS = -shared
-@@ -20,7 +20,7 @@
+@@ -32,7 +32,7 @@
+ FLAGS += -DGKRELLM_ALSA5
endif
-
-CC = gcc $(FLAGS) $(CFLAGS)
+CC += $(FLAGS) $(CFLAGS)
- OBJS = gkrellmss.o sdlib.o
+ OBJS = gkrellmss.o oscope.o spectrum.o sdlib.o
-@@ -33,8 +33,7 @@
+@@ -45,8 +45,7 @@
rm -f *.o core *.so* *.bak *~
install:
@@ -39,4 +49,4 @@
+ $(INSTALL) gkrellmss.so $(INSTALLDIR)
gkrellmss.o: gkrellmss.c gkrellmss.h
- sdlib.o: sdlib.c gkrellmss.h
+ oscope.o: oscope.c gkrellmss.h
diff --git a/audio/gkrellmss/pkg-plist b/audio/gkrellmss/pkg-plist
index e206d2d87b2..c7e11918233 100644
--- a/audio/gkrellmss/pkg-plist
+++ b/audio/gkrellmss/pkg-plist
@@ -1,5 +1,6 @@
+@comment $FreeBSD$
libexec/gkrellm/plugins/gkrellmss.so
-%%PORTDOCS%%share/doc/GKrellMSS/Changelog
-%%PORTDOCS%%share/doc/GKrellMSS/README
-%%PORTDOCS%%share/doc/GKrellMSS/Themes
-%%PORTDOCS%%@dirrm share/doc/GKrellMSS
+%%PORTDOCS%%share/doc/gkrellmss/Changelog
+%%PORTDOCS%%share/doc/gkrellmss/README
+%%PORTDOCS%%share/doc/gkrellmss/Themes
+%%PORTDOCS%%@dirrm share/doc/gkrellmss