- add no_x11 flavor

- make build respect CC and CFLAGS
- add HOMEPAGE
- move example configuration to ${PREFIX}/share/examples/
- add RCS IDs
ok peter@

mail/exim/Makefile

@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2000/06/04 22:42:05 espie Exp $
-#
+# $OpenBSD: Makefile,v 1.14 2000/08/02 15:44:11 naddy Exp $
 
 DISTNAME=	exim-3.14
 CATEGORIES=	mail
-#FAKE=No
+NEED_VERSION=	1.319
+
+HOMEPAGE=	http://www.exim.org/
 
 MAINTAINER=	peter.galbavy@knowledge.com
 
@@ -12,24 +13,33 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/
+MASTER_SITES=	ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
+		ftp://ftp.exim.org/pub/exim/ \
+		ftp://ftp.fu-berlin.de/unix/mail/exim/
 DISTFILES=	exim-3.14.tar.gz exim-texinfo-3.10.tar.gz
 
+FLAVORS=	no_x11
+FLAVOR?=
+.if !${FLAVOR:L:Mno_x11}
+USE_X11=	Yes
+.endif
+MAKE_ENV=	FLAVOR="${FLAVOR}"
+
 do-configure:
 	@mkdir -p ${WRKSRC}/Local
 	@cp ${FILESDIR}/Makefile ${WRKSRC}/Local
 	@cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
-	@(cd ${WRKSRC}/doc ; \
+	@cd ${WRKSRC}/doc ; \
 	for i in ../../exim-texinfo-3.10/doc/* ; do \
 		ln -sf $$i ; \
-	done )
+	done
 
 pre-install:
 	${INSTALL} -d ${DESTDIR}/etc/exim
 
 post-install:
-	${INSTALL_DATA_DIR}	${PREFIX}/lib/exim
-	@cp ${WRKSRC}/src/configure.default ${PREFIX}/lib/exim/configure.sample
-
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/exim
+	${INSTALL_DATA} ${WRKSRC}/src/configure.default \
+		${PREFIX}/share/examples/exim/configure.sample
 
 .include <bsd.port.mk>

mail/exim/files/Makefile

@@ -1,3 +1,4 @@
+# $OpenBSD: Makefile,v 1.6 2000/08/02 15:44:12 naddy Exp $
 ##################################################
 #          The Exim mail transport agent         #
 ##################################################
@@ -240,8 +241,9 @@ EXICYCLOG_MAX=10
 # locations of various X11 directories for libraries and include files
 # are defaulted in the OS/Makefile-Default file, and can be overridden
 # in local OS-specific make files.
-
+.if !${FLAVOR:L:Mno_x11}
 EXIM_MONITOR=eximon.bin
+.endif
 
 
 # Compiling in support for embedded Perl: If you want to be able to

mail/exim/files/eximon.conf

@@ -1,3 +1,4 @@
+# $OpenBSD: eximon.conf,v 1.4 2000/08/02 15:44:12 naddy Exp $
 ##################################################
 #                The Exim Monitor                #
 ##################################################

mail/exim/patches/patch-OS_Makefile-Default

@@ -0,0 +1,12 @@
+$OpenBSD: patch-OS_Makefile-Default,v 1.1 2000/08/02 15:44:12 naddy Exp $
+--- OS/Makefile-Default.orig	Thu Jul 27 14:37:08 2000
++++ OS/Makefile-Default	Thu Jul 27 14:37:22 2000
+@@ -53,7 +53,7 @@
+ 
+ # CC contains the name of the C compiler to be used.
+ 
+-CC=gcc
++# CC=gcc
+ 
+ 
+ # CFLAGS contains flags to be passed to the compiler. Nothing is defaulted

mail/exim/patches/patch-OS_Makefile-OpenBSD

@@ -0,0 +1,11 @@
+$OpenBSD: patch-OS_Makefile-OpenBSD,v 1.1 2000/08/02 15:44:12 naddy Exp $
+--- OS/Makefile-OpenBSD.orig	Thu Jul 27 14:38:00 2000
++++ OS/Makefile-OpenBSD	Thu Jul 27 14:38:12 2000
+@@ -1,7 +1,6 @@
+ # Exim: OS-specific make file for OpenBSD
+ 
+ CHOWN_COMMAND=/usr/sbin/chown
+-CFLAGS=-O
+ 
+ HAVE_SA_LEN=YES
+ 

mail/exim/patches/patch-src_transports_appendfile_c

@@ -1,3 +1,4 @@
+$OpenBSD: patch-src_transports_appendfile_c,v 1.1 2000/08/02 15:44:12 naddy Exp $
 --- src/transports/appendfile.c.orig	Wed Apr 12 11:44:59 2000
 +++ src/transports/appendfile.c	Mon Jun  5 00:14:52 2000
 @@ -2330,9 +2330,16 @@ opened, so that it goes away on closure.

mail/exim/pkg/DESCR

@@ -5,3 +5,5 @@ similar to Smail 3, but its facilities are more extensive. It contains
 facilities for verifying incoming sender and recipient addresses, for refusing
 mail from specified hosts, networks, or senders, and for controlling mail
 relaying.
+
+WWW: ${HOMEPAGE}

mail/exim/pkg/PFRAG.no-no_x11

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2000/08/02 15:44:12 naddy Exp $
+sbin/eximon
+sbin/eximon.bin

mail/exim/pkg/PLIST

@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/06/04 22:42:06 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2000/08/02 15:44:12 naddy Exp $
 sbin/exim
-sbin/eximon
-sbin/eximon.bin
+!%%no_x11%%
 sbin/exim_dumpdb
 sbin/exim_fixdb
 sbin/exim_tidydb
@@ -22,8 +21,8 @@ info/exim_filter.info
 @unexec install-info --delete %D/info/exim_overview.info %D/info/dir
 @unexec install-info --delete %D/info/exim.info %D/info/dir
 @unexec install-info --delete %D/info/exim_filter.info %D/info/dir
-lib/exim/configure.sample
+share/examples/exim/configure.sample
 @exec [ -d /etc/exim ] || mkdir /etc/exim
 @exec [ -f /etc/exim/configure ] || install -m 644 %D/%F /etc/exim/configure
-@dirrm lib/exim
+@dirrm share/examples/exim
 @unexec echo "Please remove the /etc/exim directory manually"