From e324d453aac98cf9a175c6ff0e37782c7262fe2f Mon Sep 17 00:00:00 2001 From: jmc Date: Thu, 24 Jul 2003 06:40:54 +0000 Subject: Various patches to make this work with rpcgen that exports _rpcsvcdirty incorrectly --- ham/hamlib/Makefile | 4 +++- ham/hamlib/distinfo | 4 +++- ham/hamlib/patches/patch-ac | 18 ++++++++++++++++++ ham/hamlib/patches/patch-ad | 17 +++++++++++++++++ 4 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 ham/hamlib/patches/patch-ac create mode 100644 ham/hamlib/patches/patch-ad (limited to 'ham/hamlib') diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile index 9a97ad5c05f..57ffb9912f9 100644 --- a/ham/hamlib/Makefile +++ b/ham/hamlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 21:43:28 grant Exp $ +# $NetBSD: Makefile,v 1.3 2003/07/24 06:40:54 jmc Exp $ # DISTNAME= hamlib-1.1.4 @@ -14,4 +14,6 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes LIBTOOL_OVERRIDE=${WRKSRC}/libtool +CONFIGURE_ENV+= CPP="${CPP}" + .include "../../mk/bsd.pkg.mk" diff --git a/ham/hamlib/distinfo b/ham/hamlib/distinfo index daf0514529f..7db9aa6553f 100644 --- a/ham/hamlib/distinfo +++ b/ham/hamlib/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/06/26 22:42:21 wulf Exp $ +$NetBSD: distinfo,v 1.2 2003/07/24 06:40:54 jmc Exp $ SHA1 (hamlib-1.1.4.tar.gz) = da9184d78c97cf6a9f290a0f439ae46feabb1d82 Size (hamlib-1.1.4.tar.gz) = 1246501 bytes SHA1 (patch-aa) = 4f36fc87cf71213c142d6504afef64155a5b7d50 SHA1 (patch-ab) = f689591ff1be703929af03cec6b513d6bfa328d4 +SHA1 (patch-ac) = e4e9497186d5d8803a0fdb9993ec8ef664836abc +SHA1 (patch-ad) = d94a0b7eaed4130a9513431bbadb4274429ad313 diff --git a/ham/hamlib/patches/patch-ac b/ham/hamlib/patches/patch-ac new file mode 100644 index 00000000000..1a5bbe37163 --- /dev/null +++ b/ham/hamlib/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.1 2003/07/24 06:40:55 jmc Exp $ + +--- rpcrig/rpcrigd.c.orig Mon Dec 16 22:06:54 2002 ++++ rpcrig/rpcrigd.c Thu Jul 24 00:55:52 2003 +@@ -45,7 +45,12 @@ + + #include + +- ++#ifdef __NetBSD__ ++#include ++#if (__NetBSD_Version__ < 106210000) ++int _rpcsvcdirty; ++#endif ++#endif + + /* + * Prototypes diff --git a/ham/hamlib/patches/patch-ad b/ham/hamlib/patches/patch-ad new file mode 100644 index 00000000000..adbabde68f0 --- /dev/null +++ b/ham/hamlib/patches/patch-ad @@ -0,0 +1,17 @@ +$NetBSD: patch-ad,v 1.1 2003/07/24 06:40:55 jmc Exp $ + +--- rpcrot/rpcrotd.c.orig Thu Jul 24 01:04:54 2003 ++++ rpcrot/rpcrotd.c Thu Jul 24 01:05:25 2003 +@@ -45,6 +45,12 @@ + + #include + ++#ifdef __NetBSD__ ++#include ++#if (__NetBSD_Version__ < 106210000) ++int _rpcsvcdirty; ++#endif ++#endif + + /* + * Prototypes -- cgit v1.2.3