summaryrefslogtreecommitdiff
path: root/security/tripwire/patches
diff options
context:
space:
mode:
authorgrant <grant>2004-02-08 13:36:20 +0000
committergrant <grant>2004-02-08 13:36:20 +0000
commit7b9bf098810cf6c661098a95aaca4d2a89d90181 (patch)
tree8094196206f124117a39d0a60154f464a920a618 /security/tripwire/patches
parent6a92248c2bb836ad3b7e1faf9be7a71f33d31f0a (diff)
downloadpkgsrc-7b9bf098810cf6c661098a95aaca4d2a89d90181.tar.gz
don't override variables which pkgsrc already sets in MAKE_ENV.
fixes build on Solaris.
Diffstat (limited to 'security/tripwire/patches')
-rw-r--r--security/tripwire/patches/patch-aa48
1 files changed, 29 insertions, 19 deletions
diff --git a/security/tripwire/patches/patch-aa b/security/tripwire/patches/patch-aa
index 3999011d58c..32977f4b989 100644
--- a/security/tripwire/patches/patch-aa
+++ b/security/tripwire/patches/patch-aa
@@ -1,9 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/05/31 04:10:32 ross Exp $
+$NetBSD: patch-aa,v 1.4 2004/02/08 13:36:20 grant Exp $
-Miscellaneous Makefile settings.
-
---- Makefile 1994/07/25 15:59:41 1.16
-+++ Makefile 1998/11/17 13:44:39
+--- Makefile.orig 1994-07-26 01:59:41.000000000 +1000
++++ Makefile
@@ -12,10 +12,10 @@
###
@@ -17,27 +15,39 @@ Miscellaneous Makefile settings.
# system utilities
LEX = lex
-@@ -32,8 +32,8 @@
+@@ -32,11 +32,11 @@ SHELL = /bin/sh
#SHELL = /bin/bash # For the GNU fanatics
# you can use ANSI C if you like, but K&R is equally fine.
-CC = cc # common
--#CC = gcc # also common
+#CC = cc # common
-+CC = gcc # also common
+ #CC = gcc # also common
#CC = /usr/ccs/bin/cc # Pyramid DC/OSx (SVR4)
- CFLAGS = -O # common
-@@ -48,7 +48,7 @@
- #CFLAGS = -systype bsd43 # ETA/10 (SVR3)
- #CFLAGS = -systype bsd43 # MIPS RISC/OS 4.5x
- #CFLAGS = -O -ansi # gnu CC
--#CFLAGS = -O -ansi -W -Wreturn-type -Wswitch -Wshadow # gnu CC w/all warnings
-+CFLAGS = -O -ansi -W -Wreturn-type -Wswitch -Wshadow -DTW_TYPE32='int'
- #CFLAGS = -OG # Pyramid OSx
- #CFLAGS = -O -Kold # Pyramid DC/OSx (SVR4)
- #CFLAGS = -DTW_TYPE32='int' # DEC OSF/1 Alpha (or any other architecture
-@@ -77,7 +77,7 @@
+-CFLAGS = -O # common
++#CFLAGS = -O # common
+ #CFLAGS = -g # common
+ #CFLAGS = -g # debugging
+ #CFLAGS = -O -cckr # SGI
+@@ -55,7 +55,7 @@ CFLAGS = -O # common
+ # where int [but not long] is a 32 bit quantity)
+
+ # a C preprocessor (to build inode.h)
+-CPP = $(CC) -E # common
++#CPP = $(CC) -E # common
+ #CPP = /usr/lib/cpp # on older systems
+ #CPP = /lib/cpp # on older systems
+
+@@ -67,7 +67,7 @@ LDFLAGS= # common
+ #LDFLAGS= -dn # Pyramid DC/OSx (SVR4)
+
+ # libraries
+-LIBS = # common
++#LIBS = # common
+ #LIBS = -lsocket # SCO
+ #LIBS = -lmalloc -lsun -lc_s # IRIX 4.0
+ #LIBS = -lx # Xenix
+@@ -77,7 +77,7 @@ LIBS = # common
# If you don't have the install command, you need to replace
# the use of it later in the makefile with a cp and chmod