From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 23 10:30:02 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC1CB1065679 for ; Sat, 23 Jan 2010 10:30:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 644568FC13 for ; Sat, 23 Jan 2010 10:30:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id o0NAU2oq016623 for ; Sat, 23 Jan 2010 10:30:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id o0NAU2dH016622; Sat, 23 Jan 2010 10:30:02 GMT (envelope-from gnats) Resent-Date: Sat, 23 Jan 2010 10:30:02 GMT Resent-Message-Id: <201001231030.o0NAU2dH016622@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Giorgos Keramidas Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 305AD1065679; Sat, 23 Jan 2010 10:23:52 +0000 (UTC) (envelope-from keramida@ceid.upatras.gr) Received: from poseidon.ceid.upatras.gr (poseidon.ceid.upatras.gr [150.140.141.169]) by mx1.freebsd.org (Postfix) with ESMTP id 9D52B8FC12; Sat, 23 Jan 2010 10:23:51 +0000 (UTC) Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 91D9CEB49EA; Sat, 23 Jan 2010 12:23:50 +0200 (EET) Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 546E1160CDC; Sat, 23 Jan 2010 12:23:50 +0200 (EET) Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EUIGPi2KsbrJ; Sat, 23 Jan 2010 12:23:50 +0200 (EET) Received: from kobe.laptop (ppp-94-64-229-101.home.otenet.gr [94.64.229.101]) by mail.ceid.upatras.gr (Postfix) with ESMTP id E028B160CD5; Sat, 23 Jan 2010 12:23:49 +0200 (EET) Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id o0NANnBd053801 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 23 Jan 2010 12:23:49 +0200 (EET) (envelope-from keramida@kobe.laptop) Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id o0NANmxe053800; Sat, 23 Jan 2010 12:23:48 +0200 (EET) (envelope-from keramida) Message-Id: <201001231023.o0NANmxe053800@kobe.laptop> Date: Sat, 23 Jan 2010 12:23:48 +0200 (EET) From: Giorgos Keramidas To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: bsam@FreeBSD.org Subject: ports/143113: [PATCH] Unbreak editors/emacs now that utmp.h is gone X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Giorgos Keramidas List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Jan 2010 10:30:02 -0000 >Number: 143113 >Category: ports >Synopsis: [PATCH] Unbreak editors/emacs now that utmp.h is gone >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 23 10:30:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Giorgos Keramidas >Release: FreeBSD 9.0-CURRENT i386 >Organization: >Environment: System: FreeBSD kobe 9.0-CURRENT FreeBSD 9.0-CURRENT #0 hg@c0e6a2ef54a6: Sun Jan 17 01:13:41 EET 2010 build@kobe:/usr/obj/usr/src/sys/KOBE i386 >Description: GNU Emacs includes "utmp.h" but doesn't really need it on FreeBSD, because src/filelock.c works fine with the sysctl interface of "kern.boottime". So make the utmp.h include conditional and check at configure-time if it's missing. >How-To-Repeat: >Fix: --- editors-emacs-utmp.h-check.patch begins here --- diff -r 35d90152f41d -r 4f0380e4dc6e editors/emacs/Makefile --- a/editors/emacs/Makefile Thu Jan 21 19:59:33 2010 +0200 +++ b/editors/emacs/Makefile Sat Jan 23 12:20:24 2010 +0200 @@ -39,6 +39,7 @@ EMACS_VER= 23.1 GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf:262 USE_GMAKE= yes USE_BZIP2= yes diff -r 35d90152f41d -r 4f0380e4dc6e editors/emacs/files/patch-ChangeLog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/editors/emacs/files/patch-ChangeLog Sat Jan 23 12:20:24 2010 +0200 @@ -0,0 +1,11 @@ +--- ChangeLog.orig 2009-07-29 18:10:35.000000000 +0300 ++++ ChangeLog 2010-01-23 11:35:20.591761496 +0200 +@@ -1,3 +1,8 @@ ++2010-01-18 Giorgos Keramidas (tiny change) ++ ++ * configure.in: Check for utmp.h availability, since some ++ systems don't have one (e.g. FreeBSD 9.X and later versions). ++ + 2009-07-29 Chong Yidong + + * Version 23.1 released. diff -r 35d90152f41d -r 4f0380e4dc6e editors/emacs/files/patch-configure.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/editors/emacs/files/patch-configure.in Sat Jan 23 12:20:24 2010 +0200 @@ -0,0 +1,11 @@ +--- configure.in.orig 2009-07-29 18:09:49.000000000 +0300 ++++ configure.in 2010-01-23 11:34:48.296987092 +0200 +@@ -1014,7 +1014,7 @@ + linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \ + termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \ + sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ +- sys/utsname.h pwd.h) ++ sys/utsname.h pwd.h utmp.h) + + AC_MSG_CHECKING(if personality LINUX32 can be set) + AC_TRY_COMPILE([#include ], [personality (PER_LINUX32)], diff -r 35d90152f41d -r 4f0380e4dc6e editors/emacs/files/patch-src-ChangeLog --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/editors/emacs/files/patch-src-ChangeLog Sat Jan 23 12:20:24 2010 +0200 @@ -0,0 +1,12 @@ +--- src/ChangeLog.orig 2009-07-29 19:55:12.000000000 +0300 ++++ src/ChangeLog 2010-01-23 11:35:44.446334596 +0200 +@@ -1,3 +1,9 @@ ++2010-01-18 Giorgos Keramidas (tiny change) ++ ++ * filelock.c: Include utmp.h only when HAVE_UTMP_H is true, ++ since some systems don't have one (e.g. FreeBSD 9.X and later ++ versions). ++ + 2009-07-29 Chong Yidong + + * Version 23.1 released. diff -r 35d90152f41d -r 4f0380e4dc6e editors/emacs/files/patch-src-filelock.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/editors/emacs/files/patch-src-filelock.c Sat Jan 23 12:20:24 2010 +0200 @@ -0,0 +1,12 @@ +--- src/filelock.c.orig 2009-06-21 07:38:14.000000000 +0300 ++++ src/filelock.c 2010-01-23 11:34:48.414989942 +0200 +@@ -62,7 +62,9 @@ + + #ifdef CLASH_DETECTION + ++#ifdef HAVE_UTMP_H + #include ++#endif + + #if !defined (S_ISLNK) && defined (S_IFLNK) + #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK) --- editors-emacs-utmp.h-check.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: