Attachment #50423 for bug #76830





# To pre-select options in batch mode, run make like this:
#
#  make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
#
# the options are the same names as in the scripts/configure.postfix file.
# POSTFIX_OPTIONS can be set in /etc/make.conf also.

# NOTE: PCRE is enabled by default unless you specifically disable it.

PORTNAME=	postfix
PORTVERSIONRAW=	2.2-20050209
PORTVERSION=	${PORTVERSIONRAW:S/-/./}
PORTEPOCH=	2
CATEGORIES=	mail ipv6

MAN5=	access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
	generics.5

MAN8=	anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
	scache.8 discard.8 tlsmgr.8

# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
# patch it.
MAN8base=$(MAN8:S/tlsmgr.8//)

CONF1=	main.cf master.cf access aliases canonical header_checks relocated \
	transport virtual generics

README=	ADDRESS_CLASS_README ADDRESS_REWRITING_README \
	ADDRESS_VERIFICATION_README BACKSCATTER_README \

	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
	XCLIENT_README XFORWARD_README IPV6_README TLS_README

.if !defined(DEBUG)
MAKEFILEFLAGS+=	DEBUG=


do-install:
	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
	config_directory=${PREFIX}/etc/postfix \
	daemon_directory=${PREFIX}/libexec/postfix \
	command_directory=${PREFIX}/sbin \
	queue_directory=/var/spool/postfix \
	sendmail_path=${PREFIX}/sbin/sendmail \
	newaliases_path=${PREFIX}/bin/newaliases \
	mailq_path=${PREFIX}/bin/mailq \
	mail_owner=postfix \
	setgid_group=maildrop \
	manpage_directory=${PREFIX}/man \
	sample_directory=${PREFIX}/etc/postfix \
	readme_directory=${READMEDIR}

.for f in ${CONF1}
	${INSTALL_DATA} ${WRKSRC}/conf/${f} \

Lines 1-4 Link Here

(-)postfix-current/distinfo (-4 / +2 lines)
1	MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e	1	MD5 (postfix/postfix-2.2-20050209.tar.gz) = 824b225dd1523753dac31c18ddef611d
2	SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328	2	SIZE (postfix/postfix-2.2-20050209.tar.gz) = 2381315
3	MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
4	SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159




   OpenBSD.2*)	SYSTYPE=OPENBSD2
 		;;
   OpenBSD.3*)	SYSTYPE=OPENBSD3
--- makedefs.snapshot_orig	Wed Apr 14 14:18:06 2004
+++ makedefs.snapshot	Fri Aug 20 15:08:54 2004
@@ -93,6 +93,8 @@
 		;;
   FreeBSD.5*)	SYSTYPE=FREEBSD5
 		;;
+  FreeBSD.6*)	SYSTYPE=FREEBSD5
+		;;
   OpenBSD.2*)	SYSTYPE=OPENBSD2
 		;;
   OpenBSD.3*)	SYSTYPE=OPENBSD3
===cut-here===
--- makedefs.stable_orig	Wed Apr 14 13:59:43 2004
+++ makedefs.stable	Fri Aug 20 15:10:13 2004
@@ -93,6 +93,8 @@
 		;;
   FreeBSD.5*)	SYSTYPE=FREEBSD5
 		;;
+  FreeBSD.6*)	SYSTYPE=FREEBSD5
+		;;
   OpenBSD.2*)	SYSTYPE=OPENBSD2
 		;;
   OpenBSD.3*)	SYSTYPE=OPENBSD3

Lines 7-13 Link Here

(-)postfix-current/pkg-plist (-2 / +10 lines)
7	@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi	7	@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
8	@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi	8	@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
9	@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi	9	@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
		10	@unexec if cmp -s %D/etc/postfix/generics %D/etc/postfix/dist-generics; then rm -f %D/etc/postfix/generics; fi
10	etc/postfix/LICENSE	11	etc/postfix/LICENSE
		12	etc/postfix/TLS_LICENSE
11	etc/postfix/main.cf.default	13	etc/postfix/main.cf.default
12	etc/postfix/makedefs.out	14	etc/postfix/makedefs.out
13	etc/postfix/post-install	15	etc/postfix/post-install
Lines 46-52 Link Here
46	libexec/postfix/trivial-rewrite	48	libexec/postfix/trivial-rewrite
47	libexec/postfix/verify	49	libexec/postfix/verify
48	libexec/postfix/virtual	50	libexec/postfix/virtual
49	%%SUB_TLS%%libexec/postfix/tlsmgr	51	libexec/postfix/tlsmgr
50	sbin/postalias	52	sbin/postalias
51	sbin/postcat	53	sbin/postcat
52	sbin/postconf	54	sbin/postconf
Lines 93-99 Link Here
93	%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html	95	%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
94	%%PORTDOCS%%%%DOCSDIR%%/INSTALL	96	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
95	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html	97	%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
96	%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README	98	%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
		99	%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
		100	%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
		101	%%PORTDOCS%%%%DOCSDIR%%/TLS_README
		102	%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
97	%%PORTDOCS%%%%DOCSDIR%%/LDAP_README	103	%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
98	%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html	104	%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
99	%%PORTDOCS%%%%DOCSDIR%%/LINUX_README	105	%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
Lines 215-220 Link Here
215	%%PORTDOCS%%%%DOCSDIR%%/verify.8.html	221	%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
216	%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html	222	%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
217	%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html	223	%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
		224	%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
		225	%%PORTDOCS%%%%DOCSDIR%%/generics.5.html
218	%%PORTDOCS%%@dirrm %%DOCSDIR%%	226	%%PORTDOCS%%@dirrm %%DOCSDIR%%
219	@dirrm libexec/postfix	227	@dirrm libexec/postfix
220	@unexec rmdir %D/etc/postfix 2>/dev/null \|\| true	228	@unexec rmdir %D/etc/postfix 2>/dev/null \|\| true




SASL		"Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
SASL2		"Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
SASLKRB		"If your SASL requires Kerberos select this option" "$status_SASLKRB" \
SASLKRB5	"If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
TLS		"SSL and TLS" "$status_TLS" \
IPv6TLS		"IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
DB3		"Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
DB40		"Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
DB41		"Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \

MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
PgSQL		"PostgreSQL v7.4 map lookups" "$status_PgSQL" \
PgSQL73		"PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
PgSQL72		"PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
NIS		"NIS map lookups" "$status_NIS" \
Test		"SMTP/LMTP test server and generator" "$status_Test" \


echo "PREFIX=	${PREFIX}"

SUB_TLS="@comment "
SUB_TEST="@comment "
SUB_IPV6="@comment "

while [ "$1" ]; do
	case $1 in

		SASLKRB)
                        echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
			;;
		SASLKRB5)
			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
			;;
		TLS)
			echo "MAN8+=		tlsmgr.8"
			echo "USE_OPENSSL=	yes"
			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
			echo "DISTFILES+=	\${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
			echo "EXTRA_PATCHES+=	\${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
			echo "PATCH_STRIP=	-p1"
			echo "TLS_SUFFIX=	+tls"
			SUB_TLS=""
			;;
		DB3)
			if [ "X$BDB_SELECTED" != "X" ]; then

			echo "MYSQL_SUFFIX=	+mysql"
			;;
		PgSQL)
			echo "POSTGRESQL_PORT?=	databases/postgresql74-client"
			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
			echo "PGSQL_SUFFIX=	+pgsql"
			;;
		PgSQL73)
			echo "POSTGRESQL_PORT?=	databases/postgresql73-client"
			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
			echo "PGSQL_SUFFIX=	+pgsql"
			;;
		PgSQL72)
			echo "POSTGRESQL_PORT?=	databases/postgresql72"
			echo "LIB_DEPENDS+=	pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
			echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include  -I\${LOCALBASE}/pgsql/include"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
			echo "PGSQL_SUFFIX=	+pgsql"
			;;
		OpenLDAP)
			echo "USE_OPENLDAP=YES"
			echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"

#			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
			SUB_TEST=""
			;;
		IPv6)
			if [ X$SUB_TLS = "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
			echo "PATCHFILES+=	ipv6-1.25-pf-2.2-20040616.patch.gz"
			echo "PATCH_DIST_STRIP=	-p1"
			echo "IPv6_SUFFIX=	+ipv6"
			echo ""
			IPv6SELECTED=YES
			SUB_IPV6=""
			;;
		IPv6TLS)
			if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "MAN8+=		tlsmgr.8"
			echo "USE_OPENSSL=	yes"
			echo "POSTFIX_CCARGS+=	-DHAS_SSL -I\${OPENSSLINC}"
			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
			echo "PATCH_SITES+=	http://www.ipnet6.org/postfix/download/"
			echo "PATCHFILES+=	tls+ipv6-1.25-pf-2.2-20040616.patch.gz"
			echo "PATCH_DIST_STRIP=	-p1"
			echo "TLS_SUFFIX=	+tls+ipv6"
			SUB_TLS=""
			SUB_IPV6=""
			;;
		*)
			echo "Unknown option(s): $*" > /dev/stderr
			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc

	shift
done

echo "PLIST_SUB+=	SUB_TLS=\"${SUB_TLS}\""
echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
echo "PLIST_SUB+=	SUB_IPV6=\"${SUB_IPV6}\""

# for some reason, if we alter the pkg name this way, the first build (where
# we ask the configure questions) doesn't pick up the extensions, but
# any subsequent build will.  so "make; make install" will build twice.
# don't do this for now.
#echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"

Return to bug 76830

Lines 7-13 Link Here

(-)postfix-current/Makefile (-22 / +19 lines)
7		7
8	# To pre-select options in batch mode, run make like this:	8	# To pre-select options in batch mode, run make like this:
9	#	9	#
10	# make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"	10	# make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
11	#	11	#
12	# the options are the same names as in the scripts/configure.postfix file.	12	# the options are the same names as in the scripts/configure.postfix file.
13	# POSTFIX_OPTIONS can be set in /etc/make.conf also.	13	# POSTFIX_OPTIONS can be set in /etc/make.conf also.
Lines 15-21 Link Here
15	# NOTE: PCRE is enabled by default unless you specifically disable it.	15	# NOTE: PCRE is enabled by default unless you specifically disable it.
16		16
17	PORTNAME= postfix	17	PORTNAME= postfix
18	PORTVERSIONRAW= 2.2-20041030	18	PORTVERSIONRAW= 2.2-20050209
19	PORTVERSION= ${PORTVERSIONRAW:S/-/./}	19	PORTVERSION= ${PORTVERSIONRAW:S/-/./}
20	PORTEPOCH= 2	20	PORTEPOCH= 2
21	CATEGORIES= mail ipv6	21	CATEGORIES= mail ipv6
Lines 45-63 Link Here
45	MAN5= access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \	45	MAN5= access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
46	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \	46	mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
47	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \	47	regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
48	header_checks.5 body_checks.5 master.5 nisplus_table.5	48	header_checks.5 body_checks.5 master.5 nisplus_table.5 \
		49	generics.5
49		50
50	MAN8= anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \	51	MAN8= anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
51	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \	52	master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
52	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \	53	smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
53	scache.8 discard.8	54	scache.8 discard.8 tlsmgr.8
54
55	# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
56	# patch it.
57	MAN8base=$(MAN8:S/tlsmgr.8//)
58		55
59	CONF1= main.cf master.cf access aliases canonical header_checks relocated \	56	CONF1= main.cf master.cf access aliases canonical header_checks relocated \
60	transport virtual	57	transport virtual generics
61		58
62	README= ADDRESS_CLASS_README ADDRESS_REWRITING_README \	59	README= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
63	ADDRESS_VERIFICATION_README BACKSCATTER_README \	60	ADDRESS_VERIFICATION_README BACKSCATTER_README \
Lines 70-76 Link Here
70	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \	67	SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
71	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \	68	SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
72	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \	69	ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
73	XCLIENT_README XFORWARD_README	70	XCLIENT_README XFORWARD_README IPV6_README TLS_README
74		71
75	.if !defined(DEBUG)	72	.if !defined(DEBUG)
76	MAKEFILEFLAGS+= DEBUG=	73	MAKEFILEFLAGS+= DEBUG=
Lines 138-155 Link Here
138		135
139	do-install:	136	do-install:
140	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \	137	cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
141	config_directory=${PREFIX}/etc/postfix \	138	config_directory=${PREFIX}/etc/postfix \
142	daemon_directory=${PREFIX}/libexec/postfix \	139	daemon_directory=${PREFIX}/libexec/postfix \
143	command_directory=${PREFIX}/sbin \	140	command_directory=${PREFIX}/sbin \
144	queue_directory=/var/spool/postfix \	141	queue_directory=/var/spool/postfix \
145	sendmail_path=${PREFIX}/sbin/sendmail \	142	sendmail_path=${PREFIX}/sbin/sendmail \
146	newaliases_path=${PREFIX}/bin/newaliases \	143	newaliases_path=${PREFIX}/bin/newaliases \
147	mailq_path=${PREFIX}/bin/mailq \	144	mailq_path=${PREFIX}/bin/mailq \
148	mail_owner=postfix \	145	mail_owner=postfix \
149	setgid_group=maildrop \	146	setgid_group=maildrop \
150	manpage_directory=${PREFIX}/man \	147	manpage_directory=${PREFIX}/man \
151	sample_directory=${PREFIX}/etc/postfix \	148	sample_directory=${PREFIX}/etc/postfix \
152	readme_directory=${READMEDIR}	149	readme_directory=${READMEDIR}
153		150
154	.for f in ${CONF1}	151	.for f in ${CONF1}
155	${INSTALL_DATA} ${WRKSRC}/conf/${f} \	152	${INSTALL_DATA} ${WRKSRC}/conf/${f} \

Lines 9-34 Link Here

(-)postfix-current/files/patch-freebsd6 (-23 lines)
9	OpenBSD.2*) SYSTYPE=OPENBSD2	9	OpenBSD.2*) SYSTYPE=OPENBSD2
10	;;	10	;;
11	OpenBSD.3*) SYSTYPE=OPENBSD3	11	OpenBSD.3*) SYSTYPE=OPENBSD3
12	--- makedefs.snapshot_orig Wed Apr 14 14:18:06 2004
13	+++ makedefs.snapshot Fri Aug 20 15:08:54 2004
14	@@ -93,6 +93,8 @@
15	;;
16	FreeBSD.5*) SYSTYPE=FREEBSD5
17	;;
18	+ FreeBSD.6*) SYSTYPE=FREEBSD5
19	+ ;;
20	OpenBSD.2*) SYSTYPE=OPENBSD2
21	;;
22	OpenBSD.3*) SYSTYPE=OPENBSD3
23	===cut-here===
24	--- makedefs.stable_orig Wed Apr 14 13:59:43 2004
25	+++ makedefs.stable Fri Aug 20 15:10:13 2004
26	@@ -93,6 +93,8 @@
27	;;
28	FreeBSD.5*) SYSTYPE=FREEBSD5
29	;;
30	+ FreeBSD.6*) SYSTYPE=FREEBSD5
31	+ ;;
32	OpenBSD.2*) SYSTYPE=OPENBSD2
33	;;
34	OpenBSD.3*) SYSTYPE=OPENBSD3

Lines 23-31 Link Here

(-)postfix-current/scripts/configure.postfix (-55 / +9 lines)
23	SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \	23	SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
24	SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \	24	SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
25	SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \	25	SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \
26	TLS "SSL and TLS (BROKEN)" "$status_TLS" \	26	SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
27	IPv6 "IPv6 support (BROKEN)" "$status_IPv6" \	27	TLS "SSL and TLS" "$status_TLS" \
28	IPv6TLS "IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
29	DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \	28	DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
30	DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \	29	DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
31	DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \	30	DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
Lines 33-39 Link Here
33	MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \	32	MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
34	PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \	33	PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \
35	PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \	34	PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
36	PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
37	OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \	35	OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
38	NIS "NIS map lookups" "$status_NIS" \	36	NIS "NIS map lookups" "$status_NIS" \
39	Test "SMTP/LMTP test server and generator" "$status_Test" \	37	Test "SMTP/LMTP test server and generator" "$status_Test" \
Lines 62-70 Link Here
62		60
63	echo "PREFIX= ${PREFIX}"	61	echo "PREFIX= ${PREFIX}"
64		62
65	SUB_TLS="@comment "
66	SUB_TEST="@comment "	63	SUB_TEST="@comment "
67	SUB_IPV6="@comment "
68		64
69	while [ "$1" ]; do	65	while [ "$1" ]; do
70	case $1 in	66	case $1 in
Lines 104-119 Link Here
104	SASLKRB)	100	SASLKRB)
105	echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"	101	echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
106	;;	102	;;
		103	SASLKRB5)
		104	echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
		105	;;
107	TLS)	106	TLS)
108	echo "MAN8+= tlsmgr.8"
109	echo "USE_OPENSSL= yes"	107	echo "USE_OPENSSL= yes"
110	echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}"	108	echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}"
111	echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"	109	echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
112	echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
113	echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
114	echo "PATCH_STRIP= -p1"
115	echo "TLS_SUFFIX= +tls"	110	echo "TLS_SUFFIX= +tls"
116	SUB_TLS=""
117	;;	111	;;
118	DB3)	112	DB3)
119	if [ "X$BDB_SELECTED" != "X" ]; then	113	if [ "X$BDB_SELECTED" != "X" ]; then
Lines 170-195 Link Here
170	echo "MYSQL_SUFFIX= +mysql"	164	echo "MYSQL_SUFFIX= +mysql"
171	;;	165	;;
172	PgSQL)	166	PgSQL)
173	echo "POSTGRESQL_PORT?= databases/postgresql7"	167	echo "POSTGRESQL_PORT?= databases/postgresql74-client"
174	echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"	168	echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
175	echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"	169	echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
176	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"	170	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
177	echo "PGSQL_SUFFIX= +pgsql"	171	echo "PGSQL_SUFFIX= +pgsql"
178	;;	172	;;
179	PgSQL73)	173	PgSQL73)
180	echo "POSTGRESQL_PORT?= databases/postgresql73"	174	echo "POSTGRESQL_PORT?= databases/postgresql73-client"
181	echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"	175	echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
182	echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"	176	echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
183	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"	177	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
184	echo "PGSQL_SUFFIX= +pgsql"	178	echo "PGSQL_SUFFIX= +pgsql"
185	;;	179	;;
186	PgSQL72)
187	echo "POSTGRESQL_PORT?= databases/postgresql72"
188	echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
189	echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
190	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
191	echo "PGSQL_SUFFIX= +pgsql"
192	;;
193	OpenLDAP)	180	OpenLDAP)
194	echo "USE_OPENLDAP=YES"	181	echo "USE_OPENLDAP=YES"
195	echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"	182	echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
Lines 205-241 Link Here
205	# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"	192	# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
206	SUB_TEST=""	193	SUB_TEST=""
207	;;	194	;;
208	IPv6)
209	if [ X$SUB_TLS = "X" ]; then
210	/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
211	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
212	exit 1
213	fi
214	echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/"
215	echo "PATCHFILES+= ipv6-1.25-pf-2.2-20040616.patch.gz"
216	echo "PATCH_DIST_STRIP= -p1"
217	echo "IPv6_SUFFIX= +ipv6"
218	echo ""
219	IPv6SELECTED=YES
220	SUB_IPV6=""
221	;;
222	IPv6TLS)
223	if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
224	/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
225	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
226	exit 1
227	fi
228	echo "MAN8+= tlsmgr.8"
229	echo "USE_OPENSSL= yes"
230	echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}"
231	echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
232	echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/"
233	echo "PATCHFILES+= tls+ipv6-1.25-pf-2.2-20040616.patch.gz"
234	echo "PATCH_DIST_STRIP= -p1"
235	echo "TLS_SUFFIX= +tls+ipv6"
236	SUB_TLS=""
237	SUB_IPV6=""
238	;;
239	*)	195	*)
240	echo "Unknown option(s): $*" > /dev/stderr	196	echo "Unknown option(s): $*" > /dev/stderr
241	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	197	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
Lines 245-256 Link Here
245	shift	201	shift
246	done	202	done
247		203
248	echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
249	echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""	204	echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
250	echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\""
251		205
252	# for some reason, if we alter the pkg name this way, the first build (where	206	# for some reason, if we alter the pkg name this way, the first build (where
253	# we ask the configure questions) doesn't pick up the extensions, but	207	# we ask the configure questions) doesn't pick up the extensions, but
254	# any subsequent build will. so "make; make install" will build twice.	208	# any subsequent build will. so "make; make install" will build twice.
255	# don't do this for now.	209	# don't do this for now.
256	#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"	210	#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"