aboutsummaryrefslogtreecommitdiff
path: root/mail/nmh
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2002-04-21 16:25:02 +0000
committerCy Schubert <cy@FreeBSD.org>2002-04-21 16:25:02 +0000
commit6d25bcb88dbe8ba88134152f42627e1330a4cd59 (patch)
tree58d84bbb843a9effb984acff37189c8afb54d6ab /mail/nmh
parent831b64a69b39e9babf682c1d7c1102db76795760 (diff)
downloadports-6d25bcb88dbe8ba88134152f42627e1330a4cd59.tar.gz
ports-6d25bcb88dbe8ba88134152f42627e1330a4cd59.zip
Notes
Diffstat (limited to 'mail/nmh')
-rw-r--r--mail/nmh/Makefile58
-rw-r--r--mail/nmh/files/patch-ac15
2 files changed, 48 insertions, 25 deletions
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index c1dbe7b4fe54..312f28220dd2 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -6,6 +6,25 @@
#
# Makefile variables of interest:
#
+# NMH_EDITOR - pass an EDITOR specification through to nmh's configure
+# script's '--with-editor' option.
+#
+# NMH_EXTRA_CONFIGURE_ARGS - extra args passed through to 'configure'.
+#
+# NMH_LOCKING - specify the style of locking to be used by nmh for the
+# users' spool files (e.g. the 'inc' command). Must match the
+# locking style used by your MTA - the default is FLOCK_LOCKING
+# (the documented behavior for the 'mail.local' delivery program).
+# Do a 'make patch', then look in the source directory (currently
+# the config.h.in file) for more information on different locking
+# settings. Current valid settings are:
+# DOT_LOCKING FCNTL_LOCKING LOCKF_LOCKING FLOCK_LOCKING
+#
+# NMH_MASQUERADE - specify the type(s) of masquerading to allow. This
+# is passed through to nmh's "--enable-masquerade" configure
+# option and the current syntax for that string is:
+# 'draft_from[ mmailid[ username_extension]]'
+#
# NMH_MTS - pass an MTS specification through to nmh's configure
# script's "--with-mts" option. Do a "make extract" and check
# the NMH distribution's "INSTALL" file for more info.
@@ -21,25 +40,11 @@
# rewriting facilities of "qmail-inject", if you are using qmail,
# may be available this way, but not via NMH_MTS=smtp.
#
-# NMH_EDITOR - pass an EDITOR specification through to nmh's configure
-# script's '--with-editor' option.
-#
# NMH_PAGER - pass an PAGER specification through to nmh's configure
# script's '--with-pager' option.
#
-# NMH_LOCKING - specify the style of locking to be used by nmh for the
-# users' spool files (e.g. the 'inc' command). Must match the
-# locking style used by your MTA - the default is FLOCK_LOCKING
-# (the documented behavior for the 'mail.local' delivery program).
-# Do a 'make patch', then look in the source directory (currently
-# the config.h.in file) for more information on different locking
-# settings. Current valid settings are:
-# DOT_LOCKING FCNTL_LOCKING LOCKF_LOCKING FLOCK_LOCKING
-#
-# NMH_MASQUERADE - specify the type(s) of masquerading to allow. This
-# is passed through to nmh's "--enable-masquerade" configure
-# option and the current syntax for that string is:
-# 'draft_from[ mmailid[ username_extension]]'
+# NMH_POP - specify "enable" or "disable" for --enable-pop (or --disable-pop).
+# Default is "enable".
#
# NMH_SMTPSERVERS - specify a blank-separated list of SMTP servers -
# passed through to nmh's configure scripts '--with-smtpservers'
@@ -58,26 +63,35 @@ MAINTAINER= Scott.Blachowicz@seaslug.org
USE_AUTOCONF_VER=213
CONFIGURE_ARGS= --libdir=${PREFIX}/libexec/nmh \
- --sysconfdir=${PREFIX}/etc/nmh --enable-nmh-pop
-.ifdef NMH_MTS
-CONFIGURE_ARGS+= --with-mts=${NMH_MTS}
-.endif
+ --sysconfdir=${PREFIX}/etc/nmh
.ifdef NMH_EDITOR
CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR}
.endif
.ifdef NMH_MASQUERADE
CONFIGURE_ARGS+= --enable-masquerade="${NMH_MASQUERADE}"
.endif
+.ifndef NMH_LOCKING
+NMH_LOCKING=FLOCK_LOCKING
+.endif
+.ifdef NMH_MTS
+CONFIGURE_ARGS+= --with-mts=${NMH_MTS}
+.endif
.ifdef NMH_PAGER
CONFIGURE_ARGS+= --with-pager=${NMH_PAGER}
.endif
+.ifdef NMH_POP
+CONFIGURE_ARGS+= --${NMH_POP}-pop
+.else
+CONFIGURE_ARGS+= --enable-pop
+.endif
.ifdef NMH_SMTPSERVERS
CONFIGURE_ARGS+= --with-smtpservers="${NMH_SMTPSERVERS}"
.endif
-.ifndef NMH_LOCKING
-NMH_LOCKING=FLOCK_LOCKING
+.ifdef NMH_EXTRA_CONFIGURE_ARGS
+CONFIGURE_ARGS+= ${NMH_EXTRA_CONFIGURE_ARGS}
.endif
+
CFLAGS+= -D${NMH_LOCKING}
MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 flist.1 folder.1 forw.1 \
diff --git a/mail/nmh/files/patch-ac b/mail/nmh/files/patch-ac
index cdec2d44e152..c9ffcc5168f4 100644
--- a/mail/nmh/files/patch-ac
+++ b/mail/nmh/files/patch-ac
@@ -1,6 +1,6 @@
---- ../../nmh-1.0.2-DIST/configure.in Tue Oct 26 14:12:37 1999
-+++ ./configure.in Sat Dec 11 11:54:28 1999
-@@ -160,6 +160,11 @@
+--- ../../../nmh-1.0.4/configure.in Wed Mar 15 15:37:30 2000
++++ ./configure.in Sun Mar 31 18:55:06 2002
+@@ -193,6 +193,11 @@
dnl ------------------
AC_PROG_MAKE_SET dnl Does make define $MAKE
AC_PROG_INSTALL dnl Check for BSD compatible `install'
@@ -12,3 +12,12 @@
AC_PROG_RANLIB dnl Check for `ranlib'
AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk
AC_PROG_LEX dnl Check for lex/flex
+@@ -389,7 +394,7 @@
+ AC_FUNC_VFORK
+ AC_CHECK_LIB(mkstemp,mkstemp)
+ AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
+- sighold sigrelse writev lstat uname tzset killpg mkstemp \
++ sighold sigrelse writev lstat tzset killpg mkstemp \
+ sethostent)
+
+ dnl solaris screws this up