diff options
| author | rillig <rillig@pkgsrc.org> | 2019-06-08 10:40:52 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-06-08 10:40:52 +0000 |
| commit | 37e00aed2490bb1d138d2efea985ff2c50f65e80 (patch) | |
| tree | 999a8b949a2cb29871cfdef47462749db698fe33 | |
| parent | 377e9ef125b86aa0e854d8d3689c4eeacfa0a4dc (diff) | |
| download | pkgsrc-37e00aed2490bb1d138d2efea985ff2c50f65e80.tar.gz | |
editors/*: let pkglint fix indentation and variable alignment
pkglint -Wall -F -r editors
Manually fixed the changes in editors/nedit since the "fixed" indentation
was wrong.
93 files changed, 341 insertions, 304 deletions
diff --git a/editors/Sigil/Makefile b/editors/Sigil/Makefile index 745bb1a827f..0b398ce7eb2 100644 --- a/editors/Sigil/Makefile +++ b/editors/Sigil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.120 2019/04/25 07:32:51 maya Exp $ +# $NetBSD: Makefile,v 1.121 2019/06/08 10:40:52 rillig Exp $ DISTNAME= Sigil-0.9.13 PKGREVISION= 2 @@ -22,7 +22,7 @@ Qt5_DIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 ALL_ENV+= Qt5_DIR=${Qt5_DIR} BUILDLINK_TRANSFORM+= opt:-O2:-O0 -#MAKE_ENV+= CXX_FLAGS="-g" +#MAKE_ENV+= CXX_FLAGS="-g" USE_LANGUAGES= c c++0x USE_CMAKE= yes @@ -38,9 +38,9 @@ BUILDLINK_TRANSFORM+= l:zlib:z #LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib PYTHON_VERSIONS_INCOMPATIBLE= 27 -REPLACE_PYTHON+= src/Resource_Files/*/*/*/*.py -REPLACE_PYTHON+= src/Resource_Files/*/*/*.py -REPLACE_PYTHON+= src/Resource_Files/*/*.py +REPLACE_PYTHON+= src/Resource_Files/*/*/*/*.py +REPLACE_PYTHON+= src/Resource_Files/*/*/*.py +REPLACE_PYTHON+= src/Resource_Files/*/*.py .include "../../textproc/xerces-c/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile index 1798d054b73..a0b323d4539 100644 --- a/editors/abiword-plugins/Makefile +++ b/editors/abiword-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2019/04/03 00:32:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.101 2019/06/08 10:40:53 rillig Exp $ .include "../../editors/abiword/Makefile.common" DISTNAME= abiword-${ABIVERSION} @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 DISTINFO_FILE= ${.CURDIR}/../../editors/abiword/distinfo PATCHDIR= ${.CURDIR}/../../editors/abiword/patches -CONFLICTS= abiword-plugins-[0-9]* abiword-personal-[0-9]* abiword2-[0-9]* +CONFLICTS= abiword-plugins-[0-9]* abiword-personal-[0-9]* abiword2-[0-9]* GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --with-inter7eps=no # evolution data server can't be found even if buildlinked # disable to make sure it's not found somewhere else -CONFIGURE_ARGS+= --with-evolution-data-server=no +CONFIGURE_ARGS+= --with-evolution-data-server=no # Disabled plugins: gda rsvg mathview # rsvg is not needed with gtk, we don't have libgnomedb diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 36a0004e526..85e7ab078db 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.185 2019/04/03 00:32:40 ryoon Exp $ +# $NetBSD: Makefile,v 1.186 2019/06/08 10:40:52 rillig Exp $ .include "Makefile.common" DISTNAME= abiword-${ABIVERSION} @@ -11,7 +11,7 @@ HOMEPAGE= http://www.abiword.com/ COMMENT= Open Source cross-platform word processor LICENSE= gnu-gpl-v2 -CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* +CONFLICTS= abiword-personal-[0-9]* abiword2-[0-9]* DEPENDS+= adwaita-icon-theme>0:../../graphics/adwaita-icon-theme @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --enable-spell # (Gtk+ only) include spell checking sup CONFIGURE_ARGS+= --enable-plugins="" # evolution data server can't be found even if buildlinked # disable to make sure it's not found somewhere else -CONFIGURE_ARGS+= --with-evolution-data-server=no +CONFIGURE_ARGS+= --with-evolution-data-server=no PKGCONFIG_OVERRIDE+= libabiword.pc.in diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index d7765427a2c..3ee58787bad 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.47 2018/11/24 19:14:09 nia Exp $ +# $NetBSD: Makefile.common,v 1.48 2019/06/08 10:40:53 rillig Exp $ # used by editors/abiword-plugins/Makefile -ABIVERSION=3.0.2 +ABIVERSION= 3.0.2 diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 74f5db23d98..32e873a61e6 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,25 +1,25 @@ -$NetBSD: distinfo,v 1.77 2018/12/28 22:24:52 gutteridge Exp $ +$NetBSD: distinfo,v 1.78 2019/06/08 10:40:53 rillig Exp $ SHA1 (abiword-3.0.2.tar.gz) = 8226e0962e6667e0a461955a0ac680a629e0b55a RMD160 (abiword-3.0.2.tar.gz) = fde551492b0cffa7d522082906f374490bd47f5c SHA512 (abiword-3.0.2.tar.gz) = 29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 Size (abiword-3.0.2.tar.gz) = 11154333 bytes SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7 -SHA1 (patch-plugin-configure.m4) = ccdb6932b389694998a8d50676347d4fa6a03910 +SHA1 (patch-plugin-configure.m4) = 50b5b6be8a1e8270c7ce45a4ed94cb5d436516f2 SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7 -SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269 +SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 2b245de4beb2f4b9b8cd8593c811bb086bb2bde3 SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445 SHA1 (patch-plugins_mht_xp_tidyReader.h) = fa4ef0ee7f893fb070b76e21aaad4efd9b8b27ee -SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b -SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6 +SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = d0b6f3c23c1512c6517775ce9a5ae78f168931fc +SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = 3cdad7a1755db036e3299368b4b11e10feff1875 SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898 -SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1 -SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9 -SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e -SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc -SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3 -SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e +SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = 027dadfb6effbb25fafda6b69e9c92c8046e52f7 +SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = e677c06d7e6c0a97ab7a4003471adae2148ce435 +SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 4931688c7cb82b9fe41cb42bb9bc604f6606ef4e +SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = 255ac57f2f127d76aff6bdbf1f0ddc223a673ca9 +SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = a3eac8abff26bf91f698948430e89bff13db710b +SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 7eb0296fdff2fa27288f4c68fc337ba105695551 SHA1 (patch-src_af_gr_gtk_gr__UnixCairoGraphics.cpp) = 2fb170202d13c9ddf077cea545d8d8f79fdbf5c2 SHA1 (patch-src_af_gr_gtk_gr__UnixImage.cpp) = 2546621961ce959a8d5078ff52efa4650362be54 SHA1 (patch-src_af_gr_xp_gr__Caret.cpp) = 96b186c4fc762f6734226b4505e2d4c64fb2b03a @@ -28,9 +28,9 @@ SHA1 (patch-src_af_gr_xp_gr__Graphics.cpp) = 9cf398ea8e787e5820d41182c005fe2906c SHA1 (patch-src_af_gr_xp_gr__Graphics.h) = a3539f0e2e3a8f661a01428f7550f8a4bebb1ee5 SHA1 (patch-src_af_util_unix_ut__unixTimer.cpp) = 543d8977c8da5c1db4e26581d82f72a4f936f190 SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4 -SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4 +SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 18529454262fe6cb3ae15fd485c7bcc8adb00ae3 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f -SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d +SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = cf7078a6bfdf9ac9b30478d11d9d3a81a95b8ed1 SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d SHA1 (patch-src_af_util_xp_ut__png.cpp) = 9f4ae043873fc6d66e063419d0736bb6104483b0 SHA1 (patch-src_af_xap_gtk_xap__UnixFrameImpl.cpp) = 5b67bd234209beddc751e7c98b17cf1844b73b1a diff --git a/editors/abiword/options.mk b/editors/abiword/options.mk index 449024bfb56..be80c93c29b 100644 --- a/editors/abiword/options.mk +++ b/editors/abiword/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2018/11/24 19:14:09 nia Exp $ +# $NetBSD: options.mk,v 1.4 2019/06/08 10:40:53 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.abiword PKG_SUPPORTED_OPTIONS= debug @@ -11,7 +11,7 @@ PKG_SUPPORTED_OPTIONS= debug .if !empty(PKG_OPTIONS:Mdebug) CC+= -ggdb CXX+= -ggdb -CONFIGURE_ARGS+= --enable-debug +CONFIGURE_ARGS+= --enable-debug INSTALL_UNSTRIPPED= yes CFLAGS+= -O0 .endif diff --git a/editors/abiword/patches/patch-plugin-configure.m4 b/editors/abiword/patches/patch-plugin-configure.m4 index e17954c733f..83ba0eb62fe 100644 --- a/editors/abiword/patches/patch-plugin-configure.m4 +++ b/editors/abiword/patches/patch-plugin-configure.m4 @@ -1,6 +1,8 @@ -$NetBSD: patch-plugin-configure.m4,v 1.2 2018/11/24 19:14:09 nia Exp $ +$NetBSD: patch-plugin-configure.m4,v 1.3 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugin-configure.m4.orig 2016-10-21 00:42:58.000000000 +0000 +++ plugin-configure.m4 @@ -72,7 +72,7 @@ AC_SUBST([GRAMMAR_CFLAGS]) diff --git a/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp b/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp index a6fa799c1f5..5e5d5a9ea1c 100644 --- a/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp +++ b/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp @@ -1,5 +1,7 @@ -$NetBSD: patch-plugins_gimp_xp_AbiGimp.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_gimp_xp_AbiGimp.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * Fix seg fault. + --- plugins/gimp/xp/AbiGimp.cpp.orig 2013-12-23 02:37:58.000000000 +0000 +++ plugins/gimp/xp/AbiGimp.cpp @@ -249,6 +249,10 @@ AbiGimp_invoke(AV_View* /*v*/, EV_EditMe diff --git a/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp b/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp index 5148dfc55c5..7c4d3794ada 100644 --- a/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp +++ b/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_paint_xp_AbiGeneric.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_paint_xp_AbiGeneric.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + If pFrame is NULL an image is obviously not selected. Fixes seg fault. + --- plugins/paint/xp/AbiGeneric.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/paint/xp/AbiGeneric.cpp @@ -297,6 +297,9 @@ bool isImageSelected (void) diff --git a/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp b/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp index 2dd14b28b90..93280ef71f0 100644 --- a/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp +++ b/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp @@ -1,5 +1,7 @@ -$NetBSD: patch-plugins_paint_xp_AbiPaint.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_paint_xp_AbiPaint.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * Fix seg fault. + --- plugins/paint/xp/AbiPaint.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/paint/xp/AbiPaint.cpp @@ -177,6 +177,9 @@ static DECLARE_ABI_PLUGIN_METHOD(specify diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am b/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am index d397e59401f..b3197c03ea3 100644 --- a/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am +++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_wordperfect_xp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_wordperfect_xp_Makefile.am,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugins/wordperfect/xp/Makefile.am.orig 2008-05-08 13:12:53.000000000 +0000 +++ plugins/wordperfect/xp/Makefile.am @@ -6,8 +6,6 @@ AM_CPPFLAGS = \ diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp index c315a1cafcd..2bc594452be 100644 --- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp +++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp @@ -31,6 +31,8 @@ diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h index 9e9a48a6eb8..e5470f2dd6c 100644 --- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h +++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugins/wordperfect/xp/ie_imp_WordPerfect.h.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/wordperfect/xp/ie_imp_WordPerfect.h @@ -30,7 +30,7 @@ diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp index 1e87a858f54..2a5cbcf415e 100644 --- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp +++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/wordperfect/xp/ie_impexp_WordPerfect.cpp @@ -35,7 +35,6 @@ diff --git a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h index 056bd3ae21c..4317a96eda5 100644 --- a/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h +++ b/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugins/wordperfect/xp/ie_impexp_WordPerfect.h.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/wordperfect/xp/ie_impexp_WordPerfect.h @@ -24,7 +24,6 @@ diff --git a/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp b/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp index 1a065d11e44..740d416ca6f 100644 --- a/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp +++ b/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp @@ -1,6 +1,8 @@ -$NetBSD: patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * adapt wordperfect plugins to dependecies available in pkgsrc from abiword svn date 2014-12-27 + --- plugins/wpg/xp/ie_impGraphic_WPG.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ plugins/wpg/xp/ie_impGraphic_WPG.cpp @@ -31,37 +31,43 @@ diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp index 49a3f973a9e..226c952fdd3 100644 --- a/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp +++ b/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp @@ -1,5 +1,7 @@ -$NetBSD: patch-src_af_util_xp_ut__iconv.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-src_af_util_xp_ut__iconv.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * NetBSD uses citrus iconv that has UCS-4 + --- src/af/util/xp/ut_iconv.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ src/af/util/xp/ut_iconv.cpp @@ -267,9 +267,11 @@ const char * ucs4Internal () diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp b/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp index 5d884912871..d068f2ac6b5 100644 --- a/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp +++ b/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp @@ -1,6 +1,8 @@ -$NetBSD: patch-src_af_util_xp_ut__mbtowc.cpp,v 1.1 2015/09/13 21:32:13 nros Exp $ +$NetBSD: patch-src_af_util_xp_ut__mbtowc.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $ + * remove bom if it comes with the conversion makes the rulers look correct on startup + --- src/af/util/xp/ut_mbtowc.cpp.orig 2013-04-07 13:53:03.000000000 +0000 +++ src/af/util/xp/ut_mbtowc.cpp @@ -192,7 +192,24 @@ int UT_UCS4_mbtowc::mbtowc (UT_UCS4Char diff --git a/editors/beav/Makefile b/editors/beav/Makefile index 6a5c6afc2c8..2a7b4089777 100644 --- a/editors/beav/Makefile +++ b/editors/beav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2017/05/09 14:51:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2019/06/08 10:40:53 rillig Exp $ DISTNAME= beav_1.40.orig PKGNAME= beav-1.40.18 @@ -6,8 +6,8 @@ PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} -PATCHFILES= beav_1.40-18.diff.gz -PATCH_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} +PATCHFILES= beav_1.40-18.diff.gz +PATCH_SITES= ${MASTER_SITE_DEBIAN:=pool/main/b/beav/} PATCH_DIST_STRIP= -p1 MAINTAINER= bad@NetBSD.org @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/beav-140 MAKE_ENV+= SED=${SED:Q} BUILD_TARGET= beav -SUBST_CLASSES+= docpath +SUBST_CLASSES+= docpath SUBST_FILES.docpath= beav.1 SUBST_STAGE.docpath= post-build SUBST_SED.docpath= -e 's,/usr/share/doc/,${PREFIX}/share/doc,' diff --git a/editors/codeblocks/hacks.mk b/editors/codeblocks/hacks.mk index 12b035356c8..d873e3f47a2 100644 --- a/editors/codeblocks/hacks.mk +++ b/editors/codeblocks/hacks.mk @@ -1,9 +1,9 @@ -# $NetBSD: hacks.mk,v 1.1 2016/08/27 20:58:41 joerg Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/06/08 10:40:53 rillig Exp $ ### g++ 4.8 and 5.3 on NetBSD/i386 fails with an internal compiler error ### when PCH is used. Be conservative and disable on all MACHINE_ARCH -### -.if ${OPSYS} == "NetBSD" +### +.if ${OPSYS} == "NetBSD" . include "../../mk/compiler.mk" . if ${PKGSRC_COMPILER} == "gcc" && \ (!empty(CC_VERSION:Mgcc-4.8.*) || !empty(CC_VERSION:Mgcc-5.*)) diff --git a/editors/dhex/distinfo b/editors/dhex/distinfo index e115112f501..419c7865fac 100644 --- a/editors/dhex/distinfo +++ b/editors/dhex/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 03:32:15 agc Exp $ +$NetBSD: distinfo,v 1.3 2019/06/08 10:40:53 rillig Exp $ SHA1 (dhex_0.68.tar.gz) = d23d65a7b330b47f8254f6c1ff25a30c4778440e RMD160 (dhex_0.68.tar.gz) = 0b5e4232a8f9e0a3ae345a9c1486c335ae7038c2 SHA512 (dhex_0.68.tar.gz) = 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421 Size (dhex_0.68.tar.gz) = 58602 bytes -SHA1 (patch-aa) = 23b61ff3abf12831a0f7bfb2f12d9f5be962098a -SHA1 (patch-ac) = 6cff750da487a36a1f9c52f8eaddd789fe005cb3 +SHA1 (patch-aa) = 663a11004dc2838797c9d16f5953e500f33f4f65 +SHA1 (patch-ac) = 05a58bbf2202de62699cb1ebee9238dae7e52bc7 diff --git a/editors/dhex/patches/patch-aa b/editors/dhex/patches/patch-aa index e9084141cd0..6045db4f9e2 100644 --- a/editors/dhex/patches/patch-aa +++ b/editors/dhex/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.1 2013/01/23 22:00:27 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2019/06/08 10:40:53 rillig Exp $ require NetBSD + --- main.c.orig 2011-02-25 14:54:07.000000000 +0100 +++ main.c 2011-02-25 14:54:27.000000000 +0100 @@ -469,6 +469,7 @@ diff --git a/editors/dhex/patches/patch-ac b/editors/dhex/patches/patch-ac index de0b2306713..447a0e2de23 100644 --- a/editors/dhex/patches/patch-ac +++ b/editors/dhex/patches/patch-ac @@ -1,6 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2013/01/23 22:00:27 wiz Exp $ +$NetBSD: patch-ac,v 1.2 2019/06/08 10:40:53 rillig Exp $ disable one compiler flag + --- Makefile.orig 2011-02-25 16:20:02.000000000 +0100 +++ Makefile 2011-02-25 16:21:03.000000000 +0100 @@ -1,7 +1,7 @@ diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile index 9e07d108e68..60f65b80f38 100644 --- a/editors/easyedit/Makefile +++ b/editors/easyedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2017/08/01 16:47:37 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2019/06/08 10:40:53 rillig Exp $ # DISTNAME= ee-1.4.6.src @@ -8,9 +8,9 @@ CATEGORIES= editors #MASTER_SITES= http://mahon.cwx.net/sources/ EXTRACT_SUFX= .tgz -PATCHFILES= easyedit-jumbo-patch-20130404.gz -PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/easyedit/ -PATCH_DIST_STRIP= -p1 +PATCHFILES= easyedit-jumbo-patch-20130404.gz +PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/easyedit/ +PATCH_DIST_STRIP= -p1 MAINTAINER= pkgsrc-users@NetBSD.org #HOMEPAGE= http://mahon.cwx.net/ diff --git a/editors/edt/Makefile b/editors/edt/Makefile index f5dbdc62222..82d476233f3 100644 --- a/editors/edt/Makefile +++ b/editors/edt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/03 11:43:32 asau Exp $ +# $NetBSD: Makefile,v 1.3 2019/06/08 10:40:53 rillig Exp $ DISTNAME= edt_1.9 PKGNAME= ${DISTNAME:C:_:-:} @@ -11,7 +11,7 @@ HOMEPAGE= http://edt-text-editor.sourceforge.net/ COMMENT= Text editor which emulates the VAX VMS EDT editor LICENSE= gnu-lgpl-v2.1 -MAKE_FILE= makefile +MAKE_FILE= makefile INSTALLATION_DIRS= bin share/doc/edt share/examples/edt do-install: diff --git a/editors/emacs/Makefile.common b/editors/emacs/Makefile.common index 46badd8a71b..556a9a3c69e 100644 --- a/editors/emacs/Makefile.common +++ b/editors/emacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.43 2018/07/17 17:14:58 tron Exp $ +# $NetBSD: Makefile.common,v 1.44 2019/06/08 10:40:54 rillig Exp $ # # used by editors/emacs/Makefile # used by editors/emacs-nox11/Makefile @@ -24,9 +24,9 @@ META_PACKAGE= yes # that can be shared. # -MY_EMACS_TYPE?=${EMACS_TYPE} -EMACS_BASE_TYPE=${MY_EMACS_TYPE:S/nox//} -EMACS_MAJOR=${EMACS_BASE_TYPE:S/emacs//} +MY_EMACS_TYPE?= ${EMACS_TYPE} +EMACS_BASE_TYPE= ${MY_EMACS_TYPE:S/nox//} +EMACS_MAJOR= ${EMACS_BASE_TYPE:S/emacs//} # Sigh. .if ${MY_EMACS_TYPE} == "emacs20nox" @@ -106,7 +106,7 @@ MY_EMACS_VERSION:= ${MY_EMACS_VERSION}.${_EMACS_VERSION_MICRO} .if ${MY_EMACS_VERSION} != ${VER} PKGREVISION= ${MYPKGREVISION} .else -PKGREVISION!=expr 1 + ${REV} + ${MYPKGREVISION} +PKGREVISION!= expr 1 + ${REV} + ${MYPKGREVISION} .endif # This doesn't work; fortunately it appears to be unnecessary. diff --git a/editors/emacs/modules.mk b/editors/emacs/modules.mk index 6323b06e92e..77faab3f111 100644 --- a/editors/emacs/modules.mk +++ b/editors/emacs/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.25 2018/11/30 18:38:19 rillig Exp $ +# $NetBSD: modules.mk,v 1.26 2019/06/08 10:40:54 rillig Exp $ # # This Makefile fragment handles Emacs Lisp Packages (== ELPs). # @@ -274,8 +274,8 @@ _EMACS_TYPE= ${EMACS_TYPE} EMACS_VERSIONS_ACCEPTED?= ${_EMACS_VERSIONS_ALL} .if empty(EMACS_VERSIONS_ACCEPTED:M${_EMACS_TYPE}) -PKG_FAIL_REASON+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}" -PKG_FAIL_REASON+= "No valid Emacs version installed found" +PKG_FAIL_REASON+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}" +PKG_FAIL_REASON+= "No valid Emacs version installed found" .endif _EMACS_PKGDIR= ${_EMACS_PKGDIR_MAP:M${_EMACS_TYPE}@*:C|${_EMACS_TYPE}@||} @@ -291,9 +291,9 @@ CONFLICTS+= ${_EMACS_CONFLICTS.${_EMACS_FLAVOR}} EMACS_MODULES?= .for _mod_ in ${EMACS_MODULES} -.if !empty(_EMACS_PKGDEP.${_mod_}) +. if !empty(_EMACS_PKGDEP.${_mod_}) DEPENDS+= ${_EMACS_PKGDEP.${_mod_}} -.endif +. endif .endfor # @@ -349,7 +349,7 @@ PRINT_PLIST_AWK+= { gsub(/${EMACS_LISPPREFIX:S|${PREFIX}/||:S|/|\\/|g}/, \ .if defined(EMACS_BUILDLINK) _EMACS_DIR= ${BUILDLINK_DIR}/share/emacs # development version usually claims three digit, say, 27.0.50 etc -. if !empty(EMACS_TYPE:Memacs27) +. if ${EMACS_TYPE} == emacs27 ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}/lisp:${_EMACS_DIR}/site-lisp . else ALL_ENV+= EMACSLOADPATH=${_EMACS_DIR}/${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}/lisp:${_EMACS_DIR}/site-lisp diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index e3350cb2072..ac20b25b910 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2017/07/23 05:22:38 dholland Exp $ +# $NetBSD: Makefile,v 1.60 2019/06/08 10:40:54 rillig Exp $ DISTNAME= emacs-20.7 PKGNAME= ${DISTNAME:S/emacs/emacs20/} @@ -34,9 +34,9 @@ BROKEN_ON_PLATFORM= Darwin-*-* DragonFly-*-* CONFLICTS= mule-[0-9]* -GNU_CONFIGURE= yes -USE_TOOLS+= gmake -GNU_ARCH.mipsbe= mips +GNU_CONFIGURE= yes +USE_TOOLS+= gmake +GNU_ARCH.mipsbe= mips # build PATH in the dumped emacs is not a problem CHECK_WRKREF_SKIP+= bin/emacs @@ -60,7 +60,7 @@ fake-libgcc: # NetBSD < 5.99.24 uses termcap; afterwards terminfo. Emacs needs to be told. .if (${OPSYS} == "NetBSD") && !exists(/usr/include/term.h) -CPPFLAGS+=-D__NETBSD_USE_TERMCAP__ +CPPFLAGS+= -D__NETBSD_USE_TERMCAP__ .endif .if (${OPSYS} == "DragonFly") && exists(/usr/lib/crtn.o) @@ -86,7 +86,7 @@ ALL_ENV+= MAKEFILECPP=${MAKEFILECPP:Q} INFO_FILES= yes -INSTALL_PROGRAM=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} +INSTALL_PROGRAM= ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} post-extract: ${CP} ${FILESDIR}/amd64.h ${WRKSRC}/src/m diff --git a/editors/emacs20/version.mk b/editors/emacs20/version.mk index a0170461197..5e535c87176 100644 --- a/editors/emacs20/version.mk +++ b/editors/emacs20/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.2 2013/02/16 23:58:36 dholland Exp $ +# $NetBSD: version.mk,v 1.3 2019/06/08 10:40:54 rillig Exp $ -_EMACS_FLAVOR= emacs -_EMACS_REQD= emacs20>=20.7<21 +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs20>=20.7<21 _EMACS_PKGDEP.base= _EMACS_PKGDEP.leim= leim>=20.${EMACS_VERSION_MINOR}<21:../../editors/leim20 diff --git a/editors/emacs21-nox11/version.mk b/editors/emacs21-nox11/version.mk index 81252962900..7a74099ac40 100644 --- a/editors/emacs21-nox11/version.mk +++ b/editors/emacs21-nox11/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.3 2013/02/17 00:22:36 dholland Exp $ +# $NetBSD: version.mk,v 1.4 2019/06/08 10:40:54 rillig Exp $ -_EMACS_FLAVOR= emacs -_EMACS_REQD= emacs21-nox11>=21.4<22 +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs21-nox11>=21.4<22 _EMACS_PKGDEP.base= _EMACS_PKGDEP.leim= leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21 diff --git a/editors/emacs21/Makefile.common b/editors/emacs21/Makefile.common index 9675f2cb386..c92869c5922 100644 --- a/editors/emacs21/Makefile.common +++ b/editors/emacs21/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2016/11/11 10:54:41 maya Exp $ +# $NetBSD: Makefile.common,v 1.18 2019/06/08 10:40:54 rillig Exp $ # # used by editors/emacs21/Makefile # used by editors/emacs21-nox11/Makefile @@ -32,7 +32,7 @@ MAKEFLAGS+= EMACSLOADPATH=${WRKSRC}/lisp CHECK_WRKREF_SKIP+= bin/emacs CHECK_WRKREF_SKIP+= bin/emacs-${EMACSVERSION} -CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} +CONFIGURE_ARGS+= --srcdir=${WRKSRC} INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} INSTALL_MAKE_FLAGS+= infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} diff --git a/editors/emacs21/hacks.mk b/editors/emacs21/hacks.mk index f1282890e23..290b7310760 100644 --- a/editors/emacs21/hacks.mk +++ b/editors/emacs21/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1 2016/05/03 09:41:20 wiz Exp $ +# $NetBSD: hacks.mk,v 1.2 2019/06/08 10:40:54 rillig Exp $ .if !defined(EMACS_HACKS_MK) EMACS_HACKS_MK= defined @@ -8,11 +8,11 @@ EMACS_HACKS_MK= defined ### On NetBSD/amd64 7.99.27, gcc optimisation, at least for version 5.3, ### produces, a "temacs" binary which segfaults. ### -. if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) -. if !empty(CC_VERSION:Mgcc-5.3.*) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) +. if !empty(CC_VERSION:Mgcc-5.3.*) PKG_HACKS+= optimisation BUILDLINK_TRANSFORM+= opt:-O2:-O0 -. endif . endif +.endif .endif # EMACS_HACKS_MK diff --git a/editors/emacs21/version.mk b/editors/emacs21/version.mk index 8130e954735..f34ab88f9e4 100644 --- a/editors/emacs21/version.mk +++ b/editors/emacs21/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.3 2013/02/17 00:18:58 dholland Exp $ +# $NetBSD: version.mk,v 1.4 2019/06/08 10:40:54 rillig Exp $ -_EMACS_FLAVOR= emacs -_EMACS_REQD= emacs21>=21.4<22 +_EMACS_FLAVOR= emacs +_EMACS_REQD= emacs21>=21.4<22 _EMACS_PKGDEP.base= _EMACS_PKGDEP.leim= leim>=21.${EMACS_VERSION_MINOR}<22:../../editors/leim21 diff --git a/editors/emacs25/Makefile.common b/editors/emacs25/Makefile.common index e454543b4f6..1041114fdc0 100644 --- a/editors/emacs25/Makefile.common +++ b/editors/emacs25/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2017/07/28 22:14:00 wiz Exp $ +# $NetBSD: Makefile.common,v 1.5 2019/06/08 10:40:54 rillig Exp $ # # used by editors/emacs25/Makefile # used by editors/emacs25-nox11/Makefile @@ -52,7 +52,7 @@ SPECIAL_PERMS+= libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-g CHECK_WRKREF_SKIP+= bin/emacs CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} -PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); } +PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); } .if (${OPSYS} == "NetBSD") && \ !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a) diff --git a/editors/emacs26-nox11/Makefile b/editors/emacs26-nox11/Makefile index 7f8317ec7bc..2be5c0e3a27 100644 --- a/editors/emacs26-nox11/Makefile +++ b/editors/emacs26-nox11/Makefile @@ -1,30 +1,30 @@ -# $NetBSD: Makefile,v 1.2 2018/06/29 15:39:33 gdt Exp $ +# $NetBSD: Makefile,v 1.3 2019/06/08 10:40:54 rillig Exp $ -PKGNAME= ${DISTNAME:S/emacs/emacs26/:S/-/-nox11-/} +PKGNAME= ${DISTNAME:S/emacs/emacs26/:S/-/-nox11-/} CONFLICTS+= emacs26-[0-9]* -FILESDIR= ${.CURDIR}/../../editors/emacs26/files -PATCHDIR= ${.CURDIR}/../../editors/emacs26/patches -PKGDIR= ${.CURDIR}/../../editors/emacs26 +FILESDIR= ${.CURDIR}/../../editors/emacs26/files +PATCHDIR= ${.CURDIR}/../../editors/emacs26/patches +PKGDIR= ${.CURDIR}/../../editors/emacs26 DISTINFO_FILE= ${.CURDIR}/../../editors/emacs26/distinfo .include "../../editors/emacs26/Makefile.common" -CONFIGURE_ARGS+= --without-dbus -CONFIGURE_ARGS+= --without-xml2 -CONFIGURE_ARGS+= --without-gnutls -CONFIGURE_ARGS+= --without-rsvg -CONFIGURE_ARGS+= --without-gconf -CONFIGURE_ARGS+= --without-imagemagick -CONFIGURE_ARGS+= --without-xaw3d -CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt +CONFIGURE_ARGS+= --without-dbus +CONFIGURE_ARGS+= --without-xml2 +CONFIGURE_ARGS+= --without-gnutls +CONFIGURE_ARGS+= --without-rsvg +CONFIGURE_ARGS+= --without-gconf +CONFIGURE_ARGS+= --without-imagemagick +CONFIGURE_ARGS+= --without-xaw3d +CONFIGURE_ARGS+= --without-xft --without-libotf --without-m17n-flt CONFIGURE_ARGS+= --without-ns -CONFIGURE_ARGS+= --without-x -CONFIGURE_ARGS+= --without-xpm -CONFIGURE_ARGS+= --without-jpeg -CONFIGURE_ARGS+= --without-tiff -CONFIGURE_ARGS+= --without-gif -CONFIGURE_ARGS+= --without-png +CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --without-xpm +CONFIGURE_ARGS+= --without-jpeg +CONFIGURE_ARGS+= --without-tiff +CONFIGURE_ARGS+= --without-gif +CONFIGURE_ARGS+= --without-png .include "../../mk/bsd.pkg.mk" diff --git a/editors/emacs26/Makefile.common b/editors/emacs26/Makefile.common index 38d5395495f..60af92f7865 100644 --- a/editors/emacs26/Makefile.common +++ b/editors/emacs26/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2019/04/14 07:03:20 wiz Exp $ +# $NetBSD: Makefile.common,v 1.3 2019/06/08 10:40:54 rillig Exp $ # # used by editors/emacs26/Makefile # used by editors/emacs26-nox11/Makefile @@ -50,7 +50,7 @@ SPECIAL_PERMS+= libexec/emacs/${EMACS_VERSION}/${MACHINE_GNU_PLATFORM}/update-g CHECK_WRKREF_SKIP+= bin/emacs CHECK_WRKREF_SKIP+= bin/emacs-${EMACS_VERSION} -PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); } +PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); } .if (${OPSYS} == "NetBSD") && \ !exists(/usr/lib/libgcc_s.so) && !exists(/usr/lib/libgcc.a) diff --git a/editors/ex/Makefile b/editors/ex/Makefile index eccf3ed227c..d9a64febe6d 100644 --- a/editors/ex/Makefile +++ b/editors/ex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/10/10 11:09:35 roy Exp $ +# $NetBSD: Makefile,v 1.14 2019/06/08 10:40:54 rillig Exp $ # DISTNAME= ex-040103 @@ -23,4 +23,4 @@ MAKE_DIRS_PERMS+= ${VARBASE}/tmp/vi.recover ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -MAKE_ENV+= TERMLIB=${BUILDLINK_LIBNAME.termcap} +MAKE_ENV+= TERMLIB=${BUILDLINK_LIBNAME.termcap} diff --git a/editors/gedit-python/Makefile b/editors/gedit-python/Makefile index ac99ee56bbd..19178079cfb 100644 --- a/editors/gedit-python/Makefile +++ b/editors/gedit-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2019/04/26 13:13:55 maya Exp $ +# $NetBSD: Makefile,v 1.45 2019/06/08 10:40:54 rillig Exp $ DISTNAME= gedit-2.30.4 PKGNAME= gedit-python-2.30.4 @@ -25,7 +25,7 @@ BUILD_DIRS= plugin-loaders/python BUILD_DIRS+= plugins/pythonconsole plugins/quickopen plugins/snippets INSTALL_DIRS= ${BUILD_DIRS} -PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-gtk2 +PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-gtk2 .include "../../lang/python/application.mk" .include "../../devel/py-gobject/buildlink3.mk" diff --git a/editors/gedit3/Makefile b/editors/gedit3/Makefile index 08cb6c8046f..ebfb5d33661 100644 --- a/editors/gedit3/Makefile +++ b/editors/gedit3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2019/04/25 07:32:51 maya Exp $ +# $NetBSD: Makefile,v 1.48 2019/06/08 10:40:55 rillig Exp $ DISTNAME= gedit-3.22.1 PKGREVISION= 8 @@ -16,10 +16,10 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake intltool msgfmt perl pkg-config GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= data/gedit.pc.in -PY_PATCHPLIST= yes +PKGCONFIG_OVERRIDE+= data/gedit.pc.in +PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 27 -REPLACE_PYTHON+= plugins/externaltools/data/send-to-fpaste.tool.in +REPLACE_PYTHON+= plugins/externaltools/data/send-to-fpaste.tool.in CONFIGURE_ARGS+= --disable-updater CONFIGURE_ARGS+= --disable-deprecations diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile index 60f3b38ee3a..6348513f1e1 100644 --- a/editors/ghex/Makefile +++ b/editors/ghex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2018/11/29 11:21:50 prlw1 Exp $ +# $NetBSD: Makefile,v 1.51 2019/06/08 10:40:55 rillig Exp $ # DISTNAME= ghex-2.24.0 @@ -16,7 +16,7 @@ USE_LIBTOOL= yes USE_TOOLS+= pkg-config intltool msgfmt gmake PKGCONFIG_OVERRIDE+= gtkhex.pc.in -GCONF_SCHEMAS= ghex2.schemas +GCONF_SCHEMAS= ghex2.schemas .include "../../textproc/gnome-doc-utils/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/editors/gummi/Makefile b/editors/gummi/Makefile index b9dce6faaf5..42d2576a312 100644 --- a/editors/gummi/Makefile +++ b/editors/gummi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2019/05/09 13:57:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.64 2019/06/08 10:40:55 rillig Exp $ DISTNAME= gummi-0.6.6 PKGREVISION= 26 @@ -12,11 +12,11 @@ HOMEPAGE= https://github.com/alexandervdm/gummi COMMENT= LaTeX editor, written in C/GTK+ LICENSE= mit -USE_TOOLS+= pkg-config intltool msgfmt gmake automake autoreconf +USE_TOOLS+= pkg-config intltool msgfmt gmake automake autoreconf BUILD_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 # we need some latex, but not all -#DEPENDS+= texlive-collection-all-[0-9]*:../../meta-pkgs/texlive-collection-all +#DEPENDS+= texlive-collection-all-[0-9]*:../../meta-pkgs/texlive-collection-all GNU_CONFIGURE= YES USE_PKGLOCALEDIR= yes @@ -24,7 +24,7 @@ USE_PKGLOCALEDIR= yes AUTO_MKDIRS= yes pre-configure: - cd ${WRKSRC:Q} && ${TOOLS_PATH.autoreconf} -vi + cd ${WRKSRC} && ${TOOLS_PATH.autoreconf} -vi .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/editors/jde/Makefile b/editors/jde/Makefile index b78bbb8dce8..e44748c321f 100644 --- a/editors/jde/Makefile +++ b/editors/jde/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2017/08/16 20:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2019/06/08 10:40:55 rillig Exp $ # DISTNAME= jde-2.3.2 @@ -23,14 +23,14 @@ USE_TOOLS+= pax WRKSRC= ${WRKDIR}/${DISTNAME}/lisp # XEmacs has its own JDE package -EMACS_VERSIONS_ACCEPTED=emacs21 # XXX Won't compile with emacs20... +EMACS_VERSIONS_ACCEPTED= emacs21 # XXX Won't compile with emacs20... .include "../../editors/emacs/modules.mk" PKG_DEFAULT_JVM= sun-jdk14 PKGSRC_MAKE_ENV+= EMACS=${EMACS} -MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} +MAKE_ENV+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX} NO_CONFIGURE= yes diff --git a/editors/jove/Makefile b/editors/jove/Makefile index d402ff7dc0e..1f67e373d6d 100644 --- a/editors/jove/Makefile +++ b/editors/jove/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/10/03 11:43:35 asau Exp $ +# $NetBSD: Makefile,v 1.18 2019/06/08 10:40:55 rillig Exp $ # DISTNAME= jove4.16.0.70 @@ -13,8 +13,8 @@ COMMENT= Small emacs-style editor, but lacks the LISP engine NO_CONFIGURE= yes USE_TOOLS+= nroff -MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP:Q} -MAKE_ENV+= ROOT_USER=${ROOT_USER:Q} +MAKE_ENV+= ROOT_GROUP=${ROOT_GROUP} +MAKE_ENV+= ROOT_USER=${ROOT_USER} MAKE_FLAGS+= NROFF=${NROFF:Q} INSTALL_MAKE_FLAGS+= JOVEHOME=${DESTDIR}${PREFIX} diff --git a/editors/kate/Makefile b/editors/kate/Makefile index 4dc9bee0273..5dc3b05a689 100644 --- a/editors/kate/Makefile +++ b/editors/kate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2019/04/25 07:32:51 maya Exp $ +# $NetBSD: Makefile,v 1.46 2019/06/08 10:40:55 rillig Exp $ DISTNAME= kate-${_KDE_VERSION} PKGREVISION= 16 @@ -9,7 +9,7 @@ PY_PATCHPLIST= YES .include "../../meta-pkgs/kde4/Makefile.kde4" -CHECK_PORTABILITY_SKIP+= examples/syntax/highlight.sh +CHECK_PORTABILITY_SKIP+= examples/syntax/highlight.sh .include "../../meta-pkgs/kde4/kde4.mk" diff --git a/editors/kile/Makefile b/editors/kile/Makefile index 019cd594c51..4b3bcc1e954 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2018/12/13 19:51:50 adam Exp $ +# $NetBSD: Makefile,v 1.102 2019/06/08 10:40:55 rillig Exp $ DISTNAME= kile-2.1.3 PKGREVISION= 28 @@ -10,7 +10,7 @@ MAINTAINER= markd@NetBSD.org HOMEPAGE= http://kile.sourceforge.net/ COMMENT= LaTeX source editor - TeX shell - Gnuplot front end -BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 USE_TOOLS+= perl msgfmt USE_LANGUAGES= c c++ diff --git a/editors/manedit/distinfo b/editors/manedit/distinfo index a19bf6a8869..1d54ab14fbe 100644 --- a/editors/manedit/distinfo +++ b/editors/manedit/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.11 2015/11/03 03:32:18 agc Exp $ +$NetBSD: distinfo,v 1.12 2019/06/08 10:40:55 rillig Exp $ SHA1 (manedit-0.8.1.tar.bz2) = 0b1705383840598ae7ced22ce5eb7f111008885b RMD160 (manedit-0.8.1.tar.bz2) = 17d378fad7a0dbe8d7b4c09b334dfc0768b0932e SHA512 (manedit-0.8.1.tar.bz2) = 87d1aa10caf5308c903d41fb47a99366075ce6639520a50186dcb48db7128faab01883912763900fba1d5920f14ae85c0943a3e6c1b58097e030a82801da2a1c Size (manedit-0.8.1.tar.bz2) = 514226 bytes -SHA1 (patch-aa) = b6b2443fca5fcab3367c49a011945b36a771ac74 +SHA1 (patch-aa) = 25caa42d1956c1b98c9c7f83ff49a56364f74455 SHA1 (patch-ab) = a49685e0c136d4a9bcf10d512cc7dc318154c6c7 SHA1 (patch-ac) = e210778d1e6f26611a8aaac769498ed05f6c1465 SHA1 (patch-ad) = 1948c0940930a9c4e703c7087763f330e5c443c1 diff --git a/editors/manedit/patches/patch-aa b/editors/manedit/patches/patch-aa index 1618bcba4de..175cb03f81c 100644 --- a/editors/manedit/patches/patch-aa +++ b/editors/manedit/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.5 2007/10/14 07:49:54 rillig Exp $ +$NetBSD: patch-aa,v 1.6 2019/06/08 10:40:56 rillig Exp $ + + --- prochandle.cpp.orig 2007-02-11 09:00:00.000000000 +0100 +++ prochandle.cpp 2007-10-14 09:38:21.000000000 +0200 @@ -270,6 +270,7 @@ char **ExecExplodeCommand(const char *cm diff --git a/editors/medit/Makefile b/editors/medit/Makefile index 98601917e7f..fcd6b1e9b03 100644 --- a/editors/medit/Makefile +++ b/editors/medit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2019/04/26 14:12:38 maya Exp $ +# $NetBSD: Makefile,v 1.37 2019/06/08 10:40:56 rillig Exp $ DISTNAME= medit-1.2.0 PKGREVISION= 10 @@ -18,10 +18,10 @@ USE_LIBTOOL= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config msgfmt intltool -PYTHON_FOR_BUILD_ONLY= yes +PYTHON_FOR_BUILD_ONLY= yes PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # not yet ported as of 1.2.0 -CONFIGURE_ARGS+= --with-python=no -CONFIGURE_ENV+= MOO_PYTHON=${PYTHONBIN} +CONFIGURE_ARGS+= --with-python=no +CONFIGURE_ENV+= MOO_PYTHON=${PYTHONBIN} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/editors/mg2a/Makefile b/editors/mg2a/Makefile index de0764d7b21..23cce81781b 100644 --- a/editors/mg2a/Makefile +++ b/editors/mg2a/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/05/09 14:46:55 jperkin Exp $ +# $NetBSD: Makefile,v 1.16 2019/06/08 10:40:56 rillig Exp $ DISTNAME= mg2a PKGNAME= mg2a-1.11 @@ -13,7 +13,7 @@ COMMENT= Small, fast, public domain EMACS style editor BUILD_TARGET= mg INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 -CONFLICTS+= mg-[0-9]* +CONFLICTS+= mg-[0-9]* pre-configure: set -e; cd ${WRKSRC}; \ diff --git a/editors/mined/Makefile b/editors/mined/Makefile index d33130e1380..c2f4e1c4c27 100644 --- a/editors/mined/Makefile +++ b/editors/mined/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/10/16 22:37:14 roy Exp $ +# $NetBSD: Makefile,v 1.24 2019/06/08 10:40:56 rillig Exp $ # DISTNAME= mined-2000.15 @@ -14,7 +14,7 @@ MAKE_FILE= makefile USE_TOOLS+= gmake post-install: - ${CHMOD} -x ${DESTDIR}${PREFIX}/share/mined/conf_user/xinitrc.mined + ${CHMOD} -x ${DESTDIR}${PREFIX}/share/mined/conf_user/xinitrc.mined .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) diff --git a/editors/mule-ucs/Makefile b/editors/mule-ucs/Makefile index e4a4fcbf721..93a0d093ef7 100644 --- a/editors/mule-ucs/Makefile +++ b/editors/mule-ucs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/02/17 19:18:03 dholland Exp $ +# $NetBSD: Makefile,v 1.22 2019/06/08 10:40:56 rillig Exp $ DISTNAME= Mule-UCS-0.84 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -19,7 +19,7 @@ INSTALLATION_DIRS= ${EMACS_LISPPREFIX:C|^${PREFIX}/||}/mule-ucs \ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 BUILDLINK_API_DEPENDS.emacs20+= emacs>=20.7nb1 -MESSAGE_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q} +MESSAGE_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX} do-build: @cd ${WRKSRC}; \ diff --git a/editors/nano/options.mk b/editors/nano/options.mk index 47b1a976c3a..87599874f8d 100644 --- a/editors/nano/options.mk +++ b/editors/nano/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.4 2015/06/05 01:32:38 wiedi Exp $ +# $NetBSD: options.mk,v 1.5 2019/06/08 10:40:56 rillig Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.nano -PKG_SUPPORTED_OPTIONS= wide-curses -PKG_SUGGESTED_OPTIONS= wide-curses +PKG_OPTIONS_VAR= PKG_OPTIONS.nano +PKG_SUPPORTED_OPTIONS= wide-curses +PKG_SUGGESTED_OPTIONS= wide-curses PKG_OPTIONS_LEGACY_OPTS+= ncursesw:wide-curses .include "../../mk/bsd.options.mk" diff --git a/editors/ne/Makefile b/editors/ne/Makefile index 4d77d16750a..58e08ccf003 100644 --- a/editors/ne/Makefile +++ b/editors/ne/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2018/06/06 14:53:04 prlw1 Exp $ +# $NetBSD: Makefile,v 1.21 2019/06/08 10:40:56 rillig Exp $ DISTNAME= ne-3.15 CATEGORIES= editors @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-termcap -MAKE_ENV+= SHELL=${SH} +MAKE_ENV+= SHELL=${SH:Q} BUILD_TARGET= build diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index bdadd54e130..109c441a2dc 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.59 2018/04/21 13:38:05 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2019/06/08 10:40:56 rillig Exp $ DISTNAME= nedit-${VERS}-src PKGNAME= nedit-${VERS} PKGREVISION= 9 CATEGORIES= editors -# @pkglint: MASTER_SITE_NEDIT is defined below MASTER_SITES= ${MASTER_SITE_NEDIT:=v${VERS:S/./_/g}/} MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=nedit/} EXTRACT_SUFX= .tar.bz2 @@ -17,12 +16,13 @@ COMMENT= Motif based standard GUI style text editor LICENSE= gnu-gpl-v2 VERS= 5.5 -MASTER_SITE_NEDIT= http://www.nedit.org/ftp/ \ - http://nl.nedit.org/ftp/ \ - ftp://nl.nedit.org/pub/NEdit/ \ - ftp://ftp.fu-berlin.de/unix/editors/nedit/ \ - ftp://cri.univ-tlse1.fr/pub/unix/nedit/NEdit/ \ - ftp://ftp.chg.ru/pub/unix/editors/nedit/ +MASTER_SITE_NEDIT= \ + http://www.nedit.org/ftp/ \ + http://nl.nedit.org/ftp/ \ + ftp://nl.nedit.org/pub/NEdit/ \ + ftp://ftp.fu-berlin.de/unix/editors/nedit/ \ + ftp://cri.univ-tlse1.fr/pub/unix/nedit/NEdit/ \ + ftp://ftp.chg.ru/pub/unix/editors/nedit/ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} BUILD_TARGET= netbsd diff --git a/editors/nts/Makefile b/editors/nts/Makefile index d8d45acd941..9d30fb7b5b5 100644 --- a/editors/nts/Makefile +++ b/editors/nts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2019/04/26 13:13:56 maya Exp $ +# $NetBSD: Makefile,v 1.15 2019/06/08 10:40:56 rillig Exp $ DISTNAME= nts-78 PKGREVISION= 2 @@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-wxWidgets>=2.8.7:../../x11/py-wxWidgets -PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-wxWidgets +PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # py-wxWidgets USE_LANGUAGES= # none diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile index 411ebbaf57c..fdc705330a7 100644 --- a/editors/nvi-m17n/Makefile +++ b/editors/nvi-m17n/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2018/08/22 09:45:02 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2019/06/08 10:40:57 rillig Exp $ DISTNAME= nvi-1.79 PKGNAME= nvi-m17n-1.79.20040608 @@ -20,29 +20,29 @@ GNU_CONFIGURE= YES PATCH_DIST_ARGS+= -d ${WRKSRC} --forward --quiet -E -f PATCH_FUZZ_FACTOR= -F1 -CONFIGURE_ENV+= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"' -CONFIGURE_ARGS+=--enable-multibyte --program-prefix=n +CONFIGURE_ENV+= OPTFLAG='-D_PATH_SYSEXRC=\"${PREFIX}/etc/vi.exrc\"' +CONFIGURE_ARGS+= --enable-multibyte --program-prefix=n -CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH:Q} -CONFIGURE_ENV+= vi_cv_path_perl=${TOOLS_PATH.perl:Q} +CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH} +CONFIGURE_ENV+= vi_cv_path_perl=${TOOLS_PATH.perl} USE_TOOLS+= sh perl:run -CPPFLAGS+= -DGTAGS +CPPFLAGS+= -DGTAGS INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} .include "options.mk" -AUTODETECT.big5=cn -AUTODETECT.euc-cn=cn -AUTODETECT.euc-jp=jp -AUTODETECT.euc-kr=kr -AUTODETECT.euc-tw=tw -AUTODETECT.hz=cn -AUTODETECT.iso-2022-cn=cn -AUTODETECT.iso-2022-jp=jp -AUTODETECT.iso-2022-kr=kr -AUTODETECT.sjis=jp +AUTODETECT.big5= cn +AUTODETECT.euc-cn= cn +AUTODETECT.euc-jp= jp +AUTODETECT.euc-kr= kr +AUTODETECT.euc-tw= tw +AUTODETECT.hz= cn +AUTODETECT.iso-2022-cn= cn +AUTODETECT.iso-2022-jp= jp +AUTODETECT.iso-2022-kr= kr +AUTODETECT.sjis= jp ENCODINGS+= iso-2022-cn iso-2022-jp iso-2022-kr ENCODINGS+= euc-jp euc-cn euc-kr sjis big5 euc-tw hz diff --git a/editors/nvi-m17n/distinfo b/editors/nvi-m17n/distinfo index 218b1b46d21..7924efd2aaf 100644 --- a/editors/nvi-m17n/distinfo +++ b/editors/nvi-m17n/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2017/01/07 19:00:55 maya Exp $ +$NetBSD: distinfo,v 1.16 2019/06/08 10:40:57 rillig Exp $ SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a RMD160 (nvi-1.79.tar.gz) = 1c39d480e0d30a87fc061c3219354b50011a8621 @@ -9,7 +9,7 @@ RMD160 (nvi-m17n-1.79-20040608.diff.gz) = 7791ce2bf6aa13245480de049e69f227002daf SHA512 (nvi-m17n-1.79-20040608.diff.gz) = 495ff4ecd698dcdcd9654a50519ed7f4b7bdb4dac01408b33a9deb08d1c0aaae65aaa729db9aa91ace20ec76a57f17941124c7bf2719ce8dc0543fb6d7a7c75c Size (nvi-m17n-1.79-20040608.diff.gz) = 159701 bytes SHA1 (patch-aa) = f9de0fd75adfd08ec55acd4bcbbce22d292d8535 -SHA1 (patch-ab) = 4526fa11abf619c5b2cfc23c97b2a4700462b601 +SHA1 (patch-ab) = 5cd869aeb27f48b14bf78cec907832c34e7ad24f SHA1 (patch-ac) = 617ddb4ba49ce3d556d2148ff4154430ad2868a0 SHA1 (patch-ad) = eff439277414d1e5318b2bdc54f273da5aabfc20 SHA1 (patch-ae) = 094bb54c79a587cbbf10756821ac52dcb53f6dc4 diff --git a/editors/nvi-m17n/patches/patch-ab b/editors/nvi-m17n/patches/patch-ab index 5a8c23437e3..198fd20e772 100644 --- a/editors/nvi-m17n/patches/patch-ab +++ b/editors/nvi-m17n/patches/patch-ab @@ -1,4 +1,6 @@ -$NetBSD: patch-ab,v 1.6 2005/12/01 18:46:53 wiz Exp $ +$NetBSD: patch-ab,v 1.7 2019/06/08 10:40:57 rillig Exp $ + + --- build/configure.orig 2005-12-01 19:37:32.000000000 +0100 +++ build/configure @@ -1805,10 +1805,8 @@ if test "$vi_cv_canna" = "yes"; then diff --git a/editors/nvi/Makefile b/editors/nvi/Makefile index bea0aae3d1d..bf64e595b90 100644 --- a/editors/nvi/Makefile +++ b/editors/nvi/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.51 2017/09/03 08:36:54 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2019/06/08 10:40:57 rillig Exp $ DISTNAME= nvi-1.81.6 PKGREVISION= 11 CATEGORIES= editors -MASTER_SITES= ${HOMEPAGE:Q} +MASTER_SITES= ${HOMEPAGE} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/editors/p5-PPIx-EditorTools/Makefile b/editors/p5-PPIx-EditorTools/Makefile index 00f6ad1dea1..3229df99ffd 100644 --- a/editors/p5-PPIx-EditorTools/Makefile +++ b/editors/p5-PPIx-EditorTools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/08/22 09:45:02 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2019/06/08 10:40:57 rillig Exp $ DISTNAME= PPIx-EditorTools-0.21 PKGNAME= p5-${DISTNAME} @@ -11,9 +11,9 @@ HOMEPAGE= http://search.cpan.org/dist/PPIx-EditorTools/ COMMENT= Utility methods and base class for manipulating Perl via PPI LICENSE= ${PERL5_LICENSE} -BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences -BUILD_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most -BUILD_DEPENDS+= p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings +BUILD_DEPENDS+= p5-Test-Differences-[0-9]*:../../devel/p5-Test-Differences +BUILD_DEPENDS+= p5-Test-Most-[0-9]*:../../devel/p5-Test-Most +BUILD_DEPENDS+= p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings DEPENDS+= p5-Class-XSAccessor>=1.02:../../devel/p5-Class-XSAccessor DEPENDS+= p5-PPI>=1.215:../../devel/p5-PPI diff --git a/editors/p5-Padre-Plugin-Ecliptic/Makefile b/editors/p5-Padre-Plugin-Ecliptic/Makefile index 432754e3e22..7959d62b619 100644 --- a/editors/p5-Padre-Plugin-Ecliptic/Makefile +++ b/editors/p5-Padre-Plugin-Ecliptic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/08/22 09:45:02 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2019/06/08 10:40:57 rillig Exp $ # DISTNAME= Padre-Plugin-Ecliptic-0.23 @@ -16,10 +16,10 @@ DEPENDS+= p5-Class-XSAccessor>=1.05:../../devel/p5-Class-XSAccessor DEPENDS+= p5-File-Which>=0.05:../../devel/p5-File-Which DEPENDS+= p5-Padre>=0.43:../../editors/p5-Padre -BUILD_DEPENDS+= p5-Locale-Msgfmt>=0.14:../../devel/p5-Locale-Msgfmt -BUILD_DEPENDS+= p5-Test-Exception>=0.27:../../devel/p5-Test-Exception +BUILD_DEPENDS+= p5-Locale-Msgfmt>=0.14:../../devel/p5-Locale-Msgfmt +BUILD_DEPENDS+= p5-Test-Exception>=0.27:../../devel/p5-Test-Exception #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.86}:../../devel/p5-Test-Simple -BUILD_DEPENDS+= p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings +BUILD_DEPENDS+= p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings PERL5_PACKLIST= auto/Padre/Plugin/Ecliptic/.packlist PERL5_MODULE_TYPE= Module::Build diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile index ede85cf060f..d6203823bc0 100644 --- a/editors/p5-Padre/Makefile +++ b/editors/p5-Padre/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2018/11/14 22:21:24 kleink Exp $ +# $NetBSD: Makefile,v 1.55 2019/06/08 10:40:57 rillig Exp $ DISTNAME= Padre-1.00 PKGNAME= p5-${DISTNAME} @@ -20,12 +20,12 @@ REPLACE_PERL+= share/examples/wx/*.pl REPLACE_PERL+= share/examples/absolute_beginner/*.pl #BUILD_DEPENDS+= p5-Capture-Tiny>=0.06:../../devel/p5-Capture-Tiny -BUILD_DEPENDS+= p5-Locale-Msgfmt>=0.15:../../devel/p5-Locale-Msgfmt -BUILD_DEPENDS+= p5-Test-Exception>=0.27:../../devel/p5-Test-Exception -BUILD_DEPENDS+= p5-Test-MockObject>=1.09:../../devel/p5-Test-MockObject +BUILD_DEPENDS+= p5-Locale-Msgfmt>=0.15:../../devel/p5-Locale-Msgfmt +BUILD_DEPENDS+= p5-Test-Exception>=0.27:../../devel/p5-Test-Exception +BUILD_DEPENDS+= p5-Test-MockObject>=1.09:../../devel/p5-Test-MockObject #BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple -BUILD_DEPENDS+= p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings -BUILD_DEPENDS+= p5-Test-Script>=1.07:../../devel/p5-Test-Script +BUILD_DEPENDS+= p5-Test-NoWarnings>=0.084:../../devel/p5-Test-NoWarnings +BUILD_DEPENDS+= p5-Test-Script>=1.07:../../devel/p5-Test-Script #DEPENDS+= p5-ack>=1.86:../../textproc/p5-ack DEPENDS+= p5-Algorithm-Diff>=1.1900:../../devel/p5-Algorithm-Diff @@ -48,8 +48,8 @@ DEPENDS+= p5-Devel-Refactor>=0.05:../../devel/p5-Devel-Refactor # by pbulk-resolve, but not at build time, since Perl is already installed # then. This forces unnecessary rebuilds. # DEPENDS+= {perl>=5.12.0,p5-ExtUtils-MakeMaker>=6.56}:../../devel/p5-ExtUtils-MakeMaker -#DEPENDS+= {perl>=5.10.1,p5-ExtUtils-Manifest>=1.56}:../../devel/p5-ExtUtils-Manifest -DEPENDS+= p5-File-Copy-Recursive>=0.37:../../sysutils/p5-File-Copy-Recursive +#DEPENDS+= {perl>=5.10.1,p5-ExtUtils-Manifest>=1.56}:../../devel/p5-ExtUtils-Manifest +DEPENDS+= p5-File-Copy-Recursive>=0.37:../../sysutils/p5-File-Copy-Recursive DEPENDS+= p5-File-Find-Rule-[0-9]*:../../devel/p5-File-Find-Rule DEPENDS+= p5-File-HomeDir>=0.91:../../devel/p5-File-HomeDir # File::Path 2.07 is in Perl 5.8.9, but Perl 5.10.0 contains "only" 2.04 diff --git a/editors/p5-Wx-Scintilla/Makefile b/editors/p5-Wx-Scintilla/Makefile index c1a4c755743..c20d7ed2f6a 100644 --- a/editors/p5-Wx-Scintilla/Makefile +++ b/editors/p5-Wx-Scintilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2018/11/14 22:21:24 kleink Exp $ +# $NetBSD: Makefile,v 1.32 2019/06/08 10:40:57 rillig Exp $ DISTNAME= Wx-Scintilla-0.39 PKGNAME= p5-${DISTNAME} @@ -11,13 +11,13 @@ HOMEPAGE= http://search.cpan.org/dist/Wx-Scintilla/ COMMENT= Scintilla source code editing component for wxWidgets LICENSE= ${PERL5_LICENSE} -BUILD_DEPENDS+= p5-Alien-wxWidgets-[0-9]*:../../x11/p5-Alien-wxWidgets +BUILD_DEPENDS+= p5-Alien-wxWidgets-[0-9]*:../../x11/p5-Alien-wxWidgets #BUILD_DEPENDS+= {perl>=5.16.6,p5-ExtUtils-ParseXS>=3.15}:../../devel/p5-ExtUtils-ParseXS MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/blib/arch/auto/Wx/Scintilla USE_TOOLS+= perl -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c++ PERL5_PACKLIST= auto/Wx/Scintilla/.packlist PERL5_MODULE_TYPE= Module::Build diff --git a/editors/sam/Makefile b/editors/sam/Makefile index 019669aed69..b3c0640f13c 100644 --- a/editors/sam/Makefile +++ b/editors/sam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2017/09/21 14:37:39 bsiegert Exp $ +# $NetBSD: Makefile,v 1.44 2019/06/08 10:40:57 rillig Exp $ DISTNAME= sam PKGNAME= sam-4.3 @@ -22,16 +22,16 @@ MANCOMPRESSED= yes INSTALLATION_DIRS= bin include lib/X11/app-defaults \ ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 ${PKGMANDIR}/man4 ${PKGMANDIR}/man6 -INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX:Q} \ +INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ MAN=${PKGMANDIR} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -.if ${X11BASE} != "/usr/openwin" +. if ${X11BASE} != "/usr/openwin" OTHER_X_LIBS= -lSM -lICE -.endif +. endif do-build: for d in libXg libframe sam samterm; do \ diff --git a/editors/sandy/Makefile b/editors/sandy/Makefile index 8af6081e69f..4b344f6cda0 100644 --- a/editors/sandy/Makefile +++ b/editors/sandy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/09/08 06:25:19 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2019/06/08 10:40:57 rillig Exp $ DISTNAME= sandy-0.4 PKGREVISION= 2 @@ -10,14 +10,14 @@ HOMEPAGE= https://tools.suckless.org/sandy COMMENT= Sandy is an ncurses text editor LICENSE= mit -SUBST_CLASSES= fix-paths -SUBST_STAGE.fix-paths= pre-configure +SUBST_CLASSES= fix-paths +SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing absolute paths. -SUBST_FILES.fix-paths= config.mk -SUBST_SED.fix-paths= -e 's,/usr/local,${PREFIX},g' -SUBST_SED.fix-paths+= -e 's,/usr/include,${BUILDLINK_PREFIX.ncursesw}/include,g' -SUBST_SED.fix-paths+= -e 's,/usr/lib,${BUILDLINK_PREFIX.ncursesw}/lib -Wl\,-R${BUILDLINK_PREFIX.ncursesw}/lib,g' -SUBST_SED.fix-paths+= -e 's,share/man,${PKGMANDIR},g' +SUBST_FILES.fix-paths= config.mk +SUBST_SED.fix-paths= -e 's,/usr/local,${PREFIX},g' +SUBST_SED.fix-paths+= -e 's,/usr/include,${BUILDLINK_PREFIX.ncursesw}/include,g' +SUBST_SED.fix-paths+= -e 's,/usr/lib,${BUILDLINK_PREFIX.ncursesw}/lib -Wl\,-R${BUILDLINK_PREFIX.ncursesw}/lib,g' +SUBST_SED.fix-paths+= -e 's,share/man,${PKGMANDIR},g' .include "../../devel/ncursesw/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/editors/sandy/distinfo b/editors/sandy/distinfo index 8179bfb9442..594f2b3092b 100644 --- a/editors/sandy/distinfo +++ b/editors/sandy/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2017/07/06 11:31:16 wiedi Exp $ +$NetBSD: distinfo,v 1.9 2019/06/08 10:40:57 rillig Exp $ SHA1 (sandy-0.4.tar.gz) = da5e8820e73ae3e849df469d32887c5227a15d74 RMD160 (sandy-0.4.tar.gz) = e230a230edf02f499ee5bbe57e3ac70cfcf228c0 SHA512 (sandy-0.4.tar.gz) = 3773c81aadeb4b55e3c77a9eecf447e2791ea43f9461d37a02a3e2eb84d9343f4951e3bb6d60f04059f12b4d9223aaaf1eed532fdad8f64726cc252af77dc7bb Size (sandy-0.4.tar.gz) = 19243 bytes -SHA1 (patch-sandy.c) = 5fdeb40a4be64043c8f3b20a9aa956a06a24cf4a +SHA1 (patch-sandy.c) = b44cc32bd85f8a05c3cc1c88629eb4d4a15d5430 diff --git a/editors/sandy/patches/patch-sandy.c b/editors/sandy/patches/patch-sandy.c index 67ea50fb68c..13ce2888a5d 100644 --- a/editors/sandy/patches/patch-sandy.c +++ b/editors/sandy/patches/patch-sandy.c @@ -1,6 +1,7 @@ -$NetBSD: patch-sandy.c,v 1.2 2017/07/06 11:31:16 wiedi Exp $ +$NetBSD: patch-sandy.c,v 1.3 2019/06/08 10:40:58 rillig Exp $ Needs include for TIOCGWINSZ + --- sandy.c.orig 2011-04-01 16:05:58.000000000 +0000 +++ sandy.c @@ -14,6 +14,8 @@ diff --git a/editors/scite/Makefile b/editors/scite/Makefile index cfe7a31551b..a19958238a0 100644 --- a/editors/scite/Makefile +++ b/editors/scite/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2018/11/14 22:21:24 kleink Exp $ +# $NetBSD: Makefile,v 1.33 2019/06/08 10:40:58 rillig Exp $ # DISTNAME= scite339 @@ -13,12 +13,12 @@ HOMEPAGE= http://scintilla.sourceforge.net/ COMMENT= Source code editor #LICENSE= # TODO: (see mk/license.mk) -WRKSRC= ${WRKDIR}/scite -USE_LANGUAGES= c c++ -BUILD_DIRS+= gtk -USE_TOOLS+= gmake pkg-config -MAKE_FILE= makefile -INSTALLATION_DIRS= share/applications share/pixmaps +WRKSRC= ${WRKDIR}/scite +USE_LANGUAGES= c c++ +BUILD_DIRS+= gtk +USE_TOOLS+= gmake pkg-config +MAKE_FILE= makefile +INSTALLATION_DIRS= share/applications share/pixmaps BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=lua.vers diff --git a/editors/tamago/Makefile b/editors/tamago/Makefile index cc6f2c156b7..d87b1bda133 100644 --- a/editors/tamago/Makefile +++ b/editors/tamago/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2017/09/29 12:40:27 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2019/06/08 10:40:58 rillig Exp $ DISTNAME= tamago-4.0.6 PKGNAME= ${EMACS_PKGNAME_PREFIX}tamago-20020909 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.m17n.org/tamago/ COMMENT= CJK characters inputting system for emacs + leim GNU_CONFIGURE= yes -MAKE_FLAGS+= prefix=${DESTDIR:Q}${PREFIX} +MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} # XXX please someone adjust paths and PLIST for XEmacs... EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 EMACS_MODULES+= leim diff --git a/editors/ted-pl/Makefile b/editors/ted-pl/Makefile index 084ae0a36dc..19ec5c24481 100644 --- a/editors/ted-pl/Makefile +++ b/editors/ted-pl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2015/07/04 16:18:30 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2019/06/08 10:40:58 rillig Exp $ DISTNAME= Ted_pl_PL PKGNAME= ted-pl-2.16 @@ -20,12 +20,12 @@ NO_BUILD= YES INSTALLATION_DIRS= share/Ted/ind post-extract: - cd ${WRKSRC};tar xvf Ted/ad/Ted_pl_PL.ad.tar + cd ${WRKSRC};tar xvf Ted/ad/Ted_pl_PL.ad.tar post-patch: - ${ECHO} "Ted*fontList: -adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-iso8859-2" \ + ${ECHO} "Ted*fontList: -adobe-helvetica-medium-r-*-*-*-100-*-*-*-*-iso8859-2" \ >>${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted - ${ECHO} "Ted.documentFileName: ${PREFIX}/share/doc/Ted/TedDocument-en_US.rtf" \ + ${ECHO} "Ted.documentFileName: ${PREFIX}/share/doc/Ted/TedDocument-en_US.rtf" \ >>${WRKSRC}/usr/lib/X11/pl_PL/app-defaults/Ted do-install: diff --git a/editors/ted/distinfo b/editors/ted/distinfo index de36ddf6d38..8818b7c681a 100644 --- a/editors/ted/distinfo +++ b/editors/ted/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2015/11/03 03:32:21 agc Exp $ +$NetBSD: distinfo,v 1.17 2019/06/08 10:40:58 rillig Exp $ SHA1 (ted-2.21.src.tar.gz) = 303b15de1fe97e473c4b89a88b6e127ee81e07e9 RMD160 (ted-2.21.src.tar.gz) = 68935d62d216708c7053910f1261353176cf5c72 @@ -8,8 +8,8 @@ SHA1 (patch-aa) = d8673fb67176c17beb90a87adebb9ab94a1e15ba SHA1 (patch-ab) = 16fa3f2a88a6b252148735f02541833b7ac56b8a SHA1 (patch-ac) = 3ad1300b213e925d50e0490587398e7574452aa8 SHA1 (patch-ad) = a0761bd537cbef20bf80a74eb59c2352a97e4d99 -SHA1 (patch-ae) = 9cea02ede59d7f6a88a0c8ec1f93e5d814e6b994 -SHA1 (patch-af) = 369a2d0324538860c50653a140d660d50c2383b9 +SHA1 (patch-ae) = c374c5845eba111128e7fe79371c715d3b26a03b +SHA1 (patch-af) = 0679838112be0e9b2ebead7e27625f6e61345383 SHA1 (patch-ag) = 3db30b3b2e04b03e4d69704ba00d6182f0c5fd9f SHA1 (patch-appFrame_appFontConfig.c) = b73d920231cd426b7db5a5d8cf6dfa87f3469a2c SHA1 (patch-appUtil_csvsheet.c) = 70c3accb39099b8926f5681b24f3e4be048fd255 diff --git a/editors/ted/patches/patch-ae b/editors/ted/patches/patch-ae index bde18c9ddc1..f36482a7e7a 100644 --- a/editors/ted/patches/patch-ae +++ b/editors/ted/patches/patch-ae @@ -1,4 +1,6 @@ -$NetBSD: patch-ae,v 1.2 2002/05/20 17:46:32 cjep Exp $ +$NetBSD: patch-ae,v 1.3 2019/06/08 10:40:58 rillig Exp $ + + --- appFrame/appFrameConfig.h.in.orig Sun Mar 3 23:24:16 2002 +++ appFrame/appFrameConfig.h.in Mon Apr 22 10:32:15 2002 @@ -29,12 +29,6 @@ diff --git a/editors/ted/patches/patch-af b/editors/ted/patches/patch-af index 0a688e7aedc..62519429fac 100644 --- a/editors/ted/patches/patch-af +++ b/editors/ted/patches/patch-af @@ -1,4 +1,6 @@ -$NetBSD: patch-af,v 1.2 2002/05/20 17:46:32 cjep Exp $ +$NetBSD: patch-af,v 1.3 2019/06/08 10:40:58 rillig Exp $ + + --- Ted/tedConfig.h.in.orig Sun Mar 3 23:24:16 2002 +++ Ted/tedConfig.h.in Mon Apr 22 11:06:41 2002 @@ -38,12 +38,6 @@ diff --git a/editors/texmaker/options.mk b/editors/texmaker/options.mk index 0ae83fd5aa5..71d525001cb 100644 --- a/editors/texmaker/options.mk +++ b/editors/texmaker/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2018/01/10 22:09:02 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2019/06/08 10:40:58 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.texmaker PKG_OPTIONS_REQUIRED_GROUPS= qt -PKG_OPTIONS_GROUP.qt = qt5 +PKG_OPTIONS_GROUP.qt= qt5 PKG_SUGGESTED_OPTIONS= qt5 .include "../../mk/bsd.options.mk" diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile index 2d70a6da2c1..6310e7a1eab 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2019/05/09 13:57:48 ryoon Exp $ +# $NetBSD: Makefile,v 1.39 2019/06/08 10:40:58 rillig Exp $ DISTNAME= texstudio-2.12.14 PKGREVISION= 5 @@ -19,7 +19,7 @@ INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" -_CRASH_HANDLER=NO_CRASH_HANDLER=yes +_CRASH_HANDLER= NO_CRASH_HANDLER=yes .else _CRASH_HANDLER= .endif diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile index 35c3ee43414..83bbe791f25 100644 --- a/editors/texworks/Makefile +++ b/editors/texworks/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.69 2019/05/09 13:57:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.70 2019/06/08 10:40:59 rillig Exp $ DISTNAME= texworks-0.6.2 PKGREVISION= 21 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GITHUB:=TeXworks/} GITHUB_PROJECT= texworks -GITHUB_TAG= release-${PKGVERSION_NOREV} +GITHUB_TAG= release-${PKGVERSION_NOREV} MAINTAINER= markd@NetBSD.org HOMEPAGE= http://www.tug.org/texworks/ diff --git a/editors/tomboy/distinfo b/editors/tomboy/distinfo index 41135641e0d..1b9ed0df0ba 100644 --- a/editors/tomboy/distinfo +++ b/editors/tomboy/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:32:22 agc Exp $ +$NetBSD: distinfo,v 1.11 2019/06/08 10:40:59 rillig Exp $ SHA1 (tomboy-1.2.1.tar.gz) = 98e01ad670a3aa2c264319a5e36daa0ea4036891 RMD160 (tomboy-1.2.1.tar.gz) = fa2e16b6e3e175e98756005853de8b6cc0ffcf25 @@ -6,4 +6,4 @@ SHA512 (tomboy-1.2.1.tar.gz) = 8266ecfd942f89b2c4b38f3232f9faa088740e16eb683c8e8 Size (tomboy-1.2.1.tar.gz) = 7695607 bytes SHA1 (patch-Tomboy_tomboy-panel.in) = b8ba00735d939da3029a6aa1046d74ccf4fc20d2 SHA1 (patch-Tomboy_tomboy.in) = f9b7caa4725133ca78111b9efaa16d7b1276c5b6 -SHA1 (patch-configure) = 47bb6f8bacdc1f08fff96001b1c097389db9f572 +SHA1 (patch-configure) = 61dbb0862983f0035644a9463df399b9f0c086d1 diff --git a/editors/tomboy/patches/patch-configure b/editors/tomboy/patches/patch-configure index 077a47a9867..fc681cc373e 100644 --- a/editors/tomboy/patches/patch-configure +++ b/editors/tomboy/patches/patch-configure @@ -1,8 +1,10 @@ -$NetBSD: patch-configure,v 1.1 2014/04/15 05:37:27 richard Exp $ +$NetBSD: patch-configure,v 1.2 2019/06/08 10:40:59 rillig Exp $ + As determined elsewhere (pkg/48075) pdksh (and perhaps older ast-ksh and bash) have problems with double-parens expressions that are not arithmetic expressions of a particular form. Adding a space between the two parens seems to get over the problem. + --- configure.orig 2010-04-26 17:30:00.000000000 +0000 +++ configure @@ -15518,7 +15518,7 @@ if test "${enable_gnome+set}" = set; the diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile index dcea4428e57..8accd429bf7 100644 --- a/editors/vigor/Makefile +++ b/editors/vigor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2018/03/12 11:16:25 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2019/06/08 10:40:59 rillig Exp $ # DISTNAME= vigor-0.016 @@ -16,16 +16,16 @@ CONFLICTS+= nvi-[0-9]* LDFLAGS+= ${BDB_LIBS} -GNU_CONFIGURE= yes -CONFIGURE_DIRS= build -CONFIGURE_ENV+= TCLCONFIG_SH=${TCLCONFIG_SH:Q} -CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH:Q} -CONFIGURE_ARGS+=--with-x +GNU_CONFIGURE= yes +CONFIGURE_DIRS= build +CONFIGURE_ENV+= TCLCONFIG_SH=${TCLCONFIG_SH:Q} +CONFIGURE_ENV+= vi_cv_path_shell=${TOOLS_SH} +CONFIGURE_ARGS+= --with-x # --enable-perlinterp \ # --disable-curses \ # --disable-re -USE_TOOLS+= sh -BUILD_DIRS= ${CONFIGURE_DIRS} +USE_TOOLS+= sh +BUILD_DIRS= ${CONFIGURE_DIRS} BUILDLINK_DEPMETHOD.libXt?= build @@ -33,7 +33,7 @@ CHECK_BUILTIN.db1:= yes .include "../../mk/db1.builtin.mk" CHECK_BUILTIN.db1:= no -.if empty(IS_BUILTIN.db1:Myes) +.if ${IS_BUILTIN.db1} != yes CONFIGURE_ARGS+= --disable-db .else SUBST_CLASSES+= db185 @@ -50,12 +50,12 @@ CPPFLAGS+= -DUSE_INTERP_RESULT .include "../../mk/bsd.prefs.mk" .if ${OPSYS} != "DragonFly" -.if exists(/usr/include/sys/queue.h) +. if exists(/usr/include/sys/queue.h) # this file obscures the system header # (Desired for DragonFly which does not have CIRCLEQ macros) post-patch: ${RM} -f ${WRKSRC}/include/sys/queue.h -.endif +. endif .endif .include "../../lang/tcl/buildlink3.mk" diff --git a/editors/vim-gtk2/Makefile b/editors/vim-gtk2/Makefile index 6fab2f34d41..497a179a42c 100644 --- a/editors/vim-gtk2/Makefile +++ b/editors/vim-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2018/11/29 11:21:50 prlw1 Exp $ +# $NetBSD: Makefile,v 1.82 2019/06/08 10:40:59 rillig Exp $ PKGNAME= vim-gtk2-${VIM_VERSION}.${VIM_PATCHLEVEL} PKGREVISION= 3 @@ -29,8 +29,8 @@ INSTALL_TARGET= installvimbin INSTALLATION_DIRS+= ${PKGMANDIR}/man1 -CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 -CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 +CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 +CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 post-install: .for f in gvim.1 gview.1 rgvim.1 rgview.1 diff --git a/editors/vim-gtk3/Makefile b/editors/vim-gtk3/Makefile index 2433006bbff..ac28e88fd5b 100644 --- a/editors/vim-gtk3/Makefile +++ b/editors/vim-gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2019/01/14 20:20:22 leot Exp $ +# $NetBSD: Makefile,v 1.14 2019/06/08 10:40:59 rillig Exp $ PKGNAME= vim-gtk3-${VIM_VERSION}.${VIM_PATCHLEVEL} PKGREVISION= 2 @@ -25,8 +25,8 @@ INSTALL_TARGET= installvimbin INSTALLATION_DIRS+= ${PKGMANDIR}/man1 -CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 -CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 +CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 +CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 post-install: .for f in gvim.1 gview.1 rgvim.1 rgview.1 diff --git a/editors/vim-motif/Makefile b/editors/vim-motif/Makefile index 67a2a92a530..adea043c1d2 100644 --- a/editors/vim-motif/Makefile +++ b/editors/vim-motif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2017/02/19 19:13:35 snj Exp $ +# $NetBSD: Makefile,v 1.37 2019/06/08 10:40:59 rillig Exp $ PKGNAME= vim-motif-${VIM_VERSION}.${VIM_PATCHLEVEL} @@ -13,16 +13,16 @@ CONFLICTS+= vim-xaw-[0-9]* vim-kde-[0-9]* CONFIGURE_ARGS+= --enable-gui=motif CONFIGURE_ARGS+= --with-tlib=${BUILDLINK_LIBNAME.termcap} -CONFIGURE_ENV+= MOTIFBASE=${MOTIFBASE:Q} -MAKE_ENV+= MOTIFBASE=${MOTIFBASE:Q} +CONFIGURE_ENV+= MOTIFBASE=${MOTIFBASE} +MAKE_ENV+= MOTIFBASE=${MOTIFBASE} BUILD_TARGET= vim INSTALL_TARGET= installvimbin INSTALLATION_DIRS+= ${PKGMANDIR}/man1 -CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 -CHECK_INTERPRETER_SKIP+=${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 +CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/gvim.1 ${PKGMANDIR}/man1/gview.1 +CHECK_INTERPRETER_SKIP+= ${PKGMANDIR}/man1/rgvim.1 ${PKGMANDIR}/man1/rgview.1 post-install: .for f in gvim.1 gview.1 rgvim.1 rgview.1 diff --git a/editors/vim-share/Makefile.common b/editors/vim-share/Makefile.common index e6322221055..ca27aca2bcd 100644 --- a/editors/vim-share/Makefile.common +++ b/editors/vim-share/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.162 2018/07/04 13:40:17 jperkin Exp $ - +# $NetBSD: Makefile.common,v 1.163 2019/06/08 10:40:59 rillig Exp $ # used by editors/vim/Makefile # used by editors/vim-gtk2/Makefile +# used by editors/vim-gtk3/Makefile # used by editors/vim-lang/Makefile # used by editors/vim-motif/Makefile # used by editors/vim-xaw/Makefile diff --git a/editors/wily/Makefile b/editors/wily/Makefile index 10f52d02124..fc02d502b8e 100644 --- a/editors/wily/Makefile +++ b/editors/wily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2017/07/21 20:50:57 nros Exp $ +# $NetBSD: Makefile,v 1.22 2019/06/08 10:40:59 rillig Exp $ # DISTNAME= wily-0.13.42 @@ -12,7 +12,7 @@ HOMEPAGE= http://www.cse.yorku.ca/~oz/wily/ COMMENT= Unix/X11 clone of the Plan9 acme editor/environment LICENSE= artistic -GNU_CONFIGURE= yes +GNU_CONFIGURE= yes CONFIGURE_HAS_MANDIR= no DEPENDS+= libXgFonts>=1.0nb1:../../fonts/Xg diff --git a/editors/xemacs-current-nox11/version.mk b/editors/xemacs-current-nox11/version.mk index d04c4a73cf8..00a3ede3f77 100644 --- a/editors/xemacs-current-nox11/version.mk +++ b/editors/xemacs-current-nox11/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: version.mk,v 1.2 2019/06/08 10:41:00 rillig Exp $ -_EMACS_FLAVOR= xemacs -_EMACS_REQD= xemacs-nox11>=21.5<21.6 +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs-nox11>=21.5<21.6 _EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages _EMACS_PKGDEP.leim= diff --git a/editors/xemacs-current/Makefile.common b/editors/xemacs-current/Makefile.common index 830c9334e37..54f6e149fa3 100644 --- a/editors/xemacs-current/Makefile.common +++ b/editors/xemacs-current/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2019/04/11 16:02:37 hauke Exp $ +# $NetBSD: Makefile.common,v 1.13 2019/06/08 10:41:00 rillig Exp $ # # used by editors/xemacs-current/Makefile # used by editors/xemacs-current-nox11/Makefile @@ -27,8 +27,8 @@ GENERATE_PLIST+= ${ECHO} bin/${EMACS_DISTNAME}-`${WRKSRC}/src/xemacs -sd`.dmp ; # Having the build path in the dumped emacs is not a problem. CHECK_WRKREF_SKIP+= bin/xemacs* -PRINT_PLIST_AWK+= { gsub(/${EMACS_DISTNAME}/, "$${DISTNAME}"); } -PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); } +PRINT_PLIST_AWK+= { gsub(/${EMACS_DISTNAME}/, "$${DISTNAME}"); } +PRINT_PLIST_AWK+= { gsub(/${MACHINE_GNU_PLATFORM}/, "$${MACHINE_GNU_PLATFORM}"); } PLIST_SUBST+= DISTNAME=${EMACS_DISTNAME} FILES_SUBST+= DISTNAME=${EMACS_DISTNAME} diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk index 6334d29685e..869f65aeef1 100644 --- a/editors/xemacs-current/options.mk +++ b/editors/xemacs-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.17 2018/12/19 13:41:45 hauke Exp $ +# $NetBSD: options.mk,v 1.18 2019/06/08 10:41:00 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS+= ldap canna debug @@ -86,10 +86,10 @@ PLIST.canna= yes CONFIGURE_ARGS+= --without-canna .endif -PLIST_VARS+= debug +PLIST_VARS+= debug .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --enable-debug=yes --with-debug CONFIGURE_ARGS+= --with-assertions --with-error-checking=all -CFLAGS+= -g3 -INSTALL_UNSTRIPPED= yes +CFLAGS+= -g3 +INSTALL_UNSTRIPPED= yes .endif diff --git a/editors/xemacs-current/version.mk b/editors/xemacs-current/version.mk index 7cf4c17dd67..bb15c03e0d2 100644 --- a/editors/xemacs-current/version.mk +++ b/editors/xemacs-current/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: version.mk,v 1.2 2019/06/08 10:41:00 rillig Exp $ -_EMACS_FLAVOR= xemacs -_EMACS_REQD= xemacs>=21.5<21.6 +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs>=21.5<21.6 _EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages _EMACS_PKGDEP.leim= diff --git a/editors/xemacs-nox11/version.mk b/editors/xemacs-nox11/version.mk index a04844f5c74..7361d9c2b44 100644 --- a/editors/xemacs-nox11/version.mk +++ b/editors/xemacs-nox11/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: version.mk,v 1.2 2019/06/08 10:41:00 rillig Exp $ -_EMACS_FLAVOR= xemacs -_EMACS_REQD= xemacs-nox11>=21.4<21.5 +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs-nox11>=21.4<21.5 _EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages _EMACS_PKGDEP.leim= diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile index 562baeac39c..fd8700b960b 100644 --- a/editors/xemacs-packages/Makefile +++ b/editors/xemacs-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2018/08/22 09:45:04 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2019/06/08 10:41:00 rillig Exp $ DISTNAME= xemacs-packages PKGNAME= xemacs-packages-1.18 @@ -6,7 +6,7 @@ PKGREVISION= 2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/} -XEMACSPKG_PATH= beta/experimental/packages +XEMACSPKG_PATH= beta/experimental/packages DISTFILES= \ Sun-1.19-pkg.tar.gz \ ada-1.16-pkg.tar.gz \ @@ -142,7 +142,7 @@ DISTFILES= \ # leim-1.38-pkg.tar.gz \ DISTFILES+= leim-1.31-pkg.tar.gz -SITES.leim-1.31-pkg.tar.gz = ${MASTER_SITE_XEMACS:="packages/"} +SITES.leim-1.31-pkg.tar.gz= ${MASTER_SITE_XEMACS:="packages/"} MAINTAINER= hauke@NetBSD.org HOMEPAGE= http://www.xemacs.org/ diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 2cbc4e55bff..022a203ac2a 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2018/02/01 14:25:30 hauke Exp $ +# $NetBSD: Makefile.common,v 1.29 2019/06/08 10:41:00 rillig Exp $ # # used by editors/xemacs-nox11/Makefile # used by editors/xemacs/Makefile @@ -23,9 +23,9 @@ USE_TOOLS+= makeinfo HAS_CONFIGURE= yes DIST_SUBDIR= xemacs -PLIST_SUBST+= DISTNAME=${DISTNAME:Q} -FILES_SUBST+= DISTNAME=${DISTNAME:Q} -MESSAGE_SUBST+= DISTNAME=${DISTNAME:Q} +PLIST_SUBST+= DISTNAME=${DISTNAME} +FILES_SUBST+= DISTNAME=${DISTNAME} +MESSAGE_SUBST+= DISTNAME=${DISTNAME} INFO_FILES= yes .if defined(MANZ) diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 6de43e5bb91..645d1f73c64 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.16 2018/12/19 13:29:34 hauke Exp $ +# $NetBSD: options.mk,v 1.17 2019/06/08 10:41:00 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS+= ldap canna debug @@ -68,9 +68,9 @@ PLIST.canna= yes CONFIGURE_ARGS+= --without-canna .endif -PLIST_VARS+= debug +PLIST_VARS+= debug .if !empty(PKG_OPTIONS:Mdebug) CONFIGURE_ARGS+= --debug -CFLAGS+= -g3 -INSTALL_UNSTRIPPED= yes +CFLAGS+= -g3 +INSTALL_UNSTRIPPED= yes .endif diff --git a/editors/xemacs/version.mk b/editors/xemacs/version.mk index 7538edd6862..eaba8abb2cd 100644 --- a/editors/xemacs/version.mk +++ b/editors/xemacs/version.mk @@ -1,7 +1,7 @@ -# $NetBSD: version.mk,v 1.1 2008/10/11 09:31:56 uebayasi Exp $ +# $NetBSD: version.mk,v 1.2 2019/06/08 10:41:00 rillig Exp $ -_EMACS_FLAVOR= xemacs -_EMACS_REQD= xemacs>=21.4<21.5 +_EMACS_FLAVOR= xemacs +_EMACS_REQD= xemacs>=21.4<21.5 _EMACS_PKGDEP.base= xemacs-packages>=1.15:../../editors/xemacs-packages _EMACS_PKGDEP.leim= |