From 68071f4728100ea2d3c4c5bc18efb7d60ec96745 Mon Sep 17 00:00:00 2001
From: Hajimu UMEMOTO <ume@FreeBSD.org>
Date: Wed, 21 May 2003 16:24:16 +0000
Subject: fix handling of CFLAGS.

Reported by:	lioux
---
 audio/gkrellmms2/Makefile       |  1 +
 audio/gkrellmms2/files/patch-aa | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'audio')

diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index aeb83130e97a..e68cbcbb3cd2 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkrellmms
 PORTVERSION=	2.1.9
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://gkrellm.luon.net/files/
 
diff --git a/audio/gkrellmms2/files/patch-aa b/audio/gkrellmms2/files/patch-aa
index f5b2a5199536..6d308bde7947 100644
--- a/audio/gkrellmms2/files/patch-aa
+++ b/audio/gkrellmms2/files/patch-aa
@@ -1,7 +1,7 @@
 Index: Makefile
 diff -u Makefile.orig Makefile
---- Makefile.orig	Thu Nov  7 01:52:54 2002
-+++ Makefile	Sat Nov  9 17:11:17 2002
+--- Makefile.orig	Wed Mar 19 20:12:30 2003
++++ Makefile	Wed May 21 13:58:26 2003
 @@ -3,17 +3,17 @@
  # You may want to rename the binary-file.
  BIN_FILENAME = gkrellmms
@@ -17,24 +17,24 @@ diff -u Makefile.orig Makefile
  PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins
  
 -FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
-+CFLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
++FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(XMMS_INCLUDE)
  LIBS = $(GTK_LIB) $(IMLIB_LIB) $(XMMS_LIB)
 -LFLAGS = -shared -lpthread
 +LFLAGS = -shared
  
  LOCALEDIR ?= /usr/share/locale
  ifeq ($(enable_nls),1)
-@@ -24,9 +24,6 @@
+@@ -24,8 +24,7 @@
  FLAGS += -DPACKAGE="\"$(PACKAGE)\"" 
  export PACKAGE LOCALEDIR
  
 -CC ?= gcc 
 -CC += $(CFLAGS) $(FLAGS)
--
++CFLAGS += $(FLAGS)
+ 
  INSTALL = install -c
  INSTALL_PROGRAM = $(INSTALL) -s
- 
-@@ -36,7 +33,7 @@
+@@ -36,7 +35,7 @@
  	(cd po && ${MAKE} all )
  
  $(BIN_FILENAME).so: $(OBJS)
-- 
cgit v1.2.3