aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authorpgollucci <pgollucci@FreeBSD.org>2010-02-02 15:03:11 +0800
committerpgollucci <pgollucci@FreeBSD.org>2010-02-02 15:03:11 +0800
commit4bf26d3726aa438cff8eaefdea10fb0d9384060f (patch)
tree65d764fef9c90b5a2c1cefb30e2320503d289885 /editors
parentd4606dbb6f489f3e39e033461c121b309606fd15 (diff)
downloadfreebsd-ports-gnome-4bf26d3726aa438cff8eaefdea10fb0d9384060f.tar.gz
freebsd-ports-gnome-4bf26d3726aa438cff8eaefdea10fb0d9384060f.tar.zst
freebsd-ports-gnome-4bf26d3726aa438cff8eaefdea10fb0d9384060f.zip
- fix utmp.h -> utmpx.h
fixes are included in upstream e-mail so this is temporary PR: ports/143113 Submitted by: Giorgos Keramidas <keramida@freebsd.org> (maintainer)
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs/Makefile2
-rw-r--r--editors/emacs/files/patch-ChangeLog11
-rw-r--r--editors/emacs/files/patch-configure.in11
-rw-r--r--editors/emacs/files/patch-src-ChangeLog12
-rw-r--r--editors/emacs/files/patch-src-filelock.c12
-rw-r--r--editors/emacs23/Makefile2
-rw-r--r--editors/emacs23/files/patch-ChangeLog11
-rw-r--r--editors/emacs23/files/patch-configure.in11
-rw-r--r--editors/emacs23/files/patch-src-ChangeLog12
-rw-r--r--editors/emacs23/files/patch-src-filelock.c12
10 files changed, 96 insertions, 0 deletions
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 <keramida@ceid.upatras.gr> (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 <cyd@stupidchicken.com>
+
+ * 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 <sys/personality.h>], [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 <keramida@ceid.upatras.gr> (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 <cyd@stupidchicken.com>
+
+ * 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 <utmp.h>
++#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 <keramida@ceid.upatras.gr> (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 <cyd@stupidchicken.com>
+
+ * 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 <sys/personality.h>], [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 <keramida@ceid.upatras.gr> (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 <cyd@stupidchicken.com>
+
+ * 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 <utmp.h>
++#endif
+
+ #if !defined (S_ISLNK) && defined (S_IFLNK)
+ #define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)