diff options
| author | joerg <joerg@pkgsrc.org> | 2005-12-28 13:46:07 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-12-28 13:46:07 +0000 |
| commit | cbaf4184d998fc35c1c6647d6ce0a672d5b01ca0 (patch) | |
| tree | e6ab3bd3ea464d3b6b2504ea25bd8d6014280e2b /biology/phylip/patches/patch-aa | |
| parent | e3882f02672411ba102e6e214ee08165a4177abf (diff) | |
| download | pkgsrc-cbaf4184d998fc35c1c6647d6ce0a672d5b01ca0.tar.gz | |
Don't depend on hard-coded /usr/X11R6 and honor CFLAGS. Bump revision.
Diffstat (limited to 'biology/phylip/patches/patch-aa')
| -rw-r--r-- | biology/phylip/patches/patch-aa | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/biology/phylip/patches/patch-aa b/biology/phylip/patches/patch-aa index 2750e4f8290..608ac7ad8c3 100644 --- a/biology/phylip/patches/patch-aa +++ b/biology/phylip/patches/patch-aa @@ -1,13 +1,31 @@ -$NetBSD: patch-aa,v 1.1 2004/08/16 23:58:35 ben Exp $ +$NetBSD: patch-aa,v 1.2 2005/12/28 13:46:07 joerg Exp $ ---- Makefile.orig 2004-08-15 12:23:29.000000000 +0200 -+++ Makefile 2004-08-15 12:24:04.000000000 +0200 -@@ -111,7 +111,7 @@ +--- Makefile.orig 2003-12-23 05:21:14.000000000 +0000 ++++ Makefile +@@ -62,7 +62,7 @@ EXEDIR = ../exe + # + # + #A minimal one +-CFLAGS = ++#CFLAGS = + # + # A basic one for debugging + #CFLAGS = -g +@@ -111,7 +111,7 @@ LIBS = -lm # # For gcc for Linux with X windows development packages installed # or for MacOS X with X windows installed -DLIBS= -L/usr/X11R6/lib/ -lX11 -lXaw -lXt -+DLIBS= -L/usr/X11R6/lib/ -Wl,-rpath,/usr/X11R6/lib -lX11 -lXaw -lXt ++DLIBS= ${X11_LDFLAGS} -lX11 -lXaw -lXt # # ---------------------------------------------------------------------------- # +@@ -119,7 +119,7 @@ DLIBS= -L/usr/X11R6/lib/ -lX11 -lXaw -lX + # ordinary compiles and the tree-drawing programs, CC and DC + # + # This one specifies the "cc" C compiler +-CC = cc $(CFLAGS) ++CC := ${CC} $(CFLAGS) + # + # To use GCC instead, if it is not the compiler that "cc" invokes + #CC = gcc $(CFLAGS) |