From owner-freebsd-ports@FreeBSD.ORG Sat Sep 18 23:23:36 2010 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C8D91065672 for ; Sat, 18 Sep 2010 23:23:36 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 916DD8FC1A for ; Sat, 18 Sep 2010 23:23:35 +0000 (UTC) Received: by fxm9 with SMTP id 9so186014fxm.13 for ; Sat, 18 Sep 2010 16:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=VrIGwM8oOrp2zhptj+T8v5UBrZfOrfnImvqxnrTLNag=; b=Ud71RWnaEbOb7ZV9GDrXQ20svvBMgnPOuP5dWGs6vjUyu+VXiOov1br7SehisSh/Wq kEnNIBDRCvPQM2ns1+xqPdp35bSJj1BTQISWRQaw9Alg5O5e+AMQ5/gTxZwykdx6RmUr 3R9yPsJh7vrl9RQbDAd5QmVvRDR721aFhKQaw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=DmG4rYfZ7JnXbU3c9uagej6a1H8KYwE+zk6Jh/Uk0Sh23t3qHRFTNWIPQIy4FWCynv o5HRYS2Luk5afvFPJkPHvLy4hRJ5eHzYTLXMQPEVsvCJCUeOidOfoBemhhQV2nB6Ticb Q/QBgskpqDj7phyjc5bcoW94VjiESVPQdkM10= Received: by 10.223.106.8 with SMTP id v8mr2950387fao.42.1284852214439; Sat, 18 Sep 2010 16:23:34 -0700 (PDT) Received: from localhost ([68.71.46.138]) by mx.google.com with ESMTPS id u8sm2241123fah.12.2010.09.18.16.23.31 (version=SSLv3 cipher=RC4-MD5); Sat, 18 Sep 2010 16:23:33 -0700 (PDT) From: Anonymous To: dlt@mebtel.net References: <20100918190115.GA56265@oriental.arm.org> Date: Sun, 19 Sep 2010 03:23:02 +0400 In-Reply-To: <20100918190115.GA56265@oriental.arm.org> (Derek Tattersall's message of "Sat, 18 Sep 2010 15:01:15 -0400") Message-ID: <868w2y3acp.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain Cc: freebsd-ports@freebsd.org Subject: Re: nmh-1.2 on CURRENT X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Sep 2010 23:23:36 -0000 Derek Tattersall writes: > nmh-1.2 has not been updated for the new utmpx implementation. The > patch is not terribly large. I haven't figured how to conditionally > patch for Current, vs. leaving it alone on other releases. How about using AC_CHECK_HEADERS(utmp.h) + #ifdef HAVE_UTMP_H ? > --- uip/rcvtty.c.orig 2010-09-18 14:23:38.000000000 -0400 > +++ uip/rcvtty.c 2010-09-18 14:27:18.000000000 -0400 > @@ -23,7 +23,7 @@ > #include > #include > > -#include > +#include > > #ifndef HAVE_GETUTENT > # ifndef UTMP_FILE %% @@ -23,7 +23,11 @@ #include #include +#ifdef HAVE_UTMP_H #include +#else +#include +#endif #ifndef HAVE_GETUTENT # ifndef UTMP_FILE %% %% Index: mail/nmh/Makefile =================================================================== RCS file: /a/.cvsup/ports/mail/nmh/Makefile,v retrieving revision 1.47 diff -u -p -r1.47 Makefile --- mail/nmh/Makefile 15 Sep 2010 18:34:44 -0000 1.47 +++ mail/nmh/Makefile 18 Sep 2010 23:16:17 -0000 @@ -63,7 +63,7 @@ COMMENT= A cleaned up MH mailer suite USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:267 +USE_AUTOTOOLS= autoconf:267 autoheader:267 CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \ --sysconfdir=${PREFIX}/etc/nmh .ifdef NMH_EDITOR Index: mail/nmh/files/patch-configure_in =================================================================== RCS file: /a/.cvsup/ports/mail/nmh/files/patch-configure_in,v retrieving revision 1.1 diff -u -p -r1.1 patch-configure_in --- mail/nmh/files/patch-configure_in 23 Feb 2006 04:37:58 -0000 1.1 +++ mail/nmh/files/patch-configure_in 18 Sep 2010 23:16:41 -0000 @@ -10,3 +10,11 @@ diff -ru ./configure.in ../../work-save/ dnl -------------- dnl CHECK FOR NDBM +@@ -807,6 +807,7 @@ + AC_DEFINE(HAVE_TM_GMTOFF) + fi + ++AC_CHECK_HEADERS(utmp.h) + AC_CACHE_CHECK(for ut_type in struct utmp, nmh_cv_struct_utmp_ut_type, + [AC_TRY_COMPILE( + [#include ], %%