Attachment #214271 for bug #246304

Lines 2-9 Link Here

(-)graphics/gdal/Makefile (-7 / +12 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gdal	4	PORTNAME= gdal
5	PORTVERSION= 3.0.4	5	PORTVERSION= 3.1.0
6	PORTREVISION= 4
7	CATEGORIES= graphics geography	6	CATEGORIES= graphics geography
8	MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \	7	MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \
9	LOCAL/sunpoet	8	LOCAL/sunpoet
Lines 21-39 Link Here
21	libjson-c.so:devel/json-c \	20	libjson-c.so:devel/json-c \
22	libpng.so:graphics/png \	21	libpng.so:graphics/png \
23	libproj.so:graphics/proj \	22	libproj.so:graphics/proj \
24	libtiff.so:graphics/tiff	23	libtiff.so:graphics/tiff \
		24	libqhull.so:math/qhull
25		25
		26	USES= compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
		27
26	OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \	28	OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \
27	KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL \	29	KML LIBXML2 MYSQL NETCDF ODBC OPENJPEG PCRE PGSQL SFCGAL \
28	SPATIALITE SQLITE WEBP XERCES ZSTD	30	SPATIALITE SQLITE WEBP XERCES ZSTD
29	OPTIONS_DEFAULT=JASPER	31	OPTIONS_DEFAULT= CURL EXPAT FREEXL GEOS HDF5 JASPER \
		32	KML LIBXML2 NETCDF OPENJPEG PCRE PGSQL SFCGAL \
		33	SPATIALITE SQLITE WEBP XERCES ZSTD POPPLER
30	OPTIONS_RADIO= PDF	34	OPTIONS_RADIO= PDF
31	OPTIONS_RADIO_PDF= PODOFO POPPLER	35	OPTIONS_RADIO_PDF= PODOFO POPPLER
32	OPTIONS_SUB= yes	36	OPTIONS_SUB= yes
33	PCRE_DESC= Regular expression support for SQLite	37	PCRE_DESC= Regular expression support for SQLite
34		38
35	USES= compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
36
37	CFLAGS+= -fPIC	39	CFLAGS+= -fPIC
38	CONFIGURE_ARGS= --datadir=${DATADIR} \	40	CONFIGURE_ARGS= --datadir=${DATADIR} \
39	--enable-static=yes \	41	--enable-static=yes \
Lines 49-54 Link Here
49	--with-proj=yes \	51	--with-proj=yes \
50	--with-threads=yes \	52	--with-threads=yes \
51	--without-libtool \	53	--without-libtool \
		54	--with-qhull=yes \
		55	--with-bash-completion=yes \
52	${ICONV_CONFIGURE_ARG}	56	${ICONV_CONFIGURE_ARG}
53	GNU_CONFIGURE= yes	57	GNU_CONFIGURE= yes
54	LDFLAGS+= ${ICONV_LIB}	58	LDFLAGS+= ${ICONV_LIB}
Lines 102-108 Link Here
102	KML_CONFIGURE_WITH= libkml	106	KML_CONFIGURE_WITH= libkml
103	KML_LIB_DEPENDS= libkmlbase.so:science/libkml	107	KML_LIB_DEPENDS= libkmlbase.so:science/libkml
104	LIBXML2_CONFIGURE_OFF= --with-xml2=no	108	LIBXML2_CONFIGURE_OFF= --with-xml2=no
105	LIBXML2_CONFIGURE_ON= --with-xml2=${LOCALBASE}/bin/xml2-config
106	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2	109	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
107	MYSQL_CONFIGURE_OFF= --with-mysql=no	110	MYSQL_CONFIGURE_OFF= --with-mysql=no
108	MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config	111	MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
Lines 140-145 Link Here
140	@${REINPLACE_CMD} -e 's\|$$(INST_LIB)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|; s\| LICENSE.TXT\|\|' ${WRKSRC}/GNUmakefile	143	@${REINPLACE_CMD} -e 's\|$$(INST_LIB)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|; s\| LICENSE.TXT\|\|' ${WRKSRC}/GNUmakefile
141	@${REINPLACE_CMD} -e 's\|-lminizip\|-lkmlminizip\|' ${WRKSRC}/configure	144	@${REINPLACE_CMD} -e 's\|-lminizip\|-lkmlminizip\|' ${WRKSRC}/configure
142	@${REINPLACE_CMD} -e 's\|getCString()\|c_str()\|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp	145	@${REINPLACE_CMD} -e 's\|getCString()\|c_str()\|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp
		146	@${REINPLACE_CMD} -e 's\|$${sysconfdir}\|${PREFIX}/etc/\|' ${WRKSRC}/configure.ac # bash_completion
143	# Clean up bundled libraries	147	# Clean up bundled libraries
144	@${RM} -r ${WRKSRC}/frmts/gif/giflib/	148	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
145	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/	149	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
Lines 155-160 Link Here
155	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/	159	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
156	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme	160	${TOUCH} ${STAGEDIR}${PREFIX}/lib/gdalplugins/.keepme
157	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/	161	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
		162	${INSTALL_DATA} ${WRKSRC}/data/* ${STAGEDIR}${DATADIR}/
158	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}	163	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
159		164
160	.include <bsd.port.mk>	165	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)graphics/gdal/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580562263	1	TIMESTAMP = 1588923980
2	SHA256 (gdal-3.0.4.tar.xz) = 5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277	2	SHA256 (gdal-3.1.0.tar.xz) = e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda
3	SIZE (gdal-3.0.4.tar.xz) = 8696684	3	SIZE (gdal-3.1.0.tar.xz) = 12076312




--- apps/GNUmakefile.orig	2018-05-04 16:05:45 UTC
+++ apps/GNUmakefile
@@ -215,7 +215,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
 
 
 install: default
-	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
-	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
+	for f in $(BIN_LIST) ; do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(INST_BIN) ; done
+	$(BSD_INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
+	$(BSD_INSTALL_SCRIPT) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
 




--- scripts/GNUmakefile.orig	2017-01-20 08:20:46 UTC
+++ scripts/GNUmakefile
@@ -4,7 +4,5 @@ completion:
 	PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
 
 install:
-	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
-		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
-		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
-	fi
+	$(INSTALL_DIR) $(DESTDIR)${prefix}/etc/bash_completion.d
+	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)${prefix}/etc/bash_completion.d




--- scripts/GNUmakefile.orig	2020-05-08 09:49:22 UTC
+++ scripts/GNUmakefile
@@ -14,7 +14,7 @@ completion:
 
 install:
 	$(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
-	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
+	$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION); \
 	for p in $(PROGRAMS); do \
-		ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
+		ln -s $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
 	done

Lines 2-8 Link Here

(-)graphics/py-gdal/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= gdal	4	PORTNAME= gdal
5	PORTVERSION= 3.0.4	5	PORTVERSION= 3.1.0
6	CATEGORIES= graphics python	6	CATEGORIES= graphics python
7	MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \	7	MASTER_SITES= https://download.osgeo.org/gdal/${PORTVERSION}/ \
8	LOCAL/sunpoet	8	LOCAL/sunpoet

Lines 1-3 Link Here

(-)graphics/py-gdal/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580562263	1	TIMESTAMP = 1588933945
2	SHA256 (gdal-3.0.4.tar.xz) = 5569a4daa1abcbba47a9d535172fc335194d9214fdb96cd0f139bb57329ae277	2	SHA256 (gdal-3.1.0.tar.xz) = e754a22242ccbec731aacdb2333b567d4c95b9b02d3ba1ea12f70508d244fcda
3	SIZE (gdal-3.0.4.tar.xz) = 8696684	3	SIZE (gdal-3.1.0.tar.xz) = 12076312

Return to bug 246304

Lines 1-13 Link Here

(-)graphics/gdal/files/patch-apps_GNUmakefile (-13 lines)
1	--- apps/GNUmakefile.orig 2018-05-04 16:05:45 UTC
2	+++ apps/GNUmakefile
3	@@ -215,7 +215,7 @@ gdal-config-inst: gdal-config.in ../GDAL
4
5
6	install: default
7	- for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
8	- $(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
9	- $(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
10	+ for f in $(BIN_LIST) ; do $(BSD_INSTALL_PROGRAM) $$f $(DESTDIR)$(INST_BIN) ; done
11	+ $(BSD_INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
12	+ $(BSD_INSTALL_SCRIPT) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
13

Lines 1-12 Link Here

(-)graphics/gdal/files/patch-scripts-GNUmakefile (-12 lines)
1	--- scripts/GNUmakefile.orig 2017-01-20 08:20:46 UTC
2	+++ scripts/GNUmakefile
3	@@ -4,7 +4,5 @@ completion:
4	PATH=$(GDAL_ROOT)/swig/python/scripts:$(GDAL_ROOT)/apps:$(PATH) python completionFinder.py gdal-bash-completion.sh
5
6	install:
7	- if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
8	- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
9	- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
10	- fi
11	+ $(INSTALL_DIR) $(DESTDIR)${prefix}/etc/bash_completion.d
12	+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)${prefix}/etc/bash_completion.d

Line 0 Link Here

(-)graphics/gdal/files/patch-scripts_GNUmakefile (+12 lines)
	1	--- scripts/GNUmakefile.orig 2020-05-08 09:49:22 UTC
	2	+++ scripts/GNUmakefile
	3	@@ -14,7 +14,7 @@ completion:
	4
	5	install:
	6	$(INSTALL_DIR) $(DESTDIR)$(INST_BASH_COMPLETION) ; \
	7	- $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo; \
	8	+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)$(INST_BASH_COMPLETION); \
	9	for p in $(PROGRAMS); do \
	10	- ln -rs $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
	11	+ ln -s $(DESTDIR)$(INST_BASH_COMPLETION)/gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
	12	done