Attachment #25388 for bug #43414

View | Details | Raw Unified | Return to bug 43414
Collapse All | Expand All




#

PORTNAME=	gkrellmms
PORTVERSION=	0.5.8
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


Lines 1-2 Link Here

(-)audio/gkrellmms/distinfo (-2 / +1 lines)
1	MD5 (gkrellmms-0.5.5.tar.gz) = 51dcb7e48873ce56632e0f2148360178	1	MD5 (gkrellmms-0.5.8.tar.gz) = c786e5668f5d66e4910b21ff990df9d6
2	MD5 (gkrellmms-patch-0.5.5) = bd27baaeb52792a44ae16c890544d0d8




--- Makefile.orig	Fri Sep 27 13:57:06 2002
+++ Makefile	Fri Sep 27 14:00:49 2002
@@ -3,31 +3,33 @@
+++ Makefile	Mon Feb  5 19:01:26 2001
@@ -3,29 +3,29 @@
 # 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`
 INSTALL_DIR ?= /usr/local/lib/gkrellm/plugins
 
-FLAGS = -O2 -Wall -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)
+LFLAGS = -shared
 
 CC ?= gcc 
 CC += $(CFLAGS) $(FLAGS)
 
 OBJS = gkrellmms.o options.o playlist.o
 
+all:	$(BIN_FILENAME).so

 	rm -f *.o core *.so* *.bak *~
 
 install: 
-	install -c -s -m 755 $(BIN_FILENAME).so $(INSTALL_DIR)
+	install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins
 
 gkrellmms.c.o: gkrellmms.c

Return to bug 43414

Lines 6-17 Link Here

(-)audio/gkrellmms/Makefile (-4 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= gkrellmms	8	PORTNAME= gkrellmms
9	PORTVERSION= 0.5.5	9	PORTVERSION= 0.5.8
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= http://gkrellm.luon.net/files/	11	MASTER_SITES= http://gkrellm.luon.net/files/
12
13	PATCH_SITES= http://web.wt.net/~billw/gkrellm/Plugins/
14	PATCHFILES= gkrellmms-patch-0.5.5
15		12
16	MAINTAINER= ume@FreeBSD.org	13	MAINTAINER= ume@FreeBSD.org
17		14

Lines 1-28 Link Here

(-)audio/gkrellmms/files/patch-aa (-16 / +16 lines)
1	Index: Makefile	1	--- Makefile.orig Fri Sep 27 13:57:06 2002
2	diff -u Makefile.orig Makefile	2	+++ Makefile Fri Sep 27 14:00:49 2002
3	--- Makefile.orig Sun Jan 21 05:28:38 2001	3	@@ -3,31 +3,33 @@
4	+++ Makefile Mon Feb 5 19:01:26 2001
5	@@ -3,29 +3,29 @@
6	# You may want to rename the binary-file.	4	# You may want to rename the binary-file.
7	BIN_FILENAME = gkrellmms	5	BIN_FILENAME = gkrellmms
8		6
9	-GTK_INCLUDE = `gtk-config --cflags`	7	-GTK_INCLUDE ?= `gtk-config --cflags`
10	-GTK_LIB = `gtk-config --libs`	8	-GTK_LIB ?= `gtk-config --libs`
11	+GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`	9	+GTK_INCLUDE ?= `$(GTK_CONFIG) --cflags gthread`
12	+GTK_LIB = `$(GTK_CONFIG) --libs gthread`	10	+GTK_LIB ?= `$(GTK_CONFIG) --libs gthread`
13	IMLIB_INCLUDE = `imlib-config --cflags-gdk`	11	IMLIB_INCLUDE ?= `imlib-config --cflags-gdk`
14	IMLIB_LIB = `imlib-config --libs-gdk`	12	IMLIB_LIB ?= `imlib-config --libs-gdk`
15	XMMS_INCLUDE = `xmms-config --cflags`	13	XMMS_INCLUDE ?= `xmms-config --cflags`
16	XMMS_LIB = `xmms-config --libs`	14	XMMS_LIB ?= `xmms-config --libs`
		15	INSTALL_DIR ?= /usr/local/lib/gkrellm/plugins
17		16
18	-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)	17	-FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
19	+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)	18	+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
20	LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)	19	LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)
21	-LFLAGS = -shared -lpthread	20	-LFLAGS = -shared -lpthread
22	-
23	-CC = gcc $(CFLAGS) $(FLAGS)
24	+LFLAGS = -shared	21	+LFLAGS = -shared
25		22
		23	CC ?= gcc
		24	CC += $(CFLAGS) $(FLAGS)
		25
26	OBJS = gkrellmms.o options.o playlist.o	26	OBJS = gkrellmms.o options.o playlist.o
27		27
28	+all: $(BIN_FILENAME).so	28	+all: $(BIN_FILENAME).so
Lines 35-41 Link Here
35	rm -f .o core .so* .bak ~	35	rm -f .o core .so* .bak ~
36		36
37	install:	37	install:
38	- install -c -s -m 755 $(BIN_FILENAME).so /usr/share/gkrellm/plugins	38	- install -c -s -m 755 $(BIN_FILENAME).so $(INSTALL_DIR)
39	+ install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins	39	+ install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins
40		40
41	gkrellmms.c.o: gkrellmms.c	41	gkrellmms.c.o: gkrellmms.c