Attachment #214402 for bug #246304

Lines 2-9 Link Here

(-)graphics/gdal/Makefile (-10 / +20 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-41 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	OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GTA HDF5 JASPER \	26	USES= compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
		27
		28	OPTIONS_DEFINE= ARMADILLO BASH 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
		37	BASH_DESC= Install bash completion script
33	PCRE_DESC= Regular expression support for SQLite	38	PCRE_DESC= Regular expression support for SQLite
34		39
35	USES= compiler:c++11-lang gmake iconv jpeg localbase pkgconfig ssl tar:xz
36
37	CFLAGS+= -fPIC	40	CFLAGS+= -fPIC
38	CONFIGURE_ARGS= --datadir=${DATADIR} \	41	CONFIGURE_ARGS= --datadir=${PREFIX}/share \
39	--enable-static=yes \	42	--enable-static=yes \
40	--with-geotiff=yes \	43	--with-geotiff=yes \
41	--with-gif=yes \	44	--with-gif=yes \
Lines 49-54 Link Here
49	--with-proj=yes \	52	--with-proj=yes \
50	--with-threads=yes \	53	--with-threads=yes \
51	--without-libtool \	54	--without-libtool \
		55	--with-qhull=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 79-84 Link Here
79		83
80	ARMADILLO_CONFIGURE_WITH= armadillo	84	ARMADILLO_CONFIGURE_WITH= armadillo
81	ARMADILLO_LIB_DEPENDS= libarmadillo.so:math/armadillo	85	ARMADILLO_LIB_DEPENDS= libarmadillo.so:math/armadillo
		86	BASH_CONFIGURE_WITH= bash-completion
82	CFITSIO_CONFIGURE_WITH= cfitsio	87	CFITSIO_CONFIGURE_WITH= cfitsio
83	CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio	88	CFITSIO_LIB_DEPENDS= libcfitsio.so:astro/cfitsio
84	CURL_CONFIGURE_OFF= --with-curl=no	89	CURL_CONFIGURE_OFF= --with-curl=no
Lines 102-108 Link Here
102	KML_CONFIGURE_WITH= libkml	107	KML_CONFIGURE_WITH= libkml
103	KML_LIB_DEPENDS= libkmlbase.so:science/libkml	108	KML_LIB_DEPENDS= libkmlbase.so:science/libkml
104	LIBXML2_CONFIGURE_OFF= --with-xml2=no	109	LIBXML2_CONFIGURE_OFF= --with-xml2=no
105	LIBXML2_CONFIGURE_ON= --with-xml2=${LOCALBASE}/bin/xml2-config
106	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2	110	LIBXML2_LIB_DEPENDS= libxml2.so:textproc/libxml2
107	MYSQL_CONFIGURE_OFF= --with-mysql=no	111	MYSQL_CONFIGURE_OFF= --with-mysql=no
108	MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config	112	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	144	@${REINPLACE_CMD} -e 's\|$$(INST_LIB)/pkgconfig\|${PREFIX}/libdata/pkgconfig\|; s\| LICENSE.TXT\|\|' ${WRKSRC}/GNUmakefile
141	@${REINPLACE_CMD} -e 's\|-lminizip\|-lkmlminizip\|' ${WRKSRC}/configure	145	@${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	146	@${REINPLACE_CMD} -e 's\|getCString()\|c_str()\|' ${WRKSRC}/frmts/pdf/pdfdataset.cpp ${WRKSRC}/frmts/pdf/pdfobject.cpp
		147	@${REINPLACE_CMD} -e 's\|$${sysconfdir}\|${PREFIX}/etc/\|' ${WRKSRC}/configure.ac # bash_completion
143	# Clean up bundled libraries	148	# Clean up bundled libraries
144	@${RM} -r ${WRKSRC}/frmts/gif/giflib/	149	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
145	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/	150	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
Lines 153-160 Link Here
153	post-install:	158	post-install:
154	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/	159	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
155	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/	160	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
156	${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} $$(find ${WRKSRC}/data -type f) ${STAGEDIR}${DATADIR}/
158	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}	163	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so.${PORTVERSION}
		164	.for p in gdaldem gdal_viewshed gdal_rasterize ogr2ogr ogrinfo gdal_grid gnmmanage gnmanalyse testepsg gdalmdiminfo ogrlineref \
		165	nearblack gdal_contour gdalmdimtranslate gdalsrsinfo gdalserver gdalmanage gdalbuildvrt gdalinfo gdaltindex gdaltransform \
		166	gdalwarp ogrtindex gdaladdo gdallocationinfo gdalenhance gdal_translate
		167	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${p}
		168	.endfor
159		169
160	.include <bsd.port.mk>	170	.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)/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; \
+		cd $(DESTDIR)$(INST_BASH_COMPLETION) ; ln -s gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
 	done

Lines 15-20 Link Here

(-)graphics/gdal/pkg-plist (-7 / +50 lines)
15	bin/gdaltindex	15	bin/gdaltindex
16	bin/gdaltransform	16	bin/gdaltransform
17	bin/gdalwarp	17	bin/gdalwarp
		18	bin/gdal_viewshed
		19	bin/gdalmdiminfo
		20	bin/gdalmdimtranslate
18	bin/gnmanalyse	21	bin/gnmanalyse
19	bin/gnmmanage	22	bin/gnmmanage
20	bin/nearblack	23	bin/nearblack
Lines 23-29 Link Here
23	bin/ogrlineref	26	bin/ogrlineref
24	bin/ogrtindex	27	bin/ogrtindex
25	bin/testepsg	28	bin/testepsg
26	etc/bash_completion.d/gdal-bash-completion.sh	29	%%BASH%%etc/bash_completion.d/gdal-bash-completion.sh
		30	%%BASH%%etc/bash_completion.d/gdal-config
		31	%%BASH%%etc/bash_completion.d/gdal2tiles.py
		32	%%BASH%%etc/bash_completion.d/gdal2xyz.py
		33	%%BASH%%etc/bash_completion.d/gdal_calc.py
		34	%%BASH%%etc/bash_completion.d/gdal_contour
		35	%%BASH%%etc/bash_completion.d/gdal_edit.py
		36	%%BASH%%etc/bash_completion.d/gdal_fillnodata.py
		37	%%BASH%%etc/bash_completion.d/gdal_grid
		38	%%BASH%%etc/bash_completion.d/gdal_merge.py
		39	%%BASH%%etc/bash_completion.d/gdal_polygonize.py
		40	%%BASH%%etc/bash_completion.d/gdal_proximity.py
		41	%%BASH%%etc/bash_completion.d/gdal_rasterize
		42	%%BASH%%etc/bash_completion.d/gdal_retile.py
		43	%%BASH%%etc/bash_completion.d/gdal_sieve.py
		44	%%BASH%%etc/bash_completion.d/gdal_translate
		45	%%BASH%%etc/bash_completion.d/gdaladdo
		46	%%BASH%%etc/bash_completion.d/gdalbuildvrt
		47	%%BASH%%etc/bash_completion.d/gdalchksum.py
		48	%%BASH%%etc/bash_completion.d/gdalcompare.py
		49	%%BASH%%etc/bash_completion.d/gdaldem
		50	%%BASH%%etc/bash_completion.d/gdalenhance
		51	%%BASH%%etc/bash_completion.d/gdalident.py
		52	%%BASH%%etc/bash_completion.d/gdalimport.py
		53	%%BASH%%etc/bash_completion.d/gdalinfo
		54	%%BASH%%etc/bash_completion.d/gdallocationinfo
		55	%%BASH%%etc/bash_completion.d/gdalmanage
		56	%%BASH%%etc/bash_completion.d/gdalmove.py
		57	%%BASH%%etc/bash_completion.d/gdalserver
		58	%%BASH%%etc/bash_completion.d/gdalsrsinfo
		59	%%BASH%%etc/bash_completion.d/gdaltindex
		60	%%BASH%%etc/bash_completion.d/gdaltransform
		61	%%BASH%%etc/bash_completion.d/gdalwarp
		62	%%BASH%%etc/bash_completion.d/ogr2ogr
		63	%%BASH%%etc/bash_completion.d/ogrinfo
		64	%%BASH%%etc/bash_completion.d/ogrlineref
		65	%%BASH%%etc/bash_completion.d/ogrmerge.py
		66	%%BASH%%etc/bash_completion.d/ogrtindex
27	include/cpl_atomic_ops.h	67	include/cpl_atomic_ops.h
28	include/cpl_auto_close.h	68	include/cpl_auto_close.h
29	include/cpl_aws.h	69	include/cpl_aws.h
Lines 100-119 Link Here
100	include/ogr_p.h	140	include/ogr_p.h
101	include/ogr_spatialref.h	141	include/ogr_spatialref.h
102	include/ogr_srs_api.h	142	include/ogr_srs_api.h
		143	include/ogr_swq.h
103	include/ogrsf_frmts.h	144	include/ogrsf_frmts.h
104	include/rawdataset.h	145	include/rawdataset.h
105	include/thinplatespline.h	146	include/thinplatespline.h
106	include/vrtdataset.h	147	include/vrtdataset.h
107	lib/gdalplugins/.keepme	148	@dir lib/gdalplugins
108	lib/libgdal.a	149	lib/libgdal.a
109	lib/libgdal.so	150	lib/libgdal.so
110	lib/libgdal.so.3	151	lib/libgdal.so.3
111	lib/libgdal.so.%%PORTVERSION%%	152	lib/libgdal.so.%%PORTVERSION%%
112	libdata/pkgconfig/gdal.pc	153	libdata/pkgconfig/gdal.pc
113	%%DATADIR%%/GDALLogoBW.svg
114	%%DATADIR%%/GDALLogoColor.svg
115	%%DATADIR%%/GDALLogoGS.svg
116	%%DATADIR%%/GDALmake.opt
117	%%DATADIR%%/bag_template.xml	154	%%DATADIR%%/bag_template.xml
118	%%DATADIR%%/cubewerx_extra.wkt	155	%%DATADIR%%/cubewerx_extra.wkt
119	%%DATADIR%%/default.rsc	156	%%DATADIR%%/default.rsc
Lines 122-127 Link Here
122	%%DATADIR%%/epsg.wkt	159	%%DATADIR%%/epsg.wkt
123	%%DATADIR%%/esri_StatePlane_extra.wkt	160	%%DATADIR%%/esri_StatePlane_extra.wkt
124	%%DATADIR%%/gdalicon.png	161	%%DATADIR%%/gdalicon.png
		162	%%DATADIR%%/GDALLogoBW.svg
		163	%%DATADIR%%/GDALLogoColor.svg
		164	%%DATADIR%%/GDALLogoGS.svg
		165	%%DATADIR%%/GDALmake.opt
		166	%%DATADIR%%/gdalmdiminfo_output.schema.json
125	%%DATADIR%%/gdalvrt.xsd	167	%%DATADIR%%/gdalvrt.xsd
126	%%DATADIR%%/gml_registry.xml	168	%%DATADIR%%/gml_registry.xml
127	%%DATADIR%%/gmlasconf.xml	169	%%DATADIR%%/gmlasconf.xml
Lines 146-153 Link Here
146	%%DATADIR%%/jpfgdgml_GCP.gfs	188	%%DATADIR%%/jpfgdgml_GCP.gfs
147	%%DATADIR%%/jpfgdgml_LeveeEdge.gfs	189	%%DATADIR%%/jpfgdgml_LeveeEdge.gfs
148	%%DATADIR%%/jpfgdgml_RailCL.gfs	190	%%DATADIR%%/jpfgdgml_RailCL.gfs
		191	%%DATADIR%%/jpfgdgml_RdArea.gfs
149	%%DATADIR%%/jpfgdgml_RdASL.gfs	192	%%DATADIR%%/jpfgdgml_RdASL.gfs
150	%%DATADIR%%/jpfgdgml_RdArea.gfs
151	%%DATADIR%%/jpfgdgml_RdCompt.gfs	193	%%DATADIR%%/jpfgdgml_RdCompt.gfs
152	%%DATADIR%%/jpfgdgml_RdEdg.gfs	194	%%DATADIR%%/jpfgdgml_RdEdg.gfs
153	%%DATADIR%%/jpfgdgml_RdMgtBdry.gfs	195	%%DATADIR%%/jpfgdgml_RdMgtBdry.gfs
Lines 186-188 Link Here
186	%%DATADIR%%/trailer.dxf	228	%%DATADIR%%/trailer.dxf
187	%%DATADIR%%/vdv452.xml	229	%%DATADIR%%/vdv452.xml
188	%%DATADIR%%/vdv452.xsd	230	%%DATADIR%%/vdv452.xsd
		231	%%DATADIR%%/vicar.json

Lines 2-8 Link Here

(-)graphics/p5-Geo-GDAL/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= Geo-GDAL	4	PORTNAME= Geo-GDAL
5	PORTVERSION= 3.0.4	5	PORTVERSION= 3.1.0
6	CATEGORIES= graphics perl5	6	CATEGORIES= graphics perl5
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/p5-Geo-GDAL/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1580562263	1	TIMESTAMP = 1589262137
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

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)/gdalinfo; $(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	+ cd $(DESTDIR)$(INST_BASH_COMPLETION) ; ln -s gdalinfo $(DESTDIR)$(INST_BASH_COMPLETION)/$$p; \
	12	done