Fix compilation of Exim on FreeBSD, bug #235785

Package-Manager: portage-2.2.01.18252-prefix/cvs/Darwin powerpc

4 files changed, 63 insertions, 7 deletions

diff --git a/mail-mta/exim/ChangeLog b/mail-mta/exim/ChangeLog
index 84e58307baad..9df67d0e4721 100644
--- a/mail-mta/exim/ChangeLog
+++ b/mail-mta/exim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.188 2011/05/07 19:12:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.189 2011/05/08 09:30:49 grobian Exp $
+
+  08 May 2011; Fabian Groffen <grobian@gentoo.org> exim-4.75-r1.ebuild,
+  +files/exim-4.75-makefile-freebsd.patch:
+  Fix compilation of Exim on FreeBSD, bug #235785
 
 *exim-4.75-r1 (07 May 2011)
 
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 25608ab69c13..87ab956c319f 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -12,6 +12,7 @@ AUX exim-4.74-makefile-posix.patch 2481 RMD160 16dd801d493052bac75dad5681d690c13
 AUX exim-4.74-pcre.patch 901 RMD160 9092fddcbe708324edf97c61e5054ad96cc2e9b6 SHA1 9e95c060806bd58b988d792e6b2a09df498cac5d SHA256 aa5dddba316473be96deaab4ecbc1ed391e231eeabcc78b47ac2baad75184a31
 AUX exim-4.74-radius-db-ENV-clash.patch 667 RMD160 8c71dce1c622bc80580cc81b5a5c2646fe18f222 SHA1 d29358b74b3ad1e921f652e04e064ced59a4361d SHA256 a4150c9b73203dd284faa646a67e39f431d07c6a378af8fabc97a4ad9e078437
 AUX exim-4.75-CVE-2011-1764.patch 1292 RMD160 6b676c2b15bc9e1f7656397e1dcab98ca79c5869 SHA1 d63bd68da6414f9af279d4a98137a438fe24649b SHA256 169b20a7038570621062074e54d6f18c1852eed0af3ad39a3c4c37dcd27a790c
+AUX exim-4.75-makefile-freebsd.patch 1206 RMD160 a0e394d04a1ff7a4caf09fb0a078dbf1f04da7dc SHA1 12bd58038523d87d943796139310e9236c593acb SHA256 f219c59168cf591bde202ab32586b09c52eab695feb00d64e288fe9b1e45086a
 AUX exim.confd 62 RMD160 d8dcabf184ffb9066ad45c3e77cce1ec0392a143 SHA1 c56feda3c3193fad26852310da8ef24ef91f60f6 SHA256 668f912565a59926957090c6143f669f0e9de2cf441507d3c05fcd046865b401
 AUX exim.logrotate 193 RMD160 af18b62c88fd86b421abe487a232f26bf5287dd5 SHA1 c12f3b44de8a51dd41c4dbf2179a2b0f9d4cbaf4 SHA256 41930f48d934dea0ad14a868c591fe1c47a5f6403d66f8a2d5f4092cd13f8b5c
 AUX exim.rc6 731 RMD160 07036a18cf072edb4a44b2ecdee21274542d1740 SHA1 bc92933d66befc68906bf9a5b83091c606323c1e SHA256 7c13ad60d4c6c9a29071aff8b68e81a6dd513b018cf0774e446c1afc3dcdc3c4
@@ -26,14 +27,14 @@ EBUILD exim-4.72-r1.ebuild 10352 RMD160 e259bf98d4197e778fe608433650c5cfdec0655d
 EBUILD exim-4.72.ebuild 10288 RMD160 9e51b3905d85e9efc564727f9831ad2678b44a72 SHA1 f42c253d762274976c05fbc998763f812e946224 SHA256 f09b3182b970280ae79333c91d5ea074fe85fbf072d7eda427f5235cf1a6acb5
 EBUILD exim-4.74-r1.ebuild 10444 RMD160 439ae1edecb5574bfc162c04f32856f4751712bd SHA1 32c013c84826d867554e5bfa1122e565cfbd3309 SHA256 820328ddbb652b6a0c30aef66c9cf3c71394b6837833a99c5b5d1a861e3a3fdc
 EBUILD exim-4.74-r2.ebuild 10448 RMD160 f864ecaad8a329f93d6f65354eb9c24c1505cc9a SHA1 3cf4b693f404dc903c386a1ef3882a04dc7bf75f SHA256 69401dd653880d72972844346b705754f006ae4ced1e5be4547179e91b2c0ea8
-EBUILD exim-4.75-r1.ebuild 10340 RMD160 c9ffe07ccc2319650eeffec61f411662a4b63ae9 SHA1 48149e2e5f9b72ca1e8f4af8e3eec21ea211c43d SHA256 411e7f0e55dc374cca575a856f183a0954a183467a28fd6567cb2414795dcbac
+EBUILD exim-4.75-r1.ebuild 10395 RMD160 4bdb77de9a954576a60f7d52290c757b4305b5aa SHA1 6eeb04fece6b686073928a1e90b15b2c053486fd SHA256 af3d400f8a09c1088ba1dfc4169f6570d7ba123c596fb2f5186be703a72e2087
 EBUILD exim-4.75.ebuild 10287 RMD160 b77ebd1519b26f97965159ec0208370c2224a6b0 SHA1 fec2250cdc652c40042433b43269049ed98a64e1 SHA256 0fc8df2f0b8d936d368ae21aa3e4c7508cab38bf75ee41b2897b8a457e7144ce
-MISC ChangeLog 39371 RMD160 5c22923e0818c72b27a9c0d7e6157e6213c68c7b SHA1 be00f88fd27428cfa23f30ea8a5481c9846f940c SHA256 03afb872bac8b2f43c27a81d37838c3ba2d3621379720f6b8e6b4055895c82ee
+MISC ChangeLog 39537 RMD160 25f0703b5fde5e3503ab653c91b3723713d8b188 SHA1 e31a999212cf720d354b3bd567b022922236a0de SHA256 654d53bf91bab3424ec613feb8b38877863af152a49cb3c7af5fdafebbccd2fc
 MISC metadata.xml 1745 RMD160 9a78e06e7038d79e2eb1e08017a2a5e6b53aa63f SHA1 892aff75716b8b21fda4d61289cc388ce0b7a3d1 SHA256 6c25800686eeb918e03fbe6caa54c38512c843e8eca3a2db8783289a9b12bea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk3FmbYACgkQX3X2B8XHToncTACfRBjk+O7AvIqThrk6m6XBZbhP
-iKAAoKS0RUDBnI9P+sh1uxbMvzZe5Rhq
-=A0Of
+iEYEARECAAYFAk3GYsMACgkQX3X2B8XHTon5gQCeMfYAY93m54i5WaJ/Jo3sXZHv
+KAgAnja+V/NtULhBXTAYHTlVjK5tl4Sj
+=yy6B
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/exim/exim-4.75-r1.ebuild b/mail-mta/exim/exim-4.75-r1.ebuild
index 0e876c2e09a8..c9ee38edc2a0 100644
--- a/mail-mta/exim/exim-4.75-r1.ebuild
+++ b/mail-mta/exim/exim-4.75-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.75-r1.ebuild,v 1.1 2011/05/07 19:12:59 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.75-r1.ebuild,v 1.2 2011/05/08 09:30:49 grobian Exp $
 
 EAPI="3"
 
@@ -72,6 +72,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
 	epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
 	epatch "${FILESDIR}"/exim-4.75-CVE-2011-1764.patch
+	epatch "${FILESDIR}"/exim-4.75-makefile-freebsd.patch
 
 	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
 	use dsn && epatch "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
diff --git a/mail-mta/exim/files/exim-4.75-makefile-freebsd.patch b/mail-mta/exim/files/exim-4.75-makefile-freebsd.patch
new file mode 100644
index 000000000000..3096e4c92000
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.75-makefile-freebsd.patch
@@ -0,0 +1,50 @@
+--- OS/Makefile-FreeBSD
++++ OS/Makefile-FreeBSD
+@@ -1,14 +1,12 @@
+ # $Cambridge: exim/src/OS/Makefile-FreeBSD,v 1.6 2009/11/19 18:58:44 nm4 Exp $
+ 
+-# Exim: OS-specific make file for FreeBSD
+-# There's no setting of CFLAGS here, to allow the system default
+-# for "make" to be the default.
+-
+-PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
+-
+-CHOWN_COMMAND=/usr/sbin/chown
+-STRIP_COMMAND=/usr/bin/strip
+-CHMOD_COMMAND=/bin/chmod
++# Exim: OS-specific FreeBSD make file, modified for Gentoo Prefix
++
++
++BASENAME_COMMAND=look_for_it
++CHOWN_COMMAND=look_for_it
++CHGRP_COMMAND=look_for_it
++CHMOD_COMMAND=look_for_it
+ 
+ HAVE_SA_LEN=YES
+ 
+@@ -18,23 +16,12 @@
+ # Dynamicly loaded modules need to be built with -fPIC
+ CFLAGS_DYNAMIC=-shared -rdynamic -fPIC
+ 
+-# FreeBSD always ships with Berkeley DB
++DBMLIB = -ldb
+ USE_DB=yes
+ 
+-# This code for building outside ports suggested by Richard Clayton
+-.ifdef   X11BASE
+-X11=${X11BASE}
+-.elifdef LOCALBASE
+-X11=$(LOCALBASE)
+-.else
+-X11=/usr/local
+-.endif
+-
++X11=/usr/X11R6
+ XINCLUDE=-I$(X11)/include
+ XLFLAGS=-L$(X11)/lib
+-.if ${PORTOBJFORMAT} == "elf"
+-XLFLAGS+=-Wl,-rpath,${X11}/lib
+-.endif
+ X11_LD_LIB=$(X11)/lib
+ 
+ EXIWHAT_PS_ARG=-ax