pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/cad cad/*: let pkglint fix indentation, variable align...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5a5310d1578d
branches:  trunk
changeset: 396733:5a5310d1578d
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jun 08 11:04:27 2019 +0000

description:
cad/*: let pkglint fix indentation, variable alignment, and LOCALBASE

pkglint -Wall -r -F cad

Manually fixed the indentation in cad/ghdl/Makefile because SITES.* was
(by the current definition) not long enough to count as an outlier line,
and because of this, all other lines were aligned to that line.

diffstat:

 cad/atlc/Makefile                                           |   4 +-
 cad/boolean/distinfo                                        |   8 ++--
 cad/boolean/patches/patch-ab                                |   4 +-
 cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp |   4 +-
 cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp   |   4 +-
 cad/electric/Makefile                                       |   6 +-
 cad/fastcap/Makefile                                        |   8 ++--
 cad/fasthenry/Makefile                                      |   4 +-
 cad/gdsreader/Makefile                                      |   4 +-
 cad/geda/Makefile                                           |   4 +-
 cad/gerbv/Makefile                                          |   4 +-
 cad/ghdl/Makefile                                           |   5 +-
 cad/gtkwave/Makefile                                        |   6 +-
 cad/kicad-i18n/Makefile                                     |  10 ++--
 cad/kicad/Makefile                                          |   6 +-
 cad/kicad/distinfo                                          |  24 ++++++------
 cad/kicad/patches/patch-common_tool_tool_manager.cpp        |   3 +-
 cad/kicad/patches/patch-eeschema_sch_component.cpp          |   3 +-
 cad/kicad/patches/patch-eeschema_sch_sheet.cpp              |   3 +-
 cad/kicad/patches/patch-include_tool_coroutine.h            |   3 +-
 cad/kicad/patches/patch-include_tool_tool_base.h            |   3 +-
 cad/kicad/patches/patch-include_tool_tool_interactive.h     |   3 +-
 cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp           |   3 +-
 cad/kicad/patches/patch-pcbnew_class_track.cpp              |   3 +-
 cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp             |   3 +-
 cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp            |   3 +-
 cad/kicad/patches/patch-pcbnew_xchgmod.cpp                  |   3 +-
 cad/klayout/Makefile                                        |   4 +-
 cad/libwcalc/Makefile                                       |   4 +-
 cad/magic/Makefile                                          |  10 ++--
 cad/mex-wcalc/Makefile                                      |  14 +++---
 cad/openscad/Makefile                                       |   4 +-
 cad/p5-gds2/Makefile                                        |   4 +-
 cad/py-gds/Makefile                                         |   4 +-
 cad/py-gdscad/Makefile                                      |   8 ++--
 cad/spice/Makefile                                          |   6 +-
 cad/tkgate/Makefile                                         |   4 +-
 cad/tkgate/distinfo                                         |   4 +-
 cad/tkgate/patches/patch-Imakefile                          |   4 +-
 cad/tnt-mmtl/Makefile                                       |   4 +-
 cad/wcalc/Makefile                                          |   4 +-
 cad/wcalc/Makefile.common                                   |  22 +++++-----
 cad/xcircuit/Makefile                                       |  20 +++++-----
 43 files changed, 136 insertions(+), 122 deletions(-)

diffs (truncated from 815 to 300 lines):

diff -r c8b587ec1212 -r 5a5310d1578d cad/atlc/Makefile
--- a/cad/atlc/Makefile Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/atlc/Makefile Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/10/08 13:25:11 asau Exp $
+# $NetBSD: Makefile,v 1.15 2019/06/08 11:04:27 rillig Exp $
 #
 
 DISTNAME=      atlc-4.6.0
@@ -16,7 +16,7 @@
 # note:  the check target builds some of the
 # example files which get installed.
 BUILD_TARGET=  all check
-TEST_DIRS=     ${WRKSRC}
+TEST_DIRS=     .
 TEST_TARGET=   check
 
 INSTALLATION_DIRS=     share/examples/atlc
diff -r c8b587ec1212 -r 5a5310d1578d cad/boolean/distinfo
--- a/cad/boolean/distinfo      Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/boolean/distinfo      Sat Jun 08 11:04:27 2019 +0000
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2015/11/03 00:21:16 agc Exp $
+$NetBSD: distinfo,v 1.20 2019/06/08 11:04:27 rillig Exp $
 
 SHA1 (boolean_6_99.tgz) = 03e8dc7c9aa2886b0d5663669248c507524c5b22
 RMD160 (boolean_6_99.tgz) = 7977bb140169fa15a7dde9709ba1867e763b7b9c
 SHA512 (boolean_6_99.tgz) = bbcb6a50782e8c3a919defaf5977b119bfa7ba7e8e51203109c1f01050d64912e65828db51d18f62b7b515f607fd80870e507ce271aa577206c1cb8f953ce293
 Size (boolean_6_99.tgz) = 4270460 bytes
 SHA1 (patch-aa) = 0ca93dd87f8c314d718b63a14a94cbea7739b5a3
-SHA1 (patch-ab) = de9890d92db5a2957b1372e9562eb1d416f7f4b1
+SHA1 (patch-ab) = c96c4b0b6b77fa5f0c89c70b4cca0b4414df8d0f
 SHA1 (patch-apps_edit_src_drivers_gdsdrin.cpp) = 8845e71816bae65cb38c86217483ac868f5a0ce1
-SHA1 (patch-apps_edit_src_drivers_printer.cpp) = fcbe44d1f059bb9ee2cf8301a7f02ec0686b318a
-SHA1 (patch-apps_edit_src_gdssourc_text.cpp) = da50d4d3156e807177cdc7d71c8de586dbd04f6d
+SHA1 (patch-apps_edit_src_drivers_printer.cpp) = e0bd3047d9dfd2501c5c1ada4f46dbdc4db2e56b
+SHA1 (patch-apps_edit_src_gdssourc_text.cpp) = 02069e2b41509af261630f5c7d90f16fbd4024da
 SHA1 (patch-apps_edit_src_intrface_strucdlg_cpp) = 44637ca6b71f722c55f0986ee31ee29f35fe8858
diff -r c8b587ec1212 -r 5a5310d1578d cad/boolean/patches/patch-ab
--- a/cad/boolean/patches/patch-ab      Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/boolean/patches/patch-ab      Sat Jun 08 11:04:27 2019 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.7 2012/11/16 00:32:50 joerg Exp $
+$NetBSD: patch-ab,v 1.8 2019/06/08 11:04:27 rillig Exp $
 
 - configure for pkgsrc
 
 --- bin/FindwxWidgets.cmake.orig       2008-10-13 12:59:48.000000000 +0000
 +++ bin/FindwxWidgets.cmake
-@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )
+@@ -137,9 +137,9 @@ SET( wxWidgets_UCD "" )
  SET( wxWidgets_DBG "" )
  
  OPTION( wxWidgets_USE_MONOLITHIC "Use wxWidgets build as monolithic library" OFF)
diff -r c8b587ec1212 -r 5a5310d1578d cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp
--- a/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp       Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp       Sat Jun 08 11:04:27 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_edit_src_drivers_printer.cpp,v 1.1 2012/10/20 22:03:01 joerg Exp $
+$NetBSD: patch-apps_edit_src_drivers_printer.cpp,v 1.2 2019/06/08 11:04:27 rillig Exp $
 
 --- apps/edit/src/drivers/printer.cpp.orig     2012-10-20 12:02:42.000000000 +0000
 +++ apps/edit/src/drivers/printer.cpp
-@@ -87,7 +87,8 @@ bool PrintDriver::OnPrintPage(int)
+@@ -87,7 +87,8 @@ bool PrintDriver::OnPrintPage(int)
        // Multiply the points with the relative matrix
        for (int i = 0; i < 4; i++)
        {
diff -r c8b587ec1212 -r 5a5310d1578d cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp
--- a/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp Sat Jun 08 11:04:27 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-apps_edit_src_gdssourc_text.cpp,v 1.1 2012/10/20 22:03:01 joerg Exp $
+$NetBSD: patch-apps_edit_src_gdssourc_text.cpp,v 1.2 2019/06/08 11:04:27 rillig Exp $
 
 --- apps/edit/src/gdssourc/text.cpp.orig       2012-10-20 11:58:47.000000000 +0000
 +++ apps/edit/src/gdssourc/text.cpp
-@@ -61,9 +61,10 @@ void Text::DoWrite(DrawDriver& dr)
+@@ -61,9 +61,10 @@ void Text::DoWrite(DrawDriver& dr)
  
        dr.SetSelected(GetSelect());
  
diff -r c8b587ec1212 -r 5a5310d1578d cad/electric/Makefile
--- a/cad/electric/Makefile     Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/electric/Makefile     Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2012/10/08 13:25:12 asau Exp $
+# $NetBSD: Makefile,v 1.21 2019/06/08 11:04:27 rillig Exp $
 #
 
 DISTNAME=      electric-7.00
@@ -16,11 +16,11 @@
 post-patch:
        ${MV} ${WRKSRC}/src/include/config.h ${WRKSRC}/src/include/config.h.bak
        ${SED}  -e 's;@prefix@;${PREFIX};g' \
-               -e 's;@localbase@;${LOCALBASE};g' \
+               -e 's;@localbase@;${PREFIX};g' \
                < ${WRKSRC}/src/include/config.h.bak \
                > ${WRKSRC}/src/include/config.h
 
-INSTALL_TARGET=        install install.html
+INSTALL_TARGET=                install install.html
 INSTALLATION_DIRS=     bin
 
 .include "../../mk/motif.buildlink3.mk"
diff -r c8b587ec1212 -r 5a5310d1578d cad/fastcap/Makefile
--- a/cad/fastcap/Makefile      Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/fastcap/Makefile      Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2012/10/08 13:25:12 asau Exp $
+# $NetBSD: Makefile,v 1.38 2019/06/08 11:04:28 rillig Exp $
 #
 
 DISTNAME=      fastcap-2.0-18Sep92
@@ -26,8 +26,8 @@
 HAS_CONFIGURE=         yes
 CONFIGURE_SCRIPT=      ./config
 CONFIGURE_ARGS+=       4
-MAKE_ENV+=             BIBTEX=${LOCALBASE}/bin/bibtex \
-                       LATEX=${LOCALBASE}/bin/latex
+MAKE_ENV+=             BIBTEX=${PREFIX}/bin/bibtex \
+                       LATEX=${PREFIX}/bin/latex
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=             2.95.3
@@ -41,7 +41,7 @@
 post-build:
        cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} manual
 .for file in mtt tcad ug
-       cd ${WRKSRC}/doc && ${LOCALBASE}/bin/dvips -R0 -o ${file}.ps ${file}.dvi
+       cd ${WRKSRC}/doc && ${PREFIX}/bin/dvips -R0 -o ${file}.ps ${file}.dvi
 .endfor
 
 do-install:
diff -r c8b587ec1212 -r 5a5310d1578d cad/fasthenry/Makefile
--- a/cad/fasthenry/Makefile    Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/fasthenry/Makefile    Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/10/08 13:25:12 asau Exp $
+# $NetBSD: Makefile,v 1.30 2019/06/08 11:04:28 rillig Exp $
 #
 
 DISTNAME=      fasthenry-3.0-12Nov96
@@ -20,7 +20,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-LIBS+=         ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
+LIBS+=         ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 .if (${MACHINE_ARCH} == "alpha")
 #
 # optimized libffm (free fast math library)
diff -r c8b587ec1212 -r 5a5310d1578d cad/gdsreader/Makefile
--- a/cad/gdsreader/Makefile    Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/gdsreader/Makefile    Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/10/21 22:38:44 mef Exp $
+# $NetBSD: Makefile,v 1.9 2019/06/08 11:04:28 rillig Exp $
 #
 
 DISTNAME=      GDSreader.0.3.2
@@ -13,7 +13,7 @@
 
 EXAMPLESDIR=   ${PREFIX}/share/examples/${PKGBASE}
 
-AUTO_MKDIRS=   yes
+AUTO_MKDIRS=           yes
 INSTALLATION_DIRS=     bin ${EXAMPLESDIR}
 
 do-install:
diff -r c8b587ec1212 -r 5a5310d1578d cad/geda/Makefile
--- a/cad/geda/Makefile Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/geda/Makefile Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2019/04/25 07:32:37 maya Exp $
+# $NetBSD: Makefile,v 1.120 2019/06/08 11:04:28 rillig Exp $
 
 DISTNAME=      geda-gaf-1.8.2
 PKGNAME=       ${DISTNAME:S/-gaf-/-/}
@@ -58,7 +58,7 @@
 USE_TOOLS+=            sh:run
 
 # for gsch2pcb
-CONFIGURE_ARGS+=       --with-pcb-datadir=${LOCALBASE}/share
+CONFIGURE_ARGS+=       --with-pcb-datadir=${PREFIX}/share
 USE_TOOLS+=            gawk:run lex perl:run pkg-config
 
 # disable groff for a consistent build
diff -r c8b587ec1212 -r 5a5310d1578d cad/gerbv/Makefile
--- a/cad/gerbv/Makefile        Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/gerbv/Makefile        Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2018/11/14 22:21:07 kleink Exp $
+# $NetBSD: Makefile,v 1.71 2019/06/08 11:04:28 rillig Exp $
 #
 
 DISTNAME=      gerbv-2.6.2
@@ -15,7 +15,7 @@
 USE_LIBTOOL=   YES
 USE_TOOLS+=    gmake pkg-config
 
-PLIST_SUBST+=  PKGNAME_NOREV=${PKGNAME_NOREV:Q}
+PLIST_SUBST+=  PKGNAME_NOREV=${PKGNAME_NOREV}
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff -r c8b587ec1212 -r 5a5310d1578d cad/ghdl/Makefile
--- a/cad/ghdl/Makefile Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/ghdl/Makefile Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/01/28 16:24:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/06/08 11:04:28 rillig Exp $
 
 GCCVER=                4.9.2
 DISTNAME=      ghdl-0.32rc1
@@ -8,7 +8,8 @@
 EXTRACT_SUFX=  .tar.bz2
 GCCDISTNAME=   gcc-${GCCVER}.tar.bz2
 DISTFILES+=    ${DISTNAME}${EXTRACT_SUFX} ${GCCDISTNAME}
-SITES.${GCCDISTNAME}=  ${MASTER_SITE_GNU:=gcc/gcc-${GCCVER}/}
+SITES.${GCCDISTNAME}= \
+       ${MASTER_SITE_GNU:=gcc/gcc-${GCCVER}/}
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://sourceforge.net/p/ghdl-updates/wiki/Home/
diff -r c8b587ec1212 -r 5a5310d1578d cad/gtkwave/Makefile
--- a/cad/gtkwave/Makefile      Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/gtkwave/Makefile      Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2019/04/13 23:38:40 mef Exp $
+# $NetBSD: Makefile,v 1.98 2019/06/08 11:04:28 rillig Exp $
 #
 
 DISTNAME=              gtkwave-3.3.100
@@ -17,8 +17,8 @@
 USE_TOOLS+=            gmake pkg-config
 USE_LANGUAGES+=                c c++
 
-PTHREAD_AUTO_VARS=     yes
-CHECK_PORTABILITY_SKIP+= contrib/bundle_for_osx/launcher.sh
+PTHREAD_AUTO_VARS=             yes
+CHECK_PORTABILITY_SKIP+=       contrib/bundle_for_osx/launcher.sh
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtkwave
 PKG_SUPPORTED_OPTIONS= gtkwave-tcl gconf
diff -r c8b587ec1212 -r 5a5310d1578d cad/kicad-i18n/Makefile
--- a/cad/kicad-i18n/Makefile   Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/kicad-i18n/Makefile   Sat Jun 08 11:04:27 2019 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2018/03/01 13:59:11 mef Exp $
+# $NetBSD: Makefile,v 1.4 2019/06/08 11:04:29 rillig Exp $
 #
 
 V=             4.0.7
 DISTNAME=      kicad-i18n-${V}
 CATEGORIES=    cad
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=KiCad/}
-GITHUB_TAG=     ${PKGVERSION_NOREV}
-EXTRACT_SUFX=   .zip
+GITHUB_TAG=    ${PKGVERSION_NOREV}
+EXTRACT_SUFX=  .zip
 
 
 MAINTAINER=    bouyer%NetBSD.org@localhost
@@ -15,10 +15,10 @@
 LICENSE=       gnu-gpl-v2
 CMAKE_ARGS+=   -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V}
 
-USE_CMAKE=             yes
+USE_CMAKE=     yes
 BUILD_DIRS=    obj
 CONFIGURE_DIRS=        ${BUILD_DIRS}
-CMAKE_ARG_PATH= ..
+CMAKE_ARG_PATH=        ..
 
 pre-configure:
        cd ${WRKSRC} && mkdir ${BUILD_DIRS}
diff -r c8b587ec1212 -r 5a5310d1578d cad/kicad/Makefile
--- a/cad/kicad/Makefile        Sat Jun 08 10:53:26 2019 +0000
+++ b/cad/kicad/Makefile        Sat Jun 08 11:04:27 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/05/29 19:52:48 adam Exp $
+# $NetBSD: Makefile,v 1.32 2019/06/08 11:04:28 rillig Exp $
 #
 
 V=             4.0.7
@@ -20,7 +20,7 @@
 CMAKE_ARGS+=           -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V}
 CMAKE_ARGS+=           -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON
 
-CMAKE_MODULE_PATH_OVERRIDE = \
+CMAKE_MODULE_PATH_OVERRIDE= \
                        bitmaps_png/CMakeLists.txt \
                        new/CMakeLists.txt \
                        tools/CMakeLists.txt
@@ -42,7 +42,7 @@
 # PR 48980: no fabsl on netbsd-5
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
 SUBST_CLASSES+=                netbsd5
-SUBST_STAGE.netbsd5=   pre-patch



Home | Main Index | Thread Index | Old Index