Wed Aug 2 01:15:00 2023 UTC ()
postgresql-postgis2: reset PKGREVISION after update


(wiz)
diff -r1.131 -r1.132 pkgsrc/databases/postgresql-postgis2/Makefile
cvs diff -r1.131 -r1.132 pkgsrc/databases/postgresql-postgis2/Makefile (switch to unified diff)

--- pkgsrc/databases/postgresql-postgis2/Makefile 2023/08/02 01:00:46 1.131
+++ pkgsrc/databases/postgresql-postgis2/Makefile 2023/08/02 01:15:00 1.132
@@ -1,108 +1,107 @@ @@ -1,108 +1,107 @@
1# $NetBSD: Makefile,v 1.131 2023/08/02 01:00:46 gdt Exp $ 1# $NetBSD: Makefile,v 1.132 2023/08/02 01:15:00 wiz Exp $
2 2
3# Note that the directory is still postgis2, for historical reasons. 3# Note that the directory is still postgis2, for historical reasons.
4# It remains, due to inertia and the pain of renaming outweighing the 4# It remains, due to inertia and the pain of renaming outweighing the
5# benefit. So far it looks more likely than not that postgis will not 5# benefit. So far it looks more likely than not that postgis will not
6# need to be versioned again soon. 6# need to be versioned again soon.
7MAJOR= 3.3 7MAJOR= 3.3
8DISTNAME= postgis-${MAJOR}.4 8DISTNAME= postgis-${MAJOR}.4
9PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME} 9PKGNAME= postgresql${PGSQL_VERSION}-${DISTNAME}
10PKGREVISION= 1 
11CATEGORIES= databases geography 10CATEGORIES= databases geography
12MASTER_SITES= https://download.osgeo.org/postgis/source/ 11MASTER_SITES= https://download.osgeo.org/postgis/source/
13 12
14MAINTAINER= gdt@NetBSD.org 13MAINTAINER= gdt@NetBSD.org
15HOMEPAGE= https://postgis.net/ 14HOMEPAGE= https://postgis.net/
16COMMENT= Spatial database capabilities for PostgreSQL 15COMMENT= Spatial database capabilities for PostgreSQL
17 16
18LICENSE= gnu-gpl-v2 17LICENSE= gnu-gpl-v2
19 18
20DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server 19DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
21 20
22TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 21TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
23 22
24CONFLICTS= postgis-[0-9]* 23CONFLICTS= postgis-[0-9]*
25 24
26# TODO section 25# TODO section
27# 1. Fix installation use of "install -o root" from pgxs.mk, when postgresql 26# 1. Fix installation use of "install -o root" from pgxs.mk, when postgresql
28# was built as root and postgis is built/installed as a non-root user. 27# was built as root and postgis is built/installed as a non-root user.
29# https://lists.osgeo.org/pipermail/postgis-devel/2015-July/025045.html 28# https://lists.osgeo.org/pipermail/postgis-devel/2015-July/025045.html
30# 2. Recheck and fix or file upstream about MAKE_JOBS_SAFE. 29# 2. Recheck and fix or file upstream about MAKE_JOBS_SAFE.
31# 3. Check 2nd make, and file bug about anything that happens. Check xsltproc 30# 3. Check 2nd make, and file bug about anything that happens. Check xsltproc
32# in particular. 31# in particular.
33 32
34# gmake complains about adding + to parent rule 33# gmake complains about adding + to parent rule
35MAKE_JOBS_SAFE= no 34MAKE_JOBS_SAFE= no
36 35
37USE_GCC_RUNTIME= yes 36USE_GCC_RUNTIME= yes
38USE_LANGUAGES= c c++ c99 37USE_LANGUAGES= c c++ c99
39USE_LIBTOOL= yes 38USE_LIBTOOL= yes
40USE_TOOLS+= gmake lex pax perl pkg-config 39USE_TOOLS+= gmake lex pax perl pkg-config
41GNU_CONFIGURE= yes 40GNU_CONFIGURE= yes
42CONFIGURE_ARGS+= --enable-rpath 41CONFIGURE_ARGS+= --enable-rpath
43CONFIGURE_ARGS+= --datadir=${PREFIX}/share/postgresql/contrib 42CONFIGURE_ARGS+= --datadir=${PREFIX}/share/postgresql/contrib
44# Documented requirement is pgsql >= 11 43# Documented requirement is pgsql >= 11
45PGSQL_VERSIONS_ACCEPTED= 14 13 12 11 44PGSQL_VERSIONS_ACCEPTED= 14 13 12 11
46 45
47# This isn't an option, but could be. 46# This isn't an option, but could be.
48CONFIGURE_ARGS+= --with-address-standardizer 47CONFIGURE_ARGS+= --with-address-standardizer
49 48
50# \todo Add sfcgal >=1.3.2 https://gitlab.com/Oslandia/SFCGAL 49# \todo Add sfcgal >=1.3.2 https://gitlab.com/Oslandia/SFCGAL
51# and CGAL >=4.1. 50# and CGAL >=4.1.
52 51
53BUILD_TARGET= all docs 52BUILD_TARGET= all docs
54INSTALL_TARGET= install docs-install 53INSTALL_TARGET= install docs-install
55 54
56DOCDIR= ${PREFIX}/share/doc/postgis 55DOCDIR= ${PREFIX}/share/doc/postgis
57 56
58PLIST_SUBST+= MAJOR=${MAJOR} 57PLIST_SUBST+= MAJOR=${MAJOR}
59PRINT_PLIST_AWK+= { gsub(/postgis-${MAJOR:S|/|\\/|g}/, "postgis-$${MAJOR}") } 58PRINT_PLIST_AWK+= { gsub(/postgis-${MAJOR:S|/|\\/|g}/, "postgis-$${MAJOR}") }
60PRINT_PLIST_AWK+= { gsub(/topology-${MAJOR:S|/|\\/|g}/, "topology-$${MAJOR}") } 59PRINT_PLIST_AWK+= { gsub(/topology-${MAJOR:S|/|\\/|g}/, "topology-$${MAJOR}") }
61 60
62# \todo Remove or file bugs upstream 61# \todo Remove or file bugs upstream
63INSTALLATION_DIRS= ${DOCDIR} ${DOCDIR}/images ${PKGMANDIR}/man1 62INSTALLATION_DIRS= ${DOCDIR} ${DOCDIR}/images ${PKGMANDIR}/man1
64 63
65REPLACE_PERL+= utils/postgis_restore.pl.in 64REPLACE_PERL+= utils/postgis_restore.pl.in
66REPLACE_PERL+= utils/create_spatial_ref_sys_config_dump.pl 65REPLACE_PERL+= utils/create_spatial_ref_sys_config_dump.pl
67#MAKE_ENV+= PERL5=${PERL5:Q} 66#MAKE_ENV+= PERL5=${PERL5:Q}
68 67
69INSTALL_ENV+= mkinstalldirs=${INSTALL_DATA_DIR:Q} 68INSTALL_ENV+= mkinstalldirs=${INSTALL_DATA_DIR:Q}
70 69
71TEST_TARGET= check 70TEST_TARGET= check
72# https://trac.osgeo.org/postgis/wiki/DevWikiGettingABackTrace#Usingwithregressiontests 71# https://trac.osgeo.org/postgis/wiki/DevWikiGettingABackTrace#Usingwithregressiontests
73 72
74# TEST_DEPENDS 73# TEST_DEPENDS
75.include "../../devel/cunit/buildlink3.mk" 74.include "../../devel/cunit/buildlink3.mk"
76 75
77# DOC DEPENDS 76# DOC DEPENDS
78CONFIGURE_ARGS+= -with-xsldir=${PREFIX}/share/xsl/docbook 77CONFIGURE_ARGS+= -with-xsldir=${PREFIX}/share/xsl/docbook
79# By default xsltproc downloads DTDs. postgis tells it not to, but 78# By default xsltproc downloads DTDs. postgis tells it not to, but
80# the dependencies are not packaged. The timing option, not needed, 79# the dependencies are not packaged. The timing option, not needed,
81# is to make the variable non-empty, to work around a 80# is to make the variable non-empty, to work around a
82# defined/non-empty incorrect test in postgis. 81# defined/non-empty incorrect test in postgis.
83MAKE_ENV+= "XSLTPROCFLAGS=--timing" 82MAKE_ENV+= "XSLTPROCFLAGS=--timing"
84 83
85# These are really all TOOL_DEPENDS. 84# These are really all TOOL_DEPENDS.
86# \todo Report upstream; they are not mentioned in README.postgis. 85# \todo Report upstream; they are not mentioned in README.postgis.
87.include "../../graphics/ImageMagick/buildlink3.mk" 86.include "../../graphics/ImageMagick/buildlink3.mk"
88.include "../../textproc/libxslt/buildlink3.mk" 87.include "../../textproc/libxslt/buildlink3.mk"
89 88
90# address standardizer (separate for possible future option) 89# address standardizer (separate for possible future option)
91.include "../../devel/pcre2/buildlink3.mk" 90.include "../../devel/pcre2/buildlink3.mk"
92 91
93# MISSING DEPEENDS 92# MISSING DEPEENDS
94# "GNU gettext 0.14" for the loader 93# "GNU gettext 0.14" for the loader
95 94
96# OMITTED DEPENDS 95# OMITTED DEPENDS
97# gtk 2.2.0, for GUI version of shp2pgsql 96# gtk 2.2.0, for GUI version of shp2pgsql
98 97
99# NORMAL DEPENDS 98# NORMAL DEPENDS
100.include "../../devel/protobuf-c/buildlink3.mk" 99.include "../../devel/protobuf-c/buildlink3.mk"
101.include "../../geography/gdal-lib/buildlink3.mk" 100.include "../../geography/gdal-lib/buildlink3.mk"
102.include "../../geography/geos/buildlink3.mk" 101.include "../../geography/geos/buildlink3.mk"
103.include "../../geography/proj/buildlink3.mk" 102.include "../../geography/proj/buildlink3.mk"
104.include "../../textproc/json-c/buildlink3.mk" 103.include "../../textproc/json-c/buildlink3.mk"
105.include "../../textproc/libxml2/buildlink3.mk" 104.include "../../textproc/libxml2/buildlink3.mk"
106.include "../../mk/pgsql.buildlink3.mk" 105.include "../../mk/pgsql.buildlink3.mk"
107.include "../../mk/pthread.buildlink3.mk" 106.include "../../mk/pthread.buildlink3.mk"
108.include "../../mk/bsd.pkg.mk" 107.include "../../mk/bsd.pkg.mk"