diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-05-08 09:30:49 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-05-08 09:30:49 +0000 |
| commit | 32b9c94506cb20a275197f1801eacb78343f9cf0 (patch) | |
| tree | ab34e0af38165b9f01e14c8e3c71d4e42f23e7e0 /mail-mta/exim | |
| parent | New addition (diff) | |
| download | gentoo-2-32b9c94506cb20a275197f1801eacb78343f9cf0.tar.gz gentoo-2-32b9c94506cb20a275197f1801eacb78343f9cf0.tar.bz2 gentoo-2-32b9c94506cb20a275197f1801eacb78343f9cf0.zip | |
Fix compilation of Exim on FreeBSD, bug #235785
(Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'mail-mta/exim')
| -rw-r--r-- | mail-mta/exim/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-mta/exim/exim-4.75-r1.ebuild | 3 | ||||
| -rw-r--r-- | mail-mta/exim/files/exim-4.75-makefile-freebsd.patch | 50 |
3 files changed, 57 insertions, 2 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/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 |