fix bug #35437

6 files changed, 29 insertions, 24 deletions

diff --git a/net-libs/c-client/ChangeLog b/net-libs/c-client/ChangeLog
index 410e9705b8a0..693c9af70a8d 100644
--- a/net-libs/c-client/ChangeLog
+++ b/net-libs/c-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/c-client
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.10 2003/12/09 04:02:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/ChangeLog,v 1.11 2003/12/23 01:20:12 robbat2 Exp $
+
+  22 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> c-client-2002d-r1.ebuild,
+  c-client-2002d.ebuild, c-client-2002e-r1.ebuild, c-client-2002e.ebuild:
+  fix bug #35437
 
 *c-client-2002e-r1 (08 Dec 2003)
 
diff --git a/net-libs/c-client/Manifest b/net-libs/c-client/Manifest
index 10a4f679f279..1f9ee5cf4c60 100644
--- a/net-libs/c-client/Manifest
+++ b/net-libs/c-client/Manifest
@@ -1,11 +1,12 @@
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/Manifest,v 1.19 2003/12/23 01:20:19 robbat2 Exp $
+MD5 1102949fc5064d5740cf01231e7e66b5 c-client-2002e-r1.ebuild 1962
+MD5 f36e9cdb7d26ccadc4e1c42d94a4d391 c-client-2002e.ebuild 1905
+MD5 8b229ccfb81c59e125d7a9f86e0030d7 c-client-2002d-r1.ebuild 1881
+MD5 97081712e58a62ddb1d75d27d163022b ChangeLog 1795
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
+MD5 7611fd4e22d32670428c9fea05b6ef45 c-client-2002d.ebuild 1864
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d-r1 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e-r1 62
 MD5 1fc1132a6fb90046b701e9196e7a96b0 files/digest-c-client-2002d 62
 MD5 27b9eec6a66d66ef07109f82da8f10ce files/digest-c-client-2002e 62
 MD5 c8cf618ac210e06a1641871b30550e8f files/2002d-Makefile.patch 2174
-MD5 7dcc164beedfdf28759f51d9ca565430 c-client-2002e-r1.ebuild 1927
-MD5 b1fd0735fee7ca0ded8c5a609eecdc43 c-client-2002e.ebuild 1906
-MD5 8ddb565867c85086f629382db6465a4f c-client-2002d-r1.ebuild 1882
-MD5 d6fa1b49a873b3a3a9fa65d9ee3eb59c ChangeLog 1625
-MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 f97a541c46f18eb7e090a52335357f11 c-client-2002d.ebuild 1866
diff --git a/net-libs/c-client/c-client-2002d-r1.ebuild b/net-libs/c-client/c-client-2002d-r1.ebuild
index 02310a8c7082..e3b7365528b4 100644
--- a/net-libs/c-client/c-client-2002d-r1.ebuild
+++ b/net-libs/c-client/c-client-2002d-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d-r1.ebuild,v 1.3 2003/10/26 05:35:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d-r1.ebuild,v 1.4 2003/12/23 01:20:12 robbat2 Exp $
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
@@ -36,9 +36,9 @@ src_unpack() {
 	cd ${S}/src/osdep/unix/
 	cp Makefile Makefile.orig
 	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
 		< Makefile.orig > Makefile
 
 	# Apply a patch to only build the stuff we need for c-client
diff --git a/net-libs/c-client/c-client-2002d.ebuild b/net-libs/c-client/c-client-2002d.ebuild
index c1a1a53f63ae..a056f2e728e3 100644
--- a/net-libs/c-client/c-client-2002d.ebuild
+++ b/net-libs/c-client/c-client-2002d.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d.ebuild,v 1.6 2003/09/06 22:04:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002d.ebuild,v 1.7 2003/12/23 01:20:12 robbat2 Exp $
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
@@ -36,9 +36,9 @@ src_unpack() {
 	cd ${S}/src/osdep/unix/
 	cp Makefile Makefile.orig
 	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
 		< Makefile.orig > Makefile
 
 	# Apply a patch to only build the stuff we need for c-client
diff --git a/net-libs/c-client/c-client-2002e-r1.ebuild b/net-libs/c-client/c-client-2002e-r1.ebuild
index aad6bf13e799..1e0d9bd03d8d 100644
--- a/net-libs/c-client/c-client-2002e-r1.ebuild
+++ b/net-libs/c-client/c-client-2002e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r1.ebuild,v 1.1 2003/12/09 04:02:22 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e-r1.ebuild,v 1.2 2003/12/23 01:20:12 robbat2 Exp $
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
@@ -34,10 +34,10 @@ src_unpack() {
 
 	# Modifications so we can build it optimially and correctly
 	sed \
-		-e "s,BASECFLAGS=\".*\",BASECFLAGS=\"${CFLAGS}\",g" \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
-		-i ${S}/src/osdep/unix/Makefile
+		-e "s:BASECFLAGS=\".*\":BASECFLAGS=\"${CFLAGS}\":g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
+		-i ${S}/src/osdep/unix/Makefile || die "Makefile sed fixing failed"
 
 	# Apply a patch to only build the stuff we need for c-client
 	EPATCH_OPTS="${EPATCH_OPTS} -d ${S}" \
diff --git a/net-libs/c-client/c-client-2002e.ebuild b/net-libs/c-client/c-client-2002e.ebuild
index d7ccc49cfac6..248f87bccc12 100644
--- a/net-libs/c-client/c-client-2002e.ebuild
+++ b/net-libs/c-client/c-client-2002e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e.ebuild,v 1.1 2003/10/26 06:46:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/c-client/c-client-2002e.ebuild,v 1.2 2003/12/23 01:20:12 robbat2 Exp $
 
 MY_PN=imap
 MY_P=${MY_PN}-${PV}
@@ -36,9 +36,9 @@ src_unpack() {
 	cd ${S}/src/osdep/unix/
 	cp Makefile Makefile.orig
 	sed \
-		-e 's,-g -fno-omit-frame-pointer -O6,${CFLAGS},g' \
-		-e 's,SSLDIR=/usr/local/ssl,SSLDIR=/usr,g' \
-		-e 's,SSLCERTS=$(SSLDIR)/certs,SSLCERTS=/etc/ssl/certs,g' \
+		-e "s:-g -fno-omit-frame-pointer -O6:${CFLAGS}:g" \
+		-e 's:SSLDIR=/usr/local/ssl:SSLDIR=/usr:g' \
+		-e 's:SSLCERTS=$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:g' \
 		< Makefile.orig > Makefile
 
 	# Apply a patch to only build the stuff we need for c-client