summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-12-10 13:59:16 +0000
committerjperkin <jperkin@pkgsrc.org>2013-12-10 13:59:16 +0000
commitb8e26d25338aff49eac8b87bdcbfab79b8161ee4 (patch)
tree3f979b2b2d798a347d3328824fab18adefc6d73b
parent85396f4c3236a8c444a45be79f7997f758548b13 (diff)
downloadpkgsrc-b8e26d25338aff49eac8b87bdcbfab79b8161ee4.tar.gz
Fix build on SunOS. Patches from Sebastian Wiedenroth.
-rw-r--r--net/mping/Makefile4
-rw-r--r--net/mping/distinfo3
-rw-r--r--net/mping/patches/patch-src_mping.c17
3 files changed, 22 insertions, 2 deletions
diff --git a/net/mping/Makefile b/net/mping/Makefile
index 0f009398d4d..c612ccb16bd 100644
--- a/net/mping/Makefile
+++ b/net/mping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/23 17:18:38 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/12/10 13:59:16 jperkin Exp $
DISTNAME= mping-2.01
CATEGORIES= net
@@ -13,6 +13,8 @@ USE_FEATURES+= inet6
INSTALLATION_DIRS= sbin ${PKGMANDIR}/man8
+LDFLAGS.SunOS+= -lsocket -lnsl
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/mping ${DESTDIR}${PREFIX}/sbin/mping
${INSTALL_MAN} ${WRKSRC}/man/mping.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
diff --git a/net/mping/distinfo b/net/mping/distinfo
index 8e06802feaf..7d8b7bf55be 100644
--- a/net/mping/distinfo
+++ b/net/mping/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/07 10:06:26 rillig Exp $
+$NetBSD: distinfo,v 1.2 2013/12/10 13:59:16 jperkin Exp $
SHA1 (mping-2.01.tar.gz) = 2240631825844b8be8492cf53ed832774b062526
RMD160 (mping-2.01.tar.gz) = 3c0030c0d0a47460bb6ffe5c6af2ce508135cb26
Size (mping-2.01.tar.gz) = 159203 bytes
+SHA1 (patch-src_mping.c) = 907dd54cbeb5a6ce4b9e33f766b8cfd0fee76998
diff --git a/net/mping/patches/patch-src_mping.c b/net/mping/patches/patch-src_mping.c
new file mode 100644
index 00000000000..814c48b596d
--- /dev/null
+++ b/net/mping/patches/patch-src_mping.c
@@ -0,0 +1,17 @@
+$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