summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Coie <rac@gentoo.org>2004-09-10 21:46:18 +0000
committerRobert Coie <rac@gentoo.org>2004-09-10 21:46:18 +0000
commitdc92cf89288944131c8ac28eb41f2d20b8c55117 (patch)
tree16d6dc3b6cf9f8a1a3906d633e33058012478d29 /app-editors/xemacs
parentfix ADDPATH path's (diff)
downloadhistorical-dc92cf89288944131c8ac28eb41f2d20b8c55117.tar.gz
historical-dc92cf89288944131c8ac28eb41f2d20b8c55117.tar.bz2
historical-dc92cf89288944131c8ac28eb41f2d20b8c55117.zip
robustify gdbm patch
Diffstat (limited to 'app-editors/xemacs')
-rw-r--r--app-editors/xemacs/ChangeLog5
-rw-r--r--app-editors/xemacs/Manifest4
-rw-r--r--app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch15
3 files changed, 14 insertions, 10 deletions
diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 8a782be790c6..5734b367d8c5 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-editors/xemacs
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.50 2004/09/03 19:04:54 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.51 2004/09/10 21:46:18 rac Exp $
+
+ 10 Sep 2004; Robert Coie <rac@gentoo.org> files/xemacs-21.4.15-gdbm.patch:
+ modify gdbm patch so it will build against either 1.8.0 or 1.8.3
03 Sep 2004; Robert Coie <rac@gentoo.org> xemacs-21.4.15-r2.ebuild:
keywording amd64 and alpha to match gdbm 1.8.3
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 1edf1377904b..680429f3b7bd 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,5 +1,5 @@
MD5 cd336f54fb85ddaeaf1a46bda0909ddb xemacs-21.4.9.ebuild 4175
-MD5 e8cf33b6c221ceaf75d6e12dee61d685 ChangeLog 9207
+MD5 58dfd01a10513d297bed4093766772c8 ChangeLog 9352
MD5 0f39d0139849956930b1a500aca9c6de metadata.xml 365
MD5 55a82a5bffcca6d02689a1b3cad052a9 xemacs-21.4.15-r2.ebuild 5109
MD5 e575bd3c0a8ac4756e3bb8b118c525ef xemacs-21.4.12.ebuild 4944
@@ -18,4 +18,4 @@ MD5 94beef92edcaf12edef657556fbb7a7e files/xemacs-21.4.8-ppc.diff 1032
MD5 678239bc0954d838f5a9c53a6570c850 files/xemacs-21.4.9-ppc-glibc-2.3.x.diff 1112
MD5 c72c4643e7b5e7c44a57766a88838600 files/xemacs-21.4.9-ppc.diff 1031
MD5 6a3d383a050855607a702a56c850ff1a files/digest-xemacs-21.4.15-r1 130
-MD5 f6e1525d3bd987735c9b4bdd169b1591 files/xemacs-21.4.15-gdbm.patch 670
+MD5 0da90396cb9e3ca915e9e00a2f99ee32 files/xemacs-21.4.15-gdbm.patch 639
diff --git a/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch b/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
index 4ad6c82bd598..180c4160834a 100644
--- a/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
+++ b/app-editors/xemacs/files/xemacs-21.4.15-gdbm.patch
@@ -1,16 +1,17 @@
---- xemacs-21.4.15/configure.in.orig 2004-01-24 15:37:54.000000000 +1100
-+++ xemacs-21.4.15/configure.in 2004-08-25 11:08:37.532591944 +1000
-@@ -4420,11 +4420,11 @@
- dnl Check for DBM support in libgdbm.
+--- configure.in.orig 2004-09-10 14:38:08.812210820 -0700
++++ configure.in 2004-09-10 14:39:26.267741413 -0700
+@@ -4421,10 +4421,13 @@
if test "$with_database_gdbm" != "no"; then
AC_CHECK_LIB(gdbm, dbm_open, [
-- with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
-+ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [
+ with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [
++ AC_CHECK_LIB(gdbm_compat, dbm_open, [
++ with_database_gdbm=yes with_database_dbm=no libdbm="-lgdbm -lgdbm_compat"], [
if test "$with_database_gdbm" = "yes"; then
XE_DIE("Required GNU DBM support cannot be provided.")
fi
- with_database_gdbm=no])
-+ with_database_gdbm=no],-lgdbm_compat)
++ with_database_gdbm=no], -lgdbm)
++ ])
fi
dnl Check for DBM support in libc and libdbm.