From 945f562437156bf1ddab7843c386449b366e2a76 Mon Sep 17 00:00:00 2001
From: branch-fixup <branch-fixup>
Date: Fri, 12 Dec 2008 01:10:54 +0000
Subject: [PATCH] Add files from parent branch HEAD: 
 security/tripwire/distinfo 	security/tripwire/patches/patch-aa

---
 security/tripwire/distinfo         | 16 ++++++++
 security/tripwire/patches/patch-aa | 65 ++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 security/tripwire/distinfo
 create mode 100644 security/tripwire/patches/patch-aa

diff --git a/security/tripwire/distinfo b/security/tripwire/distinfo
new file mode 100644
index 000000000000..ec9fcab22c25
--- /dev/null
+++ b/security/tripwire/distinfo
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.12 2008/10/03 17:42:29 joerg Exp $
+
+SHA1 (tripwire-1.2.tar.gz) = 6fc91e25b3e1af3881fd5b6acf240ab6c1133e38
+RMD160 (tripwire-1.2.tar.gz) = f745db5973f14b1abbc0c2e7030f90e6fdac3257
+Size (tripwire-1.2.tar.gz) = 299831 bytes
+SHA1 (patch-aa) = e131fff1f7d3e5c589a4d1f6eb9bf4da4a5b970b
+SHA1 (patch-ab) = 78a8e7050b51c05f94273581ffed8f56c89387ad
+SHA1 (patch-ac) = 35b3fe52f497e6cbbf7edfeaee398f0d24aff219
+SHA1 (patch-ad) = 4b8ad8d0cd7c17a8f3a655c5a574856670533ea5
+SHA1 (patch-ae) = 6eb1767af3d881ed4181ab83bd02c960edd0a84e
+SHA1 (patch-af) = 1e4eb327ddda18ef08d4b62ca846262dfdf059a6
+SHA1 (patch-ag) = 3bfc6965782d727b6b5cf20da4dd44e45327925f
+SHA1 (patch-ah) = 97eccc44190e165dbf174f04c3acab5f1b442bc7
+SHA1 (patch-ai) = c01404b4036d8607c0eea294d2c87d7f454e9abe
+SHA1 (patch-aj) = 87a7df6f487339cf06ec662492db4fc238674488
+SHA1 (patch-ak) = f97dbba31eec398322384ec72c75ba6698d55718
diff --git a/security/tripwire/patches/patch-aa b/security/tripwire/patches/patch-aa
new file mode 100644
index 000000000000..54106b4642ba
--- /dev/null
+++ b/security/tripwire/patches/patch-aa
@@ -0,0 +1,65 @@
+$NetBSD: patch-aa,v 1.5 2008/10/03 17:42:29 joerg Exp $
+
+--- Makefile.orig	1994-07-26 00:59:41.000000000 +0900
++++ Makefile
+@@ -12,7 +12,7 @@
+ ###
+ 
+ # destination directory for final executables
+-DESTDIR = /secureplace/bin
++DESTDIR? =
+ 
+ # destination for man pages
+ MANDIR  = /usr/man
+@@ -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     = cc			# common
+ #CC     = gcc			# also common
+ #CC	= /usr/ccs/bin/cc	# Pyramid DC/OSx (SVR4)
+ 
+-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
+-INSTALL= /usr/bin/install	# common
++#INSTALL= /usr/bin/install	# common
+ #INSTALL= /usr/ucb/install	# Pyramid DC/OSx (SVR4)
+ #INSTALL= /etc/install		# Pyramid OSx
+ #INSTALL= /bin/cp		# no install
+@@ -103,8 +103,8 @@ all:
+ 		YACC="$(YACC)" LEX="$(LEX)" all)
+ 
+ install: all
+-	(cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR) install)
+-	(cd man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install)
++	(cd src; make INSTALL=$(INSTALL) DESTDIR=$(DESTDIR)${PREFIX}/sbin install)
++	(cd man; make INSTALL=$(INSTALL) MANDIR=$(DESTDIR)$(PREFIX)/${PKGMANDIR} install)
+ 
+ test:	all
+ 	(cd tests; make HOSTNAME=$(HOSTNAME) DIST=$(DIST) SHELL=$(SHELL) \
-- 
2.41.0