Tue Dec 10 13:59:16 2013 UTC ()
Fix build on SunOS.  Patches from Sebastian Wiedenroth.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/net/mping/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/net/mping/distinfo
diff -r0 -r1.1 pkgsrc/net/mping/patches/patch-src_mping.c
cvs diff -r1.6 -r1.7 pkgsrc/net/mping/Makefile (expand / switch to unified diff)

--- pkgsrc/net/mping/Makefile 2012/10/23 17:18:38 1.6
+++ pkgsrc/net/mping/Makefile 2013/12/10 13:59:16 1.7
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:38 asau Exp $ 1# $NetBSD: Makefile,v 1.7 2013/12/10 13:59:16 jperkin Exp $
2 2
3DISTNAME= mping-2.01 3DISTNAME= mping-2.01
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= http://mping.uninett.no/ 5MASTER_SITES= http://mping.uninett.no/
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://mping.uninett.no/ 8HOMEPAGE= http://mping.uninett.no/
9COMMENT= Mping network statistics collector 9COMMENT= Mping network statistics collector
10 10
11GNU_CONFIGURE= yes 11GNU_CONFIGURE= yes
12USE_FEATURES+= inet6 12USE_FEATURES+= inet6
13 13
14INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8 14INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
15 15
 16LDFLAGS.SunOS+= -lsocket -lnsl
 17
16do-install: 18do-install:
17 ${INSTALL_PROGRAM} ${WRKSRC}/src/mping ${DESTDIR}${PREFIX}/sbin/mping 19 ${INSTALL_PROGRAM} ${WRKSRC}/src/mping ${DESTDIR}${PREFIX}/sbin/mping
18 ${INSTALL_MAN} ${WRKSRC}/man/mping.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 20 ${INSTALL_MAN} ${WRKSRC}/man/mping.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
19 21
20.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/net/mping/distinfo (expand / switch to unified diff)

--- pkgsrc/net/mping/distinfo 2006/09/07 10:06:26 1.1.1.1
+++ pkgsrc/net/mping/distinfo 2013/12/10 13:59:16 1.2
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.1.1.1 2006/09/07 10:06:26 rillig Exp $ 1$NetBSD: distinfo,v 1.2 2013/12/10 13:59:16 jperkin Exp $
2 2
3SHA1 (mping-2.01.tar.gz) = 2240631825844b8be8492cf53ed832774b062526 3SHA1 (mping-2.01.tar.gz) = 2240631825844b8be8492cf53ed832774b062526
4RMD160 (mping-2.01.tar.gz) = 3c0030c0d0a47460bb6ffe5c6af2ce508135cb26 4RMD160 (mping-2.01.tar.gz) = 3c0030c0d0a47460bb6ffe5c6af2ce508135cb26
5Size (mping-2.01.tar.gz) = 159203 bytes 5Size (mping-2.01.tar.gz) = 159203 bytes
 6SHA1 (patch-src_mping.c) = 907dd54cbeb5a6ce4b9e33f766b8cfd0fee76998
File Added: pkgsrc/net/mping/patches/patch-src_mping.c
$NetBSD: patch-src_mping.c,v 1.1 2013/12/10 13:59:16 jperkin Exp $

Provide compat MIN()

--- src/mping.c.orig	2004-12-17 01:45:56.000000000 +0000
+++ src/mping.c
@@ -121,6 +121,10 @@ OTHER:
 #define MAXWAIT         10              /* max time to wait for response, sec. */
 #define MAXPACKET       (65536-60-8)    /* max packet size */
 
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+
 /* Various options */
 int options;
 #define F_INTERVAL        0x001