Index: head/mail/exim/Makefile =================================================================== --- head/mail/exim/Makefile (revision 66429) +++ head/mail/exim/Makefile (revision 66430) @@ -1,250 +1,251 @@ # New ports collection makefile for: exim # Date created: 23 June 1996 # Whom: markm@FreeBSD.org # # $FreeBSD$ # PORTNAME= exim PORTVERSION= ${EXIM_VERSION} +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ http://www.exim.org/ftp/exim4/ \ ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/ DISTFILES= exim-${EXIM_VERSION}.tar.bz2 \ exim-texinfo-${EXIM_DOCVERSION}.tar.bz2 MAINTAINER= sheldonh@FreeBSD.org USE_BZIP2= yes MAN8= exim.8 EXIM_VERSION= 4.10 EXIM_DOCVERSION= 4.10 PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}" .if defined(NOPORTDOCS) PKGMESSAGE= ${FILESDIR}/POST-INSTALL-NOTES .endif MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} # If WITH_EXIMON is defined, the eximon monitor, which requires X, # will be made a dependency. Note that using WITH_EXIMON will cause # XFree86 to be installed if it is not present. #WITH_EXIMON= yes # Define WITH_TCP_WRAPPERS, WITH_LDAP, WITH_MYSQL, and WITH_PGSQL to # link against libwrap, an LDAP library (see below), liblibmysqlclient # and libpq respectively. Define WITH_PWCHECK to link against libsasl # for SMTP AUTH authentication via the Cyrus SASL pwcheck daemon. #WITH_TCP_WRAPPERS= yes #WITH_LDAP= yes #WITH_MYSQL= yes #WITH_PGSQL= yes #WITH_PWCHECK= yes # Define WITHOUT_IPV6 to exclude IPv6 support from the compiled exim # binary. Exim compiled with IPv6 support will still operate on # systems that do not have IPv6 kernel support, so this should not # be necessary. #WITHOUT_IPV6= yes # If WITH_LDAP is defined, LDAP_LIB_TYPE must be either OPENLDAP1 or # OPENLDAP2. UMICHIGAN is an alias for OPENLDAP1. Exim also supports # NETSCAPE and SOLARIS7 lookup types, but no client libraries exist # for these in the ports tree. LDAP_LIB_TYPE?=OPENLDAP1 # DB_LIB_VERSION is the version of the Berkeley DB library to use, and # may be 1, which corresponds to version 1.85 in the base system, or 4 # which depends on the databases/db4 port. DB_LIB_VERSION?=1 # The following options may be defined to turn off support for various # features that this port enables by default. # # Do not link against OpenSSL; disables STARTTLS. #WITHOUT_TLS= yes # # Disable the embedded Perl interpreter, which allows Perl subroutines to # be called during string expansion. #WITHOUT_PERL= yes # # Disable built-in Exim support for the PAM, RFC 2195 and RFC 2595 # authentication mechanisms, used for SMTP AUTH. #WITHOUT_PAM= yes #WITHOUT_AUTH_CRAM_MD5= yes #WITHOUT_AUTH_PLAINTEXT= yes # # Disable built-in Exim support for additional mailbox formats. #WITHOUT_MAILDIR= yes #WITHOUT_MAILSTORE= yes #WITHOUT_MBX= yes # # Disable support for CDB-style lookups. #WITHOUT_CDB= yes # # Disable support for the LMTP (RFC 2033 "SMTP over command pipe") # transport. #WITHOUT_LMTP # You should not need to fiddle with anything below this point. .if defined(WITH_EXIMON) RUN_DEPENDS= ${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor .endif .include PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \ dbm.discuss.txt exim.8 filter.txt pcre.txt pcretest.txt \ spec.txt .if ${OSVERSION} < 400014 WITHOUT_IPV6= yes .endif SEDLIST= -e 's,XX_PREFIX_XX,${PREFIX},' .if !defined(WITHOUT_TLS) SEDLIST+= -e 's,^\# SUPPORT_TLS=,SUPPORT_TLS=,' .else SEDLIST+= -e 's,^TLS_LIBS=,\#TLS_LIBS=,' .endif .if !defined(WITHOUT_PERL) SEDLIST+= -e 's,^\# EXIM_PERL=,EXIM_PERL=,' .endif .if defined(WITH_TCP_WRAPPERS) SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \ -e 's,^\# USE_TCP_WRAPPERS=,USE_TCP_WRAPPERS=,' .else SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,' .endif .if defined(WITH_LDAP) .if (${LDAP_LIB_TYPE} == OPENLDAP1) || (${LDAP_LIB_TYPE} == UMICHIGAN) LIB_DEPENDS+= lber.1:${PORTSDIR}/net/openldap .elif ${LDAP_LIB_TYPE} == OPENLDAP2 LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap2 .else .error LDAP_LIB_TYPE must be either OPENLDAP1 or OPENLDAP2 .endif SEDLIST+= -e 's,XX_LDAP_LIBS_XX,-L${LOCALBASE}/lib -llber -lldap,' \ -e 's,XX_LDAP_INCLUDE_XX,-I${LOCALBASE}/include,' \ -e 's,XX_LDAP_TYPE_XX,${LDAP_LIB_TYPE},' \ -e 's,^\# LOOKUP_LDAP=,LOOKUP_LDAP=,' .else SEDLIST+= -e 's,XX_LDAP_[^ ]*_XX,,' \ -e 's,^LDAP_LIB_TYPE=,\#LDAP_LIB_TYPE=,' .endif .if (${DB_LIB_VERSION} == 1) DB_LIBS= .elif (${DB_LIB_VERSION} == 4) DB_LIBS= -ldb4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .else .error DB_LIB_VERSION must be either 1 or 4 .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${LOCALBASE}/lib/mysql -lmysqlclient,' \ -e 's,XX_MYSQL_INCLUDE_XX,-I${LOCALBASE}/include/mysql,' \ -e 's,^\# LOOKUP_MYSQL=,LOOKUP_MYSQL=,' .else SEDLIST+= -e 's,XX_MYSQL_[^ ]*_XX,,' .endif .if defined(WITH_PWCHECK) RUN_DEPENDS+= ${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl SEDLIST+= -e 's,^\# SUPPORT_CYRUS_PWCHECK=,SUPPORT_CYRUS_PWCHECK=,' \ -e 's,^\# CYRUS_PWCHECK_SOCKET=,CYRUS_PWCHECK_SOCKET=,' .endif .if !defined(WITHOUT_PAM) SEDLIST+= -e 's,XX_PAM_LIBS_XX,-lpam,' \ -e 's,^\# SUPPORT_PAM=,SUPPORT_PAM=,' .else SEDLIST+= -e 's,XX_PAM_LIBS_XX,,' .endif .if !defined(WITHOUT_AUTH_CRAM_MD5) SEDLIST+= -e 's,^\# AUTH_CRAM_MD5=,AUTH_CRAM_MD5=,' .endif .if !defined(WITHOUT_AUTH_PLAINTEXT) SEDLIST+= -e 's,^\# AUTH_PLAINTEXT=,AUTH_PLAINTEXT=,' .endif .if defined(WITH_PGSQL) LIB_DEPENDS+= pq.2:${PORTSDIR}/databases/postgresql7 SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${LOCALBASE}/lib -lpq,' \ -e 's,XX_PGSQL_INCLUDE_XX,-I${LOCALBASE}/include/pgsql,' \ -e 's,^\# LOOKUP_PGSQL=,LOOKUP_PGSQL=,' .else SEDLIST+= -e 's,XX_PGSQL_[^ ]*_XX,,' .endif .if !defined(WITHOUT_IPV6) SEDLIST+= -e 's,^\# HAVE_IPV6=,HAVE_IPV6=,' .endif .if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP) && \ ${DB_LIB_VERSION} == 1 SEDLIST+= -e 's,^LOOKUP_LIBS=,\#LOOKUP_LIBS=,' \ -e 's,^LOOKUP_INCLUDE=,\#LOOKUP_INCLUDE=,' .endif .if !defined(WITHOUT_MAILDIR) SEDLIST+= -e 's,^\# SUPPORT_MAILDIR=,SUPPORT_MAILDIR=,' .endif .if !defined(WITHOUT_MAILSTORE) SEDLIST+= -e 's,^\# SUPPORT_MAILSTORE=,SUPPORT_MAILSTORE=,' .endif .if !defined(WITHOUT_MBX) SEDLIST+= -e 's,^\# SUPPORT_MBX=,SUPPORT_MBX=,' .endif .if !defined(WITHOUT_CDB) SEDLIST+= -e 's,^\# LOOKUP_CDB=,LOOKUP_CDB=,' .endif .if !defined(WITHOUT_LMTP) SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,' .endif do-configure: ${MKDIR} ${WRKSRC}/Local ${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile cd ${WRKSRC}/doc && \ for i in ../../exim-texinfo-${EXIM_DOCVERSION}/doc/* ; do \ ${LN} -sf $$i ; \ done pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL post-install: ${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${PREFIX}/etc/rc.d .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/exim ${INSTALL_DATA} ${FILESDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim .for file in ${PORTDOC_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/exim .endfor .for file in ${MAN8} ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${PREFIX}/man/man8 .endfor .endif @${CAT} ${PKGMESSAGE} .include Property changes on: head/mail/exim/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.113 \ No newline at end of property +1.114 \ No newline at end of property Index: head/mail/exim/files/patch-src::EDITME =================================================================== --- head/mail/exim/files/patch-src::EDITME (revision 66429) +++ head/mail/exim/files/patch-src::EDITME (revision 66430) @@ -1,111 +1,124 @@ --- src/EDITME.orig Mon Jul 22 10:59:47 2002 -+++ src/EDITME Fri Sep 13 13:00:02 2002 ++++ src/EDITME Mon Sep 16 11:33:03 2002 @@ -98,7 +98,7 @@ # /usr/local/sbin. The installation script will try to create this directory, # and any superior directories, if they do not exist. -BIN_DIRECTORY=/usr/exim/bin +BIN_DIRECTORY=XX_PREFIX_XX/sbin #------------------------------------------------------------------------------ @@ -113,7 +113,7 @@ # directories if they don't exist. It will also install a default run time # configuration if this file does not exist. -CONFIGURE_FILE=/usr/exim/configure +CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure #------------------------------------------------------------------------------ @@ -126,14 +126,14 @@ # owner of a local mailbox.) Specifying these values as root is very strongly # discouraged. These values are compiled into the binary. -EXIM_USER= +EXIM_USER=mailnull # If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must # also be a setting of EXIM_GROUP. If, on the other hand, you use a name # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless # you want to use a group other than the default group for the given user. -# EXIM_GROUP= +EXIM_GROUP=mail # Many sites define a user called "exim", with an appropriate default group, # and use @@ -257,6 +257,7 @@ # LDAP_LIB_TYPE=OPENLDAP2 # LDAP_LIB_TYPE=NETSCAPE # LDAP_LIB_TYPE=SOLARIS +LDAP_LIB_TYPE=XX_LDAP_TYPE_XX # If you don't set any of these, Exim assumes the original University of # Michigan (OpenLDAP 1) library. @@ -269,8 +270,9 @@ # don't need to set LOOKUP_INCLUDE if the relevant directories are already # specified in INCLUDE. -# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include -# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq +INCLUDE=-I XX_PREFIX_XX/include +LOOKUP_INCLUDE=XX_MYSQL_INCLUDE_XX XX_PGSQL_INCLUDE_XX XX_LDAP_INCLUDE_XX +LOOKUP_LIBS=XX_MYSQL_LIBS_XX XX_PGSQL_LIBS_XX XX_LDAP_LIBS_XX XX_DB_LIBS_XX #------------------------------------------------------------------------------ @@ -281,7 +283,7 @@ # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. -EXIM_MONITOR=eximon.bin +#EXIM_MONITOR=eximon.bin @@ -316,7 +318,7 @@ # settings commented out. # SUPPORT_TLS=yes -# TLS_LIBS=-lssl -lcrypto +TLS_LIBS=-lssl -lcrypto # If you are running Exim as a server, note that just building it with TLS # support is not all you need to do. You also need to set up a suitable @@ -358,7 +360,7 @@ # Once you have done this, "make install" will build the info files and # install them in the directory you have defined. -# INFO_DIRECTORY=/usr/share/info +INFO_DIRECTORY=XX_PREFIX_XX/info #------------------------------------------------------------------------------ @@ -371,7 +373,7 @@ # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: -# LOG_FILE_PATH=/var/log/exim_%slog +LOG_FILE_PATH=/var/log/exim/%slog # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -474,7 +476,7 @@ +@@ -474,12 +476,20 @@ # USE_TCP_WRAPPERS=yes # CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap +EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -695,7 +697,7 @@ + + ++# IPv6 is coming. Exim has experimental support that has been tried out on ++# one or two OS. See the file README.IPV6 for the current status of this ++# support. Do not set this option unless you are working on IPv6 and know ++# what you are doing. ++ ++# HAVE_IPV6=YES ++ ++ + #------------------------------------------------------------------------------ + # The default action of the exim_install script is to install the Exim binary + # with a unique name such as exim-4.00-1, and then set up a symbolic link +@@ -695,7 +705,7 @@ # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: -# PID_FILE_PATH=/var/lock/exim.pid +PID_FILE_PATH=/var/run/exim.pid # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". Property changes on: head/mail/exim/files/patch-src::EDITME ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property