Wed Jun 30 04:58:30 2010 UTC ()
build fix for a leafy package (plus some beautifying)


(spz)
diff -r1.1 -r1.2 pkgsrc/net/irrd/MESSAGE
diff -r1.42 -r1.43 pkgsrc/net/irrd/Makefile
diff -r1.13 -r1.14 pkgsrc/net/irrd/distinfo
diff -r0 -r1.1 pkgsrc/net/irrd/patches/patch-ak
cvs diff -r1.1 -r1.2 pkgsrc/net/irrd/MESSAGE (expand / switch to unified diff)

--- pkgsrc/net/irrd/MESSAGE 2010/02/23 20:37:05 1.1
+++ pkgsrc/net/irrd/MESSAGE 2010/06/30 04:58:30 1.2
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1=========================================================================== 1===========================================================================
 2$NetBSD: MESSAGE,v 1.2 2010/06/30 04:58:30 spz Exp $
 3===========================================================================
2 4
3The useful user documentation is ${PREFIX}/share/doc/irrd/irrd-user.pdf 5The useful user documentation is ${PREFIX}/share/doc/irrd/irrd-user.pdf
4 or ${PREFIX}/share/doc/irrd/irrd-user.sgml 6 or ${PREFIX}/share/doc/irrd/irrd-user.sgml
5 7
6=========================================================================== 8===========================================================================
cvs diff -r1.42 -r1.43 pkgsrc/net/irrd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/irrd/Makefile 2010/02/23 20:37:05 1.42
+++ pkgsrc/net/irrd/Makefile 2010/06/30 04:58:30 1.43
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: Makefile,v 1.42 2010/02/23 20:37:05 spz Exp $ 1# $NetBSD: Makefile,v 1.43 2010/06/30 04:58:30 spz Exp $
2 2
3DISTNAME= irrd2.3.9 3DISTNAME= irrd2.3.9
4PKGNAME= irrd-2.3.9 4PKGNAME= irrd-2.3.9
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://www.irrd.net/ 6MASTER_SITES= http://www.irrd.net/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= kim@tac.nyc.ny.us 9MAINTAINER= kim@tac.nyc.ny.us
10HOMEPAGE= http://www.irrd.net/ 10HOMEPAGE= http://www.irrd.net/
11COMMENT= Internet Routing Registry Daemon 11COMMENT= Internet Routing Registry Daemon
12LICENSE= original-bsd 12LICENSE= original-bsd
13 13
14MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17DEPENDS+= gnupg-[0-9]*:../../security/gnupg 17DEPENDS+= gnupg-[0-9]*:../../security/gnupg
18DEPENDS+= wget-[0-9]*:../../net/wget 18DEPENDS+= wget-[0-9]*:../../net/wget
19 19
20USE_TOOLS+= automake autoconf flex perl:run yacc 20USE_TOOLS+= automake autoconf flex perl:run yacc
21 21
22WRKSRC= ${WRKDIR}/${DISTNAME}/src 22WRKSRC= ${WRKDIR}/${DISTNAME}/src
23 23
 24BUILD_DEFS+= VARBASE
 25
24PKG_SYSCONFSUBDIR= irrd 26PKG_SYSCONFSUBDIR= irrd
25EGDIR= ${PREFIX}/share/examples/irrd 27EGDIR= ${PREFIX}/share/examples/irrd
26DOCDIR= ${PREFIX}/share/doc/irrd 28DOCDIR= ${PREFIX}/share/doc/irrd
27CONF_FILES+= ${EGDIR}/irrd.conf ${PKG_SYSCONFDIR}/irrd.conf 29CONF_FILES+= ${EGDIR}/irrd.conf ${PKG_SYSCONFDIR}/irrd.conf
28 30
29IRRD_USER= irrd 31IRRD_USER= irrd
30IRRD_GROUP= irrd 32IRRD_GROUP= irrd
31 33
32PKG_GROUPS= ${IRRD_USER} 34PKG_GROUPS= ${IRRD_USER}
33PKG_USERS= ${IRRD_USER:Q}:${IRRD_GROUP:Q} 35PKG_USERS= ${IRRD_USER:Q}:${IRRD_GROUP:Q}
34PKG_GECOS.${IRRD_USER}= IRRd user 36PKG_GECOS.${IRRD_USER}= IRRd user
35RCD_SCRIPTS+= irrd 37RCD_SCRIPTS+= irrd
36 38
cvs diff -r1.13 -r1.14 pkgsrc/net/irrd/distinfo (expand / switch to unified diff)

--- pkgsrc/net/irrd/distinfo 2010/02/23 20:37:05 1.13
+++ pkgsrc/net/irrd/distinfo 2010/06/30 04:58:30 1.14
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.13 2010/02/23 20:37:05 spz Exp $ 1$NetBSD: distinfo,v 1.14 2010/06/30 04:58:30 spz Exp $
2 2
3SHA1 (irrd2.3.9.tgz) = 73281b1f73bfa2267535d70906ff35c266083ec2 3SHA1 (irrd2.3.9.tgz) = 73281b1f73bfa2267535d70906ff35c266083ec2
4RMD160 (irrd2.3.9.tgz) = de212320204cde0d05abf848e952f8f1bf06503d 4RMD160 (irrd2.3.9.tgz) = de212320204cde0d05abf848e952f8f1bf06503d
5Size (irrd2.3.9.tgz) = 777722 bytes 5Size (irrd2.3.9.tgz) = 777722 bytes
6SHA1 (patch-aa) = 5b7c5c9c2183c19b188a98017f526bf71904b1d5 6SHA1 (patch-aa) = 5b7c5c9c2183c19b188a98017f526bf71904b1d5
7SHA1 (patch-ad) = 313a1d44c4623123f7c2a37ff2740887fa32bdb2 7SHA1 (patch-ad) = 313a1d44c4623123f7c2a37ff2740887fa32bdb2
8SHA1 (patch-ae) = c012cd8e34f9b492bc03593b3598de030c04849b 8SHA1 (patch-ae) = c012cd8e34f9b492bc03593b3598de030c04849b
9SHA1 (patch-af) = aa14907291184040f16561e01ecb9775bcecd702 9SHA1 (patch-af) = aa14907291184040f16561e01ecb9775bcecd702
10SHA1 (patch-ag) = 9b23300fcaf1b1a48547fff2501f1e81ba86ed0c 10SHA1 (patch-ag) = 9b23300fcaf1b1a48547fff2501f1e81ba86ed0c
11SHA1 (patch-ah) = 74a5e88dd79385ebb7bb3cb7a3cd6da46d26fd54 11SHA1 (patch-ah) = 74a5e88dd79385ebb7bb3cb7a3cd6da46d26fd54
12SHA1 (patch-ai) = d256698195bc90727c54ddb3f55c14e0e4f0437f 12SHA1 (patch-ai) = d256698195bc90727c54ddb3f55c14e0e4f0437f
13SHA1 (patch-aj) = c357f5da9f127978263b22220ea11e3e650eaaf0 13SHA1 (patch-aj) = c357f5da9f127978263b22220ea11e3e650eaaf0
 14SHA1 (patch-ak) = 93a3d155ad981155c129358d91d1706eb952b65b
File Added: pkgsrc/net/irrd/patches/patch-ak
$NetBSD: patch-ak,v 1.1 2010/06/30 04:58:30 spz Exp $

--- programs/irr_notify/notify_msgs.c.orig	2009-04-20 18:51:16.000000000 +0000
+++ programs/irr_notify/notify_msgs.c
@@ -161,7 +161,7 @@ void maint_request (trace_t *tr, FILE *f
 
 #ifdef HAVE_SENDMAIL
     sprintf (email, "%s < %s", SENDMAIL_CMD, buf);
-#elif HAVE_MAIL
+#elif defined HAVE_MAIL
     sprintf (email, "%s \"%s\" < %s", MAIL_CMD, to_addr, buf);
 #else
     trace (NORM, tr, "No mail or sendmail found\n");
@@ -627,7 +627,7 @@ void send_email (trace_t *tr,  char *add
 /*    chmod (msg_hdl[ndx[i]].fname, S_IRWXO|S_IRGRP|S_IRWXU); */
 #ifdef HAVE_SENDMAIL
       sprintf (buf, "%s < %s", SENDMAIL_CMD, msg_hdl[ndx[i]].fname);
-#elif HAVE_MAIL
+#elif defined HAVE_MAIL
       sprintf (buf, "%s \"%s\" < %s", MAIL_CMD, p, msg_hdl[ndx[i]].fname);
 #else
       trace (NORM, tr, "No mail or sendmail found\n");