diff options
author | rillig <rillig@pkgsrc.org> | 2019-11-03 19:30:32 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2019-11-03 19:30:32 +0000 |
commit | de90321faa2cb881bb1a9b82259ec01e54fd0566 (patch) | |
tree | f7a9981004a3672de5b0c505775a9043c464460b | |
parent | 668a035f6586a571d9d7f2f11e71a7d4c48d8b2b (diff) | |
download | pkgsrc-de90321faa2cb881bb1a9b82259ec01e54fd0566.tar.gz |
geography: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
-rw-r--r-- | geography/epsg-docs/Makefile | 4 | ||||
-rw-r--r-- | geography/epsg/Makefile | 6 | ||||
-rw-r--r-- | geography/gama/Makefile | 4 | ||||
-rw-r--r-- | geography/gdal-lib/options.mk | 8 | ||||
-rw-r--r-- | geography/libchamplain012/Makefile | 6 | ||||
-rw-r--r-- | geography/libchamplain08/Makefile | 6 | ||||
-rw-r--r-- | geography/libmemphis02/Makefile | 6 | ||||
-rw-r--r-- | geography/libspatialite/Makefile | 4 | ||||
-rw-r--r-- | geography/opencpn-plugin-statusbar/Makefile | 4 | ||||
-rw-r--r-- | geography/opencpn-plugin-weather_routing/Makefile | 4 | ||||
-rw-r--r-- | geography/p5-Geo-Distance/Makefile | 6 | ||||
-rw-r--r-- | geography/p5-Geo-Gpx/Makefile | 6 | ||||
-rw-r--r-- | geography/qgis/Makefile | 20 | ||||
-rw-r--r-- | geography/qgis/options.mk | 4 |
14 files changed, 44 insertions, 44 deletions
diff --git a/geography/epsg-docs/Makefile b/geography/epsg-docs/Makefile index 2a3836eb46e..97d4a81cc86 100644 --- a/geography/epsg-docs/Makefile +++ b/geography/epsg-docs/Makefile @@ -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} diff --git a/geography/epsg/Makefile b/geography/epsg/Makefile index 40b17f0db16..5a2840a3861 100644 --- a/geography/epsg/Makefile +++ b/geography/epsg/Makefile @@ -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" diff --git a/geography/gama/Makefile b/geography/gama/Makefile index 9386ac65d75..93f2900e146 100644 --- a/geography/gama/Makefile +++ b/geography/gama/Makefile @@ -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 diff --git a/geography/gdal-lib/options.mk b/geography/gdal-lib/options.mk index 16568f94311..e63b176949b 100644 --- a/geography/gdal-lib/options.mk +++ b/geography/gdal-lib/options.mk @@ -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 diff --git a/geography/libchamplain012/Makefile b/geography/libchamplain012/Makefile index e1e895e6438..774de5a492f 100644 --- a/geography/libchamplain012/Makefile +++ b/geography/libchamplain012/Makefile @@ -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 diff --git a/geography/libchamplain08/Makefile b/geography/libchamplain08/Makefile index d4e13499add..4f752ff3715 100644 --- a/geography/libchamplain08/Makefile +++ b/geography/libchamplain08/Makefile @@ -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.pc.in 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 --git a/geography/libmemphis02/Makefile b/geography/libmemphis02/Makefile index 7e7851a9ff9..58e52f4ab82 100644 --- a/geography/libmemphis02/Makefile +++ b/geography/libmemphis02/Makefile @@ -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}; \ diff --git a/geography/libspatialite/Makefile b/geography/libspatialite/Makefile index c97dbd503b9..8ad955664ea 100644 --- a/geography/libspatialite/Makefile +++ b/geography/libspatialite/Makefile @@ -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" diff --git a/geography/opencpn-plugin-statusbar/Makefile b/geography/opencpn-plugin-statusbar/Makefile index cd86cffd7ca..68c466706cc 100644 --- a/geography/opencpn-plugin-statusbar/Makefile +++ b/geography/opencpn-plugin-statusbar/Makefile @@ -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 --git a/geography/opencpn-plugin-weather_routing/Makefile b/geography/opencpn-plugin-weather_routing/Makefile index ea9dd0ce7ee..8e2c6003ed8 100644 --- a/geography/opencpn-plugin-weather_routing/Makefile +++ b/geography/opencpn-plugin-weather_routing/Makefile @@ -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 \ diff --git a/geography/p5-Geo-Distance/Makefile b/geography/p5-Geo-Distance/Makefile index bf8e1887c91..891430135ad 100644 --- a/geography/p5-Geo-Distance/Makefile +++ b/geography/p5-Geo-Distance/Makefile @@ -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/BLUEFEET/Geo-Distance-0.20 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 --git a/geography/p5-Geo-Gpx/Makefile b/geography/p5-Geo-Gpx/Makefile index 970970b9dbe..8d49f5540c4 100644 --- a/geography/p5-Geo-Gpx/Makefile +++ b/geography/p5-Geo-Gpx/Makefile @@ -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/release/ANDYA/Geo-Gpx-0.26/lib/Geo/Gpx.pm 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 --git a/geography/qgis/Makefile b/geography/qgis/Makefile index 8ebbb017124..34b8306b9d7 100644 --- a/geography/qgis/Makefile +++ b/geography/qgis/Makefile @@ -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 diff --git a/geography/qgis/options.mk b/geography/qgis/options.mk index ead8cff804b..68dccb9b3a1 100644 --- a/geography/qgis/options.mk +++ b/geography/qgis/options.mk @@ -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" |