pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/geography geography: align variable assignments
details: https://anonhg.NetBSD.org/pkgsrc/rev/bc9a0556e2c1
branches: trunk
changeset: 417077:bc9a0556e2c1
user: rillig <rillig%pkgsrc.org@localhost>
date: Sun Nov 03 19:30:32 2019 +0000
description:
geography: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
diffstat:
geography/epsg-docs/Makefile | 4 ++--
geography/epsg/Makefile | 6 +++---
geography/gama/Makefile | 4 ++--
geography/gdal-lib/options.mk | 8 ++++----
geography/libchamplain012/Makefile | 6 +++---
geography/libchamplain08/Makefile | 6 +++---
geography/libmemphis02/Makefile | 6 +++---
geography/libspatialite/Makefile | 4 ++--
geography/opencpn-plugin-statusbar/Makefile | 4 ++--
geography/opencpn-plugin-weather_routing/Makefile | 4 ++--
geography/p5-Geo-Distance/Makefile | 6 +++---
geography/p5-Geo-Gpx/Makefile | 6 +++---
geography/qgis/Makefile | 20 ++++++++++----------
geography/qgis/options.mk | 4 ++--
14 files changed, 44 insertions(+), 44 deletions(-)
diffs (truncated from 312 to 300 lines):
diff -r 78554a57243c -r bc9a0556e2c1 geography/epsg-docs/Makefile
--- a/geography/epsg-docs/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/epsg-docs/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
WRKSRC= ${WRKDIR}
NO_BUILD= yes
-DOCDIR= ${PREFIX}/share/doc/epsg
+DOCDIR= ${PREFIX}/share/doc/epsg
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
diff -r 78554a57243c -r bc9a0556e2c1 geography/epsg/Makefile
--- a/geography/epsg/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/epsg/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
${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"
diff -r 78554a57243c -r bc9a0556e2c1 geography/gama/Makefile
--- a/geography/gama/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/gama/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
# Not documented, but apparent.
USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
INFO_FILES= yes
diff -r 78554a57243c -r bc9a0556e2c1 geography/gdal-lib/options.mk
--- a/geography/gdal-lib/options.mk Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/gdal-lib/options.mk Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
.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
diff -r 78554a57243c -r bc9a0556e2c1 geography/libchamplain012/Makefile
--- a/geography/libchamplain012/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/libchamplain012/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
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
diff -r 78554a57243c -r bc9a0556e2c1 geography/libchamplain08/Makefile
--- a/geography/libchamplain08/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/libchamplain08/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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.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"
diff -r 78554a57243c -r bc9a0556e2c1 geography/libmemphis02/Makefile
--- a/geography/libmemphis02/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/libmemphis02/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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_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}; \
diff -r 78554a57243c -r bc9a0556e2c1 geography/libspatialite/Makefile
--- a/geography/libspatialite/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/libspatialite/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
# 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"
diff -r 78554a57243c -r bc9a0556e2c1 geography/opencpn-plugin-statusbar/Makefile
--- a/geography/opencpn-plugin-statusbar/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/opencpn-plugin-statusbar/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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
diff -r 78554a57243c -r bc9a0556e2c1 geography/opencpn-plugin-weather_routing/Makefile
--- a/geography/opencpn-plugin-weather_routing/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/opencpn-plugin-weather_routing/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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/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 \
diff -r 78554a57243c -r bc9a0556e2c1 geography/p5-Geo-Distance/Makefile
--- a/geography/p5-Geo-Distance/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/p5-Geo-Distance/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
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"
diff -r 78554a57243c -r bc9a0556e2c1 geography/p5-Geo-Gpx/Makefile
--- a/geography/p5-Geo-Gpx/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/p5-Geo-Gpx/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
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
diff -r 78554a57243c -r bc9a0556e2c1 geography/qgis/Makefile
--- a/geography/qgis/Makefile Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/qgis/Makefile Sun Nov 03 19:30:32 2019 +0000
@@ -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 @@
.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
diff -r 78554a57243c -r bc9a0556e2c1 geography/qgis/options.mk
--- a/geography/qgis/options.mk Sun Nov 03 19:28:47 2019 +0000
+++ b/geography/qgis/options.mk Sun Nov 03 19:30:32 2019 +0000
@@ -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 $
Home |
Main Index |
Thread Index |
Old Index