Import of pkgsrc-2015Q1

sysutils/tree/patches/patch-Makefile

@@ -1,19 +1,19 @@
-$NetBSD: patch-Makefile,v 1.3 2013/08/25 14:29:52 richard Exp $
+$NetBSD: patch-Makefile,v 1.4 2014/04/29 07:07:26 wiz Exp $
 
 * Fix build on systems lacking strverscmp.
-* Remove CFLAGS/LDFLAGS passed in as MAKE_FLAGS
+* Use CFLAGS that were passed in
 * Fix DESTDIR.
 
---- Makefile.orig	2011-06-24 14:25:27.000000000 +0000
+--- Makefile.orig	2014-04-18 17:35:39.000000000 +0000
 +++ Makefile
-@@ -31,13 +31,13 @@ OBJS=tree.o unix.o html.o xml.o hash.o c
+@@ -30,14 +30,14 @@ OBJS=tree.o unix.o html.o xml.o json.o h
+ # Uncomment options below for your particular OS:
  
  # Linux defaults:
- #CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS=-s
-+#CFLAGS=-DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+#LDFLAGS=-s
+-CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++#CFLAGS=-ggdb -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ #LDFLAGS=-s
  
  # Uncomment for FreeBSD:
  #CFLAGS=-O2 -Wall -fomit-frame-pointer
@@ -23,7 +23,7 @@ $NetBSD: patch-Makefile,v 1.3 2013/08/25 14:29:52 richard Exp $
  
  # Uncomment for Solaris:
  #CC=cc
-@@ -94,12 +94,12 @@ clean:
+@@ -95,12 +95,12 @@ clean:
  	rm -f *~
  
  install: tree
@@ -32,8 +32,8 @@ $NetBSD: patch-Makefile,v 1.3 2013/08/25 14:29:52 richard Exp $
 +	install -d $(DESTDIR)$(BINDIR)
 +	install -d $(DESTDIR)$(MANDIR)
  	if [ -e $(TREE_DEST) ]; then \
--		install -s $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
-+		install -s $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \
+-		install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
++		install $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST); \
  	fi
 -	install doc/$(MAN) $(MANDIR)/$(MAN)
 +	install doc/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN)