aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2002-09-03 02:34:28 +0800
committerume <ume@FreeBSD.org>2002-09-03 02:34:28 +0800
commitc47434d234bde05486111ee1dcf508f09bd5beed (patch)
tree73828ab90aaa8c7345af55a1eb21d249d92b2f28
parentaac13aa224b11f1e1b33d11f956523cf480a6c2d (diff)
downloadfreebsd-ports-gnome-c47434d234bde05486111ee1dcf508f09bd5beed.tar.gz
freebsd-ports-gnome-c47434d234bde05486111ee1dcf508f09bd5beed.tar.zst
freebsd-ports-gnome-c47434d234bde05486111ee1dcf508f09bd5beed.zip
Update gkrellmms to 2.0 after repocopy.
-rw-r--r--audio/gkrellmms2/Makefile15
-rw-r--r--audio/gkrellmms2/distinfo3
-rw-r--r--audio/gkrellmms2/files/patch-aa35
-rw-r--r--audio/gkrellmms2/pkg-descr5
-rw-r--r--audio/gkrellmms2/pkg-plist2
5 files changed, 26 insertions, 34 deletions
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 14fcd4251b25..e91dcabf04ba 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -6,23 +6,20 @@
#
PORTNAME= gkrellmms
-PORTVERSION= 0.5.5
+PORTVERSION= 2.0
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
-PATCH_SITES= http://web.wt.net/~billw/gkrellm/Plugins/
-PATCHFILES= gkrellmms-patch-0.5.5
-
MAINTAINER= ume@FreeBSD.org
LIB_DEPENDS= xmms.3:${PORTSDIR}/audio/xmms
-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}/${PORTNAME}
+WRKSRC= ${WRKDIR}/gkrellmms2-${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/gkrellmms2/distinfo b/audio/gkrellmms2/distinfo
index 15e6a4b43985..75b2c5c698e9 100644
--- a/audio/gkrellmms2/distinfo
+++ b/audio/gkrellmms2/distinfo
@@ -1,2 +1 @@
-MD5 (gkrellmms-0.5.5.tar.gz) = 51dcb7e48873ce56632e0f2148360178
-MD5 (gkrellmms-patch-0.5.5) = bd27baaeb52792a44ae16c890544d0d8
+MD5 (gkrellmms-2.0.tar.gz) = 637d06fb6af566309a84a620838dc0c2
diff --git a/audio/gkrellmms2/files/patch-aa b/audio/gkrellmms2/files/patch-aa
index d9c0fded1a21..91614ae32acb 100644
--- a/audio/gkrellmms2/files/patch-aa
+++ b/audio/gkrellmms2/files/patch-aa
@@ -1,26 +1,28 @@
Index: Makefile
diff -u Makefile.orig Makefile
---- Makefile.orig Sun Jan 21 05:28:38 2001
-+++ Makefile Mon Feb 5 19:01:26 2001
-@@ -3,29 +3,29 @@
+--- Makefile.orig Mon Aug 26 18:11:28 2002
++++ Makefile Sat Aug 31 00:06:01 2002
+@@ -3,25 +3,24 @@
# You may want to rename the binary-file.
BIN_FILENAME = gkrellmms
--GTK_INCLUDE = `gtk-config --cflags`
--GTK_LIB = `gtk-config --libs`
-+GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
-+GTK_LIB = `$(GTK_CONFIG) --libs gthread`
- IMLIB_INCLUDE = `imlib-config --cflags-gdk`
- IMLIB_LIB = `imlib-config --libs-gdk`
- XMMS_INCLUDE = `xmms-config --cflags`
- XMMS_LIB = `xmms-config --libs`
+-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`
+ IMLIB_INCLUDE ?=
+ IMLIB_LIB ?=
+ XMMS_INCLUDE ?= `xmms-config --cflags`
+ XMMS_LIB ?= `xmms-config --libs`
+ PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
-+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
++CFLAGS = -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)
-LFLAGS = -shared -lpthread
-
--CC = gcc $(CFLAGS) $(FLAGS)
+-CC ?= gcc
+-CC += $(CFLAGS) $(FLAGS)
+LFLAGS = -shared
OBJS = gkrellmms.o options.o playlist.o
@@ -33,10 +35,3 @@ diff -u Makefile.orig Makefile
clean:
rm -f *.o core *.so* *.bak *~
-
- install:
-- install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins
-+ install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins
-
- gkrellmms.c.o: gkrellmms.c
- options.c.o: options.c
diff --git a/audio/gkrellmms2/pkg-descr b/audio/gkrellmms2/pkg-descr
index a236c27de607..6458667ede44 100644
--- a/audio/gkrellmms2/pkg-descr
+++ b/audio/gkrellmms2/pkg-descr
@@ -1,5 +1,6 @@
-GKrellM XMMS Plugin
-Author: Sander Klein Lebbink <sander@cerberus.demon.nl>
+GKrellMMS: GKrellM XMMS Plugin
+Orginal Author: Sander Klein Lebbink <sander@cerberus.demon.nl>
+Current Maintainer: Sjoerd Simons <sjoerd@luon.net>
WWW: http://gkrellm.luon.net/gkrellmms.phtml
A plugin for GKrellM, which allows you to control XMMS from within GKrellM.
diff --git a/audio/gkrellmms2/pkg-plist b/audio/gkrellmms2/pkg-plist
index a3ae719f2e8d..0f321a71c5f9 100644
--- a/audio/gkrellmms2/pkg-plist
+++ b/audio/gkrellmms2/pkg-plist
@@ -1 +1 @@
-libexec/gkrellm/plugins/gkrellmms.so
+libexec/gkrellm2/plugins/gkrellmms.so