From mm@neo.vx.sk  Thu Sep 22 17:07:06 2011
Return-Path: <mm@neo.vx.sk>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F2637106564A;
	Thu, 22 Sep 2011 17:07:05 +0000 (UTC)
	(envelope-from mm@neo.vx.sk)
Received: from neo.vx.sk (neo.vx.sk [188.40.111.84])
	by mx1.freebsd.org (Postfix) with ESMTP id 9004C8FC19;
	Thu, 22 Sep 2011 17:07:05 +0000 (UTC)
Received: from neo.vx.sk (localhost [127.0.0.1])
	by neo.vx.sk (Postfix) with ESMTP id CC758B526;
	Thu, 22 Sep 2011 18:58:52 +0200 (CEST)
Received: (from mm@localhost)
	by neo.vx.sk (8.14.5/8.14.5/Submit) id p8MGwqKF084565;
	Thu, 22 Sep 2011 18:58:52 +0200 (CEST)
	(envelope-from mm)
Message-Id: <201109221658.p8MGwqKF084565@neo.vx.sk>
Date: Thu, 22 Sep 2011 18:58:52 +0200 (CEST)
From: Martin Matuska <mm@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: girgen@freebsd.org
Subject: [PATCH] databases/postgresql-server: add SSL option
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         160914
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql90-server: add SSL option
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    girgen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 22 17:10:05 UTC 2011
>Closed-Date:    Thu Oct 06 11:33:39 UTC 2011
>Last-Modified:  Thu Oct 06 11:33:39 UTC 2011
>Originator:     Martin Matuska
>Release:        FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.0-BETA2 FreeBSD 9.0-BETA2 #9 r225689: Tue Sep 20 10:30:04 CEST
>Description:
- Add SSL to OPTIONS
- Make portlint happier
- Fix typo

Port maintainer (girgen@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- postgresql-server-9.0.4_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql90-server/Makefile,v
retrieving revision 1.222
diff -u -r1.222 Makefile
--- Makefile	15 Aug 2011 14:52:31 -0000	1.222
+++ Makefile	22 Sep 2011 16:58:57 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	9.0.4
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -73,18 +73,6 @@
 CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
 .endif
 
-# Cannot check this with standard OPTION due to a catch-22.
-# USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
-# what OPTIONS are set.
-#
-# If you *don't* want SSL, set WITHOUT_SSL=YES when making
-.if !defined(WITHOUT_SSL)
-USE_OPENSSL=	yes
-CONFIGURE_ARGS+=--with-openssl
-.endif
-
-.include <bsd.port.pre.mk>
-
 .if !defined(SLAVE_ONLY)
 OPTIONS+=	DTRACE "Build with DTrace probes (server only)" off
 OPTIONS+=	PAM "Build with PAM support (server only)" off
@@ -95,7 +83,7 @@
 OPTIONS+=	XML "Build with XML data type (server)" on
 OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
-OPTIONS+=	GSSAPI "BUild with GSSAPI support" off
+OPTIONS+=	GSSAPI "Build with GSSAPI support" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
 OPTIONS+=	ICU	"Use ICU for unicode collation (server)" off
@@ -103,7 +91,17 @@
 # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
 # (requires dump/restore if modified.)
 OPTIONS+=	INTDATE "Builds with 64-bit date/time type (server)" on
+.endif
+OPTIONS+=	SSL "Build with OpenSSL support" on
+
+.include <bsd.port.options.mk>
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
+.endif
+
+.if !defined(SLAVE_ONLY)
 .  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=--with-icu
@@ -113,6 +111,8 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
 .  endif
 
+.include <bsd.port.pre.mk>
+
 PATCH_DIST_STRIP=-p1
 
 .  if defined(WITH_DTRACE)
@@ -178,7 +178,7 @@
 
 .  if defined(WITH_MIT_KRB5)
 .    if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)
-BROKEN=		"You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB"
+BROKEN=		You must remove heimdal's /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB
 .    endif
 # Allow defining a home built MIT Kerberos by setting KRB5_HOME
 .    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
@@ -313,12 +313,12 @@
 PKGMESSAGE=	${WRKSRC}/pkg-message${PKGNAMESUFFIX}
 .  endif
 .  if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in)
-SUB_FILES+=     pkg-install${PKGNAMESUFFIX}
-SUB_LIST=       PG_GROUP=$(PG_GROUP) \
-                PG_USER=$(PG_USER) \
-                PG_UID=$(PG_UID)
-PLIST_SUB+=     PG_USER=$(PG_USER)
-PKGINSTALL=     ${WRKDIR}/pkg-install${PKGNAMESUFFIX}
+SUB_FILES+=	pkg-install${PKGNAMESUFFIX}
+SUB_LIST=	PG_GROUP=${PG_GROUP} \
+		PG_USER=${PG_USER} \
+		PG_UID=${PG_UID}
+PLIST_SUB+=	PG_USER=${PG_USER}
+PKGINSTALL=	${WRKDIR}/pkg-install${PKGNAMESUFFIX}
 .  endif
 .endif
 
--- postgresql-server-9.0.4_3.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->girgen 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Thu Sep 22 17:24:07 UTC 2011 
Responsible-Changed-Why:  
Fix synopsis and assign. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160914 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160914: commit references a PR
Date: Thu,  6 Oct 2011 08:45:33 +0000 (UTC)

 mm          2011-10-06 08:45:16 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/postgresql90-server Makefile 
   Log:
   - Add SSL to OPTIONS
   - Make portlint happier
   - Fix typo
   
   PR:             ports/160914
   Approved by:    maintainer (timeout)
   
   Revision  Changes    Path
   1.226     +21 -20    ports/databases/postgresql90-server/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: mm 
State-Changed-When: Thu Oct 6 11:33:34 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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