Attachment 25388 Details for Bug 43414 – file.diff

[patch] file.diff

file.diff (text/plain), 2.71 KB, created by Paulius Bulotas on 2002-09-27 13:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulius Bulotas

Created: 2002-09-27 13:30:01 UTC

Size: 2.71 KB

patch

obsolete

>diff -urN audio/gkrellmms/Makefile.orig audio/gkrellmms/Makefile
>--- audio/gkrellmms/Makefile.orig	Sat Aug 31 02:13:06 2002
>+++ audio/gkrellmms/Makefile	Fri Sep 27 14:09:28 2002
>@@ -6,12 +6,9 @@
> #
> 
> PORTNAME=	gkrellmms
>-PORTVERSION=	0.5.5
>+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
> 
>diff -urN audio/gkrellmms/distinfo.orig audio/gkrellmms/distinfo
>--- audio/gkrellmms/distinfo.orig	Fri Feb 22 18:50:24 2002
>+++ audio/gkrellmms/distinfo	Fri Sep 27 14:12:16 2002
>@@ -1,2 +1 @@
>-MD5 (gkrellmms-0.5.5.tar.gz) = 51dcb7e48873ce56632e0f2148360178
>-MD5 (gkrellmms-patch-0.5.5) = bd27baaeb52792a44ae16c890544d0d8
>+MD5 (gkrellmms-0.5.8.tar.gz) = c786e5668f5d66e4910b21ff990df9d6
>diff -urN audio/gkrellmms/files/patch-aa.orig audio/gkrellmms/files/patch-aa
>--- audio/gkrellmms/files/patch-aa.orig	Mon Feb  5 12:17:50 2001
>+++ audio/gkrellmms/files/patch-aa	Fri Sep 27 14:06:07 2002
>@@ -1,28 +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	Fri Sep 27 13:57:06 2002
>++++ Makefile	Fri Sep 27 14:00:49 2002
>+@@ -3,31 +3,33 @@
>  # 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 ?= `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
>@@ -35,7 +35,7 @@
>  	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 $(INSTALL_DIR)
> +	install -c -s -m 755 $(BIN_FILENAME).so $(PREFIX)/libexec/gkrellm/plugins
>  
>  gkrellmms.c.o: gkrellmms.c

Actions: View | Diff

Attachments on bug 43414: 25388