From 4bf26d3726aa438cff8eaefdea10fb0d9384060f Mon Sep 17 00:00:00 2001 From: pgollucci Date: Tue, 2 Feb 2010 07:03:11 +0000 Subject: - fix utmp.h -> utmpx.h fixes are included in upstream e-mail so this is temporary PR: ports/143113 Submitted by: Giorgos Keramidas (maintainer) --- editors/emacs/Makefile | 2 ++ editors/emacs/files/patch-ChangeLog | 11 +++++++++++ editors/emacs/files/patch-configure.in | 11 +++++++++++ editors/emacs/files/patch-src-ChangeLog | 12 ++++++++++++ editors/emacs/files/patch-src-filelock.c | 12 ++++++++++++ editors/emacs23/Makefile | 2 ++ editors/emacs23/files/patch-ChangeLog | 11 +++++++++++ editors/emacs23/files/patch-configure.in | 11 +++++++++++ editors/emacs23/files/patch-src-ChangeLog | 12 ++++++++++++ editors/emacs23/files/patch-src-filelock.c | 12 ++++++++++++ 10 files changed, 96 insertions(+) create mode 100644 editors/emacs/files/patch-ChangeLog create mode 100644 editors/emacs/files/patch-configure.in create mode 100644 editors/emacs/files/patch-src-ChangeLog create mode 100644 editors/emacs/files/patch-src-filelock.c create mode 100644 editors/emacs23/files/patch-ChangeLog create mode 100644 editors/emacs23/files/patch-configure.in create mode 100644 editors/emacs23/files/patch-src-ChangeLog create mode 100644 editors/emacs23/files/patch-src-filelock.c (limited to 'editors') diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 223d344f4c42..4705b7a6918f 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -39,6 +40,7 @@ INSTALLS_ICONS= yes EMACS_VER= 23.1 GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf:262 USE_GMAKE= yes USE_BZIP2= yes diff --git a/editors/emacs/files/patch-ChangeLog b/editors/emacs/files/patch-ChangeLog new file mode 100644 index 000000000000..4fc2beae5610 --- /dev/null +++ b/editors/emacs/files/patch-ChangeLog @@ -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 --git a/editors/emacs/files/patch-configure.in b/editors/emacs/files/patch-configure.in new file mode 100644 index 000000000000..14cb6ddd95fc --- /dev/null +++ b/editors/emacs/files/patch-configure.in @@ -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 --git a/editors/emacs/files/patch-src-ChangeLog b/editors/emacs/files/patch-src-ChangeLog new file mode 100644 index 000000000000..3aa0d6117851 --- /dev/null +++ b/editors/emacs/files/patch-src-ChangeLog @@ -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 --git a/editors/emacs/files/patch-src-filelock.c b/editors/emacs/files/patch-src-filelock.c new file mode 100644 index 000000000000..7f8b0d0d4b59 --- /dev/null +++ b/editors/emacs/files/patch-src-filelock.c @@ -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) diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 223d344f4c42..4705b7a6918f 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} @@ -39,6 +40,7 @@ INSTALLS_ICONS= yes EMACS_VER= 23.1 GNU_CONFIGURE= yes +USE_AUTOTOOLS= autoconf:262 USE_GMAKE= yes USE_BZIP2= yes diff --git a/editors/emacs23/files/patch-ChangeLog b/editors/emacs23/files/patch-ChangeLog new file mode 100644 index 000000000000..4fc2beae5610 --- /dev/null +++ b/editors/emacs23/files/patch-ChangeLog @@ -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 --git a/editors/emacs23/files/patch-configure.in b/editors/emacs23/files/patch-configure.in new file mode 100644 index 000000000000..14cb6ddd95fc --- /dev/null +++ b/editors/emacs23/files/patch-configure.in @@ -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 --git a/editors/emacs23/files/patch-src-ChangeLog b/editors/emacs23/files/patch-src-ChangeLog new file mode 100644 index 000000000000..3aa0d6117851 --- /dev/null +++ b/editors/emacs23/files/patch-src-ChangeLog @@ -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 --git a/editors/emacs23/files/patch-src-filelock.c b/editors/emacs23/files/patch-src-filelock.c new file mode 100644 index 000000000000..7f8b0d0d4b59 --- /dev/null +++ b/editors/emacs23/files/patch-src-filelock.c @@ -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) -- cgit =e127cf2f03a87283f703b70f81a3e1891e56e7f5'>- Fix trailing whitespace in pkg-descrs, categories [a-f]*amdmi32016-05-191-1/+1 * - Convert ports from benchmarks/ and biology/ to new USES=pythonmva2014-10-191-3/+2 * Update the default version of GCC in the Ports Collection from GCC 4.7.4gerald2014-09-111-0/+1 * - Update to 0.5.2wen2014-04-062-4/+5 * Update the default version of GCC used in the Ports Collection fromgerald2014-03-111-1/+1 * - Convert to PYDISTUTILS_AUTOPLISTmiwi2014-01-312-25/+3 * Python cleanup:rene2014-01-141-1/+1 * Update to libmpc version 1.0.1 which brings the following fixes:gerald2013-10-261-0/+1 * - Update to 0.5.1wen2013-10-043-4/+4 * Add NO_STAGE all over the place in preparation for the staging support (cat: ...bapt2013-09-201-0/+1 * - Trim Makefile headerswen2013-06-011-5/+1 * - Update to 0.4.5wen2012-02-232-3/+3 * - Update to 0.44wen2011-10-132-4/+4 * - Update to 0.4.3wen2011-06-022-3/+3 * - Update to 0.4.2wen2011-04-132-3/+3 * - Update to 0.4.1wen2010-12-022-4/+3 * - Update to 0.4.0wen2010-10-262-4/+4 * - Update USE_PYTHON in Makefile to reflect upstream Pythonglarkin2010-08-181-1/+1 * - Update to 0.3.9wen2010-03-192-4/+4 * - Update to 0.3.7wen2009-12-242-4/+4 * - Update to 0.3.5wen2009-12-212-4/+4 * - Update to 0.3.4wen2009-12-162-4/+4 * - Update to 0.3.3wen2009-12-063-7/+7