Sun Feb 15 16:16:50 2009 UTC ()
Fix LP64, require Perl as it installs a Perl module and add DESTDIR.


(joerg)
diff -r1.7 -r1.8 pkgsrc/net/spreadlogd/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/spreadlogd/distinfo
diff -r0 -r1.1 pkgsrc/net/spreadlogd/patches/patch-ad
diff -r0 -r1.1 pkgsrc/net/spreadlogd/patches/patch-ae
cvs diff -r1.7 -r1.8 pkgsrc/net/spreadlogd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/spreadlogd/Makefile 2008/10/19 19:18:44 1.7
+++ pkgsrc/net/spreadlogd/Makefile 2009/02/15 16:16:50 1.8
@@ -1,40 +1,43 @@ @@ -1,40 +1,43 @@
1# $NetBSD: Makefile,v 1.7 2008/10/19 19:18:44 he Exp $ 1# $NetBSD: Makefile,v 1.8 2009/02/15 16:16:50 joerg Exp $
2# 2#
3 3
4DISTNAME= spreadlogd 4DISTNAME= spreadlogd
5PKGNAME= spreadlogd-2.0.0 5PKGNAME= spreadlogd-2.0.0
6PKGREVISION= 5 6PKGREVISION= 6
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= http://www.backhand.org/mod_log_spread/ 8MASTER_SITES= http://www.backhand.org/mod_log_spread/
9DIST_SUBDIR= ${PKGNAME_NOREV} 9DIST_SUBDIR= ${PKGNAME_NOREV}
10 10
11MAINTAINER= mark@exonetric.com 11MAINTAINER= mark@exonetric.com
12HOMEPAGE= http://www.backhand.org/mod_log_spread/ 12HOMEPAGE= http://www.backhand.org/mod_log_spread/
13COMMENT= Daemon to log to file, messages from spread toolkit clients 13COMMENT= Daemon to log to file, messages from spread toolkit clients
14 14
 15PKG_DESTDIR_SUPPORT= user-destdir
 16
15GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
16USE_TOOLS+= perl yacc 18USE_TOOLS+= perl:run yacc
17WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 19WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
18 20
19RCD_SCRIPTS= spreadlogd 21RCD_SCRIPTS= spreadlogd
20# define the "example" directory for post-install target and for the CONF_FILES 22# define the "example" directory for post-install target and for the CONF_FILES
21# variable used by pkginstall 23# variable used by pkginstall
22EXAMPLEDIR= ${PREFIX}/share/examples/spreadlogd 24EXAMPLEDIR= ${PREFIX}/share/examples/spreadlogd
23 25
24# tell pkginstall where to pluck virgin configuration files from in the case of a new 26# tell pkginstall where to pluck virgin configuration files from in the case of a new
25# install, knowing that the post-install target in *this* Makefile will put the 27# install, knowing that the post-install target in *this* Makefile will put the
26# sample configuration in the example directory for us (as well as creating it) 28# sample configuration in the example directory for us (as well as creating it)
27CONF_FILES+= ${EXAMPLEDIR}/spreadlogd.conf.sample ${PKG_SYSCONFDIR}/spreadlogd.conf 29CONF_FILES+= ${EXAMPLEDIR}/spreadlogd.conf.sample ${PKG_SYSCONFDIR}/spreadlogd.conf
28 30
 31INSTALLATION_DIRS+= ${EXAMPLEDIR}
 32
29# create example directory *and* put the sample configuration file here with the suffix 33# create example directory *and* put the sample configuration file here with the suffix
30# .sample so that pkginstall can drop it in for us. 34# .sample so that pkginstall can drop it in for us.
31post-install: 35post-install:
32 ${INSTALL_DATA_DIR} ${EXAMPLEDIR} 36 ${INSTALL_DATA} ${WRKSRC}/spreadlogd.conf ${DESTDIR}${EXAMPLEDIR}/spreadlogd.conf.sample
33 ${INSTALL_DATA} ${WRKSRC}/spreadlogd.conf ${EXAMPLEDIR}/spreadlogd.conf.sample 
34 37
35BUILDLINK_API_DEPENDS.libevent+=libevent>=1.0c 38BUILDLINK_API_DEPENDS.libevent+=libevent>=1.0c
36 39
37.include "../../net/spread/buildlink3.mk" 40.include "../../net/spread/buildlink3.mk"
38.include "../../devel/libevent/buildlink3.mk" 41.include "../../devel/libevent/buildlink3.mk"
39.include "../../lang/perl5/buildlink3.mk" 42.include "../../lang/perl5/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/spreadlogd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/spreadlogd/distinfo 2007/07/29 06:58:59 1.1.1.1
+++ pkgsrc/net/spreadlogd/distinfo 2009/02/15 16:16:50 1.2
@@ -1,8 +1,10 @@ @@ -1,8 +1,10 @@
1$NetBSD: distinfo,v 1.1.1.1 2007/07/29 06:58:59 obache Exp $ 1$NetBSD: distinfo,v 1.2 2009/02/15 16:16:50 joerg Exp $
2 2
3SHA1 (spreadlogd-2.0.0/spreadlogd.tar.gz) = 4fd88a3b804e4fbd655c822350d3137505120234 3SHA1 (spreadlogd-2.0.0/spreadlogd.tar.gz) = 4fd88a3b804e4fbd655c822350d3137505120234
4RMD160 (spreadlogd-2.0.0/spreadlogd.tar.gz) = 2f70a3a0b6768128b2152321e016d795540a6ada 4RMD160 (spreadlogd-2.0.0/spreadlogd.tar.gz) = 2f70a3a0b6768128b2152321e016d795540a6ada
5Size (spreadlogd-2.0.0/spreadlogd.tar.gz) = 79559 bytes 5Size (spreadlogd-2.0.0/spreadlogd.tar.gz) = 79559 bytes
6SHA1 (patch-aa) = 952d46b24ec2a8bea5335290bc7ba4aedd9f3a7d 6SHA1 (patch-aa) = 952d46b24ec2a8bea5335290bc7ba4aedd9f3a7d
7SHA1 (patch-ab) = c70fd89f4839213969febac0825329acbf61b59a 7SHA1 (patch-ab) = c70fd89f4839213969febac0825329acbf61b59a
8SHA1 (patch-ac) = d38e189fbaceb97f4fffde25ff78a671eb39d4e9 8SHA1 (patch-ac) = d38e189fbaceb97f4fffde25ff78a671eb39d4e9
 9SHA1 (patch-ad) = d3f5437d59910385804f9f2db72a866a21fe5fd8
 10SHA1 (patch-ae) = 2a92fe9e315d012b64839aa6046451556a4e6980
File Added: pkgsrc/net/spreadlogd/patches/patch-ad
$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
File Added: pkgsrc/net/spreadlogd/patches/patch-ae
$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);