editors/emacs24: Fix DragonFly regression

3 files changed, 214 insertions, 5 deletions

diff --git a/editors/emacs24/distinfo b/editors/emacs24/distinfo
index 58075c9a168..fc89869abc4 100644
--- a/editors/emacs24/distinfo
+++ b/editors/emacs24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2013/03/15 22:45:00 wiz Exp $
+$NetBSD: distinfo,v 1.10 2013/03/22 18:05:09 marino Exp $
 
 SHA1 (emacs-24.3.tar.gz) = 3c672a176df06e20d2661058ad49893f184b4956
 RMD160 (emacs-24.3.tar.gz) = b67e847861002bbb76ae6588ff659408763313cf
 Size (emacs-24.3.tar.gz) = 52543898 bytes
-SHA1 (patch-aa) = 0a7b298996c482f6c736597f66b34c992421e3ce
-SHA1 (patch-ab) = 043e6bb77ef2623424b4142cd137101ab2c8a295
+SHA1 (patch-aa) = 9c1c68344f446b85eba7d3bdc244ffa7c1983b67
+SHA1 (patch-ab) = 1143637a0fdc6ebc9503691f6e90c630c98532d2
 SHA1 (patch-ad) = 2dcb0f4b43c599d0c4af83b5f7e1f2797f96bdac
 SHA1 (patch-ag) = 407d34e97356c2e8bee26f0fd90f116dd194afcb
 SHA1 (patch-lib-careadlinkat.h) = f236d182e609bf7111c70e83e10806a75a220c29
diff --git a/editors/emacs24/patches/patch-aa b/editors/emacs24/patches/patch-aa
index 6a2a49ca957..d84ab3ba356 100644
--- a/editors/emacs24/patches/patch-aa
+++ b/editors/emacs24/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2013/03/15 22:45:00 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2013/03/22 18:05:10 marino Exp $
 
 Add DragonFly
 
@@ -19,6 +19,15 @@ Add DragonFly
  
    ## Silicon Graphics machines
    ## Iris 4D
+@@ -906,7 +914,7 @@ esac
+ 
+ LD_SWITCH_SYSTEM=
+ case "$opsys" in
+-  freebsd)
++  dragonfly|freebsd)
+    ## Let `ld' find image libs and similar things in /usr/local/lib.
+    ## The system compiler, GCC, has apparently been modified to not
+    ## look there, contrary to what a stock GCC would do.
 @@ -992,7 +1000,7 @@ case "$opsys" in
    ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
    aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
@@ -69,3 +78,98 @@ Add DragonFly
    netbsd | openbsd )
      if test -f $CRT_DIR/crti.o; then
  
+@@ -2834,7 +2869,7 @@ mail_lock=no
+ case "$opsys" in
+   aix4-2) mail_lock="lockf" ;;
+ 
+-  gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
++  gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
+ 
+   ## On GNU/Linux systems, both methods are used by various mail programs.
+   ## I assume most people are using newer mailers that have heard of flock.
+@@ -2988,6 +3023,11 @@ case "$opsys" in
+   ##  option to use it.
+   darwin) LIBS_TERMCAP="-lncurses" ;;
+ 
++  dragonfly)
++    TERMINFO=yes
++    LIBS_TERMCAP="-lncurses"
++    ;;
++
+   gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;;
+ 
+   freebsd)
+@@ -3439,7 +3479,7 @@ case $opsys in
+ esac
+ 
+ case $opsys in
+-  darwin | freebsd | netbsd | openbsd )
++  darwin | dragonfly | freebsd | netbsd | openbsd )
+     AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to
+       close a pty to make it a controlling terminal (it is already a
+       controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).])
+@@ -3545,7 +3585,7 @@ case $opsys in
+     AC_DEFINE(FIRST_PTY_LETTER, ['p'])
+     ;;
+ 
+-  gnu-linux | gnu-kfreebsd | freebsd | netbsd )
++  gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
+     dnl if HAVE_GRANTPT
+     if test "x$ac_cv_func_grantpt" = xyes; then
+       AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.])
+@@ -3628,7 +3668,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Mak
+ case $opsys in
+   dnl Perry Smith <pedz@ddivt1.austin.ibm.com> says this is correct for AIX.
+   dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX.
+-  aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
++  aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
+     AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1)
+     ;;
+ 
+@@ -3725,6 +3765,10 @@ else                            dnl !ema
+       AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->_p - (FILE)->_bf._base)])
+       ;;
+ 
++    dragonfly)
++      AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [__fpending (FILE)])
++      ;;
++
+     unixware)
+       AC_DEFINE(PENDING_OUTPUT_COUNT(FILE), [((FILE)->__ptr - (FILE)->__base)])
+       ;;
+@@ -3782,7 +3826,7 @@ AH_TEMPLATE(TAB3, [Undocumented.])
+ case $opsys in
+   darwin) AC_DEFINE(TAB3, OXTABS) ;;
+ 
+-  gnu | freebsd | netbsd | openbsd )
++  gnu | dragonfly | freebsd | netbsd | openbsd )
+     AC_DEFINE(TABDLY, OXTABS, [Undocumented.])
+     AC_DEFINE(TAB3, OXTABS)
+     ;;
+@@ -3859,7 +3903,7 @@ if test x$GCC = xyes; then
+ else
+   case $opsys in
+     dnl irix: Tested on Irix 6.5.  SCM worked on earlier versions.
+-    freebsd | netbsd | openbsd | irix6-5 | sol2* )
++    dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
+       AC_DEFINE(GC_SETJMP_WORKS, 1)
+       ;;
+   esac
+@@ -3959,7 +4003,7 @@ case $opsys in
+     AC_DEFINE(BSD_SYSTEM_AHB, 1, [Define if AH_BOTTOM should change BSD_SYSTEM.])
+     ;;
+ 
+-  gnu | netbsd | openbsd )
++  gnu | dragonfly | netbsd | openbsd )
+     AC_DEFINE(BSD4_2, [])
+     AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+ #ifndef BSD_SYSTEM
+@@ -4415,7 +4459,7 @@ LIB_GCC=
+ if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
+ 
+   case "$opsys" in
+-    freebsd|netbsd|openbsd) LIB_GCC= ;;
++    dragonfly|freebsd|netbsd|openbsd) LIB_GCC= ;;
+ 
+     gnu-*)
+       ## armin76@gentoo.org reported that the lgcc_s flag is necessary to
diff --git a/editors/emacs24/patches/patch-ab b/editors/emacs24/patches/patch-ab
index 74b545436af..56a8cb6f57d 100644
--- a/editors/emacs24/patches/patch-ab
+++ b/editors/emacs24/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2013/03/15 22:45:00 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2013/03/22 18:05:10 marino Exp $
 
 Add DragonFly
 
@@ -20,6 +20,15 @@ Add DragonFly
    ## OpenBSD ports
    *-*-openbsd* )
      opsys=openbsd
+@@ -8251,7 +8260,7 @@ esac
+ 
+ LD_SWITCH_SYSTEM=
+ case "$opsys" in
+-  freebsd)
++  dragonfly|freebsd)
+    ## Let `ld' find image libs and similar things in /usr/local/lib.
+    ## The system compiler, GCC, has apparently been modified to not
+    ## look there, contrary to what a stock GCC would do.
 @@ -8341,7 +8350,7 @@ case "$opsys" in
    ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2.
    aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;;
@@ -93,3 +102,99 @@ Add DragonFly
    netbsd | openbsd )
      if test -f $CRT_DIR/crti.o; then
  
+@@ -13404,7 +13463,7 @@ mail_lock=no
+ case "$opsys" in
+   aix4-2) mail_lock="lockf" ;;
+ 
+-  gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
++  gnu|dragonfly|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;;
+ 
+   ## On GNU/Linux systems, both methods are used by various mail programs.
+   ## I assume most people are using newer mailers that have heard of flock.
+@@ -13770,6 +13829,11 @@ case "$opsys" in
+   ##  option to use it.
+   darwin) LIBS_TERMCAP="-lncurses" ;;
+ 
++  dragonfly)
++    TERMINFO=yes
++    LIBS_TERMCAP="-lncurses"
++    ;;
++
+   gnu*) test -z "$LIBS_TERMCAP" && LIBS_TERMCAP="-lncurses" ;;
+ 
+   freebsd)
+@@ -15195,7 +15259,7 @@ $as_echo "#define HAVE_PROCFS 1" >>confd
+ esac
+ 
+ case $opsys in
+-  darwin | freebsd | netbsd | openbsd )
++  darwin | dragonfly | freebsd | netbsd | openbsd )
+ 
+ $as_echo "#define DONT_REOPEN_PTY 1" >>confdefs.h
+ 
+@@ -15277,7 +15341,7 @@ case $opsys in
+ 
+     ;;
+ 
+-  gnu-linux | gnu-kfreebsd | freebsd | netbsd )
++  gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd )
+         if test "x$ac_cv_func_grantpt" = xyes; then
+ 
+ $as_echo "#define UNIX98_PTYS 1" >>confdefs.h
+@@ -15356,7 +15420,7 @@ esac
+ 
+ 
+ case $opsys in
+-      aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin )
++      aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin )
+     $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h
+ 
+     ;;
+@@ -15514,6 +15578,11 @@ else
+ 
+       ;;
+ 
++    dragonfly)
++      $as_echo "#define PENDING_OUTPUT_COUNT(FILE) __fpending (FILE)" >>confdefs.h
++
++      ;;
++
+     unixware)
+       $as_echo "#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)" >>confdefs.h
+ 
+@@ -15572,7 +15641,7 @@ case $opsys in
+   darwin) $as_echo "#define TAB3 OXTABS" >>confdefs.h
+  ;;
+ 
+-  gnu | freebsd | netbsd | openbsd )
++  gnu | dragonfly | freebsd | netbsd | openbsd )
+ 
+ $as_echo "#define TABDLY OXTABS" >>confdefs.h
+ 
+@@ -15687,7 +15756,7 @@ if test x$GCC = xyes; then
+ 
+ else
+   case $opsys in
+-        freebsd | netbsd | openbsd | irix6-5 | sol2* )
++        dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* )
+       $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h
+ 
+       ;;
+@@ -15844,7 +15913,7 @@ $as_echo "#define BSD_SYSTEM_AHB 1" >>co
+ 
+     ;;
+ 
+-  gnu | netbsd | openbsd )
++  gnu | dragonfly | netbsd | openbsd )
+     $as_echo "#define BSD4_2 /**/" >>confdefs.h
+ 
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -24713,7 +24782,7 @@ LIB_GCC=
+ if test "x$GCC" = "xyes" && test "x$ORDINARY_LINK" != "xyes"; then
+ 
+   case "$opsys" in
+-    freebsd|netbsd|openbsd) LIB_GCC= ;;
++    dragonfly|freebsd|netbsd|openbsd) LIB_GCC= ;;
+ 
+     gnu-*)
+       ## armin76@gentoo.org reported that the lgcc_s flag is necessary to