diff options
| author | joerg <joerg@pkgsrc.org> | 2006-05-13 13:28:27 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-05-13 13:28:27 +0000 |
| commit | 596a228be8c768b33e2dc1fddf5a748835ae64d1 (patch) | |
| tree | d028081f3a03bed801c39c35912c341f693ef2a2 /x11/xgrk | |
| parent | 4f9ab57b6bd63594863677e2959d1b28297d33c2 (diff) | |
| download | pkgsrc-596a228be8c768b33e2dc1fddf5a748835ae64d1.tar.gz | |
Honour CFLAGS and LDFLAGS.
Diffstat (limited to 'x11/xgrk')
| -rw-r--r-- | x11/xgrk/distinfo | 4 | ||||
| -rw-r--r-- | x11/xgrk/patches/patch-aa | 49 |
2 files changed, 41 insertions, 12 deletions
diff --git a/x11/xgrk/distinfo b/x11/xgrk/distinfo index 98d7d3598cc..6a66517909a 100644 --- a/x11/xgrk/distinfo +++ b/x11/xgrk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2006/04/10 13:48:31 is Exp $ +$NetBSD: distinfo,v 1.3 2006/05/13 13:28:27 joerg Exp $ SHA1 (xgrk-1.6.3.tar.gz) = 0cfe79190225d1cf3e5489c7674b4294d793d14b RMD160 (xgrk-1.6.3.tar.gz) = 70c6f41f29f04ccac5662544cfb45e10dbc5eb7c Size (xgrk-1.6.3.tar.gz) = 25039 bytes -SHA1 (patch-aa) = 3907d6e476576390cae8d3bfd1b49a0b5b853419 +SHA1 (patch-aa) = a0031b6ddda14c9b9803c2e2b18df7a5fdf17f3b SHA1 (patch-ab) = 493d021068e09cdce68d9bfa99f2738950663650 diff --git a/x11/xgrk/patches/patch-aa b/x11/xgrk/patches/patch-aa index 73f314e9c3f..a90e87c38b5 100644 --- a/x11/xgrk/patches/patch-aa +++ b/x11/xgrk/patches/patch-aa @@ -1,16 +1,45 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/04/04 09:33:36 is Exp $ +$NetBSD: patch-aa,v 1.2 2006/05/13 13:28:27 joerg Exp $ ---- Makefile.orig 2004-02-02 13:01:14.000000000 +0100 +--- Makefile.orig 2004-02-02 12:01:14.000000000 +0000 +++ Makefile -@@ -24,6 +24,11 @@ LIBS=-L/usr/X11R6/lib - INCL=-I/usr/X11R6/include - endif +@@ -1,38 +1,17 @@ + ## (GNU) Makefile for xgrk + ## -+ifeq ($(ARCH),NetBSD) -+LIBS=-L/usr/X11R6/lib -R/usr/X11R6/lib -+INCL=-I/usr/X11R6/include -+endif -+ +-CC=gcc + ARCH := $(shell uname -s) +-CFLAGS=-O3 -s #-Wall + LFLAGS=-lX11 -lXpm +-#DEFS=-DNOXPM +- +-ifeq ($(ARCH),Linux) +-LIBS=-L/usr/X11R6/lib +-INCL= +-endif +- +-ifeq ($(ARCH),FreeBSD) +-LIBS=-L/usr/X11R6/lib +-INCL=-I/usr/X11R6/include +-endif +- +-ifeq ($(ARCH),Darwin) +-LIBS=-L/usr/X11R6/lib +-INCL=-I/usr/X11R6/include +-endif +- +- +- all: xgrk xgrk2 + + xgrk: xgrk.c xgrk.h +- $(CC) $(CFLAGS) xgrk.c -o xgrk $(INCL) $(LIBS) $(LFLAGS) $(DEFS) ++ $(CC) $(LDFLAGS) $(CFLAGS) xgrk.c -o xgrk $(INCL) $(LIBS) $(LFLAGS) $(DEFS) + + xgrk2: xgrk.c xgrk2.h +- $(CC) $(CFLAGS) xgrk.c -o xgrk2 $(INCL) $(LIBS) $(LFLAGS) $(DEFS)\ ++ $(CC) $(LDFLAGS) $(CFLAGS) xgrk.c -o xgrk2 $(INCL) $(LIBS) $(LFLAGS) $(DEFS)\ + -Dalth + + clean: |