OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Peter Smej
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 13-Jan-2003 18:15:38
Branch: HEAD Handle: 2003011317153700
Added files:
openpkg-src/emacs emacs.patch sol2-8.h
Modified files:
openpkg-src/emacs emacs.spec
Log:
Appended patches for Solaris 2.8 and 2.9
Summary:
Revision Changes Path
1.1 +44 -0 openpkg-src/emacs/emacs.patch
1.30 +6 -1 openpkg-src/emacs/emacs.spec
1.1 +10 -0 openpkg-src/emacs/sol2-8.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.patch
============================================================================
$ cvs diff -u -r0 -r1.1 emacs.patch
--- /dev/null 2003-01-13 18:15:37.000000000 +0100
+++ emacs.patch 2003-01-13 18:15:37.000000000 +0100
@@ -0,0 +1,44 @@
+--- configure.orig Mon Jan 13 17:26:11 2003
++++ configure Mon Jan 13 17:26:09 2003
+@@ -1527,8 +1527,18 @@
+ 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 ;;
+--- configure.in.orig Mon Jan 13 17:26:10 2003
++++ configure.in Mon Jan 13 17:26:10 2003
+@@ -901,8 +901,18 @@
+ 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 ;;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/emacs.spec
============================================================================
$ cvs diff -u -r1.29 -r1.30 emacs.spec
--- openpkg-src/emacs/emacs.spec 3 Jan 2003 11:24:13 -0000 1.29
+++ openpkg-src/emacs/emacs.spec 13 Jan 2003 17:15:37 -0000 1.30
@@ -33,7 +33,7 @@
Group: Editor
License: GPL
Version: 21.2
-Release: 20030103
+Release: 20030113
# package options
%option with_x11 %{l_test -p x11}
@@ -48,6 +48,8 @@
# list of sources
Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz
+Source1: sol2-8.h
+Patch0: emacs.patch
# build information
Prefix: %{l_prefix}
@@ -72,8 +74,11 @@
%prep
%setup -q
+ %patch0 -p0
%build
+ %{l_shtool} install -c -m 755 \
+ %{SOURCE sol2-8.h} ${RPM_BUILD_DIR}emacs-%{version}/src/s/sol2-8.h
%{l_shtool} subst \
-e 's;/${version}/;/;g' \
-e 's;/${version};;g' \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/emacs/sol2-8.h
============================================================================
$ cvs diff -u -r0 -r1.1 sol2-8.h
--- /dev/null 2003-01-13 18:15:37.000000000 +0100
+++ sol2-8.h 2003-01-13 18:15:37.000000000 +0100
@@ -0,0 +1,10 @@
+/* Handle Solaris 2.8 and 2.9 . */
+
+#include "sol2-5.h"
+
+/* Avoid conflict with strings.h iso/string_iso.h */
+
+#undef bcmp
+#undef bcopy
+#undef bzero
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
