CVS commit: pkgsrc/geography

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/geography
From: "Roland Illig" <rillig%netbsd.org@localhost>
Date: Sun, 3 Nov 2019 19:30:34 +0000

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Nov  3 19:30:34 UTC 2019

Modified Files:
        pkgsrc/geography/epsg: Makefile
        pkgsrc/geography/epsg-docs: Makefile
        pkgsrc/geography/gama: Makefile
        pkgsrc/geography/gdal-lib: options.mk
        pkgsrc/geography/libchamplain012: Makefile
        pkgsrc/geography/libchamplain08: Makefile
        pkgsrc/geography/libmemphis02: Makefile
        pkgsrc/geography/libspatialite: Makefile
        pkgsrc/geography/opencpn-plugin-statusbar: Makefile
        pkgsrc/geography/opencpn-plugin-weather_routing: Makefile
        pkgsrc/geography/p5-Geo-Distance: Makefile
        pkgsrc/geography/p5-Geo-Gpx: Makefile
        pkgsrc/geography/qgis: Makefile options.mk

Log Message:
geography: align variable assignments

pkglint -Wall -F --only aligned --only indent -r

No manual corrections.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/geography/epsg/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/epsg-docs/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/geography/gama/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/geography/gdal-lib/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/geography/libchamplain012/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/geography/libchamplain08/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/libmemphis02/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/libspatialite/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/geography/opencpn-plugin-statusbar/Makefile
cvs rdiff -u -r1.22 -r1.23 \
    pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/geography/p5-Geo-Distance/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/p5-Geo-Gpx/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/geography/qgis/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/geography/qgis/options.mk

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

Modified files:

Index: pkgsrc/geography/epsg/Makefile
diff -u pkgsrc/geography/epsg/Makefile:1.16 pkgsrc/geography/epsg/Makefile:1.17
--- pkgsrc/geography/epsg/Makefile:1.16 Thu Jan 19 18:52:11 2017
+++ pkgsrc/geography/epsg/Makefile      Sun Nov  3 19:30:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2017/01/19 18:52:11 agc Exp $
+# $NetBSD: Makefile,v 1.17 2019/11/03 19:30:32 rillig Exp $
 #
 
 DISTNAME=              epsg-v${VERS}sql-PostgreSQL
@@ -78,9 +78,9 @@ do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/epsg-load ${DESTDIR}${BINDIR}
        ${INSTALL_DATA} ${WRKSRC}/${DIR.doc}/epsg-v${VERS_README}_readme.pdf ${DESTDIR}${DOCDIR:Q}
 .for d in pgsql mysql
-.for f in ${DATAFILES.${d}}
+.  for f in ${DATAFILES.${d}}
        ${INSTALL_DATA} ${WRKSRC}/${DIR.${d}}/${f} ${DESTDIR}${EPSGDIR:Q}/${f}
-.endfor
+.  endfor
 .endfor
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/epsg-docs/Makefile
diff -u pkgsrc/geography/epsg-docs/Makefile:1.6 pkgsrc/geography/epsg-docs/Makefile:1.7
--- pkgsrc/geography/epsg-docs/Makefile:1.6     Thu Oct  4 09:19:17 2012
+++ pkgsrc/geography/epsg-docs/Makefile Sun Nov  3 19:30:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/04 09:19:17 asau Exp $
+# $NetBSD: Makefile,v 1.7 2019/11/03 19:30:32 rillig Exp $
 #
 
 DISTNAME=              G7-1
@@ -21,7 +21,7 @@ CONFLICTS+=           epsg<6.13
 
 WRKSRC=                        ${WRKDIR}
 NO_BUILD=              yes
-DOCDIR=                 ${PREFIX}/share/doc/epsg
+DOCDIR=                        ${PREFIX}/share/doc/epsg
 
 do-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}

Index: pkgsrc/geography/gama/Makefile
diff -u pkgsrc/geography/gama/Makefile:1.32 pkgsrc/geography/gama/Makefile:1.33
--- pkgsrc/geography/gama/Makefile:1.32 Tue Sep 10 01:05:18 2019
+++ pkgsrc/geography/gama/Makefile      Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/09/10 01:05:18 gdt Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 19:30:33 rillig Exp $
 #
 
 DISTNAME=      gama-2.07
@@ -14,7 +14,7 @@ USE_LANGUAGES=        c c++11
 # Not documented, but apparent.
 USE_TOOLS+=    gmake
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --infodir=${PREFIX}/info
 
 INFO_FILES=    yes

Index: pkgsrc/geography/gdal-lib/options.mk
diff -u pkgsrc/geography/gdal-lib/options.mk:1.3 pkgsrc/geography/gdal-lib/options.mk:1.4
--- pkgsrc/geography/gdal-lib/options.mk:1.3    Sat Sep 13 00:57:00 2014
+++ pkgsrc/geography/gdal-lib/options.mk        Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/09/13 00:57:00 gdt Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 19:30:33 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gdal-lib
 
@@ -14,21 +14,21 @@ PKG_SUGGESTED_OPTIONS=
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mpgsql)
-. include "../../mk/pgsql.buildlink3.mk"
+.  include "../../mk/pgsql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-pg
 .else
 CONFIGURE_ARGS+=       --without-pg
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
-. include "../../mk/mysql.buildlink3.mk"
+.  include "../../mk/mysql.buildlink3.mk"
 CONFIGURE_ARGS+=       --with-mysql
 .else
 CONFIGURE_ARGS+=       --without-mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Msqlite)
-. include "../../databases/sqlite3/buildlink3.mk"
+.  include "../../databases/sqlite3/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
 .else
 CONFIGURE_ARGS+=       --without-sqlite3

Index: pkgsrc/geography/libchamplain012/Makefile
diff -u pkgsrc/geography/libchamplain012/Makefile:1.24 pkgsrc/geography/libchamplain012/Makefile:1.25
--- pkgsrc/geography/libchamplain012/Makefile:1.24      Sun Jul 21 22:24:03 2019
+++ pkgsrc/geography/libchamplain012/Makefile   Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/07/21 22:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 19:30:33 rillig Exp $
 
 DISTNAME=      libchamplain-0.12.10
 PKGNAME=       libchamplain012-0.12.10
@@ -16,8 +16,8 @@ GNU_CONFIGURE=        yes
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gmake pkg-config
 
-CONFIGURE_ARGS+=--disable-gtk-doc
-CONFIGURE_ARGS+=--enable-memphis
+CONFIGURE_ARGS+=       --disable-gtk-doc
+CONFIGURE_ARGS+=       --enable-memphis
 
 PKGCONFIG_OVERRIDE+=   champlain-gtk.pc.in
 PKGCONFIG_OVERRIDE+=   champlain.pc.in

Index: pkgsrc/geography/libchamplain08/Makefile
diff -u pkgsrc/geography/libchamplain08/Makefile:1.52 pkgsrc/geography/libchamplain08/Makefile:1.53
--- pkgsrc/geography/libchamplain08/Makefile:1.52       Sun Jul 21 22:24:03 2019
+++ pkgsrc/geography/libchamplain08/Makefile    Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/07/21 22:24:03 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/03 19:30:33 rillig Exp $
 #
 
 DISTNAME=      libchamplain-0.8.3
@@ -22,9 +22,9 @@ PKGCONFIG_OVERRIDE+=  champlain-memphis.p
 PKGCONFIG_OVERRIDE+=   champlain.pc.in
 
 # XXX notyet
-#PLIST_VARS+= memphis
+#PLIST_VARS+=  memphis
 #.include "../../geography/memphis/buildlink3.mk"
-#PLIST.memphis= yes
+#PLIST.memphis=        yes
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"

Index: pkgsrc/geography/libmemphis02/Makefile
diff -u pkgsrc/geography/libmemphis02/Makefile:1.4 pkgsrc/geography/libmemphis02/Makefile:1.5
--- pkgsrc/geography/libmemphis02/Makefile:1.4  Wed Nov 14 22:21:33 2018
+++ pkgsrc/geography/libmemphis02/Makefile      Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/11/14 22:21:33 kleink Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 19:30:33 rillig Exp $
 
 DISTNAME=      memphis-0.2.3
 PKGNAME=       libmemphis02-0.2.3
@@ -18,9 +18,9 @@ USE_LIBTOOL=  yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    aclocal autoconf autoheader automake gmake pkg-config
 
-CONFIGURE_ARGS+=--enable-gtk-doc
+CONFIGURE_ARGS+=       --enable-gtk-doc
 
-PKGCONFIG_OVERRIDE+=memphis.pc.in
+PKGCONFIG_OVERRIDE+=   memphis.pc.in
 
 pre-configure:
        set -e; cd ${WRKSRC}; \

Index: pkgsrc/geography/libspatialite/Makefile
diff -u pkgsrc/geography/libspatialite/Makefile:1.14 pkgsrc/geography/libspatialite/Makefile:1.15
--- pkgsrc/geography/libspatialite/Makefile:1.14        Wed Apr  3 00:32:44 2019
+++ pkgsrc/geography/libspatialite/Makefile     Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/04/03 00:32:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 19:30:33 rillig Exp $
 
 DISTNAME=      libspatialite-4.3.0a
 PKGREVISION=   10
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE=   spatialite.pc.in
 # src/shapefiles wants to create both a module and library
 # from the same sources. This confuses some temporary file handling
 # in libtool 2.4.2.
-MAKE_JOBS_SAFE=no
+MAKE_JOBS_SAFE=        no
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"

Index: pkgsrc/geography/opencpn-plugin-statusbar/Makefile
diff -u pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.11 pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.12
--- pkgsrc/geography/opencpn-plugin-statusbar/Makefile:1.11     Sun Jul 21 22:24:54 2019
+++ pkgsrc/geography/opencpn-plugin-statusbar/Makefile  Sun Nov  3 19:30:33 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2019/07/21 22:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2019/11/03 19:30:33 rillig Exp $
 
 VERSION=       20180405
-PKGREVISION=   7
+PKGREVISION=   7
 DISTNAME=      statusbar_pi-${VERSION}
 PKGNAME=       opencpn-plugin-statusbar-${VERSION}
 CATEGORIES=    geography

Index: pkgsrc/geography/opencpn-plugin-weather_routing/Makefile
diff -u pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.22 pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.23
--- pkgsrc/geography/opencpn-plugin-weather_routing/Makefile:1.22       Sun Jul 21 22:24:54 2019
+++ pkgsrc/geography/opencpn-plugin-weather_routing/Makefile    Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/07/21 22:24:54 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 19:30:33 rillig Exp $
 #
 
 VERSION=       20180827
@@ -26,7 +26,7 @@ CMAKE_MODULE_PATH_OVERRIDE = \
                cmake/PluginLocalization.cmake \
                cmake/PluginPackage.cmake
 
-SUBST_CLASSES+=        isnan
+SUBST_CLASSES+=                isnan
 SUBST_STAGE.isnan=     pre-configure
 SUBST_MESSAGE.isnan=   replace wxIsNaN with std::isnan
 SUBST_FILES.isnan=     src/BoatDialog.cpp \

Index: pkgsrc/geography/p5-Geo-Distance/Makefile
diff -u pkgsrc/geography/p5-Geo-Distance/Makefile:1.20 pkgsrc/geography/p5-Geo-Distance/Makefile:1.21
--- pkgsrc/geography/p5-Geo-Distance/Makefile:1.20      Sun Aug 11 13:21:05 2019
+++ pkgsrc/geography/p5-Geo-Distance/Makefile   Sun Nov  3 19:30:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/08/11 13:21:05 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 19:30:33 rillig Exp $
 
 DISTNAME=      Geo-Distance-0.20
 PKGNAME=       p5-${DISTNAME}
@@ -11,9 +11,9 @@ HOMEPAGE=     https://metacpan.org/release/B
 COMMENT=       Calculate Distances and Closest Locations
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST=        auto/Geo/Distance/.packlist
+PERL5_PACKLIST=                auto/Geo/Distance/.packlist
 #PERL5_MODULE_TYPE=    Module::Install::Bundled
-MAKE_PARAMS+=  --skipdeps
+MAKE_PARAMS+=          --skipdeps
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/geography/p5-Geo-Gpx/Makefile
diff -u pkgsrc/geography/p5-Geo-Gpx/Makefile:1.7 pkgsrc/geography/p5-Geo-Gpx/Makefile:1.8
--- pkgsrc/geography/p5-Geo-Gpx/Makefile:1.7    Sun Aug 11 13:21:06 2019
+++ pkgsrc/geography/p5-Geo-Gpx/Makefile        Sun Nov  3 19:30:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/08/11 13:21:06 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 19:30:34 rillig Exp $
 #
 
 DISTNAME=      Geo-Gpx-0.26
@@ -12,9 +12,9 @@ HOMEPAGE=     https://metacpan.org/pod/relea
 COMMENT=       Geo::Gpx - Create and parse GPX files.
 LICENSE=       ${PERL5_LICENSE}
 
-PERL5_PACKLIST=        auto/Geo/Gpx/.packlist
+PERL5_PACKLIST=                auto/Geo/Gpx/.packlist
 #PERL5_MODULE_TYPE=    Module::Install::Bundled
-MAKE_PARAMS+=  --skipdeps
+MAKE_PARAMS+=          --skipdeps
 
 DEPENDS+=      p5-DateTime-Format-ISO8601>=0.0800:../../time/p5-DateTime-Format-ISO8601
 DEPENDS+=      p5-HTML-Parser>=3.71:../../www/p5-HTML-Parser

Index: pkgsrc/geography/qgis/Makefile
diff -u pkgsrc/geography/qgis/Makefile:1.79 pkgsrc/geography/qgis/Makefile:1.80
--- pkgsrc/geography/qgis/Makefile:1.79 Tue Oct 29 19:30:11 2019
+++ pkgsrc/geography/qgis/Makefile      Sun Nov  3 19:30:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2019/10/29 19:30:11 bouyer Exp $
+# $NetBSD: Makefile,v 1.80 2019/11/03 19:30:34 rillig Exp $
 
 DISTNAME=      qgis-3.8.3
 CATEGORIES=    geography
@@ -22,31 +22,31 @@ PLIST_SRC=          PLIST
 
 .include "options.mk"
 
-DEPENDS+=     qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl
+DEPENDS+=              qca2-qt5-ossl-[0-9]*:../../security/qca2-qt5-ossl
 # This is needed to find qca2.
-CMAKE_PREFIX_PATH+=${QTDIR}
+CMAKE_PREFIX_PATH+=    ${QTDIR}
 
 # This could be used if we want to build pdf doc, which is currently false
-#BUILD_DEPENDS+= txt2tags-[0-9]*:../../wip/txt2tags
+#BUILD_DEPENDS+=       txt2tags-[0-9]*:../../wip/txt2tags
 
 # Disable building of QGIS.app
 # (XXX For now, we might want to find a way to do this later.)
 SUBST_CLASSES+=                        xapple
 SUBST_STAGE.xapple=            pre-configure
 SUBST_MESSAGE.xapple=          Disabling APPLE App in cmake scripts
-xapple_FIND_CMD=               cd ${WRKSRC} && \
+xapple_FIND_CMD=               cd ${WRKSRC} && \
        find . -name '*.cmake' -o -name CMakeLists.txt
 SUBST_FILES.xapple=            ${xapple_FIND_CMD:sh}
 SUBST_SED.xapple+=             -e 's,APPLE,XAPPLE,'
 SUBST_SED.xapple+=             -e 's,MACOSX_BUNDLE ,,'
 
-CMAKE_ARGS+=   -DWITH_QTWEBKIT=FALSE
-CMAKE_ARGS+=   -DQWT_DIR=${QWT_DIR}
+CMAKE_ARGS+=   -DWITH_QTWEBKIT=FALSE
+CMAKE_ARGS+=   -DQWT_DIR=${QWT_DIR}
 # Useful for package development:
-#CMAKE_ARGS+=  -DCMAKE_VERBOSE_MAKEFILE=TRUE
+#CMAKE_ARGS+=  -DCMAKE_VERBOSE_MAKEFILE=TRUE
 
-CONFIGURE_DIRS=build
-CMAKE_ARG_PATH=..
+CONFIGURE_DIRS=        build
+CMAKE_ARG_PATH=        ..
 
 pre-configure:
        ${MKDIR} ${WRKSRC}/build

Index: pkgsrc/geography/qgis/options.mk
diff -u pkgsrc/geography/qgis/options.mk:1.15 pkgsrc/geography/qgis/options.mk:1.16
--- pkgsrc/geography/qgis/options.mk:1.15       Tue Oct 29 19:30:11 2019
+++ pkgsrc/geography/qgis/options.mk    Sun Nov  3 19:30:34 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/10/29 19:30:11 bouyer Exp $
+# $NetBSD: options.mk,v 1.16 2019/11/03 19:30:34 rillig Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qgis
 PKG_SUPPORTED_OPTIONS= python
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  python
 # supported by gdal-lib and as a result we get a
 # warning when qgis is launched.
 # XXX fix gdal-lib and reenable this.
-PKG_SUGGESTED_OPTIONS+= python
+PKG_SUGGESTED_OPTIONS+=        python
 
 .include "../../mk/bsd.options.mk"

Prev by Date: CVS commit: pkgsrc/games
Next by Date: CVS commit: pkgsrc/ham
Previous by Thread: CVS commit: pkgsrc/games
Next by Thread: CVS commit: pkgsrc/ham
Indexes:

Home | Main Index | Thread Index | Old Index