Fix location of radiusclient.conf when RADIUS_TYPE=RADIUSCLIENT

Make some more options tunable

Noted by:	Jan-Peter Koopmann <Jan-Peter.Koopmann@seceidos.de>

5 files changed, 58 insertions, 25 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index a5e776b..b044917 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -63,13 +63,8 @@ USE_XLIB=	yes
 .endif
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_REINPLACE=	yes
 
-.if !defined(WITHOUT_PERL)
-USE_PERL5=	yes
-.endif
-
 .if !defined(EXIMON_ONLY)
 MAN8=		exim.8
 .else
@@ -96,6 +91,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 MAKE_ENV+=	OSTYPE="${OPSYS}" ARCHTYPE="${ARCH}"
 .if defined(EXIMON_ONLY)
 MAKE_ENV+=	INSTALL_ARG="eximon eximon.bin"
+.elif defined(WITHOUT_SUID)
+MAKE_ENV+=	INSTALL_ARG="-no_chown"
 .endif
 
 EXIM_USER?=	mailnull
@@ -234,6 +231,13 @@ WITH_DEFAULT_CHARSET?=	ISO-8859-1
 #
 # Use the readline(3) library for the test expansion option
 #WITH_READLINE=		yes
+#
+# Don't install the exim binary suid root
+#WITHOUT_SUID=		yes
+#
+# Don't install scripts to run exim as a daemon
+# (for example when using option mua_wrapper)
+#WITHOUT_DAEMON=	yes
 
 # You should not need to fiddle with anything below this point.
 
@@ -248,11 +252,12 @@ PLIST_SUB+=	EXISCAN_ACL=""
 PLIST_SUB+=	EXISCAN_ACL="@comment "
 .endif
 
-SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
-		-e 's,XX_EXIM_USER_XX,${EXIM_USER},' \
-		-e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP},' \
+SEDLIST+=	-e 's,XX_CFLAGS_XX,${CFLAGS},' \
+		-e 's,XX_PREFIX_XX,${PREFIX},' \
 		-e 's,XX_LOCALBASE_XX,${LOCALBASE},' \
 		-e 's,XX_LOG_FILE_PATH_XX,${LOG_FILE_PATH},' \
+		-e 's,XX_EXIM_USER_XX,${EXIM_USER},' \
+		-e 's,XX_EXIM_GROUP_XX,${EXIM_GROUP},' \
 		-e 's,XX_DEFAULT_CHARSET_XX,${WITH_DEFAULT_CHARSET},'
 
 .if defined(WITH_EXIMON)
@@ -263,13 +268,14 @@ PLIST_SUB+=	EXIMON="@comment "
 .endif
 
 .if !defined(WITHOUT_TLS)
-SEDLIST+=	-e 's,^\# (SUPPORT_TLS=),\1,'
 USE_OPENSSL=	yes
+SEDLIST+=	-e 's,^\# (SUPPORT_TLS=),\1,'
 .else
 SEDLIST+=	-e 's,^(TLS_LIBS=),\# \1,'
 .endif
 
 .if !defined(WITHOUT_PERL)
+USE_PERL5=	yes
 SEDLIST+=	-e 's,^\# (EXIM_PERL=),\1,'
 .endif
 
@@ -280,6 +286,14 @@ SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,-lwrap,' \
 SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
 .endif
 
+.if !defined(WITHOUT_ICONV)
+USE_ICONV=	yes
+SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE}/lib -liconv,' \
+		-e 's,^\# (HAVE_ICONV=),\1,'
+.else
+SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,,'
+.endif
+
 .if defined(WITH_LDAP) || defined(LDAP_LIB_TYPE) \
 	|| defined(WITH_OPENLDAP1) || defined(WITH_OPENLDAP2) \
 	|| defined(WITH_OPENLDAP20) || defined(WITH_OPENLDAP21)
@@ -388,7 +402,7 @@ SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-lradius,' \
 .elif ${WITH_RADIUS_TYPE:L} == radiusclient
 LIB_DEPENDS+=	radiusclient.0:${PORTSDIR}/net/radiusclient
 SEDLIST+=	-e 's,XX_RADIUS_LIBS_XX,-L${LOCALBASE}/lib -lradiusclient,' \
-		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/radiusclient.conf,' \
+		-e 's,^\# (RADIUS_CONFIG_FILE=).*,\1${LOCALBASE}/etc/radiusclient.conf,' \
 		-e 's,^\# (RADIUS_LIB_TYPE=).*,\1RADIUSCLIENT,'
 .else
 IGNORE=		WITH_RADIUS_TYPE must be either RADLIB or RADIUSCLIENT
@@ -497,7 +511,7 @@ SEDLIST+=	-e 's,^\# (USE_READLINE=),\1,'
 .error EXIMON_ONLY is not user settable
 .endif
 
-.if !defined(EXIMON_ONLY)
+.if !defined(EXIMON_ONLY) && !defined(WITHOUT_DAEMON)
 USE_RC_SUBR=	yes
 .if defined(WITH_RCORDER) && ${OSVERSION} >= 500037
 RC_DIR=		/etc/rc.d
@@ -515,6 +529,9 @@ PLIST_SUB+=	RCORDER="@comment " \
 SED_SCRIPT+=	-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
 		-e 's,%%RC_DIR%%,${RC_DIR},g' \
 		-e 's,%%RC_SUFX%%,${RC_SUFX},g'
+PLIST_SUB+=	DAEMON=""
+.else
+PLIST_SUB+=	DAEMON="@comment "
 .endif
 
 .if ${OSVERSION} < 400014
@@ -589,11 +606,13 @@ pre-install:
 	@${SETENV} PKG_PREFIX="${PREFIX}" PKG_DESTDIR="${DESTDIR}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+.if !defined(WITHOUT_DAEMON)
 	@${INSTALL_SCRIPT} ${WRKDIR}/exim.sh ${DESTDIR}${RC_DIR}/exim${RC_SUFX}
 	@${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily
 .for script in ${DAILY_SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${DESTDIR}${PREFIX}/etc/periodic/daily/${script}
 .endfor
+.endif
 	@[ -f ${DESTDIR}${PREFIX}/etc/exim/configure ] || \
 		${CP} ${DESTDIR}${PREFIX}/etc/exim/configure.default ${DESTDIR}${PREFIX}/etc/exim/configure
 .for manfile in ${MAN8}
diff --git a/mail/exim/files/patch-OS::Makefile-FreeBSD b/mail/exim/files/patch-OS::Makefile-FreeBSD
index aefbb83..b5f198f 100644
--- a/mail/exim/files/patch-OS::Makefile-FreeBSD
+++ b/mail/exim/files/patch-OS::Makefile-FreeBSD
@@ -1,19 +1,15 @@
 --- OS/Makefile-FreeBSD.orig	Tue Aug 12 17:39:51 2003
 +++ OS/Makefile-FreeBSD	Thu Aug 14 12:10:46 2003
-@@ -5,11 +5,16 @@
+@@ -5,11 +5,12 @@
  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_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
diff --git a/mail/exim/files/patch-src::EDITME b/mail/exim/files/patch-src::EDITME
index 762daaa..5cf3460 100644
--- a/mail/exim/files/patch-src::EDITME
+++ b/mail/exim/files/patch-src::EDITME
@@ -116,8 +116,8 @@
 -# CFLAGS=-O -I/usr/local/include
 -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
 -#
-+CFLAGS+=XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX
-+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX
++CFLAGS=XX_CFLAGS_XX XX_SPF_FLAGS_XX XX_SRS_FLAGS_XX
++EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX XX_ICONV_LIBS_XX XX_SPF_LIBS_XX XX_SRS_LIBS_XX XX_RADIUS_LIBS_XX
 +
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
diff --git a/mail/exim/options b/mail/exim/options
index 622a24c..bc811be 100644
--- a/mail/exim/options
+++ b/mail/exim/options
@@ -145,6 +145,15 @@
 #WITHOUT_READLINE
 # readline(3) library for the test expansion option.
 
+#WITH_SUID
+# Install the exim binary suid root (usually required)
+
+#WITH_DAEMON
+# Don't install scripts to run exim as a daemon
+
+#WITH_ICONV
+# Link with libiconv to enable header charset conversion
+
 ## AUTOMATICALLY GENERATED FILE - DO NOT CHANGE ANYTHING BELOW THIS LINE ##
 # use `make config' to edit the local configuration
 # use `make makeconfig' to edit the defaults (MAINTAINER only)
@@ -258,3 +267,12 @@ WITHOUT_RCORDER?=yes
 .ifndef WITH_READLINE
 WITHOUT_READLINE?=yes
 .endif
+.ifndef WITHOUT_SUID
+WITH_SUID?=yes
+.endif
+.ifndef WITHOUT_DAEMON
+WITH_DAEMON?=yes
+.endif
+.ifndef WITHOUT_ICONV
+WITH_ICONV?=yes
+.endif
diff --git a/mail/exim/pkg-plist b/mail/exim/pkg-plist
index 4a09049..68fea93 100644
--- a/mail/exim/pkg-plist
+++ b/mail/exim/pkg-plist
@@ -1,5 +1,5 @@
 @comment $FreeBSD$
-@unexec [ ! -f /var/run/exim.pid ] || %%RC_DIR%%/exim%%RC_SUFX%% stop || true
+%%DAEMON%%@unexec [ ! -f /var/run/exim.pid ] || %%RC_DIR%%/exim%%RC_SUFX%% stop || true
 sbin/exim
 sbin/exim-%%EXIM_VERSION%%
 sbin/exim_checkaccess
@@ -44,10 +44,10 @@ sbin/exiwhat
 %%PORTDOCS%%%%EXAMPLESDIR%%/pcretest
 %%PORTDOCS%%%%EXAMPLESDIR%%/transport-filter.pl
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-etc/periodic/daily/150.exim-tidydb
-etc/periodic/daily/460.exim-mail-rejects
-@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
-@unexec rmdir %D/etc/periodic 2>/dev/null || true
+%%DAEMON%%etc/periodic/daily/150.exim-tidydb
+%%DAEMON%%etc/periodic/daily/460.exim-mail-rejects
+%%DAEMON%%@unexec rmdir %D/etc/periodic/daily 2>/dev/null || true
+%%DAEMON%%@unexec rmdir %D/etc/periodic 2>/dev/null || true
 @unexec if cmp -s %D/etc/exim/configure %D/etc/exim/configure.default; then rm -f %D/etc/exim/configure; fi
 etc/exim/configure.default
 @exec [ -f %B/configure ] || cp %B/%f %B/configure
@@ -55,6 +55,6 @@ etc/exim/configure.default
 %%SA_EXIM%%etc/exim/sa-exim.conf.default
 %%SA_EXIM%%@exec [ -f %B/sa-exim.conf ] || cp %B/%f %B/sa-exim.conf
 @unexec rmdir %B 2>/dev/null || true
-%%RCORDER%%@cwd /
-etc/rc.d/exim%%RC_SUFX%%
+%%DAEMON%%%%RCORDER%%@cwd /
+%%DAEMON%%etc/rc.d/exim%%RC_SUFX%%
 @unexec rmdir %%LOGDIR%% 2>/dev/null || true