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:
Revision Changes Path
1.9 +18 -325 openpkg-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 -0000 1.8
+++ openpkg-src/emacs/emacs.patch 7 Jun 2007 08:41:45 -0000 1.9
@@ -1,87 +1,7 @@
-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"
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: 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
Index: src/m/sparc.h
---- 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 @@
+--- src/m/sparc.h.orig 2007-01-14 04:10:22 +0100
++++ src/m/sparc.h 2007-06-07 10:27:37 +0200
+@@ -76,7 +76,7 @@
#define PURESIZE 130000
#endif
@@ -305,53 +42,9 @@
/* This really belongs in s/sun.h. */
/* 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 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
Index: src/s/sol2-4.h
---- 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
+--- 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
@@ -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.
@@ -362,8 +55,8 @@
`NOT_USING_MOTIF || echo ' -R/usr/dt/lib -L/usr/dt/lib'`
#endif /* GCC */
Index: src/s/sol2-8.h
---- /dev/null 2006-10-03 09:22:09 +0200
-+++ src/s/sol2-8.h 2006-10-03 09:21:20 +0200
+--- /dev/null 2007-06-07 10:27:45 +0200
++++ src/s/sol2-8.h 2007-06-07 10:27:37 +0200
@@ -0,0 +1,10 @@
+/* Handle Solaris 2.8 and 2.9 */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 emacs.spec
--- openpkg-src/emacs/emacs.spec 1 Jan 2007 17:37:41 -0000 1.62
+++ openpkg-src/emacs/emacs.spec 7 Jun 2007 08:41:46 -0000 1.63
@@ -23,13 +23,13 @@
##
# package version
-%define V_emacs 21.4a
-%define V_subdir 21.4
+%define V_emacs 22.1
+%define V_subdir 22.1
%define V_leim 21.4
# package information
Name: emacs
-Summary: The GNU EMACS Text Editor
+Summary: GNU Emacs Text Editor
URL: http://www.gnu.org/software/emacs/
Vendor: Richard Stallmann et al.
Packager: OpenPKG Foundation e.V.
@@ -38,10 +38,11 @@
Group: Editor
License: GPL
Version: %{V_emacs}
-Release: 20061016
+Release: 20070607
# package options
%option with_x11 no
+%option with_gtk no
%option with_xaw3d no
%option with_jpeg no
%option with_png no
@@ -50,7 +51,7 @@
%option with_leim no
# package option dependencies
-%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes" || "%{with_tiff}" ==
"yes" || "%{with_gif}" == "yes" || "%{with_xaw3d}" == "yes"
+%if "%{with_jpeg}" == "yes" || "%{with_png}" == "yes" || "%{with_tiff}" ==
"yes" || "%{with_gif}" == "yes" || "%{with_xaw3d}" == "yes" || "%{with_gtk}" ==
"yes"
%undefine with_x11
%define with_x11 yes
%endif
@@ -68,6 +69,10 @@
%if "%{with_x11}" == "yes"
BuildPreReq: X11
PreReq: X11
+%if "%{with_gtk}" == "yes"
+BuildPreReq: gtk2, pkgconfig
+PreReq: gtk2
+%endif
%if "%{with_xaw3d}" == "yes"
BuildPreReq: xaw3d
PreReq: xaw3d
@@ -93,7 +98,10 @@
AutoReqProv: no
%description
- The popular GNU EMACS text editor.
+ The popular GNU Emacs text editor, an extensible, customizable,
+ self-documenting real-time display editor. GNU Emacs at its core
+ is powered by an interpreter for Emacs Lisp, a dialect of the Lisp
+ programming language with extensions to support text editing.
%track
prog emacs = {
@@ -114,10 +122,11 @@
%endif
%patch -p0
case "%{l_platform -p}" in
- ix86-fedora4 ) %{l_shtool} subst -e 's;/\* \(#define CANNOT_DUMP\)
\*/;\1 1;' src/m/intel386.h ;;
+ ix86-fedora[4-7] ) %{l_shtool} subst -e 's;/\* \(#define
CANNOT_DUMP\) \*/;\1 1;' src/m/intel386.h ;;
esac
%build
+ # configure program
%if "%{with_xaw3d}" != "yes"
( echo "ac_cv_header_X11_Xaw3d_Scrollbar_h=no"
echo "ac_cv_lib_Xaw3d_XawScrollbarSetThumb=no"
@@ -146,10 +155,17 @@
--cache-file=./config.cache \
%endif
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --infodir=%{l_prefix}/info \
%if "%{with_x11}" == "yes"
--with-x \
--x-includes=`%{l_rc} --query x11_incdir` \
--x-libraries=`%{l_rc} --query x11_libdir` \
+%if "%{with_gtk}" == "yes"
+ --with-x-toolkit=gtk \
+%else
+ --with-x-toolkit=athena \
+%endif
%if "%{with_xaw3d}" == "yes"
--with-toolkit-scroll-bars \
%else
@@ -167,11 +183,12 @@
%if "%{with_gif}" == "yes"
--with-gif \
%endif
- --with-x-toolkit=athena
%else
--with-x-toolkit=no \
--without-x
%endif
+
+ # build program
cmd="%{l_make} %{l_mflags -O}"
if [ ".`uname -s`" = .Linux ] && %{l_shtool} path -s setarch; then
# work-around conflicting Exec-shield security feature
@@ -180,20 +197,25 @@
eval $cmd
%install
+ # install program
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install \
- prefix=$RPM_BUILD_ROOT%{l_prefix} \
- exec_prefix=$RPM_BUILD_ROOT%{l_prefix}
- rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
+ %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
+
+ # strip down installation files
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/emacs-%{version}
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/rcs-checkin
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/[ce]tags
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/[ce]tags.1
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/b2m
+
+ # rearrange and strip down info pages
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
mv $RPM_BUILD_ROOT%{l_prefix}/info $RPM_BUILD_ROOT%{l_prefix}/info.old
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/info
mv $RPM_BUILD_ROOT%{l_prefix}/info.old/emacs*
$RPM_BUILD_ROOT%{l_prefix}/info/
rm -rf $RPM_BUILD_ROOT%{l_prefix}/info.old
+
+ # determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
