Attachment #56619 for bug #85489

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

Lines 15-21 Link Here

(-)postfix-current/Makefile (-1 / +1 lines)
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	DISTVERSION= 2.3-20050726	18	DISTVERSION= 2.3-20050829
19	PORTEPOCH= 2	19	PORTEPOCH= 2
20	CATEGORIES= mail ipv6	20	CATEGORIES= mail ipv6
21	MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \	21	MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \

Lines 1-2 Link Here

(-)postfix-current/distinfo (-2 / +2 lines)
1	MD5 (postfix/postfix-2.3-20050726.tar.gz) = 77bdd5bcbb8f8eac5ad819b619da5f68	1	MD5 (postfix/postfix-2.3-20050829.tar.gz) = b1b3818064af1f0134fac35a8a883ae9
2	SIZE (postfix/postfix-2.3-20050726.tar.gz) = 2504873	2	SIZE (postfix/postfix-2.3-20050829.tar.gz) = 2506666




	if [ x${answer} = x ]; then
		answer=${default}
	fi
	echo ${answer}
}

yesno() {

			[Yy]*)	return 0;;
			[Nn]*)	return 1;;
		esac
		echo "Please answer yes or no."
	done
}


	GID2=126

	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
		echo "You already have a group \"${GROUP}\", so I will use it."
	else
		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
			echo "Added group \"${GROUP}\"."
		else
			echo "Adding group \"${GROUP}\" failed..."
			echo "Please create it, and try again."
			exit 1
		fi
	fi

	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
		echo "You already have a group \"${GROUP2}\", so I will use it."
	else
		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
			echo "Added group \"${GROUP2}\"."
		else
			echo "Adding group \"${GROUP2}\" failed..."
			echo "Please create it, and try again."
			exit 1
		fi
	fi

	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
		echo "You already have a user \"${USER}\", so I will use it."
	else
		if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
			echo "Added user \"${USER}\"."
		else
			echo "Adding user \"${USER}\" failed..."
			echo "Please create it, and try again."
			exit 1
		fi
	fi

	if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then
		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
	else
		echo "You need user \"${USER}\" added to group \"mail\"."
		if yesno "Would you like me to add it" y; then
			/usr/sbin/pw groupmod mail -m ${USER} || exit
			echo "Done."
		else
			echo "Please create it, and try again."
			exit 1
		fi
	fi

	if [ ${OSVERSION} -ge 400014 ]; then
		if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
			/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
			echo "#"						>	/etc/mail/mailer.conf
			echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
			echo ", named ${PKG_PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
			echo "#"						>>	/etc/mail/mailer.conf
			echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
			echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
			echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
			echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
		fi
	else
		if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
			replace /usr/sbin/sendmail	${PKG_PREFIX}/sbin/sendmail
			replace /usr/bin/mailq		${PKG_PREFIX}/sbin/sendmail
			replace /usr/bin/newaliases	${PKG_PREFIX}/sbin/sendmail
			echo "Done."
		fi
	fi
fi




MySQL		"MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
CDB		"CDB map lookups" "$status_CDB" \
NIS		"NIS map lookups" "$status_NIS" \
Test		"SMTP/LMTP test server and generator" "$status_Test" \
2> $tempfile


	case $retval in
		0)	if [ -z "$*" ]; then
				echo "Nothing selected"
			fi
			;;
		1)	echo "Cancel pressed."
			exit 1
			;;
	esac

${MKDIR} ${WRKDIRPREFIX}${CURDIR}
exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc

echo "PREFIX=	${PREFIX}"

SUB_TEST="@comment "

while [ "$1" ]; do
	case $1 in
		NOPCRE)
			echo "WITHOUT_PCRE=	yes"
			echo "NOPCRE_SUFFIX=	+nopcre"
			SUB_NOPCRE=""
			;;
		SASL)
			echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
			echo "SASL_SUFFIX=		+sasl"
			if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
				if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then
					SASL_USE_MYSQL="YES"

			fi
			;;
		SASL2)
			echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
			echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
			echo "SASL_SUFFIX=		+sasl2"
			if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
				if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then
					SASL_USE_MYSQL="YES"

			fi
			;;
		SASLKRB)
			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
			;;
		SASLKRB5)
			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
			;;
		TLS)
			echo "USE_OPENSSL=	yes"
			echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
			echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
			echo "TLS_SUFFIX=		+tls"
			;;
		DB3)
			if [ "X$BDB_SELECTED" != "X" ]; then

				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
			echo "DB_SUFFIX=		+db3"
			BDB_SELECTED="3"
			;;
		DB40)

				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
			echo "DB_SUFFIX=		+db40"
			BDB_SELECTED="40"
			;;
		DB41)

				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
			echo "DB_SUFFIX=		+db41"
			BDB_SELECTED="41"
			;;
		DB42)

				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
			echo "DB_SUFFIX=		+db42"
			BDB_SELECTED="42"
			;;
		DB43)

				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi
			echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
			echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
			echo "DB_SUFFIX=		+db43"
			BDB_SELECTED="43"
			;;
		MySQL)
			echo "USE_MYSQL=YES"
			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
			echo "POSTFIX_AUXLIBS+= 	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
					echo "USE_OPENSSL=	yes"
					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
				fi
			fi
			echo "MYSQL_SUFFIX=	+mysql"
			MYSQL_SELECTED="YES"
			;;
		PgSQL)
			echo "USE_PGSQL=YES"
			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 "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
			echo "OPENLDAP_SUFFIX=	+openldap"
			;;
		CDB)
			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
			echo "POSTFIX_CCARGS+=	-DHAS_CDB -I\${LOCALBASE}/include"
			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lcdb"
			echo "CDB_SUFFIX=		+cdb"
			;;
		NIS)
			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
			echo "NIS_SUFFIX=		+nis"
			;;
		Test)
			echo "BIN1=		smtp-sink smtp-source qmqp-source"
#			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
			SUB_TEST=""
			;;
		*)
			echo "Unknown option(s): $*" > /dev/stderr
			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
			exit 1
			;;

	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
		/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
		if [ $? = 0 ]; then
			echo "USE_MYSQL=YES"
			echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
			echo "POSTFIX_AUXLIBS+= 	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
			if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
				if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then
					echo "USE_OPENSSL=	yes"
					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
				fi
			fi
		fi
	fi
fi

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

# 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}\${TLS_SUFFIX}\${NIS_SUFFIX}"

Return to bug 85489

Lines 33-38 Link Here

(-)postfix-current/scripts/configure.postfix (-67 / +74 lines)
33	MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \	33	MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
34	PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \	34	PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
35	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" \
		36	CDB "CDB map lookups" "$status_CDB" \
36	NIS "NIS map lookups" "$status_NIS" \	37	NIS "NIS map lookups" "$status_NIS" \
37	Test "SMTP/LMTP test server and generator" "$status_Test" \	38	Test "SMTP/LMTP test server and generator" "$status_Test" \
38	2> $tempfile	39	2> $tempfile
Lines 46-55 Link Here
46		47
47	case $retval in	48	case $retval in
48	0) if [ -z "$*" ]; then	49	0) if [ -z "$*" ]; then
49	/bin/echo "Nothing selected"	50	echo "Nothing selected"
50	fi	51	fi
51	;;	52	;;
52	1) /bin/echo "Cancel pressed."	53	1) echo "Cancel pressed."
53	exit 1	54	exit 1
54	;;	55	;;
55	esac	56	esac
Lines 58-79 Link Here
58	${MKDIR} ${WRKDIRPREFIX}${CURDIR}	59	${MKDIR} ${WRKDIRPREFIX}${CURDIR}
59	exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	60	exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
60		61
61	/bin/echo "PREFIX= ${PREFIX}"	62	echo "PREFIX= ${PREFIX}"
62		63
63	SUB_TEST="@comment "	64	SUB_TEST="@comment "
64		65
65	while [ "$1" ]; do	66	while [ "$1" ]; do
66	case $1 in	67	case $1 in
67	NOPCRE)	68	NOPCRE)
68	/bin/echo "WITHOUT_PCRE= yes"	69	echo "WITHOUT_PCRE= yes"
69	/bin/echo "NOPCRE_SUFFIX= +nopcre"	70	echo "NOPCRE_SUFFIX= +nopcre"
70	SUB_NOPCRE=""	71	SUB_NOPCRE=""
71	;;	72	;;
72	SASL)	73	SASL)
73	/bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl"	74	echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl"
74	/bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"	75	echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
75	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"	76	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
76	/bin/echo "SASL_SUFFIX= +sasl"	77	echo "SASL_SUFFIX= +sasl"
77	if [ -f ${LOCALBASE}/lib/libsasl.a ]; then	78	if [ -f ${LOCALBASE}/lib/libsasl.a ]; then
78	if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a \| grep -wq "mysql_init"; then	79	if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a \| grep -wq "mysql_init"; then
79	SASL_USE_MYSQL="YES"	80	SASL_USE_MYSQL="YES"
Lines 81-90 Link Here
81	fi	82	fi
82	;;	83	;;
83	SASL2)	84	SASL2)
84	/bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"	85	echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
85	/bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"	86	echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
86	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"	87	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
87	/bin/echo "SASL_SUFFIX= +sasl2"	88	echo "SASL_SUFFIX= +sasl2"
88	if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then	89	if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then
89	if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a \| grep -wq "mysql_init"; then	90	if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a \| grep -wq "mysql_init"; then
90	SASL_USE_MYSQL="YES"	91	SASL_USE_MYSQL="YES"
Lines 92-107 Link Here
92	fi	93	fi
93	;;	94	;;
94	SASLKRB)	95	SASLKRB)
95	/bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"	96	echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
96	;;	97	;;
97	SASLKRB5)	98	SASLKRB5)
98	/bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"	99	echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
99	;;	100	;;
100	TLS)	101	TLS)
101	/bin/echo "USE_OPENSSL= yes"	102	echo "USE_OPENSSL= yes"
102	/bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}"	103	echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}"
103	/bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"	104	echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
104	/bin/echo "TLS_SUFFIX= +tls"	105	echo "TLS_SUFFIX= +tls"
105	;;	106	;;
106	DB3)	107	DB3)
107	if [ "X$BDB_SELECTED" != "X" ]; then	108	if [ "X$BDB_SELECTED" != "X" ]; then
Lines 109-118 Link Here
109	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	110	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
110	exit 1	111	exit 1
111	fi	112	fi
112	/bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"	113	echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3"
113	/bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"	114	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3"
114	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"	115	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3"
115	/bin/echo "DB_SUFFIX= +db3"	116	echo "DB_SUFFIX= +db3"
116	BDB_SELECTED="3"	117	BDB_SELECTED="3"
117	;;	118	;;
118	DB40)	119	DB40)
Lines 121-130 Link Here
121	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	122	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
122	exit 1	123	exit 1
123	fi	124	fi
124	/bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"	125	echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4"
125	/bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4"	126	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4"
126	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4"	127	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4"
127	/bin/echo "DB_SUFFIX= +db40"	128	echo "DB_SUFFIX= +db40"
128	BDB_SELECTED="40"	129	BDB_SELECTED="40"
129	;;	130	;;
130	DB41)	131	DB41)
Lines 133-142 Link Here
133	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	134	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
134	exit 1	135	exit 1
135	fi	136	fi
136	/bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41"	137	echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41"
137	/bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41"	138	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41"
138	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41"	139	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41"
139	/bin/echo "DB_SUFFIX= +db41"	140	echo "DB_SUFFIX= +db41"
140	BDB_SELECTED="41"	141	BDB_SELECTED="41"
141	;;	142	;;
142	DB42)	143	DB42)
Lines 145-154 Link Here
145	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	146	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
146	exit 1	147	exit 1
147	fi	148	fi
148	/bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42"	149	echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42"
149	/bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42"	150	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42"
150	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"	151	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"
151	/bin/echo "DB_SUFFIX= +db42"	152	echo "DB_SUFFIX= +db42"
152	BDB_SELECTED="42"	153	BDB_SELECTED="42"
153	;;	154	;;
154	DB43)	155	DB43)
Lines 157-205 Link Here
157	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	158	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
158	exit 1	159	exit 1
159	fi	160	fi
160	/bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43"	161	echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43"
161	/bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43"	162	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43"
162	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb"	163	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb"
163	/bin/echo "DB_SUFFIX= +db43"	164	echo "DB_SUFFIX= +db43"
164	BDB_SELECTED="43"	165	BDB_SELECTED="43"
165	;;	166	;;
166	MySQL)	167	MySQL)
167	/bin/echo "USE_MYSQL=YES"	168	echo "USE_MYSQL=YES"
168	/bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"	169	echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
169	/bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"	170	echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
170	if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then	171	if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
171	if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a \| grep -wq "SSL_new"; then	172	if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a \| grep -wq "SSL_new"; then
172	/bin/echo "USE_OPENSSL= yes"	173	echo "USE_OPENSSL= yes"
173	/bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}"	174	echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}"
174	/bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"	175	echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
175	fi	176	fi
176	fi	177	fi
177	/bin/echo "MYSQL_SUFFIX= +mysql"	178	echo "MYSQL_SUFFIX= +mysql"
178	MYSQL_SELECTED="YES"	179	MYSQL_SELECTED="YES"
179	;;	180	;;
180	PgSQL)	181	PgSQL)
181	/bin/echo "USE_PGSQL=YES"	182	echo "USE_PGSQL=YES"
182	/bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"	183	echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
183	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"	184	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
184	/bin/echo "PGSQL_SUFFIX= +pgsql"	185	echo "PGSQL_SUFFIX= +pgsql"
185	;;	186	;;
186	OpenLDAP)	187	OpenLDAP)
187	/bin/echo "USE_OPENLDAP=YES"	188	echo "USE_OPENLDAP=YES"
188	/bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"	189	echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
189	/bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber"	190	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber"
190	/bin/echo "OPENLDAP_SUFFIX= +openldap"	191	echo "OPENLDAP_SUFFIX= +openldap"
		192	;;
		193	CDB)
		194	echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libcdb.a:\${PORTSDIR}/databases/tinycdb"
		195	echo "POSTFIX_CCARGS+= -DHAS_CDB -I\${LOCALBASE}/include"
		196	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lcdb"
		197	echo "CDB_SUFFIX= +cdb"
191	;;	198	;;
192	NIS)	199	NIS)
193	/bin/echo "POSTFIX_CCARGS+= -DHAS_NIS"	200	echo "POSTFIX_CCARGS+= -DHAS_NIS"
194	/bin/echo "NIS_SUFFIX= +nis"	201	echo "NIS_SUFFIX= +nis"
195	;;	202	;;
196	Test)	203	Test)
197	/bin/echo "BIN1= smtp-sink smtp-source qmqp-source"	204	echo "BIN1= smtp-sink smtp-source qmqp-source"
198	# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"	205	# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
199	SUB_TEST=""	206	SUB_TEST=""
200	;;	207	;;
201	*)	208	*)
202	/bin/echo "Unknown option(s): $*" > /dev/stderr	209	echo "Unknown option(s): $*" > /dev/stderr
203	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	210	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
204	exit 1	211	exit 1
205	;;	212	;;
Lines 211-234 Link Here
211	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then	218	if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then
212	/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr	219	/usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr
213	if [ $? = 0 ]; then	220	if [ $? = 0 ]; then
214	/bin/echo "USE_MYSQL=YES"	221	echo "USE_MYSQL=YES"
215	/bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"	222	echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
216	/bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"	223	echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
217	if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then	224	if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then
218	if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a \| grep -wq "SSL_new"; then	225	if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a \| grep -wq "SSL_new"; then
219	/bin/echo "USE_OPENSSL= yes"	226	echo "USE_OPENSSL= yes"
220	/bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}"	227	echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}"
221	/bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"	228	echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
222	fi	229	fi
223	fi	230	fi
224	fi	231	fi
225	fi	232	fi
226	fi	233	fi
227		234
228	/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""	235	echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
229		236
230	# for some reason, if we alter the pkg name this way, the first build (where	237	# for some reason, if we alter the pkg name this way, the first build (where
231	# we ask the configure questions) doesn't pick up the extensions, but	238	# we ask the configure questions) doesn't pick up the extensions, but
232	# any subsequent build will. so "make; make install" will build twice.	239	# any subsequent build will. so "make; make install" will build twice.
233	# don't do this for now.	240	# don't do this for now.
234	#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"	241	#echo "PKGNAMESUFFIX=\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"

Lines 34-40 Link Here

(-)postfix-current/pkg-install (-27 / +27 lines)
34	if [ x${answer} = x ]; then	34	if [ x${answer} = x ]; then
35	answer=${default}	35	answer=${default}
36	fi	36	fi
37	/bin/echo ${answer}	37	echo ${answer}
38	}	38	}
39		39
40	yesno() {	40	yesno() {
Lines 48-54 Link Here
48	[Yy]*) return 0;;	48	[Yy]*) return 0;;
49	[Nn]*) return 1;;	49	[Nn]*) return 1;;
50	esac	50	esac
51	/bin/echo "Please answer yes or no."	51	echo "Please answer yes or no."
52	done	52	done
53	}	53	}
54		54
Lines 61-110 Link Here
61	GID2=126	61	GID2=126
62		62
63	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then	63	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
64	/bin/echo "You already have a group \"${GROUP}\", so I will use it."	64	echo "You already have a group \"${GROUP}\", so I will use it."
65	else	65	else
66	if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then	66	if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
67	/bin/echo "Added group \"${GROUP}\"."	67	echo "Added group \"${GROUP}\"."
68	else	68	else
69	/bin/echo "Adding group \"${GROUP}\" failed..."	69	echo "Adding group \"${GROUP}\" failed..."
70	/bin/echo "Please create it, and try again."	70	echo "Please create it, and try again."
71	exit 1	71	exit 1
72	fi	72	fi
73	fi	73	fi
74		74
75	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then	75	if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then
76	/bin/echo "You already have a group \"${GROUP2}\", so I will use it."	76	echo "You already have a group \"${GROUP2}\", so I will use it."
77	else	77	else
78	if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then	78	if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
79	/bin/echo "Added group \"${GROUP2}\"."	79	echo "Added group \"${GROUP2}\"."
80	else	80	else
81	/bin/echo "Adding group \"${GROUP2}\" failed..."	81	echo "Adding group \"${GROUP2}\" failed..."
82	/bin/echo "Please create it, and try again."	82	echo "Please create it, and try again."
83	exit 1	83	exit 1
84	fi	84	fi
85	fi	85	fi
86		86
87	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then	87	if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
88	/bin/echo "You already have a user \"${USER}\", so I will use it."	88	echo "You already have a user \"${USER}\", so I will use it."
89	else	89	else
90	if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then	90	if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then
91	/bin/echo "Added user \"${USER}\"."	91	echo "Added user \"${USER}\"."
92	else	92	else
93	/bin/echo "Adding user \"${USER}\" failed..."	93	echo "Adding user \"${USER}\" failed..."
94	/bin/echo "Please create it, and try again."	94	echo "Please create it, and try again."
95	exit 1	95	exit 1
96	fi	96	fi
97	fi	97	fi
98		98
99	if /usr/sbin/pw show group mail \| grep -q "${USER}" 2>/dev/null; then	99	if /usr/sbin/pw show group mail \| grep -q "${USER}" 2>/dev/null; then
100	/bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it."	100	echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
101	else	101	else
102	/bin/echo "You need user \"${USER}\" added to group \"mail\"."	102	echo "You need user \"${USER}\" added to group \"mail\"."
103	if yesno "Would you like me to add it" y; then	103	if yesno "Would you like me to add it" y; then
104	/usr/sbin/pw groupmod mail -m ${USER} \|\| exit	104	/usr/sbin/pw groupmod mail -m ${USER} \|\| exit
105	/bin/echo "Done."	105	echo "Done."
106	else	106	else
107	/bin/echo "Please create it, and try again."	107	echo "Please create it, and try again."
108	exit 1	108	exit 1
109	fi	109	fi
110	fi	110	fi
Lines 160-180 Link Here
160	if [ ${OSVERSION} -ge 400014 ]; then	160	if [ ${OSVERSION} -ge 400014 ]; then
161	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then	161	if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then
162	/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old	162	/bin/mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old
163	/bin/echo "#" > /etc/mail/mailer.conf	163	echo "#" > /etc/mail/mailer.conf
164	/bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf	164	echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf
165	/bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf	165	echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
166	/bin/echo "#" >> /etc/mail/mailer.conf	166	echo "#" >> /etc/mail/mailer.conf
167	/bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf	167	echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
168	/bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf	168	echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
169	/bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf	169	echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
170	/bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf	170	echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf
171	fi	171	fi
172	else	172	else
173	if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then	173	if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then
174	replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail	174	replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail
175	replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail	175	replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail
176	replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail	176	replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail
177	/bin/echo "Done."	177	echo "Done."
178	fi	178	fi
179	fi	179	fi
180	fi	180	fi