From 4904bdd53c317dcacca2795f830ca84321b3a857 Mon Sep 17 00:00:00 2001 From: rillig Date: Sat, 8 Jun 2019 11:04:27 +0000 Subject: 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. --- cad/atlc/Makefile | 4 ++-- cad/boolean/distinfo | 8 ++++---- cad/boolean/patches/patch-ab | 4 ++-- .../patch-apps_edit_src_drivers_printer.cpp | 4 ++-- .../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 +++++++++++----------- .../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 ++- .../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(-) diff --git a/cad/atlc/Makefile b/cad/atlc/Makefile index d40c03dc928..ba1e78eee82 100644 --- a/cad/atlc/Makefile +++ b/cad/atlc/Makefile @@ -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 @@ GNU_CONFIGURE= YES # 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 --git a/cad/boolean/distinfo b/cad/boolean/distinfo index c0db0bba067..8a8fd803045 100644 --- a/cad/boolean/distinfo +++ b/cad/boolean/distinfo @@ -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 --git a/cad/boolean/patches/patch-ab b/cad/boolean/patches/patch-ab index 2bfb77a811b..4bad44e99a4 100644 --- a/cad/boolean/patches/patch-ab +++ b/cad/boolean/patches/patch-ab @@ -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 --git a/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp b/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp index 2c2877f22df..92d2936dbd9 100644 --- a/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp +++ b/cad/boolean/patches/patch-apps_edit_src_drivers_printer.cpp @@ -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 --git a/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp b/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp index c6efd6c7577..e867ace9aa2 100644 --- a/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp +++ b/cad/boolean/patches/patch-apps_edit_src_gdssourc_text.cpp @@ -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 --git a/cad/electric/Makefile b/cad/electric/Makefile index 1e83f45cfcc..060e0b1797a 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -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 @@ USE_LANGUAGES= c c++ 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 --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile index 0a47bc93320..bacc3aa53c9 100644 --- a/cad/fastcap/Makefile +++ b/cad/fastcap/Makefile @@ -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 @@ WRKSRC= ${WRKDIR} 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-patch: 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 --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile index 0c2af9ca61f..74ec304edfb 100644 --- a/cad/fasthenry/Makefile +++ b/cad/fasthenry/Makefile @@ -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 @@ CONFIGURE_ARGS+= default .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 --git a/cad/gdsreader/Makefile b/cad/gdsreader/Makefile index 0a1c3a49b47..7bfb3174a64 100644 --- a/cad/gdsreader/Makefile +++ b/cad/gdsreader/Makefile @@ -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 @@ LICENSE= gnu-gpl-v2 EXAMPLESDIR= ${PREFIX}/share/examples/${PKGBASE} -AUTO_MKDIRS= yes +AUTO_MKDIRS= yes INSTALLATION_DIRS= bin ${EXAMPLESDIR} do-install: diff --git a/cad/geda/Makefile b/cad/geda/Makefile index 667bc9f12d2..e5ca32a0a71 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -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 @@ REPLACE_SH+= gnetlist/scripts/sch2eaglepos.sh 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 --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 65fc5afa34c..309a65d9285 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -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 @@ GNU_CONFIGURE= YES 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 --git a/cad/ghdl/Makefile b/cad/ghdl/Makefile index 65740811c16..e54b13643aa 100644 --- a/cad/ghdl/Makefile +++ b/cad/ghdl/Makefile @@ -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 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} 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 HOMEPAGE= https://sourceforge.net/p/ghdl-updates/wiki/Home/ diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 93f88d0b91c..1819d4d2c09 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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 --git a/cad/kicad-i18n/Makefile b/cad/kicad-i18n/Makefile index 902a1a6138f..16ec4b8ee59 100644 --- a/cad/kicad-i18n/Makefile +++ b/cad/kicad-i18n/Makefile @@ -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 @@ -15,10 +15,10 @@ COMMENT= user interface translations for the PCB CAD software 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 --git a/cad/kicad/Makefile b/cad/kicad/Makefile index c40886b3e3c..91570c6ed0a 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -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 @@ USE_CMAKE= yes 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 @@ SUBST_SED.macosx= -e 's/[[:<:]]MACOSX_BUNDLE[[:>:]]//' # PR 48980: no fabsl on netbsd-5 .if !empty(MACHINE_PLATFORM:MNetBSD-5.*) SUBST_CLASSES+= netbsd5 -SUBST_STAGE.netbsd5= pre-patch +SUBST_STAGE.netbsd5= post-extract SUBST_MESSAGE.netbsd5= Substituting fabs() for fabsl() for NetBSD-5 SUBST_FILES.netbsd5= pcbnew/legacy_plugin.cpp \ tools/test-nm-biu-to-ascii-mm-round-tripping.cpp diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo index fea1f658a14..66f1efaacd9 100644 --- a/cad/kicad/distinfo +++ b/cad/kicad/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2018/06/24 13:02:00 mef Exp $ +$NetBSD: distinfo,v 1.10 2019/06/08 11:04:28 rillig Exp $ SHA1 (kicad-4.0.7.tar.xz) = 6e4276edd0761f47008038c5ba8435653b2aee59 RMD160 (kicad-4.0.7.tar.xz) = 7bd4c81b1bf7ffc4c6d85e37dc5ec710783089d9 @@ -12,24 +12,24 @@ SHA1 (patch-CMakeModules_config.h.cmake) = 3988783a0058ed1b5489bc54d903cab2a724f SHA1 (patch-bitmaps_png_CMakeLists.txt) = 1202783b39af4ddf83b9def91eb72b058f2da5bb SHA1 (patch-common_CMakeLists.txt) = 18446b8aa7abbfa8c8598dda0fa7d98216a6f123 SHA1 (patch-common_richio.cpp) = 1e47e1ab5c2f0a2cee5b7bd20b47fc62930feda4 -SHA1 (patch-common_tool_tool_manager.cpp) = 242a0755b7aff280e5eb2b423a546f1dc4fdea2c +SHA1 (patch-common_tool_tool_manager.cpp) = 9f7f06e178a8c3960a8dc3196dc2e8c51a002a1e SHA1 (patch-cvpcb_CMakeLists.txt) = 2eaa753054851efab680f402fbf808d78d84205a SHA1 (patch-eeschema_CMakeLists.txt) = a6dec7f84f5854ccedc2cae5e8c290ea3d41bfa3 -SHA1 (patch-eeschema_sch_component.cpp) = 7b3363a917e408327061f313e7cce8f77f0977e8 -SHA1 (patch-eeschema_sch_sheet.cpp) = 83dd03910b1a7f78f46d3fc591bf5ec2670f2ce4 +SHA1 (patch-eeschema_sch_component.cpp) = 25a47fe8c2ddc44ac6c5e4bd34c8de35d36b799c +SHA1 (patch-eeschema_sch_sheet.cpp) = d86de4797b80819218c8022c852a5cdf2ac8b93b SHA1 (patch-gerbview_CMakeLists.txt) = 817f7fa3f27e77e42d37e0df4fab1525cfb35053 SHA1 (patch-include-kicad_string.h) = 16f2db87cab7716171360220a6c41d9a8ee5b8d1 SHA1 (patch-include_common.h) = 10395bb76634e43a7b4c7cf7f27c44c794793589 SHA1 (patch-include_hashtables.h) = 4b26adef481406b61c1c9cf660f69847aa76142d SHA1 (patch-include_kiway.h) = b8438a192222a4d70266ac612552fd0c76d2867c -SHA1 (patch-include_tool_coroutine.h) = 635534de04d268a5718ec21e4f86c7dd20f1ffe1 -SHA1 (patch-include_tool_tool_base.h) = e679ef52ebf39f5a3234c71f57381569836b2df3 -SHA1 (patch-include_tool_tool_interactive.h) = 4ef06e99001ee6db6828d2285ca2b77a0604564d +SHA1 (patch-include_tool_coroutine.h) = 79821c124e5eef7432d4629d5d3682171ca972a9 +SHA1 (patch-include_tool_tool_base.h) = 78698a0d513a13b63459626f92b5d06e21ab05de +SHA1 (patch-include_tool_tool_interactive.h) = 2cddceb5a2cfb681bc8f46bc39ef526b5d6db976 SHA1 (patch-pagelayout_editor_CMakeLists.txt) = 3e3d7bc448a3c9908ee4ed889b8e8c7bf3ac1b4a SHA1 (patch-pcb_calculator_CMakeLists.txt) = 97c34f8f2926b904275f36129a60fb7c523f506d SHA1 (patch-pcbnew_CMakeLists.txt) = 5898d0c2541ecdae4101906c5dc52250480260e6 -SHA1 (patch-pcbnew_class_edge_mod.cpp) = 3b868e0fd20bc091749f92cdb2124725df944104 -SHA1 (patch-pcbnew_class_track.cpp) = 6b11cba5b7c7f4b8b72a5a97263d95f2032a0854 -SHA1 (patch-pcbnew_kicad_plugin.cpp) = 6d5a1643bb234d8a6c0ddd3d7651c6360e59974d -SHA1 (patch-pcbnew_legacy_plugin.cpp) = 594ed6627be91662991c19624d45e0d3e944f3bf -SHA1 (patch-pcbnew_xchgmod.cpp) = d2f6750cd49ff25d73984d0eeb1141c5bf86c357 +SHA1 (patch-pcbnew_class_edge_mod.cpp) = d8b98f0770e1285a59186ea23af448cc19216c60 +SHA1 (patch-pcbnew_class_track.cpp) = 8ca03bb6292a125c5be42a51c442e9c6dc8c05df +SHA1 (patch-pcbnew_kicad_plugin.cpp) = cda16d23db89bb3db5f65a775d9555b22859dcb5 +SHA1 (patch-pcbnew_legacy_plugin.cpp) = d8dba73ee4c6eac54e7e2c7d30c3918451188f75 +SHA1 (patch-pcbnew_xchgmod.cpp) = e62c67e656cf7d9b08f9945ed2eaf59089258e6a diff --git a/cad/kicad/patches/patch-common_tool_tool_manager.cpp b/cad/kicad/patches/patch-common_tool_tool_manager.cpp index 761d35cb6a9..272210b680f 100644 --- a/cad/kicad/patches/patch-common_tool_tool_manager.cpp +++ b/cad/kicad/patches/patch-common_tool_tool_manager.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-common_tool_tool_manager.cpp,v 1.1 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-common_tool_tool_manager.cpp,v 1.2 2019/06/08 11:04:28 rillig Exp $ + Fix for newer boost, from upstream developement branch --- common/tool/tool_manager.cpp.orig 2016-09-03 22:47:46.000000000 +0200 diff --git a/cad/kicad/patches/patch-eeschema_sch_component.cpp b/cad/kicad/patches/patch-eeschema_sch_component.cpp index 0ea4da8975c..27c640408fa 100644 --- a/cad/kicad/patches/patch-eeschema_sch_component.cpp +++ b/cad/kicad/patches/patch-eeschema_sch_component.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-eeschema_sch_component.cpp,v 1.4 2016/09/21 13:16:07 bouyer Exp $ +$NetBSD: patch-eeschema_sch_component.cpp,v 1.5 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/kicad/patches/patch-eeschema_sch_sheet.cpp b/cad/kicad/patches/patch-eeschema_sch_sheet.cpp index 6e00d9746bc..1a4517aeac2 100644 --- a/cad/kicad/patches/patch-eeschema_sch_sheet.cpp +++ b/cad/kicad/patches/patch-eeschema_sch_sheet.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-eeschema_sch_sheet.cpp,v 1.3 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-eeschema_sch_sheet.cpp,v 1.4 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/kicad/patches/patch-include_tool_coroutine.h b/cad/kicad/patches/patch-include_tool_coroutine.h index 43d97a17ebf..d092b2adab0 100644 --- a/cad/kicad/patches/patch-include_tool_coroutine.h +++ b/cad/kicad/patches/patch-include_tool_coroutine.h @@ -1,4 +1,5 @@ -$NetBSD: patch-include_tool_coroutine.h,v 1.1 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-include_tool_coroutine.h,v 1.2 2019/06/08 11:04:28 rillig Exp $ + Fix for newer boost, from upstream developement branch --- include/tool/coroutine.h.orig 2016-09-07 19:04:03.000000000 +0200 diff --git a/cad/kicad/patches/patch-include_tool_tool_base.h b/cad/kicad/patches/patch-include_tool_tool_base.h index eea8f5a7556..64a50c62f72 100644 --- a/cad/kicad/patches/patch-include_tool_tool_base.h +++ b/cad/kicad/patches/patch-include_tool_tool_base.h @@ -1,4 +1,5 @@ -$NetBSD: patch-include_tool_tool_base.h,v 1.1 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-include_tool_tool_base.h,v 1.2 2019/06/08 11:04:28 rillig Exp $ + Fix for newer boost, from upstream developement branch --- include/tool/tool_base.h.orig 2016-09-03 22:47:50.000000000 +0200 diff --git a/cad/kicad/patches/patch-include_tool_tool_interactive.h b/cad/kicad/patches/patch-include_tool_tool_interactive.h index 82a7e5ef4da..5131b823a80 100644 --- a/cad/kicad/patches/patch-include_tool_tool_interactive.h +++ b/cad/kicad/patches/patch-include_tool_tool_interactive.h @@ -1,4 +1,5 @@ -$NetBSD: patch-include_tool_tool_interactive.h,v 1.1 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-include_tool_tool_interactive.h,v 1.2 2019/06/08 11:04:28 rillig Exp $ + Fix for newer boost, from upstream developement branch --- include/tool/tool_interactive.h.orig 2016-09-03 22:47:50.000000000 +0200 diff --git a/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp b/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp index 80cec47cf55..24707459ff8 100644 --- a/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp +++ b/cad/kicad/patches/patch-pcbnew_class_edge_mod.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-pcbnew_class_edge_mod.cpp,v 1.3 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-pcbnew_class_edge_mod.cpp,v 1.4 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/kicad/patches/patch-pcbnew_class_track.cpp b/cad/kicad/patches/patch-pcbnew_class_track.cpp index 1fcc9b79bf1..1cfaa091105 100644 --- a/cad/kicad/patches/patch-pcbnew_class_track.cpp +++ b/cad/kicad/patches/patch-pcbnew_class_track.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-pcbnew_class_track.cpp,v 1.3 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-pcbnew_class_track.cpp,v 1.4 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp b/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp index 4a056b110a7..7a88a6bb62f 100644 --- a/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp +++ b/cad/kicad/patches/patch-pcbnew_kicad_plugin.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-pcbnew_kicad_plugin.cpp,v 1.3 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-pcbnew_kicad_plugin.cpp,v 1.4 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp b/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp index 401661bc304..d88bb5bda2d 100644 --- a/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp +++ b/cad/kicad/patches/patch-pcbnew_legacy_plugin.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-pcbnew_legacy_plugin.cpp,v 1.3 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-pcbnew_legacy_plugin.cpp,v 1.4 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/kicad/patches/patch-pcbnew_xchgmod.cpp b/cad/kicad/patches/patch-pcbnew_xchgmod.cpp index 7826bb2880b..50eca9b24f5 100644 --- a/cad/kicad/patches/patch-pcbnew_xchgmod.cpp +++ b/cad/kicad/patches/patch-pcbnew_xchgmod.cpp @@ -1,4 +1,5 @@ -$NetBSD: patch-pcbnew_xchgmod.cpp,v 1.3 2016/09/08 09:32:28 bouyer Exp $ +$NetBSD: patch-pcbnew_xchgmod.cpp,v 1.4 2019/06/08 11:04:28 rillig Exp $ + 64bit time_t fix Reported upstream as bug id 1280901 diff --git a/cad/klayout/Makefile b/cad/klayout/Makefile index fb9f31bb458..a77b9f29c9a 100644 --- a/cad/klayout/Makefile +++ b/cad/klayout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2019/04/25 07:32:37 maya Exp $ +# $NetBSD: Makefile,v 1.19 2019/06/08 11:04:29 rillig Exp $ DISTNAME= klayout-0.25.6 PKGREVISION= 3 @@ -19,7 +19,7 @@ NO_CONFIGURE= yes SUBST_CLASSES+= rpath SUBST_MESSAGE.rpath= Add COMPILER_RPATH_FLAG and PREFIX to NetBSD specific config file SUBST_FILES.rpath+= config/Makefile.conf.netbsd-32-gcc-release -SUBST_STAGE.rpath= post-patch +SUBST_STAGE.rpath= pre-configure SUBST_VARS.rpath= COMPILER_RPATH_FLAG PREFIX LDFLAGS BUILDLINK_TRANSFORM.NetBSD+= rm:-ldl diff --git a/cad/libwcalc/Makefile b/cad/libwcalc/Makefile index 862d12d1466..8c0a148ff6d 100644 --- a/cad/libwcalc/Makefile +++ b/cad/libwcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/08 13:25:14 asau Exp $ +# $NetBSD: Makefile,v 1.7 2019/06/08 11:04:29 rillig Exp $ # .include "../../cad/wcalc/Makefile.common" @@ -23,7 +23,7 @@ USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE= libwcalc/wcalc.pc.in -BUILD_DIRS= ${WRKSRC} ${WRKSRC}/po +BUILD_DIRS= . po pre-build: ${MV} ${WRKSRC}/libwcalc/wcalc-config ${WRKSRC}/libwcalc/wcalc-config.bak diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 075b6201c2b..5442edb4679 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2018/03/12 11:16:08 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/06/08 11:04:29 rillig Exp $ # DISTNAME= magic-7.5.188 @@ -15,13 +15,13 @@ LICENSE= magic-license MAKE_JOBS_SAFE= no USE_TOOLS+= gmake printf csh -MAKE_ENV+= MAGIC_HOME=${PREFIX:Q} +MAKE_ENV+= MAGIC_HOME=${PREFIX} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR} GNU_CONFIGURE= yes -CONFIGURE_DIRS= scripts -BUILD_DIRS= ${WRKSRC} +CONFIGURE_DIRS= scripts +BUILD_DIRS= . -MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} +MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:M*:Q} REPLACE_CSH+= scripts/makedbh scripts/printmans diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile index 66af154ed83..41c8ad3cee1 100644 --- a/cad/mex-wcalc/Makefile +++ b/cad/mex-wcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2018/07/04 13:40:10 jperkin Exp $ +# $NetBSD: Makefile,v 1.12 2019/06/08 11:04:29 rillig Exp $ # .include "../../cad/wcalc/Makefile.common" @@ -45,21 +45,21 @@ ONLY_FOR_PLATFORM= Linux-*-i386 SunOS-*-sparc* .include "../../mk/bsd.prefs.mk" DEF_MATLAB_ARCH= unknown -DEF_MATLAB_MEX= mex -DEF_MEX_SUFX= unknown +DEF_MATLAB_MEX= mex +DEF_MEX_SUFX= unknown .if ${OPSYS} == "Linux" . if (${MACHINE_ARCH} == "i386") DEF_MATLAB_ARCH= glnx86 -DEF_MEX_SUFX= mexglx +DEF_MEX_SUFX= mexglx . endif .elif ${OPSYS} == "SunOS" . if (${MACHINE_ARCH} == "sparc") DEF_MATLAB_ARCH= sol2 -DEF_MEX_SUFX= mexsol +DEF_MEX_SUFX= mexsol . endif .endif -MATLAB_ARCH?= ${DEF_MATLAB_ARCH} -MEX_SUFX?= ${DEF_MEX_SUFX} +MATLAB_ARCH?= ${DEF_MATLAB_ARCH} +MEX_SUFX?= ${DEF_MEX_SUFX} MATLAB_MEX?= ${DEF_MATLAB_MEX} diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index 9543e68b76e..c0e3797dc1a 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2019/05/29 19:52:48 adam Exp $ +# $NetBSD: Makefile,v 1.56 2019/06/08 11:04:29 rillig Exp $ # DISTNAME= openscad-2015.03-3.src @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME:R} MAKE_JOBS_SAFE= no -CHECK_PORTABILITY_SKIP+=tests/compare-bitmaps.sh +CHECK_PORTABILITY_SKIP+= tests/compare-bitmaps.sh REPLACE_PYTHON= libraries/MCAD/get_submodules.py .include "../../lang/python/application.mk" diff --git a/cad/p5-gds2/Makefile b/cad/p5-gds2/Makefile index 92a2b953255..62817b4e33b 100644 --- a/cad/p5-gds2/Makefile +++ b/cad/p5-gds2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2018/08/22 09:43:00 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2019/06/08 11:04:29 rillig Exp $ DISTNAME= GDS2-3.35 PKGNAME= p5-${DISTNAME:tl} @@ -11,7 +11,7 @@ HOMEPAGE= http://search.cpan.org/dist/GDS2/lib/GDS2.pm COMMENT= Modules to read, write, and manipulate GDS2 (GDSII) stream files LICENSE= artistic -PERL5_PACKLIST= auto/GDS2/.packlist +PERL5_PACKLIST= auto/GDS2/.packlist .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/cad/py-gds/Makefile b/cad/py-gds/Makefile index fe0bb75dc13..47c6f1cc60d 100644 --- a/cad/py-gds/Makefile +++ b/cad/py-gds/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2018/07/07 12:04:00 mef Exp $ +# $NetBSD: Makefile,v 1.11 2019/06/08 11:04:29 rillig Exp $ VERSION= 1.3.1 DISTNAME= gdspy-${VERSION} -PKGNAME= ${PYPKGPREFIX}-gds-${VERSION} +PKGNAME= ${PYPKGPREFIX}-gds-${VERSION} CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_GITHUB:=heitzmann/} GITHUB_PROJECT= gdspy diff --git a/cad/py-gdscad/Makefile b/cad/py-gdscad/Makefile index 45b6d324ab6..e21a94240b3 100644 --- a/cad/py-gdscad/Makefile +++ b/cad/py-gdscad/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2019/04/26 13:13:44 maya Exp $ +# $NetBSD: Makefile,v 1.6 2019/06/08 11:04:29 rillig Exp $ DISTNAME= gdsCAD-0.4.5 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -CATEGORIES= cad python +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= cad python MASTER_SITES= ${MASTER_SITE_GITHUB:=hohlraum/} GITHUB_PROJECT= gdsCAD @@ -12,7 +12,7 @@ COMMENT= Package for creating, reading, and manipulating GDSII layout files LICENSE= gnu-gpl-v3 USE_LANGUAGES= # none -PYTHON_VERSIONS_INCOMPATIBLE= 36 37 +PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # PYSETUPBUILDTARGET= install .include "../../lang/python/egg.mk" diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 06dbb71b5cf..d187ed7570e 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/05/22 07:44:03 sbd Exp $ +# $NetBSD: Makefile,v 1.48 2019/06/08 11:04:30 rillig Exp $ DISTNAME= sp3f4.kit PKGNAME= spice-3f5.1 @@ -25,7 +25,7 @@ WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 -MAKE_ENV+= WRKSRC=${WRKSRC:Q} +MAKE_ENV+= WRKSRC=${WRKSRC} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "Linux" @@ -48,7 +48,7 @@ do-configure: do-build: cd ${WRKSRC} && env ${MAKE_ENV} util/build NetBSD default -INSTALLATION_DIRS+=share/examples/spice3 +INSTALLATION_DIRS+= share/examples/spice3 do-install: cd ${WRKSRC} && env ${MAKE_ENV} ${INSTALL_ENV} util/build NetBSD install diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index bd03b54735a..6ece560914b 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2018/03/12 11:16:08 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2019/06/08 11:04:30 rillig Exp $ # DISTNAME= tkgate-1.8.7 @@ -20,7 +20,7 @@ USE_TOOLS+= gm4 bison TKGATE_SITENAME= Earth CONFIGURE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q} -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} +CONFIGURE_ENV+= LOCALBASE=${PREFIX} SUBST_CLASSES+= tkgate SUBST_MESSAGE.tkgate= Fixing paths in configuration files. diff --git a/cad/tkgate/distinfo b/cad/tkgate/distinfo index 851d6b3489b..3d9cf30ff1e 100644 --- a/cad/tkgate/distinfo +++ b/cad/tkgate/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2016/04/21 13:15:15 jperkin Exp $ +$NetBSD: distinfo,v 1.12 2019/06/08 11:04:30 rillig Exp $ SHA1 (tkgate-1.8.7.tgz) = cf670ee0088c7bbd1f757d8647ec9b3a5ab58257 RMD160 (tkgate-1.8.7.tgz) = 87d7528f765adcd1b38fff4d019458fce1e855de SHA512 (tkgate-1.8.7.tgz) = 6a02d06b8394bb6601774cbfc699534e8fe337177aa59130f791b863b8080463c5d555b50d72e32bd710cfa6be6e4e8a5e681344ffb833e8b8d699d9032d1ab0 Size (tkgate-1.8.7.tgz) = 1541823 bytes -SHA1 (patch-Imakefile) = 6b10f8aa4e7fe40d5b804809e10ea4be8a256c72 +SHA1 (patch-Imakefile) = 362839de48f7d13e1dc51ee55a1573725401351e SHA1 (patch-aa) = e4ac73db08ae6cbd039e84e3640e5a23f3c7f840 SHA1 (patch-ab) = 1b80671b8ad504970f35d6413151439138269a1b diff --git a/cad/tkgate/patches/patch-Imakefile b/cad/tkgate/patches/patch-Imakefile index b30d826fdea..c6a965eaa4b 100644 --- a/cad/tkgate/patches/patch-Imakefile +++ b/cad/tkgate/patches/patch-Imakefile @@ -1,5 +1,7 @@ -$NetBSD: patch-Imakefile,v 1.1 2015/01/17 14:48:56 bsiegert Exp $ +$NetBSD: patch-Imakefile,v 1.2 2019/06/08 11:04:30 rillig Exp $ + Add DESTDIR support + --- Imakefile.orig 2004-06-09 19:16:06.000000000 +0200 +++ Imakefile 2014-12-13 18:35:32.000000000 +0100 @@ -99,4 +99,4 @@ diff --git a/cad/tnt-mmtl/Makefile b/cad/tnt-mmtl/Makefile index 2a96fb8b116..034e219202e 100644 --- a/cad/tnt-mmtl/Makefile +++ b/cad/tnt-mmtl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2018/03/12 11:16:09 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/06/08 11:04:30 rillig Exp $ # DISTNAME= tnt-1.2.2 @@ -28,7 +28,7 @@ USE_LANGUAGES= c c++ fortran77 # in turn ends up feeding a .F file to gcc -E that fails due to # fortran not being a configured language. This is what happens on # a stock NetBSD-5.1 install. -CONFIGURE_ENV+= CPP=${CPP} +CONFIGURE_ENV+= CPP=${CPP:Q} post-patch: ${MV} ${WRKSRC}/tnt ${WRKSRC}/tnt-mmtl diff --git a/cad/wcalc/Makefile b/cad/wcalc/Makefile index 8d94ec33906..9b09a10c735 100644 --- a/cad/wcalc/Makefile +++ b/cad/wcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/04/09 00:41:53 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2019/06/08 11:04:30 rillig Exp $ # META_PACKAGE= # empty @@ -33,7 +33,7 @@ DEPENDS+= gtk2-wcalc-${VER}*:../../cad/gtk2-wcalc # will not currently build correctly if you are using a # non-native matlab (i.e. linux or solaris matlab on NetBSD) ONLY_FOR_PLATFORM= Linux-*-i386 SunOS-*-sparc* -DEPENDS+= mex-wcalc-${VER}*:../../cad/mex-wcalc +DEPENDS+= mex-wcalc-${VER}*:../../cad/mex-wcalc .endif .include "../../mk/bsd.pkg.mk" diff --git a/cad/wcalc/Makefile.common b/cad/wcalc/Makefile.common index b0526215006..0bcebee67cb 100644 --- a/cad/wcalc/Makefile.common +++ b/cad/wcalc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2014/10/05 16:41:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2019/06/08 11:04:30 rillig Exp $ # # used by cad/wcalc/Makefile # used by cad/wcalc-docs/Makefile @@ -44,19 +44,19 @@ WCALC_CGIDIR?= libexec/cgi-bin WCALC_CGIPATH?= /cgi-wcalc/ # setup the directories and URI path -CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/${WCALC_HTMLDIR:Q} -CONFIGURE_ARGS+= --with-htmlpath=${WCALC_HTMLPATH:Q} -CONFIGURE_ARGS+= --with-cgibin=${PREFIX}/${WCALC_CGIDIR:Q} -CONFIGURE_ARGS+= --with-cgipath=${WCALC_CGIPATH:Q} +CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/${WCALC_HTMLDIR} +CONFIGURE_ARGS+= --with-htmlpath=${WCALC_HTMLPATH} +CONFIGURE_ARGS+= --with-cgibin=${PREFIX}/${WCALC_CGIDIR} +CONFIGURE_ARGS+= --with-cgipath=${WCALC_CGIPATH} # make sure we can refer to these paths in the MESSAGE -MESSAGE_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR:Q} -MESSAGE_SUBST+= WCALC_CGIPATH=${WCALC_CGIPATH:Q} -MESSAGE_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR:Q} -MESSAGE_SUBST+= WCALC_HTMLPATH=${WCALC_HTMLPATH:Q} +MESSAGE_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR} +MESSAGE_SUBST+= WCALC_CGIPATH=${WCALC_CGIPATH} +MESSAGE_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR} +MESSAGE_SUBST+= WCALC_HTMLPATH=${WCALC_HTMLPATH} MESSAGE_SUBST+= WCALC_DIR=${WCALC_DIR:Q} # and the PLIST too -PLIST_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR:Q} -PLIST_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR:Q} +PLIST_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR} +PLIST_SUBST+= WCALC_HTMLDIR=${WCALC_HTMLDIR} PLIST_SUBST+= WCALC_DIR=${WCALC_DIR:Q} diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 4adc50b9fcf..c7686ac7f3f 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2018/11/14 22:21:08 kleink Exp $ +# $NetBSD: Makefile,v 1.49 2019/06/08 11:04:30 rillig Exp $ DISTNAME= xcircuit-3.9.72 PKGREVISION= 3 @@ -20,16 +20,16 @@ EGDIR= share/examples/xcircuit .include "../../lang/tcl/Makefile.version" .include "../../x11/tk/Makefile.version" -CONFIGURE_ARGS+=--with-tcl=${BUILDLINK_PREFIX.tcl}/lib -CONFIGURE_ARGS+=--with-tk=${BUILDLINK_PREFIX.tk}/lib -CONFIGURE_ARGS+=--with-tclincls=${BUILDLINK_PREFIX.tcl}/include -CONFIGURE_ARGS+=--with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib -CONFIGURE_ARGS+=--with-tkincls=${BUILDLINK_PREFIX.tk}/include -CONFIGURE_ARGS+=--with-tklibs=${BUILDLINK_PREFIX.tk}/lib -#CFLAGS+= -DBUILTINS_DIR=${PREFIX}/lib/${DISTNAME:C/\.[^\.]*$//} +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib +CONFIGURE_ARGS+= --with-tclincls=${BUILDLINK_PREFIX.tcl}/include +CONFIGURE_ARGS+= --with-tcllibs=${BUILDLINK_PREFIX.tcl}/lib +CONFIGURE_ARGS+= --with-tkincls=${BUILDLINK_PREFIX.tk}/include +CONFIGURE_ARGS+= --with-tklibs=${BUILDLINK_PREFIX.tk}/lib +#CFLAGS+= -DBUILTINS_DIR=${PREFIX}/lib/${DISTNAME:C/\.[^\.]*$//} -BUILD_TARGET= tcl -INSTALL_TARGET= install-tcl +BUILD_TARGET= tcl +INSTALL_TARGET= install-tcl INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${EGDIR} post-extract: -- cgit v1.2.3