Sat Sep 29 21:33:48 2018 UTC ()
moreutils: fix build on SunOS


(wiedi)
diff -r1.6 -r1.7 pkgsrc/misc/moreutils/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/moreutils/distinfo
diff -r0 -r1.1 pkgsrc/misc/moreutils/patches/patch-sponge.c
cvs diff -r1.6 -r1.7 pkgsrc/misc/moreutils/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/moreutils/Makefile 2018/08/22 09:45:44 1.6
+++ pkgsrc/misc/moreutils/Makefile 2018/09/29 21:33:47 1.7
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2018/08/22 09:45:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.7 2018/09/29 21:33:47 wiedi Exp $
2 2
3DISTNAME= moreutils_0.62.orig 3DISTNAME= moreutils_0.62.orig
4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//} 4PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= misc 6CATEGORIES= misc
7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/moreutils/} 7MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/m/moreutils/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= leot@NetBSD.org 10MAINTAINER= leot@NetBSD.org
11HOMEPAGE= https://joeyh.name/code/moreutils/ 11HOMEPAGE= https://joeyh.name/code/moreutils/
12COMMENT= Additional Unix utilities 12COMMENT= Additional Unix utilities
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 15BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
16BUILD_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 16BUILD_DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
18 18
@@ -20,26 +20,28 @@ DEPENDS+= p5-IPC-Run-[0-9]*:../../devel/ @@ -20,26 +20,28 @@ DEPENDS+= p5-IPC-Run-[0-9]*:../../devel/
20 20
21USE_TOOLS+= gmake pod2man perl:run 21USE_TOOLS+= gmake pod2man perl:run
22WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 22WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
23 23
24USE_LANGUAGES= c99 24USE_LANGUAGES= c99
25 25
26REPLACE_PERL+= chronic 26REPLACE_PERL+= chronic
27REPLACE_PERL+= combine 27REPLACE_PERL+= combine
28REPLACE_PERL+= ts 28REPLACE_PERL+= ts
29REPLACE_PERL+= vidir 29REPLACE_PERL+= vidir
30REPLACE_PERL+= vipe 30REPLACE_PERL+= vipe
31REPLACE_PERL+= zrun 31REPLACE_PERL+= zrun
32 32
 33LDFLAGS.SunOS+= -lsocket -lnsl
 34
33MAKE_ENV+= \ 35MAKE_ENV+= \
34 PREFIX=${PREFIX} \ 36 PREFIX=${PREFIX} \
35 MANDIR=${PREFIX}/${PKGMANDIR} \ 37 MANDIR=${PREFIX}/${PKGMANDIR} \
36 CFLAGS=${CFLAGS:Q} \ 38 CFLAGS=${CFLAGS:Q} \
37 LDFLAGS=${LDFLAGS:Q} \ 39 LDFLAGS=${LDFLAGS:Q} \
38 DOCBOOKXSL=${PREFIX}/share/xsl/docbook \ 40 DOCBOOKXSL=${PREFIX}/share/xsl/docbook \
39 INSTALL_BIN=${INSTALL_PROGRAM:Q} \ 41 INSTALL_BIN=${INSTALL_PROGRAM:Q} \
40 INSTALL_MAN=${INSTALL_MAN:Q} \ 42 INSTALL_MAN=${INSTALL_MAN:Q} \
41 INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 43 INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
42 44
43# Avoid possible conflicts with `parallel' of parallel/parallel 45# Avoid possible conflicts with `parallel' of parallel/parallel
44post-install: 46post-install:
45 ${MV} ${DESTDIR}${PREFIX}/bin/parallel \ 47 ${MV} ${DESTDIR}${PREFIX}/bin/parallel \
cvs diff -r1.3 -r1.4 pkgsrc/misc/moreutils/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/moreutils/distinfo 2018/04/21 17:27:51 1.3
+++ pkgsrc/misc/moreutils/distinfo 2018/09/29 21:33:47 1.4
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.3 2018/04/21 17:27:51 leot Exp $ 1$NetBSD: distinfo,v 1.4 2018/09/29 21:33:47 wiedi Exp $
2 2
3SHA1 (moreutils_0.62.orig.tar.xz) = e1167351127aad1d661b987245e619f737a2fc0c 3SHA1 (moreutils_0.62.orig.tar.xz) = e1167351127aad1d661b987245e619f737a2fc0c
4RMD160 (moreutils_0.62.orig.tar.xz) = 93a42c239443e572c7e1cc7e370882a702272671 4RMD160 (moreutils_0.62.orig.tar.xz) = 93a42c239443e572c7e1cc7e370882a702272671
5SHA512 (moreutils_0.62.orig.tar.xz) = 4d1bd481695f3152d33fbb8a58ca923c70ad0a189df7272082adb8d2ccaf0349a3816b6e0f642b667faa36935e4098ed4d2b40dfd256f84b7d5c48e9ace0bdc2 5SHA512 (moreutils_0.62.orig.tar.xz) = 4d1bd481695f3152d33fbb8a58ca923c70ad0a189df7272082adb8d2ccaf0349a3816b6e0f642b667faa36935e4098ed4d2b40dfd256f84b7d5c48e9ace0bdc2
6Size (moreutils_0.62.orig.tar.xz) = 80364 bytes 6Size (moreutils_0.62.orig.tar.xz) = 80364 bytes
7SHA1 (patch-Makefile) = 80fb38e584db12f344ed66da76c8bee0127d17cc 7SHA1 (patch-Makefile) = 80fb38e584db12f344ed66da76c8bee0127d17cc
8SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62 8SHA1 (patch-ifdata.c) = 5c0d9737657354ad1877f2efc6ff08e76ca7bc62
9SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c 9SHA1 (patch-is__utf8_Makefile) = 8feacdc8a0a0939aefd7f647be8196bdfdbda66c
10SHA1 (patch-pee.c) = 0c2cf167e7038fadd818ea3262686a1b4ed5aa7e 10SHA1 (patch-pee.c) = 0c2cf167e7038fadd818ea3262686a1b4ed5aa7e
 11SHA1 (patch-sponge.c) = 3ba941bcc1d6595c8fb6aa59b1636e86dadfdf32
File Added: pkgsrc/misc/moreutils/patches/patch-sponge.c
$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