Index: head/mail/exim/Makefile =================================================================== --- head/mail/exim/Makefile (revision 87218) +++ head/mail/exim/Makefile (revision 87219) @@ -1,357 +1,356 @@ # New ports collection makefile for: exim # Date created: 23 June 1996 # Whom: markm@FreeBSD.org # # $FreeBSD$ # PORTNAME= exim PORTVERSION= ${EXIM_VERSION} -PORTREVISION= 2 CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_EXIM} \ - http://duncanthrax.net/%SUBDIR%/:exiscan_acl -MASTER_SITE_SUBDIR= exim4 exiscan-acl/:exiscan_acl +MASTER_SITES= ${MASTER_SITE_EXIM} +MASTER_SITE_SUBDIR= exim4 DISTFILES= exim-${EXIM_VERSION}${EXTRACT_SUFX} \ exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX} +DIST_SUBDIR= exim + .if !defined(WITHOUT_EXISCAN) -DISTFILES+= exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2:exiscan_acl +PATCH_SITES= http://duncanthrax.net/%SUBDIR%/ +PATCH_SITE_SUBDIR= exiscan-acl +PATCHFILES= exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2 .endif -DIST_SUBDIR= exim -EXTRACT_ONLY= exim-${EXIM_VERSION}${EXTRACT_SUFX} \ - exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX} - MAINTAINER= sheldonh@FreeBSD.org COMMENT= High performance MTA for Unix systems on the Internet LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv USE_BZIP2= yes USE_PERL5= yes MAN8= exim.8 +INFO= exim exim_filter -EXIM_VERSION= 4.21 +EXIM_VERSION= 4.22 EXIM_DOCVERSION= 4.20 EXISCAN_ACL_VERSION= ${EXIM_VERSION}-10 -PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}" +PLIST_SUB+= EXIM_VERSION="${EXIM_VERSION}" .if defined(NOPORTDOCS) PKGMESSAGE= ${WRKDIR}/POST-INSTALL-NOTES .endif +PATCH_DIST_STRIP= -p1 + MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} LOCALBASE=${LOCALBASE} POSTGRESQL_PORT?= databases/postgresql7 # 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 # If WITHOUT_EXISCAN is defined, exim will be built without exiscan # email content scanner support. #WITHOUT_EXISCAN= yes # Define WITH_TCP_WRAPPERS, WITH_MYSQL, and WITH_PGSQL to link against # libwrap, 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_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 # Define WITH_OPENLDAP1, WITH_OPENLDAP20 or WITH_OPENLDAP21 to link # against the respective OpenLDAP library. # Exim also supports NETSCAPE and SOLARIS7 lookup types, but no # client libraries exist for these in the ports tree. #WITH_OPENLDAP1= yes #WITH_OPENLDAP20= yes #WITH_OPENLDAP21= yes # 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, 4 or # 41 which depends on the databases/db4 or databases/db41 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, RFC 2595 and # Microsoft "Secure Password Authentication" authentication mechanisms, # used for SMTP AUTH. #WITHOUT_PAM= yes #WITHOUT_AUTH_CRAM_MD5= yes #WITHOUT_AUTH_PLAINTEXT= yes #WITHOUT_AUTH_SPA= yes # # Disable built-in Exim support for additional mailbox formats. #WITHOUT_MAILDIR= yes #WITHOUT_MAILSTORE= yes #WITHOUT_MBX= yes # # Define WITHOUT_CDB, WITHOUT_DSEARCH, WILD_LSEARCH and WITHOUT_NIS to # disable support for CDB-style, directory-list, wildcarded-file and NIS # lookups respectively. #WITHOUT_CDB= yes #WITHOUT_DSEARCH= yes #WITHOUT_WILDLSEARCH= yes #WITHOUT_NIS= yes # # Disable support for the LMTP (RFC 2033 "SMTP over command pipe") # transport. #WITHOUT_LMTP= yes # # Include the unsupported patches in ${PATCHDIR}/wishlist-*.patch #WITH_WISHLIST= yes # 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 .if defined(WITH_WISHLIST) EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name 'wishlist-*.patch'` .endif .include PORTDOC_FILES= Exim3.upgrade Exim4.upgrade OptionLists.txt README \ dbm.discuss.txt filter.txt pcrepattern.txt pcretest.txt \ spec.txt .if !defined(WITHOUT_EXISCAN) PORTDOC_FILES+= exiscan-acl-examples.txt exiscan-acl-spec.txt -PLIST_SUB+= EXISCAN_ACL="" +PLIST_SUB+= EXISCAN_ACL="" .else -PLIST_SUB+= EXISCAN_ACL="@comment " +PLIST_SUB+= EXISCAN_ACL="@comment " .endif .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) LDAP_LIB_TYPE?=OPENLDAP1 .if (${LDAP_LIB_TYPE} == OPENLDAP1) || (${LDAP_LIB_TYPE} == UMICHIGAN) WITH_OPENLDAP1= yes .elif ${LDAP_LIB_TYPE} == OPENLDAP2 WITH_OPENLDAP2= yes .else .error LDAP_LIB_TYPE must be either OPENLDAP1 or OPENLDAP2 .endif .endif .if defined(WITH_OPENLDAP1) && ( defined(WITH_OPENLDAP2) || \ defined(WITH_OPENLDAP20) || defined(WITH_OPENLDAP21) ) .error please select only one OpenLDAP version .elif defined(WITH_OPENLDAP20) && defined(WITH_OPENLDAP21) .error OpenLDAP 2.0 and 2.1 are mutually exclusive .endif .if defined(WITH_OPENLDAP21) LDAP_LIB_TYPE= OPENLDAP2 LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap21-client .elif defined(WITH_OPENLDAP2) || defined(WITH_OPENLDAP20) LDAP_LIB_TYPE= OPENLDAP2 LIB_DEPENDS+= lber.2:${PORTSDIR}/net/openldap20-client .elif defined(WITH_OPENLDAP1) LDAP_LIB_TYPE= OPENLDAP1 LIB_DEPENDS+= lber.1:${PORTSDIR}/net/openldap12 .elif defined(LDAP_LIB_TYPE) .error please choose the OpenLDAP version you want to use .endif .if defined(LDAP_LIB_TYPE) 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= DB_INCLUDES= SEDLIST+= -e 's,^DBMLIB=,\#DBMLIB=,' .elif (${DB_LIB_VERSION} == 4) DB_LIBS= -L${LOCALBASE}/lib -ldb4 DB_INCLUDES= -I${LOCALBASE}/include/db4 LIB_DEPENDS+= db4.0:${PORTSDIR}/databases/db4 .elif (${DB_LIB_VERSION} == 41) DB_LIBS= -L${LOCALBASE}/lib -ldb41 DB_INCLUDES= -I${LOCALBASE}/include/db41 LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 .else .error DB_LIB_VERSION must be either 1, 4 or 41 .endif SEDLIST+= -e 's,XX_DB_LIBS_XX,${DB_LIBS},' \ -e 's,XX_DB_INCLUDES_XX,${DB_INCLUDES},' .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(WITHOUT_AUTH_SPA) SEDLIST+= -e 's,^\# AUTH_SPA=,AUTH_SPA=,' .endif .if defined(WITH_PGSQL) LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} 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(LDAP_LIB_TYPE) && \ ${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_DSEARCH) SEDLIST+= -e 's,^\# LOOKUP_DSEARCH=,LOOKUP_DSEARCH=,' .endif .if !defined(WITHOUT_WILDLSEARCH) SEDLIST+= -e 's,^\# LOOKUP_WILDLSEARCH=,LOOKUP_WILDLSEARCH=,' .endif .if !defined(WITHOUT_NIS) SEDLIST+= -e 's,^\# LOOKUP_NIS=,LOOKUP_NIS=,' .endif .if !defined(WITHOUT_LMTP) SEDLIST+= -e 's,^\# TRANSPORT_LMTP=,TRANSPORT_LMTP=,' .endif pre-everything:: .if empty(.MAKEFLAGS:M-s) && defined(WITH_WISHLIST) @${ECHO} '' @${ECHO} 'Included extra patches:' @${FIND} ${PATCHDIR} -name 'wishlist-*.patch' \ -exec ${SED} -ne 's,^# , ,p' {} \; @${ECHO} '' .endif post-patch: .if !defined(WITHOUT_EXISCAN) - ${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2 \ - | ${PATCH} -d ${WRKSRC} -p1 > ${WRKDIR}/patch-exiscan-acl.log 2>&1 @${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan-acl \ ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES .else @${CAT} ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES .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} ${WRKDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DOCSDIR} .for file in ${PORTDOC_FILES} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/exim + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR} .endfor .for file in ${MAN8} - ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${PREFIX}/man/man8 + ${INSTALL_MAN} ${WRKSRC}/doc/${file} ${MAN8PREFIX}/man/man8 .endfor .endif @${CAT} ${PKGMESSAGE} @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/mail/exim/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.148 \ No newline at end of property +1.149 \ No newline at end of property Index: head/mail/exim/distinfo =================================================================== --- head/mail/exim/distinfo (revision 87218) +++ head/mail/exim/distinfo (revision 87219) @@ -1,3 +1,3 @@ -MD5 (exim/exim-4.21.tar.bz2) = 16b1290e4c289c7d70294ca447b0a3bc +MD5 (exim/exim-4.22.tar.bz2) = 938ae799c08ed1899dd27fd50d48f4e5 MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d -MD5 (exim/exiscan-acl-4.21-10.patch.bz2) = b22d3ed3e132ea11069b89ae4269f493 +MD5 (exim/exiscan-acl-4.22-10.patch.bz2) = 239fb3db3eeb5da7c816ce2765b5db2a Property changes on: head/mail/exim/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.56 \ No newline at end of property +1.57 \ No newline at end of property Index: head/mail/exim/files/patch-src::os.c =================================================================== --- head/mail/exim/files/patch-src::os.c (revision 87218) +++ head/mail/exim/files/patch-src::os.c (nonexistent) @@ -1,19 +0,0 @@ -*** src/os.c.orig Tue Aug 12 16:39:56 2003 ---- src/os.c Thu Aug 14 15:53:49 2003 -*************** -*** 659,665 **** - addrp = &ifreq.V_ifr_addr; - - #else -! memcpy((char *)&ifreq, cp, len); - memcpy(addrbuf, (char *)&(ifreq.V_ifr_addr), len - sizeof(ifreq.V_ifr_name)); - addrp = (struct sockaddr *)addrbuf; - #endif ---- 659,665 ---- - addrp = &ifreq.V_ifr_addr; - - #else -! memcpy((char *)&ifreq, cp, sizeof(ifreq)); - memcpy(addrbuf, (char *)&(ifreq.V_ifr_addr), len - sizeof(ifreq.V_ifr_name)); - addrp = (struct sockaddr *)addrbuf; - #endif Property changes on: head/mail/exim/files/patch-src::os.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/mail/exim/files/patch-OS::Makefile-FreeBSD =================================================================== --- head/mail/exim/files/patch-OS::Makefile-FreeBSD (revision 87218) +++ head/mail/exim/files/patch-OS::Makefile-FreeBSD (revision 87219) @@ -1,19 +1,19 @@ --- OS/Makefile-FreeBSD.orig Tue Aug 12 17:39:51 2003 +++ OS/Makefile-FreeBSD Thu Aug 14 12:10:46 2003 -@@ -5,12 +5,16 @@ +@@ -5,11 +5,16 @@ PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout CHOWN_COMMAND=/usr/sbin/chown +STRIP_COMMAND=/usr/bin/strip - HAVE_ICONV=yes ++HAVE_ICONV=yes HAVE_SA_LEN=YES # crypt() is in a separate library LIBS=-lcrypt + +# iconv() is in a separate 4rd party library +LFLAGS+=-liconv -L${LOCALBASE}/lib # FreeBSD always ships with Berkeley DB USE_DB=yes Property changes on: head/mail/exim/files/patch-OS::Makefile-FreeBSD ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/mail/exim/files/patch-src::EDITME =================================================================== --- head/mail/exim/files/patch-src::EDITME (revision 87218) +++ head/mail/exim/files/patch-src::EDITME (revision 87219) @@ -1,125 +1,126 @@ ---- src/EDITME.orig Mon Jul 22 10:59:47 2002 -+++ src/EDITME Mon Sep 16 11:33:03 2002 +--- src/EDITME.orig Mon Aug 18 14:52:52 2003 ++++ src/EDITME Mon Aug 18 17:34:17 2003 @@ -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 runtime - # configuration if this file does not exist. +@@ -114,7 +114,7 @@ + # don't exist. It will also install a default runtime configuration if this + # file does not exist. -CONFIGURE_FILE=/usr/exim/configure +CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure # It is possible to specify a colon-separated list of files for CONFIGURE_FILE. # In this case, Exim will use the first of them that exists when it is run. -@@ -131,14 +131,14 @@ +@@ -132,14 +132,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 -@@ -264,6 +264,7 @@ +@@ -265,6 +265,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. -@@ -276,8 +277,10 @@ +@@ -277,8 +278,10 @@ # 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=-IXX_PREFIX_XX/include XX_DB_INCLUDES_XX +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 +DBMLIB=XX_DB_LIBS_XX #------------------------------------------------------------------------------ -@@ -288,7 +290,7 @@ +@@ -289,7 +292,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 -@@ -326,7 +328,7 @@ +@@ -393,7 +396,7 @@ # SUPPORT_TLS=yes # Uncomment this setting if you are using OpenSSL -# TLS_LIBS=-lssl -lcrypto +TLS_LIBS=-lssl -lcrypto # Uncomment these settings if you are using GnuTLS # USE_GNUTLS=yes -@@ -377,7 +379,7 @@ +@@ -444,7 +447,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 #------------------------------------------------------------------------------ -@@ -390,7 +392,7 @@ +@@ -457,7 +460,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 -@@ -493,12 +495,20 @@ - - # USE_TCP_WRAPPERS=yes - # CFLAGS=-O -I/usr/local/include --# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap +@@ -594,12 +597,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. +# 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 (which is run by "make # install") is to install the Exim binary with a unique name such as -@@ -726,7 +736,7 @@ +@@ -841,7 +852,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.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/mail/exim/pkg-plist =================================================================== --- head/mail/exim/pkg-plist (revision 87218) +++ head/mail/exim/pkg-plist (revision 87219) @@ -1,37 +1,31 @@ etc/exim/configure.default etc/rc.d/exim.sh -info/exim.info -info/exim_filter.info sbin/exim sbin/exim-%%EXIM_VERSION%%-1 sbin/exim_checkaccess sbin/exim_dumpdb sbin/exim_fixdb sbin/exim_lock sbin/exim_tidydb sbin/exinext sbin/exiwhat sbin/exim_dbmbuild sbin/exicyclog sbin/exigrep sbin/eximstats sbin/exiqgrep sbin/exiqsumm -%%PORTDOCS%%share/doc/exim/POST-INSTALL-NOTES -%%PORTDOCS%%share/doc/exim/Exim3.upgrade -%%PORTDOCS%%share/doc/exim/Exim4.upgrade -%%PORTDOCS%%share/doc/exim/OptionLists.txt -%%PORTDOCS%%share/doc/exim/README -%%PORTDOCS%%share/doc/exim/dbm.discuss.txt -%%PORTDOCS%%share/doc/exim/filter.txt -%%PORTDOCS%%share/doc/exim/pcrepattern.txt -%%PORTDOCS%%share/doc/exim/pcretest.txt -%%PORTDOCS%%share/doc/exim/spec.txt -%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-examples.txt -%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-spec.txt -@unexec install-info --delete %D/info/exim.info %D/info/dir -@unexec install-info --delete %D/info/exim_filter.info %D/info/dir -@exec install-info --section="Exim" --entry "* Exim Specification: (exim). Exim manual" %D/info/exim.info %D/info/dir -@exec install-info --section="Exim" --entry "* Exim Filtering: (exim_filter). Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir +%%PORTDOCS%%%%DOCSDIR%%/POST-INSTALL-NOTES +%%PORTDOCS%%%%DOCSDIR%%/Exim3.upgrade +%%PORTDOCS%%%%DOCSDIR%%/Exim4.upgrade +%%PORTDOCS%%%%DOCSDIR%%/OptionLists.txt +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/dbm.discuss.txt +%%PORTDOCS%%%%DOCSDIR%%/filter.txt +%%PORTDOCS%%%%DOCSDIR%%/pcrepattern.txt +%%PORTDOCS%%%%DOCSDIR%%/pcretest.txt +%%PORTDOCS%%%%DOCSDIR%%/spec.txt +%%PORTDOCS%%%%EXISCAN_ACL%%%%DOCSDIR%%/exiscan-acl-examples.txt +%%PORTDOCS%%%%EXISCAN_ACL%%%%DOCSDIR%%/exiscan-acl-spec.txt @dirrm etc/exim -@dirrm share/doc/exim +%%PORTDOCS%%@dirrm %%DOCSDIR%% Property changes on: head/mail/exim/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.29 \ No newline at end of property +1.30 \ No newline at end of property