From owner-freebsd-ports Fri Apr 9 15: 6: 8 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 21F9E16B1A for ; Fri, 9 Apr 1999 14:42:37 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id OAA33542; Fri, 9 Apr 1999 14:40:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Date: Fri, 9 Apr 1999 14:40:04 -0700 (PDT) Message-Id: <199904092140.OAA33542@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: Peter Jeremy Subject: Re: ports/10783: ELF emacs 19.34 hangs under X windows Reply-To: Peter Jeremy Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/10783; it has been noted by GNATS. From: Peter Jeremy To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: DDeatherage@bridge.com, asami@FreeBSD.ORG, joelh@gnu.org, ports@FreeBSD.ORG, sprice@hiwaay.net Subject: Re: ports/10783: ELF emacs 19.34 hangs under X windows Date: Sat, 10 Apr 1999 07:20:23 +1000 [Changing the subject line to suit gnats] "Deatherage, David" wrote: > I've found where this problem is coming from. It's in > emacs20.3/src/s/freebsd.h. It sets a macro called BSD_SYSTEM based upon the > version number contained in __FreeBSD__, checking for 1, 2 and 3. Of > course, -current uses 4. I have found that you can check for __FreeBSD__ >= > 3, and it will work, but this feels a bit like a hack. I've never updated a > port, so I can either get some instruction from someone to put in a patch, > or let someone else do it. Thanks David. It's the same problem in the editors/emacs port. I should have thought of something like this when I first saw the problem :-(. The equality tests on __FreeBSD__ are used to define a macro `BSD'. At least in 19.34, the value of this macro is never checked, just its definition, so David's change is adequate. Joel Ray Holveck >I'll make the patch if a committer can get it in. Going thru the proper FreeBSD channels... (Joel might like to see if he can get it integrated into emacs). The fix for 19.34 is a patch file: diff -bur work.old/emacs-19.34/src/s/freebsd.h work/emacs-19.34/src/s/freebsd.h --- work.old/emacs-19.34/src/s/freebsd.h Fri Mar 12 12:18:16 1999 +++ work/emacs-19.34/src/s/freebsd.h Sat Apr 10 06:32:00 1999 @@ -112,7 +112,7 @@ #define BSD 199103 #elif __FreeBSD__ == 2 #define BSD 199306 -#elif __FreeBSD__ == 3 +#elif __FreeBSD__ >= 3 #define BSD 199506 #endif Satoshi (or someone else with the complete ports tree): How about doing a quick search for any other equality checks against __FreeBSD__ or __FreeBSD_version that are biting us. (And maybe keeping the list around so we don't go thru the same thing next year when we move to FreeBSD-5.x) Peter To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message