From a79aa69c18650016b968860cd9b5327c46c43596 Mon Sep 17 00:00:00 2001 From: jschauma Date: Tue, 11 Oct 2005 02:03:18 +0000 Subject: Somehow the last commit only got Makefile. Commit missing bits: Make this build and install under IRIX. To do this, we patch one file to get the proper include (not quite what's suggested in PR pkg/31273, but based on it), add the proper library to link against and simply ignore the fact that we don't have nroff (and thus don't install pre-formatted manual pages). --- sysutils/findutils/distinfo | 4 ++-- sysutils/findutils/patches/patch-aa | 4 ++-- sysutils/findutils/patches/patch-ac | 4 ++-- sysutils/findutils/patches/patch-ad | 4 ++-- sysutils/findutils/patches/patch-ag | 17 ++++++++++++++--- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/sysutils/findutils/distinfo b/sysutils/findutils/distinfo index b1e85c3ecd0..75e6a56f81d 100644 --- a/sysutils/findutils/distinfo +++ b/sysutils/findutils/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2005/07/29 12:35:07 wiz Exp $ +$NetBSD: distinfo,v 1.10 2005/10/11 02:03:18 jschauma Exp $ SHA1 (findutils-4.1.tar.gz) = b91cd03ca4c9659b3e5d40e841c64bfd2e7f25d8 RMD160 (findutils-4.1.tar.gz) = b66c0aa2e72d378e8c3cb9968ceb68d9138af874 @@ -9,7 +9,7 @@ SHA1 (patch-ac) = 2443dab53a9bc738cdb16e46b5aa7893ee7c13aa SHA1 (patch-ad) = 4f28e677b099e60b0097b0f7358dc4c51f07e1aa SHA1 (patch-ae) = db0debddba28d04954cf96c72e197408c9e6c3ad SHA1 (patch-af) = 0ae11b085ebe08d49a13fb1c1211fdb938391f5b -SHA1 (patch-ag) = 95de4d7f28c223e2218a258e3df8823af14e1f0e +SHA1 (patch-ag) = 17216ad95a59ba9bdcc8e52f0a99f05d263a9ba3 SHA1 (patch-ah) = 64ccdeebbb70694d45d16c41a4137bbe125df23b SHA1 (patch-ai) = 59c8872a9cef3bb94e35c7eb97a9878bcdb11c51 SHA1 (patch-aj) = 5fd1d20f75fafa01063982e2ef49f123d4cb4c7d diff --git a/sysutils/findutils/patches/patch-aa b/sysutils/findutils/patches/patch-aa index bb320ef9055..38522744e7f 100644 --- a/sysutils/findutils/patches/patch-aa +++ b/sysutils/findutils/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2002/10/22 11:35:40 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2005/10/11 02:03:18 jschauma Exp $ --- locate/Makefile.in.orig Sat Nov 5 15:44:08 1994 +++ locate/Makefile.in @@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/22 11:35:40 wiz Exp $ - echo formatting $$man as $$cdir/$$inst; \ - $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ + echo formatting $$man as $$cdir/$$inst0; \ -+ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \ ++ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0 || true; \ fi; \ done diff --git a/sysutils/findutils/patches/patch-ac b/sysutils/findutils/patches/patch-ac index 28aece041a7..106fc349ee4 100644 --- a/sysutils/findutils/patches/patch-ac +++ b/sysutils/findutils/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2002/10/22 11:35:40 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2005/10/11 02:03:18 jschauma Exp $ --- find/Makefile.in.orig Sat Nov 5 15:43:52 1994 +++ find/Makefile.in @@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1 2002/10/22 11:35:40 wiz Exp $ - echo formatting $$man as $$cdir/$$inst; \ - $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ + echo formatting $$man as $$cdir/$$inst0; \ -+ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \ ++ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0 || true; \ fi; \ done diff --git a/sysutils/findutils/patches/patch-ad b/sysutils/findutils/patches/patch-ad index ec26455e350..270c9623b24 100644 --- a/sysutils/findutils/patches/patch-ad +++ b/sysutils/findutils/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1 2002/10/22 11:35:40 wiz Exp $ +$NetBSD: patch-ad,v 1.2 2005/10/11 02:03:18 jschauma Exp $ --- xargs/Makefile.in.orig Sat Nov 5 15:44:18 1994 +++ xargs/Makefile.in @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.1 2002/10/22 11:35:40 wiz Exp $ - echo formatting $$man as $$cdir/$$inst; \ - $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst; \ + echo formatting $$man as $$cdir/$$inst0; \ -+ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0; \ ++ $(NROFF) -man $(srcdir)/$$man > $$cdir/$$inst0 || true; \ fi; \ done diff --git a/sysutils/findutils/patches/patch-ag b/sysutils/findutils/patches/patch-ag index 84a8e76f57c..8828a522b55 100644 --- a/sysutils/findutils/patches/patch-ag +++ b/sysutils/findutils/patches/patch-ag @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.2 2005/06/19 10:44:45 hira Exp $ +$NetBSD: patch-ag,v 1.3 2005/10/11 02:03:18 jschauma Exp $ ---- find/pred.c Wed Nov 2 15:59:23 1994 -+++ find/pred.c Tue May 2 15:38:51 2000 +--- find/pred.c.orig Mon Oct 10 21:13:02 2005 ++++ find/pred.c Mon Oct 10 21:14:52 2005 @@ -15,6 +15,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -11,3 +11,14 @@ $NetBSD: patch-ag,v 1.2 2005/06/19 10:44:45 hira Exp $ #include #include #include +@@ -26,6 +28,10 @@ + #include "defs.h" + #include "modetype.h" + #include "wait.h" ++ ++#ifdef __sgi ++#include ++#endif + + #if !defined(SIGCHLD) && defined(SIGCLD) + #define SIGCHLD SIGCLD -- cgit v1.2.3