From 8df8f793ec3f4fee2bc77ce42806e8090d44894b Mon Sep 17 00:00:00 2001 From: agc Date: Tue, 13 Jul 2004 14:24:32 +0000 Subject: Pullup ticket 54 to the pkgsrc-2004Q2 branch, requested by Lubomir Sedlacik Solaris build fix for archivers/afio Module Name: pkgsrc Committed By: salo Date: Sat Jul 10 15:35:52 UTC 2004 Modified Files: pkgsrc/archivers/afio: distinfo Added Files: pkgsrc/archivers/afio/patches: patch-ab Log Message: Fix the Solaris check. SunPro doesn't define neither sun, nor __svr4__. Fixes compilation on Solaris with SunPro compiler. --- archivers/afio/distinfo | 3 ++- archivers/afio/patches/patch-ab | 13 +++++++++++++ doc/CHANGES-pkgsrc-2004Q2 | 4 +++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 archivers/afio/patches/patch-ab diff --git a/archivers/afio/distinfo b/archivers/afio/distinfo index 5449945362b..b189dd606a6 100644 --- a/archivers/afio/distinfo +++ b/archivers/afio/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2004/04/11 23:04:50 minskim Exp $ +$NetBSD: distinfo,v 1.2.2.1 2004/07/13 14:24:32 agc Exp $ SHA1 (afio-2.5.tgz) = 051765f209fded60f94944da8a76ae37c3423a23 Size (afio-2.5.tgz) = 179184 bytes SHA1 (patch-aa) = e35b47c2f10a6f80d8446e4c22a7a023dae55933 +SHA1 (patch-ab) = 234d24918c5d152b6c013e82d5e43a4471cc65de diff --git a/archivers/afio/patches/patch-ab b/archivers/afio/patches/patch-ab new file mode 100644 index 00000000000..47b17fbb407 --- /dev/null +++ b/archivers/afio/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1.2.2 2004/07/13 14:24:32 agc Exp $ + +--- compfile.c.orig Tue Jun 24 23:32:20 2003 ++++ compfile.c Sat Jul 10 17:26:02 2004 +@@ -210,7 +210,7 @@ + * version; + */ + +-#if ( defined(sun) && defined(__svr4__) ) ++#if ( defined(__sun) && defined(__SVR4) ) + #include + #else + #include diff --git a/doc/CHANGES-pkgsrc-2004Q2 b/doc/CHANGES-pkgsrc-2004Q2 index d05db8b17d2..f1cc592a296 100644 --- a/doc/CHANGES-pkgsrc-2004Q2 +++ b/doc/CHANGES-pkgsrc-2004Q2 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.20 2004/07/13 14:12:03 agc Exp $ +$NetBSD: CHANGES-pkgsrc-2004Q2,v 1.1.2.21 2004/07/13 14:24:32 agc Exp $ Changes to the packages collection and infrastructure on the pkgsrc-2004Q2 branch: @@ -36,3 +36,5 @@ Pullup ticket 52, requested by Grant Beattie [agc 2004-07-13] Solaris netpbm build fix Pullup ticket 53, requested by Lubomir Sedlacik [agc 2004-07-13] Solaris arj build fix +Pullup ticket 54, requested by Lubomir Sedlacik [agc 2004-07-13] + Solaris afio build fix -- cgit v1.2.3