From khera@kcilink.com  Mon Feb  7 16:27:40 2005
Return-Path: <khera@kcilink.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F110E16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Feb 2005 16:27:40 +0000 (GMT)
Received: from yertle.kcilink.com (yertle.kcilink.com [65.205.34.180])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 69C8A43D41
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  7 Feb 2005 16:27:40 +0000 (GMT)
	(envelope-from khera@kcilink.com)
Received: by yertle.kcilink.com (Postfix, from userid 100)
	id F0ED1B833; Mon,  7 Feb 2005 11:27:39 -0500 (EST)
Message-Id: <20050207162739.F0ED1B833@yertle.kcilink.com>
Date: Mon,  7 Feb 2005 11:27:39 -0500 (EST)
From: Vivek Khera <vivek@khera.org>
Reply-To: Vivek Khera <vivek@khera.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: fix mail/postfix for Postgres port changes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77216
>Category:       ports
>Synopsis:       fix mail/postfix for Postgres port changes
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 07 16:30:17 GMT 2005
>Closed-Date:    Tue Feb 08 13:51:39 GMT 2005
>Last-Modified:  Tue Feb 08 13:51:39 GMT 2005
>Originator:     Vivek Khera
>Release:        FreeBSD 5.3-STABLE amd64
>Organization:
>Environment:
System: FreeBSD yertle.int.kciLink.com 5.3-STABLE FreeBSD 5.3-STABLE #0: Fri Jan 7 16:42:37 EST 2005 khera@yertle.int.kciLink.com:/usr/obj/usr/src/sys/YERTLE amd64


	
>Description:
	

postfix' optional postgres support doesn't work with the new Postgres port
configuration.  this patchf fixes that

>How-To-Repeat:
	
>Fix:

	


diff -Pru postfix/scripts/configure.postfix postfix.new/scripts/configure.postfix
--- postfix/scripts/configure.postfix	Tue Nov 30 10:54:28 2004
+++ postfix.new/scripts/configure.postfix	Mon Feb  7 11:19:56 2005
@@ -33,9 +33,7 @@
 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" \
 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" \
+PgSQL		"PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \
 OpenLDAP	"OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
 VDA		"VDA (Virtual Delivery Agent)" "$status_VDA" \
 Test		"SMTP/LMTP test server and generator" "$status_Test" \
@@ -176,22 +174,7 @@
 			echo "MYSQL_SUFFIX=	+mysql"
 			;;
 		PgSQL)
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			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"
-			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 "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"
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Tue Feb 8 13:51:38 GMT 2005 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77216 
>Unformatted:
