CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May 21 08:12:23 UTC 2018

Modified Files:
        pkgsrc/databases/postgresql-pljava: Makefile
        pkgsrc/databases/postgresql-postgis2: Makefile buildlink3.mk
        pkgsrc/pkgtools/pkglint/files: vardefs.go
        pkgsrc/pkgtools/pkglint4/files: makevars.map

Log Message:
Removed 92 from PGSQL_VERSIONS_ACCEPTED


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/postgresql-pljava/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/databases/postgresql-postgis2/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/databases/postgresql-postgis2/buildlink3.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/pkgtools/pkglint/files/vardefs.go
cvs rdiff -u -r1.8 -r1.9 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-pljava/Makefile
diff -u pkgsrc/databases/postgresql-pljava/Makefile:1.1 pkgsrc/databases/postgresql-pljava/Makefile:1.2
--- pkgsrc/databases/postgresql-pljava/Makefile:1.1     Fri Oct 27 09:51:03 2017
+++ pkgsrc/databases/postgresql-pljava/Makefile Mon May 21 08:12:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2017/10/27 09:51:03 fhajny Exp $
+# $NetBSD: Makefile,v 1.2 2018/05/21 08:12:23 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 92
+PGSQL_VERSIONS_ACCEPTED=       95 94 93
 
 USE_JAVA2=     7
 USE_LANGUAGES= c c++

Index: pkgsrc/databases/postgresql-postgis2/Makefile
diff -u pkgsrc/databases/postgresql-postgis2/Makefile:1.42 pkgsrc/databases/postgresql-postgis2/Makefile:1.43
--- pkgsrc/databases/postgresql-postgis2/Makefile:1.42  Sun Apr 29 21:31:30 2018
+++ pkgsrc/databases/postgresql-postgis2/Makefile       Mon May 21 08:12:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2018/04/29 21:31:30 adam Exp $
+# $NetBSD: Makefile,v 1.43 2018/05/21 08:12:23 adam Exp $
 
 DISTNAME=      postgis-2.4.3
 PKGNAME=       postgresql${PGSQL_VERSION}-${DISTNAME}
@@ -28,7 +28,7 @@ CONFLICTS=            postgis-[0-9]*
 # gmake complains about adding + to parent rule
 MAKE_JOBS_SAFE=                no
 
-PGSQL_VERSIONS_ACCEPTED=       96 95 94 93 92
+PGSQL_VERSIONS_ACCEPTED=       96 95 94 93
 
 USE_GCC_RUNTIME=       yes
 USE_LANGUAGES=         c c++ c99

Index: pkgsrc/databases/postgresql-postgis2/buildlink3.mk
diff -u pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.7 pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.8
--- pkgsrc/databases/postgresql-postgis2/buildlink3.mk:1.7      Wed May 24 19:51:12 2017
+++ pkgsrc/databases/postgresql-postgis2/buildlink3.mk  Mon May 21 08:12:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2017/05/24 19:51:12 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2018/05/21 08:12:23 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 92
+PGSQL_VERSIONS_ACCEPTED=       94 93
 
 .include "../../geography/geos/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"

Index: pkgsrc/pkgtools/pkglint/files/vardefs.go
diff -u pkgsrc/pkgtools/pkglint/files/vardefs.go:1.41 pkgsrc/pkgtools/pkglint/files/vardefs.go:1.42
--- pkgsrc/pkgtools/pkglint/files/vardefs.go:1.41       Mon May 14 20:25:48 2018
+++ pkgsrc/pkgtools/pkglint/files/vardefs.go    Mon May 21 08:12:23 2018
@@ -833,7 +833,7 @@ func (src *Pkgsrc) InitVartypes() {
        pkg("PERL5_REQD", lkShell, BtVersion)
        pkg("PERL5_USE_PACKLIST", lkNone, BtYesNo)
        sys("PGSQL_PREFIX", lkNone, BtPathname)
-       acl("PGSQL_VERSIONS_ACCEPTED", lkShell, enum("92 93 94 95 96"), "")
+       acl("PGSQL_VERSIONS_ACCEPTED", lkShell, enum("10 93 94 95 96"), "")
        usr("PGSQL_VERSION_DEFAULT", lkNone, BtVersion)
        sys("PG_LIB_EXT", lkNone, enum("dylib so"))
        sys("PGSQL_TYPE", lkNone, enum("postgresql81-client postgresql80-client"))

Index: pkgsrc/pkgtools/pkglint4/files/makevars.map
diff -u pkgsrc/pkgtools/pkglint4/files/makevars.map:1.8 pkgsrc/pkgtools/pkglint4/files/makevars.map:1.9
--- pkgsrc/pkgtools/pkglint4/files/makevars.map:1.8     Mon Jan  1 10:23:04 2018
+++ pkgsrc/pkgtools/pkglint4/files/makevars.map Mon May 21 08:12:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.8 2018/01/01 10:23:04 wiz Exp $
+# $NetBSD: makevars.map,v 1.9 2018/05/21 08:12:23 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 {92 93 94 95 96}
+PGSQL_VERSIONS_ACCEPTED        List of {10 93 94 95 96}
 PGSQL_VERSION_DEFAULT  Version [$user]
 PG_LIB_EXT             { dylib so } [$system]
 PGSQL_TYPE             { postgresql81-client postgresql80-client } [$system]