Date: Mon, 13 May 2013 05:14:25 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317995 - in head/editors/emacs22: . files Message-ID: <201305130514.r4D5EPF4049207@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Mon May 13 05:14:24 2013 New Revision: 317995 URL: http://svnweb.freebsd.org/changeset/ports/317995 Log: - Unbreak on FreeBSD 9.x and later Modified: head/editors/emacs22/Makefile head/editors/emacs22/files/patch-src-filelock.c Modified: head/editors/emacs22/Makefile ============================================================================== --- head/editors/emacs22/Makefile Mon May 13 04:27:55 2013 (r317994) +++ head/editors/emacs22/Makefile Mon May 13 05:14:24 2013 (r317995) @@ -3,7 +3,6 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} -PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -68,8 +67,6 @@ LATEST_LINK= emacs22 .if ${ARCH} == "ia64" BROKEN= Emacs 22.X does not currently build on ia64 -.elif ${OSVERSION} >= 900007 -BROKEN= does not build .endif pre-everything:: Modified: head/editors/emacs22/files/patch-src-filelock.c ============================================================================== --- head/editors/emacs22/files/patch-src-filelock.c Mon May 13 04:27:55 2013 (r317994) +++ head/editors/emacs22/files/patch-src-filelock.c Mon May 13 05:14:24 2013 (r317995) @@ -1,5 +1,8 @@ ---- src/filelock.c.org 2008-01-07 23:30:11.000000000 -0500 -+++ src/filelock.c 2010-02-12 17:50:08.000000000 -0500 + +$FreeBSD$ + +--- src/filelock.c.orig ++++ src/filelock.c @@ -64,7 +64,12 @@ #ifdef CLASH_DETECTION @@ -32,3 +35,52 @@ int desc; if (filename) +@@ -272,16 +281,28 @@ + + emacs_close (desc); + ++#if __FreeBSD_version >= 900007 ++ setutxdb (UTXDB_ACTIVE, filename); ++#else + utmpname (filename); ++#endif + } + ++#if __FreeBSD_version >= 900007 ++ setutxent (); ++#else + setutent (); ++#endif + + while (1) + { + /* Find the next reboot record. */ + ut.ut_type = BOOT_TIME; ++#if __FreeBSD_version >= 900007 ++ utp = getutxid (&ut); ++#else + utp = getutid (&ut); ++#endif + if (! utp) + break; + /* Compare reboot times and use the newest one. */ +@@ -293,11 +314,19 @@ + } + /* Advance on element in the file + so that getutid won't repeat the same one. */ ++#if __FreeBSD_version >= 900007 ++ utp = getutxent (); ++#else + utp = getutent (); ++#endif + if (! utp) + break; + } ++#if __FreeBSD_version >= 900007 ++ endutxent(); ++#else + endutent (); ++#endif + } + #endif /* BOOT_TIME */ +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305130514.r4D5EPF4049207>