summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiedi <wiedi@pkgsrc.org>2018-09-29 21:33:47 +0000
committerwiedi <wiedi@pkgsrc.org>2018-09-29 21:33:47 +0000
commitfa0ba5cee8fdb3308cd0b705180d6354c3b2b8f4 (patch)
tree27fdbb282e50c77517e2eed3da0ef906206673e3 /misc
parent02003d0fb9466feec9d34a08a577d31ee84065d8 (diff)
downloadpkgsrc-fa0ba5cee8fdb3308cd0b705180d6354c3b2b8f4.tar.gz
moreutils: fix build on SunOS
Diffstat (limited to 'misc')
-rw-r--r--misc/moreutils/Makefile6
-rw-r--r--misc/moreutils/distinfo3
-rw-r--r--misc/moreutils/patches/patch-sponge.c17
3 files changed, 23 insertions, 3 deletions
diff --git a/misc/moreutils/Makefile b/misc/moreutils/Makefile
index aad69710a9d..81fe1a3fad8 100644
--- a/misc/moreutils/Makefile
+++ b/misc/moreutils/Makefile
@@ -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} \
diff --git a/misc/moreutils/distinfo b/misc/moreutils/distinfo
index d074a42674b..55e297cd685 100644
--- a/misc/moreutils/distinfo
+++ b/misc/moreutils/distinfo
@@ -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) = 80fb38e584db12f344ed66da76c8bee0127d17cc
SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c
SHA1 (patch-pee.c) = 0c2cf167e7038fadd818ea3262686a1b4ed5aa7e
+SHA1 (patch-sponge.c) = 3ba941bcc1d6595c8fb6aa59b1636e86dadfdf32
diff --git a/misc/moreutils/patches/patch-sponge.c b/misc/moreutils/patches/patch-sponge.c
new file mode 100644
index 00000000000..e8b3074dca0
--- /dev/null
+++ b/misc/moreutils/patches/patch-sponge.c
@@ -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