diff options
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 44 | ||||
| -rw-r--r-- | mail/exim/files/patch-scripts::exim_install | 18 | ||||
| -rw-r--r-- | mail/exim/files/patch-src::EDITME | 23 | ||||
| -rw-r--r-- | mail/exim/pkg-plist | 2 |
4 files changed, 33 insertions, 54 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index dc9f0fad3a72..0985dda334ec 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -20,11 +20,10 @@ USE_PERL5= yes MAKE_ENV+= OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} -# If WITHOUT_X11 is not defined, the eximon monitor, which requires X, -# will be built. If you do not have XFree86 installed and you do not -# want to install it, define WITHOUT_X11 during the build. This will -# disable eximon, the Exim monitor. -#WITHOUT_X11= yes +# 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 @@ -72,8 +71,8 @@ LDAP_LIB_TYPE?=OPENLDAP1 # You should not need to fiddle with anything below this point. -.if !defined(WITHOUT_X11) -USE_XLIB= yes +.if defined(WITH_EXIMON) +RUN_DEPENDS= ${LOCALBASE}/sbin/eximon:${PORTSDIR}/mail/exim-monitor .endif .include <bsd.port.pre.mk> @@ -82,16 +81,12 @@ USE_XLIB= yes WITHOUT_IPV6= yes .endif -SEDLIST= -e 's,XX_PREFIX_XX,${PREFIX},' \ - -e 's,XX_BINOWN_XX,${BINOWN},' -.if !defined(USE_XLIB) -SEDLIST+= -e 's,^EXIM_MONITOR,\#EXIM_MONITOR,' -.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,' +SEDLIST+= -e 's,^TLS_LIBS=,\#TLS_LIBS=,' .endif .if !defined(WITHOUT_PERL) @@ -113,19 +108,19 @@ 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${PREFIX}/lib -llber -lldap,' \ - -e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \ +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,' + -e 's,^LDAP_LIB_TYPE=,\#LDAP_LIB_TYPE=,' .endif .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client -SEDLIST+= -e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \ - -e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \ +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,,' @@ -148,8 +143,8 @@ SEDLIST+= -e 's,^\# AUTH_PLAINTEXT=,AUTH_PLAINTEXT=,' .if defined(WITH_PGSQL) LIB_DEPENDS+= pq.2:${PORTSDIR}/databases/postgresql7 -SEDLIST+= -e 's,XX_PGSQL_LIBS_XX,-L${PREFIX}/lib -lpq,' \ - -e 's,XX_PGSQL_INCLUDE_XX,-I${PREFIX}/include/pgsql,' \ +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,,' @@ -160,8 +155,8 @@ SEDLIST+= -e 's,^\# HAVE_IPV6=,HAVE_IPV6=,' .endif .if !defined(WITH_PGSQL) && !defined(WITH_MYSQL) && !defined(WITH_LDAP) -SEDLIST+= -e 's,^LOOKUP_LIBS,\#LOOKUP_LIBS,' \ - -e 's,^LOOKUP_INCLUDE,\#LOOKUP_INCLUDE,' +SEDLIST+= -e 's,^LOOKUP_LIBS=,\#LOOKUP_LIBS=,' \ + -e 's,^LOOKUP_INCLUDE=,\#LOOKUP_INCLUDE=,' .endif .if !defined(WITHOUT_MAILDIR) @@ -183,16 +178,11 @@ SEDLIST+= -e 's,^\# LOOKUP_CDB=,LOOKUP_CDB=,' do-configure: ${MKDIR} ${WRKSRC}/Local ${SED} ${SEDLIST} < ${WRKSRC}/src/EDITME > ${WRKSRC}/Local/Makefile - ${CP} ${WRKSRC}/exim_monitor/EDITME ${WRKSRC}/Local/eximon.conf cd ${WRKSRC}/doc && \ for i in ../../exim-texinfo-3.30/doc/* ; do \ ${LN} -sf $$i ; \ done -post-build: - ${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon.bin - ${TOUCH} ${WRKSRC}/build-${OPSYS}-${MACHINE_ARCH}/eximon - pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/mail/exim/files/patch-scripts::exim_install b/mail/exim/files/patch-scripts::exim_install index fbb13e0bad09..db0bc1168f0a 100644 --- a/mail/exim/files/patch-scripts::exim_install +++ b/mail/exim/files/patch-scripts::exim_install @@ -1,26 +1,8 @@ -This patch makes two changes to the exim_install script: - -*) Changes the test used to determine whether a file should be installed - to cope with files which we "touch" to zero bytes for packaging - purposes. - *) Causes the configure file to be installed as a sample only. The administrator needs to rename this file to "activate" exim. --- scripts/exim_install.orig Mon Aug 2 17:43:03 1999 +++ scripts/exim_install Tue Aug 3 14:31:20 1999 -@@ -146,9 +146,9 @@ - from=../util/ - fi - -- if [ ! -s ${from}${name} ]; then -+ if [ ! -r ${from}${name} ]; then - echo $com "" -- echo $com "*** `pwd`/${from}${name} does not exist or is empty" -+ echo $com "*** `pwd`/${from}${name} does not exist" - echo $com "*** Have you built Exim successfully?" - echo $com "*** Exim installation ${ver}failed ***" - exit 1 @@ -199,25 +199,20 @@ fi done diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME index 2b4699382ff8..6a314acc6ec4 100644 --- a/mail/exim/files/patch-src::EDITME +++ b/mail/exim/files/patch-src::EDITME @@ -43,7 +43,16 @@ # In some installations there may be multiple machines sharing file systems, -@@ -284,7 +284,7 @@ +@@ -243,7 +243,7 @@ + # are defaulted in the OS/Makefile-Default file, and can be overridden + # in local OS-specific make files. + +-EXIM_MONITOR=eximon.bin ++#EXIM_MONITOR=eximon.bin + + + # Compiling in support for embedded Perl: If you want to be able to +@@ -286,7 +286,7 @@ # "panic", or "reject" to form the final file name. For example, some # installations may want something like this: @@ -52,7 +61,7 @@ # 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 -@@ -350,6 +350,8 @@ +@@ -352,6 +352,8 @@ # 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 @@ -61,7 +70,7 @@ # If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP # library you have. Unfortunately, though most of their functions are the -@@ -363,6 +365,7 @@ +@@ -365,6 +367,7 @@ # LDAP_LIB_TYPE=OPENLDAP2 # LDAP_LIB_TYPE=NETSCAPE # LDAP_LIB_TYPE=SOLARIS @@ -69,7 +78,7 @@ # If you don't set any of these, Exim assumes the original University of # Michigan (OpenLDAP 1) library. -@@ -409,7 +412,7 @@ +@@ -411,7 +414,7 @@ # the file name, allowing sites that run two separate daemons to distinguish # them. Some installations may want something like this @@ -78,7 +87,7 @@ # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # (see SPOOL_DIRECTORY below) with the name "exim-daemon.pid" for the standard -@@ -458,7 +461,7 @@ +@@ -460,7 +463,7 @@ # uid and gid. # Many installations will want something like this: @@ -87,7 +96,7 @@ # Others may prefer to keep all Exim things under one directory: # SPOOL_DIRECTORY=/usr/exim/spool -@@ -523,7 +526,7 @@ +@@ -525,7 +528,7 @@ # with TLS support. # SUPPORT_TLS=yes @@ -96,7 +105,7 @@ # If you are running Exim as a server, note that just building it with TLS # support is not usually all you need to do. You normally need to set up a -@@ -573,5 +576,14 @@ +@@ -575,5 +578,14 @@ # chapter on building and installing Exim. # USE_TCP_WRAPPERS=yes diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist index e5c97e42ac94..145dfd50e3d9 100644 --- a/mail/exim/pkg-plist +++ b/mail/exim/pkg-plist @@ -3,8 +3,6 @@ info/exim_overview.info info/exim.info info/exim_filter.info sbin/exim -sbin/eximon -sbin/eximon.bin sbin/exim_dumpdb sbin/exim_fixdb sbin/exim_lock |