CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 21 05:52:31 UTC 2019

Modified Files:
        pkgsrc/databases/postgresql-pgroonga: Makefile
        pkgsrc/databases/postgresql-pljava: Makefile
        pkgsrc/databases/postgresql-postgis2: buildlink3.mk
        pkgsrc/mk: pgsql.buildlink3.mk
        pkgsrc/pkgtools/pkglint4/files: makevars.map

Log Message:
Remove references to Postgresql 9.3


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql-pgroonga/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/postgresql-pljava/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/postgresql-postgis2/buildlink3.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/mk/pgsql.buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/pkgtools/pkglint4/files/makevars.map

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/postgresql-pgroonga/Makefile
diff -u pkgsrc/databases/postgresql-pgroonga/Makefile:1.2 pkgsrc/databases/postgresql-pgroonga/Makefile:1.3
--- pkgsrc/databases/postgresql-pgroonga/Makefile:1.2   Sun Dec  3 00:11:39 2017
+++ pkgsrc/databases/postgresql-pgroonga/Makefile       Tue May 21 05:52:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/12/03 00:11:39 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/21 05:52:31 adam Exp $
 
 DISTNAME=      pgroonga-1.2.3
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=      postgresql-license
 
 DEPENDS+=      postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server
 
-PGSQL_VERSIONS_ACCEPTED=       96 95 94 93
+PGSQL_VERSIONS_ACCEPTED=       96 95 94
 
 USE_GCC_RUNTIME=       yes
 USE_LANGUAGES=         c c++ c99

Index: pkgsrc/databases/postgresql-pljava/Makefile
diff -u pkgsrc/databases/postgresql-pljava/Makefile:1.2 pkgsrc/databases/postgresql-pljava/Makefile:1.3
--- pkgsrc/databases/postgresql-pljava/Makefile:1.2     Mon May 21 08:12:23 2018
+++ pkgsrc/databases/postgresql-pljava/Makefile Tue May 21 05:52:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/05/21 08:12:23 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/05/21 05:52:31 adam Exp $
 
 DISTNAME=      pljava-1.5.0
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
@@ -18,7 +18,7 @@ LICENSE=      modified-bsd
 DEPENDS+=      apache-maven-[0-9]*:../../devel/apache-maven
 DEPENDS+=      postgresql${PGSQL_VERSION}-server>=0:../../databases/postgresql${PGSQL_VERSION}-server
 
-PGSQL_VERSIONS_ACCEPTED=       95 94 93
+PGSQL_VERSIONS_ACCEPTED=       95 94
 
 USE_JAVA2=     7
 USE_LANGUAGES= c c++

Index: pkgsrc/databases/postgresql-postgis2/buildlink3.mk
diff -u pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.8 pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.9
--- pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.8      Mon May 21 08:12:23 2018
+++ pkgsrc/databases/postgresql-postgis2/buildlink3.mk  Tue May 21 05:52:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2018/05/21 08:12:23 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2019/05/21 05:52:31 adam Exp $
 
 BUILDLINK_TREE+=       postgresql-postgis
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.postgresql-postgis
 BUILDLINK_ABI_DEPENDS.postgresql-postgis?=     postgresql${PGSQL_VERSION}-postgis>=2.2.2nb3
 BUILDLINK_PKGSRCDIR.postgresql-postgis?=       ../../databases/postgresql-postgis2
 
-PGSQL_VERSIONS_ACCEPTED=       94 93
+PGSQL_VERSIONS_ACCEPTED=       10 96 95 94
 
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"

Index: pkgsrc/mk/pgsql.buildlink3.mk
diff -u pkgsrc/mk/pgsql.buildlink3.mk:1.48 pkgsrc/mk/pgsql.buildlink3.mk:1.49
--- pkgsrc/mk/pgsql.buildlink3.mk:1.48  Tue Oct 23 16:02:51 2018
+++ pkgsrc/mk/pgsql.buildlink3.mk       Tue May 21 05:52:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.48 2018/10/23 16:02:51 adam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.49 2019/05/21 05:52:31 adam Exp $
 #
 # User-settable variables:
 #
@@ -25,7 +25,7 @@ _SYS_VARS.pgsql=      PG_LIB_EXT PGSQL_TYPE P
 .include "../../mk/bsd.prefs.mk"
 
 PGSQL_VERSION_DEFAULT?=                95
-PGSQL_VERSIONS_ACCEPTED?=      11 10 96 95 94 93
+PGSQL_VERSIONS_ACCEPTED?=      11 10 96 95 94
 
 # transform the list into individual variables
 .for pv in ${PGSQL_VERSIONS_ACCEPTED}
@@ -55,9 +55,6 @@ _PGSQL_VERSION_95_INSTALLED=  yes
 .  if exists(${LOCALBASE}/lib/libecpg.6.6.dylib)
 _PGSQL_VERSION_94_INSTALLED=   yes
 .  endif
-.  if exists(${LOCALBASE}/lib/libecpg.6.5.dylib)
-_PGSQL_VERSION_93_INSTALLED=   yes
-.  endif
 .else
 .  if exists(${LOCALBASE}/lib/libecpg.so.6.11)
 _PGSQL_VERSION_11_INSTALLED=   yes
@@ -74,9 +71,6 @@ _PGSQL_VERSION_95_INSTALLED=  yes
 .  if exists(${LOCALBASE}/lib/libecpg.so.6.6)
 _PGSQL_VERSION_94_INSTALLED=   yes
 .  endif
-.  if exists(${LOCALBASE}/lib/libecpg.so.6.5)
-_PGSQL_VERSION_93_INSTALLED=   yes
-.  endif
 .endif
 
 # if a version is explicitely required, take it
@@ -129,9 +123,6 @@ PGPKGSRCDIR=        ../../databases/postgresql9
 .elif ${_PGSQL_VERSION} == "94"
 PGSQL_TYPE=    postgresql94-client
 PGPKGSRCDIR=   ../../databases/postgresql94-client
-.elif ${_PGSQL_VERSION} == "93"
-PGSQL_TYPE=    postgresql93-client
-PGPKGSRCDIR=   ../../databases/postgresql93-client
 .else
 # force an error
 PGSQL_TYPE=            none

Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.10 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.11
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.10    Thu May  2 08:36:10 2019
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Tue May 21 05:52:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.10 2019/05/02 08:36:10 wiz Exp $
+# $NetBSD: makevars.map,v 1.11 2019/05/21 05:52:31 adam Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -544,7 +544,7 @@ PERL5_USE_PACKLIST  YesNo [$package]
 PERL5_PACKLIST         List of Perl5Packlist [m:s,o:sa]
 PERL5_PACKLIST_DIR     Pathname []
 PGSQL_PREFIX           Pathname [$system]
-PGSQL_VERSIONS_ACCEPTED        List of {10 93 94 95 96}
+PGSQL_VERSIONS_ACCEPTED        List of {11 10 94 95 96}
 PGSQL_VERSION_DEFAULT  Version [$user]
 PG_LIB_EXT             { dylib so } [$system]
 PGSQL_TYPE             { postgresql81-client postgresql80-client } [$system]