head	1.12;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.8
	OPENPKG_E1_MP:1.8
	OPENPKG_E1_MP_2_STABLE:1.7.6.1
	OPENPKG_E1_FP:1.7.6.1
	OPENPKG_2_STABLE_MP:1.8
	OPENPKG_2_STABLE_20061018:1.7.6.1
	OPENPKG_2_STABLE_20060622:1.7
	OPENPKG_2_STABLE:1.7.0.6
	OPENPKG_2_STABLE_BP:1.7
	OPENPKG_2_5_RELEASE:1.7
	OPENPKG_2_5_SOLID:1.7.0.4
	OPENPKG_2_5_SOLID_BP:1.7
	OPENPKG_2_4_RELEASE:1.7
	OPENPKG_2_4_SOLID:1.7.0.2
	OPENPKG_2_4_SOLID_BP:1.7
	OPENPKG_CW_FP:1.5
	OPENPKG_2_3_RELEASE:1.5
	OPENPKG_2_3_SOLID:1.5.0.2
	OPENPKG_2_3_SOLID_BP:1.5
	OPENPKG_2_2_RELEASE:1.4
	OPENPKG_2_2_SOLID:1.4.0.4
	OPENPKG_2_2_SOLID_BP:1.4
	OPENPKG_2_1_RELEASE:1.4
	OPENPKG_2_1_SOLID:1.4.0.2
	OPENPKG_2_1_SOLID_BP:1.4
	OPENPKG_2_0_RELEASE:1.3
	OPENPKG_2_0_SOLID:1.3.0.2
	OPENPKG_2_0_SOLID_BP:1.3
	OPENPKG_1_3_RELEASE:1.2.6.1
	OPENPKG_1_3_SOLID:1.2.0.6
	OPENPKG_1_3_SOLID_BP:1.2
	OPENPKG_1_STABLE_MP:1.3
	OPENPKG_1_2_RELEASE:1.2
	OPENPKG_1_2_SOLID:1.2.0.4
	OPENPKG_1_2_SOLID_BP:1.2
	OPENPKG_1_STABLE:1.2.0.2
	OPENPKG_1_STABLE_BP:1.2;
locks; strict;
comment	@# @;


1.12
date	2009.07.30.17.24.08;	author rse;	state dead;
branches;
next	1.11;
commitid	qubVC0w9VEqP8LXt;

1.11
date	2008.09.06.07.48.51;	author rse;	state Exp;
branches;
next	1.10;
commitid	Gna9fDAQQ5E9tGht;

1.10
date	2007.12.22.18.59.19;	author rse;	state Exp;
branches;
next	1.9;
commitid	3LJFeNj15XQjvsKs;

1.9
date	2007.06.07.08.41.45;	author rse;	state Exp;
branches;
next	1.8;
commitid	MRbCkYJktfY3sXks;

1.8
date	2006.10.03.07.23.29;	author rse;	state Exp;
branches;
next	1.7;
commitid	dXtY1RFUVU7sXcPr;

1.7
date	2005.06.13.08.04.42;	author steve;	state Exp;
branches
	1.7.6.1;
next	1.6;

1.6
date	2005.06.12.21.34.18;	author steve;	state Exp;
branches;
next	1.5;

1.5
date	2005.02.07.14.09.38;	author rse;	state Exp;
branches;
next	1.4;

1.4
date	2004.03.02.19.43.08;	author rse;	state Exp;
branches;
next	1.3;

1.3
date	2003.07.31.07.41.13;	author rse;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2003.01.13.19.08.49;	author rse;	state Exp;
branches
	1.2.2.1
	1.2.6.1;
next	1.1;

1.1
date	2003.01.13.17.15.37;	author ps;	state Exp;
branches;
next	;

1.7.6.1
date	2006.10.16.14.49.49;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;

1.3.2.1
date	2004.04.05.14.11.07;	author rse;	state Exp;
branches;
next	;

1.2.2.1
date	2003.07.31.08.06.23;	author rse;	state Exp;
branches;
next	;

1.2.6.1
date	2003.07.31.08.07.46;	author rse;	state Exp;
branches;
next	;


desc
@@


1.12
log
@upgrading package: emacs 22.3 -> 23.1
@
text
@Index: configure
--- configure.orig	2008-09-05 18:21:51 +0200
+++ configure	2008-09-06 09:23:40 +0200
@@@@ -13903,7 +13903,7 @@@@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lungif  $LIBS"
+LIBS="-lgif  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@@@ -23501,7 +23501,7 @@@@
 echo "  Does Emacs use -lXpm?                                   ${HAVE_XPM}"
 echo "  Does Emacs use -ljpeg?                                  ${HAVE_JPEG}"
 echo "  Does Emacs use -ltiff?                                  ${HAVE_TIFF}"
-echo "  Does Emacs use -lungif?                                 ${HAVE_GIF}"
+echo "  Does Emacs use -lgif?                                   ${HAVE_GIF}"
 echo "  Does Emacs use -lpng?                                   ${HAVE_PNG}"
 echo "  Does Emacs use X toolkit scroll bars?                   ${USE_TOOLKIT_SCROLL_BARS}"
 echo
Index: src/Makefile.in
--- src/Makefile.in.orig	2008-07-11 10:52:53 +0200
+++ src/Makefile.in	2008-09-06 09:23:40 +0200
@@@@ -159,8 +159,12 @@@@
 /* This holds special options for linking temacs
    that should be used for linking anything else.  */
 #ifndef LD_SWITCH_SYSTEM_TEMACS
+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
+#else
 #define LD_SWITCH_SYSTEM_TEMACS
 #endif
+#endif
 
 /* Some s/SYSTEM.h files define this to request special switches
    for compiling temacs.  */
@@@@ -441,7 +445,7 @@@@
 
 #if HAVE_GIF
 #ifndef LIBGIF
-#define LIBGIF -lungif
+#define LIBGIF -lgif
 #endif /* not defined LIBGIF */
 #else /* not HAVE_GIF */
 #define LIBGIF
Index: src/alloc.c
--- src/alloc.c.orig	2008-08-12 20:35:44 +0200
+++ src/alloc.c	2008-09-06 09:26:20 +0200
@@@@ -4573,8 +4573,12 @@@@
      needed on ia64 too.  See mach_dep.c, where it also says inline
      assembler doesn't work with relevant proprietary compilers.  */
 #ifdef __sparc__
+#ifdef __ia64__
+  asm ("flushw");
+#else
   asm ("ta 3");
 #endif
+#endif
 
   /* Save registers that we need to see on the stack.  We need to see
      registers used to hold register variables and registers used to
Index: src/m/sparc.h
--- src/m/sparc.h.orig	2008-08-12 20:35:45 +0200
+++ src/m/sparc.h	2008-09-06 09:23:40 +0200
@@@@ -76,7 +76,7 @@@@
 #define PURESIZE 130000
 #endif
 
-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
 /* This really belongs in s/sun.h.  */
 
 /* Say that the text segment of a.out includes the header;
Index: src/s/sol2-4.h
--- src/s/sol2-4.h.orig	2003-09-01 17:45:58 +0200
+++ src/s/sol2-4.h	2008-09-06 09:23:40 +0200
@@@@ -24,7 +24,7 @@@@
 /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
    has anything in it.  It can be empty.
    This works ok in temacs.  */
-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
+#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc -L/usr/ccs/lib \
  `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
   `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
 #endif /* GCC */
Index: src/s/sol2-8.h
--- /dev/null	2008-09-06 09:25:08 +0200
+++ src/s/sol2-8.h	2008-09-06 09:23:40 +0200
@@@@ -0,0 +1,10 @@@@
+/* Handle Solaris 2.8 and 2.9 */
+
+#include "sol2-5.h"
+
+/* Avoid conflict between strings.h and iso/string_iso.h */
+
+#undef bcmp
+#undef bcopy
+#undef bzero
+
@


1.11
log
@upgrading package: emacs 22.2 -> 22.3
@
text
@@


1.10
log
@use original giflib instead of libungif (which nowadays is no longer required because LZW patent expired)
@
text
@d2 3
a4 3
--- configure.orig	2007-05-25 14:43:29 +0200
+++ configure	2007-12-22 19:56:59 +0100
@@@@ -13862,7 +13862,7 @@@@
d13 1
a13 1
@@@@ -23103,7 +23103,7 @@@@
d23 3
a25 3
--- src/Makefile.in.orig	2007-03-21 15:31:24 +0100
+++ src/Makefile.in	2007-12-22 19:57:29 +0100
@@@@ -158,8 +158,12 @@@@
d38 1
a38 1
@@@@ -440,7 +444,7 @@@@
d48 3
a50 3
--- src/alloc.c.orig	2007-04-16 07:59:37 +0200
+++ src/alloc.c	2007-12-22 19:56:59 +0100
@@@@ -4566,8 +4566,12 @@@@
d53 2
a54 2
 #ifdef sparc
+#ifdef __sparc64__
d64 2
a65 2
--- src/m/sparc.h.orig	2007-01-14 04:10:22 +0100
+++ src/m/sparc.h	2007-12-22 19:56:59 +0100
d77 1
a77 1
+++ src/s/sol2-4.h	2007-12-22 19:56:59 +0100
d88 2
a89 2
--- /dev/null	2007-12-22 19:57:00 +0100
+++ src/s/sol2-8.h	2007-12-22 19:56:59 +0100
@


1.9
log
@upgrading package: emacs 21.4a -> 22.1
@
text
@d1 21
d24 1
a24 1
+++ src/Makefile.in	2007-06-07 10:27:37 +0200
d38 9
d49 1
a49 1
+++ src/alloc.c	2007-06-07 10:28:36 +0200
d65 1
a65 1
+++ src/m/sparc.h	2007-06-07 10:27:37 +0200
d77 1
a77 1
+++ src/s/sol2-4.h	2007-06-07 10:27:37 +0200
d88 2
a89 2
--- /dev/null	2007-06-07 10:27:45 +0200
+++ src/s/sol2-8.h	2007-06-07 10:27:37 +0200
@


1.8
log
@fix building under AIX 5.x
@
text
@a0 80
Index: configure
--- configure.orig	2003-03-18 15:19:12 +0100
+++ configure	2006-10-03 09:22:00 +0200
@@@@ -822,9 +822,13 @@@@
       sparc*-*-netbsd*)	machine=sparc ;;
       vax-*-netbsd*)	machine=vax ;;
       arm-*-netbsd*)	machine=arm ;;
+      x86_64-*-netbsd*)	machine=amd64 ;;
     esac
   ;;
 
+  ## Darwin / Mac OS X
+  powerpc-apple-darwin* )
+    machine=powermac opsys=darwin ;;
   ## OpenBSD ports
   *-*-openbsd* )
     opsys=openbsd
@@@@ -1212,7 +1216,7 @@@@
   rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
-  rs6000-ibm-aix5.1* | powerpc-ibm-aix5.1*  )
+  rs6000-ibm-aix5.* | powerpc-ibm-aix5.*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
   rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0*  )
@@@@ -1628,8 +1632,20 @@@@
   ;;
 
   ## IA-64
-  ia64*-*-linux* )
-    machine=ia64 opsys=gnu-linux
+  ia64*-*-* )
+    machine=ia64
+    case "${canonical}" in
+      *-linux-gnu* )        opsys=gnu-linux ;;
+      *-freebsd* )          opsys=freebsd ;;
+    esac
+  ;;
+
+  amd64*-*-* )
+    machine=amd64
+    case "${canonical}" in
+      *-linux-gnu* )        opsys=gnu-linux ;;
+      *-freebsd* )          opsys=freebsd ;;
+    esac
   ;;
 
   ## Intel 386 machines where we don't care about the manufacturer
@@@@ -1659,6 +1675,7 @@@@
       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
       *-386bsd* )	        opsys=386bsd ;;
       *-freebsd* )	        opsys=freebsd ;;
+      *-dragonfly* )	        opsys=freebsd ;;
       *-nextstep* )             opsys=nextstep ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
     esac
@@@@ -9124,6 +9141,22 @@@@
 fi
 
 
+# NETBSD: NetBSD's newer run-time linker fix.
+if test $opsys = netbsd; then
+  if test -f /usr/lib/crti.o; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_NETBSD_CRTI 1
+EOF
+
+  fi
+  if test -f /usr/lib/crtn.o; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_NETBSD_CRTN 1
+EOF
+
+  fi
+fi
+
 # Set up the CFLAGS for real compilation, so we can substitute it.
 CFLAGS="$REAL_CFLAGS"
 CPPFLAGS="$REAL_CPPFLAGS"
d2 3
a4 3
--- src/Makefile.in.orig	2003-01-23 11:34:06 +0100
+++ src/Makefile.in	2006-10-03 09:21:20 +0200
@@@@ -155,8 +155,12 @@@@
d15 2
a16 2
 /* Some m/MACHINE.h files define this to request special switches in ld.  */
 #ifndef LD_SWITCH_MACHINE
d18 5
a22 5
--- src/alloc.c.orig	2003-01-17 14:45:13 +0100
+++ src/alloc.c	2006-10-03 09:21:20 +0200
@@@@ -3723,8 +3723,12 @@@@
   /* This trick flushes the register windows so that all the state of
      the process is contained in the stack.  */
d30 1
a30 1
   
a32 183
Index: src/config.in
--- src/config.in.orig	2002-07-09 00:23:31 +0200
+++ src/config.in	2006-10-03 09:21:20 +0200
@@@@ -354,6 +354,12 @@@@
 /* Define for large files, on AIX-style hosts.  */
 #undef _LARGE_FILES
 
+/* On NetBSD, Define HAVE_NETBSD_CRT{I,N} if a given system has crt{i,n}.o
+   installed under /usr/lib.  These should be linked against temacs,
+   or it won't boot.  */
+#undef HAVE_NETBSD_CRTI
+#undef HAVE_NETBSD_CRTN
+
 #undef EMACS_CONFIGURATION
 
 #undef EMACS_CONFIG_OPTIONS
Index: src/m/alpha.h
--- src/m/alpha.h.orig	2000-10-02 16:30:39 +0200
+++ src/m/alpha.h	2006-10-03 09:21:20 +0200
@@@@ -198,7 +198,7 @@@@
 
 #ifndef NOT_C_CODE
 /* We need these because pointers are larger than the default ints.  */
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
 #include <alloca.h>
 #endif
 
Index: src/m/amd64.h
--- /dev/null	2006-10-03 09:22:09 +0200
+++ src/m/amd64.h	2006-10-03 09:21:20 +0200
@@@@ -0,0 +1,131 @@@@
+/* machine description file for AMD x86-64.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+/* The following line tells the configuration script what sort of 
+   operating system this machine is likely to run.
+   USUAL-OPSYS="linux"  */
+
+#define BITS_PER_LONG           64
+#define BITS_PER_EMACS_INT      64
+
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+   is the most significant byte.  */
+
+#undef WORDS_BIG_ENDIAN
+
+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+ * group of arguments and treat it as an array of the arguments.  */
+
+#define NO_ARG_ARRAY
+
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts.  */
+
+/* #define WORD_MACHINE  */
+
+/* Now define a symbol for the cpu type, if your compiler
+   does not define it automatically:
+   Ones defined so far include vax, m68000, ns16000, pyramid,
+   orion, tahoe, APOLLO and many others */
+/* __x86_64 defined automatically.  */
+
+/* Use type int rather than a union, to represent Lisp_Object */
+/* This is desirable for most machines.  */
+
+#define NO_UNION_TYPE
+
+/* Define the type to use.  */
+#define EMACS_INT               long
+#define EMACS_UINT              unsigned long
+#define SPECIAL_EMACS_INT
+
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the 24-bit bit field into an int.  In other words, if bit fields
+   are always unsigned.
+
+   If you use NO_UNION_TYPE, this flag does not matter.  */
+
+#define EXPLICIT_SIGN_EXTEND
+
+/* Data type of load average, as read out of kmem.  */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+
+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+
+/* Define CANNOT_DUMP on machines where unexec does not work.
+   Then the function dump-emacs will not be defined
+   and temacs will do (load "loadup") automatically unless told otherwise.  */
+
+/* #define CANNOT_DUMP */
+
+/* Define VIRT_ADDR_VARIES if the virtual addresses of
+   pure and impure space as loaded can vary, and even their
+   relative order cannot be relied on.
+
+   Otherwise Emacs assumes that text space precedes data space,
+   numerically.  */
+
+#define VIRT_ADDR_VARIES  /* XXX */
+
+/* Define C_ALLOCA if this machine does not support a true alloca
+   and the one written in C should be used instead.
+   Define HAVE_ALLOCA to say that the system provides a properly
+   working alloca function and it should be used.
+   Define neither one if an assembler-language alloca
+   in the file alloca.s should be used.  */
+
+/* #define C_ALLOCA */      /* XXX */
+#define HAVE_ALLOCA
+
+/* Define NO_REMAP if memory segmentation makes it not work well
+   to change the boundary between the text section and data section
+   when Emacs is dumped.  If you define this, the preloaded Lisp
+   code will not be sharable; but that's better than failing completely.  */
+
+#define NO_REMAP  /* XXX */
+
+#define PNTR_COMPARISON_TYPE unsigned long
+
+/* On the 64 bit architecture, we can use 60 bits for addresses */
+
+#define VALBITS         60
+
+/* This definition of MARKBIT is necessary because of the comparison of
+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
+
+#define MARKBIT         0x8000000000000000L
+
+/* Define XINT and XUINT so that they can take arguments of type int */
+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
+#define XUINT(a) ((long) (a) & VALMASK)
+
+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+
+#define XPNTR(a) XUINT (a)
+
+/* #undef START_FILES */ /* XXX */
+/* #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o */ /* XXX */
+
+/* #undef LIB_STANDARD */                                    /* XXX */
+/* #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o */ /* XXX */
Index: src/m/ia64.h
--- src/m/ia64.h.orig	2000-09-29 15:00:37 +0200
+++ src/m/ia64.h	2006-10-03 09:21:20 +0200
@@@@ -147,7 +147,7 @@@@
 
 #ifndef NOT_C_CODE
 /* We need these because pointers are larger than the default ints.  */
-# if !defined(__NetBSD__) && !defined(__OpenBSD__)
+# if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
 #  include <alloca.h>
 # else
 #  include <stdlib.h>
@@@@ -178,6 +178,6 @@@@
 
 #endif /* not NOT_C_CODE */
 
-#define DATA_SEG_BITS	0x6000000000000000
+#define DATA_SEG_BITS	0x2000000000000000
 
 #define HAVE_TEXT_START
d34 3
a36 3
--- src/m/sparc.h.orig	2000-09-26 15:02:21 +0200
+++ src/m/sparc.h	2006-10-03 09:21:20 +0200
@@@@ -89,7 +89,7 @@@@
a44 44
Index: src/s/freebsd.h
--- src/s/freebsd.h.orig	2001-02-20 11:52:17 +0100
+++ src/s/freebsd.h	2006-10-03 09:21:20 +0200
@@@@ -68,6 +68,11 @@@@
 #define LIBS_SYSTEM -lutil
 #if __FreeBSD_version < 400000
 #define LIBS_TERMCAP -ltermcap
+#else
+#ifdef HAVE_LIBNCURSES
+#define TERMINFO
+#define LIBS_TERMCAP -lncurses
+#endif
 #endif
 
 #define SYSV_SYSTEM_DIR
Index: src/s/netbsd.h
--- src/s/netbsd.h.orig	2002-05-31 18:29:02 +0200
+++ src/s/netbsd.h	2006-10-03 09:21:20 +0200
@@@@ -60,9 +60,17 @@@@
 #endif /* not NO_SHARED_LIBS and not ELF */
 
 #if !defined (NO_SHARED_LIBS) && defined (__ELF__)
+#if defined(HAVE_NETBSD_CRTI)
+#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crti.o /usr/lib/crtbegin.o
+#else
 #define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
+#endif
 #define UNEXEC unexelf.o
+#if defined(HAVE_NETBSD_CRTN)
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
+#else
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
+#endif
 #undef LIB_GCC
 #define LIB_GCC
 #endif
@@@@ -123,3 +131,7 @@@@
 
 #define GC_MARK_STACK	GC_MAKE_GCPROS_NOOPS
 
+/* Use sigprocmask(2) and friends instead of sigblock(2); the man page
+   of sigblock says it is obsolete.  */
+
+#define POSIX_SIGNALS		1
d46 2
a47 2
--- src/s/sol2-4.h.orig	1998-08-29 01:38:20 +0200
+++ src/s/sol2-4.h	2006-10-03 09:21:20 +0200
d58 2
a59 2
--- /dev/null	2006-10-03 09:22:09 +0200
+++ src/s/sol2-8.h	2006-10-03 09:21:20 +0200
@


1.7
log
@fixed build for ia64-*-freebds
@
text
@d3 1
a3 1
+++ configure	2005-06-13 09:18:51 +0200
d18 9
d83 1
a83 1
+++ src/Makefile.in	2005-06-13 09:18:51 +0200
d99 1
a99 1
+++ src/alloc.c	2005-06-13 09:18:51 +0200
d115 1
a115 1
+++ src/config.in	2005-06-13 09:18:51 +0200
d131 1
a131 1
+++ src/m/alpha.h	2005-06-13 09:18:51 +0200
d142 2
a143 2
--- /dev/null	2005-06-13 09:33:35 +0200
+++ src/m/amd64.h	2005-06-13 09:18:51 +0200
d278 1
a278 1
+++ src/m/ia64.h	2005-06-13 09:41:30 +0200
d298 1
a298 1
+++ src/m/sparc.h	2005-06-13 09:18:51 +0200
d310 1
a310 1
+++ src/s/freebsd.h	2005-06-13 09:18:51 +0200
d325 1
a325 1
+++ src/s/netbsd.h	2005-06-13 09:18:51 +0200
d354 1
a354 1
+++ src/s/sol2-4.h	2005-06-13 09:18:51 +0200
d365 2
a366 2
--- /dev/null	2005-06-13 09:33:35 +0200
+++ src/s/sol2-8.h	2005-06-13 09:18:51 +0200
@


1.7.6.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d3 1
a3 1
+++ configure	2006-10-03 09:22:00 +0200
a17 9
@@@@ -1212,7 +1216,7 @@@@
   rs6000-ibm-aix4.2* | powerpc-ibm-aix4.2*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
-  rs6000-ibm-aix5.1* | powerpc-ibm-aix5.1*  )
+  rs6000-ibm-aix5.* | powerpc-ibm-aix5.*  )
     machine=ibmrs6000 opsys=aix4-2
   ;;
   rs6000-ibm-aix4.0* | powerpc-ibm-aix4.0*  )
d74 1
a74 1
+++ src/Makefile.in	2006-10-03 09:21:20 +0200
d90 1
a90 1
+++ src/alloc.c	2006-10-03 09:21:20 +0200
d106 1
a106 1
+++ src/config.in	2006-10-03 09:21:20 +0200
d122 1
a122 1
+++ src/m/alpha.h	2006-10-03 09:21:20 +0200
d133 2
a134 2
--- /dev/null	2006-10-03 09:22:09 +0200
+++ src/m/amd64.h	2006-10-03 09:21:20 +0200
d269 1
a269 1
+++ src/m/ia64.h	2006-10-03 09:21:20 +0200
d289 1
a289 1
+++ src/m/sparc.h	2006-10-03 09:21:20 +0200
d301 1
a301 1
+++ src/s/freebsd.h	2006-10-03 09:21:20 +0200
d316 1
a316 1
+++ src/s/netbsd.h	2006-10-03 09:21:20 +0200
d345 1
a345 1
+++ src/s/sol2-4.h	2006-10-03 09:21:20 +0200
d356 2
a357 2
--- /dev/null	2006-10-03 09:22:09 +0200
+++ src/s/sol2-8.h	2006-10-03 09:21:20 +0200
@


1.6
log
@Fixes for NetBSD and amd64, ia64 still broken
@
text
@d3 1
a3 1
+++ configure	2005-06-12 23:19:03 +0200
d74 1
a74 1
+++ src/Makefile.in	2005-06-12 23:16:20 +0200
d90 1
a90 1
+++ src/alloc.c	2005-06-12 23:16:20 +0200
d106 1
a106 1
+++ src/config.in	2005-06-12 23:16:20 +0200
d122 1
a122 1
+++ src/m/alpha.h	2005-06-12 23:16:20 +0200
d133 2
a134 2
--- /dev/null	2005-06-12 23:21:40 +0200
+++ src/m/amd64.h	2005-06-12 23:16:20 +0200
d269 1
a269 1
+++ src/m/ia64.h	2005-06-12 23:16:20 +0200
d279 8
d289 1
a289 1
+++ src/m/sparc.h	2005-06-12 23:16:20 +0200
d301 1
a301 1
+++ src/s/freebsd.h	2005-06-12 23:16:20 +0200
d316 1
a316 1
+++ src/s/netbsd.h	2005-06-12 23:16:20 +0200
d345 1
a345 1
+++ src/s/sol2-4.h	2005-06-12 23:16:20 +0200
d356 2
a357 2
--- /dev/null	2005-06-12 23:21:40 +0200
+++ src/s/sol2-8.h	2005-06-12 23:16:20 +0200
@


1.5
log
@upgrading package: emacs 21.3 -> 21.4
@
text
@d1 25
a25 9
--- configure.orig	Thu Jul 31 09:30:40 2003
+++ configure	Thu Jul 31 09:32:10 2003
@@@@ -805,6 +805,16 @@@@
 machine='' opsys='' unported=no
 case "${canonical}" in
 
+  ## FreeBSD ports
+  *-*-freebsd* )
+    opsys=freebsd
d27 2
a28 3
+      alpha*-*-freebsd*)     machine=alpha ;;
+      i[3456]86-*-freebsd*)  machine=intel386 ;;
+      sparc64-*-freebsd*)    machine=sparc ;;
d32 10
a41 26
   ## NetBSD ports
   *-*-netbsd* )
     opsys=netbsd
@@@@ -1535,9 +1545,19 @@@@
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		RANLIB="ar -ts"
 		;;
-      *-sunos5* | *-solaris* )
+      *-sunos5.6* | *-solaris2.6* )
 		opsys=sol2-5
 		NON_GNU_CPP=/usr/ccs/lib/cpp
+		RANLIB="ar -ts"
+		;;
+      *-sunos5.7* | *-solaris2.7* )
+		opsys=sol2-5
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		RANLIB="ar -ts"
+		;;
+      *-sunos5* | *-solaris* )
+		opsys=sol2-8
+		NON_GNU_CPP=/usr/ccs/lib/cpp
 		;;
       *			  ) opsys=bsd4-2   ;;
     esac
@@@@ -1658,7 +1678,6 @@@@
 				;;
d44 2
a45 1
-      *-freebsd* )	        opsys=freebsd ;;
d49 10
a58 4
--- /dev/null	Mon Jan 13 19:51:22 2003
+++ src/s/sol2-8.h	Mon Jan 13 18:15:37 2003
@@@@ -0,0 +1,10 @@@@
+/* Handle Solaris 2.8 and 2.9 */
d60 5
a64 1
+#include "sol2-5.h"
d66 2
a67 1
+/* Avoid conflict between strings.h and iso/string_iso.h */
d69 7
a75 7
+#undef bcmp
+#undef bcopy
+#undef bzero
+
--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
+++ src/Makefile.in	Mon Oct 21 13:37:26 2002
@@@@ -155,6 +155,10 @@@@
d83 1
a84 1
 #endif
d86 6
a91 3
--- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
+++ src/alloc.c	Thu Sep 12 13:48:11 2002
@@@@ -3723,7 +3723,11 @@@@
d99 1
a100 1
 #endif
d103 20
a122 2
--- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
+++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
d132 150
a281 2
--- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
+++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
d291 3
a293 2
--- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
d306 32
a337 2
--- src/s/sol2-4.h.orig	1998-08-28 19:38:20.000000000 -0400
+++ src/s/sol2-4.h	2004-02-27 16:21:42.615474000 -0500
d347 14
a360 17
Index: configure
--- configure.orig	2005-02-06 12:45:05 +0100
+++ configure	2005-02-06 12:49:12 +0100
@@@@ -1651,9 +1651,12 @@@@
   ia64*-*-linux* )
     machine=ia64 opsys=gnu-linux
   ;;
+  ia64*-*-* )
+    machine=ia64
+  ;;
 
   ## Intel 386 machines where we don't care about the manufacturer
-  i[3456]86-*-* )
+  i[3456]86-*-* | amd64-*-* | x86_64-*-* )
     machine=intel386
     case "${canonical}" in
       *-lynxos* )               opsys=lynxos ;;
@


1.4
log
@Emacs segfaulted when starting up in X mode if built with "with_x11 yes"
on Solaris 9 with a recent version GNU ld. This is because a couple of
years ago, GNU ld changed the "combreloc" switch from being defaulted
off to being defaulted on. So now we need "-z nocombreloc" to build
emacs with GNU ld. Emacs had been patched to turn on this option for
GNU/Linux and FreeBSD, but not for Solaris.

Submitted by: Dennis McRitchie <dmcr@@Princeton.EDU>
@
text
@d136 17
@


1.3
log
@apply more complete FreeBSD patches
@
text
@d125 11
@


1.3.2.1
log
@MFC: build-time fixes and convinience options
@
text
@a124 11
--- src/s/sol2-4.h.orig	1998-08-28 19:38:20.000000000 -0400
+++ src/s/sol2-4.h	2004-02-27 16:21:42.615474000 -0500
@@@@ -24,7 +24,7 @@@@
 /* We use ./prefix-args because we don't know whether LD_SWITCH_X_SITE_AUX
    has anything in it.  It can be empty.
    This works ok in temacs.  */
-#define LD_SWITCH_SYSTEM_TEMACS -L/usr/ccs/lib \
+#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc -L/usr/ccs/lib \
  `./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
   `NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
 #endif /* GCC */
@


1.2
log
@Make Solaris patching less intrusive by simplifying it.
@
text
@d1 20
a20 3
--- configure.orig	Mon Jan 13 17:26:11 2003
+++ configure	Mon Jan 13 17:26:09 2003
@@@@ -1527,8 +1527,18 @@@@
a25 5
+		opsys=sol2-5
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		RANLIB="ar -ts"
+		;;
+      *-sunos5.7* | *-solaris2.7* )
a26 11
+		NON_GNU_CPP=/usr/ccs/lib/cpp
+		RANLIB="ar -ts"
+		;;
+      *-sunos5* | *-solaris* )
+		opsys=sol2-8
 		NON_GNU_CPP=/usr/ccs/lib/cpp
 		;;
       *			  ) opsys=bsd4-2   ;;
--- configure.in.orig	Mon Jan 13 17:26:10 2003
+++ configure.in	Mon Jan 13 17:26:10 2003
@@@@ -901,8 +901,18 @@@@
a27 6
 		RANLIB="ar -ts"
 		;;
-      *-sunos5* | *-solaris* )
+      *-sunos5.6* | *-solaris2.6* )
+		opsys=sol2-5
+		NON_GNU_CPP=/usr/ccs/lib/cpp
d31 1
a31 1
 		opsys=sol2-5
d37 1
a37 1
 		NON_GNU_CPP=/usr/ccs/lib/cpp
d40 9
d62 63
@


1.2.6.1
log
@MFS: apply more complete FreeBSD patches
@
text
@d1 3
a3 20
--- configure.orig	Thu Jul 31 09:30:40 2003
+++ configure	Thu Jul 31 09:32:10 2003
@@@@ -805,6 +805,16 @@@@
 machine='' opsys='' unported=no
 case "${canonical}" in
 
+  ## FreeBSD ports
+  *-*-freebsd* )
+    opsys=freebsd
+    case "${canonical}" in
+      alpha*-*-freebsd*)     machine=alpha ;;
+      i[3456]86-*-freebsd*)  machine=intel386 ;;
+      sparc64-*-freebsd*)    machine=sparc ;;
+    esac
+  ;;
+
   ## NetBSD ports
   *-*-netbsd* )
     opsys=netbsd
@@@@ -1535,9 +1545,19 @@@@
d9 5
d15 11
d27 6
d36 1
a36 1
+		opsys=sol2-5
d42 1
a42 1
+		NON_GNU_CPP=/usr/ccs/lib/cpp
a44 9
     esac
@@@@ -1658,7 +1678,6 @@@@
 				;;
       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
       *-386bsd* )	        opsys=386bsd ;;
-      *-freebsd* )	        opsys=freebsd ;;
       *-nextstep* )             opsys=nextstep ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
     esac
a57 63
--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
+++ src/Makefile.in	Mon Oct 21 13:37:26 2002
@@@@ -155,6 +155,10 @@@@
 /* This holds special options for linking temacs
    that should be used for linking anything else.  */
 #ifndef LD_SWITCH_SYSTEM_TEMACS
+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
+#else
 #define LD_SWITCH_SYSTEM_TEMACS
+#endif
 #endif
 
--- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
+++ src/alloc.c	Thu Sep 12 13:48:11 2002
@@@@ -3723,7 +3723,11 @@@@
   /* This trick flushes the register windows so that all the state of
      the process is contained in the stack.  */
 #ifdef sparc
+#ifdef __sparc64__
+  asm ("flushw");
+#else
   asm ("ta 3");
+#endif
 #endif
   
   /* Save registers that we need to see on the stack.  We need to see
--- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
+++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
@@@@ -198,7 +198,7 @@@@
 
 #ifndef NOT_C_CODE
 /* We need these because pointers are larger than the default ints.  */
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
 #include <alloca.h>
 #endif
 
--- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
+++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
@@@@ -89,7 +89,7 @@@@
 #define PURESIZE 130000
 #endif
 
-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
 /* This really belongs in s/sun.h.  */
 
 /* Say that the text segment of a.out includes the header;
--- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
@@@@ -68,6 +68,11 @@@@
 #define LIBS_SYSTEM -lutil
 #if __FreeBSD_version < 400000
 #define LIBS_TERMCAP -ltermcap
+#else
+#ifdef HAVE_LIBNCURSES
+#define TERMINFO
+#define LIBS_TERMCAP -lncurses
+#endif
 #endif
 
 #define SYSV_SYSTEM_DIR
@


1.2.2.1
log
@MFC: apply more complete FreeBSD patches
@
text
@d1 3
a3 20
--- configure.orig	Thu Jul 31 09:30:40 2003
+++ configure	Thu Jul 31 09:32:10 2003
@@@@ -805,6 +805,16 @@@@
 machine='' opsys='' unported=no
 case "${canonical}" in
 
+  ## FreeBSD ports
+  *-*-freebsd* )
+    opsys=freebsd
+    case "${canonical}" in
+      alpha*-*-freebsd*)     machine=alpha ;;
+      i[3456]86-*-freebsd*)  machine=intel386 ;;
+      sparc64-*-freebsd*)    machine=sparc ;;
+    esac
+  ;;
+
   ## NetBSD ports
   *-*-netbsd* )
     opsys=netbsd
@@@@ -1535,9 +1545,19 @@@@
d9 5
d15 11
d27 6
d36 1
a36 1
+		opsys=sol2-5
d42 1
a42 1
+		NON_GNU_CPP=/usr/ccs/lib/cpp
a44 9
     esac
@@@@ -1658,7 +1678,6 @@@@
 				;;
       *-sysv4.2uw* )	  	opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
       *-386bsd* )	        opsys=386bsd ;;
-      *-freebsd* )	        opsys=freebsd ;;
       *-nextstep* )             opsys=nextstep ;;
       ## Otherwise, we'll fall through to the generic opsys code at the bottom.
     esac
a57 63
--- src/Makefile.in.orig	Mon Dec 17 23:09:32 2001
+++ src/Makefile.in	Mon Oct 21 13:37:26 2002
@@@@ -155,6 +155,10 @@@@
 /* This holds special options for linking temacs
    that should be used for linking anything else.  */
 #ifndef LD_SWITCH_SYSTEM_TEMACS
+#if defined(__FreeBSD_version) && (__FreeBSD_version >= 500042)
+#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc
+#else
 #define LD_SWITCH_SYSTEM_TEMACS
+#endif
 #endif
 
--- src/alloc.c.orig	Thu Sep 12 13:50:01 2002
+++ src/alloc.c	Thu Sep 12 13:48:11 2002
@@@@ -3723,7 +3723,11 @@@@
   /* This trick flushes the register windows so that all the state of
      the process is contained in the stack.  */
 #ifdef sparc
+#ifdef __sparc64__
+  asm ("flushw");
+#else
   asm ("ta 3");
+#endif
 #endif
   
   /* Save registers that we need to see on the stack.  We need to see
--- src/m/alpha.h.orig	Mon Oct  2 23:30:39 2000
+++ src/m/alpha.h	Wed Feb 13 09:05:57 2002
@@@@ -198,7 +198,7 @@@@
 
 #ifndef NOT_C_CODE
 /* We need these because pointers are larger than the default ints.  */
-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
+#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__FreeBSD__)
 #include <alloca.h>
 #endif
 
--- src/m/sparc.h.orig	Thu Sep 12 02:25:09 2002
+++ src/m/sparc.h	Thu Sep 12 12:33:36 2002
@@@@ -89,7 +89,7 @@@@
 #define PURESIZE 130000
 #endif
 
-#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__)
+#if !defined (__NetBSD__) && !defined (__linux__) && !defined (__OpenBSD__) && !defined(__FreeBSD__)
 /* This really belongs in s/sun.h.  */
 
 /* Say that the text segment of a.out includes the header;
--- src/s/freebsd.h.orig	Tue Feb 20 19:52:17 2001
+++ src/s/freebsd.h	Mon Feb 18 11:51:50 2002
@@@@ -68,6 +68,11 @@@@
 #define LIBS_SYSTEM -lutil
 #if __FreeBSD_version < 400000
 #define LIBS_TERMCAP -ltermcap
+#else
+#ifdef HAVE_LIBNCURSES
+#define TERMINFO
+#define LIBS_TERMCAP -lncurses
+#endif
 #endif
 
 #define SYSV_SYSTEM_DIR
@


1.1
log
@Appended patches for Solaris 2.8 and 2.9
@
text
@d45 13
@