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

(-)Makefile (-10 / +17 lines)
Lines 13-19 Link Here
13
## base system, building this port may fail.
13
## base system, building this port may fail.
14
14
15
PORTNAME=	dkim-milter
15
PORTNAME=	dkim-milter
16
PORTVERSION=	2.4.4
16
PORTVERSION=	2.5.0
17
CATEGORIES=	mail
17
CATEGORIES=	mail
18
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
18
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
19
MASTER_SITE_SUBDIR=	${PORTNAME}
19
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 51-59 PLIST_FILES= etc/mail/dkim-filter.conf.s Link Here
51
PLIST_DIRS=	etc/mail
51
PLIST_DIRS=	etc/mail
52
PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
52
PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
53
		autorespond.csh \
53
		autorespond.csh \
54
		draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-00.txt \
54
		draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-01.txt \
55
		draft-ietf-dkim-overview-07.txt draft-ietf-dkim-ssp-01.txt \
55
		draft-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \
56
		draft-kucherawy-sender-auth-header-10.txt \
56
		draft-kucherawy-sender-auth-header-12.txt \
57
		rfc4686.txt rfc4871.txt rfc5016.txt
57
		rfc4686.txt rfc4871.txt rfc5016.txt
58
.if !defined(NOPORTDOCS)
58
.if !defined(NOPORTDOCS)
59
LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
59
LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
Lines 63-68 LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht Link Here
63
		${DOCSDIR_REL}/libdkim/dkim_body.html \
63
		${DOCSDIR_REL}/libdkim/dkim_body.html \
64
		${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
64
		${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
65
		${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
65
		${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
66
		${DOCSDIR_REL}/libdkim/dkim_chunk.html \
66
		${DOCSDIR_REL}/libdkim/dkim_close.html \
67
		${DOCSDIR_REL}/libdkim/dkim_close.html \
67
		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
68
		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
68
		${DOCSDIR_REL}/libdkim/dkim_eom.html \
69
		${DOCSDIR_REL}/libdkim/dkim_eom.html \
Lines 72-78 LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht Link Here
72
		${DOCSDIR_REL}/libdkim/dkim_getcachestats.html \
73
		${DOCSDIR_REL}/libdkim/dkim_getcachestats.html \
73
		${DOCSDIR_REL}/libdkim/dkim_getdomain.html \
74
		${DOCSDIR_REL}/libdkim/dkim_getdomain.html \
74
		${DOCSDIR_REL}/libdkim/dkim_geterror.html \
75
		${DOCSDIR_REL}/libdkim/dkim_geterror.html \
75
		${DOCSDIR_REL}/libdkim/dkim_gethandlingstr.html \
76
		${DOCSDIR_REL}/libdkim/dkim_getmode.html \
76
		${DOCSDIR_REL}/libdkim/dkim_getmode.html \
77
		${DOCSDIR_REL}/libdkim/dkim_getpolicystr.html \
77
		${DOCSDIR_REL}/libdkim/dkim_getpolicystr.html \
78
		${DOCSDIR_REL}/libdkim/dkim_getpresult.html \
78
		${DOCSDIR_REL}/libdkim/dkim_getpresult.html \
Lines 81-95 LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht Link Here
81
		${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
81
		${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
82
		${DOCSDIR_REL}/libdkim/dkim_getsiglist.html \
82
		${DOCSDIR_REL}/libdkim/dkim_getsiglist.html \
83
		${DOCSDIR_REL}/libdkim/dkim_getsignature.html \
83
		${DOCSDIR_REL}/libdkim/dkim_getsignature.html \
84
		${DOCSDIR_REL}/libdkim/dkim_handling_t.html \
85
		${DOCSDIR_REL}/libdkim/dkim_header.html \
84
		${DOCSDIR_REL}/libdkim/dkim_header.html \
86
		${DOCSDIR_REL}/libdkim/dkim_init.html \
85
		${DOCSDIR_REL}/libdkim/dkim_init.html \
86
		${DOCSDIR_REL}/libdkim/dkim_key_syntax.html \
87
		${DOCSDIR_REL}/libdkim/dkim_lib.html \
87
		${DOCSDIR_REL}/libdkim/dkim_lib.html \
88
		${DOCSDIR_REL}/libdkim/dkim_minbody.html \
88
		${DOCSDIR_REL}/libdkim/dkim_minbody.html \
89
		${DOCSDIR_REL}/libdkim/dkim_ohdrs.html \
89
		${DOCSDIR_REL}/libdkim/dkim_ohdrs.html \
90
		${DOCSDIR_REL}/libdkim/dkim_options.html \
90
		${DOCSDIR_REL}/libdkim/dkim_options.html \
91
		${DOCSDIR_REL}/libdkim/dkim_param_t.html \
91
		${DOCSDIR_REL}/libdkim/dkim_param_t.html \
92
		${DOCSDIR_REL}/libdkim/dkim_policy.html \
92
		${DOCSDIR_REL}/libdkim/dkim_policy.html \
93
		${DOCSDIR_REL}/libdkim/dkim_policy_syntax.html \
93
		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
94
		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
94
		${DOCSDIR_REL}/libdkim/dkim_presult.html \
95
		${DOCSDIR_REL}/libdkim/dkim_presult.html \
95
		${DOCSDIR_REL}/libdkim/dkim_pstate.html \
96
		${DOCSDIR_REL}/libdkim/dkim_pstate.html \
Lines 118-123 LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht Link Here
118
		${DOCSDIR_REL}/libdkim/dkim_sig_getsigntime.html \
119
		${DOCSDIR_REL}/libdkim/dkim_sig_getsigntime.html \
119
		${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
120
		${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
120
		${DOCSDIR_REL}/libdkim/dkim_sig_process.html \
121
		${DOCSDIR_REL}/libdkim/dkim_sig_process.html \
122
		${DOCSDIR_REL}/libdkim/dkim_sig_syntax.html \
121
		${DOCSDIR_REL}/libdkim/dkim_sigerror.html \
123
		${DOCSDIR_REL}/libdkim/dkim_sigerror.html \
122
		${DOCSDIR_REL}/libdkim/dkim_siginfo.html \
124
		${DOCSDIR_REL}/libdkim/dkim_siginfo.html \
123
		${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
125
		${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
Lines 127-132 LIBDOCS= ${DOCSDIR_REL}/libdkim/index.ht Link Here
127
		${DOCSDIR_REL}/libdkim/dkim_verify.html \
129
		${DOCSDIR_REL}/libdkim/dkim_verify.html \
128
		${DOCSDIR_REL}/libdkim/rfc2822_mailbox_split.html
130
		${DOCSDIR_REL}/libdkim/rfc2822_mailbox_split.html
129
PLIST_FILES+=	${DOCSDIR_REL}/README.dkim-filter \
131
PLIST_FILES+=	${DOCSDIR_REL}/README.dkim-filter \
132
		${DOCSDIR_REL}/README.libdkim \
130
		${LIBDOCS}
133
		${LIBDOCS}
131
PLIST_DIRS+=	${DOCSDIR_REL}/libdkim
134
PLIST_DIRS+=	${DOCSDIR_REL}/libdkim
132
.endif
135
.endif
Lines 162-167 SITE_SUB+= -e '\|bld_LIBDKIM_INSTALL|s/^ Link Here
162
.if defined(WITH_LIBDKIM_SHARED)
165
.if defined(WITH_LIBDKIM_SHARED)
163
PLIST_SUB+=	LIBDKIM="@comment "
166
PLIST_SUB+=	LIBDKIM="@comment "
164
PLIST_SUB+=	LIBDKIMSHARED=""
167
PLIST_SUB+=	LIBDKIMSHARED=""
168
USE_LDCONFIG=	yes
165
.else
169
.else
166
PLIST_SUB+=	LIBDKIM=""
170
PLIST_SUB+=	LIBDKIM=""
167
PLIST_SUB+=	LIBDKIMSHARED="@comment "
171
PLIST_SUB+=	LIBDKIMSHARED="@comment "
Lines 198-208 PLIST_SUB+= STATS="" Link Here
198
PLIST_SUB+=	STATS="@comment "
202
PLIST_SUB+=	STATS="@comment "
199
.endif
203
.endif
200
204
201
.if defined(WITH_POPAUTH) \
205
.if (defined(WITH_POPAUTH) \
202
	|| defined(WITH_QUERY_CACHE) \
206
	|| defined(WITH_QUERY_CACHE) \
203
	|| defined(WITH_STATS)
207
	|| defined(WITH_BODYLENGTH_DB) \
208
	|| defined(WITH_STATS)) \
209
	&& !defined(WITH_BDB_BASE)
204
USE_BDB=	41+
210
USE_BDB=	41+
205
INVALID_BDB_VER=	2 3 40
206
SITE_SUB+=	-e 's|%%BDB%%||g' \
211
SITE_SUB+=	-e 's|%%BDB%%||g' \
207
		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
212
		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
208
		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
213
		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
Lines 240-247 pre-fetch: Link Here
240
	@${ECHO_MSG} " WITH_QUERY_CACHE=yes		Cache DNS Query"
245
	@${ECHO_MSG} " WITH_QUERY_CACHE=yes		Cache DNS Query"
241
	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
246
	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
242
	@${ECHO_MSG} " WITH_SENDMAIL_BASE=yes		Build to run with base sendmail"
247
	@${ECHO_MSG} " WITH_SENDMAIL_BASE=yes		Build to run with base sendmail"
248
	@${ECHO_MSG} " WITH_SENDMAIL_PORT=yes		Build to run with ports' sendmail"
243
	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
249
	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
244
	@${ECHO_MSG} " WITH_LIBDKIM_INSTALL=yes		Install libdkim library"
250
	@${ECHO_MSG} " WITH_LIBDKIM_INSTALL=yes	Install libdkim library"
245
	@${ECHO_MSG}
251
	@${ECHO_MSG}
246
	@sleep 5
252
	@sleep 5
247
253
Lines 284-289 post-install: Link Here
284
	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
290
	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
285
.endfor
291
.endfor
286
	${INSTALL_DATA} ${WRKSRC}/dkim-filter/README ${DOCSDIR}/README.dkim-filter
292
	${INSTALL_DATA} ${WRKSRC}/dkim-filter/README ${DOCSDIR}/README.dkim-filter
293
	${INSTALL_DATA} ${WRKSRC}/libdkim/README ${DOCSDIR}/README.libdkim
287
	${MKDIR} ${DOCSDIR}/libdkim
294
	${MKDIR} ${DOCSDIR}/libdkim
288
.for f in ${LIBDOCS}
295
.for f in ${LIBDOCS}
289
	${INSTALL_DATA} ${WRKSRC}/libdkim/docs/`${BASENAME} ${f}` ${DOCSDIR}/libdkim/
296
	${INSTALL_DATA} ${WRKSRC}/libdkim/docs/`${BASENAME} ${f}` ${DOCSDIR}/libdkim/
(-)Makefile.features (+8 lines)
Lines 11-16 Link Here
11
SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
11
SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
12
.endif
12
.endif
13
13
14
.if defined(WITH_AUTHSERV_JOBID) && !defined(WITHOUT_AUTHSERV_JOBID)
15
SITE_SUB+=	-e '/-D_FFR_AUTHSERV_JOBID/s|^dnl ||'
16
.endif
17
18
.if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
19
SITE_SUB+=	-e '/-D_FFR_BODYLENGTH_DB/s|^dnl ||'
20
.endif
21
14
.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
22
.if defined(WITH_CAPTURE_UNKNOWN_ERRORS) && !defined(WITHOUT_CAPTURE_UNKNOWN_ERRORS)
15
SITE_SUB+=	-e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
23
SITE_SUB+=	-e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
16
.endif
24
.endif
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (dkim-milter-2.4.4.tar.gz) = 1367d42fdb33547bea49a45c1329cd94
1
MD5 (dkim-milter-2.5.0.tar.gz) = 4780f1e2efe02a28a36203dd5cee39b6
2
SHA256 (dkim-milter-2.4.4.tar.gz) = e04323c1d901437f88c1c81bd05118910986027ec5627d68259568178c05833b
2
SHA256 (dkim-milter-2.5.0.tar.gz) = 9372bdfa34c14d2b957dbac275d6a00cb6ac321fda8803b8e86ca1c73ac14855
3
SIZE (dkim-milter-2.4.4.tar.gz) = 617230
3
SIZE (dkim-milter-2.5.0.tar.gz) = 639037
(-)files/site.config.m4 (-3 / +3 lines)
Lines 10-17 define(`confDONT_INSTALL_CATMAN',`True') Link Here
10
%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%% ')
10
%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%% ')
11
%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%% ')
11
%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%% ')
12
%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%% ')
12
%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%% ')
13
%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% -R%%OPENSSLLIB%% ')
13
%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% ')
14
%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%% ')
14
%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%% ')
15
%%LIBTRE%%APPENDDEF(`confINCDIRS', `-I/usr/local/include/tre ')
15
%%LIBTRE%%APPENDDEF(`confINCDIRS', `-I%%LOCALBASE%%/include/tre ')
16
%%LIBTRE%%APPENDDEF(`confLIBDIRS', `-L/usr/local/lib ')
16
%%LIBTRE%%APPENDDEF(`confLIBDIRS', `-L%%LOCALBASE%%/lib ')
17
%%LIBTRE%%APPENDDEF(`confLIBS', `-ltre ')
17
%%LIBTRE%%APPENDDEF(`confLIBS', `-ltre ')

Return to bug 121465