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

(-)mail/exim/Makefile (-19 / +18 lines)
Lines 7-26 Link Here
7
7
8
PORTNAME=	exim
8
PORTNAME=	exim
9
PORTVERSION=	${EXIM_VERSION}
9
PORTVERSION=	${EXIM_VERSION}
10
PORTREVISION=	2
11
CATEGORIES=	mail
10
CATEGORIES=	mail
12
MASTER_SITES=	${MASTER_SITE_EXIM} \
11
MASTER_SITES=	${MASTER_SITE_EXIM}
13
		http://duncanthrax.net/%SUBDIR%/:exiscan_acl
12
MASTER_SITE_SUBDIR=	exim4
14
MASTER_SITE_SUBDIR=	exim4 exiscan-acl/:exiscan_acl
15
DISTFILES=	exim-${EXIM_VERSION}${EXTRACT_SUFX} \
13
DISTFILES=	exim-${EXIM_VERSION}${EXTRACT_SUFX} \
16
		exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
14
		exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
17
.if !defined(WITHOUT_EXISCAN)
18
DISTFILES+=	exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2:exiscan_acl
19
.endif
20
DIST_SUBDIR=	exim
15
DIST_SUBDIR=	exim
21
16
22
EXTRACT_ONLY=	exim-${EXIM_VERSION}${EXTRACT_SUFX} \
17
.if !defined(WITHOUT_EXISCAN)
23
		exim-texinfo-${EXIM_DOCVERSION}${EXTRACT_SUFX}
18
PATCH_SITES=	http://duncanthrax.net/%SUBDIR%/
19
PATCH_SITE_SUBDIR=	exiscan-acl
20
PATCHFILES=	exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2
21
.endif
24
22
25
MAINTAINER=	sheldonh@FreeBSD.org
23
MAINTAINER=	sheldonh@FreeBSD.org
26
COMMENT=	High performance MTA for Unix systems on the Internet
24
COMMENT=	High performance MTA for Unix systems on the Internet
Lines 30-46 Link Here
30
USE_BZIP2=	yes
28
USE_BZIP2=	yes
31
USE_PERL5=	yes
29
USE_PERL5=	yes
32
MAN8=		exim.8
30
MAN8=		exim.8
31
INFO=		exim exim_filter
33
32
34
EXIM_VERSION=		4.21
33
EXIM_VERSION=		4.22
35
EXIM_DOCVERSION=	4.20
34
EXIM_DOCVERSION=	4.20
36
EXISCAN_ACL_VERSION=	${EXIM_VERSION}-10
35
EXISCAN_ACL_VERSION=	${EXIM_VERSION}-10
37
36
38
PLIST_SUB+=     EXIM_VERSION="${EXIM_VERSION}"
37
PLIST_SUB+=	EXIM_VERSION="${EXIM_VERSION}"
39
38
40
.if defined(NOPORTDOCS)
39
.if defined(NOPORTDOCS)
41
PKGMESSAGE=	${WRKDIR}/POST-INSTALL-NOTES
40
PKGMESSAGE=	${WRKDIR}/POST-INSTALL-NOTES
42
.endif
41
.endif
43
42
43
PATCH_DIST_STRIP=	-p1
44
44
MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} LOCALBASE=${LOCALBASE}
45
MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH} LOCALBASE=${LOCALBASE}
45
46
46
POSTGRESQL_PORT?=	databases/postgresql7
47
POSTGRESQL_PORT?=	databases/postgresql7
Lines 137-145 Link Here
137
		spec.txt
138
		spec.txt
138
.if !defined(WITHOUT_EXISCAN)
139
.if !defined(WITHOUT_EXISCAN)
139
PORTDOC_FILES+=	exiscan-acl-examples.txt exiscan-acl-spec.txt
140
PORTDOC_FILES+=	exiscan-acl-examples.txt exiscan-acl-spec.txt
140
PLIST_SUB+=             EXISCAN_ACL=""
141
PLIST_SUB+=	EXISCAN_ACL=""
141
.else
142
.else
142
PLIST_SUB+=             EXISCAN_ACL="@comment "
143
PLIST_SUB+=	EXISCAN_ACL="@comment "
143
.endif
144
.endif
144
145
145
.if ${OSVERSION} < 400014
146
.if ${OSVERSION} < 400014
Lines 320-327 Link Here
320
321
321
post-patch:
322
post-patch:
322
.if !defined(WITHOUT_EXISCAN)
323
.if !defined(WITHOUT_EXISCAN)
323
	${BZCAT} ${DISTDIR}/${DIST_SUBDIR}/exiscan-acl-${EXISCAN_ACL_VERSION}.patch.bz2 \
324
	    | ${PATCH} -d ${WRKSRC} -p1 > ${WRKDIR}/patch-exiscan-acl.log 2>&1
325
	@${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan-acl \
324
	@${CAT} ${FILESDIR}/POST-INSTALL-NOTES.exiscan-acl \
326
	    ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
325
	    ${FILESDIR}/POST-INSTALL-NOTES > ${WRKDIR}/POST-INSTALL-NOTES
327
.else
326
.else
Lines 342-354 Link Here
342
post-install:
341
post-install:
343
	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${PREFIX}/etc/rc.d
342
	${INSTALL_SCRIPT} ${FILESDIR}/exim.sh ${PREFIX}/etc/rc.d
344
.if !defined(NOPORTDOCS)
343
.if !defined(NOPORTDOCS)
345
	${MKDIR} ${PREFIX}/share/doc/exim
344
	${MKDIR} ${DOCSDIR}
346
	${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${PREFIX}/share/doc/exim
345
	${INSTALL_DATA} ${WRKDIR}/POST-INSTALL-NOTES ${DOCSDIR}
347
.for file in ${PORTDOC_FILES}
346
.for file in ${PORTDOC_FILES}
348
	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/exim
347
	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
349
.endfor
348
.endfor
350
.for file in ${MAN8}
349
.for file in ${MAN8}
351
	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${PREFIX}/man/man8
350
	${INSTALL_MAN} ${WRKSRC}/doc/${file} ${MAN8PREFIX}/man/man8
352
.endfor
351
.endfor
353
.endif
352
.endif
354
	@${CAT} ${PKGMESSAGE}
353
	@${CAT} ${PKGMESSAGE}
(-)mail/exim/distinfo (-2 / +2 lines)
Lines 1-3 Link Here
1
MD5 (exim/exim-4.21.tar.bz2) = 16b1290e4c289c7d70294ca447b0a3bc
1
MD5 (exim/exim-4.22.tar.bz2) = 938ae799c08ed1899dd27fd50d48f4e5
2
MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
2
MD5 (exim/exim-texinfo-4.20.tar.bz2) = debc6d3fdd88fd6d9c646ca0495fa92d
3
MD5 (exim/exiscan-acl-4.21-10.patch.bz2) = b22d3ed3e132ea11069b89ae4269f493
3
MD5 (exim/exiscan-acl-4.22-10.patch.bz2) = 239fb3db3eeb5da7c816ce2765b5db2a
(-)mail/exim/files/patch-OS::Makefile-FreeBSD (-2 / +2 lines)
Lines 1-12 Link Here
1
--- OS/Makefile-FreeBSD.orig	Tue Aug 12 17:39:51 2003
1
--- OS/Makefile-FreeBSD.orig	Tue Aug 12 17:39:51 2003
2
+++ OS/Makefile-FreeBSD	Thu Aug 14 12:10:46 2003
2
+++ OS/Makefile-FreeBSD	Thu Aug 14 12:10:46 2003
3
@@ -5,12 +5,16 @@
3
@@ -5,11 +5,16 @@
4
 PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
4
 PORTOBJFORMAT!= test -x /usr/bin/objformat && /usr/bin/objformat || echo aout
5
 
5
 
6
 CHOWN_COMMAND=/usr/sbin/chown
6
 CHOWN_COMMAND=/usr/sbin/chown
7
+STRIP_COMMAND=/usr/bin/strip
7
+STRIP_COMMAND=/usr/bin/strip
8
 
8
 
9
 HAVE_ICONV=yes
9
+HAVE_ICONV=yes
10
 HAVE_SA_LEN=YES
10
 HAVE_SA_LEN=YES
11
 
11
 
12
 # crypt() is in a separate library
12
 # crypt() is in a separate library
(-)mail/exim/files/patch-src::EDITME (-19 / +20 lines)
Lines 1-5 Link Here
1
--- src/EDITME.orig	Mon Jul 22 10:59:47 2002
1
--- src/EDITME.orig	Mon Aug 18 14:52:52 2003
2
+++ src/EDITME	Mon Sep 16 11:33:03 2002
2
+++ src/EDITME	Mon Aug 18 17:34:17 2003
3
@@ -98,7 +98,7 @@
3
@@ -98,7 +98,7 @@
4
 # /usr/local/sbin. The installation script will try to create this directory,
4
 # /usr/local/sbin. The installation script will try to create this directory,
5
 # and any superior directories, if they do not exist.
5
 # and any superior directories, if they do not exist.
Lines 9-24 Link Here
9
 
9
 
10
 
10
 
11
 #------------------------------------------------------------------------------
11
 #------------------------------------------------------------------------------
12
@@ -113,7 +113,7 @@
12
@@ -114,7 +114,7 @@
13
 # directories if they don't exist. It will also install a default runtime
13
 # don't exist. It will also install a default runtime configuration if this
14
 # configuration if this file does not exist.
14
 # file does not exist.
15
 
15
 
16
-CONFIGURE_FILE=/usr/exim/configure
16
-CONFIGURE_FILE=/usr/exim/configure
17
+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
17
+CONFIGURE_FILE=XX_PREFIX_XX/etc/exim/configure
18
 
18
 
19
 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
19
 # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
20
 # In this case, Exim will use the first of them that exists when it is run.
20
 # In this case, Exim will use the first of them that exists when it is run.
21
@@ -131,14 +131,14 @@
21
@@ -132,14 +132,14 @@
22
 # owner of a local mailbox.) Specifying these values as root is very strongly
22
 # owner of a local mailbox.) Specifying these values as root is very strongly
23
 # discouraged. These values are compiled into the binary.
23
 # discouraged. These values are compiled into the binary.
24
 
24
 
Lines 35-41 Link Here
35
 
35
 
36
 # Many sites define a user called "exim", with an appropriate default group,
36
 # Many sites define a user called "exim", with an appropriate default group,
37
 # and use
37
 # and use
38
@@ -264,6 +264,7 @@
38
@@ -265,6 +265,7 @@
39
 # LDAP_LIB_TYPE=OPENLDAP2
39
 # LDAP_LIB_TYPE=OPENLDAP2
40
 # LDAP_LIB_TYPE=NETSCAPE
40
 # LDAP_LIB_TYPE=NETSCAPE
41
 # LDAP_LIB_TYPE=SOLARIS
41
 # LDAP_LIB_TYPE=SOLARIS
Lines 43-49 Link Here
43
 
43
 
44
 # If you don't set any of these, Exim assumes the original University of
44
 # If you don't set any of these, Exim assumes the original University of
45
 # Michigan (OpenLDAP 1) library.
45
 # Michigan (OpenLDAP 1) library.
46
@@ -276,8 +277,10 @@
46
@@ -277,8 +278,10 @@
47
 # don't need to set LOOKUP_INCLUDE if the relevant directories are already
47
 # don't need to set LOOKUP_INCLUDE if the relevant directories are already
48
 # specified in INCLUDE.
48
 # specified in INCLUDE.
49
 
49
 
Lines 56-62 Link Here
56
 
56
 
57
 
57
 
58
 #------------------------------------------------------------------------------
58
 #------------------------------------------------------------------------------
59
@@ -288,7 +290,7 @@
59
@@ -289,7 +292,7 @@
60
 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
60
 # files are defaulted in the OS/Makefile-Default file, but can be overridden in
61
 # local OS-specific make files.
61
 # local OS-specific make files.
62
 
62
 
Lines 65-71 Link Here
65
 
65
 
66
 
66
 
67
 
67
 
68
@@ -326,7 +328,7 @@
68
@@ -393,7 +396,7 @@
69
 # SUPPORT_TLS=yes
69
 # SUPPORT_TLS=yes
70
 
70
 
71
 # Uncomment this setting if you are using OpenSSL
71
 # Uncomment this setting if you are using OpenSSL
Lines 74-80 Link Here
74
 
74
 
75
 # Uncomment these settings if you are using GnuTLS
75
 # Uncomment these settings if you are using GnuTLS
76
 # USE_GNUTLS=yes
76
 # USE_GNUTLS=yes
77
@@ -377,7 +379,7 @@
77
@@ -444,7 +447,7 @@
78
 # Once you have done this, "make install" will build the info files and
78
 # Once you have done this, "make install" will build the info files and
79
 # install them in the directory you have defined.
79
 # install them in the directory you have defined.
80
 
80
 
Lines 83-89 Link Here
83
 
83
 
84
 
84
 
85
 #------------------------------------------------------------------------------
85
 #------------------------------------------------------------------------------
86
@@ -390,7 +392,7 @@
86
@@ -457,7 +460,7 @@
87
 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
87
 # %s. This will be replaced by one of the strings "main", "panic", or "reject"
88
 # to form the final file names. Some installations may want something like this:
88
 # to form the final file names. Some installations may want something like this:
89
 
89
 
Lines 92-104 Link Here
92
 
92
 
93
 # which results in files with names /var/log/exim_mainlog, etc. The directory
93
 # which results in files with names /var/log/exim_mainlog, etc. The directory
94
 # in which the log files are placed must exist; Exim does not try to create
94
 # in which the log files are placed must exist; Exim does not try to create
95
@@ -493,12 +495,20 @@
95
@@ -594,12 +597,20 @@
96
 
96
 #
97
 #  USE_TCP_WRAPPERS=yes
97
 # USE_TCP_WRAPPERS=yes
98
 #  CFLAGS=-O -I/usr/local/include
98
 # CFLAGS=-O -I/usr/local/include
99
-#  EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
99
-# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap
100
-#
100
+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX
101
+EXTRALIBS=XX_TCP_WRAPPERS_LIBS_XX XX_PAM_LIBS_XX
101
 
102
+
102
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
103
 # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
103
 # as well.
104
 # as well.
104
 
105
 
Lines 114-120 Link Here
114
 #------------------------------------------------------------------------------
115
 #------------------------------------------------------------------------------
115
 # The default action of the exim_install script (which is run by "make
116
 # The default action of the exim_install script (which is run by "make
116
 # install") is to install the Exim binary with a unique name such as
117
 # install") is to install the Exim binary with a unique name such as
117
@@ -726,7 +736,7 @@
118
@@ -841,7 +852,7 @@
118
 # (process id) to a file so that it can easily be identified. The path of the
119
 # (process id) to a file so that it can easily be identified. The path of the
119
 # file can be specified here. Some installations may want something like this:
120
 # file can be specified here. Some installations may want something like this:
120
 
121
 
(-)mail/exim/files/patch-src::os.c (-19 lines)
Lines 1-19 Link Here
1
*** src/os.c.orig	Tue Aug 12 16:39:56 2003
2
--- src/os.c		Thu Aug 14 15:53:49 2003
3
***************
4
*** 659,665 ****
5
    addrp = &ifreq.V_ifr_addr;
6
7
    #else
8
!   memcpy((char *)&ifreq, cp, len);
9
    memcpy(addrbuf, (char *)&(ifreq.V_ifr_addr), len - sizeof(ifreq.V_ifr_name));
10
    addrp = (struct sockaddr *)addrbuf;
11
    #endif
12
--- 659,665 ----
13
    addrp = &ifreq.V_ifr_addr;
14
15
    #else
16
!   memcpy((char *)&ifreq, cp, sizeof(ifreq));
17
    memcpy(addrbuf, (char *)&(ifreq.V_ifr_addr), len - sizeof(ifreq.V_ifr_name));
18
    addrp = (struct sockaddr *)addrbuf;
19
    #endif
(-)mail/exim/pkg-plist (-19 / +13 lines)
Lines 1-7 Link Here
1
etc/exim/configure.default
1
etc/exim/configure.default
2
etc/rc.d/exim.sh
2
etc/rc.d/exim.sh
3
info/exim.info
4
info/exim_filter.info
5
sbin/exim
3
sbin/exim
6
sbin/exim-%%EXIM_VERSION%%-1
4
sbin/exim-%%EXIM_VERSION%%-1
7
sbin/exim_checkaccess
5
sbin/exim_checkaccess
Lines 17-37 Link Here
17
sbin/eximstats
15
sbin/eximstats
18
sbin/exiqgrep
16
sbin/exiqgrep
19
sbin/exiqsumm
17
sbin/exiqsumm
20
%%PORTDOCS%%share/doc/exim/POST-INSTALL-NOTES
18
%%PORTDOCS%%%%DOCSDIR%%/POST-INSTALL-NOTES
21
%%PORTDOCS%%share/doc/exim/Exim3.upgrade
19
%%PORTDOCS%%%%DOCSDIR%%/Exim3.upgrade
22
%%PORTDOCS%%share/doc/exim/Exim4.upgrade
20
%%PORTDOCS%%%%DOCSDIR%%/Exim4.upgrade
23
%%PORTDOCS%%share/doc/exim/OptionLists.txt
21
%%PORTDOCS%%%%DOCSDIR%%/OptionLists.txt
24
%%PORTDOCS%%share/doc/exim/README
22
%%PORTDOCS%%%%DOCSDIR%%/README
25
%%PORTDOCS%%share/doc/exim/dbm.discuss.txt
23
%%PORTDOCS%%%%DOCSDIR%%/dbm.discuss.txt
26
%%PORTDOCS%%share/doc/exim/filter.txt
24
%%PORTDOCS%%%%DOCSDIR%%/filter.txt
27
%%PORTDOCS%%share/doc/exim/pcrepattern.txt
25
%%PORTDOCS%%%%DOCSDIR%%/pcrepattern.txt
28
%%PORTDOCS%%share/doc/exim/pcretest.txt
26
%%PORTDOCS%%%%DOCSDIR%%/pcretest.txt
29
%%PORTDOCS%%share/doc/exim/spec.txt
27
%%PORTDOCS%%%%DOCSDIR%%/spec.txt
30
%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-examples.txt
28
%%PORTDOCS%%%%EXISCAN_ACL%%%%DOCSDIR%%/exiscan-acl-examples.txt
31
%%PORTDOCS%%%%EXISCAN_ACL%%share/doc/exim/exiscan-acl-spec.txt
29
%%PORTDOCS%%%%EXISCAN_ACL%%%%DOCSDIR%%/exiscan-acl-spec.txt
32
@unexec install-info --delete %D/info/exim.info %D/info/dir
33
@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
34
@exec install-info --section="Exim" --entry "* Exim Specification: (exim).       Exim manual" %D/info/exim.info %D/info/dir
35
@exec install-info --section="Exim" --entry "* Exim Filtering: (exim_filter).    Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
36
@dirrm etc/exim
30
@dirrm etc/exim
37
@dirrm share/doc/exim
31
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 55701