View | Details | Raw Unified | Return to bug 110135
Collapse All | Expand All

(-)mail/smail/Makefile (-15 / +82 lines)
Lines 6-42 Link Here
6
#
6
#
7
7
8
PORTNAME=	smail
8
PORTNAME=	smail
9
PORTVERSION=	3.2.0.114
9
PORTVERSION=	3.2.0.121
10
CATEGORIES=	mail
10
CATEGORIES=	mail
11
MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/OLD/ \
11
MASTER_SITES=	ftp://ftp.planix.com/pub/Smail/%SUBDIR%/ \
12
		ftp://ftp.planix.com/pub/Smail/OLD/ \
12
		ftp://ftp.fu-berlin.de/unix/mail/smail/%SUBDIR%/
13
		ftp://ftp.fu-berlin.de/unix/mail/smail/OLD/
13
MASTER_SITE_SUBDIR=	. OLD
14
14
15
MAINTAINER=	ports@FreeBSD.org
15
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	A program used for receiving and delivering mail
16
COMMENT=	A program used for receiving and delivering mail
17
17
18
CONFLICTS=	bsmtp-*
19
20
BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
18
BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
19
LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
21
20
22
CONFLICTS=	courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* zmailer-2.*
21
CONFLICTS=	bsmtp-1.* courier-0.* postfix-1.* postfix-2.* sendmail-8.* sendmail-*-8.* zmailer-2.*
23
INSTALL_TARGET=	install installman
24
22
23
.if !defined(NO_INSTALL_MANPAGES)
25
MAN1=		pathto.1 uuwho.1 uupath.1
24
MAN1=		pathto.1 uuwho.1 uupath.1
26
MAN5=		smailconf.5 smail.5 smaildrct.5 smailmeth.5 smailqual.5 \
25
MAN5=		smailconf.5 smail.5 smaildrct.5 smailmeth.5 smailqual.5 \
27
		smailrtrs.5 smailrtry.5 smailtrns.5
26
		smailrtrs.5 smailrtry.5 smailtrns.5 aliases.5
28
MAN8=		pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \
27
MAN8=		pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \
29
		mkpath.8 pathmerge.8 checkerr.8 getmap.8 mkhpath.8 savelog.8 \
28
		mkpath.8 pathmerge.8 checkerr.8 getmap.8 mkhpath.8 savelog.8 \
30
		mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8 \
29
		mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8 \
31
		newaliases.8 smailbug.8 unfreezemail.8 bouncemail.8
30
		newaliases.8 smailbug.8 unfreezemail.8 bouncemail.8 logsumm.8
31
.endif
32
32
33
post-install:
33
CFLAGS+=	-I${LOCALBASE}/include
34
	@${ECHO_MSG} "If you want to replace sendmail with links to smail, type"
34
LDFLAGS+=	-L${LOCALBASE}/lib
35
	@${ECHO_MSG} "the following command as \"root\":"
35
LIBS+=		-lident -lwrap -lpcre
36
	@${ECHO_MSG} ""
36
37
	@${ECHO_MSG} "      make replace"
37
CYRUS_USER?=	cyrus
38
CYRUS_GROUP?=	cyrus
39
CYRUS_DELIVER_PATH?=	${LOCALBASE}/cyrus/bin/deliver
40
41
OPTIONS=	CYRUS22 "Use mail/cyrus-imapd22 as local transport" off \
42
		CYRUS23 "Use mail/cyrus-imapd23 as local transport" off \
43
		REPLACE_CONF "Replace /etc/mail/mailer.conf" off
38
44
39
.include <bsd.port.pre.mk>
45
.include <bsd.port.pre.mk>
46
47
.if defined(WITH_CYRUS22) && defined(WITH_CYRUS23)
48
IGNORE=		WITH_CYRUS22 and WITH_CYRUS23 are mutually exclusive. Please run make options again
49
.endif
50
51
.if defined(WITH_CYRUS22)
52
CYRUS_PORT=	${PORTSDIR}/mail/cyrus-imapd22
53
.else
54
CYRUS_PORT=	${PORTSDIR}/mail/cyrus-imapd23
55
.endif
56
57
.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23)
58
RUN_DEPENDS+=	cyrus/bin/deliver:${CYRUS_PORT}
59
CYRUS_IMAPD=	USE_CYRUS_IMAPD
60
PLIST_SUB+=	CYRUS_DELIVER=""
61
.else
62
PLIST_SUB+=	CYRUS_DELIVER="@comment "
63
.endif
64
65
.if ${ARCH} == "amd64" || ${ARCH} == "ia64" || ${ARCH} == "sparc64"
66
ARCH_TYPE=64bit
67
.else
68
ARCH_TYPE=32bit
69
.endif
70
71
do-configure:
72
	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
73
		-e 's|%%MANPREFIX%%|${MANPREFIX}|g' \
74
		-e 's|%%CFLAGS%%|${CFLAGS}|g' \
75
		-e 's|%%CPPFLAGS%%|${CPPFLAGS}|g' \
76
		-e 's|%%LDFLAGS%%|${LDFLAGS}|g' \
77
		-e 's|%%LIBS%%|${LIBS}|g' \
78
		-e 's|%%ARCH_TYPE%%|${ARCH_TYPE}|g' \
79
		-e 's|%%CYRUS_IMAPD%%|${CYRUS_IMAPD}|g' \
80
		${FILESDIR}/freebsd5.in > ${WRKSRC}/conf/os/freebsd5
81
	@${ECHO_CMD} OS_TYPE=freebsd5 > ${WRKSRC}/conf/EDITME
82
	@${ECHO_CMD} STRIP=yes >> ${WRKSRC}/conf/EDITME
83
	@${ECHO_CMD} CYRUS_USER="${CYRUS_USER}" >> ${WRKSRC}/conf/EDITME
84
	@${ECHO_CMD} CYRUS_GROUP="${CYRUS_GROUP}" >> ${WRKSRC}/conf/EDITME
85
	@${ECHO_CMD} CYRUS_DELIVER_PATH="${CYRUS_DELIVER_PATH}" >> ${WRKSRC}/conf/EDITME
86
	@${LN} -sf ${WRKSRC}/conf/Make.local-BSD ${WRKSRC}/conf/Make.local
87
	@${REINPLACE_CMD} -e 's|defs install|defs|g' \
88
		${WRKSRC}/man/Makefile
89
	@${ECHO_CMD} >> ${WRKSRC}/man/Makefile
90
	@${ECHO_CMD} install: >> ${WRKSRC}/man/Makefile
91
92
pre-install:
93
	@${MKDIR} ${PREFIX}/etc/smail
94
95
post-install:
96
.if defined(WITH_REPLACE_CONF)
97
	@make replace
98
.endif
99
100
.if defined(WITH_CYRUS22) || defined(WITH_CYRUS23)
101
	@cd ${WRKSRC}/util && make install-cyrus-bins
102
.endif
103
104
.if !defined(NO_INSTALL_MANPAGES)
105
	@cd ${WRKSRC}/man && make installman
106
.endif
40
107
41
replace:
108
replace:
42
.if ${OSVERSION} >= 400014
109
.if ${OSVERSION} >= 400014
(-)mail/smail/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (smail-3.2.0.114.tar.gz) = e7e42019fbaebbcab6ec73d76b662fef
1
MD5 (smail-3.2.0.121.tar.gz) = 0637d2753221ab98e65460a823e1d417
2
SHA256 (smail-3.2.0.114.tar.gz) = 5f0a9fc7bb45dc868e893db06c6d30131006d3cd98bb79d6437e8624fb1d7024
2
SHA256 (smail-3.2.0.121.tar.gz) = 7c81c9ee7d52fee5b1d7d1c3cebe19ca36b3a5c553859c8db3f5625f4a415322
3
SIZE (smail-3.2.0.114.tar.gz) = 849729
3
SIZE (smail-3.2.0.121.tar.gz) = 1833218
(-)mail/smail/files/EDITME (-2 lines)
Lines 1-2 Link Here
1
OS_TYPE=freebsd2.0
2
STRIP=yes
(-)mail/smail/files/freebsd2.0 (-81 lines)
Lines 1-81 Link Here
1
# FreeBSD 2.x
2
3
. $ROOT/conf/os/bsd4.4-lite
4
5
# OSNAMES - Names defining this operating system
6
OSNAMES="FREEBSD:$OSNAMES"
7
8
# MAN1 - where smail user command man pages are to be installed
9
# MAN5 - where smail file format man pages are to be installed
10
# MAN8 - where smail administrator man pages should be installed
11
# MAN1_EXT - file extension for user command man pages
12
# MAN5_EXT - file extension for file format man pages
13
# MAN8_EXT - file extension for adminstrator man pages
14
#
15
#
16
MAN1_EXT=1
17
MAN1=!!PREFIX!!/man/man1
18
MAN5_EXT=5
19
MAN5=!!PREFIX!!/man/man5
20
MAN8_EXT=8
21
MAN8=!!PREFIX!!/man/man8
22
23
# SMAIL_BIN_DIR - location for uupath, etc.
24
SMAIL_BIN_DIR=!!PREFIX!!/bin
25
26
# SMAIL_NAME - to replace sendmail completely
27
SMAIL_NAME=!!PREFIX!!/sbin/sendmail
28
29
# OTHER_SMAIL_NAMES - to replace sendmail completely
30
OTHER_SMAIL_NAMES=!!PREFIX!!/bin/mailq:!!PREFIX!!/bin/rmail:!!PREFIX!!/bin/rsmtp
31
32
# NEWALIASES - to replace sendmail completely
33
NEWALIASES=!!PREFIX!!/bin/newaliases
34
35
# LIB_DIR - config files
36
LIB_DIR=!!PREFIX!!/etc/smail
37
38
# UTIL_BIN_DIR - programs
39
UTIL_BIN_DIR=!!PREFIX!!/libexec/smail
40
41
# Enable rfc1413 (ident protocol) and ESMTP sending support (EHLO)
42
HAVE=$HAVE:EHLO:RFC1413:LIBWRAP
43
44
# NOBODY - a user with few access capabilities
45
NOBODY=nobody
46
47
# PATHS_FILE, PATHS_TYPE - location and type of the pathalias router database
48
PATHS_FILE=paths
49
PATHS_TYPE=dbm
50
51
# FORCE_PATHS_FILE, FORCE_PATHS_TYPE - location and type of the force_paths
52
# router database
53
FORCE_PATHS_FILE=forcepaths
54
FORCE_PATHS_TYPE=lsearch
55
56
# FORCE_SMTP_FILE, FORCE_SMTP_TYPE - location and type of the force_smtp
57
# router database
58
FORCE_SMTP_FILE=forcesmtp
59
FORCE_SMTP_TYPE=lsearch
60
61
# Rewrite File
62
REWRITE_FILE=rewrite
63
REWRITE_TYPE=lsearch
64
65
# CPPFLAGS - interesting flags for the cpp, and cc commands
66
CPPFLAGS="-I. -I.. -I../src -I/usr/local/include -I!!PREFIX!!/include"
67
68
CFLAGS="$CFLAGS -I!!PREFIX!!/include"
69
70
# LDFLAGS - flags to pass to the loader
71
LDFLAGS="-L/usr/local/lib -L!!PREFIX!!/lib"
72
73
# LIBS - libraries to include in binaries
74
LIBS="-lident -lwrap"
75
76
# OSLIBS - we don't have libresolv
77
# I doubt that the change to smail-3.2.0.110/conf/os/bsd4.4 is the right way
78
# to do it.
79
OSLIBS="-lcrypt"
80
81
MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX"
(-)mail/smail/files/freebsd5.in (+89 lines)
Line 0 Link Here
1
# FreeBSD 5.x
2
3
. $ROOT/conf/os/bsd4.4-lite
4
5
# OSNAMES - Names defining this operating system
6
OSNAMES="FREEBSD:$OSNAMES"
7
8
# MAN1 - where smail user command man pages are to be installed
9
# MAN5 - where smail file format man pages are to be installed
10
# MAN8 - where smail administrator man pages should be installed
11
# MAN1_EXT - file extension for user command man pages
12
# MAN5_EXT - file extension for file format man pages
13
# MAN8_EXT - file extension for adminstrator man pages
14
#
15
#
16
MAN1_EXT=1
17
MAN1=%%MANPREFIX%%/man/man1
18
MAN5_EXT=5
19
MAN5=%%MANPREFIX%%/man/man5
20
MAN8_EXT=8
21
MAN8=%%MANPREFIX%%/man/man8
22
23
# SMAIL_BIN_DIR - location for uupath, etc.
24
SMAIL_BIN_DIR=%%PREFIX%%/bin
25
26
# SMAIL_NAME - to replace sendmail completely
27
SMAIL_NAME=%%PREFIX%%/sbin/sendmail
28
29
# OTHER_SMAIL_NAMES - to replace sendmail completely
30
OTHER_SMAIL_NAMES=%%PREFIX%%/bin/mailq:%%PREFIX%%/bin/rmail:%%PREFIX%%/bin/rsmtp
31
32
# NEWALIASES - to replace sendmail completely
33
NEWALIASES=%%PREFIX%%/bin/newaliases
34
35
# LIB_DIR - config files
36
LIB_DIR=%%PREFIX%%/etc/smail
37
38
# UTIL_BIN_DIR - programs
39
UTIL_BIN_DIR=%%PREFIX%%/libexec/smail
40
41
# Enable rfc1413 (ident protocol) and ESMTP sending support (EHLO)
42
HAVE=$HAVE:EHLO:RFC1413:LIBWRAP
43
44
# NOBODY - a user with few access capabilities
45
NOBODY=nobody
46
47
# PATHS_FILE, PATHS_TYPE - location and type of the pathalias router database
48
PATHS_FILE=paths
49
PATHS_TYPE=dbm
50
51
# FORCE_PATHS_FILE, FORCE_PATHS_TYPE - location and type of the force_paths
52
# router database
53
FORCE_PATHS_FILE=forcepaths
54
FORCE_PATHS_TYPE=lsearch
55
56
# FORCE_SMTP_FILE, FORCE_SMTP_TYPE - location and type of the force_smtp
57
# router database
58
FORCE_SMTP_FILE=forcesmtp
59
FORCE_SMTP_TYPE=lsearch
60
61
# Rewrite File
62
REWRITE_FILE=rewrite
63
REWRITE_TYPE=lsearch
64
65
# CPPFLAGS - interesting flags for the cpp, and cc commands
66
CPPFLAGS="-I. -I.. -I../src %%CPPFLAGS%%"
67
68
CFLAGS="%%CFLAGS%%"
69
70
# LDFLAGS - flags to pass to the loader
71
LDFLAGS="%%LDFLAGS%%"
72
73
# LIBS - libraries to include in binaries
74
LIBS="%%LIBS%%"
75
76
# OSLIBS - we don't have libresolv
77
OSLIBS="-lcrypt"
78
79
SPOOL_DIRS=/var/spool/smail
80
TMP_DIR=/var/spool/smail/tmp
81
LOG_DIR=/var/log/smail
82
UNSHAR_MAP_DIR=/var/spool/uumaps
83
NEWS_SPOOL_DIR=/var/spool/news
84
UUWHO_FILE=/var/spool/smail/uuwho
85
86
MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX:%%CYRUS_IMAPD%%"
87
88
# Architecture type
89
ARCH_TYPE=%%ARCH_TYPE%%
(-)mail/smail/files/patch-conf_lib_mkdepend.sh (-13 lines)
Lines 1-13 Link Here
1
2
$FreeBSD: ports/mail/smail/files/patch-conf_lib_mkdepend.sh,v 1.1 2002/12/31 00:57:35 naddy Exp $
3
4
--- conf/lib/mkdepend.sh.orig	Tue Dec 31 01:45:53 2002
5
+++ conf/lib/mkdepend.sh	Tue Dec 31 01:48:30 2002
6
@@ -60,6 +60,7 @@
7
 		# the compiler with the sun 3 produces extra garbage after
8
 		# the quoted filename.
9
 		sed -n 's/^#[ 	]*[0-9]*[ 	]*"\(.*\)"[ 0-9]*$/\1/p' |
10
+		grep -v '^<.*>$' |	# remove GCC3 <built-in> etc
11
 		sed 's%^\./%%' |	# remove ./ prefixes
12
 		# next remove 
13
 		sort | uniq |
(-)mail/smail/files/patch-util-Makefile (+42 lines)
Line 0 Link Here
1
--- util/Makefile.orig	Tue Jul 12 18:45:55 2005
2
+++ util/Makefile	Fri Mar  9 12:47:33 2007
3
@@ -35,13 +35,14 @@
4
 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
5
 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
6
 LOCAL_LIB=libsmail.a
7
-SH_TARGETS=checkerr cyrus-deliver-noquota getmap init logsumm mkaliases mkcyrusoqlist mkpath \
8
+SH_TARGETS=checkerr getmap init logsumm mkaliases mkpath \
9
 	   mkuuwho mkhpath bouncemail savelog smailbug unfreezemail
10
 C_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap
11
 UTIL_TARGETS=${SH_TARGETS} ${C_TARGETS}
12
 # this may not always be sane or necessary....
13
-BIN_TARGETS=bouncemail cyrus-deliver-noquota mkaliases mkcyrusoqlist smailbug unfreezemail
14
-TARGETS=${UTIL_TARGETS} ${BIN_TARGETS}
15
+BIN_TARGETS=bouncemail mkaliases smailbug unfreezemail
16
+CYRUS_BIN_TARGETS=cyrus-deliver-noquota mkcyrusoqlist
17
+TARGETS=${UTIL_TARGETS} ${BIN_TARGETS} ${CYRUS_BIN_TARGETS}
18
 STRIP_TARGETS=mkline mksort dcasehost mkdbm pathmerge gleem unsharmap
19
 OBJ=mkline.o mksort.o dcasehost.o mkdbm.o pathmerge.o \
20
     gleem.o unsharmap.o
21
@@ -110,6 +111,21 @@
22
 			fi; \
23
 		done; \
24
 	   esac
25
+
26
+install-cyrus-bins: all
27
+	@. ./${DEFS_SH}; \
28
+	   case "$$DONT_INSTALL" in \
29
+	   ?*)	echo Testing ... install ignored; exit 0;; \
30
+	   esac; \
31
+	   ${XEXEC} ${SHELL} ${INSTM} -m 0555 $$UTIL_BIN_DIR ${CYRUS_BIN_TARGETS}; \
32
+	   for i in ${CYRUS_BIN_TARGETS} ; do \
33
+		case $$UTIL_BIN_DIR in \
34
+		"$$SMAIL_BIN_DIR")	xx="";; \
35
+		*)			xx=$$SMAIL_BIN_DIR/$$i;; \
36
+		esac; \
37
+		${XEXEC} ${SHELL} ${INST} -m 0555 $$l_flag -d $$UTIL_BIN_DIR $$i $$i $$xx; \
38
+	   done; \
39
+
40
 
41
 install-libs: ${DEFS_SH}
42
 	@. ./${DEFS_SH}; \
(-)mail/smail/pkg-plist (+10 lines)
Lines 1-6 Link Here
1
bin/bouncemail
1
bin/bouncemail
2
%%CYRUS_DELIVER%%bin/cyrus-deliver-noquota
2
bin/mailq
3
bin/mailq
3
bin/mkaliases
4
bin/mkaliases
5
%%CYRUS_DELIVER%%bin/mkcyrusoqlist
4
bin/newaliases
6
bin/newaliases
5
bin/pathto
7
bin/pathto
6
bin/rmail
8
bin/rmail
Lines 13-18 Link Here
13
bin/uupath
15
bin/uupath
14
bin/uuwho
16
bin/uuwho
15
etc/smail/COPYING
17
etc/smail/COPYING
18
etc/smail/dead-mail.egrep
19
etc/smail/dead-mail.senders
16
etc/smail/forcepaths
20
etc/smail/forcepaths
17
etc/smail/forcesmtp
21
etc/smail/forcesmtp
18
@exec mkdir -p %D/etc/smail/maps
22
@exec mkdir -p %D/etc/smail/maps
Lines 22-35 Link Here
22
libexec/smail/bouncemail
26
libexec/smail/bouncemail
23
libexec/smail/bouncemail.O
27
libexec/smail/bouncemail.O
24
libexec/smail/checkerr
28
libexec/smail/checkerr
29
%%CYRUS_DELIVER%%libexec/smail/cyrus-deliver-noquota
30
%%CYRUS_DELIVER%%libexec/smail/cyrus-deliver-noquota.O
25
libexec/smail/dcasehost
31
libexec/smail/dcasehost
26
libexec/smail/getmap
32
libexec/smail/getmap
27
libexec/smail/getopt
33
libexec/smail/getopt
28
libexec/smail/gleem
34
libexec/smail/gleem
35
libexec/smail/init
29
libexec/smail/logsumm
36
libexec/smail/logsumm
37
libexec/smail/logsumm.awk
30
libexec/smail/makedb
38
libexec/smail/makedb
31
libexec/smail/mkaliases
39
libexec/smail/mkaliases
32
libexec/smail/mkaliases.O
40
libexec/smail/mkaliases.O
41
%%CYRUS_DELIVER%%libexec/smail/mkcyrusoqlist
42
%%CYRUS_DELIVER%%libexec/smail/mkcyrusoqlist.O
33
libexec/smail/mkdbm
43
libexec/smail/mkdbm
34
libexec/smail/mkhpath
44
libexec/smail/mkhpath
35
libexec/smail/mkline
45
libexec/smail/mkline
(-)mail/smail/scripts/configure (-6 lines)
Lines 1-6 Link Here
1
#!/bin/sh
2
#
3
# $FreeBSD: ports/mail/smail/scripts/configure,v 1.4 1999/08/30 12:06:29 peter Exp $
4
5
sed <${FILESDIR}/EDITME >${WRKSRC}/conf/EDITME s+!!PREFIX!!+$PREFIX+g
6
sed <${FILESDIR}/freebsd2.0 >${WRKSRC}/conf/os/freebsd2.0 s+!!PREFIX!!+$PREFIX+g

Return to bug 110135