[pkgsrc/trunk]: pkgsrc/audio/gtkmserv pass $(CPPFLAGS) and $(LDFLAGS) where a...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ead5162378df
branches:  trunk
changeset: 476486:ead5162378df
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Jun 12 01:20:57 2004 +0000

description:
pass $(CPPFLAGS) and $(LDFLAGS) where appropriate. remove hardcoded
CC=gcc.

diffstat:

 audio/gtkmserv/distinfo         |   4 ++--
 audio/gtkmserv/patches/patch-aa |  27 ++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)

diffs (48 lines):

diff -r 51317ba7a264 -r ead5162378df audio/gtkmserv/distinfo
--- a/audio/gtkmserv/distinfo   Sat Jun 12 01:05:37 2004 +0000
+++ b/audio/gtkmserv/distinfo   Sat Jun 12 01:20:57 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/10/13 12:04:19 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/06/12 01:20:57 grant Exp $
 
 SHA1 (gtkmserv-0.5.2.tar.gz) = 59829ef0c2a438b6f35577effbeaff5ed91ccd0d
 Size (gtkmserv-0.5.2.tar.gz) = 22441 bytes
-SHA1 (patch-aa) = e338fee23f059ff943698f1bc0d924efdd4b630e
+SHA1 (patch-aa) = b9b0b62d0444c5e793ea0f331444b25417e1a882
diff -r 51317ba7a264 -r ead5162378df audio/gtkmserv/patches/patch-aa
--- a/audio/gtkmserv/patches/patch-aa   Sat Jun 12 01:05:37 2004 +0000
+++ b/audio/gtkmserv/patches/patch-aa   Sat Jun 12 01:20:57 2004 +0000
@@ -1,13 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2002/10/13 12:04:20 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/06/12 01:20:57 grant Exp $
 
---- Makefile.in.orig   Tue Jan 30 02:20:31 2001
-+++ Makefile.in        Mon Mar  4 17:25:06 2002
-@@ -1,7 +1,7 @@
+--- Makefile.in.orig   2001-01-30 13:20:31.000000000 +1100
++++ Makefile.in
+@@ -1,4 +1,4 @@
 -CC = gcc -Wall -ggdb
-+CC = gcc -Wall
++# CC = gcc -Wall -ggdb
  LIBS = `gtk-config --libs`
  LIBS_DEBUG = -lefence
  CFLAGS = `gtk-config --cflags`
+@@ -9,11 +9,11 @@ SRCS = main.c  menu.c  mserv.c  on.c  se
+ OBJS = main.o  menu.o  mserv.o  on.o  setup.o  utils.o  window.o  album.o \
+        queue.o
+ .c.o:
+-      $(CC) $(CFLAGS) -c $<
++      $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
  
- SRCS = main.c  menu.c  mserv.c  on.c  setup.c  utils.c  window.c  album.c \
-        queue.c
+ all:  $(OBJS)
+-      $(CC) $(LIBS) -o gtkMserv $(OBJS)
++      $(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o gtkMserv $(OBJS)
+ 
+ clean: 
+       rm *.o
+-      rm core
+\ No newline at end of file
++      rm core