pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/editors
Module Name: pkgsrc
Committed By: rillig
Date: Sat Jun 8 10:41:00 UTC 2019
Modified Files:
pkgsrc/editors/Sigil: Makefile
pkgsrc/editors/abiword: Makefile Makefile.common distinfo options.mk
pkgsrc/editors/abiword-plugins: Makefile
pkgsrc/editors/abiword/patches: patch-plugin-configure.m4
patch-plugins_gimp_xp_AbiGimp.cpp
patch-plugins_paint_xp_AbiGeneric.cpp
patch-plugins_paint_xp_AbiPaint.cpp
patch-plugins_wordperfect_xp_Makefile.am
patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
patch-src_af_util_xp_ut__iconv.cpp
patch-src_af_util_xp_ut__mbtowc.cpp
pkgsrc/editors/beav: Makefile
pkgsrc/editors/codeblocks: hacks.mk
pkgsrc/editors/dhex: distinfo
pkgsrc/editors/dhex/patches: patch-aa patch-ac
pkgsrc/editors/easyedit: Makefile
pkgsrc/editors/edt: Makefile
pkgsrc/editors/emacs: Makefile.common modules.mk
pkgsrc/editors/emacs20: Makefile version.mk
pkgsrc/editors/emacs21: Makefile.common hacks.mk version.mk
pkgsrc/editors/emacs21-nox11: version.mk
pkgsrc/editors/emacs25: Makefile.common
pkgsrc/editors/emacs26: Makefile.common
pkgsrc/editors/emacs26-nox11: Makefile
pkgsrc/editors/ex: Makefile
pkgsrc/editors/gedit-python: Makefile
pkgsrc/editors/gedit3: Makefile
pkgsrc/editors/ghex: Makefile
pkgsrc/editors/gummi: Makefile
pkgsrc/editors/jde: Makefile
pkgsrc/editors/jove: Makefile
pkgsrc/editors/kate: Makefile
pkgsrc/editors/kile: Makefile
pkgsrc/editors/manedit: distinfo
pkgsrc/editors/manedit/patches: patch-aa
pkgsrc/editors/medit: Makefile
pkgsrc/editors/mg2a: Makefile
pkgsrc/editors/mined: Makefile
pkgsrc/editors/mule-ucs: Makefile
pkgsrc/editors/nano: options.mk
pkgsrc/editors/ne: Makefile
pkgsrc/editors/nedit: Makefile
pkgsrc/editors/nts: Makefile
pkgsrc/editors/nvi: Makefile
pkgsrc/editors/nvi-m17n: Makefile distinfo
pkgsrc/editors/nvi-m17n/patches: patch-ab
pkgsrc/editors/p5-PPIx-EditorTools: Makefile
pkgsrc/editors/p5-Padre: Makefile
pkgsrc/editors/p5-Padre-Plugin-Ecliptic: Makefile
pkgsrc/editors/p5-Wx-Scintilla: Makefile
pkgsrc/editors/sam: Makefile
pkgsrc/editors/sandy: Makefile distinfo
pkgsrc/editors/sandy/patches: patch-sandy.c
pkgsrc/editors/scite: Makefile
pkgsrc/editors/tamago: Makefile
pkgsrc/editors/ted: distinfo
pkgsrc/editors/ted-pl: Makefile
pkgsrc/editors/ted/patches: patch-ae patch-af
pkgsrc/editors/texmaker: options.mk
pkgsrc/editors/texstudio: Makefile
pkgsrc/editors/texworks: Makefile
pkgsrc/editors/tomboy: distinfo
pkgsrc/editors/tomboy/patches: patch-configure
pkgsrc/editors/vigor: Makefile
pkgsrc/editors/vim-gtk2: Makefile
pkgsrc/editors/vim-gtk3: Makefile
pkgsrc/editors/vim-motif: Makefile
pkgsrc/editors/vim-share: Makefile.common
pkgsrc/editors/wily: Makefile
pkgsrc/editors/xemacs: Makefile.common options.mk version.mk
pkgsrc/editors/xemacs-current: Makefile.common options.mk version.mk
pkgsrc/editors/xemacs-current-nox11: version.mk
pkgsrc/editors/xemacs-nox11: version.mk
pkgsrc/editors/xemacs-packages: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/editors/Sigil/Makefile
cvs rdiff -u -r1.185 -r1.186 pkgsrc/editors/abiword/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/editors/abiword/Makefile.common
cvs rdiff -u -r1.77 -r1.78 pkgsrc/editors/abiword/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/abiword/options.mk
cvs rdiff -u -r1.100 -r1.101 pkgsrc/editors/abiword-plugins/Makefile
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/editors/abiword/patches/patch-plugin-configure.m4
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp \
pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp \
pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp \
pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am \
pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp \
pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h \
pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp \
pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h \
pkgsrc/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp \
pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp \
pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
cvs rdiff -u -r1.16 -r1.17 pkgsrc/editors/beav/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/codeblocks/hacks.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/dhex/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/dhex/patches/patch-aa \
pkgsrc/editors/dhex/patches/patch-ac
cvs rdiff -u -r1.19 -r1.20 pkgsrc/editors/easyedit/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/edt/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/editors/emacs/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/editors/emacs/modules.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/editors/emacs20/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs20/version.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/emacs21/Makefile.common
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/emacs21/hacks.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs21/version.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/emacs21-nox11/version.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/emacs25/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs26/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/emacs26-nox11/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/ex/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/editors/gedit-python/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/editors/gedit3/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/editors/ghex/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/editors/gummi/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/editors/jde/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/jove/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/editors/kate/Makefile
cvs rdiff -u -r1.101 -r1.102 pkgsrc/editors/kile/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/manedit/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/manedit/patches/patch-aa
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/medit/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/mg2a/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/editors/mined/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/mule-ucs/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/nano/options.mk
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/ne/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/editors/nedit/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/nts/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/editors/nvi/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/editors/nvi-m17n/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/nvi-m17n/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/nvi-m17n/patches/patch-ab
cvs rdiff -u -r1.18 -r1.19 pkgsrc/editors/p5-PPIx-EditorTools/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/editors/p5-Padre/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/p5-Padre-Plugin-Ecliptic/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/editors/p5-Wx-Scintilla/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/editors/sam/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/sandy/Makefile \
pkgsrc/editors/sandy/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/sandy/patches/patch-sandy.c
cvs rdiff -u -r1.32 -r1.33 pkgsrc/editors/scite/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/tamago/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/editors/ted/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/editors/ted-pl/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/ted/patches/patch-ae \
pkgsrc/editors/ted/patches/patch-af
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/texmaker/options.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/editors/texstudio/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/editors/texworks/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/editors/tomboy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/tomboy/patches/patch-configure
cvs rdiff -u -r1.47 -r1.48 pkgsrc/editors/vigor/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/editors/vim-gtk2/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/vim-gtk3/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/editors/vim-motif/Makefile
cvs rdiff -u -r1.162 -r1.163 pkgsrc/editors/vim-share/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/editors/wily/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/editors/xemacs/Makefile.common
cvs rdiff -u -r1.16 -r1.17 pkgsrc/editors/xemacs/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/xemacs/version.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/editors/xemacs-current/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/editors/xemacs-current/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/xemacs-current/version.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/xemacs-current-nox11/version.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/xemacs-nox11/version.mk
cvs rdiff -u -r1.70 -r1.71 pkgsrc/editors/xemacs-packages/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/editors/Sigil/Makefile
diff -u pkgsrc/editors/Sigil/Makefile:1.120 pkgsrc/editors/Sigil/Makefile:1.121
--- pkgsrc/editors/Sigil/Makefile:1.120 Thu Apr 25 07:32:51 2019
+++ pkgsrc/editors/Sigil/Makefile Sat Jun 8 10:40:52 2019
@@ -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}/
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"
Index: pkgsrc/editors/abiword/Makefile
diff -u pkgsrc/editors/abiword/Makefile:1.185 pkgsrc/editors/abiword/Makefile:1.186
--- pkgsrc/editors/abiword/Makefile:1.185 Wed Apr 3 00:32:40 2019
+++ pkgsrc/editors/abiword/Makefile Sat Jun 8 10:40:52 2019
@@ -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
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
Index: pkgsrc/editors/abiword/Makefile.common
diff -u pkgsrc/editors/abiword/Makefile.common:1.47 pkgsrc/editors/abiword/Makefile.common:1.48
--- pkgsrc/editors/abiword/Makefile.common:1.47 Sat Nov 24 19:14:09 2018
+++ pkgsrc/editors/abiword/Makefile.common Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/abiword/distinfo
diff -u pkgsrc/editors/abiword/distinfo:1.77 pkgsrc/editors/abiword/distinfo:1.78
--- pkgsrc/editors/abiword/distinfo:1.77 Fri Dec 28 22:24:52 2018
+++ pkgsrc/editors/abiword/distinfo Sat Jun 8 10:40:53 2019
@@ -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.cp
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
Index: pkgsrc/editors/abiword/options.mk
diff -u pkgsrc/editors/abiword/options.mk:1.3 pkgsrc/editors/abiword/options.mk:1.4
--- pkgsrc/editors/abiword/options.mk:1.3 Sat Nov 24 19:14:09 2018
+++ pkgsrc/editors/abiword/options.mk Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/abiword-plugins/Makefile
diff -u pkgsrc/editors/abiword-plugins/Makefile:1.100 pkgsrc/editors/abiword-plugins/Makefile:1.101
--- pkgsrc/editors/abiword-plugins/Makefile:1.100 Wed Apr 3 00:32:40 2019
+++ pkgsrc/editors/abiword-plugins/Makefile Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/abiword/patches/patch-plugin-configure.m4
diff -u pkgsrc/editors/abiword/patches/patch-plugin-configure.m4:1.2 pkgsrc/editors/abiword/patches/patch-plugin-configure.m4:1.3
--- pkgsrc/editors/abiword/patches/patch-plugin-configure.m4:1.2 Sat Nov 24 19:14:09 2018
+++ pkgsrc/editors/abiword/patches/patch-plugin-configure.m4 Sat Jun 8 10:40:53 2019
@@ -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])
Index: pkgsrc/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp:1.1 pkgsrc/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_gimp_xp_AbiGimp.cpp Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp:1.1 pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiGeneric.cpp Sat Jun 8 10:40:53 2019
@@ -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)
Index: pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp:1.1 pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_paint_xp_AbiPaint.cpp Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am:1.1 pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_Makefile.am Sat Jun 8 10:40:53 2019
@@ -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 = \
Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp:1.1 pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h:1.1 pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp:1.1 pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h:1.1 pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp:1.1 pkgsrc/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp
diff -u pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp:1.1 pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__iconv.cpp Sat Jun 8 10:40:53 2019
@@ -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 ()
Index: pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp
diff -u pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp:1.1 pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp:1.2
--- pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp:1.1 Sun Sep 13 21:32:13 2015
+++ pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__mbtowc.cpp Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/beav/Makefile
diff -u pkgsrc/editors/beav/Makefile:1.16 pkgsrc/editors/beav/Makefile:1.17
--- pkgsrc/editors/beav/Makefile:1.16 Tue May 9 14:51:36 2017
+++ pkgsrc/editors/beav/Makefile Sat Jun 8 10:40:53 2019
@@ -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@localhost
@@ -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,'
Index: pkgsrc/editors/codeblocks/hacks.mk
diff -u pkgsrc/editors/codeblocks/hacks.mk:1.1 pkgsrc/editors/codeblocks/hacks.mk:1.2
--- pkgsrc/editors/codeblocks/hacks.mk:1.1 Sat Aug 27 20:58:41 2016
+++ pkgsrc/editors/codeblocks/hacks.mk Sat Jun 8 10:40:53 2019
@@ -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.*))
Index: pkgsrc/editors/dhex/distinfo
diff -u pkgsrc/editors/dhex/distinfo:1.2 pkgsrc/editors/dhex/distinfo:1.3
--- pkgsrc/editors/dhex/distinfo:1.2 Tue Nov 3 03:32:15 2015
+++ pkgsrc/editors/dhex/distinfo Sat Jun 8 10:40:53 2019
@@ -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
Index: pkgsrc/editors/dhex/patches/patch-aa
diff -u pkgsrc/editors/dhex/patches/patch-aa:1.1 pkgsrc/editors/dhex/patches/patch-aa:1.2
--- pkgsrc/editors/dhex/patches/patch-aa:1.1 Wed Jan 23 22:00:27 2013
+++ pkgsrc/editors/dhex/patches/patch-aa Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/dhex/patches/patch-ac
diff -u pkgsrc/editors/dhex/patches/patch-ac:1.1 pkgsrc/editors/dhex/patches/patch-ac:1.2
--- pkgsrc/editors/dhex/patches/patch-ac:1.1 Wed Jan 23 22:00:27 2013
+++ pkgsrc/editors/dhex/patches/patch-ac Sat Jun 8 10:40:53 2019
@@ -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 @@
Index: pkgsrc/editors/easyedit/Makefile
diff -u pkgsrc/editors/easyedit/Makefile:1.19 pkgsrc/editors/easyedit/Makefile:1.20
--- pkgsrc/editors/easyedit/Makefile:1.19 Tue Aug 1 16:47:37 2017
+++ pkgsrc/editors/easyedit/Makefile Sat Jun 8 10:40:53 2019
@@ -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@localhost
#HOMEPAGE= http://mahon.cwx.net/
Index: pkgsrc/editors/edt/Makefile
diff -u pkgsrc/editors/edt/Makefile:1.2 pkgsrc/editors/edt/Makefile:1.3
--- pkgsrc/editors/edt/Makefile:1.2 Wed Oct 3 11:43:32 2012
+++ pkgsrc/editors/edt/Makefile Sat Jun 8 10:40:53 2019
@@ -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.sourcef
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:
Index: pkgsrc/editors/emacs/Makefile.common
diff -u pkgsrc/editors/emacs/Makefile.common:1.43 pkgsrc/editors/emacs/Makefile.common:1.44
--- pkgsrc/editors/emacs/Makefile.common:1.43 Tue Jul 17 17:14:58 2018
+++ pkgsrc/editors/emacs/Makefile.common Sat Jun 8 10:40:54 2019
@@ -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}.$
.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.
Index: pkgsrc/editors/emacs/modules.mk
diff -u pkgsrc/editors/emacs/modules.mk:1.25 pkgsrc/editors/emacs/modules.mk:1.26
--- pkgsrc/editors/emacs/modules.mk:1.25 Fri Nov 30 18:38:19 2018
+++ pkgsrc/editors/emacs/modules.mk Sat Jun 8 10:40:54 2019
@@ -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_
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_LISPPR
.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
Index: pkgsrc/editors/emacs20/Makefile
diff -u pkgsrc/editors/emacs20/Makefile:1.59 pkgsrc/editors/emacs20/Makefile:1.60
--- pkgsrc/editors/emacs20/Makefile:1.59 Sun Jul 23 05:22:38 2017
+++ pkgsrc/editors/emacs20/Makefile Sat Jun 8 10:40:54 2019
@@ -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
Index: pkgsrc/editors/emacs20/version.mk
diff -u pkgsrc/editors/emacs20/version.mk:1.2 pkgsrc/editors/emacs20/version.mk:1.3
--- pkgsrc/editors/emacs20/version.mk:1.2 Sat Feb 16 23:58:36 2013
+++ pkgsrc/editors/emacs20/version.mk Sat Jun 8 10:40:54 2019
@@ -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
Index: pkgsrc/editors/emacs21/Makefile.common
diff -u pkgsrc/editors/emacs21/Makefile.common:1.17 pkgsrc/editors/emacs21/Makefile.common:1.18
--- pkgsrc/editors/emacs21/Makefile.common:1.17 Fri Nov 11 10:54:41 2016
+++ pkgsrc/editors/emacs21/Makefile.common Sat Jun 8 10:40:54 2019
@@ -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}
Index: pkgsrc/editors/emacs21/hacks.mk
diff -u pkgsrc/editors/emacs21/hacks.mk:1.1 pkgsrc/editors/emacs21/hacks.mk:1.2
--- pkgsrc/editors/emacs21/hacks.mk:1.1 Tue May 3 09:41:20 2016
+++ pkgsrc/editors/emacs21/hacks.mk Sat Jun 8 10:40:54 2019
@@ -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
Index: pkgsrc/editors/emacs21/version.mk
diff -u pkgsrc/editors/emacs21/version.mk:1.3 pkgsrc/editors/emacs21/version.mk:1.4
--- pkgsrc/editors/emacs21/version.mk:1.3 Sun Feb 17 00:18:58 2013
+++ pkgsrc/editors/emacs21/version.mk Sat Jun 8 10:40:54 2019
@@ -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
Index: pkgsrc/editors/emacs21-nox11/version.mk
diff -u pkgsrc/editors/emacs21-nox11/version.mk:1.3 pkgsrc/editors/emacs21-nox11/version.mk:1.4
--- pkgsrc/editors/emacs21-nox11/version.mk:1.3 Sun Feb 17 00:22:36 2013
+++ pkgsrc/editors/emacs21-nox11/version.mk Sat Jun 8 10:40:54 2019
@@ -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
Index: pkgsrc/editors/emacs25/Makefile.common
diff -u pkgsrc/editors/emacs25/Makefile.common:1.4 pkgsrc/editors/emacs25/Makefile.common:1.5
--- pkgsrc/editors/emacs25/Makefile.common:1.4 Fri Jul 28 22:14:00 2017
+++ pkgsrc/editors/emacs25/Makefile.common Sat Jun 8 10:40:54 2019
@@ -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_V
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)
Index: pkgsrc/editors/emacs26/Makefile.common
diff -u pkgsrc/editors/emacs26/Makefile.common:1.2 pkgsrc/editors/emacs26/Makefile.common:1.3
--- pkgsrc/editors/emacs26/Makefile.common:1.2 Sun Apr 14 07:03:20 2019
+++ pkgsrc/editors/emacs26/Makefile.common Sat Jun 8 10:40:54 2019
@@ -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_V
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)
Index: pkgsrc/editors/emacs26-nox11/Makefile
diff -u pkgsrc/editors/emacs26-nox11/Makefile:1.2 pkgsrc/editors/emacs26-nox11/Makefile:1.3
--- pkgsrc/editors/emacs26-nox11/Makefile:1.2 Fri Jun 29 15:39:33 2018
+++ pkgsrc/editors/emacs26-nox11/Makefile Sat Jun 8 10:40:54 2019
@@ -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"
Index: pkgsrc/editors/ex/Makefile
diff -u pkgsrc/editors/ex/Makefile:1.13 pkgsrc/editors/ex/Makefile:1.14
--- pkgsrc/editors/ex/Makefile:1.13 Thu Oct 10 11:09:35 2013
+++ pkgsrc/editors/ex/Makefile Sat Jun 8 10:40:54 2019
@@ -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.reco
.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
-MAKE_ENV+= TERMLIB=${BUILDLINK_LIBNAME.termcap}
+MAKE_ENV+= TERMLIB=${BUILDLINK_LIBNAME.termcap}
Index: pkgsrc/editors/gedit-python/Makefile
diff -u pkgsrc/editors/gedit-python/Makefile:1.44 pkgsrc/editors/gedit-python/Makefile:1.45
--- pkgsrc/editors/gedit-python/Makefile:1.44 Fri Apr 26 13:13:55 2019
+++ pkgsrc/editors/gedit-python/Makefile Sat Jun 8 10:40:54 2019
@@ -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"
Index: pkgsrc/editors/gedit3/Makefile
diff -u pkgsrc/editors/gedit3/Makefile:1.47 pkgsrc/editors/gedit3/Makefile:1.48
--- pkgsrc/editors/gedit3/Makefile:1.47 Thu Apr 25 07:32:51 2019
+++ pkgsrc/editors/gedit3/Makefile Sat Jun 8 10:40:55 2019
@@ -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
Index: pkgsrc/editors/ghex/Makefile
diff -u pkgsrc/editors/ghex/Makefile:1.50 pkgsrc/editors/ghex/Makefile:1.51
--- pkgsrc/editors/ghex/Makefile:1.50 Thu Nov 29 11:21:50 2018
+++ pkgsrc/editors/ghex/Makefile Sat Jun 8 10:40:55 2019
@@ -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"
Index: pkgsrc/editors/gummi/Makefile
diff -u pkgsrc/editors/gummi/Makefile:1.63 pkgsrc/editors/gummi/Makefile:1.64
--- pkgsrc/editors/gummi/Makefile:1.63 Thu May 9 13:57:48 2019
+++ pkgsrc/editors/gummi/Makefile Sat Jun 8 10:40:55 2019
@@ -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/alexanderv
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"
Index: pkgsrc/editors/jde/Makefile
diff -u pkgsrc/editors/jde/Makefile:1.29 pkgsrc/editors/jde/Makefile:1.30
--- pkgsrc/editors/jde/Makefile:1.29 Wed Aug 16 20:45:36 2017
+++ pkgsrc/editors/jde/Makefile Sat Jun 8 10:40:55 2019
@@ -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
Index: pkgsrc/editors/jove/Makefile
diff -u pkgsrc/editors/jove/Makefile:1.17 pkgsrc/editors/jove/Makefile:1.18
--- pkgsrc/editors/jove/Makefile:1.17 Wed Oct 3 11:43:35 2012
+++ pkgsrc/editors/jove/Makefile Sat Jun 8 10:40:55 2019
@@ -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 l
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}
Index: pkgsrc/editors/kate/Makefile
diff -u pkgsrc/editors/kate/Makefile:1.45 pkgsrc/editors/kate/Makefile:1.46
--- pkgsrc/editors/kate/Makefile:1.45 Thu Apr 25 07:32:51 2019
+++ pkgsrc/editors/kate/Makefile Sat Jun 8 10:40:55 2019
@@ -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"
Index: pkgsrc/editors/kile/Makefile
diff -u pkgsrc/editors/kile/Makefile:1.101 pkgsrc/editors/kile/Makefile:1.102
--- pkgsrc/editors/kile/Makefile:1.101 Thu Dec 13 19:51:50 2018
+++ pkgsrc/editors/kile/Makefile Sat Jun 8 10:40:55 2019
@@ -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@localhost
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++
Index: pkgsrc/editors/manedit/distinfo
diff -u pkgsrc/editors/manedit/distinfo:1.11 pkgsrc/editors/manedit/distinfo:1.12
--- pkgsrc/editors/manedit/distinfo:1.11 Tue Nov 3 03:32:18 2015
+++ pkgsrc/editors/manedit/distinfo Sat Jun 8 10:40:55 2019
@@ -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
Index: pkgsrc/editors/manedit/patches/patch-aa
diff -u pkgsrc/editors/manedit/patches/patch-aa:1.5 pkgsrc/editors/manedit/patches/patch-aa:1.6
--- pkgsrc/editors/manedit/patches/patch-aa:1.5 Sun Oct 14 07:49:54 2007
+++ pkgsrc/editors/manedit/patches/patch-aa Sat Jun 8 10:40:56 2019
@@ -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
Index: pkgsrc/editors/medit/Makefile
diff -u pkgsrc/editors/medit/Makefile:1.36 pkgsrc/editors/medit/Makefile:1.37
--- pkgsrc/editors/medit/Makefile:1.36 Fri Apr 26 14:12:38 2019
+++ pkgsrc/editors/medit/Makefile Sat Jun 8 10:40:56 2019
@@ -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"
Index: pkgsrc/editors/mg2a/Makefile
diff -u pkgsrc/editors/mg2a/Makefile:1.15 pkgsrc/editors/mg2a/Makefile:1.16
--- pkgsrc/editors/mg2a/Makefile:1.15 Tue May 9 14:46:55 2017
+++ pkgsrc/editors/mg2a/Makefile Sat Jun 8 10:40:56 2019
@@ -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 EMAC
BUILD_TARGET= mg
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-CONFLICTS+= mg-[0-9]*
+CONFLICTS+= mg-[0-9]*
pre-configure:
set -e; cd ${WRKSRC}; \
Index: pkgsrc/editors/mined/Makefile
diff -u pkgsrc/editors/mined/Makefile:1.23 pkgsrc/editors/mined/Makefile:1.24
--- pkgsrc/editors/mined/Makefile:1.23 Wed Oct 16 22:37:14 2013
+++ pkgsrc/editors/mined/Makefile Sat Jun 8 10:40:56 2019
@@ -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)
Index: pkgsrc/editors/mule-ucs/Makefile
diff -u pkgsrc/editors/mule-ucs/Makefile:1.21 pkgsrc/editors/mule-ucs/Makefile:1.22
--- pkgsrc/editors/mule-ucs/Makefile:1.21 Sun Feb 17 19:18:03 2013
+++ pkgsrc/editors/mule-ucs/Makefile Sat Jun 8 10:40:56 2019
@@ -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|
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}; \
Index: pkgsrc/editors/nano/options.mk
diff -u pkgsrc/editors/nano/options.mk:1.4 pkgsrc/editors/nano/options.mk:1.5
--- pkgsrc/editors/nano/options.mk:1.4 Fri Jun 5 01:32:38 2015
+++ pkgsrc/editors/nano/options.mk Sat Jun 8 10:40:56 2019
@@ -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"
Index: pkgsrc/editors/ne/Makefile
diff -u pkgsrc/editors/ne/Makefile:1.20 pkgsrc/editors/ne/Makefile:1.21
--- pkgsrc/editors/ne/Makefile:1.20 Wed Jun 6 14:53:04 2018
+++ pkgsrc/editors/ne/Makefile Sat Jun 8 10:40:56 2019
@@ -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
Index: pkgsrc/editors/nedit/Makefile
diff -u pkgsrc/editors/nedit/Makefile:1.59 pkgsrc/editors/nedit/Makefile:1.60
--- pkgsrc/editors/nedit/Makefile:1.59 Sat Apr 21 13:38:05 2018
+++ pkgsrc/editors/nedit/Makefile Sat Jun 8 10:40:56 2019
@@ -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
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
Index: pkgsrc/editors/nts/Makefile
diff -u pkgsrc/editors/nts/Makefile:1.14 pkgsrc/editors/nts/Makefile:1.15
--- pkgsrc/editors/nts/Makefile:1.14 Fri Apr 26 13:13:56 2019
+++ pkgsrc/editors/nts/Makefile Sat Jun 8 10:40:56 2019
@@ -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
Index: pkgsrc/editors/nvi/Makefile
diff -u pkgsrc/editors/nvi/Makefile:1.51 pkgsrc/editors/nvi/Makefile:1.52
--- pkgsrc/editors/nvi/Makefile:1.51 Sun Sep 3 08:36:54 2017
+++ pkgsrc/editors/nvi/Makefile Sat Jun 8 10:40:57 2019
@@ -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@localhost
Index: pkgsrc/editors/nvi-m17n/Makefile
diff -u pkgsrc/editors/nvi-m17n/Makefile:1.55 pkgsrc/editors/nvi-m17n/Makefile:1.56
--- pkgsrc/editors/nvi-m17n/Makefile:1.55 Wed Aug 22 09:45:02 2018
+++ pkgsrc/editors/nvi-m17n/Makefile Sat Jun 8 10:40:57 2019
@@ -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
Index: pkgsrc/editors/nvi-m17n/distinfo
diff -u pkgsrc/editors/nvi-m17n/distinfo:1.15 pkgsrc/editors/nvi-m17n/distinfo:1.16
--- pkgsrc/editors/nvi-m17n/distinfo:1.15 Sat Jan 7 19:00:55 2017
+++ pkgsrc/editors/nvi-m17n/distinfo Sat Jun 8 10:40:57 2019
@@ -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)
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
Index: pkgsrc/editors/nvi-m17n/patches/patch-ab
diff -u pkgsrc/editors/nvi-m17n/patches/patch-ab:1.6 pkgsrc/editors/nvi-m17n/patches/patch-ab:1.7
--- pkgsrc/editors/nvi-m17n/patches/patch-ab:1.6 Thu Dec 1 18:46:53 2005
+++ pkgsrc/editors/nvi-m17n/patches/patch-ab Sat Jun 8 10:40:57 2019
@@ -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
Index: pkgsrc/editors/p5-PPIx-EditorTools/Makefile
diff -u pkgsrc/editors/p5-PPIx-EditorTools/Makefile:1.18 pkgsrc/editors/p5-PPIx-EditorTools/Makefile:1.19
--- pkgsrc/editors/p5-PPIx-EditorTools/Makefile:1.18 Wed Aug 22 09:45:02 2018
+++ pkgsrc/editors/p5-PPIx-EditorTools/Makefile Sat Jun 8 10:40:57 2019
@@ -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/PP
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
Index: pkgsrc/editors/p5-Padre/Makefile
diff -u pkgsrc/editors/p5-Padre/Makefile:1.54 pkgsrc/editors/p5-Padre/Makefile:1.55
--- pkgsrc/editors/p5-Padre/Makefile:1.54 Wed Nov 14 22:21:24 2018
+++ pkgsrc/editors/p5-Padre/Makefile Sat Jun 8 10:40:57 2019
@@ -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:../../
# 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
Index: pkgsrc/editors/p5-Padre-Plugin-Ecliptic/Makefile
diff -u pkgsrc/editors/p5-Padre-Plugin-Ecliptic/Makefile:1.13 pkgsrc/editors/p5-Padre-Plugin-Ecliptic/Makefile:1.14
--- pkgsrc/editors/p5-Padre-Plugin-Ecliptic/Makefile:1.13 Wed Aug 22 09:45:02 2018
+++ pkgsrc/editors/p5-Padre-Plugin-Ecliptic/Makefile Sat Jun 8 10:40:57 2019
@@ -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:../.
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
Index: pkgsrc/editors/p5-Wx-Scintilla/Makefile
diff -u pkgsrc/editors/p5-Wx-Scintilla/Makefile:1.31 pkgsrc/editors/p5-Wx-Scintilla/Makefile:1.32
--- pkgsrc/editors/p5-Wx-Scintilla/Makefile:1.31 Wed Nov 14 22:21:24 2018
+++ pkgsrc/editors/p5-Wx-Scintilla/Makefile Sat Jun 8 10:40:57 2019
@@ -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
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
Index: pkgsrc/editors/sam/Makefile
diff -u pkgsrc/editors/sam/Makefile:1.43 pkgsrc/editors/sam/Makefile:1.44
--- pkgsrc/editors/sam/Makefile:1.43 Thu Sep 21 14:37:39 2017
+++ pkgsrc/editors/sam/Makefile Sat Jun 8 10:40:57 2019
@@ -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 \
Index: pkgsrc/editors/sandy/Makefile
diff -u pkgsrc/editors/sandy/Makefile:1.8 pkgsrc/editors/sandy/Makefile:1.9
--- pkgsrc/editors/sandy/Makefile:1.8 Fri Sep 8 06:25:19 2017
+++ pkgsrc/editors/sandy/Makefile Sat Jun 8 10:40:57 2019
@@ -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/san
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"
Index: pkgsrc/editors/sandy/distinfo
diff -u pkgsrc/editors/sandy/distinfo:1.8 pkgsrc/editors/sandy/distinfo:1.9
--- pkgsrc/editors/sandy/distinfo:1.8 Thu Jul 6 11:31:16 2017
+++ pkgsrc/editors/sandy/distinfo Sat Jun 8 10:40:57 2019
@@ -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
Index: pkgsrc/editors/sandy/patches/patch-sandy.c
diff -u pkgsrc/editors/sandy/patches/patch-sandy.c:1.2 pkgsrc/editors/sandy/patches/patch-sandy.c:1.3
--- pkgsrc/editors/sandy/patches/patch-sandy.c:1.2 Thu Jul 6 11:31:16 2017
+++ pkgsrc/editors/sandy/patches/patch-sandy.c Sat Jun 8 10:40:58 2019
@@ -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 @@
Index: pkgsrc/editors/scite/Makefile
diff -u pkgsrc/editors/scite/Makefile:1.32 pkgsrc/editors/scite/Makefile:1.33
--- pkgsrc/editors/scite/Makefile:1.32 Wed Nov 14 22:21:24 2018
+++ pkgsrc/editors/scite/Makefile Sat Jun 8 10:40:58 2019
@@ -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.n
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
Index: pkgsrc/editors/tamago/Makefile
diff -u pkgsrc/editors/tamago/Makefile:1.28 pkgsrc/editors/tamago/Makefile:1.29
--- pkgsrc/editors/tamago/Makefile:1.28 Fri Sep 29 12:40:27 2017
+++ pkgsrc/editors/tamago/Makefile Sat Jun 8 10:40:58 2019
@@ -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
Index: pkgsrc/editors/ted/distinfo
diff -u pkgsrc/editors/ted/distinfo:1.16 pkgsrc/editors/ted/distinfo:1.17
--- pkgsrc/editors/ted/distinfo:1.16 Tue Nov 3 03:32:21 2015
+++ pkgsrc/editors/ted/distinfo Sat Jun 8 10:40:58 2019
@@ -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) = d8673fb67176c17beb90a8
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
Index: pkgsrc/editors/ted-pl/Makefile
diff -u pkgsrc/editors/ted-pl/Makefile:1.14 pkgsrc/editors/ted-pl/Makefile:1.15
--- pkgsrc/editors/ted-pl/Makefile:1.14 Sat Jul 4 16:18:30 2015
+++ pkgsrc/editors/ted-pl/Makefile Sat Jun 8 10:40:58 2019
@@ -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:
Index: pkgsrc/editors/ted/patches/patch-ae
diff -u pkgsrc/editors/ted/patches/patch-ae:1.2 pkgsrc/editors/ted/patches/patch-ae:1.3
--- pkgsrc/editors/ted/patches/patch-ae:1.2 Mon May 20 17:46:32 2002
+++ pkgsrc/editors/ted/patches/patch-ae Sat Jun 8 10:40:58 2019
@@ -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 @@
Index: pkgsrc/editors/ted/patches/patch-af
diff -u pkgsrc/editors/ted/patches/patch-af:1.2 pkgsrc/editors/ted/patches/patch-af:1.3
--- pkgsrc/editors/ted/patches/patch-af:1.2 Mon May 20 17:46:32 2002
+++ pkgsrc/editors/ted/patches/patch-af Sat Jun 8 10:40:58 2019
@@ -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 @@
Index: pkgsrc/editors/texmaker/options.mk
diff -u pkgsrc/editors/texmaker/options.mk:1.3 pkgsrc/editors/texmaker/options.mk:1.4
--- pkgsrc/editors/texmaker/options.mk:1.3 Wed Jan 10 22:09:02 2018
+++ pkgsrc/editors/texmaker/options.mk Sat Jun 8 10:40:58 2019
@@ -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"
Index: pkgsrc/editors/texstudio/Makefile
diff -u pkgsrc/editors/texstudio/Makefile:1.38 pkgsrc/editors/texstudio/Makefile:1.39
--- pkgsrc/editors/texstudio/Makefile:1.38 Thu May 9 13:57:48 2019
+++ pkgsrc/editors/texstudio/Makefile Sat Jun 8 10:40:58 2019
@@ -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=${DEST
.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
Index: pkgsrc/editors/texworks/Makefile
diff -u pkgsrc/editors/texworks/Makefile:1.69 pkgsrc/editors/texworks/Makefile:1.70
--- pkgsrc/editors/texworks/Makefile:1.69 Thu May 9 13:57:49 2019
+++ pkgsrc/editors/texworks/Makefile Sat Jun 8 10:40:59 2019
@@ -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@localhost
HOMEPAGE= http://www.tug.org/texworks/
Index: pkgsrc/editors/tomboy/distinfo
diff -u pkgsrc/editors/tomboy/distinfo:1.10 pkgsrc/editors/tomboy/distinfo:1.11
--- pkgsrc/editors/tomboy/distinfo:1.10 Tue Nov 3 03:32:22 2015
+++ pkgsrc/editors/tomboy/distinfo Sat Jun 8 10:40:59 2019
@@ -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) = 8266ecfd9
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
Index: pkgsrc/editors/tomboy/patches/patch-configure
diff -u pkgsrc/editors/tomboy/patches/patch-configure:1.1 pkgsrc/editors/tomboy/patches/patch-configure:1.2
--- pkgsrc/editors/tomboy/patches/patch-configure:1.1 Tue Apr 15 05:37:27 2014
+++ pkgsrc/editors/tomboy/patches/patch-configure Sat Jun 8 10:40:59 2019
@@ -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
Index: pkgsrc/editors/vigor/Makefile
diff -u pkgsrc/editors/vigor/Makefile:1.47 pkgsrc/editors/vigor/Makefile:1.48
--- pkgsrc/editors/vigor/Makefile:1.47 Mon Mar 12 11:16:25 2018
+++ pkgsrc/editors/vigor/Makefile Sat Jun 8 10:40:59 2019
@@ -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"
Index: pkgsrc/editors/vim-gtk2/Makefile
diff -u pkgsrc/editors/vim-gtk2/Makefile:1.81 pkgsrc/editors/vim-gtk2/Makefile:1.82
--- pkgsrc/editors/vim-gtk2/Makefile:1.81 Thu Nov 29 11:21:50 2018
+++ pkgsrc/editors/vim-gtk2/Makefile Sat Jun 8 10:40:59 2019
@@ -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
Index: pkgsrc/editors/vim-gtk3/Makefile
diff -u pkgsrc/editors/vim-gtk3/Makefile:1.13 pkgsrc/editors/vim-gtk3/Makefile:1.14
--- pkgsrc/editors/vim-gtk3/Makefile:1.13 Mon Jan 14 20:20:22 2019
+++ pkgsrc/editors/vim-gtk3/Makefile Sat Jun 8 10:40:59 2019
@@ -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
Index: pkgsrc/editors/vim-motif/Makefile
diff -u pkgsrc/editors/vim-motif/Makefile:1.36 pkgsrc/editors/vim-motif/Makefile:1.37
--- pkgsrc/editors/vim-motif/Makefile:1.36 Sun Feb 19 19:13:35 2017
+++ pkgsrc/editors/vim-motif/Makefile Sat Jun 8 10:40:59 2019
@@ -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
Index: pkgsrc/editors/vim-share/Makefile.common
diff -u pkgsrc/editors/vim-share/Makefile.common:1.162 pkgsrc/editors/vim-share/Makefile.common:1.163
--- pkgsrc/editors/vim-share/Makefile.common:1.162 Wed Jul 4 13:40:17 2018
+++ pkgsrc/editors/vim-share/Makefile.common Sat Jun 8 10:40:59 2019
@@ -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
Index: pkgsrc/editors/wily/Makefile
diff -u pkgsrc/editors/wily/Makefile:1.21 pkgsrc/editors/wily/Makefile:1.22
--- pkgsrc/editors/wily/Makefile:1.21 Fri Jul 21 20:50:57 2017
+++ pkgsrc/editors/wily/Makefile Sat Jun 8 10:40:59 2019
@@ -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/wi
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
Index: pkgsrc/editors/xemacs/Makefile.common
diff -u pkgsrc/editors/xemacs/Makefile.common:1.28 pkgsrc/editors/xemacs/Makefile.common:1.29
--- pkgsrc/editors/xemacs/Makefile.common:1.28 Thu Feb 1 14:25:30 2018
+++ pkgsrc/editors/xemacs/Makefile.common Sat Jun 8 10:41:00 2019
@@ -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)
Index: pkgsrc/editors/xemacs/options.mk
diff -u pkgsrc/editors/xemacs/options.mk:1.16 pkgsrc/editors/xemacs/options.mk:1.17
--- pkgsrc/editors/xemacs/options.mk:1.16 Wed Dec 19 13:29:34 2018
+++ pkgsrc/editors/xemacs/options.mk Sat Jun 8 10:41:00 2019
@@ -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
Index: pkgsrc/editors/xemacs/version.mk
diff -u pkgsrc/editors/xemacs/version.mk:1.1 pkgsrc/editors/xemacs/version.mk:1.2
--- pkgsrc/editors/xemacs/version.mk:1.1 Sat Oct 11 09:31:56 2008
+++ pkgsrc/editors/xemacs/version.mk Sat Jun 8 10:41:00 2019
@@ -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=
Index: pkgsrc/editors/xemacs-current/Makefile.common
diff -u pkgsrc/editors/xemacs-current/Makefile.common:1.12 pkgsrc/editors/xemacs-current/Makefile.common:1.13
--- pkgsrc/editors/xemacs-current/Makefile.common:1.12 Thu Apr 11 16:02:37 2019
+++ pkgsrc/editors/xemacs-current/Makefile.common Sat Jun 8 10:41:00 2019
@@ -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_DIS
# 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}
Index: pkgsrc/editors/xemacs-current/options.mk
diff -u pkgsrc/editors/xemacs-current/options.mk:1.17 pkgsrc/editors/xemacs-current/options.mk:1.18
--- pkgsrc/editors/xemacs-current/options.mk:1.17 Wed Dec 19 13:41:45 2018
+++ pkgsrc/editors/xemacs-current/options.mk Sat Jun 8 10:41:00 2019
@@ -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
Index: pkgsrc/editors/xemacs-current/version.mk
diff -u pkgsrc/editors/xemacs-current/version.mk:1.1 pkgsrc/editors/xemacs-current/version.mk:1.2
--- pkgsrc/editors/xemacs-current/version.mk:1.1 Sat Oct 11 09:31:56 2008
+++ pkgsrc/editors/xemacs-current/version.mk Sat Jun 8 10:41:00 2019
@@ -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=
Index: pkgsrc/editors/xemacs-current-nox11/version.mk
diff -u pkgsrc/editors/xemacs-current-nox11/version.mk:1.1 pkgsrc/editors/xemacs-current-nox11/version.mk:1.2
--- pkgsrc/editors/xemacs-current-nox11/version.mk:1.1 Sat Oct 11 09:31:56 2008
+++ pkgsrc/editors/xemacs-current-nox11/version.mk Sat Jun 8 10:41:00 2019
@@ -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=
Index: pkgsrc/editors/xemacs-nox11/version.mk
diff -u pkgsrc/editors/xemacs-nox11/version.mk:1.1 pkgsrc/editors/xemacs-nox11/version.mk:1.2
--- pkgsrc/editors/xemacs-nox11/version.mk:1.1 Sat Oct 11 09:31:56 2008
+++ pkgsrc/editors/xemacs-nox11/version.mk Sat Jun 8 10:41:00 2019
@@ -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=
Index: pkgsrc/editors/xemacs-packages/Makefile
diff -u pkgsrc/editors/xemacs-packages/Makefile:1.70 pkgsrc/editors/xemacs-packages/Makefile:1.71
--- pkgsrc/editors/xemacs-packages/Makefile:1.70 Wed Aug 22 09:45:04 2018
+++ pkgsrc/editors/xemacs-packages/Makefile Sat Jun 8 10:41:00 2019
@@ -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@localhost
HOMEPAGE= http://www.xemacs.org/
Home |
Main Index |
Thread Index |
Old Index