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

(-)./UPDATING (+21 lines)
Lines 7-12 Link Here
7
upgrades.
7
upgrades.
8
8
9
9
10
20050714:
11
  AFFECTS: users of mail/qmail, mail/qmail-ldap, mail/qmail-mysql,
12
           mail/qmail-smtp_auth+tls, mail/qmail-spamcontrol,
13
           mail/qmail-tls and all ports that depend of it.
14
  AUTHOR: garga@FreeBSD.org
15
16
  If you use qmail installe don a PREFIX different of /var/qmail,
17
  please, set a var on /etc/make.conf named QMAIL_PREFIX with this
18
  value. It'll be used for many ports that depends of qmail.
19
20
  To prevent stale dependencies, when you use one of qmail slave ports,
21
  now you just need to set a var named QMAIL_SLAVEPORT on /etc/make.conf
22
  assigning to it the name of slaveport you are using.
23
24
  The valid options for now are:
25
  * ldap
26
  * mysql
27
  * smtp_auth+tls
28
  * spamcontrol
29
  * tls
30
10
20050722:
31
20050722:
11
  AFFECTS: All RELENG_6 and HEAD users of ports/packages, maintainers
32
  AFFECTS: All RELENG_6 and HEAD users of ports/packages, maintainers
12
	   of ports that interact with the compat libraries.
33
	   of ports that interact with the compat libraries.
(-)./mail/ezmlm/Makefile (-5 / +5 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	ezmlm
8
PORTNAME=	ezmlm
9
PORTVERSION=	0.53
9
PORTVERSION=	0.53
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://cr.yp.to/software/ \
12
MASTER_SITES=	http://cr.yp.to/software/ \
12
		ftp://ftp.fu-berlin.de/unix/mail/qmail/ \
13
		ftp://ftp.fu-berlin.de/unix/mail/qmail/ \
Lines 19-33 Link Here
19
MAINTAINER=	sergei@FreeBSD.org
20
MAINTAINER=	sergei@FreeBSD.org
20
COMMENT=	An easy-to-use, high-speed mailing list manager for qmail
21
COMMENT=	An easy-to-use, high-speed mailing list manager for qmail
21
22
22
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
23
DEPEND_QMAIL_RUN=	yes
23
24
24
CONFLICTS=	ezmlm-idx-*
25
CONFLICTS=	ezmlm-idx-*
25
26
26
NO_PACKAGE=	Unsure of DJB license
27
NO_PACKAGE=	Unsure of DJB license
27
28
28
# QMAIL_DIR is the directory where qmail is installed
29
QMAIL_DIR?=	/var/qmail
30
31
ALL_TARGET=	it
29
ALL_TARGET=	it
32
30
33
PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
31
PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
Lines 38-49 Link Here
38
MAN5=		ezmlm.5
36
MAN5=		ezmlm.5
39
DOCS=		BLURB INSTALL README THANKS TODO
37
DOCS=		BLURB INSTALL README THANKS TODO
40
38
39
.include "${.CURDIR}/../qmail/Makefile.include"
40
41
post-patch:
41
post-patch:
42
	@${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin
42
	@${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin
43
	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
43
	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
44
	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
44
	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
45
	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
45
	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
46
	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
46
	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
47
47
48
do-install:
48
do-install:
49
	cd ${WRKSRC} && \
49
	cd ${WRKSRC} && \
(-)./mail/ezmlm-idx/Makefile (-6 / +5 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	ezmlm-idx
8
PORTNAME=	ezmlm-idx
9
PORTVERSION=	0.40
9
PORTVERSION=	0.40
10
PORTREVISION=	3
10
PORTREVISION=	4
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
12
MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
13
		ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
13
		ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
Lines 22-34 Link Here
22
MAINTAINER=	sergei@FreeBSD.org
22
MAINTAINER=	sergei@FreeBSD.org
23
COMMENT=	Improved version of the ezmlm mailing list manager
23
COMMENT=	Improved version of the ezmlm mailing list manager
24
24
25
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
25
DEPEND_QMAIL_RUN=	yes
26
26
27
CONFLICTS=	ezmlm-0.*
27
CONFLICTS=	ezmlm-0.*
28
28
29
# QMAIL_DIR is the directory where qmail is installed
30
QMAIL_DIR?=	/var/qmail
31
32
# LANGUAGE is the ISO code for the language to use in ezmlmrc
29
# LANGUAGE is the ISO code for the language to use in ezmlmrc
33
LANGUAGE?=	en_US
30
LANGUAGE?=	en_US
34
31
Lines 75-80 Link Here
75
MAN5=	ezmlm.5 ezmlmglrc.5 ezmlmrc.5 ezmlmsubrc.5
72
MAN5=	ezmlm.5 ezmlmglrc.5 ezmlmrc.5 ezmlmsubrc.5
76
DOCS=	CHANGES.idx DOWNGRADE.idx FAQ.idx INSTALL.idx README.idx UPGRADE.idx
73
DOCS=	CHANGES.idx DOWNGRADE.idx FAQ.idx INSTALL.idx README.idx UPGRADE.idx
77
74
75
.include "${.CURDIR}/../qmail/Makefile.include"
76
78
pre-patch:
77
pre-patch:
79
	@${MV} -f ${WRKDIR}/ezmlm-idx-${PORTVERSION}/* ${WRKSRC}
78
	@${MV} -f ${WRKDIR}/ezmlm-idx-${PORTVERSION}/* ${WRKSRC}
80
	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < idx.patch
79
	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < idx.patch
Lines 91-97 Link Here
91
	@${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld
90
	@${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld
92
.endif
91
.endif
93
	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
92
	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
94
	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
93
	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
95
	@${REINPLACE_CMD} -e 's,/etc/ezmlm/,${PREFIX}/etc/ezmlm/,' \
94
	@${REINPLACE_CMD} -e 's,/etc/ezmlm/,${PREFIX}/etc/ezmlm/,' \
96
		${WRKSRC}/idx.h
95
		${WRKSRC}/idx.h
97
96
(-)./mail/mailfront/Makefile (-2 / +4 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	mailfront
8
PORTNAME=	mailfront
9
PORTVERSION=	0.92
9
PORTVERSION=	0.92
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
12
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
12
13
Lines 16-34 Link Here
16
BUILD_DEPENDS=	${LOCALBASE}/lib/libbg.a:${PORTSDIR}/devel/bglibs \
17
BUILD_DEPENDS=	${LOCALBASE}/lib/libbg.a:${PORTSDIR}/devel/bglibs \
17
		${LOCALBASE}/lib/libcvm-client.a:${PORTSDIR}/security/cvm
18
		${LOCALBASE}/lib/libcvm-client.a:${PORTSDIR}/security/cvm
18
19
19
QMAIL_ROOT?=	/var/qmail
20
CFLAGS+=	-I${LOCALBASE}/include
20
CFLAGS+=	-I${LOCALBASE}/include
21
LDFLAGS?=	-s
21
LDFLAGS?=	-s
22
22
23
DOCS=		NEWS README TODO *.html
23
DOCS=		NEWS README TODO *.html
24
24
25
.include "${.CURDIR}/../qmail/Makefile.include"
26
25
do-configure:
27
do-configure:
26
	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
28
	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
27
	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
29
	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
28
	${ECHO_CMD} "${CC} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
30
	${ECHO_CMD} "${CC} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
29
	${ECHO_CMD} "${LOCALBASE}/include/bglibs" > ${WRKSRC}/conf-bgincs
31
	${ECHO_CMD} "${LOCALBASE}/include/bglibs" > ${WRKSRC}/conf-bgincs
30
	${ECHO_CMD} "${LOCALBASE}/lib"	> ${WRKSRC}/conf-bglibs
32
	${ECHO_CMD} "${LOCALBASE}/lib"	> ${WRKSRC}/conf-bglibs
31
	${ECHO_CMD} "${QMAIL_ROOT}"	> ${WRKSRC}/conf-qmail
33
	${ECHO_CMD} "${QMAIL_PREFIX}"	> ${WRKSRC}/conf-qmail
32
34
33
do-install:
35
do-install:
34
	cd ${WRKSRC} && ./installer
36
	cd ${WRKSRC} && ./installer
(-)./mail/mess822/Makefile (-8 / +5 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	mess822
8
PORTNAME=	mess822
9
PORTVERSION=	0.58
9
PORTVERSION=	0.58
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://cr.yp.to/software/ \
12
MASTER_SITES=	http://cr.yp.to/software/ \
12
		ftp://ftp.jp.qmail.org/qmail/ \
13
		ftp://ftp.jp.qmail.org/qmail/ \
Lines 16-22 Link Here
16
MAINTAINER=	drs@rucus.ru.ac.za
17
MAINTAINER=	drs@rucus.ru.ac.za
17
COMMENT=	RFC 822 mail message parsing library and rewriting utilities
18
COMMENT=	RFC 822 mail message parsing library and rewriting utilities
18
19
19
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
20
DEPEND_QMAIL_RUN=	yes
20
21
21
NO_PACKAGE=	Violates djb\'s license
22
NO_PACKAGE=	Violates djb\'s license
22
USE_REINPLACE=	yes
23
USE_REINPLACE=	yes
Lines 31-47 Link Here
31
MAN5=		rewriting.5
32
MAN5=		rewriting.5
32
MAN8=		ofmipd.8 ofmipname.8
33
MAN8=		ofmipd.8 ofmipname.8
33
34
34
.if exists(${PREFIX}/qmail/bin/qmail-send)
35
QMAIL_DIR?=	${PREFIX}/qmail
36
.else
37
QMAIL_DIR?=	/var/qmail
38
.endif
39
40
NO_MTREE=	yes
35
NO_MTREE=	yes
41
36
37
.include "${.CURDIR}/../qmail/Makefile.include"
38
42
post-patch:
39
post-patch:
43
	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
40
	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
44
	@${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKSRC}/conf-qmail
41
	@${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_PREFIX}|" ${WRKSRC}/conf-qmail
45
	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
42
	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
46
43
47
.include <bsd.port.mk>
44
.include <bsd.port.mk>
(-)./mail/qmHandle/Makefile (-7 / +3 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmHandle
8
PORTNAME=	qmHandle
9
PORTVERSION=	1.2.0
9
PORTVERSION=	1.2.0
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	qmhandle
13
MASTER_SITE_SUBDIR=	qmhandle
Lines 16-32 Link Here
16
MAINTAINER=	petef@FreeBSD.org
16
MAINTAINER=	petef@FreeBSD.org
17
COMMENT=	Tool to view and manage a qmail queue
17
COMMENT=	Tool to view and manage a qmail queue
18
18
19
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
19
DEPEND_QMAIL_RUN=	yes
20
20
21
NO_WRKSUBDIR=	yes
21
NO_WRKSUBDIR=	yes
22
NO_BUILD=	yes
22
NO_BUILD=	yes
23
USE_PERL5=	yes
23
USE_PERL5=	yes
24
24
25
.if exists(${LOCALBASE}/qmail/bin/qmail-qstat)
25
.include "${.CURDIR}/../qmail/Makefile.include"
26
QMAIL_DIR?=	${LOCALBASE}/qmail
27
.else
28
QMAIL_DIR?=	/var/qmail
29
.endif
30
26
31
.include <bsd.port.pre.mk>
27
.include <bsd.port.pre.mk>
32
28
(-)./mail/qmail/Makefile (-13 / +48 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail
8
PORTNAME=	qmail
9
PORTVERSION?=	${QMAIL_VERSION}
9
PORTVERSION?=	${QMAIL_VERSION}
10
PORTREVISION?=	4
10
PORTREVISION?=	5
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES+=	${MASTER_SITE_QMAIL}
12
MASTER_SITES+=	${MASTER_SITE_QMAIL}
13
DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
13
DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
Lines 99-108 Link Here
99
NO_PACKAGE=	djb's packaging license does not allow non-standard \
99
NO_PACKAGE=	djb's packaging license does not allow non-standard \
100
		qmail binary distributions
100
		qmail binary distributions
101
101
102
# A normal qmail installation puts everything into /var/qmail/.
102
.include "Makefile.include"
103
# If you want to install to /usr/local/, then "/usr/local/qmail" is
103
104
# suggested instead of "/usr/local", but both will work.
104
PREFIX?=		${QMAIL_PREFIX}
105
PREFIX?=		/var/qmail
106
QMAIL_VERSION?=		1.03
105
QMAIL_VERSION?=		1.03
107
106
108
.if !defined(BARRIER_QMAILQUEUE_PATCH)
107
.if !defined(BARRIER_QMAILQUEUE_PATCH)
Lines 193-198 Link Here
193
	qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \
192
	qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \
194
	qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8
193
	qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8
195
194
195
.if defined(SLAVE_MYSQL)
196
PKGMESSAGE_SUFFIX=	mysql
197
.endif
198
196
.if defined(SLAVE_SPAMCONTROL)
199
.if defined(SLAVE_SPAMCONTROL)
197
EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
200
EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
198
ALL_TARGET+=	${EXTRA_MAN8}
201
ALL_TARGET+=	${EXTRA_MAN8}
Lines 206-219 Link Here
206
.endif
209
.endif
207
210
208
.if defined(SLAVE_LDAP)
211
.if defined(SLAVE_LDAP)
209
PKGMESSAGE_SUFFIX=	-ldap
212
PKGMESSAGE_SUFFIX=	ldap
210
PLIST_SUB+=	LDAP="" NOT_LDAP="@comment "
213
PLIST_SUB+=	LDAP="" NOT_LDAP="@comment "
211
.else
214
.else
212
PLIST_SUB+=	LDAP="@comment " NOT_LDAP=""
215
PLIST_SUB+=	LDAP="@comment " NOT_LDAP=""
213
.endif
216
.endif
214
217
215
.if defined(SLAVE_SMTP_AUTH_TLS)
218
.if defined(SLAVE_SMTP_AUTH_TLS)
216
PKGMESSAGE_SUFFIX=	-smtp_auth+tls
219
PKGMESSAGE_SUFFIX=	smtp_auth+tls
217
PLIST_SUB+=	SMTP_AUTH_TLS=""
220
PLIST_SUB+=	SMTP_AUTH_TLS=""
218
.else
221
.else
219
PLIST_SUB+=	SMTP_AUTH_TLS="@comment "
222
PLIST_SUB+=	SMTP_AUTH_TLS="@comment "
Lines 226-241 Link Here
226
.endif
229
.endif
227
230
228
.if defined(SLAVE_TLS)
231
.if defined(SLAVE_TLS)
229
PKGMESSAGE_SUFFIX=	-tls
232
PKGMESSAGE_SUFFIX=	tls
230
PLIST_SUB+=	TLS=""
233
PLIST_SUB+=	TLS=""
231
.else
234
.else
232
PLIST_SUB+=	TLS="@comment "
235
PLIST_SUB+=	TLS="@comment "
233
.endif
236
.endif
234
237
235
SUB_FILES+=	pkg-message${PKGMESSAGE_SUFFIX} mailer.conf.sample \
238
.if defined(PKGMESSAGE_SUFFIX)
236
		bootfiles.sed enable-qmail
239
SLAVEPORT_LINE=	${PKGMESSAGE_SUFFIX}
240
.elif defined(SLAVE_SPAMCONTROL)
241
SLAVEPORT_LINE=	spamcontrol
242
.endif
243
244
SUB_FILES+=	mailer.conf.sample bootfiles.sed enable-qmail
237
PKGINSTALL?=	${WRKDIR}/pkg-install
245
PKGINSTALL?=	${WRKDIR}/pkg-install
238
PKGMESSAGE?=	${WRKDIR}/pkg-message${PKGMESSAGE_SUFFIX}
246
247
.if defined(PKGMESSAGE_SUFFIX)
248
SUB_FILES+=	pkg-message-${PKGMESSAGE_SUFFIX}
249
PKGMESSAGE?=	${WRKDIR}/pkg-message-${PKGMESSAGE_SUFFIX}
250
.else
251
SUB_FILES+=	pkg-message
252
.endif
239
253
240
CSH?=	/bin/csh
254
CSH?=	/bin/csh
241
255
Lines 313-322 Link Here
313
.endif
327
.endif
314
328
315
.if defined(SLAVE_LDAP)
329
.if defined(SLAVE_LDAP)
316
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
317
330
318
.if !defined(WITHOUT_TLS)
331
.if !defined(WITHOUT_TLS)
319
PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
320
# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
332
# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
321
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
333
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
322
.endif
334
.endif
Lines 472-477 Link Here
472
	@${ECHO_MSG} ""
484
	@${ECHO_MSG} ""
473
.endif
485
.endif
474
486
487
.if !defined(QMAIL_PREFIX)
488
	@${ECHO_MSG} "QMAIL_PREFIX=PREFIX_PATH"
489
	@${ECHO_MSG} "		(default PREFIX_PATH=${PREFIX})"
490
	@${ECHO_MSG} "		A normal qmail installation puts"
491
	@${ECHO_MSG} "		everything into /var/qmail/."
492
	@${ECHO_MSG} "		If you want to install to ${LOCALBASE},"
493
	@${ECHO_MSG} "		then \"${LOCALBASE}/qmail\" is suggested"
494
	@${ECHO_MSG} "		instead of \"${LOCALBASE}\", but both will"
495
	@${ECHO_MSG} "		work."
496
 	@${ECHO_MSG} ""
497
.endif
498
 
475
post-extract:
499
post-extract:
476
.if defined(SLAVE_SPAMCONTROL)
500
.if defined(SLAVE_SPAMCONTROL)
477
	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
501
	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
Lines 595-600 Link Here
595
	@${ECHO_CMD}
619
	@${ECHO_CMD}
596
	@${CAT} ${PKGMESSAGE}
620
	@${CAT} ${PKGMESSAGE}
597
	@${ECHO_CMD}
621
	@${ECHO_CMD}
622
.if defined(SLAVEPORT_LINE)
623
	@${ECHO_CMD} "============================================="
624
	@${ECHO_CMD}
625
	@${ECHO_CMD} "ATTENTION"
626
	@${ECHO_CMD}
627
	@${ECHO_CMD} "Add the following line to your /etc/make.conf"
628
	@${ECHO_CMD} "QMAIL_SLAVEPORT=${SLAVEPORT_LINE}"
629
	@${ECHO_CMD}
630
	@${ECHO_CMD} "============================================="
631
	@${ECHO_CMD}
632
.endif
598
633
599
certificate:
634
certificate:
600
.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_LDAP)
635
.if defined(SLAVE_TLS) || defined(SLAVE_SMTP_AUTH_TLS) || defined(SLAVE_LDAP)
(-)./mail/qmail/Makefile.include (+19 lines)
Line 0 Link Here
1
QMAIL_PREFIX?=	/var/qmail
2
3
.if defined(DEPEND_QMAIL) || defined(DEPEND_QMAIL_RUN) || defined (DEPEND_QMAIL_BUILD)
4
5
.if defined(QMAIL_SLAVEPORT)
6
QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT}
7
.else
8
QMAIL_DEPENDS=	${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
9
.endif
10
11
.if defined(DEPEND_QMAIL) || defined(DEPEND_QMAIL_RUN)
12
RUN_DEPENDS+=	${QMAIL_DEPENDS}
13
.endif
14
15
.if defined(DEPEND_QMAIL) || defined(DEPEND_QMAIL_BUILD)
16
BUILD_DEPENDS+=	${QMAIL_DEPENDS}
17
.endif
18
19
.endif
(-)./mail/qmail-conf/Makefile (-5 / +5 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail-conf
8
PORTNAME=	qmail-conf
9
PORTVERSION=	0.60
9
PORTVERSION=	0.60
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	http://www.din.or.jp/~ushijima/qmail-conf/ \
12
MASTER_SITES=	http://www.din.or.jp/~ushijima/qmail-conf/ \
13
		http://cr.yp.to/djbdns/
13
		http://cr.yp.to/djbdns/
Lines 23-31 Link Here
23
23
24
NO_PACKAGE=	"borrows code from djbdns, thus falls under the same restrictions as dns/djbdns"
24
NO_PACKAGE=	"borrows code from djbdns, thus falls under the same restrictions as dns/djbdns"
25
25
26
# Note: this MUST be the same as the directory qmail is installed in!
26
PREFIX?=	${QMAIL_PREFIX}
27
QMAIL_DIR?=	/var/qmail
28
PREFIX?=	${QMAIL_DIR}
29
27
30
NO_MTREE=	yes
28
NO_MTREE=	yes
31
29
Lines 33-43 Link Here
33
DJBDNS_NAME=	djbdns-${DJBDNS_VER}
31
DJBDNS_NAME=	djbdns-${DJBDNS_VER}
34
DJBDNS_DIST=	${DJBDNS_NAME}${EXTRACT_SUFX}
32
DJBDNS_DIST=	${DJBDNS_NAME}${EXTRACT_SUFX}
35
33
34
.include "${.CURDIR}/../qmail/Makefile.include"
35
36
post-extract:
36
post-extract:
37
		@(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DJBDNS_DIST} ${EXTRACT_AFTER_ARGS})
37
		@(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DJBDNS_DIST} ${EXTRACT_AFTER_ARGS})
38
38
39
post-patch:
39
post-patch:
40
		@${ECHO_CMD} "${QMAIL_DIR}" > ${WRKSRC}/conf-qmail
40
		@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
41
		@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
41
		@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
42
		@${ECHO_CMD} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld
42
		@${ECHO_CMD} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld
43
		@${ECHO_CMD} "${LOCALBASE}" > ${WRKSRC}/conf-ucspi-tcp
43
		@${ECHO_CMD} "${LOCALBASE}" > ${WRKSRC}/conf-ucspi-tcp
(-)./mail/qmail-contrib/Makefile (-10 / +7 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	qmail-contrib
8
PORTNAME=	qmail-contrib
9
PORTVERSION=	0.1
9
PORTVERSION=	0.1
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	ftp://ftp.qmail.org/pub/software/ \
12
MASTER_SITES=	ftp://ftp.qmail.org/pub/software/ \
12
		ftp://rucus.ru.ac.za/pub/mail/qmail/src/
13
		ftp://rucus.ru.ac.za/pub/mail/qmail/src/
Lines 16-22 Link Here
16
MAINTAINER=	ports@FreeBSD.org
17
MAINTAINER=	ports@FreeBSD.org
17
COMMENT=	Contributed programs for qmail
18
COMMENT=	Contributed programs for qmail
18
19
19
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
20
DEPEND_QMAIL_RUN=	yes
20
21
21
NO_PACKAGE=	Unsure of djb\'s license
22
NO_PACKAGE=	Unsure of djb\'s license
22
23
Lines 28-40 Link Here
28
29
29
PLIST_SUB=	DOCDIR=${DOCDIR}
30
PLIST_SUB=	DOCDIR=${DOCDIR}
30
31
31
.if exists(${PREFIX}/qmail/bin/qmail-send)
32
PREFIX?=	${QMAIL_PREFIX}
32
QMAIL_DIR?=	${PREFIX}/qmail
33
PREFIX?=	${PREFIX}/qmail
34
.else
35
QMAIL_DIR?=	/var/qmail
36
PREFIX?=	/var/qmail
37
.endif
38
33
39
.if (${PREFIX} == "/usr/local")
34
.if (${PREFIX} == "/usr/local")
40
DOCDIR=		share/doc/qmail
35
DOCDIR=		share/doc/qmail
Lines 52-57 Link Here
52
NO_MTREE=	yes
47
NO_MTREE=	yes
53
USE_PERL5_BUILD=yes
48
USE_PERL5_BUILD=yes
54
49
50
.include "${.CURDIR}/../qmail/Makefile.include"
51
55
pre-patch:
52
pre-patch:
56
	@cd ${WRKFF} \
53
	@cd ${WRKFF} \
57
	&& ${PATCH} -s <${PATCHDIR}/extra-patch-newaliases
54
	&& ${PATCH} -s <${PATCHDIR}/extra-patch-newaliases
Lines 60-69 Link Here
60
57
61
post-patch:
58
post-patch:
62
	@perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKFF}/conf-cc
59
	@perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKFF}/conf-cc
63
	@perl -pi.bak -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKFF}/conf-qmail
60
	@perl -pi.bak -e "s|.var.qmail|${QMAIL_PREFIX}|" ${WRKFF}/conf-qmail
64
	@perl -pi.bak -e '$$_ = "" if /cat/' ${WRKFF}/hier.c
61
	@perl -pi.bak -e '$$_ = "" if /cat/' ${WRKFF}/hier.c
65
	@perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKDF}/conf-cc
62
	@perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKDF}/conf-cc
66
	@perl -pi.bak -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKDF}/conf-qmail
63
	@perl -pi.bak -e "s|.var.qmail|${QMAIL_PREFIX}|" ${WRKDF}/conf-qmail
67
	@perl -pi.bak -e '$$_ = "" if /cat/' ${WRKDF}/hier.c
64
	@perl -pi.bak -e '$$_ = "" if /cat/' ${WRKDF}/hier.c
68
65
69
do-build:
66
do-build:
(-)./mail/qmail-ldap/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail
8
PORTNAME=	qmail
9
PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
9
PORTVERSION=	${QMAIL_VERSION}.${LDAP_PATCH_DATE}
10
PORTREVISION=	2
10
PORTREVISION=	3
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
PKGNAMESUFFIX=	-ldap
12
PKGNAMESUFFIX=	-ldap
13
13
(-)./mail/qmail-mysql/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail
8
PORTNAME=	qmail
9
PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
9
PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
10
PORTREVISION=	0
10
PORTREVISION=	1
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
PKGNAMESUFFIX=	-mysql
12
PKGNAMESUFFIX=	-mysql
13
13
(-)./mail/qmail-rblchk/Makefile (-2 / +4 lines)
Lines 7-26 Link Here
7
7
8
PORTNAME=	qmail-rblchk
8
PORTNAME=	qmail-rblchk
9
PORTVERSION=	2.2
9
PORTVERSION=	2.2
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://morettoni.net/qmail/
12
MASTER_SITES=	http://morettoni.net/qmail/
12
13
13
MAINTAINER=	ehaupt@critical.ch
14
MAINTAINER=	ehaupt@critical.ch
14
COMMENT=	A qmail RBL filter
15
COMMENT=	A qmail RBL filter
15
16
16
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
17
DEPEND_QMAIL_RUN=	yes
17
18
18
LDFLAGS?=	-s
19
LDFLAGS?=	-s
19
CFLAGS?=	-O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \
20
CFLAGS?=	-O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \
20
		-Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
21
		-Wshadow -Wcast-qual -Wcast-align -Wwrite-strings
21
22
22
WRKSRC=		${WRKDIR}/${PORTNAME}
23
WRKSRC=		${WRKDIR}/${PORTNAME}
23
QMAIL_DIR?=	/var/qmail
24
24
25
ALL_TARGET=	default
25
ALL_TARGET=	default
26
INSTALL_TARGET=	setup
26
INSTALL_TARGET=	setup
Lines 30-35 Link Here
30
PLIST_FILES=	bin/qmail-rblchk %%EXAMPLESDIR%%/spam-report.sh
30
PLIST_FILES=	bin/qmail-rblchk %%EXAMPLESDIR%%/spam-report.sh
31
PLIST_DIRS=	%%EXAMPLESDIR%%
31
PLIST_DIRS=	%%EXAMPLESDIR%%
32
MAN1=		qmail-rblchk.1
32
MAN1=		qmail-rblchk.1
33
34
.include "${.CURDIR}/../qmail/Makefile.include"
33
35
34
post-patch:
36
post-patch:
35
	@${REINPLACE_CMD} 's|02755|0755|g; /"cat/d' ${WRKSRC}/hier.c
37
	@${REINPLACE_CMD} 's|02755|0755|g; /"cat/d' ${WRKSRC}/hier.c
(-)./mail/qmail-scanner/Makefile (-9 / +9 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail-scanner
8
PORTNAME=	qmail-scanner
9
PORTVERSION=	1.25
9
PORTVERSION=	1.25
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail security
11
CATEGORIES=	mail security
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 17-30 Link Here
17
MAINTAINER=	freebsd@simplerezo.com
17
MAINTAINER=	freebsd@simplerezo.com
18
COMMENT=	Content/Anti-virus Scanner for qmail
18
COMMENT=	Content/Anti-virus Scanner for qmail
19
19
20
BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
20
BUILD_DEPENDS=	reformime:${PORTSDIR}/mail/maildrop \
21
		reformime:${PORTSDIR}/mail/maildrop \
22
		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
21
		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
23
22
24
# A normal qmail installation puts everything into /var/qmail/.
23
QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
25
# Must match your qmail installation
26
QMAIL_DIR?=	/var/qmail
27
QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
28
24
29
USE_PERL5=	yes
25
USE_PERL5=	yes
30
NO_BUILD=	yes
26
NO_BUILD=	yes
Lines 79-90 Link Here
79
75
80
RUN_DEPENDS=	${BUILD_DEPENDS}
76
RUN_DEPENDS=	${BUILD_DEPENDS}
81
77
78
DEPEND_QMAIL=	yes
79
82
SPOOLDIR=	${PREFIX}/qmailscan
80
SPOOLDIR=	${PREFIX}/qmailscan
83
PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
81
PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
84
82
85
HAS_CONFIGURE=	yes
83
HAS_CONFIGURE=	yes
86
CONFIGURE_ARGS+=	\
84
CONFIGURE_ARGS+=	\
87
		--qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \
85
		--qmaildir "${QMAIL_PREFIX}" --spooldir "${SPOOLDIR}" \
88
		--bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \
86
		--bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \
89
		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
87
		--admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \
90
		--silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \
88
		--silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \
Lines 93-98 Link Here
93
		--log-details syslog --debug no \
91
		--log-details syslog --debug no \
94
		--batch
92
		--batch
95
93
94
.include "${.CURDIR}/../qmail/Makefile.include"
95
96
pre-configure:
96
pre-configure:
97
	@${ECHO_MSG} ""
97
	@${ECHO_MSG} ""
98
	@${ECHO_MSG} "----------------------------------------"
98
	@${ECHO_MSG} "----------------------------------------"
Lines 137-143 Link Here
137
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
137
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
138
	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
138
	@if ! ${TEST} -f ${QMAIL_QUEUE}; then \
139
		${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
139
		${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
140
		${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
140
		${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
141
		exit 1; \
141
		exit 1; \
142
	fi
142
	fi
143
143
(-)./mail/qmail-scanner/pkg-plist (-12 / +18 lines)
Lines 2-17 Link Here
2
bin/qmail-scanner-queue.pl
2
bin/qmail-scanner-queue.pl
3
bin/qs2mrtg.pl
3
bin/qs2mrtg.pl
4
share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
4
share/examples/qs2mrtg/mrtg-qmail-scanner.cfg
5
@dirrm share/examples/qs2mrtg
6
@unexec if cmp -s %D/%%SPOOLDIR%%/quarantine-attachments.txt %D/%%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %D/%%SPOOLDIR%%/quarantine-attachments.txt && rm -f %D/%%SPOOLDIR%%/quarantine-attachments.db; fi
5
%%SPOOLDIR%%/quarantine-attachments.sample
7
%%SPOOLDIR%%/quarantine-attachments.sample
6
@unexec if cmp -s %%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %%SPOOLDIR%%/quarantine-attachments.txt; fi
8
@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt
7
@unexec rmdir share/examples/qs2mrtg 2>/dev/null || true
9
%%SPOOLDIR%%/qmail-scanner-queue-version.txt
8
@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true
10
@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true
9
@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true
11
@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true
10
@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true
12
@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true
11
@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true
13
@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true
12
@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
14
@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true
13
@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true
15
@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true
14
@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
16
@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true
15
@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true
17
@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true
16
@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true
18
@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true
17
@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true
19
@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true
20
@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true
21
@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true
22
@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true
23
@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true
(-)./mail/qmail-smtp_auth+tls/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail
8
PORTNAME=	qmail
9
PORTVERSION=	${QMAIL_VERSION}.${SMTP_AUTH-TLS_PATCH_DATE}
9
PORTVERSION=	${QMAIL_VERSION}.${SMTP_AUTH-TLS_PATCH_DATE}
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
PKGNAMESUFFIX=	-smtp_auth+tls
12
PKGNAMESUFFIX=	-smtp_auth+tls
13
13
(-)./mail/qmail-spamcontrol/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail
8
PORTNAME=	qmail
9
PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
9
PORTVERSION=	${QMAIL_VERSION}.${SPAMCONTROL_VERSION}
10
PORTREVISION=	0
10
PORTREVISION=	1
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol
12
MASTER_SITES+=	http://www.fehcom.de/qmail/spamcontrol/:spamcontrol
13
PKGNAMESUFFIX=	-spamcontrol
13
PKGNAMESUFFIX=	-spamcontrol
(-)./mail/qmail-tls/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	qmail
8
PORTNAME=	qmail
9
PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
9
PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
10
PORTREVISION=	0
10
PORTREVISION=	1
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
PKGNAMESUFFIX=	-tls
12
PKGNAMESUFFIX=	-tls
13
13
(-)./mail/qmailadmin/Makefile (-11 / +4 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	qmailadmin
8
PORTNAME=	qmailadmin
9
PORTVERSION=	1.2.7
9
PORTVERSION=	1.2.7
10
PORTREVISION=	1
10
PORTEPOCH=	1
11
PORTEPOCH=	1
11
CATEGORIES=	mail www
12
CATEGORIES=	mail www
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
Lines 70-91 Link Here
70
PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
71
PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
71
		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
72
		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
72
73
73
.include <bsd.port.pre.mk>
74
.include "${.CURDIR}/../qmail/Makefile.include"
74
75
#
76
# QMAIL_DIR     - location of qmail directory
77
#
78
75
79
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
76
.include <bsd.port.pre.mk>
80
QMAIL_DIR?=	${LOCALBASE}/qmail
81
.else
82
QMAIL_DIR?=	/var/qmail
83
.endif
84
77
85
# End of user-configurable variables
78
# End of user-configurable variables
86
79
87
CONFIGURE_ARGS+=	\
80
CONFIGURE_ARGS+=	\
88
	--enable-qmaildir=${QMAIL_DIR} \
81
	--enable-qmaildir=${QMAIL_PREFIX} \
89
	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
82
	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
90
	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
83
	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
91
	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
84
	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
(-)./mail/qmailadmin-devel/Makefile (-13 / +4 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	qmailadmin
8
PORTNAME=	qmailadmin
9
PORTVERSION=	1.2.7
9
PORTVERSION=	1.2.7
10
PORTREVISION=	1
10
CATEGORIES=	mail www
11
CATEGORIES=	mail www
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 16-26 Link Here
16
COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
17
COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
17
18
18
BUILD_DEPENDS=	\
19
BUILD_DEPENDS=	\
19
	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
20
	autorespond:${PORTSDIR}/mail/autorespond \
20
	autorespond:${PORTSDIR}/mail/autorespond \
21
	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
21
	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
22
RUN_DEPENDS=	\
22
RUN_DEPENDS=	\
23
	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
24
	autorespond:${PORTSDIR}/mail/autorespond \
23
	autorespond:${PORTSDIR}/mail/autorespond \
25
	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
24
	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
26
25
Lines 71-92 Link Here
71
PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
70
PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
72
		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
71
		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
73
72
74
.include <bsd.port.pre.mk>
73
.include "${.CURDIR}/../qmail/Makefile.include"
75
76
#
77
# QMAIL_DIR     - location of qmail directory
78
#
79
74
80
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
75
.include <bsd.port.pre.mk>
81
QMAIL_DIR?=	${LOCALBASE}/qmail
82
.else
83
QMAIL_DIR?=	/var/qmail
84
.endif
85
76
86
# End of user-configurable variables
77
# End of user-configurable variables
87
78
88
CONFIGURE_ARGS+=	\
79
CONFIGURE_ARGS+=	\
89
	--enable-qmaildir=${QMAIL_DIR} \
80
	--enable-qmaildir=${QMAIL_PREFIX} \
90
	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
81
	--enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
91
	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
82
	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \
92
	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
83
	--enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \
(-)./mail/qmailanalog/Makefile (-11 / +7 lines)
Lines 7-20 Link Here
7
7
8
PORTNAME=	qmailanalog
8
PORTNAME=	qmailanalog
9
PORTVERSION=	0.70
9
PORTVERSION=	0.70
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	ftp://cr.yp.to/software/
12
MASTER_SITES=	ftp://cr.yp.to/software/
13
13
14
MAINTAINER=	garga@FreeBSD.org
14
MAINTAINER=	garga@FreeBSD.org
15
COMMENT=	A collection of tools to analyze qmail-send's activity
15
COMMENT=	A collection of tools to analyze qmail-send's activity
16
16
17
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
17
DEPEND_QMAIL_RUN=	yes
18
18
19
ALL_TARGET=	it
19
ALL_TARGET=	it
20
INSTALL_TARGET=	setup
20
INSTALL_TARGET=	setup
Lines 24-51 Link Here
24
24
25
PLIST_SUB+=	MYSUBDIR=${MYSUBDIR}
25
PLIST_SUB+=	MYSUBDIR=${MYSUBDIR}
26
26
27
.if exists(${PREFIX}/qmail/bin/qmail-send)
28
QMAIL_DIR?=	${PREFIX}/qmail
29
.else
30
QMAIL_DIR?=	/var/qmail
31
.endif
32
33
.if !defined(NOSUBDIR)
27
.if !defined(NOSUBDIR)
34
MYSUBDIR?=	qmailanalog/
28
MYSUBDIR?=	qmailanalog/
35
.else
29
.else
36
MYSUBDIR?=
30
MYSUBDIR?=
37
.endif
31
.endif
38
32
39
PREFIX?=	${QMAIL_DIR}
33
PREFIX?=	${QMAIL_PREFIX}
40
QMPREFIX?=	${PREFIX}/${MYSUBDIR}
34
QMPREFIX?=	${PREFIX}/${MYSUBDIR}
41
35
42
NO_MTREE=	yes
36
NO_MTREE=	yes
43
USE_REINPLACE=	yes
37
USE_REINPLACE=	yes
44
38
39
.include "${.CURDIR}/../qmail/Makefile.include"
40
45
.include <bsd.port.pre.mk>
41
.include <bsd.port.pre.mk>
46
42
47
.if ${PREFIX} != ${QMAIL_DIR}
43
.if ${PREFIX} != ${QMAIL_PREFIX}
48
BROKEN=	"Cannot Make and Install with different PREFIX or QMAIL_DIR"
44
BROKEN=	"Cannot Make and Install with different PREFIX or QMAIL_PREFIX"
49
.endif
45
.endif
50
46
51
post-patch:
47
post-patch:
(-)./mail/qmailmrtg7/Makefile (-10 / +6 lines)
Lines 7-35 Link Here
7
7
8
PORTNAME=	qmailmrtg7
8
PORTNAME=	qmailmrtg7
9
PORTVERSION=	4.2
9
PORTVERSION=	4.2
10
PORTREVISION=	1
10
CATEGORIES=	mail net-mgmt
11
CATEGORIES=	mail net-mgmt
11
MASTER_SITES=	http://www.inter7.com/qmailmrtg7/
12
MASTER_SITES=	http://www.inter7.com/qmailmrtg7/
12
13
13
MAINTAINER=	ale@FreeBSD.org
14
MAINTAINER=	ale@FreeBSD.org
14
COMMENT=	A program to create mrtg graphs for qmail activity
15
COMMENT=	A program to create mrtg graphs for qmail activity
15
16
16
BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail
17
RUN_DEPENDS=	mrtg:${PORTSDIR}/net-mgmt/mrtg
17
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
18
DEPEND_QMAIL=	yes
18
		mrtg:${PORTSDIR}/net-mgmt/mrtg
19
19
20
USE_REINPLACE=	yes
20
USE_REINPLACE=	yes
21
21
22
.include <bsd.port.pre.mk>
22
.include "${.CURDIR}/../qmail/Makefile.include"
23
23
24
.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
24
.include <bsd.port.pre.mk>
25
QMAIL_DIR?=	${LOCALBASE}/qmail
26
.else
27
QMAIL_DIR?=	/var/qmail
28
.endif
29
25
30
post-patch:
26
post-patch:
31
	@${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile
27
	@${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile
32
	@${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_DIR}|g" \
28
	@${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_PREFIX}|g" \
33
		${WRKSRC}/checkq.c ${WRKSRC}/qmail.mrtg.cfg
29
		${WRKSRC}/checkq.c ${WRKSRC}/qmail.mrtg.cfg
34
30
35
do-install:
31
do-install:
(-)./mail/qscan/Makefile (-9 / +7 lines)
Lines 7-34 Link Here
7
7
8
PORTNAME=	qscan
8
PORTNAME=	qscan
9
PORTVERSION=	1.5
9
PORTVERSION=	1.5
10
PORTREVISION=	1
10
CATEGORIES=	mail security
11
CATEGORIES=	mail security
11
MASTER_SITES=	ftp://ftp.c9x.org/qscan/
12
MASTER_SITES=	ftp://ftp.c9x.org/qscan/
12
13
13
MAINTAINER=	ale@FreeBSD.org
14
MAINTAINER=	ale@FreeBSD.org
14
COMMENT=	A mail filter for Qmail that scans messages with ClamAV
15
COMMENT=	A mail filter for Qmail that scans messages with ClamAV
15
16
16
RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
17
RUN_DEPENDS=	clamdscan:${PORTSDIR}/security/clamav \
17
		clamdscan:${PORTSDIR}/security/clamav \
18
		ripmime:${PORTSDIR}/mail/ripmime
18
		ripmime:${PORTSDIR}/mail/ripmime
19
DEPEND_QMAIL_RUN=	yes
19
20
20
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
21
USE_REINPLACE=	yes
22
USE_REINPLACE=	yes
22
23
24
.include "${.CURDIR}/../qmail/Makefile.include"
25
23
.include <bsd.port.pre.mk>
26
.include <bsd.port.pre.mk>
24
27
25
.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
28
QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
26
QMAIL_DIR?=	${LOCALBASE}/qmail
29
QSCAN_VAR?=	${QMAIL_PREFIX}/${PORTNAME}
27
.else
28
QMAIL_DIR?=	/var/qmail
29
.endif
30
QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
31
QSCAN_VAR?=	${QMAIL_DIR}/${PORTNAME}
32
PLIST_SUB+=	QSCAN_VAR="${QSCAN_VAR}" \
30
PLIST_SUB+=	QSCAN_VAR="${QSCAN_VAR}" \
33
		QMAIL_QUEUE="${QMAIL_QUEUE}"
31
		QMAIL_QUEUE="${QMAIL_QUEUE}"
34
32
(-)./mail/qsheff/Makefile (-9 / +6 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	qsheff
8
PORTNAME=	qsheff
9
PORTVERSION=	1.0.r1
9
PORTVERSION=	1.0.r1
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://www.enderunix.org/qsheff/
12
MASTER_SITES=	http://www.enderunix.org/qsheff/
12
DISTNAME=	${PORTNAME}-1.0-r1
13
DISTNAME=	${PORTNAME}-1.0-r1
Lines 14-21 Link Here
14
MAINTAINER=	ozkan@enderunix.org
15
MAINTAINER=	ozkan@enderunix.org
15
COMMENT=	A qmail-queue replacement to filter mail traffic
16
COMMENT=	A qmail-queue replacement to filter mail traffic
16
17
17
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
18
RUN_DEPENDS=	${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
18
		${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
19
DEPEND_QMAIL_RUN=	yes
19
20
20
USE_REINPLACE=	YES
21
USE_REINPLACE=	YES
21
GNU_CONFIGURE=	YES
22
GNU_CONFIGURE=	YES
Lines 28-42 Link Here
28
29
29
OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on
30
OPTIONS=	CLAMAV "Integrate with Clam AntiVirus" on
30
31
31
.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
32
PREFIX?=	${QMAIL_PREFIX}
32
QMAIL_DIR?=	${LOCALBASE}/qmail
33
.else
34
QMAIL_DIR?=	/var/qmail
35
.endif
36
33
37
PREFIX?=	${QMAIL_DIR}
34
CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_PREFIX}
38
35
39
CONFIGURE_ARGS+=	--with-qmaildir=${QMAIL_DIR}
36
.include "${.CURDIR}/../qmail/Makefile.include"
40
37
41
.include <bsd.port.pre.mk>
38
.include <bsd.port.pre.mk>
42
39
(-)./mail/qtools/Makefile (-5 / +10 lines)
Lines 7-33 Link Here
7
7
8
PORTNAME=	qtools
8
PORTNAME=	qtools
9
PORTVERSION=	0.56
9
PORTVERSION=	0.56
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	http://www.superscript.com/qtools/
12
MASTER_SITES=	http://www.superscript.com/qtools/
13
13
14
MAINTAINER=	sergei@FreeBSD.org
14
MAINTAINER=	sergei@FreeBSD.org
15
COMMENT=	Tools to use in .qmail files
15
COMMENT=	Tools to use in .qmail files
16
16
17
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
17
RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
18
		${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
19
18
20
ALL_TARGET=	it
19
ALL_TARGET=	it
21
INSTALL_TARGET=	setup check
20
INSTALL_TARGET=	setup check
22
21
23
QMAIL_DIR?=	/var/qmail
24
EZMLM_DIR?=	${LOCALBASE}
22
EZMLM_DIR?=	${LOCALBASE}
25
23
24
USE_REINPLACE=	yes
25
26
.include "${.CURDIR}/../qmail/Makefile.include"
27
28
post-patch:
29
	@${REINPLACE_CMD} -e 's|02755|0755|g' ${WRKSRC}/hier.c
30
26
do-configure:
31
do-configure:
27
	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
32
	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
28
	@${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
33
	@${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld
29
	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
34
	@${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home
30
	@${ECHO_CMD} "${QMAIL_DIR}" > ${WRKSRC}/conf-qmail
35
	@${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail
31
	@${ECHO_CMD} "${EZMLM_DIR}/bin/ezmlm" > ${WRKSRC}/conf-ezmlm
36
	@${ECHO_CMD} "${EZMLM_DIR}/bin/ezmlm" > ${WRKSRC}/conf-ezmlm
32
37
33
.include <bsd.port.mk>
38
.include <bsd.port.mk>
(-)./mail/queue-fix/Makefile (-3 / +5 lines)
Lines 7-22 Link Here
7
7
8
PORTNAME=	queue-fix
8
PORTNAME=	queue-fix
9
PORTVERSION=	1.4
9
PORTVERSION=	1.4
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://www.netmeridian.com/e-huss/
12
MASTER_SITES=	http://www.netmeridian.com/e-huss/
12
13
13
MAINTAINER=	garga@FreeBSD.org
14
MAINTAINER=	garga@FreeBSD.org
14
COMMENT=	Repairs or generates a qmail queue structure
15
COMMENT=	Repairs or generates a qmail queue structure
15
16
16
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
17
DEPEND_QMAIL_RUN=	yes
17
18
18
QMAIL_DIR?=	/var/qmail
19
PREFIX?=	${QMAIL_PREFIX}
19
PREFIX?=	${QMAIL_DIR}
20
20
21
OPTIONS=	BIG_TODO "Use big_todo patch" off
21
OPTIONS=	BIG_TODO "Use big_todo patch" off
22
22
Lines 25-30 Link Here
25
25
26
PLIST_SUB=	DOCDIR=${DOCDIR}
26
PLIST_SUB=	DOCDIR=${DOCDIR}
27
PLIST_FILES=	bin/queue-fix
27
PLIST_FILES=	bin/queue-fix
28
29
.include "${.CURDIR}/../qmail/Makefile.include"
28
30
29
.if !defined(NOPORTDOCS)
31
.if !defined(NOPORTDOCS)
30
PLIST_FILES+=	%%DOCDIR%%/README
32
PLIST_FILES+=	%%DOCDIR%%/README
(-)./mail/queue-repair/Makefile (-3 / +4 lines)
Lines 7-21 Link Here
7
7
8
PORTNAME=	queue-repair
8
PORTNAME=	queue-repair
9
PORTVERSION=	0.9.0
9
PORTVERSION=	0.9.0
10
PORTREVISION=	1
10
CATEGORIES=	mail python
11
CATEGORIES=	mail python
11
MASTER_SITES=	http://www.qcc.ca/~charlesc/software/queue_repair/
12
MASTER_SITES=	http://pyropus.ca/software/queue-repair/
12
13
13
MAINTAINER=	sergei@FreeBSD.org
14
MAINTAINER=	sergei@FreeBSD.org
14
COMMENT=	A qmail queue diagnostic and repair tool
15
COMMENT=	A qmail queue diagnostic and repair tool
15
16
16
.if !defined(WITHOUT_QMAIL_PORT)
17
.if !defined(WITHOUT_QMAIL_PORT)
17
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
18
DEPEND_QMAIL_RUN=	yes
18
QMAIL_DIR?=	/var/qmail
19
.include "${.CURDIR}/../qmail/Makefile.include"
19
.endif
20
.endif
20
21
21
USE_PYTHON=	yes
22
USE_PYTHON=	yes
(-)./mail/serialmail/Makefile (-7 / +6 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	serialmail
8
PORTNAME=	serialmail
9
PORTVERSION=	0.75
9
PORTVERSION=	0.75
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	http://cr.yp.to/software/ \
12
MASTER_SITES=	http://cr.yp.to/software/ \
13
		ftp://ftp.gbnet.net/pub/qmail/ \
13
		ftp://ftp.gbnet.net/pub/qmail/ \
Lines 17-27 Link Here
17
MAINTAINER=	sergei@FreeBSD.org
17
MAINTAINER=	sergei@FreeBSD.org
18
COMMENT=	Tools for passing mail across serial links
18
COMMENT=	Tools for passing mail across serial links
19
19
20
RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
20
RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
21
		${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
21
DEPEND_QMAIL_RUN=	yes
22
23
# QMAIL_DIR is the directory where qmail is installed
24
QMAIL_DIR?=	/var/qmail
25
22
26
NO_PACKAGE=	Unsure of DJB license
23
NO_PACKAGE=	Unsure of DJB license
27
24
Lines 35-40 Link Here
35
		serialsmtp.1 setlock.1
32
		serialsmtp.1 setlock.1
36
DOCS=		AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
33
DOCS=		AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
37
34
35
.include "${.CURDIR}/../qmail/Makefile.include"
36
38
.include <bsd.port.pre.mk>
37
.include <bsd.port.pre.mk>
39
38
40
.if defined(WITH_AUTH)
39
.if defined(WITH_AUTH)
Lines 47-53 Link Here
47
	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
46
	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
48
	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
47
	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
49
	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
48
	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
50
	@${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
49
	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
51
50
52
do-install:
51
do-install:
53
	cd ${WRKSRC} && \
52
	cd ${WRKSRC} && \
(-)./mail/simscan/Makefile (-12 / +12 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	simscan
8
PORTNAME=	simscan
9
PORTVERSION=	1.1
9
PORTVERSION=	1.1
10
PORTREVISION=	1
10
CATEGORIES=	mail security
11
CATEGORIES=	mail security
11
MASTER_SITES=	http://www.inter7.com/simscan/
12
MASTER_SITES=	http://www.inter7.com/simscan/
12
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 15-30 Link Here
15
MAINTAINER=	toxa@toxahost.ru
16
MAINTAINER=	toxa@toxahost.ru
16
COMMENT=	Fast Content/Anti-virus Scanner for qmail Written in C
17
COMMENT=	Fast Content/Anti-virus Scanner for qmail Written in C
17
18
18
BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
19
DEPEND_QMAIL_BUILD=	yes
19
20
20
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
21
22
22
# A normal qmail installation puts everything into /var/qmail/.
23
WORKDIR?=	${QMAIL_PREFIX}/${PORTNAME}
23
# Must match your qmail installation
24
QMAIL_QUEUE=	${QMAIL_PREFIX}/bin/qmail-queue
24
QMAIL_DIR?=	/var/qmail
25
PLIST_SUB=	QMAIL_PREFIX=${QMAIL_PREFIX} \
25
WORKDIR?=	${QMAIL_DIR}/${PORTNAME}
26
QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
27
PLIST_SUB=	QMAIL_DIR=${QMAIL_DIR} \
28
		SIMSCAN_DIR=${PORTNAME}
26
		SIMSCAN_DIR=${PORTNAME}
29
27
30
OPTIONS=	CLAMAV "Support for ClamAV Virus Scanning" on \
28
OPTIONS=	CLAMAV "Support for ClamAV Virus Scanning" on \
Lines 37-46 Link Here
37
		PASSTHRU "Pass Spam Thru, Do Not Reject (required SPAMD)" off \
35
		PASSTHRU "Pass Spam Thru, Do Not Reject (required SPAMD)" off \
38
		HEADERS "Add a Received Line With Versions of Scanners" off
36
		HEADERS "Add a Received Line With Versions of Scanners" off
39
37
38
.include "${.CURDIR}/../qmail/Makefile.include"
39
40
.include <bsd.port.pre.mk>
40
.include <bsd.port.pre.mk>
41
41
42
CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \
42
CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \
43
		--enable-qmaildir=${QMAIL_DIR} \
43
		--enable-qmaildir=${QMAIL_PREFIX} \
44
	  	--enable-spamc-user=n \
44
	  	--enable-spamc-user=n \
45
		--enable-workdir=${WORKDIR}
45
		--enable-workdir=${WORKDIR}
46
46
Lines 107-113 Link Here
107
107
108
if ! ${TEST} -f ${QMAIL_QUEUE}; then \
108
if ! ${TEST} -f ${QMAIL_QUEUE}; then \
109
	${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
109
	${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'.";  \
110
	${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \
110
	${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \
111
	exit 1; \
111
	exit 1; \
112
fi
112
fi
113
113
Lines 116-122 Link Here
116
	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
116
	@${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~="
117
	@${ECHO_MSG} "You may also use the following build options:"
117
	@${ECHO_MSG} "You may also use the following build options:"
118
	@${ECHO_MSG} ""
118
	@${ECHO_MSG} ""
119
	@${ECHO_MSG} "QMAIL_DIR		Base qmail directory. Default is /var/qmail"
119
	@${ECHO_MSG} "QMAIL_PREFIX		Base qmail directory. Default is /var/qmail"
120
	@${ECHO_MSG} "WORKDIR		Directory to unpack emails. Default is /var/qmail/simscan"
120
	@${ECHO_MSG} "WORKDIR		Directory to unpack emails. Default is /var/qmail/simscan"
121
	@${ECHO_MSG} "QMAIL_QUEUE		Define full path and name of the qmail-queue program"
121
	@${ECHO_MSG} "QMAIL_QUEUE		Define full path and name of the qmail-queue program"
122
	@${ECHO_MSG} "			Incoming mail is passed to this program after being"
122
	@${ECHO_MSG} "			Incoming mail is passed to this program after being"
Lines 131-138 Link Here
131
	@${ECHO_MSG} ""
131
	@${ECHO_MSG} ""
132
132
133
post-install:
133
post-install:
134
	@${CHMOD} 04711 ${QMAIL_DIR}/bin/simscan
134
	@${CHMOD} 04711 ${QMAIL_PREFIX}/bin/simscan
135
	@${CHOWN} simscan:simscan ${QMAIL_DIR}/bin/simscan ${QMAIL_DIR}/bin/simscanmk
135
	@${CHOWN} simscan:simscan ${QMAIL_PREFIX}/bin/simscan ${QMAIL_PREFIX}/bin/simscanmk
136
.if !defined(NOPORTDOCS)
136
.if !defined(NOPORTDOCS)
137
	@${MKDIR} ${DOCSDIR}
137
	@${MKDIR} ${DOCSDIR}
138
.for i in ${PORTDOCS}
138
.for i in ${PORTDOCS}
(-)./mail/simscan/pkg-plist (-3 / +3 lines)
Lines 1-7 Link Here
1
@cwd %%QMAIL_DIR%%
1
@cwd %%QMAIL_PREFIX%%
2
bin/simscanmk
2
bin/simscanmk
3
bin/simscan
3
bin/simscan
4
@unexec rmdir %%QMAIL_DIR%%/%%SIMSCAN_DIR%% || true
4
@unexec rmdir %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% || true
5
@unexec echo ""
5
@unexec echo ""
6
@unexec echo "If you're not updating this port, you can delete %%QMAIL_DIR%%/%%SIMSCAN_DIR%% directory"
6
@unexec echo "If you're not updating this port, you can delete %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% directory"
7
@unexec echo ""
7
@unexec echo ""
(-)./mail/usendmail/Makefile (-7 / +6 lines)
Lines 4-23 Link Here
4
#
4
#
5
# $FreeBSD: ports/mail/usendmail/Makefile,v 1.4 2005/07/21 11:56:46 garga Exp $
5
# $FreeBSD: ports/mail/usendmail/Makefile,v 1.4 2005/07/21 11:56:46 garga Exp $
6
#
6
#
7
# Tunables: QMAIL_DIR: Where qmail resides (default: /var/qmail)
8
7
9
PORTNAME=	usendmail
8
PORTNAME=	usendmail
10
PORTVERSION=	0.1.6
9
PORTVERSION=	0.1.6
10
PORTREVISION=	1
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	http://www.ohse.de/uwe/usendmail/
12
MASTER_SITES=	http://www.ohse.de/uwe/usendmail/
13
13
14
MAINTAINER=	tmseck@netcologne.de
14
MAINTAINER=	tmseck@netcologne.de
15
COMMENT=	A replacement for qmail's sendmail drop-in
15
COMMENT=	A replacement for qmail's sendmail drop-in
16
16
17
BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
17
DEPEND_QMAIL=	yes
18
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
19
20
QMAIL_DIR?=	/var/qmail
21
18
22
NO_SIZE=	yes
19
NO_SIZE=	yes
23
USE_REINPLACE=	yes
20
USE_REINPLACE=	yes
Lines 26-35 Link Here
26
PLIST_FILES=	sbin/usendmail
23
PLIST_FILES=	sbin/usendmail
27
PORTDOCS=	NEWS README
24
PORTDOCS=	NEWS README
28
SUB_FILES=	pkg-message
25
SUB_FILES=	pkg-message
29
SUB_LIST=	QMAIL_DIR=${QMAIL_DIR}
26
SUB_LIST=	QMAIL_PREFIX=${QMAIL_PREFIX}
27
28
.include "${.CURDIR}/../qmail/Makefile.include"
30
29
31
post-patch:
30
post-patch:
32
	@${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_DIR},' \
31
	@${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_PREFIX},' \
33
	    ${WRKSRC}/src/usendmail.c
32
	    ${WRKSRC}/src/usendmail.c
34
	@${REINPLACE_CMD} -e 's,^CC=,CC\?=,' \
33
	@${REINPLACE_CMD} -e 's,^CC=,CC\?=,' \
35
	    ${WRKSRC}/src/Makefile
34
	    ${WRKSRC}/src/Makefile
(-)./mail/usendmail/files/pkg-message.in (-3 / +3 lines)
Lines 7-14 Link Here
7
7
8
in /etc/mail/mailer.conf replace the lines
8
in /etc/mail/mailer.conf replace the lines
9
9
10
sendmail	%%QMAIL_DIR%%/bin/sendmail
10
sendmail	%%QMAIL_PREFIX%%/bin/sendmail
11
send-mail	%%QMAIL_DIR%%/bin/sendmail
11
send-mail	%%QMAIL_PREFIX%%/bin/sendmail
12
12
13
with
13
with
14
14
Lines 16-20 Link Here
16
send-mail	%%PREFIX%%/sbin/usendmail
16
send-mail	%%PREFIX%%/sbin/usendmail
17
17
18
Otherwise replace the link from /usr/sbin/sendmail to
18
Otherwise replace the link from /usr/sbin/sendmail to
19
%%QMAIL_DIR%%/bin/sendmail with one to %%PREFIX%%/sbin/usendmail.
19
%%QMAIL_PREFIX%%/bin/sendmail with one to %%PREFIX%%/sbin/usendmail.
20
20
(-)./mail/vmailmgr/Makefile (-6 / +18 lines)
Lines 7-32 Link Here
7
7
8
PORTNAME=	vmailmgr
8
PORTNAME=	vmailmgr
9
PORTVERSION=	0.96.9
9
PORTVERSION=	0.96.9
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	http://www.vmailmgr.org/current/
12
MASTER_SITES=	http://www.vmailmgr.org/current/
13
13
14
MAINTAINER=	patrick@rinke-bochum.de
14
MAINTAINER=	patrick@rinke-bochum.de
15
COMMENT=	Virtual MAIL ManaGeR for virtual mailboxes and domains
15
COMMENT=	Virtual MAIL ManaGeR for virtual mailboxes and domains
16
16
17
RUN_DEPENDS=	/var/qmail/bin/qmail-start:${PORTSDIR}/mail/qmail \
17
USE_APACHE=	yes
18
		unixserver:${PORTSDIR}/sysutils/ucspi-unix
18
DEPEND_QMAIL_RUN=	yes
19
19
20
HAS_CONFIGURE=yes
20
HAS_CONFIGURE=	yes
21
USE_REINPLACE=	yes
21
22
22
SVC_DIR=	"/var/qmail/service/vmailmgrd"
23
SVC_DIR=	"${QMAIL_PREFIX}/service/vmailmgrd"
24
PHP_DIR=	${PREFIX}/www/data-dist/${PORTNAME}
25
CGI_DIR=	${PREFIX}/www/cgi-bin-dist
26
27
PLIST_SUB+=	PHP_DIR=${PHP_DIR} CGI_DIR=${CGI_DIR}
23
28
24
MAN1=		checkvpw.1 vauthenticate.1 vpasswd2cdb.1 vrehash.1 \
29
MAN1=		checkvpw.1 vauthenticate.1 vpasswd2cdb.1 vrehash.1 \
25
		listvdomain.1 vadduser.1 vchattr.1 vchforwards.1 \
30
		listvdomain.1 vadduser.1 vchattr.1 vchforwards.1 \
26
		vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1
31
		vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1 \
32
		vpasswd2db.1 vpasswds.1 vpopbull.1 vsetup.1
27
MAN7=		vmailmgr.7
33
MAN7=		vmailmgr.7
28
MAN8=		vmailmgrd.8
34
MAN8=		vmailmgrd.8
29
35
36
.include "${.CURDIR}/../qmail/Makefile.include"
37
38
post-patch:
39
	@${REINPLACE_CMD} -e 's|phpdir=".home.httpd.php"|phpdir="${PHP_DIR}"|g' \
40
			  -e 's|cgidir=...prefix./cgi-bin.|cgidir="${CGI_DIR}"|g' \
41
		${WRKSRC}/configure ${WRKSRC}/configure.in
30
post-install:
42
post-install:
31
	${MKDIR} ${PREFIX}/etc/vmailmgr
43
	${MKDIR} ${PREFIX}/etc/vmailmgr
32
	${CP} ${WRKSRC}/scripts/autoresponder.sh ${PREFIX}/etc/vmailmgr/vdeliver-postdeliver
44
	${CP} ${WRKSRC}/scripts/autoresponder.sh ${PREFIX}/etc/vmailmgr/vdeliver-postdeliver
(-)./mail/vmailmgr/pkg-plist (-7 / +13 lines)
Lines 19-36 Link Here
19
bin/vauthenticate
19
bin/vauthenticate
20
bin/checkvpw
20
bin/checkvpw
21
bin/showvconfig
21
bin/showvconfig
22
cgi-bin/vpasswd
22
%%CGI_DIR%%/vpasswd
23
cgi-bin/vadduser
23
%%CGI_DIR%%/vadduser
24
cgi-bin/vdeluser
24
%%CGI_DIR%%/vdeluser
25
cgi-bin/vaddalias
25
%%CGI_DIR%%/vaddalias
26
cgi-bin/vchattr
26
%%CGI_DIR%%/vchattr
27
cgi-bin/vchforwards
27
%%CGI_DIR%%/vchforwards
28
cgi-bin/listvdomain
28
%%CGI_DIR%%/listvdomain
29
@unexec rmdir %D/%%CGI_DIR%% 2>/dev/null || true
29
etc/vmailmgr/default-username
30
etc/vmailmgr/default-username
30
etc/vmailmgr/vdeliver-postdeliver
31
etc/vmailmgr/vdeliver-postdeliver
31
lib/courier-imap/libexec/authlib/authvmailmgr
32
lib/courier-imap/libexec/authlib/authvmailmgr
33
@dirrm lib/courier-imap/libexec/authlib
34
@dirrm lib/courier-imap/libexec
35
@dirrm lib/courier-imap
32
sbin/vmailmgrd
36
sbin/vmailmgrd
33
@dirrm etc/vmailmgr
37
@dirrm etc/vmailmgr
38
%%PHP_DIR%%/vmail.inc
39
@dirrm %%PHP_DIR%%
34
@cwd /var/qmail/service
40
@cwd /var/qmail/service
35
vmailmgrd/log/run
41
vmailmgrd/log/run
36
vmailmgrd/run
42
vmailmgrd/run
(-)./mail/vpopmail/Makefile (-13 / +8 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	vpopmail
8
PORTNAME=	vpopmail
9
PORTVERSION=	5.4.10
9
PORTVERSION=	5.4.10
10
PORTREVISION=	3
10
PORTREVISION=	4
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 15-24 Link Here
15
MAINTAINER=	roam@FreeBSD.org
15
MAINTAINER=	roam@FreeBSD.org
16
COMMENT=	Easy virtual domain and authentication package for use with qmail
16
COMMENT=	Easy virtual domain and authentication package for use with qmail
17
17
18
BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
18
BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
19
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
19
RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
20
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
20
DEPEND_QMAIL=	yes
21
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
22
21
23
CONFLICTS=	vpopmail-devel-5.*
22
CONFLICTS=	vpopmail-devel-5.*
24
23
Lines 31-37 Link Here
31
VCFGFILES?=	inc_deps lib_deps tcp.smtp
30
VCFGFILES?=	inc_deps lib_deps tcp.smtp
32
31
33
CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
32
CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
34
CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
33
CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_PREFIX} \
35
		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
34
		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
36
		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
35
		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
37
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
36
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
Lines 76-82 Link Here
76
# WITH_MYSQL_LOG - enable auth logging to a MySQL database [deprecateed]
75
# WITH_MYSQL_LOG - enable auth logging to a MySQL database [deprecateed]
77
# WITH_PGSQL_LOG - enable auth logging to a PostgreSQL database [deprecated]
76
# WITH_PGSQL_LOG - enable auth logging to a PostgreSQL database [deprecated]
78
# WITH_SQL_LOG  - enable auth logging to the selected SQL database
77
# WITH_SQL_LOG  - enable auth logging to the selected SQL database
79
# QMAIL_DIR     - location of qmail directory
78
# QMAIL_PREFIX  - location of qmail directory
80
# PREFIX	- installation area for vpopmail (see comment below)
79
# PREFIX	- installation area for vpopmail (see comment below)
81
# VCHKPW_GID	- the group ID of the new vchkpw group (89)
80
# VCHKPW_GID	- the group ID of the new vchkpw group (89)
82
# VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
81
# VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
Lines 189-201 Link Here
189
CONFIGURE_ARGS+=	--enable-sql-logging
188
CONFIGURE_ARGS+=	--enable-sql-logging
190
.endif
189
.endif
191
190
192
.include <bsd.port.pre.mk>
191
.include "${.CURDIR}/../qmail/Makefile.include"
193
192
194
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
193
.include <bsd.port.pre.mk>
195
QMAIL_DIR?=	${LOCALBASE}/qmail
196
.else
197
QMAIL_DIR?=	/var/qmail
198
.endif
199
194
200
# Uncomment this, or set PREFIX to /home if you have an existing
195
# Uncomment this, or set PREFIX to /home if you have an existing
201
# vpopmail install with the vpopmail users' home directory set to
196
# vpopmail install with the vpopmail users' home directory set to
(-)./mail/vpopmail-devel/Makefile (-16 / +12 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	vpopmail
8
PORTNAME=	vpopmail
9
PORTVERSION=	5.5.0
9
PORTVERSION=	5.5.0
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	mail
11
CATEGORIES=	mail
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
13
MASTER_SITE_SUBDIR=	${PORTNAME}
Lines 16-38 Link Here
16
MAINTAINER=	ale@FreeBSD.org
16
MAINTAINER=	ale@FreeBSD.org
17
COMMENT=	Easy virtual domain and authentication package for use with qmail
17
COMMENT=	Easy virtual domain and authentication package for use with qmail
18
18
19
BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
19
BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
20
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
20
RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
21
RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
21
DEPEND_QMAIL=	yes
22
		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
23
22
24
CONFLICTS=	vpopmail-5.*
23
CONFLICTS=	vpopmail-5.*
25
24
26
GNU_CONFIGURE=	YES
25
GNU_CONFIGURE=	YES
27
USE_GMAKE=	YES
26
USE_GMAKE=	YES
28
USE_REINPLACE=	YES
27
USE_REINPLACE=	YES
29
USE_PERL5_BUILD=	YES
28
USE_PERL5=	YES
30
29
31
VCFGDIR?=	${WRKDIR}/vcfg
30
VCFGDIR?=	${WRKDIR}/vcfg
32
VCFGFILES?=	inc_deps lib_deps tcp.smtp
31
VCFGFILES?=	inc_deps lib_deps tcp.smtp
33
32
34
CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
33
CONFIGURE_ENV+=	VCFGDIR="${VCFGDIR}"
35
CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_DIR} \
34
CONFIGURE_ARGS=	--enable-qmaildir=${QMAIL_PREFIX} \
36
		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
35
		--enable-tcprules-prog=${LOCALBASE}/bin/tcprules \
37
		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
36
		--enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp
38
37
Lines 74-80 Link Here
74
# WITHOUT_AUTH_LOG - disables authentication logging
73
# WITHOUT_AUTH_LOG - disables authentication logging
75
# WITH_MYSQL_LOG - enable logging to a MySQL database
74
# WITH_MYSQL_LOG - enable logging to a MySQL database
76
# WITH_PGSQL_LOG - enable logging to a PostgreSQL database
75
# WITH_PGSQL_LOG - enable logging to a PostgreSQL database
77
# QMAIL_DIR     - location of qmail directory
76
# QMAIL_PREFIX   - location of qmail directory
78
# PREFIX	- installation area for vpopmail (see comment below)
77
# PREFIX	- installation area for vpopmail (see comment below)
79
# VCHKPW_GID	- the group ID of the new vchkpw group (89)
78
# VCHKPW_GID	- the group ID of the new vchkpw group (89)
80
# VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
79
# VPOPMAIL_UID	- the user ID of the new vpopmail user (89)
Lines 168-180 Link Here
168
.endif
167
.endif
169
.endif
168
.endif
170
169
171
.include <bsd.port.pre.mk>
170
.include "${.CURDIR}/../qmail/Makefile.include"
172
171
173
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
172
.include <bsd.port.pre.mk>
174
QMAIL_DIR?=	${LOCALBASE}/qmail
175
.else
176
QMAIL_DIR?=	/var/qmail
177
.endif
178
173
179
# Uncomment this, or set PREFIX to /home if you have an existing
174
# Uncomment this, or set PREFIX to /home if you have an existing
180
# vpopmail install with the vpopmail users' home directory set to
175
# vpopmail install with the vpopmail users' home directory set to
Lines 327-336 Link Here
327
	${MKDIR} ${PREFIX}/vpopmail/etc
322
	${MKDIR} ${PREFIX}/vpopmail/etc
328
	if [ ! -e "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
323
	if [ ! -e "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
329
		if [ -e "${VCFGDIR}/tcp.smtp" ]; then \
324
		if [ -e "${VCFGDIR}/tcp.smtp" ]; then \
330
			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \
325
			${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \
331
		else \
326
		else \
332
			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
327
			${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \
333
		fi; \
328
		fi; \
329
		${CP} -p ${PREFIX}/vpopmail/etc/tcp.smtp-dist ${PREFIX}/vpopmail/etc/tcp.smtp; \
334
	fi
330
	fi
335
.if defined(DEFAULT_DOMAIN)
331
.if defined(DEFAULT_DOMAIN)
336
	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
332
	${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
(-)./mail/vpopmail-devel/pkg-plist (-1 / +3 lines)
Lines 41-47 Link Here
41
@unexec if [ -f %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi
41
@unexec if [ -f %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi
42
vpopmail/etc/inc_deps
42
vpopmail/etc/inc_deps
43
vpopmail/etc/lib_deps
43
vpopmail/etc/lib_deps
44
@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
44
@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi
45
vpopmail/etc/tcp.smtp-dist
46
@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi
45
@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
47
@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
46
vpopmail/etc/vlimits.default-dist
48
vpopmail/etc/vlimits.default-dist
47
@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
49
@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
(-)./mail/vqadmin/Makefile (-2 / +4 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	vqadmin
8
PORTNAME=	vqadmin
9
PORTVERSION=	2.3.6
9
PORTVERSION=	2.3.6
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
12
MASTER_SITE_SUBDIR=	vqadmin
13
MASTER_SITE_SUBDIR=	vqadmin
Lines 24-34 Link Here
24
25
25
CGIBINDIR?=	www/cgi-bin-dist
26
CGIBINDIR?=	www/cgi-bin-dist
26
WEBDATADIR?=	www/data-dist
27
WEBDATADIR?=	www/data-dist
27
QMAIL_DIR?=	/var/qmail
28
28
29
CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR} \
29
CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR} \
30
		--enable-htmldir=${PREFIX}/${WEBDATADIR} \
30
		--enable-htmldir=${PREFIX}/${WEBDATADIR} \
31
		--enable-qmaildir=${QMAIL_DIR}
31
		--enable-qmaildir=${QMAIL_PREFIX}
32
33
.include "${.CURDIR}/../qmail/Makefile.include"
32
34
33
.include <bsd.port.pre.mk>
35
.include <bsd.port.pre.mk>
34
36
(-)./mail/zabit/Makefile (-7 / +5 lines)
Lines 7-30 Link Here
7
7
8
PORTNAME=	zabit
8
PORTNAME=	zabit
9
PORTVERSION=	0.7.1
9
PORTVERSION=	0.7.1
10
PORTREVISION=	1
10
CATEGORIES=	mail
11
CATEGORIES=	mail
11
MASTER_SITES=	http://www.enderunix.org/zabit/
12
MASTER_SITES=	http://www.enderunix.org/zabit/
12
13
13
MAINTAINER=	ozkan@enderunix.org
14
MAINTAINER=	ozkan@enderunix.org
14
COMMENT=	Zabit is a content/attachment filter for qmail
15
COMMENT=	Zabit is a content/attachment filter for qmail
15
16
16
RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
17
DEPEND_QMAIL_RUN=	yes
17
18
18
HAS_CONFIGURE=	yes
19
HAS_CONFIGURE=	yes
19
20
21
.include "${.CURDIR}/../qmail/Makefile.include"
22
20
.include <bsd.port.pre.mk>
23
.include <bsd.port.pre.mk>
21
24
22
.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
25
QMAIL_QUEUE=    ${QMAIL_PREFIX}/bin/qmail-queue
23
QMAIL_DIR?=     ${LOCALBASE}/qmail
24
.else
25
QMAIL_DIR?=     /var/qmail
26
.endif
27
QMAIL_QUEUE=    ${QMAIL_DIR}/bin/qmail-queue
28
26
29
pre-build:
27
pre-build:
30
.if !defined(BATCH)
28
.if !defined(BATCH)
(-)./security/amavis-perl/Makefile (-7 / +3 lines)
Lines 7-12 Link Here
7
7
8
PORTNAME=	amavis-perl
8
PORTNAME=	amavis-perl
9
PORTVERSION=	11
9
PORTVERSION=	11
10
PORTREVISION=	1
10
CATEGORIES=	security
11
CATEGORIES=	security
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
12
MASTER_SITE_SUBDIR=	amavis
13
MASTER_SITE_SUBDIR=	amavis
Lines 57-69 Link Here
57
MTA?=	qmail
58
MTA?=	qmail
58
DIROWNER?=	qmailq:qmail
59
DIROWNER?=	qmailq:qmail
59
CONFIGURE_ARGS+=	--enable-qmail
60
CONFIGURE_ARGS+=	--enable-qmail
60
.if exists(${LOCALBASE}/qmail/bin/qmail-send)
61
DEPEND_QMAIL=	yes
61
QMAIL_DIR?=	${LOCALBASE}/qmail
62
.include "${.CURDIR}/../../mail/qmail/Makefile.include"
62
.else
63
QMAIL_DIR?=	/var/qmail
64
.endif
65
BUILD_DEPENDS+=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
66
RUN_DEPENDS=	${BUILD_DEPENDS}
67
.endif
63
.endif
68
64
69
.if defined(MTA)
65
.if defined(MTA)
(-)./sysutils/dtc/Makefile (-7 / +8 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	dtc
8
PORTNAME=	dtc
9
PORTVERSION=	0.12.0.6
9
PORTVERSION=	0.12.0.6
10
PORTREVISION=	1
10
PORTREVISION=	2
11
CATEGORIES=	sysutils
11
CATEGORIES=	sysutils
12
MASTER_SITES=	ftp://ftp.gplhost.com/pub/dtc/bsd/
12
MASTER_SITES=	ftp://ftp.gplhost.com/pub/dtc/bsd/
13
13
Lines 15-27 Link Here
15
COMMENT=	A hosting web GUI for admin and accounting apache/named/proftpd/qmail
15
COMMENT=	A hosting web GUI for admin and accounting apache/named/proftpd/qmail
16
16
17
RUN_DEPENDS=	${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC \
17
RUN_DEPENDS=	${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC \
18
		${LOCALBASE}/libexec/proftpd:${PORTSDIR}/ftp/proftpd-mysql \
18
		${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd-mysql \
19
		${LOCALBASE}/libexec/apache2/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \
19
		${LOCALBASE}/libexec/apache/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \
20
		${LOCALBASE}/bin/webalizer:${PORTSDIR}/www/webalizer \
20
		${LOCALBASE}/bin/webalizer:${PORTSDIR}/www/webalizer \
21
		${QMAIL_DIR}/bin/qmail-start:${PORTSDIR}/mail/qmail
22
21
23
USE_PHP=	session mysql sockets gd
22
USE_PHP=	session mysql sockets gd
24
QMAIL_DIR?=	/var/qmail
25
23
26
DTCROOT?=	www/dtc
24
DTCROOT?=	www/dtc
27
DTCDIR=		${PREFIX}/${DTCROOT}
25
DTCDIR=		${PREFIX}/${DTCROOT}
Lines 34-47 Link Here
34
NO_BUILD=	yes
32
NO_BUILD=	yes
35
USE_MYSQL=	yes
33
USE_MYSQL=	yes
36
34
35
DEPEND_QMAIL_RUN=	yes
36
.include "${.CURDIR}/../../mail/qmail/Makefile.include"
37
37
do-configure:
38
do-configure:
38
	@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
39
	@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
39
		s,%%LOCALBASE%%,${LOCALBASE},;\
40
		s,%%LOCALBASE%%,${LOCALBASE},;\
40
		s,%%QMAIL_DIR%%,${QMAIL_DIR},' \
41
		s,%%QMAIL_PREFIX%%,${QMAIL_PREFIX},' \
41
		${FILESDIR}/dtc-install.in > ${WRKDIR}/dtc-install
42
		${FILESDIR}/dtc-install.in > ${WRKDIR}/dtc-install
42
	@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
43
	@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
43
		s,%%LOCALBASE%%,${LOCALBASE},;\
44
		s,%%LOCALBASE%%,${LOCALBASE},;\
44
		s,%%QMAIL_DIR%%,${QMAIL_DIR},' \
45
		s,%%QMAIL_PREFIX%%,${QMAIL_PREFIX},' \
45
		${FILESDIR}/dtc-deinstall.in > ${WRKDIR}/dtc-deinstall
46
		${FILESDIR}/dtc-deinstall.in > ${WRKDIR}/dtc-deinstall
46
47
47
do-install:
48
do-install:
(-)./sysutils/dtc/files/dtc-deinstall.in (-2 / +2 lines)
Lines 8-20 Link Here
8
8
9
PREFIX=%%PREFIX%%
9
PREFIX=%%PREFIX%%
10
LOCALBASE=%%LOCALBASE%%
10
LOCALBASE=%%LOCALBASE%%
11
QMAIL_DIR=%%QMAIL_DIR%%
11
QMAIL_PREFIX=%%QMAIL_PREFIX%%
12
12
13
echo "### DEAMON PATH CONFIGURATION ###"
13
echo "### DEAMON PATH CONFIGURATION ###"
14
PATH_HTTPD_CONF="${LOCALBASE}/etc/apache/httpd.conf"
14
PATH_HTTPD_CONF="${LOCALBASE}/etc/apache/httpd.conf"
15
PATH_NAMED_CONF="/etc/namedb/named.conf"
15
PATH_NAMED_CONF="/etc/namedb/named.conf"
16
PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf"
16
PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf"
17
PATH_QMAIL_CTRL="${QMAIL_DIR}/control"
17
PATH_QMAIL_CTRL="${QMAIL_PREFIX}/control"
18
18
19
# Multi OS (Unix system) uninstall sh script for DTC
19
# Multi OS (Unix system) uninstall sh script for DTC
20
# Written by Thomas GOIRAND <thomas@goirand.fr>
20
# Written by Thomas GOIRAND <thomas@goirand.fr>
(-)./sysutils/dtc/files/dtc-install.in (-2 / +2 lines)
Lines 7-13 Link Here
7
7
8
PREFIX=%%PREFIX%%
8
PREFIX=%%PREFIX%%
9
LOCALBASE=%%LOCALBASE%%
9
LOCALBASE=%%LOCALBASE%%
10
QMAIL_DIR=%%QMAIL_DIR%%
10
QMAIL_PREFIX=%%QMAIL_PREFIX%%
11
11
12
UNIX_TYPE=freebsd
12
UNIX_TYPE=freebsd
13
13
Lines 128-134 Link Here
128
	cp ${LOCALBASE}/etc/proftpd.conf.default ${LOCALBASE}/etc/proftpd.conf
128
	cp ${LOCALBASE}/etc/proftpd.conf.default ${LOCALBASE}/etc/proftpd.conf
129
fi
129
fi
130
PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf"
130
PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf"
131
PATH_QMAIL_CTRL="${QMAIL_DIR}/control"
131
PATH_QMAIL_CTRL="${QMAIL_PREFIX}/control"
132
PATH_PHP_CGI="${LOCALBASE}/bin/php"
132
PATH_PHP_CGI="${LOCALBASE}/bin/php"
133
PATH_DTC_SHARED="${PREFIX}/www/dtc"
133
PATH_DTC_SHARED="${PREFIX}/www/dtc"

Return to bug 84053