[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Sep-2008 09:48:52
Branch: HEAD Handle: 2008090608485100
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
upgrading package: emacs 22.2 - 22.3
Summary:
RevisionChanges Path
1.11+18 -18 openpkg-src/emacs/emacs.patch
1.68+3 -3 openpkg-src/emacs/emacs.spec
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.patch
$ cvs diff -u -r1.10 -r1.11 emacs.patch
--- openpkg-src/emacs/emacs.patch 22 Dec 2007 18:59:19 - 1.10
+++ openpkg-src/emacs/emacs.patch 6 Sep 2008 07:48:51 - 1.11
@@ -1,7 +1,7 @@
Index: configure
configure.orig 2007-05-25 14:43:29 +0200
-+++ configure2007-12-22 19:56:59 +0100
-@@ -13862,7 +13862,7 @@
+--- configure.orig 2008-09-05 18:21:51 +0200
configure2008-09-06 09:23:40 +0200
+@@ -13903,7 +13903,7 @@
echo $ECHO_N (cached) $ECHO_C 6
else
ac_check_lib_save_LIBS=$LIBS
@@ -10,7 +10,7 @@
cat conftest.$ac_ext _ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23103,7 +23103,7 @@
+@@ -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}
@@ -20,9 +20,9 @@
echo Does Emacs use X toolkit scroll bars?
${USE_TOOLKIT_SCROLL_BARS}
echo
Index: src/Makefile.in
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 @@
+--- 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
@@ -35,7 +35,7 @@
/* Some s/SYSTEM.h files define this to request special switches
for compiling temacs. */
-@@ -440,7 +444,7 @@
+@@ -441,7 +445,7 @@
#if HAVE_GIF
#ifndef LIBGIF
@@ -45,13 +45,13 @@
#else /* not HAVE_GIF */
#define LIBGIF
Index: src/alloc.c
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 @@
+--- 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 __sparc64__
+ #ifdef __sparc__
++#ifdef __ia64__
+ asm (flushw);
+#else
asm (ta 3);
@@ -61,8 +61,8 @@
/* 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 2007-01-14 04:10:22 +0100
-+++ src/m/sparc.h2007-12-22 19:56:59 +0100
+--- src/m/sparc.h.orig 2008-08-12 20:35:45 +0200
src/m/sparc.h2008-09-06 09:23:40 +0200
@@ -76,7 +76,7 @@
#define PURESIZE 13
#endif
@@ -74,7 +74,7 @@
/* 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 2007-12-22 19:56:59 +0100
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.
@@ -85,8 +85,8 @@
`NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
#endif /* GCC */
Index: src/s/sol2-8.h
/dev/null2007-12-22 19:57:00 +0100
-+++ src/s/sol2-8.h 2007-12-22 19:56:59 +0100
+--- /dev/null2008-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 */
+
@@ .
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.spec
$ cvs diff -u -r1.67 -r1.68 emacs.spec
--- openpkg-src/emacs/emacs.spec 27 Mar 2008 07:42:10 - 1.67
+++ openpkg-src/emacs/emacs.spec 6 Sep 2008 07:48:51 - 1.68
@@ -22,8 +22,8 @@
##
# package version
-%define V_emacs 22.2
-%define V_subdir 22.2
+%define V_emacs
[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2007 19:59:20
Branch: HEAD Handle: 2007122218591900
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
use original giflib instead of libungif (which nowadays is no longer
required because LZW patent expired)
Summary:
RevisionChanges Path
1.10+36 -6 openpkg-src/emacs/emacs.patch
1.64+1 -1 openpkg-src/emacs/emacs.spec
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.patch
$ cvs diff -u -r1.9 -r1.10 emacs.patch
--- openpkg-src/emacs/emacs.patch 7 Jun 2007 08:41:45 - 1.9
+++ openpkg-src/emacs/emacs.patch 22 Dec 2007 18:59:19 - 1.10
@@ -1,6 +1,27 @@
+Index: configure
+--- configure.orig 2007-05-25 14:43:29 +0200
configure2007-12-22 19:56:59 +0100
+@@ -13862,7 +13862,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
+@@ -23103,7 +23103,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 2007-03-21 15:31:24 +0100
-+++ src/Makefile.in 2007-06-07 10:27:37 +0200
src/Makefile.in 2007-12-22 19:57:29 +0100
@@ -158,8 +158,12 @@
/* This holds special options for linking temacs
that should be used for linking anything else. */
@@ -14,9 +35,18 @@
/* Some s/SYSTEM.h files define this to request special switches
for compiling temacs. */
+@@ -440,7 +444,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 2007-04-16 07:59:37 +0200
-+++ src/alloc.c 2007-06-07 10:28:36 +0200
src/alloc.c 2007-12-22 19:56:59 +0100
@@ -4566,8 +4566,12 @@
needed on ia64 too. See mach_dep.c, where it also says inline
assembler doesn't work with relevant proprietary compilers. */
@@ -32,7 +62,7 @@
registers used to hold register variables and registers used to
Index: src/m/sparc.h
--- src/m/sparc.h.orig 2007-01-14 04:10:22 +0100
-+++ src/m/sparc.h2007-06-07 10:27:37 +0200
src/m/sparc.h2007-12-22 19:56:59 +0100
@@ -76,7 +76,7 @@
#define PURESIZE 13
#endif
@@ -44,7 +74,7 @@
/* 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 2007-06-07 10:27:37 +0200
src/s/sol2-4.h 2007-12-22 19:56:59 +0100
@@ -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.
@@ -55,8 +85,8 @@
`NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
#endif /* GCC */
Index: src/s/sol2-8.h
/dev/null2007-06-07 10:27:45 +0200
-+++ src/s/sol2-8.h 2007-06-07 10:27:37 +0200
+--- /dev/null2007-12-22 19:57:00 +0100
src/s/sol2-8.h 2007-12-22 19:56:59 +0100
@@ -0,0 +1,10 @@
+/* Handle Solaris 2.8 and 2.9 */
+
@@ .
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.spec
$ cvs diff -u -r1.63 -r1.64 emacs.spec
--- openpkg-src/emacs/emacs.spec 7 Jun 2007 08:41:46 - 1.63
+++ openpkg-src/emacs/emacs.spec 22 Dec 2007 18:59:19 - 1.64
@@ -38,7 +38,7 @@
Group:Editor
License: GPL
Version: %{V_emacs}
-Release: 20070607
+Release: 20071222
# package options
%option with_x11 no
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List
[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Jun-2007 10:41:46
Branch: HEAD Handle: 2007060709414501
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
upgrading package: emacs 21.4a - 22.1
Summary:
RevisionChanges Path
1.9 +18 -325openpkg-src/emacs/emacs.patch
1.63+34 -12 openpkg-src/emacs/emacs.spec
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.patch
$ cvs diff -u -r1.8 -r1.9 emacs.patch
--- openpkg-src/emacs/emacs.patch 3 Oct 2006 07:23:29 - 1.8
+++ openpkg-src/emacs/emacs.patch 7 Jun 2007 08:41:45 - 1.9
@@ -1,87 +1,7 @@
-Index: configure
configure.orig 2003-03-18 15:19:12 +0100
-+++ configure2006-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
Index: src/Makefile.in
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 @@
+--- src/Makefile.in.orig 2007-03-21 15:31:24 +0100
src/Makefile.in 2007-06-07 10:27:37 +0200
+@@ -158,8 +158,12 @@
/* This holds special options for linking temacs
that should be used for linking anything else. */
#ifndef LD_SWITCH_SYSTEM_TEMACS
@@ -92,14 +12,14 @@
#endif
+#endif
- /* Some m/MACHINE.h files define this to request special switches in ld. */
- #ifndef LD_SWITCH_MACHINE
+ /* Some s/SYSTEM.h files define this to request special switches
+for compiling temacs. */
Index: src/alloc.c
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. */
+--- src/alloc.c.orig 2007-04-16 07:59:37 +0200
src/alloc.c 2007-06-07 10:28:36 +0200
+@@ -4566,8 +4566,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 __sparc64__
+ asm (flushw);
@@ -107,196 +27,13 @@
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:
[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 03-Oct-2006 09:23:29 Branch: HEAD Handle: 2006100308232900 Modified files: openpkg-src/emacs emacs.patch emacs.spec Log: fix building under AIX 5.x Summary: RevisionChanges Path 1.8 +23 -14 openpkg-src/emacs/emacs.patch 1.59+1 -1 openpkg-src/emacs/emacs.spec patch -p0 '@@ .' Index: openpkg-src/emacs/emacs.patch $ cvs diff -u -r1.7 -r1.8 emacs.patch --- openpkg-src/emacs/emacs.patch 13 Jun 2005 08:04:42 - 1.7 +++ openpkg-src/emacs/emacs.patch 3 Oct 2006 07:23:29 - 1.8 @@ -1,6 +1,6 @@ Index: configure --- configure.orig 2003-03-18 15:19:12 +0100 -+++ configure2005-06-13 09:18:51 +0200 configure2006-10-03 09:22:00 +0200 @@ -822,9 +822,13 @@ sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*)machine=vax ;; @@ -15,6 +15,15 @@ ## 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 @@ ;; @@ -71,7 +80,7 @@ CPPFLAGS=$REAL_CPPFLAGS Index: src/Makefile.in --- src/Makefile.in.orig 2003-01-23 11:34:06 +0100 -+++ src/Makefile.in 2005-06-13 09:18:51 +0200 src/Makefile.in 2006-10-03 09:21:20 +0200 @@ -155,8 +155,12 @@ /* This holds special options for linking temacs that should be used for linking anything else. */ @@ -87,7 +96,7 @@ #ifndef LD_SWITCH_MACHINE Index: src/alloc.c --- src/alloc.c.orig 2003-01-17 14:45:13 +0100 -+++ src/alloc.c 2005-06-13 09:18:51 +0200 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. */ @@ -103,7 +112,7 @@ registers used to hold register variables and registers used to Index: src/config.in --- src/config.in.orig 2002-07-09 00:23:31 +0200 -+++ src/config.in2005-06-13 09:18:51 +0200 src/config.in2006-10-03 09:21:20 +0200 @@ -354,6 +354,12 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -119,7 +128,7 @@ #undef EMACS_CONFIG_OPTIONS Index: src/m/alpha.h --- src/m/alpha.h.orig 2000-10-02 16:30:39 +0200 -+++ src/m/alpha.h2005-06-13 09:18:51 +0200 src/m/alpha.h2006-10-03 09:21:20 +0200 @@ -198,7 +198,7 @@ #ifndef NOT_C_CODE @@ -130,8 +139,8 @@ #endif Index: src/m/amd64.h /dev/null2005-06-13 09:33:35 +0200 -+++ src/m/amd64.h2005-06-13 09:18:51 +0200 +--- /dev/null2006-10-03 09:22:09 +0200 src/m/amd64.h2006-10-03 09:21:20 +0200 @@ -0,0 +1,131 @@ +/* machine description file for AMD x86-64. + Copyright (C) 2002 Free Software Foundation, Inc. @@ -266,7 +275,7 @@ +/* #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o */ /* XXX */ Index: src/m/ia64.h --- src/m/ia64.h.orig2000-09-29 15:00:37 +0200 -+++ src/m/ia64.h 2005-06-13 09:41:30 +0200 src/m/ia64.h 2006-10-03 09:21:20 +0200 @@ -147,7 +147,7 @@ #ifndef NOT_C_CODE @@ -286,7 +295,7 @@ #define HAVE_TEXT_START Index: src/m/sparc.h --- src/m/sparc.h.orig 2000-09-26 15:02:21 +0200 -+++ src/m/sparc.h2005-06-13 09:18:51 +0200 src/m/sparc.h2006-10-03 09:21:20 +0200 @@ -89,7 +89,7 @@ #define PURESIZE 13 #endif @@ -298,7 +307,7 @@ /* Say that the text segment of a.out includes the header; Index: src/s/freebsd.h --- src/s/freebsd.h.orig 2001-02-20 11:52:17 +0100 -+++ src/s/freebsd.h 2005-06-13 09:18:51 +0200 src/s/freebsd.h 2006-10-03 09:21:20 +0200 @@ -68,6 +68,11 @@ #define LIBS_SYSTEM -lutil #if __FreeBSD_version 40 @@ -313,7 +322,7 @@ #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 2005-06-13 09:18:51 +0200 src/s/netbsd.h 2006-10-03 09:21:20 +0200 @@ -60,9 +60,17 @@ #endif /* not NO_SHARED_LIBS and not ELF */ @@ -342,7 +351,7 @@ +#define POSIX_SIGNALS 1 Index:
[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Steffen Weinreich Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 13-Jun-2005 10:04:44 Branch: HEAD Handle: 2005061309044201 Modified files: openpkg-src/emacs emacs.patch emacs.spec Log: fixed build for ia64-*-freebds Summary: RevisionChanges Path 1.7 +22 -14 openpkg-src/emacs/emacs.patch 1.56+1 -1 openpkg-src/emacs/emacs.spec patch -p0 '@@ .' Index: openpkg-src/emacs/emacs.patch $ cvs diff -u -r1.6 -r1.7 emacs.patch --- openpkg-src/emacs/emacs.patch 12 Jun 2005 21:34:18 - 1.6 +++ openpkg-src/emacs/emacs.patch 13 Jun 2005 08:04:42 - 1.7 @@ -1,6 +1,6 @@ Index: configure --- configure.orig 2003-03-18 15:19:12 +0100 -+++ configure2005-06-12 23:19:03 +0200 configure2005-06-13 09:18:51 +0200 @@ -822,9 +822,13 @@ sparc*-*-netbsd*) machine=sparc ;; vax-*-netbsd*)machine=vax ;; @@ -71,7 +71,7 @@ CPPFLAGS=$REAL_CPPFLAGS Index: src/Makefile.in --- src/Makefile.in.orig 2003-01-23 11:34:06 +0100 -+++ src/Makefile.in 2005-06-12 23:16:20 +0200 src/Makefile.in 2005-06-13 09:18:51 +0200 @@ -155,8 +155,12 @@ /* This holds special options for linking temacs that should be used for linking anything else. */ @@ -87,7 +87,7 @@ #ifndef LD_SWITCH_MACHINE Index: src/alloc.c --- src/alloc.c.orig 2003-01-17 14:45:13 +0100 -+++ src/alloc.c 2005-06-12 23:16:20 +0200 src/alloc.c 2005-06-13 09:18:51 +0200 @@ -3723,8 +3723,12 @@ /* This trick flushes the register windows so that all the state of the process is contained in the stack. */ @@ -103,7 +103,7 @@ registers used to hold register variables and registers used to Index: src/config.in --- src/config.in.orig 2002-07-09 00:23:31 +0200 -+++ src/config.in2005-06-12 23:16:20 +0200 src/config.in2005-06-13 09:18:51 +0200 @@ -354,6 +354,12 @@ /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES @@ -119,7 +119,7 @@ #undef EMACS_CONFIG_OPTIONS Index: src/m/alpha.h --- src/m/alpha.h.orig 2000-10-02 16:30:39 +0200 -+++ src/m/alpha.h2005-06-12 23:16:20 +0200 src/m/alpha.h2005-06-13 09:18:51 +0200 @@ -198,7 +198,7 @@ #ifndef NOT_C_CODE @@ -130,8 +130,8 @@ #endif Index: src/m/amd64.h /dev/null2005-06-12 23:21:40 +0200 -+++ src/m/amd64.h2005-06-12 23:16:20 +0200 +--- /dev/null2005-06-13 09:33:35 +0200 src/m/amd64.h2005-06-13 09:18:51 +0200 @@ -0,0 +1,131 @@ +/* machine description file for AMD x86-64. + Copyright (C) 2002 Free Software Foundation, Inc. @@ -266,7 +266,7 @@ +/* #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o */ /* XXX */ Index: src/m/ia64.h --- src/m/ia64.h.orig2000-09-29 15:00:37 +0200 -+++ src/m/ia64.h 2005-06-12 23:16:20 +0200 src/m/ia64.h 2005-06-13 09:41:30 +0200 @@ -147,7 +147,7 @@ #ifndef NOT_C_CODE @@ -276,9 +276,17 @@ # include alloca.h # else # include stdlib.h +@@ -178,6 +178,6 @@ + + #endif /* not NOT_C_CODE */ + +-#define DATA_SEG_BITS 0x6000 ++#define DATA_SEG_BITS 0x2000 + + #define HAVE_TEXT_START Index: src/m/sparc.h --- src/m/sparc.h.orig 2000-09-26 15:02:21 +0200 -+++ src/m/sparc.h2005-06-12 23:16:20 +0200 src/m/sparc.h2005-06-13 09:18:51 +0200 @@ -89,7 +89,7 @@ #define PURESIZE 13 #endif @@ -290,7 +298,7 @@ /* Say that the text segment of a.out includes the header; Index: src/s/freebsd.h --- src/s/freebsd.h.orig 2001-02-20 11:52:17 +0100 -+++ src/s/freebsd.h 2005-06-12 23:16:20 +0200 src/s/freebsd.h 2005-06-13 09:18:51 +0200 @@ -68,6 +68,11 @@ #define LIBS_SYSTEM -lutil #if __FreeBSD_version 40 @@ -305,7 +313,7 @@ #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 2005-06-12 23:16:20 +0200 src/s/netbsd.h 2005-06-13 09:18:51 +0200 @@ -60,9 +60,17 @@ #endif /* not NO_SHARED_LIBS and not ELF */ @@ -334,7 +342,7 @@ +#define POSIX_SIGNALS 1 Index: src/s/sol2-4.h --- src/s/sol2-4.h.orig 1998-08-29 01:38:20 +0200 -+++ src/s/sol2-4.h 2005-06-12 23:16:20 +0200 src/s/sol2-4.h 2005-06-13 09:18:51 +0200 @@ -24,7 +24,7 @@ /* We use
[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Steffen Weinreich
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jun-2005 23:34:19
Branch: HEAD Handle: 2005061222341800
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
Fixes for NetBSD and amd64, ia64 still broken
Summary:
RevisionChanges Path
1.6 +290 -82openpkg-src/emacs/emacs.patch
1.55+1 -1 openpkg-src/emacs/emacs.spec
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.patch
$ cvs diff -u -r1.5 -r1.6 emacs.patch
--- openpkg-src/emacs/emacs.patch 7 Feb 2005 14:09:38 - 1.5
+++ openpkg-src/emacs/emacs.patch 12 Jun 2005 21:34:18 - 1.6
@@ -1,67 +1,78 @@
configure.orig Thu Jul 31 09:30:40 2003
-+++ configureThu Jul 31 09:32:10 2003
-@@ -805,6 +805,16 @@
- machine='' opsys='' unported=no
- case ${canonical} in
-
-+ ## FreeBSD ports
-+ *-*-freebsd* )
-+opsys=freebsd
+Index: configure
+--- configure.orig 2003-03-18 15:19:12 +0100
configure2005-06-12 23:19:03 +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
+@@ -1628,8 +1632,20 @@
+ ;;
+
+ ## IA-64
+- ia64*-*-linux* )
+-machine=ia64 opsys=gnu-linux
++ ia64*-*-* )
++machine=ia64
+case ${canonical} in
-+ alpha*-*-freebsd*) machine=alpha ;;
-+ i[3456]86-*-freebsd*) machine=intel386 ;;
-+ sparc64-*-freebsd*)machine=sparc ;;
++ *-linux-gnu* )opsys=gnu-linux ;;
++ *-freebsd* ) opsys=freebsd ;;
+esac
+ ;;
+
- ## 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 @@
- ;;
++ 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 ;;
+ *-freebsd* ) opsys=freebsd ;;
++ *-dragonfly* )opsys=freebsd ;;
*-nextstep* ) opsys=nextstep ;;
## Otherwise, we'll fall through to the generic opsys code at the
bottom.
esac
/dev/nullMon 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 */
+@@ -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
+
-+#include sol2-5.h
++ fi
++ if test -f /usr/lib/crtn.o; then
++cat confdefs.h \EOF
++#define HAVE_NETBSD_CRTN 1
++EOF
+
-+/* Avoid conflict between strings.h and iso/string_iso.h */
++ fi
++fi
+
-+#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 @@
+ # Set up the CFLAGS for real compilation, so we can substitute it.
+ CFLAGS=$REAL_CFLAGS
+ CPPFLAGS=$REAL_CPPFLAGS
+Index: src/Makefile.in
+--- src/Makefile.in.orig 2003-01-23 11:34:06 +0100
src/Makefile.in 2005-06-12 23:16:20 +0200
+@@ -155,8 +155,12 @@
/* This
[CVS] OpenPKG: openpkg-src/emacs/ emacs.patch emacs.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-Feb-2005 15:09:38
Branch: HEAD Handle: 2005020714093800
Modified files:
openpkg-src/emacs emacs.patch emacs.spec
Log:
upgrading package: emacs 21.3 - 21.4
Summary:
RevisionChanges Path
1.5 +17 -0 openpkg-src/emacs/emacs.patch
1.51+10 -6 openpkg-src/emacs/emacs.spec
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.patch
$ cvs diff -u -r1.4 -r1.5 emacs.patch
--- openpkg-src/emacs/emacs.patch 2 Mar 2004 19:43:08 - 1.4
+++ openpkg-src/emacs/emacs.patch 7 Feb 2005 14:09:38 - 1.5
@@ -133,3 +133,20 @@
`./prefix-args -Xlinker LD_SWITCH_X_SITE_AUX` \
`NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
#endif /* GCC */
+Index: configure
+--- configure.orig 2005-02-06 12:45:05 +0100
configure2005-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 ;;
@@ .
patch -p0 '@@ .'
Index: openpkg-src/emacs/emacs.spec
$ cvs diff -u -r1.50 -r1.51 emacs.spec
--- openpkg-src/emacs/emacs.spec 1 Jan 2005 10:48:56 - 1.50
+++ openpkg-src/emacs/emacs.spec 7 Feb 2005 14:09:38 - 1.51
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_emacs 21.4
+%define V_leim 21.3
+
# package information
Name: emacs
Summary: The GNU EMACS Text Editor
@@ -33,8 +37,8 @@
Class:BASE
Group:Editor
License: GPL
-Version: 21.3
-Release: 20040920
+Version: %{V_emacs}
+Release: 20050207
# package options
%option with_x11 no
@@ -52,8 +56,8 @@
%endif
# list of sources
-Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
-Source1: ftp://ftp.gnu.org/gnu/emacs/leim-%{version}.tar.gz
+Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{V_emacs}.tar.gz
+Source1: ftp://ftp.gnu.org/gnu/emacs/leim-%{V_leim}.tar.gz
Patch0: emacs.patch
# build information
@@ -93,12 +97,12 @@
%track
prog emacs = {
-version = %{version}
+version = %{V_emacs}
url = ftp://ftp.gnu.org/gnu/emacs/
regex = emacs-(__VER__)\.tar\.gz
}
prog emacs:leim = {
-version = %{version}
+version = %{V_leim}
url = ftp://ftp.gnu.org/gnu/emacs/
regex = leim-(__VER__)\.tar\.gz
}
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
