Attachment #51502 for bug #78205

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	PORTVERSIONRAW= 2.2-20050218	18	PORTVERSIONRAW= 2.2-20050227
19	PORTVERSION= ${PORTVERSIONRAW:S/-/./}	19	PORTVERSION= ${PORTVERSIONRAW:S/-/./}
20	PORTEPOCH= 2	20	PORTEPOCH= 2
21	CATEGORIES= mail ipv6	21	CATEGORIES= mail ipv6

Lines 1-2 Link Here

(-)postfix-current/distinfo (-2 / +2 lines)
1	MD5 (postfix/postfix-2.2-20050218.tar.gz) = 5b41c917635ec61e29731bc9cea07a96	1	MD5 (postfix/postfix-2.2-20050227.tar.gz) = 10b9b8d39464abae33e9fe480635af3a
2	SIZE (postfix/postfix-2.2-20050218.tar.gz) = 2401756	2	SIZE (postfix/postfix-2.2-20050227.tar.gz) = 2402536

Lines 81-86 Link Here

(-)postfix-current/pkg-plist (+1 lines)
81	%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html	81	%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html
82	%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README	82	%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README
83	%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html	83	%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html
		84	%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html
84	%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README	85	%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README
85	%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html	86	%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html
86	%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html	87	%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html




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" \
DB42		"Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
DB43		"Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
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" \

			;;
		DB3)
			if [ "X$BDB_SELECTED" != "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi

			;;
		DB40)
			if [ "X$BDB_SELECTED" != "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi

			;;
		DB41)
			if [ "X$BDB_SELECTED" != "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi

			;;
		DB42)
			if [ "X$BDB_SELECTED" != "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
				exit 1
			fi

			echo "POSTFIX_AUXLIBS+=	-L\${LOCALBASE}/lib/db42/ -ldb"
			echo "DB_SUFFIX=	+db42"
			BDB_SELECTED="42"
			;;
		DB43)
			if [ "X$BDB_SELECTED" != "X" ]; then
				/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
				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"

Return to bug 78205

Lines 29-34 Link Here

(-)postfix-current/scripts/configure.postfix (-4 / +17 lines)
29	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" \
30	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" \
31	DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \	31	DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
		32	DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \
32	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" \
33	PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \	34	PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
34	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" \
Lines 110-116 Link Here
110	;;	111	;;
111	DB3)	112	DB3)
112	if [ "X$BDB_SELECTED" != "X" ]; then	113	if [ "X$BDB_SELECTED" != "X" ]; then
113	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr	114	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
114	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	115	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
115	exit 1	116	exit 1
116	fi	117	fi
Lines 122-128 Link Here
122	;;	123	;;
123	DB40)	124	DB40)
124	if [ "X$BDB_SELECTED" != "X" ]; then	125	if [ "X$BDB_SELECTED" != "X" ]; then
125	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr	126	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
126	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	127	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
127	exit 1	128	exit 1
128	fi	129	fi
Lines 134-140 Link Here
134	;;	135	;;
135	DB41)	136	DB41)
136	if [ "X$BDB_SELECTED" != "X" ]; then	137	if [ "X$BDB_SELECTED" != "X" ]; then
137	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr	138	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
138	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	139	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
139	exit 1	140	exit 1
140	fi	141	fi
Lines 146-152 Link Here
146	;;	147	;;
147	DB42)	148	DB42)
148	if [ "X$BDB_SELECTED" != "X" ]; then	149	if [ "X$BDB_SELECTED" != "X" ]; then
149	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41 and DB42 options." 5 60 > /dev/stderr	150	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
150	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc	151	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
151	exit 1	152	exit 1
152	fi	153	fi
Lines 155-160 Link Here
155	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"	156	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb"
156	echo "DB_SUFFIX= +db42"	157	echo "DB_SUFFIX= +db42"
157	BDB_SELECTED="42"	158	BDB_SELECTED="42"
		159	;;
		160	DB43)
		161	if [ "X$BDB_SELECTED" != "X" ]; then
		162	/usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr
		163	rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
		164	exit 1
		165	fi
		166	echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43"
		167	echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43"
		168	echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb"
		169	echo "DB_SUFFIX= +db43"
		170	BDB_SELECTED="43"
158	;;	171	;;
159	MySQL)	172	MySQL)
160	echo "USE_MYSQL=YES"	173	echo "USE_MYSQL=YES"