Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Aug 2005 13:18:26 -0300 (BRT)
From:      Marcus Grando <marcus@corp.grupos.com.br>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/85489: Update port: mail/postfix-current to 2.3-20050829
Message-ID:  <200508301618.j7UGIQRo014420@marcus.grupos.com.br>
Resent-Message-ID: <200508301620.j7UGKDAj059018@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         85489
>Category:       ports
>Synopsis:       Update port: mail/postfix-current to 2.3-20050829
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 30 16:20:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Marcus Grando
>Release:        FreeBSD 6.0-BETA3 i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-BETA3 FreeBSD 6.0-BETA3 #32: Mon Aug 29 21:33:04 BRT 2005 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386


	
>Description:

- Update to 2.3-20050829
- Add CDB maps (ports/84382)
- Use builtin echo

	
>How-To-Repeat:
	
>Fix:

	

--- postfix-current.patch begins here ---
diff -ruN postfix-current.orig/Makefile postfix-current/Makefile
--- postfix-current.orig/Makefile	Thu Jul 28 15:27:49 2005
+++ postfix-current/Makefile	Tue Aug 30 13:04:16 2005
@@ -15,7 +15,7 @@
 # NOTE: PCRE is enabled by default unless you specifically disable it.
 
 PORTNAME=	postfix
-DISTVERSION=	2.3-20050726
+DISTVERSION=	2.3-20050829
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
diff -ruN postfix-current.orig/distinfo postfix-current/distinfo
--- postfix-current.orig/distinfo	Thu Jul 28 15:27:49 2005
+++ postfix-current/distinfo	Tue Aug 30 13:07:35 2005
@@ -1,2 +1,2 @@
-MD5 (postfix/postfix-2.3-20050726.tar.gz) = 77bdd5bcbb8f8eac5ad819b619da5f68
-SIZE (postfix/postfix-2.3-20050726.tar.gz) = 2504873
+MD5 (postfix/postfix-2.3-20050829.tar.gz) = b1b3818064af1f0134fac35a8a883ae9
+SIZE (postfix/postfix-2.3-20050829.tar.gz) = 2506666
diff -ruN postfix-current.orig/pkg-install postfix-current/pkg-install
--- postfix-current.orig/pkg-install	Tue Apr  5 06:56:41 2005
+++ postfix-current/pkg-install	Tue Aug 30 13:10:21 2005
@@ -34,7 +34,7 @@
 	if [ x${answer} = x ]; then
 		answer=${default}
 	fi
-	/bin/echo ${answer}
+	echo ${answer}
 }
 
 yesno() {
@@ -48,7 +48,7 @@
 			[Yy]*)	return 0;;
 			[Nn]*)	return 1;;
 		esac
-		/bin/echo "Please answer yes or no."
+		echo "Please answer yes or no."
 	done
 }
 
@@ -61,50 +61,50 @@
 	GID2=126
 
 	if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
-		/bin/echo "You already have a group \"${GROUP}\", so I will use it."
+		echo "You already have a group \"${GROUP}\", so I will use it."
 	else
 		if /usr/sbin/pw groupadd ${GROUP} -g ${GID}; then
-			/bin/echo "Added group \"${GROUP}\"."
+			echo "Added group \"${GROUP}\"."
 		else
-			/bin/echo "Adding group \"${GROUP}\" failed..."
-			/bin/echo "Please create it, and try again."
+			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
-		/bin/echo "You already have a group \"${GROUP2}\", so I will use it."
+		echo "You already have a group \"${GROUP2}\", so I will use it."
 	else
 		if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then
-			/bin/echo "Added group \"${GROUP2}\"."
+			echo "Added group \"${GROUP2}\"."
 		else
-			/bin/echo "Adding group \"${GROUP2}\" failed..."
-			/bin/echo "Please create it, and try again."
+			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
-		/bin/echo "You already have a user \"${USER}\", so I will use it."
+		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
-			/bin/echo "Added user \"${USER}\"."
+			echo "Added user \"${USER}\"."
 		else
-			/bin/echo "Adding user \"${USER}\" failed..."
-			/bin/echo "Please create it, and try again."
+			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
-		/bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
+		echo "You already have user \"${USER}\" in group \"mail\", so I will use it."
 	else
-		/bin/echo "You need user \"${USER}\" added to group \"mail\"."
+		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
-			/bin/echo "Done."
+			echo "Done."
 		else
-			/bin/echo "Please create it, and try again."
+			echo "Please create it, and try again."
 			exit 1
 		fi
 	fi
@@ -160,21 +160,21 @@
 	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
-			/bin/echo "#"						>	/etc/mail/mailer.conf
-			/bin/echo -n "# Execute the Postfix sendmail program"	>>	/etc/mail/mailer.conf
-			/bin/echo ", named ${PKG_PREFIX}/sbin/sendmail"		>>	/etc/mail/mailer.conf
-			/bin/echo "#"						>>	/etc/mail/mailer.conf
-			/bin/echo "sendmail	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-			/bin/echo "send-mail	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-			/bin/echo "mailq	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
-			/bin/echo "newaliases	${PKG_PREFIX}/sbin/sendmail"	>>	/etc/mail/mailer.conf
+			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
-			/bin/echo "Done."
+			echo "Done."
 		fi
 	fi
 fi
diff -ruN postfix-current.orig/scripts/configure.postfix postfix-current/scripts/configure.postfix
--- postfix-current.orig/scripts/configure.postfix	Fri Mar 11 18:59:28 2005
+++ postfix-current/scripts/configure.postfix	Tue Aug 30 13:07:00 2005
@@ -33,6 +33,7 @@
 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
@@ -46,10 +47,10 @@
 
 	case $retval in
 		0)	if [ -z "$*" ]; then
-				/bin/echo "Nothing selected"
+				echo "Nothing selected"
 			fi
 			;;
-		1)	/bin/echo "Cancel pressed."
+		1)	echo "Cancel pressed."
 			exit 1
 			;;
 	esac
@@ -58,22 +59,22 @@
 ${MKDIR} ${WRKDIRPREFIX}${CURDIR}
 exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 
-/bin/echo "PREFIX=	${PREFIX}"
+echo "PREFIX=	${PREFIX}"
 
 SUB_TEST="@comment "
 
 while [ "$1" ]; do
 	case $1 in
 		NOPCRE)
-			/bin/echo "WITHOUT_PCRE=	yes"
-			/bin/echo "NOPCRE_SUFFIX=	+nopcre"
+			echo "WITHOUT_PCRE=	yes"
+			echo "NOPCRE_SUFFIX=	+nopcre"
 			SUB_NOPCRE=""
 			;;
 		SASL)
-			/bin/echo "LIB_DEPENDS+=	sasl.8:\${PORTSDIR}/security/cyrus-sasl"
-			/bin/echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl -lpam -lcrypt"
-			/bin/echo "SASL_SUFFIX=		+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"
@@ -81,10 +82,10 @@
 			fi
 			;;
 		SASL2)
-			/bin/echo "LIB_DEPENDS+=	sasl2.2:\${PORTSDIR}/security/cyrus-sasl2"
-			/bin/echo "POSTFIX_CCARGS+=	-DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt"
-			/bin/echo "SASL_SUFFIX=		+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"
@@ -92,16 +93,16 @@
 			fi
 			;;
 		SASLKRB)
-			/bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
+			echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
 			;;
 		SASLKRB5)
-			/bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
+			echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
 			;;
 		TLS)
-			/bin/echo "USE_OPENSSL=	yes"
-			/bin/echo "POSTFIX_CCARGS+=	-DUSE_TLS -I\${OPENSSLINC}"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
-			/bin/echo "TLS_SUFFIX=		+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
@@ -109,10 +110,10 @@
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			/bin/echo "LIB_DEPENDS+=	db3.3:\${PORTSDIR}/databases/db3"
-			/bin/echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db3"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb3"
-			/bin/echo "DB_SUFFIX=		+db3"
+			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)
@@ -121,10 +122,10 @@
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			/bin/echo "LIB_DEPENDS+=	db4.0:\${PORTSDIR}/databases/db4"
-			/bin/echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db4"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb4"
-			/bin/echo "DB_SUFFIX=		+db40"
+			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)
@@ -133,10 +134,10 @@
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			/bin/echo "LIB_DEPENDS+=	db41.1:\${PORTSDIR}/databases/db41"
-			/bin/echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db41"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -ldb41"
-			/bin/echo "DB_SUFFIX=		+db41"
+			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)
@@ -145,10 +146,10 @@
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			/bin/echo "LIB_DEPENDS+=	db-4.2.2:\${PORTSDIR}/databases/db42"
-			/bin/echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db42"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
-			/bin/echo "DB_SUFFIX=		+db42"
+			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)
@@ -157,49 +158,55 @@
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			/bin/echo "LIB_DEPENDS+=	db-4.3.0:\${PORTSDIR}/databases/db43"
-			/bin/echo "POSTFIX_CCARGS+=	-I\${LOCALBASE}/include/db43"
-			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db43/ -ldb"
-			/bin/echo "DB_SUFFIX=		+db43"
+			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)
-			/bin/echo "USE_MYSQL=YES"
-			/bin/echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			/bin/echo "POSTFIX_AUXLIBS+= 	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
+			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
-					/bin/echo "USE_OPENSSL=	yes"
-					/bin/echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					/bin/echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+					echo "USE_OPENSSL=	yes"
+					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
+					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 				fi
 			fi
-			/bin/echo "MYSQL_SUFFIX=	+mysql"
+			echo "MYSQL_SUFFIX=	+mysql"
 			MYSQL_SELECTED="YES"
 			;;
 		PgSQL)
-			/bin/echo "USE_PGSQL=YES"
-			/bin/echo "POSTFIX_CCARGS+=	-DHAS_PGSQL -I\${LOCALBASE}/include	-I\${LOCALBASE}/pgsql/include"
-			/bin/echo "POSTFIX_AUXLIBS+= 	-L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
-			/bin/echo "PGSQL_SUFFIX=	+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)
-			/bin/echo "USE_OPENLDAP=YES"
-			/bin/echo "POSTFIX_CCARGS+=	-DHAS_LDAP -I\${LOCALBASE}/include"
- 			/bin/echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib -lldap -llber"
-			/bin/echo "OPENLDAP_SUFFIX=	+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)
-			/bin/echo "POSTFIX_CCARGS+=	-DHAS_NIS"
-			/bin/echo "NIS_SUFFIX=		+nis"
+			echo "POSTFIX_CCARGS+=	-DHAS_NIS"
+			echo "NIS_SUFFIX=		+nis"
 			;;
 		Test)
-			/bin/echo "BIN1=		smtp-sink smtp-source qmqp-source"
-#			/bin/echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
+			echo "BIN1=		smtp-sink smtp-source qmqp-source"
+#			echo "MAN1+=		smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
 			SUB_TEST=""
 			;;
 		*)
-			/bin/echo "Unknown option(s): $*" > /dev/stderr
+			echo "Unknown option(s): $*" > /dev/stderr
 			rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 			exit 1
 			;;
@@ -211,24 +218,24 @@
 	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
-			/bin/echo "USE_MYSQL=YES"
-			/bin/echo "POSTFIX_CCARGS+=	-DHAS_MYSQL -I\${LOCALBASE}/include/mysql"
-			/bin/echo "POSTFIX_AUXLIBS+= 	\${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt"
+			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
-					/bin/echo "USE_OPENSSL=	yes"
-					/bin/echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
-					/bin/echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
+					echo "USE_OPENSSL=	yes"
+					echo "POSTFIX_CCARGS+=	-I\${OPENSSLLIB}"
+					echo "POSTFIX_AUXLIBS+=	-L\${OPENSSLLIB} -lssl -lcrypto"
 				fi
 			fi
 		fi
 	fi
 fi
 
-/bin/echo "PLIST_SUB+=	SUB_TEST=\"${SUB_TEST}\""
+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.
-#/bin/echo "PKGNAMESUFFIX=	\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
+#echo "PKGNAMESUFFIX=\${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"
--- postfix-current.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508301618.j7UGIQRo014420>