Fix LP64, require Perl as it installs a Perl module and add DESTDIR.

4 files changed, 55 insertions, 6 deletions

diff --git a/net/spreadlogd/Makefile b/net/spreadlogd/Makefile
index 5c61e927490..89bdde6498e 100644
--- a/net/spreadlogd/Makefile
+++ b/net/spreadlogd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2008/10/19 19:18:44 he Exp $
+# $NetBSD: Makefile,v 1.8 2009/02/15 16:16:50 joerg Exp $
 #
 
 DISTNAME=	spreadlogd
 PKGNAME=	spreadlogd-2.0.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://www.backhand.org/mod_log_spread/
 DIST_SUBDIR=	${PKGNAME_NOREV}
@@ -12,8 +12,10 @@ MAINTAINER=	mark@exonetric.com
 HOMEPAGE=	http://www.backhand.org/mod_log_spread/
 COMMENT=	Daemon to log to file, messages from spread toolkit clients
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	perl yacc
+USE_TOOLS+=	perl:run yacc
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 RCD_SCRIPTS=	spreadlogd
@@ -26,11 +28,12 @@ EXAMPLEDIR=	${PREFIX}/share/examples/spreadlogd
 # sample configuration in the example directory for us (as well as creating it)
 CONF_FILES+=	${EXAMPLEDIR}/spreadlogd.conf.sample ${PKG_SYSCONFDIR}/spreadlogd.conf
 
+INSTALLATION_DIRS+=	${EXAMPLEDIR}
+
 # create example directory *and* put the sample configuration file here with the suffix
 # .sample so that pkginstall can drop it in for us.
 post-install:
-	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKSRC}/spreadlogd.conf ${EXAMPLEDIR}/spreadlogd.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/spreadlogd.conf ${DESTDIR}${EXAMPLEDIR}/spreadlogd.conf.sample
 
 BUILDLINK_API_DEPENDS.libevent+=libevent>=1.0c
 
diff --git a/net/spreadlogd/distinfo b/net/spreadlogd/distinfo
index dc5f39770eb..bc55fdcc899 100644
--- a/net/spreadlogd/distinfo
+++ b/net/spreadlogd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/29 06:58:59 obache Exp $
+$NetBSD: distinfo,v 1.2 2009/02/15 16:16:50 joerg Exp $
 
 SHA1 (spreadlogd-2.0.0/spreadlogd.tar.gz) = 4fd88a3b804e4fbd655c822350d3137505120234
 RMD160 (spreadlogd-2.0.0/spreadlogd.tar.gz) = 2f70a3a0b6768128b2152321e016d795540a6ada
@@ -6,3 +6,5 @@ Size (spreadlogd-2.0.0/spreadlogd.tar.gz) = 79559 bytes
 SHA1 (patch-aa) = 952d46b24ec2a8bea5335290bc7ba4aedd9f3a7d
 SHA1 (patch-ab) = c70fd89f4839213969febac0825329acbf61b59a
 SHA1 (patch-ac) = d38e189fbaceb97f4fffde25ff78a671eb39d4e9
+SHA1 (patch-ad) = d3f5437d59910385804f9f2db72a866a21fe5fd8
+SHA1 (patch-ae) = 2a92fe9e315d012b64839aa6046451556a4e6980
diff --git a/net/spreadlogd/patches/patch-ad b/net/spreadlogd/patches/patch-ad
new file mode 100644
index 00000000000..774d46ec119
--- /dev/null
+++ b/net/spreadlogd/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2009/02/15 16:16:50 joerg Exp $
+
+--- nethelp.h.orig	2006-05-05 19:50:18.000000000 +0200
++++ nethelp.h
+@@ -26,20 +26,4 @@ int tcp_listen_on(const char *addr, unsi
+ int tcp_dispatch(const char *addr, unsigned short port, int backlog, int mask,
+                  void (*dispatch)(int, short, void *), void *userdata);
+ 
+-
+-#if BYTE_ORDER == BIG_ENDIAN
+-static inline unsigned long long bswap64(unsigned long long _x) {
+-  return _x;
+-}
+-#elif BYTE_ORDER == LITTLE_ENDIAN
+-static inline unsigned long long bswap64(unsigned long long _x) {
+-  return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
+-    ((_x >> 8) & 0xff000000) |
+-    ((_x << 8) & ((unsigned long long)0xff << 32)) |
+-    ((_x << 24) & ((unsigned long long)0xff << 40)) |
+-    ((_x << 40) & ((unsigned long long)0xff << 48)) | ((_x << 56)));
+-}
+-#else
+-#error Unsupported byte order
+-#endif
+ #endif
diff --git a/net/spreadlogd/patches/patch-ae b/net/spreadlogd/patches/patch-ae
new file mode 100644
index 00000000000..7951a757340
--- /dev/null
+++ b/net/spreadlogd/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2009/02/15 16:16:50 joerg Exp $
+
+--- perl.h.orig	2006-05-05 19:50:18.000000000 +0200
++++ perl.h
+@@ -1,11 +1,11 @@
+ #ifndef __PERL_H_
+ #define __PERL_H_
+ 
++#include <EXTERN.h>
++#include <perl.h>
++
+ void perl_startup();
+ void perl_shutdown();
+-#ifndef I32
+-#define I32 int
+-#endif
+ I32 perl_inc(char *path);
+ I32 perl_use(char *module);
+ I32 perl_log(char *func, char *sender, char *group, char *message);