ports/182587: Patch for build problems, amd64 compat, minor other updates

[Joe Greco]

>Number:         182587
>Category:       ports
>Synopsis:       Patch for build problems, amd64 compat, minor other updates
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 02 23:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Joe Greco
>Release:        FreeBSD 9.2-RELEASE amd64
>Organization:
sol.net Network Services
>Environment:
>Description:

port directory: /usr/ports/security/tripwire12
building for: FreeBSD 91amd64-default-job-24 9.1-RELEASE FreeBSD 9.1-RELEASE amd64
maintained by: jgreco at ns.sol.net
Log URL: http://beefy2.isc.freebsd.org/bulk/91amd64-default/2013-10-02_14h38m51s/logs/tripwire-1.2_1.log
Build URL: http://beefy2.isc.freebsd.org/bulk/91amd64-default/2013-10-02_14h38m51s


>How-To-Repeat:
>Fix:

diff -rupN tripwire12-old/Makefile tripwire12/Makefile
--- tripwire12-old/Makefile	2013-09-26 19:03:31.000000000 +0000
+++ tripwire12/Makefile	2013-10-02 21:00:09.000000000 +0000
@@ -16,6 +16,7 @@ MAN8=		siggen.8 tripwire.8
 NO_CDROM=	cannot be redistributed for more than the cost of duplication
 NO_PACKAGE=	requires local database to be built
 USE_PERL5_BUILD=yes
+MAKE_JOBS_UNSAFE=yes
 
 TWCONFIG?=	${FILESDIR}/tw.conf.freebsd8
 
@@ -29,7 +30,7 @@ post-patch:
 	    's|bs_ntohl|ntohl|g;s|bs_htonl|htonl|g'
 
 pre-configure:
-	@ ${CP} ${FILESDIR}/conf-freebsd2.h ${WRKSRC}/configs
+	@ ${CP} ${FILESDIR}/conf-freebsd8.h ${WRKSRC}/configs
 	@ ${CP} ${TWCONFIG} ${WRKSRC}/configs/tw.conf.freebsd8
 
 post-install:
diff -rupN tripwire12-old/files/conf-freebsd8.h tripwire12/files/conf-freebsd8.h
--- tripwire12-old/files/conf-freebsd8.h	1970-01-01 00:00:00.000000000 +0000
+++ tripwire12/files/conf-freebsd8.h	2013-10-02 21:15:15.000000000 +0000
@@ -0,0 +1,57 @@
+/* $FreeBSD$ */
+
+/*
+ * conf-freebsd8.h
+ *
+ *	Tripwire configuration file
+ *
+ * Joe Greco
+ * sol.net Network Services
+ * Derived from the other BSD config.h's
+ */
+
+/***
+ *** Operating System specifics
+ ***	
+ ***	If the answer to a question in the comment is "Yes", then
+ ***	change the corresponding "#undef" to a "#define"
+ ***/
+
+/*
+ * is your OS a System V derivitive?  if so, what version?
+ *			(e.g., define SYSV 4)
+ */
+
+#undef SYSV
+
+/* 
+ * does your system have a <malloc.h> like System V? 
+ */
+
+#undef MALLOCH 	
+
+/* 
+ * does your system have a <stdlib.h> like POSIX says you should? 
+ */
+
+#define STDLIBH
+
+/*
+ * does your system use readdir(3) that returns (struct dirent *)?
+ */
+
+#define DIRENT
+
+/*
+ * is #include <string.h> ok?  (as opposed to <strings.h>)
+ */
+
+#define STRINGH
+ 
+/* 
+ * does your system have gethostname(2) (instead of uname(2))?
+ */
+
+#define GETHOSTNAME
+
+#define	TW_TYPE32	int
diff -rupN tripwire12-old/files/patch-aa tripwire12/files/patch-aa
--- tripwire12-old/files/patch-aa	2013-09-26 19:03:31.000000000 +0000
+++ tripwire12/files/patch-aa	2013-10-02 20:59:12.000000000 +0000
@@ -13,7 +13,7 @@
    ***	file that corresponds with your operating system.
    ***/
   
-! #include "../configs/conf-freebsd2.h"
+! #include "../configs/conf-freebsd8.h"
   
   #ifdef TW_TYPE32
   typedef TW_TYPE32 int32;
diff -rupN tripwire12-old/files/tw.conf.freebsd8 tripwire12/files/tw.conf.freebsd8
--- tripwire12-old/files/tw.conf.freebsd8	2013-09-26 19:03:31.000000000 +0000
+++ tripwire12/files/tw.conf.freebsd8	2013-10-02 21:27:40.000000000 +0000
@@ -82,7 +82,6 @@
 /.forward	R	# may not exist
 
 # Unix itself
-/kernel		R
 /boot		R
 /boot.config	R
 
@@ -115,10 +114,6 @@
 # /libexec
 /libexec		R-2
 
-# /lkm and /modules
-/lkm			R-2
-/modules		R-2
-
 # /boot
 /boot			R-2
 
>Release-Note:
>Audit-Trail:
>Unformatted: