4 files changed, 67 insertions, 32 deletions

diff --git a/mail/smail/files/EDITME b/mail/smail/files/EDITME
deleted file mode 100644
index 8a30852c1815..000000000000
--- a/mail/smail/files/EDITME
+++ /dev/null
@@ -1,2 +0,0 @@
-OS_TYPE=freebsd2.0
-STRIP=yes
diff --git a/mail/smail/files/freebsd2.0 b/mail/smail/files/freebsd5.in
index 03c2e066b875..e7c05c1e4f2a 100644
--- a/mail/smail/files/freebsd2.0
+++ b/mail/smail/files/freebsd5.in
@@ -1,4 +1,4 @@
-# FreeBSD 2.x
+# FreeBSD 5.x
 
 . $ROOT/conf/os/bsd4.4-lite
 
@@ -14,29 +14,29 @@ OSNAMES="FREEBSD:$OSNAMES"
 #
 #
 MAN1_EXT=1
-MAN1=!!PREFIX!!/man/man1
+MAN1=%%MANPREFIX%%/man/man1
 MAN5_EXT=5
-MAN5=!!PREFIX!!/man/man5
+MAN5=%%MANPREFIX%%/man/man5
 MAN8_EXT=8
-MAN8=!!PREFIX!!/man/man8
+MAN8=%%MANPREFIX%%/man/man8
 
 # SMAIL_BIN_DIR - location for uupath, etc.
-SMAIL_BIN_DIR=!!PREFIX!!/bin
+SMAIL_BIN_DIR=%%PREFIX%%/bin
 
 # SMAIL_NAME - to replace sendmail completely
-SMAIL_NAME=!!PREFIX!!/sbin/sendmail
+SMAIL_NAME=%%PREFIX%%/sbin/sendmail
 
 # OTHER_SMAIL_NAMES - to replace sendmail completely
-OTHER_SMAIL_NAMES=!!PREFIX!!/bin/mailq:!!PREFIX!!/bin/rmail:!!PREFIX!!/bin/rsmtp
+OTHER_SMAIL_NAMES=%%PREFIX%%/bin/mailq:%%PREFIX%%/bin/rmail:%%PREFIX%%/bin/rsmtp
 
 # NEWALIASES - to replace sendmail completely
-NEWALIASES=!!PREFIX!!/bin/newaliases
+NEWALIASES=%%PREFIX%%/bin/newaliases
 
 # LIB_DIR - config files
-LIB_DIR=!!PREFIX!!/etc/smail
+LIB_DIR=%%PREFIX%%/etc/smail
 
 # UTIL_BIN_DIR - programs
-UTIL_BIN_DIR=!!PREFIX!!/libexec/smail
+UTIL_BIN_DIR=%%PREFIX%%/libexec/smail
 
 # Enable rfc1413 (ident protocol) and ESMTP sending support (EHLO)
 HAVE=$HAVE:EHLO:RFC1413:LIBWRAP
@@ -63,19 +63,27 @@ REWRITE_FILE=rewrite
 REWRITE_TYPE=lsearch
 
 # CPPFLAGS - interesting flags for the cpp, and cc commands
-CPPFLAGS="-I. -I.. -I../src -I/usr/local/include -I!!PREFIX!!/include"
+CPPFLAGS="-I. -I.. -I../src %%CPPFLAGS%%"
 
-CFLAGS="$CFLAGS -I!!PREFIX!!/include"
+CFLAGS="%%CFLAGS%%"
 
 # LDFLAGS - flags to pass to the loader
-LDFLAGS="-L/usr/local/lib -L!!PREFIX!!/lib"
+LDFLAGS="%%LDFLAGS%%"
 
 # LIBS - libraries to include in binaries
-LIBS="-lident -lwrap"
+LIBS="%%LIBS%%"
 
 # OSLIBS - we don't have libresolv
-# I doubt that the change to smail-3.2.0.110/conf/os/bsd4.4 is the right way
-# to do it.
 OSLIBS="-lcrypt"
 
-MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX"
+SPOOL_DIRS=/var/spool/smail
+TMP_DIR=/var/spool/smail/tmp
+LOG_DIR=/var/log/smail
+UNSHAR_MAP_DIR=/var/spool/uumaps
+NEWS_SPOOL_DIR=/var/spool/news
+UUWHO_FILE=/var/spool/smail/uuwho
+
+MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX:%%CYRUS_IMAPD%%"
+
+# Architecture type
+ARCH_TYPE=%%ARCH_TYPE%%
diff --git a/mail/smail/files/patch-conf_lib_mkdepend.sh b/mail/smail/files/patch-conf_lib_mkdepend.sh
deleted file mode 100644
index d3b5483761d0..000000000000
--- a/mail/smail/files/patch-conf_lib_mkdepend.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- conf/lib/mkdepend.sh.orig	Tue Dec 31 01:45:53 2002
-+++ conf/lib/mkdepend.sh	Tue Dec 31 01:48:30 2002
-@@ -60,6 +60,7 @@
- 		# the compiler with the sun 3 produces extra garbage after
- 		# the quoted filename.
- 		sed -n 's/^#[ 	]*[0-9]*[ 	]*"\(.*\)"[ 0-9]*$/\1/p' |
-+		grep -v '^<.*>$' |	# remove GCC3 <built-in> etc
- 		sed 's%^\./%%' |	# remove ./ prefixes
- 		# next remove 
- 		sort | uniq |
diff --git a/mail/smail/files/patch-util-Makefile b/mail/smail/files/patch-util-Makefile
new file mode 100644
index 000000000000..238e60556395
--- /dev/null
+++ b/mail/smail/files/patch-util-Makefile
@@ -0,0 +1,42 @@
+--- util/Makefile.orig	Tue Jul 12 18:45:55 2005
++++ util/Makefile	Fri Mar  9 12:47:33 2007
+@@ -35,13 +35,14 @@
+ LOCAL_SRC=addr.c field.c parse.c ascii.c string.c match.c list.c log.c config.c alloc.c hash.c pwcache.c sysdep.c
+ LOCAL_OBJ=addr.o field.o parse.o ascii.o string.o match.o list.o log.o config.o alloc.o hash.o pwcache.o sysdep.o
+ LOCAL_LIB=libsmail.a
+-SH_TARGETS=checkerr cyrus-deliver-noquota getmap init logsumm mkaliases mkcyrusoqlist mkpath \
++SH_TARGETS=checkerr getmap init logsumm mkaliases mkpath \
+ 	   mkuuwho mkhpath bouncemail savelog smailbug unfreezemail
+ C_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap
+ UTIL_TARGETS=${SH_TARGETS} ${C_TARGETS}
+ # this may not always be sane or necessary....
+-BIN_TARGETS=bouncemail cyrus-deliver-noquota mkaliases mkcyrusoqlist smailbug unfreezemail
+-TARGETS=${UTIL_TARGETS} ${BIN_TARGETS}
++BIN_TARGETS=bouncemail mkaliases smailbug unfreezemail
++CYRUS_BIN_TARGETS=cyrus-deliver-noquota mkcyrusoqlist
++TARGETS=${UTIL_TARGETS} ${BIN_TARGETS} ${CYRUS_BIN_TARGETS}
+ STRIP_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap
+ OBJ=mkline.o mksort.o dcasehost.o mkdbm.o pathmerge.o \
+     gleem.o unsharmap.o
+@@ -110,6 +111,21 @@
+ 			fi; \
+ 		done; \
+ 	   esac
++
++install-cyrus-bins: all
++	@. ./${DEFS_SH}; \
++	   case "$$DONT_INSTALL" in \
++	   ?*)	echo Testing ... install ignored; exit 0;; \
++	   esac; \
++	   ${XEXEC} ${SHELL} ${INSTM} -m 0555 $$UTIL_BIN_DIR ${CYRUS_BIN_TARGETS}; \
++	   for i in ${CYRUS_BIN_TARGETS} ; do \
++		case $$UTIL_BIN_DIR in \
++		"$$SMAIL_BIN_DIR")	xx="";; \
++		*)			xx=$$SMAIL_BIN_DIR/$$i;; \
++		esac; \
++		${XEXEC} ${SHELL} ${INST} -m 0555 $$l_flag -d $$UTIL_BIN_DIR $$i $$i $$xx; \
++	   done; \
++
+ 
+ install-libs: ${DEFS_SH}
+ 	@. ./${DEFS_SH}; \