From nobody@FreeBSD.org  Tue Oct 25 10:01:49 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B79A8106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 25 Oct 2011 10:01:49 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 9DD108FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 25 Oct 2011 10:01:49 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p9PA1nuj071356
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 25 Oct 2011 10:01:49 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p9PA1nMK071354;
	Tue, 25 Oct 2011 10:01:49 GMT
	(envelope-from nobody)
Message-Id: <201110251001.p9PA1nMK071354@red.freebsd.org>
Date: Tue, 25 Oct 2011 10:01:49 GMT
From: Ruslan Mahmatkhanov <cvs-src@yandex.ru>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] databases/postgresql91-server: cleanup
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         161987
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql91-server: cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 25 10:10:01 UTC 2011
>Closed-Date:    Sat Oct 29 10:11:25 UTC 2011
>Last-Modified:  Sat Oct 29 10:20:08 UTC 2011
>Originator:     Ruslan Mahmatkhanov
>Release:        10.0-CURRENT
>Organization:
>Environment:
10.0-CURRENT i386
>Description:
- do not conflict with postgresql 7.x (we don't have them in a tree anymore)
- remove not-supported FreeBSD versions
- whitespace fixes in pkg-descr
- remove empty pkg-plist (portlint doesn't seems care)
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/Makefile b/Makefile
index 1ddce31..8d0e94d 100644
--- a/Makefile
+++ b/Makefile
@@ -16,9 +16,9 @@ PKGNAMESUFFIX?=	-server
 MAINTAINER?=	girgen@FreeBSD.org
 COMMENT?=	The most advanced open-source database available anywhere
 
-CONFLICTS?=	${PORTNAME}-client-[78]* \
+CONFLICTS?=	${PORTNAME}-client-8* \
 		${PORTNAME}-client-9.[02-9]* \
-		${PORTNAME}${PKGNAMESUFFIX}-[78]* \
+		${PORTNAME}${PKGNAMESUFFIX}-8* \
 		${PORTNAME}${PKGNAMESUFFIX}-9.[02-9]
 
 WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
@@ -178,7 +178,7 @@ INSTALL_TARGET=	install
 INSTALL_TARGET=	install-strip
 .  endif
 
-.if (${OSVERSION} >= 700000) && !defined(WITHOUT_GSSAPI)
+.if !defined(WITHOUT_GSSAPI)
 CONFIGURE_ARGS+=--with-gssapi
 .if !defined(WITH_MIT_KRB5) && !defined(WITH_HEIMDAL_KRB5)
 # Kerberos libraries will pull the proper GSSAPI library
diff --git a/pkg-descr b/pkg-descr
index f8f8a9e..99641bd 100644
--- a/pkg-descr
+++ b/pkg-descr
@@ -3,19 +3,19 @@ almost all SQL constructs, including subselects, transactions, and
 user-defined types and functions. It is the most advanced open-source
 database available anywhere. Commercial Support is also available.
 
-The original Postgres code was the effort of many graduate students, 
-undergraduate students, and staff programmers working under the direction of 
-Professor Michael Stonebraker at the University of California, Berkeley. In 
-1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query 
-language to SQL and created a new database system which came to known as 
-Postgres95. Many others contributed to the porting, testing, debugging and 
-enhancement of the Postgres95 code. As the code improved, and 1995 faded into 
+The original Postgres code was the effort of many graduate students,
+undergraduate students, and staff programmers working under the direction of
+Professor Michael Stonebraker at the University of California, Berkeley. In
+1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
+language to SQL and created a new database system which came to known as
+Postgres95. Many others contributed to the porting, testing, debugging and
+enhancement of the Postgres95 code. As the code improved, and 1995 faded into
 memory, PostgreSQL was born.
 
-PostgreSQL development is presently being performed by a team of Internet 
-developers who are now responsible for all current and future development. The 
-development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG). 
-Support is available from the PostgreSQL developer/user community through the 
+PostgreSQL development is presently being performed by a team of Internet
+developers who are now responsible for all current and future development. The
+development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
+Support is available from the PostgreSQL developer/user community through the
 support mailing list (questions@PostgreSQL.ORG).
 
 PostgreSQL is free and the complete source is available.
diff --git a/pkg-plist b/pkg-plist
deleted file mode 100644
index 9c9bab3..0000000
--- a/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment to make portlint happy


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->girgen 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Oct 25 10:10:14 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161987 
Responsible-Changed-From-To: girgen->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sat Oct 29 10:09:08 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=161987 
State-Changed-From-To: open->closed 
State-Changed-By: crees 
State-Changed-When: Sat Oct 29 10:11:23 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/161987: commit references a PR
Date: Sat, 29 Oct 2011 10:11:19 +0000 (UTC)

 crees       2011-10-29 10:11:05 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/postgresql91-server Makefile pkg-descr 
   Removed files:
     databases/postgresql91-server pkg-plist 
   Log:
   - do not conflict with postgresql 7.x (we don't have them in a tree anymore)
   - remove not-supported FreeBSD versions
   - whitespace fixes in pkg-descr
   - remove empty pkg-plist (portlint doesn't seems care)
   
   PR:             ports/161987
   Submitted by:   Ruslan Mahmatkhanov <cvs-src@yandex.ru>
   
   Revision  Changes    Path
   1.232     +3 -3      ports/databases/postgresql91-server/Makefile
   1.13      +11 -11    ports/databases/postgresql91-server/pkg-descr
   1.45      +0 -1      ports/databases/postgresql91-server/pkg-plist (dead)
 _______________________________________________
 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"
 
>Unformatted:
