Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1538256828100060"
MIME-Version: 1.0
Date: Sat, 29 Sep 2018 21:33:48 +0000
From: "Sebastian Wiedenroth" <wiedi@netbsd.org>
Subject: CVS commit: pkgsrc/misc/moreutils
To: pkgsrc-changes@NetBSD.org
Reply-To: wiedi@netbsd.org
Message-Id: <20180929213348.23F5AFBEE@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1538256828100060
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiedi
Date:		Sat Sep 29 21:33:48 UTC 2018

Modified Files:
	pkgsrc/misc/moreutils: Makefile distinfo
Added Files:
	pkgsrc/misc/moreutils/patches: patch-sponge.c

Log Message:
moreutils: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/moreutils/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/moreutils/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/moreutils/patches/patch-sponge.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1538256828100060
Content-Disposition: inline
Content-Length: 2264
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/misc/moreutils/Makefile
diff -u pkgsrc/misc/moreutils/Makefile:1.6 pkgsrc/misc/moreutils/Makefile:1.7
--- pkgsrc/misc/moreutils/Makefile:1.6	Wed Aug 22 09:45:44 2018
+++ pkgsrc/misc/moreutils/Makefile	Sat Sep 29 21:33:47 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2018/08/22 09:45:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2018/09/29 21:33:47 wiedi Exp $
 
 DISTNAME=	moreutils_0.62.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/m/moreutils/}
 EXTRACT_SUFX=	.tar.xz
@@ -30,6 +30,8 @@ REPLACE_PERL+=	vidir
 REPLACE_PERL+=	vipe
 REPLACE_PERL+=	zrun
 
+LDFLAGS.SunOS+=	-lsocket -lnsl
+
 MAKE_ENV+=	\
 	PREFIX=${PREFIX} \
 	MANDIR=${PREFIX}/${PKGMANDIR} \

Index: pkgsrc/misc/moreutils/distinfo
diff -u pkgsrc/misc/moreutils/distinfo:1.3 pkgsrc/misc/moreutils/distinfo:1.4
--- pkgsrc/misc/moreutils/distinfo:1.3	Sat Apr 21 17:27:51 2018
+++ pkgsrc/misc/moreutils/distinfo	Sat Sep 29 21:33:47 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/04/21 17:27:51 leot Exp $
+$NetBSD: distinfo,v 1.4 2018/09/29 21:33:47 wiedi Exp $
 
 SHA1 (moreutils_0.62.orig.tar.xz) = e1167351127aad1d661b987245e619f737a2fc0c
 RMD160 (moreutils_0.62.orig.tar.xz) = 93a42c239443e572c7e1cc7e370882a702272671
@@ -8,3 +8,4 @@ SHA1 (patch-Makefile) = 80fb38e584db12f3
 SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
 SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c
 SHA1 (patch-pee.c) = 0c2cf167e7038fadd818ea3262686a1b4ed5aa7e
+SHA1 (patch-sponge.c) = 3ba941bcc1d6595c8fb6aa59b1636e86dadfdf32

Added files:

Index: pkgsrc/misc/moreutils/patches/patch-sponge.c
diff -u /dev/null pkgsrc/misc/moreutils/patches/patch-sponge.c:1.1
--- /dev/null	Sat Sep 29 21:33:48 2018
+++ pkgsrc/misc/moreutils/patches/patch-sponge.c	Sat Sep 29 21:33:47 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-sponge.c,v 1.1 2018/09/29 21:33:47 wiedi Exp $
+
+Need MAX() on SunOS
+
+--- sponge.c.orig	2017-12-31 16:02:11.000000000 +0000
++++ sponge.c
+@@ -36,6 +36,10 @@
+ #include <signal.h>
+ #include <getopt.h>
+ 
++#if !defined(MAX)
++#define MAX(a, b) ((a) > (b) ? (a) : (b))
++#endif
++
+ #include "physmem.c"
+ 
+ #define BUFF_SIZE           8192


--_----------=_1538256828100060--