- 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>

3 files changed, 14 insertions, 15 deletions

diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 92bdb62e207d..16b46da8d470 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/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/databases/postgresql91-server/pkg-descr b/databases/postgresql91-server/pkg-descr
index f8f8a9e0d422..99641bd6dd1f 100644
--- a/databases/postgresql91-server/pkg-descr
+++ b/databases/postgresql91-server/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/databases/postgresql91-server/pkg-plist b/databases/postgresql91-server/pkg-plist
deleted file mode 100644
index 9c9bab36b9f8..000000000000
--- a/databases/postgresql91-server/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-@comment to make portlint happy