[pkgsrc/trunk]: pkgsrc/sysutils/tree Made CFLAGS and LDFLAGS overridable thro...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2c14f8ceab8
branches:  trunk
changeset: 534625:f2c14f8ceab8
user:      heinz <heinz%pkgsrc.org@localhost>
date:      Sun Oct 28 10:10:09 2007 +0000

description:
Made CFLAGS and LDFLAGS overridable through the pkgsrc Makefile.
Proposed by Christian Hattemer in PR pkg/37190.

diffstat:

 sysutils/tree/Makefile         |   4 +++-
 sysutils/tree/distinfo         |   4 ++--
 sysutils/tree/patches/patch-ab |  24 +++++++++++++++++++++---
 3 files changed, 26 insertions(+), 6 deletions(-)

diffs (72 lines):

diff -r 12e85d097415 -r f2c14f8ceab8 sysutils/tree/Makefile
--- a/sysutils/tree/Makefile    Sun Oct 28 07:30:38 2007 +0000
+++ b/sysutils/tree/Makefile    Sun Oct 28 10:10:09 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/10/25 08:51:30 heinz Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/28 10:10:09 heinz Exp $
 #
 
 DISTNAME=      tree-1.5.1.1
@@ -14,6 +14,8 @@
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 MAKE_FLAGS+=           PREFIX=${PREFIX:Q}
+MAKE_FLAGS+=           CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=           LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=           MANSUBDIR=${PKGMANDIR:Q}
 MAKE_FLAGS+=           INSTALL_PROGRAM_DIR=${INSTALL_PROGRAM_DIR:Q}
 MAKE_FLAGS+=           INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
diff -r 12e85d097415 -r f2c14f8ceab8 sysutils/tree/distinfo
--- a/sysutils/tree/distinfo    Sun Oct 28 07:30:38 2007 +0000
+++ b/sysutils/tree/distinfo    Sun Oct 28 10:10:09 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2007/10/25 08:51:30 heinz Exp $
+$NetBSD: distinfo,v 1.4 2007/10/28 10:10:09 heinz Exp $
 
 SHA1 (tree-1.5.1.1.tgz) = ca4145bf1d2957ff3f4e6af0f64ce92d102fd356
 RMD160 (tree-1.5.1.1.tgz) = 7cc78b7a0103a7f81ec40c2c5e1ff2399fd7bb20
 Size (tree-1.5.1.1.tgz) = 30792 bytes
 SHA1 (patch-aa) = 999de75f82c27034da470e28067c6b2956f3d231
-SHA1 (patch-ab) = 7105d8effd9313a15886a85371f6870eb66b32c3
+SHA1 (patch-ab) = 3d2ac13f762bccc0bd45990b3f2aae64b2e12669
diff -r 12e85d097415 -r f2c14f8ceab8 sysutils/tree/patches/patch-ab
--- a/sysutils/tree/patches/patch-ab    Sun Oct 28 07:30:38 2007 +0000
+++ b/sysutils/tree/patches/patch-ab    Sun Oct 28 10:10:09 2007 +0000
@@ -1,8 +1,18 @@
-$NetBSD: patch-ab,v 1.2 2007/10/25 08:51:30 heinz Exp $
+$NetBSD: patch-ab,v 1.3 2007/10/28 10:10:10 heinz Exp $
 
 --- Makefile.orig      2007-06-11 15:22:47.000000000 +0200
 +++ Makefile
-@@ -38,13 +38,18 @@ LDFLAGS=-s
+@@ -8,7 +8,8 @@
+ 
+ CC=gcc
+ #CFLAGS=-ggdb -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CFLAGS=-O2 -Wall -fomit-frame-pointer -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CDEFS=-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS=-O2 -Wall -fomit-frame-pointer
+ LDFLAGS=-s
+ 
+ # Uncomment for FreeBSD:
+@@ -38,13 +39,18 @@ LDFLAGS=-s
  #CFLAGS=-02 -Wall -fomit-frame-pointer -Zomf -Zsmall-conv
  #LDFLAGS=-s -Zomf -Zsmall-conv
  
@@ -24,7 +34,15 @@
  
  all:  tree
  
-@@ -59,12 +64,12 @@ clean:
+@@ -52,6 +58,7 @@ tree:        tree.o
+       $(CC) $(LDFLAGS) -o $(TREE_DEST) tree.o
+ 
+ tree.o:       tree.c
++      $(CC) -c $(CFLAGS) $(CDEFS) -o $@ $<
+ 
+ clean:
+       if [ -x $(TREE_DEST) ]; then rm $(TREE_DEST); fi
+@@ -59,12 +66,12 @@ clean:
        rm -f *~
  
  install: