diff options
| author | grant <grant> | 2004-02-08 13:36:20 +0000 |
|---|---|---|
| committer | grant <grant> | 2004-02-08 13:36:20 +0000 |
| commit | d202215451fb09cb1cc2098a1362c3efd4ab6997 (patch) | |
| tree | 8094196206f124117a39d0a60154f464a920a618 | |
| parent | 48800756a658c04c4821256d709bed2e64df15cd (diff) | |
| download | pkgsrc-d202215451fb09cb1cc2098a1362c3efd4ab6997.tar.gz | |
don't override variables which pkgsrc already sets in MAKE_ENV.
fixes build on Solaris.
| -rw-r--r-- | security/tripwire/distinfo | 4 | ||||
| -rw-r--r-- | security/tripwire/patches/patch-aa | 48 |
2 files changed, 31 insertions, 21 deletions
diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo index f2d2064c823..7a02550ebc4 100644 --- a/security/tripwire/distinfo +++ b/security/tripwire/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.8 2003/12/09 19:17:37 ben Exp $ +$NetBSD: distinfo,v 1.9 2004/02/08 13:36:20 grant Exp $ SHA1 (tripwire-1.2.tar.gz) = 6fc91e25b3e1af3881fd5b6acf240ab6c1133e38 Size (tripwire-1.2.tar.gz) = 299831 bytes -SHA1 (patch-aa) = 37e41b99fbd437cc62b1446545f963d03e91e819 +SHA1 (patch-aa) = 2a03c5970becef18d0b655cc5e91a1db070111f8 SHA1 (patch-ab) = 186edaa504e6e1a7edadb2168982b9b8a2482bac SHA1 (patch-ac) = 35b3fe52f497e6cbbf7edfeaee398f0d24aff219 SHA1 (patch-ad) = 4b8ad8d0cd7c17a8f3a655c5a574856670533ea5 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 |