pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11
Module Name: pkgsrc
Committed By: rillig
Date: Sun Nov 3 09:14:21 UTC 2019
Modified Files:
pkgsrc/x11/Xfixes: Makefile builtin.mk
pkgsrc/x11/Xrender: Makefile builtin.mk
pkgsrc/x11/aterm: Makefile options.mk
pkgsrc/x11/avant-window-navigator: Makefile
pkgsrc/x11/blt: Makefile
pkgsrc/x11/clipit: Makefile
pkgsrc/x11/driconf: Makefile
pkgsrc/x11/eekboard: Makefile
pkgsrc/x11/elementary: Makefile
pkgsrc/x11/enlightenment: Makefile
pkgsrc/x11/evieext: builtin.mk
pkgsrc/x11/filerunner: Makefile
pkgsrc/x11/fixesproto4: Makefile builtin.mk
pkgsrc/x11/fltk13: Makefile buildlink3.mk
pkgsrc/x11/gnome-desktop3: Makefile
pkgsrc/x11/gnome-panel: Makefile
pkgsrc/x11/gnustep-preferences: Makefile
pkgsrc/x11/gtk-sharp: Makefile
pkgsrc/x11/gtk2: Makefile options.mk
pkgsrc/x11/gtk3: Makefile
pkgsrc/x11/kactivities: Makefile
pkgsrc/x11/kactivities-stats: buildlink3.mk
pkgsrc/x11/kconfigwidgets: Makefile
pkgsrc/x11/kde-workspace4: Makefile options.mk
pkgsrc/x11/kdelibs4: Makefile
pkgsrc/x11/kdelibs4support: Makefile
pkgsrc/x11/kirigami2: buildlink3.mk
pkgsrc/x11/kterm: Makefile
pkgsrc/x11/labltk: Makefile
pkgsrc/x11/libFS: builtin.mk
pkgsrc/x11/libICE: builtin.mk
pkgsrc/x11/libSM: builtin.mk
pkgsrc/x11/libX11: Makefile builtin.mk
pkgsrc/x11/libXScrnSaver: builtin.mk
pkgsrc/x11/libXau: builtin.mk
pkgsrc/x11/libXcomposite: builtin.mk
pkgsrc/x11/libXdamage: builtin.mk
pkgsrc/x11/libXdmcp: builtin.mk
pkgsrc/x11/libXevie: builtin.mk
pkgsrc/x11/libXext: builtin.mk
pkgsrc/x11/libXfixes: builtin.mk
pkgsrc/x11/libXfont: Makefile builtin.mk
pkgsrc/x11/libXfont2: Makefile builtin.mk
pkgsrc/x11/libXft: builtin.mk
pkgsrc/x11/libXi: builtin.mk
pkgsrc/x11/libXinerama: builtin.mk
pkgsrc/x11/libXmu: builtin.mk
pkgsrc/x11/libXpm: builtin.mk
pkgsrc/x11/libXpresent: builtin.mk
pkgsrc/x11/libXrandr: builtin.mk
pkgsrc/x11/libXrender: builtin.mk
pkgsrc/x11/libXres: builtin.mk
pkgsrc/x11/libXt: builtin.mk
pkgsrc/x11/libXtst: builtin.mk
pkgsrc/x11/libXv: builtin.mk
pkgsrc/x11/libXvMC: builtin.mk
pkgsrc/x11/libgnomekbd2: Makefile
pkgsrc/x11/libkactivities4: Makefile
pkgsrc/x11/liboldXrandr: builtin.mk
pkgsrc/x11/libxcb: builtin.mk
pkgsrc/x11/lxlauncher: Makefile
pkgsrc/x11/mcookie: Makefile
pkgsrc/x11/mlterm: options.mk
pkgsrc/x11/motif: Makefile
pkgsrc/x11/mowitz: Makefile
pkgsrc/x11/p5-Wx: Makefile
pkgsrc/x11/pixman: Makefile hacks.mk
pkgsrc/x11/py-Pmw: Makefile
pkgsrc/x11/py-Xlib: Makefile
pkgsrc/x11/py-gnome2: Makefile
pkgsrc/x11/py-gnome2-desktop: Makefile
pkgsrc/x11/py-gnome2-extras: Makefile
pkgsrc/x11/py-gtk2: Makefile options.mk
pkgsrc/x11/py-gtksourceview: Makefile
pkgsrc/x11/py-kde4: Makefile
pkgsrc/x11/py-keybinder: Makefile
pkgsrc/x11/py-kiwi: Makefile
pkgsrc/x11/py-qt4: Makefile
pkgsrc/x11/py-qwt-qt4: Makefile
pkgsrc/x11/py-terminator: Makefile
pkgsrc/x11/py-vte: Makefile
pkgsrc/x11/py-wxWidgets: Makefile
pkgsrc/x11/py-xcbgen: Makefile
pkgsrc/x11/qt4-libs: Makefile Makefile.common
pkgsrc/x11/qt4-mysql: Makefile
pkgsrc/x11/qt4-pgsql: Makefile
pkgsrc/x11/qt4-sqlite3: Makefile
pkgsrc/x11/qt5-qtbase: Makefile
pkgsrc/x11/qt5-qtmultimedia: buildlink3.mk
pkgsrc/x11/qt5-qtserialport: buildlink3.mk
pkgsrc/x11/qt5-qtspeech: buildlink3.mk
pkgsrc/x11/qt5-qtsvg: buildlink3.mk
pkgsrc/x11/qt5-qtwebchannel: buildlink3.mk
pkgsrc/x11/qt5-qtwebkit: Makefile
pkgsrc/x11/qwt-qt4: Makefile
pkgsrc/x11/qwt6-qt5: Makefile buildlink3.mk
pkgsrc/x11/redshift: Makefile
pkgsrc/x11/rofi: Makefile
pkgsrc/x11/rox-session: Makefile
pkgsrc/x11/ruby-tk: Makefile
pkgsrc/x11/ruby-tk-gem: Makefile
pkgsrc/x11/sessreg: Makefile
pkgsrc/x11/stalonetray: Makefile
pkgsrc/x11/tk-Tix: options.mk
pkgsrc/x11/tk85: options.mk
pkgsrc/x11/wmfire: Makefile
pkgsrc/x11/wterm: Makefile
pkgsrc/x11/wxGTK28: Makefile.common
pkgsrc/x11/xauth: builtin.mk
pkgsrc/x11/xbitmaps: builtin.mk
pkgsrc/x11/xcb-proto: builtin.mk
pkgsrc/x11/xcb-util: builtin.mk
pkgsrc/x11/xcb-util-xrm: Makefile
pkgsrc/x11/xcb-util036: Makefile
pkgsrc/x11/xcursor: builtin.mk
pkgsrc/x11/xdaemon: Makefile
pkgsrc/x11/xdm3d: Makefile
pkgsrc/x11/xearth: Makefile
pkgsrc/x11/xephem: Makefile
pkgsrc/x11/xfce4-tumbler: Makefile
pkgsrc/x11/xfce4-wmdock-plugin: Makefile
pkgsrc/x11/xicc: Makefile
pkgsrc/x11/xkbd: Makefile
pkgsrc/x11/xlockmore: Makefile Makefile.common
pkgsrc/x11/xmindpath: Makefile
pkgsrc/x11/xmx: Makefile
pkgsrc/x11/xorgproto: builtin.mk
pkgsrc/x11/xosd: Makefile
pkgsrc/x11/xpmroot: Makefile
pkgsrc/x11/xscribble: Makefile
pkgsrc/x11/xterm: Makefile options.mk
pkgsrc/x11/xtrans: builtin.mk
Log Message:
x11: align variable assignments
pkglint -Wall -F --only aligned --only indent -r
No manual corrections.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/Xfixes/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/Xfixes/builtin.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/Xrender/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/Xrender/builtin.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/aterm/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/aterm/options.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/avant-window-navigator/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/x11/blt/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/clipit/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/driconf/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/x11/eekboard/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/elementary/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/enlightenment/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/evieext/builtin.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/filerunner/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/fixesproto4/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/x11/fixesproto4/builtin.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/fltk13/buildlink3.mk
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/gnome-desktop3/Makefile
cvs rdiff -u -r1.216 -r1.217 pkgsrc/x11/gnome-panel/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/x11/gnustep-preferences/Makefile
cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/gtk-sharp/Makefile
cvs rdiff -u -r1.310 -r1.311 pkgsrc/x11/gtk2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/gtk2/options.mk
cvs rdiff -u -r1.135 -r1.136 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/x11/kactivities/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/kactivities-stats/buildlink3.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/kconfigwidgets/Makefile
cvs rdiff -u -r1.77 -r1.78 pkgsrc/x11/kde-workspace4/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/kde-workspace4/options.mk
cvs rdiff -u -r1.106 -r1.107 pkgsrc/x11/kdelibs4/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/x11/kdelibs4support/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/kirigami2/buildlink3.mk
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/kterm/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/labltk/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libFS/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libICE/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libSM/builtin.mk
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/libX11/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libX11/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXScrnSaver/builtin.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXau/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXcomposite/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXdamage/builtin.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXdmcp/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXevie/builtin.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libXext/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXfixes/builtin.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/libXfont/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXfont/builtin.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/libXfont2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXfont2/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXft/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXi/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXinerama/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXmu/builtin.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/libXpm/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXpresent/builtin.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/libXrandr/builtin.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/libXrender/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXres/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXt/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXtst/builtin.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXv/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libXvMC/builtin.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/libgnomekbd2/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/libkactivities4/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/liboldXrandr/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/libxcb/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/lxlauncher/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/mcookie/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/mlterm/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/motif/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/mowitz/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/x11/p5-Wx/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/x11/pixman/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/pixman/hacks.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/x11/py-Pmw/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/py-Xlib/Makefile
cvs rdiff -u -r1.123 -r1.124 pkgsrc/x11/py-gnome2/Makefile
cvs rdiff -u -r1.133 -r1.134 pkgsrc/x11/py-gnome2-desktop/Makefile
cvs rdiff -u -r1.95 -r1.96 pkgsrc/x11/py-gnome2-extras/Makefile
cvs rdiff -u -r1.121 -r1.122 pkgsrc/x11/py-gtk2/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-gtk2/options.mk
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/py-gtksourceview/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/x11/py-kde4/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/py-keybinder/Makefile
cvs rdiff -u -r1.51 -r1.52 pkgsrc/x11/py-kiwi/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/py-qt4/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/py-qwt-qt4/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/py-terminator/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/x11/py-vte/Makefile
cvs rdiff -u -r1.78 -r1.79 pkgsrc/x11/py-wxWidgets/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/py-xcbgen/Makefile
cvs rdiff -u -r1.130 -r1.131 pkgsrc/x11/qt4-libs/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/x11/qt4-libs/Makefile.common
cvs rdiff -u -r1.41 -r1.42 pkgsrc/x11/qt4-mysql/Makefile
cvs rdiff -u -r1.50 -r1.51 pkgsrc/x11/qt4-pgsql/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/x11/qt4-sqlite3/Makefile
cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/qt5-qtbase/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/qt5-qtserialport/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/qt5-qtspeech/buildlink3.mk
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/qt5-qtsvg/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/qwt-qt4/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/qwt6-qt5/Makefile \
pkgsrc/x11/qwt6-qt5/buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/redshift/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/rofi/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/rox-session/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/ruby-tk/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/ruby-tk-gem/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/sessreg/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/stalonetray/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/tk-Tix/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/tk85/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/wmfire/Makefile
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/wterm/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/wxGTK28/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xauth/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xbitmaps/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xcb-proto/builtin.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xcb-util/builtin.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xcb-util-xrm/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/xcb-util036/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xcursor/builtin.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xdaemon/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/xdm3d/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/x11/xearth/Makefile
cvs rdiff -u -r1.67 -r1.68 pkgsrc/x11/xephem/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/x11/xfce4-tumbler/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xfce4-wmdock-plugin/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xicc/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/xkbd/Makefile
cvs rdiff -u -r1.139 -r1.140 pkgsrc/x11/xlockmore/Makefile
cvs rdiff -u -r1.79 -r1.80 pkgsrc/x11/xlockmore/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xmindpath/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xmx/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/xorgproto/builtin.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xosd/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/x11/xpmroot/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/xscribble/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/x11/xterm/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/xterm/options.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/xtrans/builtin.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/Xfixes/Makefile
diff -u pkgsrc/x11/Xfixes/Makefile:1.31 pkgsrc/x11/Xfixes/Makefile:1.32
--- pkgsrc/x11/Xfixes/Makefile:1.31 Wed Sep 6 09:03:05 2017
+++ pkgsrc/x11/Xfixes/Makefile Sun Nov 3 09:14:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/09/06 09:03:05 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 09:14:06 rillig Exp $
DISTNAME= libXfixes-2.0.1
PKGNAME= ${DISTNAME:S/libX/X/}
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= xfixes.pc.in
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead."
+PKG_FAIL_REASON+= "This package is for native X11 only; use libXfixes instead."
.endif
CFLAGS.Darwin+= -fno-common
Index: pkgsrc/x11/Xfixes/builtin.mk
diff -u pkgsrc/x11/Xfixes/builtin.mk:1.12 pkgsrc/x11/Xfixes/builtin.mk:1.13
--- pkgsrc/x11/Xfixes/builtin.mk:1.12 Mon Mar 19 12:34:21 2012
+++ pkgsrc/x11/Xfixes/builtin.mk Sun Nov 3 09:14:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.12 2012/03/19 12:34:21 joerg Exp $
+# $NetBSD: builtin.mk,v 1.13 2019/11/03 09:14:06 rillig Exp $
BUILTIN_PKG:= Xfixes
@@ -18,7 +18,7 @@ IS_BUILTIN.Xfixes= yes
IS_BUILTIN.Xfixes= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.Xfixes
+MAKEVARS+= IS_BUILTIN.Xfixes
###
### Determine whether we should use the built-in implementation if it
@@ -45,6 +45,6 @@ USE_BUILTIN.Xfixes!= \
. endif
. endif # PREFER.Xfixes
.endif
-MAKEVARS+= USE_BUILTIN.Xfixes
+MAKEVARS+= USE_BUILTIN.Xfixes
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/Xrender/Makefile
diff -u pkgsrc/x11/Xrender/Makefile:1.39 pkgsrc/x11/Xrender/Makefile:1.40
--- pkgsrc/x11/Xrender/Makefile:1.39 Wed Mar 7 11:57:33 2018
+++ pkgsrc/x11/Xrender/Makefile Sun Nov 3 09:14:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/03/07 11:57:33 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 09:14:06 rillig Exp $
DISTNAME= libXrender-0.9.0
PKGNAME= ${DISTNAME:S/lib//}
@@ -22,7 +22,7 @@ CONFIGURE_ENV+= X_LIBS=${X11_LDFLAGS:Q}
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+="This package is for native X11 only; use libXrender instead."
+PKG_FAIL_REASON+= "This package is for native X11 only; use libXrender instead."
.endif
.include "../../x11/xorgproto/buildlink3.mk"
Index: pkgsrc/x11/Xrender/builtin.mk
diff -u pkgsrc/x11/Xrender/builtin.mk:1.21 pkgsrc/x11/Xrender/builtin.mk:1.22
--- pkgsrc/x11/Xrender/builtin.mk:1.21 Mon Mar 10 11:56:02 2014
+++ pkgsrc/x11/Xrender/builtin.mk Sun Nov 3 09:14:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.21 2014/03/10 11:56:02 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.22 2019/11/03 09:14:06 rillig Exp $
BUILTIN_PKG:= Xrender
@@ -18,7 +18,7 @@ IS_BUILTIN.Xrender= yes
IS_BUILTIN.Xrender= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.Xrender
+MAKEVARS+= IS_BUILTIN.Xrender
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -50,10 +50,10 @@ BUILTIN_VERSION.Xrender?= ${_version_}
. endfor
. endfor
. if defined(BUILTIN_VERSION.Xrender)
-BUILTIN_PKG.Xrender= Xrender-${BUILTIN_VERSION.Xrender}
+BUILTIN_PKG.Xrender= Xrender-${BUILTIN_VERSION.Xrender}
. endif
.endif
-MAKEVARS+= BUILTIN_PKG.Xrender
+MAKEVARS+= BUILTIN_PKG.Xrender
###
### Determine whether we should use the built-in implementation if it
@@ -89,7 +89,7 @@ USE_BUILTIN.Xrender!= \
. endif
. endif # PREFER.Xrender
.endif
-MAKEVARS+= USE_BUILTIN.Xrender
+MAKEVARS+= USE_BUILTIN.Xrender
###
### The section below only applies if we are not including this file
Index: pkgsrc/x11/aterm/Makefile
diff -u pkgsrc/x11/aterm/Makefile:1.57 pkgsrc/x11/aterm/Makefile:1.58
--- pkgsrc/x11/aterm/Makefile:1.57 Sun Jul 21 22:25:55 2019
+++ pkgsrc/x11/aterm/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/07/21 22:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 09:14:07 rillig Exp $
#
DISTNAME= aterm-1.0.1
@@ -17,21 +17,21 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= YES
MAKE_JOBS_SAFE= no
-CONFIGURE_ARGS+=--enable-background-image \
- --enable-transparency \
- --enable-fading \
- --enable-graphics \
- --with-xpm \
- --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \
- --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \
- --with-jpeg \
- --with-jpeg-includes=${JPEGBASE}/include \
- --with-jpeg-library=${JPEGBASE}/lib \
- --with-png \
- --with-png-library=${BUILDLINK_PREFIX.png}/lib \
- --with-png-includes=${BUILDLINK_PREFIX.png}/include \
- --enable-utmp \
- --enable-wtmp
+CONFIGURE_ARGS+= --enable-background-image \
+ --enable-transparency \
+ --enable-fading \
+ --enable-graphics \
+ --with-xpm \
+ --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \
+ --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \
+ --with-jpeg \
+ --with-jpeg-includes=${JPEGBASE}/include \
+ --with-jpeg-library=${JPEGBASE}/lib \
+ --with-png \
+ --with-png-library=${BUILDLINK_PREFIX.png}/lib \
+ --with-png-includes=${BUILDLINK_PREFIX.png}/include \
+ --enable-utmp \
+ --enable-wtmp
.include "options.mk"
Index: pkgsrc/x11/aterm/options.mk
diff -u pkgsrc/x11/aterm/options.mk:1.4 pkgsrc/x11/aterm/options.mk:1.5
--- pkgsrc/x11/aterm/options.mk:1.4 Fri Nov 30 17:25:05 2018
+++ pkgsrc/x11/aterm/options.mk Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2018/11/30 17:25:05 nia Exp $
+# $NetBSD: options.mk,v 1.5 2019/11/03 09:14:07 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.aterm
PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll \
@@ -15,17 +15,17 @@ CONFIGURE_ARGS+=--without-afterimage_con
.endif
.if !empty(PKG_OPTIONS:Materm-big5)
-CONFIGURE_ARGS+=--enable-big5
+CONFIGURE_ARGS+= --enable-big5
.endif
.if !empty(PKG_OPTIONS:Materm-greek)
-CONFIGURE_ARGS+=--enable-greek
+CONFIGURE_ARGS+= --enable-greek
.endif
.if !empty(PKG_OPTIONS:Materm-kanji)
-CONFIGURE_ARGS+=--enable-kanji
+CONFIGURE_ARGS+= --enable-kanji
.endif
.if !empty(PKG_OPTIONS:Materm-xterm-scroll)
-CONFIGURE_ARGS+=--enable-xterm-scroll
+CONFIGURE_ARGS+= --enable-xterm-scroll
.endif
Index: pkgsrc/x11/avant-window-navigator/Makefile
diff -u pkgsrc/x11/avant-window-navigator/Makefile:1.52 pkgsrc/x11/avant-window-navigator/Makefile:1.53
--- pkgsrc/x11/avant-window-navigator/Makefile:1.52 Mon Sep 2 13:20:14 2019
+++ pkgsrc/x11/avant-window-navigator/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/09/02 13:20:14 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/11/03 09:14:07 rillig Exp $
DISTNAME= avant-window-navigator-0.4.0
PKGREVISION= 35
@@ -41,10 +41,10 @@ SUBST_FILES.pathfix+= tests/test-awn-eff
SUBST_FILES.pathfix+= tests/test-overlays.py
SUBST_SED.pathfix= -e "s,/usr/share,${PREFIX}/share,"
-PY_PATCHPLIST= yes
-REPLACE_PYTHON+= awn-settings/awnSettings.py.in
-REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+PY_PATCHPLIST= yes
+REPLACE_PYTHON+= awn-settings/awnSettings.py.in
+REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
.include "../../devel/GConf/schemas.mk"
.include "../../lang/vala/buildlink3.mk"
Index: pkgsrc/x11/blt/Makefile
diff -u pkgsrc/x11/blt/Makefile:1.32 pkgsrc/x11/blt/Makefile:1.33
--- pkgsrc/x11/blt/Makefile:1.32 Mon Mar 12 11:15:48 2018
+++ pkgsrc/x11/blt/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/03/12 11:15:48 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2019/11/03 09:14:07 rillig Exp $
DISTNAME= BLT2.4z
PKGNAME= blt-2.4z
@@ -6,9 +6,9 @@ PKGREVISION= 10
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=blt/}
-PATCHFILES= blt2.4z-patch-2
-PATCH_SITES= ${MASTER_SITES}
-PATCH_DIST_STRIP=-p1
+PATCHFILES= blt2.4z-patch-2
+PATCH_SITES= ${MASTER_SITES}
+PATCH_DIST_STRIP= -p1
MAINTAINER= brook%nmsu.edu@localhost
HOMEPAGE= http://blt.sourceforge.net/
Index: pkgsrc/x11/clipit/Makefile
diff -u pkgsrc/x11/clipit/Makefile:1.21 pkgsrc/x11/clipit/Makefile:1.22
--- pkgsrc/x11/clipit/Makefile:1.21 Sun Jul 21 22:25:56 2019
+++ pkgsrc/x11/clipit/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/07/21 22:25:56 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 09:14:07 rillig Exp $
#
DISTNAME= clipit-1.4.2
@@ -12,8 +12,8 @@ COMMENT= Lightweight, fully featured GTK
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
USE_TOOLS+= gmake
USE_TOOLS+= intltool msgfmt
Index: pkgsrc/x11/driconf/Makefile
diff -u pkgsrc/x11/driconf/Makefile:1.29 pkgsrc/x11/driconf/Makefile:1.30
--- pkgsrc/x11/driconf/Makefile:1.29 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/driconf/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 09:14:07 rillig Exp $
DISTNAME= driconf-0.9.1
PKGREVISION= 11
@@ -17,9 +17,9 @@ DEPENDS+= xdriinfo>=1.0.2:../../x11/xdri
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt msgmerge xgettext
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-REPLACE_PYTHON= *.py
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+REPLACE_PYTHON= *.py
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
SUBST_CLASSES+= fix-paths
SUBST_FILES.fix-paths= driconf driconf.desktop
Index: pkgsrc/x11/eekboard/Makefile
diff -u pkgsrc/x11/eekboard/Makefile:1.53 pkgsrc/x11/eekboard/Makefile:1.54
--- pkgsrc/x11/eekboard/Makefile:1.53 Sun Jul 21 22:24:15 2019
+++ pkgsrc/x11/eekboard/Makefile Sun Nov 3 09:14:07 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.53 2019/07/21 22:24:15 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2019/11/03 09:14:07 rillig Exp $
DISTNAME= eekboard-1.0.8
PKGREVISION= 23
MASTER_SITES= ${MASTER_SITE_GITHUB:=ueno/}
-GITHUB_PROJECT= eekboard
+GITHUB_PROJECT= eekboard
GITHUB_TAG= ${DISTNAME}
CATEGORIES= x11
Index: pkgsrc/x11/elementary/Makefile
diff -u pkgsrc/x11/elementary/Makefile:1.24 pkgsrc/x11/elementary/Makefile:1.25
--- pkgsrc/x11/elementary/Makefile:1.24 Thu Aug 22 12:23:55 2019
+++ pkgsrc/x11/elementary/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2019/08/22 12:23:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 09:14:07 rillig Exp $
DISTNAME= elementary-1.7.7
PKGREVISION= 18
@@ -26,9 +26,9 @@ MAKE_FLAGS+= AUTOMAKE="automake -af"
PKGCONFIG_OVERRIDE= elementary
# currently it is like it is
-MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-1.7.7
-PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH}
-PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-1.7.7
+PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
MAKE_FLAGS+= MODULE_ARCH=${MODULE_ARCH}
Index: pkgsrc/x11/enlightenment/Makefile
diff -u pkgsrc/x11/enlightenment/Makefile:1.54 pkgsrc/x11/enlightenment/Makefile:1.55
--- pkgsrc/x11/enlightenment/Makefile:1.54 Thu Aug 22 12:23:55 2019
+++ pkgsrc/x11/enlightenment/Makefile Sun Nov 3 09:14:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2019/08/22 12:23:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2019/11/03 09:14:07 rillig Exp $
DISTNAME= enlightenment-0.17.3
PKGREVISION= 20
@@ -53,9 +53,9 @@ pre-install:
PKGCONFIG_OVERRIDE= enlightenment.pc.in
-MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-${PKGVERSION_NOREV}
-PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH}
-PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
+MODULE_ARCH= ${LOWER_OPSYS}-${MACHINE_ARCH}-${PKGVERSION_NOREV}
+PLIST_SUBST= MODULE_ARCH=${MODULE_ARCH}
+PRINT_PLIST_AWK+= { gsub(/${MODULE_ARCH}/, "$${MODULE_ARCH}") }
.include "../../devel/ecore/buildlink3.mk"
.include "../../devel/eet/buildlink3.mk"
Index: pkgsrc/x11/evieext/builtin.mk
diff -u pkgsrc/x11/evieext/builtin.mk:1.4 pkgsrc/x11/evieext/builtin.mk:1.5
--- pkgsrc/x11/evieext/builtin.mk:1.4 Mon Aug 3 09:53:01 2015
+++ pkgsrc/x11/evieext/builtin.mk Sun Nov 3 09:14:07 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.4 2015/08/03 09:53:01 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.5 2019/11/03 09:14:07 rillig Exp $
-BUILTIN_PKG:= evieext
+BUILTIN_PKG:= evieext
PKGCONFIG_FILE.evieext= ${X11BASE}/lib/pkgconfig/evieproto.pc
PKGCONFIG_FILE.evieext+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/evieproto.pc
PKGCONFIG_FILE.evieext+= ${X11BASE}/share/pkgconfig/evieproto.pc
Index: pkgsrc/x11/filerunner/Makefile
diff -u pkgsrc/x11/filerunner/Makefile:1.39 pkgsrc/x11/filerunner/Makefile:1.40
--- pkgsrc/x11/filerunner/Makefile:1.39 Mon Mar 12 11:17:49 2018
+++ pkgsrc/x11/filerunner/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/03/12 11:17:49 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 09:14:08 rillig Exp $
DISTNAME= FileRunner-2.5.1
PKGNAME= ${DISTNAME:S/FileRunner/filerunner/}
@@ -20,13 +20,13 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/fr ${DESTDIR}${PREFIX}/lib/FileRunner
${LN} -sf ${PREFIX}/lib/FileRunner/fr ${DESTDIR}${PREFIX}/bin
.for file in FAQ HISTORY QuickStart.txt Tips.txt Users_Guide.txt chmod.tcl cmd.tcl config.tcl dialog.tcl ext.so font.tcl ftp.tcl http.tcl tclIndex
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
.endfor
.for file in frcolor frftp
- ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
+ ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/lib/FileRunner
.endfor
.for map in cross.bit frterm.bit larger.bit left.bit max.bit pgdown.bit pgup.bit right.bit smaller.bit toggle.bit tree.bit up.bit update.bit xterm.bit
- ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${DESTDIR}${PREFIX}/lib/FileRunner/bitmaps
+ ${INSTALL_DATA} ${WRKSRC}/bitmaps/${map} ${DESTDIR}${PREFIX}/lib/FileRunner/bitmaps
.endfor
CPPFLAGS+= -DUSE_INTERP_RESULT
Index: pkgsrc/x11/fixesproto4/Makefile
diff -u pkgsrc/x11/fixesproto4/Makefile:1.3 pkgsrc/x11/fixesproto4/Makefile:1.4
--- pkgsrc/x11/fixesproto4/Makefile:1.3 Wed Mar 7 11:57:34 2018
+++ pkgsrc/x11/fixesproto4/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/03/07 11:57:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 09:14:08 rillig Exp $
#
# This package is for use with Xfixes only. Do not update to later versions.
@@ -21,7 +21,7 @@ USE_LANGUAGES= # none, not even C
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} != "native"
-PKG_FAIL_REASON+="This package is for native X11 only; use libXfixes instead."
+PKG_FAIL_REASON+= "This package is for native X11 only; use libXfixes instead."
.endif
.include "../../converters/libiconv/buildlink3.mk"
Index: pkgsrc/x11/fixesproto4/builtin.mk
diff -u pkgsrc/x11/fixesproto4/builtin.mk:1.1.1.1 pkgsrc/x11/fixesproto4/builtin.mk:1.2
--- pkgsrc/x11/fixesproto4/builtin.mk:1.1.1.1 Wed Dec 8 00:39:31 2010
+++ pkgsrc/x11/fixesproto4/builtin.mk Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1.1.1 2010/12/08 00:39:31 abs Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:08 rillig Exp $
BUILTIN_PKG:= fixesproto
@@ -28,7 +28,7 @@ IS_BUILTIN.fixesproto= no
IS_BUILTIN.fixesproto= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.fixesproto
+MAKEVARS+= IS_BUILTIN.fixesproto
###
### Determine whether we should use the built-in implementation if it
@@ -55,7 +55,7 @@ USE_BUILTIN.fixesproto!= \
. endif
. endif # PREFER.fixesproto
.endif
-MAKEVARS+= USE_BUILTIN.fixesproto
+MAKEVARS+= USE_BUILTIN.fixesproto
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/fltk13/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.31 pkgsrc/x11/fltk13/Makefile:1.32
--- pkgsrc/x11/fltk13/Makefile:1.31 Thu Oct 17 10:16:28 2019
+++ pkgsrc/x11/fltk13/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2019/10/17 10:16:28 micha Exp $
+# $NetBSD: Makefile,v 1.32 2019/11/03 09:14:08 rillig Exp $
DISTNAME= fltk-1.3.5-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -21,8 +21,8 @@ TEST_TARGET= test
PKG_OPTIONS_VAR= PKG_OPTIONS.fltk13
PKG_SUPPORTED_OPTIONS= opengl # cairo
PKG_SUGGESTED_OPTIONS= opengl # cairo
-#PLIST_VARS+= cairo
-PLIST_VARS+= opengl
+#PLIST_VARS+= cairo
+PLIST_VARS+= opengl
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.options.mk"
@@ -42,15 +42,15 @@ PLIST.cs= yes
#.if !empty(PKG_OPTIONS:Mcairo)
#. include "../../graphics/cairo/buildlink3.mk"
#CONFIGURE_ARGS+= --enable-cairo
-#PLIST.cairo= yes
+#PLIST.cairo= yes
#.else
#CONFIGURE_ARGS+= --disable-cairo
#.endif
.if !empty(PKG_OPTIONS:Mopengl)
. if ${OPSYS} != "Darwin"
-. include "../../graphics/MesaLib/buildlink3.mk"
-. include "../../graphics/glu/buildlink3.mk"
+. include "../../graphics/MesaLib/buildlink3.mk"
+. include "../../graphics/glu/buildlink3.mk"
. endif
CONFIGURE_ARGS+= --enable-gl
PLIST.opengl= yes
Index: pkgsrc/x11/fltk13/buildlink3.mk
diff -u pkgsrc/x11/fltk13/buildlink3.mk:1.12 pkgsrc/x11/fltk13/buildlink3.mk:1.13
--- pkgsrc/x11/fltk13/buildlink3.mk:1.12 Thu Oct 17 10:16:28 2019
+++ pkgsrc/x11/fltk13/buildlink3.mk Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2019/10/17 10:16:28 micha Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2019/11/03 09:14:08 rillig Exp $
BUILDLINK_TREE+= fltk
@@ -17,8 +17,8 @@ pkgbase := fltk
# For "opengl" option
.if !empty(PKG_BUILD_OPTIONS.fltk:Mopengl)
. if ${OPSYS} != "Darwin"
-. include "../../graphics/MesaLib/buildlink3.mk"
-. include "../../graphics/glu/buildlink3.mk"
+. include "../../graphics/MesaLib/buildlink3.mk"
+. include "../../graphics/glu/buildlink3.mk"
. endif
.endif
Index: pkgsrc/x11/gnome-desktop3/Makefile
diff -u pkgsrc/x11/gnome-desktop3/Makefile:1.35 pkgsrc/x11/gnome-desktop3/Makefile:1.36
--- pkgsrc/x11/gnome-desktop3/Makefile:1.35 Sun Jul 21 22:24:15 2019
+++ pkgsrc/x11/gnome-desktop3/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2019/07/21 22:24:15 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 09:14:08 rillig Exp $
DISTNAME= gnome-desktop-3.24.2
PKGNAME= ${DISTNAME:S/desktop/desktop3/}
@@ -12,9 +12,9 @@ HOMEPAGE= https://www.gnome.org/
COMMENT= GNOME3 desktop-wide documents and libgnome-desktop library
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake intltool msgfmt pkg-config
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= libgnome-desktop/gnome-desktop-3.0.pc.in
Index: pkgsrc/x11/gnome-panel/Makefile
diff -u pkgsrc/x11/gnome-panel/Makefile:1.216 pkgsrc/x11/gnome-panel/Makefile:1.217
--- pkgsrc/x11/gnome-panel/Makefile:1.216 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/gnome-panel/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.216 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.217 2019/11/03 09:14:08 rillig Exp $
DISTNAME= gnome-panel-2.32.1
PKGREVISION= 72
@@ -15,13 +15,13 @@ COMMENT= GNOME2 panel application
#CONF_FILES+= ${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \
# ${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
-GNU_CONFIGURE= YES
-USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
-USE_PKGLOCALEDIR= YES
-USE_LIBTOOL= YES
-PKGCONFIG_OVERRIDE+= bonobo/libpanel-applet/libpanelapplet-2.0.pc.in
-PKGCONFIG_OVERRIDE+= libpanel-applet/libpanelapplet-3.0.pc.in
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+GNU_CONFIGURE= YES
+USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
+USE_PKGLOCALEDIR= YES
+USE_LIBTOOL= YES
+PKGCONFIG_OVERRIDE+= bonobo/libpanel-applet/libpanelapplet-2.0.pc.in
+PKGCONFIG_OVERRIDE+= libpanel-applet/libpanelapplet-3.0.pc.in
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
PYTHON_VERSIONS_ACCEPTED= 27 # py-ORBit via py-gnome2
# XXX this pkg installs a gio module to ${PREFIX}/lib/gnome-panel/modules
@@ -44,7 +44,7 @@ GCONF_SCHEMAS+= panel-object.schemas
GCONF_SCHEMAS+= panel-compatibility.schemas
GCONF_SCHEMAS+= workspace-switcher.schemas
GCONF_SCHEMAS+= window-list.schemas
-GCONF_ENTRIES= panel-default-setup.entries
+GCONF_ENTRIES= panel-default-setup.entries
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.15.1
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0
Index: pkgsrc/x11/gnustep-preferences/Makefile
diff -u pkgsrc/x11/gnustep-preferences/Makefile:1.55 pkgsrc/x11/gnustep-preferences/Makefile:1.56
--- pkgsrc/x11/gnustep-preferences/Makefile:1.55 Wed Apr 3 00:33:14 2019
+++ pkgsrc/x11/gnustep-preferences/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2019/04/03 00:33:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.56 2019/11/03 09:14:08 rillig Exp $
DISTNAME= Preferences-1.2.0
PKGNAME= gnustep-${DISTNAME:S/P/p/}
@@ -20,7 +20,7 @@ MAKE_FILE= GNUmakefile
MAKE_JOBS_SAFE= NO
MAKE_FLAGS+= GNUSTEP_USER_DIR=${WRKDIR}/fake_home/GNUstep
-FIX_GNUSTEP_INSTALLATION_DIR= yes
+FIX_GNUSTEP_INSTALLATION_DIR= yes
SUBST_FILES.gnustep_installation_dir+= GNUmakefile.preamble
SUBST_FILES.gnustep_installation_dir+= PrefsModule/GNUmakefile.preamble
SUBST_FILES.gnustep_installation_dir+= Modules/Keyboard/GNUmakefile
Index: pkgsrc/x11/gtk-sharp/Makefile
diff -u pkgsrc/x11/gtk-sharp/Makefile:1.76 pkgsrc/x11/gtk-sharp/Makefile:1.77
--- pkgsrc/x11/gtk-sharp/Makefile:1.76 Wed Oct 16 13:44:20 2019
+++ pkgsrc/x11/gtk-sharp/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2019/10/16 13:44:20 nia Exp $
+# $NetBSD: Makefile,v 1.77 2019/11/03 09:14:08 rillig Exp $
DISTNAME= gtk-sharp-2.12.45
CATEGORIES= x11
@@ -26,11 +26,11 @@ PKGCONFIG_OVERRIDE+= glib/glib-sharp-2.0
PKGCONFIG_OVERRIDE+= parser/gapi-2.0.pc.in
PKGCONFIG_OVERRIDE+= glade/glade-sharp-2.0.pc.in
-SUBST_CLASSES+= relprefix
-SUBST_MESSAGE.relprefix=Replacing relative prefix in pkg-config files.
-SUBST_STAGE.relprefix= pre-configure
-SUBST_FILES.relprefix= ${PKGCONFIG_OVERRIDE}
-SUBST_SED.relprefix= -e 's|$${pcfiledir}/../..|@prefix@|g'
+SUBST_CLASSES+= relprefix
+SUBST_MESSAGE.relprefix= Replacing relative prefix in pkg-config files.
+SUBST_STAGE.relprefix= pre-configure
+SUBST_FILES.relprefix= ${PKGCONFIG_OVERRIDE}
+SUBST_SED.relprefix= -e 's|$${pcfiledir}/../..|@prefix@|g'
.include "../../devel/libglade/buildlink3.mk"
.include "../../lang/mono/buildlink3.mk"
Index: pkgsrc/x11/gtk2/Makefile
diff -u pkgsrc/x11/gtk2/Makefile:1.310 pkgsrc/x11/gtk2/Makefile:1.311
--- pkgsrc/x11/gtk2/Makefile:1.310 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/gtk2/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.311 2019/11/03 09:14:08 rillig Exp $
DISTNAME= gtk+-2.24.32
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -62,7 +62,7 @@ CONFIGURE_ARGS.Darwin+= --disable-visibi
CPPFLAGS+= -DPREFIX="\"${PREFIX}\""
-#SUBST_CLASSES+= pthread
+#SUBST_CLASSES+= pthread
#SUBST_STAGE.pthread= pre-configure
#SUBST_MESSAGE.pthread= Fixing pthread flags.
#SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g'
Index: pkgsrc/x11/gtk2/options.mk
diff -u pkgsrc/x11/gtk2/options.mk:1.17 pkgsrc/x11/gtk2/options.mk:1.18
--- pkgsrc/x11/gtk2/options.mk:1.17 Sun Sep 8 14:29:25 2019
+++ pkgsrc/x11/gtk2/options.mk Sun Nov 3 09:14:08 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.17 2019/09/08 14:29:25 nia Exp $
+# $NetBSD: options.mk,v 1.18 2019/11/03 09:14:08 rillig Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.gtk2
-PKG_SUPPORTED_OPTIONS= cups debug
+PKG_OPTIONS_VAR= PKG_OPTIONS.gtk2
+PKG_SUPPORTED_OPTIONS= cups debug
PKG_OPTIONS_REQUIRED_GROUPS= gdk-target
PKG_OPTIONS_GROUP.gdk-target= x11
.if exists(/System/Library/Frameworks/Quartz.framework)
Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.135 pkgsrc/x11/gtk3/Makefile:1.136
--- pkgsrc/x11/gtk3/Makefile:1.135 Thu Oct 10 12:04:13 2019
+++ pkgsrc/x11/gtk3/Makefile Sun Nov 3 09:14:08 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2019/10/10 12:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.136 2019/11/03 09:14:08 rillig Exp $
DISTNAME= gtk+-3.24.11
PKGNAME= ${DISTNAME:S/gtk/gtk3/}
@@ -11,16 +11,16 @@ HOMEPAGE= https://www.gtk.org/
COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces
LICENSE= gnu-lgpl-v2.1
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-PTHREAD_AUTO_VARS= yes
-TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+PTHREAD_AUTO_VARS= yes
+TOOL_DEPENDS+= gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+TOOL_DEPENDS+= gettext-tools>=0.19.4nb1:../../devel/gettext-tools
# There is no logic in gettext.mk to detect the native version of xgettext,
# and we do need it to be compiled with Glade support.
-_TOOLS_USE_PKGSRC.xgettext=yes
+_TOOLS_USE_PKGSRC.xgettext= yes
GNU_CONFIGURE= yes
# XXX there is a subtle bashism in "configure" or a bug in NetBSD's sh
Index: pkgsrc/x11/kactivities/Makefile
diff -u pkgsrc/x11/kactivities/Makefile:1.47 pkgsrc/x11/kactivities/Makefile:1.48
--- pkgsrc/x11/kactivities/Makefile:1.47 Thu Aug 22 12:23:55 2019
+++ pkgsrc/x11/kactivities/Makefile Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/08/22 12:23:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2019/11/03 09:14:09 rillig Exp $
DISTNAME= kactivities-4.13.3
PKGREVISION= 15
@@ -20,7 +20,7 @@ CMAKE_ARGS+= -DWITH_NepomukCore:BOOL=OFF
# The default MACOSX_DEPLOYMENT_TARGET is incompatible with the C++11 tests.
CMAKE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_VERSION}
-INSTALLATION_DIRS= bin
+INSTALLATION_DIRS= bin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/_KDE_build/src/service/kactivitymanagerd ${DESTDIR}${PREFIX}/bin/kactivitymanagerd
Index: pkgsrc/x11/kactivities-stats/buildlink3.mk
diff -u pkgsrc/x11/kactivities-stats/buildlink3.mk:1.9 pkgsrc/x11/kactivities-stats/buildlink3.mk:1.10
--- pkgsrc/x11/kactivities-stats/buildlink3.mk:1.9 Wed Sep 18 14:17:19 2019
+++ pkgsrc/x11/kactivities-stats/buildlink3.mk Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2019/09/18 14:17:19 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2019/11/03 09:14:09 rillig Exp $
BUILDLINK_TREE+= kactivities-stats
@@ -7,7 +7,7 @@ KACTIVITIES_STATS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kactivities-stats+= kactivities-stats>=5.41.0
BUILDLINK_ABI_DEPENDS.kactivities-stats?= kactivities-stats>=5.61.0nb1
-BUILDLINK_PKGSRCDIR.kactivities-stats?= ../../x11/kactivities-stats
+BUILDLINK_PKGSRCDIR.kactivities-stats?= ../../x11/kactivities-stats
.include "../../x11/kactivities5/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
Index: pkgsrc/x11/kconfigwidgets/Makefile
diff -u pkgsrc/x11/kconfigwidgets/Makefile:1.26 pkgsrc/x11/kconfigwidgets/Makefile:1.27
--- pkgsrc/x11/kconfigwidgets/Makefile:1.26 Tue Aug 27 20:18:01 2019
+++ pkgsrc/x11/kconfigwidgets/Makefile Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/08/27 20:18:01 markd Exp $
+# $NetBSD: Makefile,v 1.27 2019/11/03 09:14:09 rillig Exp $
DISTNAME= kconfigwidgets-${KF5VER}
CATEGORIES= x11
@@ -9,7 +9,7 @@ LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
.include "../../meta-pkgs/kde/kf5.mk"
-BUILD_DEPENDS+= kdoctools>=${KF5VER}:../../devel/kdoctools
+BUILD_DEPENDS+= kdoctools>=${KF5VER}:../../devel/kdoctools
USE_TOOLS+= perl:run msgmerge
Index: pkgsrc/x11/kde-workspace4/Makefile
diff -u pkgsrc/x11/kde-workspace4/Makefile:1.77 pkgsrc/x11/kde-workspace4/Makefile:1.78
--- pkgsrc/x11/kde-workspace4/Makefile:1.77 Sun Nov 3 06:33:56 2019
+++ pkgsrc/x11/kde-workspace4/Makefile Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2019/11/03 06:33:56 markd Exp $
+# $NetBSD: Makefile,v 1.78 2019/11/03 09:14:09 rillig Exp $
DISTNAME= kde-workspace-4.11.22
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -9,10 +9,10 @@ MASTER_SITES= ${MASTER_SITE_KDE:=applica
.include "../../meta-pkgs/kde4/Makefile.kde4"
-DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README
-DISTFILES+= NetBSD-flag-1.0.png
-SITES.Daemon.png= ${MASTER_SITE_LOCAL}
-SITES.Daemon.README= ${MASTER_SITE_LOCAL}
+DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README
+DISTFILES+= NetBSD-flag-1.0.png
+SITES.Daemon.png= ${MASTER_SITE_LOCAL}
+SITES.Daemon.README= ${MASTER_SITE_LOCAL}
SITES.NetBSD-flag-1.0.png= ${MASTER_SITE_LOCAL}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -59,7 +59,7 @@ PKG_GROUPS= ${KDM_GROUP}
PKG_USERS= ${KDM_USER}:${KDM_GROUP}
PKG_GECOS.${KDM_USER}= kdm unprivileged user
-REPLACE_PERL+= \
+REPLACE_PERL+= \
kcontrol/keys/convertShortcuts.pl \
kwin/clients/oxygen/data/update_oxygen.pl \
kwin/data/kwin3_plugin.pl \
@@ -71,7 +71,7 @@ PY_PATCHPLIST= yes
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
-PLIST_VARS+= gles utempter noutempter
+PLIST_VARS+= gles utempter noutempter
.if ${OPSYS} == "Linux" && exists(/usr/include/utempter.h)
PLIST.utempter= yes
.elif ${OPSYS} == "FreeBSD" && exists(/usr/include/utempter.h)
@@ -112,7 +112,7 @@ CMAKE_ARGS+= -DRT_LIB_SCHED=${RT_LIB_SCH
CMAKE_ARGS+= -DWITH_Xmms:BOOL=OFF
# genkdmconf wont install faces if using destdir so do it ourselves
-INSTALLATION_DIRS+= share/kde/apps/kdm/faces
+INSTALLATION_DIRS+= share/kde/apps/kdm/faces
post-install:
${INSTALL_DATA} ${WRKSRC}/kdm/kfrontend/pics/default1.png \
Index: pkgsrc/x11/kde-workspace4/options.mk
diff -u pkgsrc/x11/kde-workspace4/options.mk:1.2 pkgsrc/x11/kde-workspace4/options.mk:1.3
--- pkgsrc/x11/kde-workspace4/options.mk:1.2 Tue Jun 12 15:46:05 2012
+++ pkgsrc/x11/kde-workspace4/options.mk Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2012/06/12 15:46:05 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 09:14:09 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kde-workspace
PKG_SUPPORTED_OPTIONS= inet6
@@ -20,7 +20,7 @@ PKG_SUGGESTED_OPTIONS= inet6
#CC+= -ggdb
#CXX+= -ggdb
#CONFIGURE_ARGS+= --enable-debug=full
-#CONFIGURE_ENV+= INSTALL_STRIP_FLAG=
+#CONFIGURE_ENV+= INSTALL_STRIP_FLAG=
#INSTALL_UNSTRIPPED= yes
#.endif
Index: pkgsrc/x11/kdelibs4/Makefile
diff -u pkgsrc/x11/kdelibs4/Makefile:1.106 pkgsrc/x11/kdelibs4/Makefile:1.107
--- pkgsrc/x11/kdelibs4/Makefile:1.106 Sat Nov 2 19:45:26 2019
+++ pkgsrc/x11/kdelibs4/Makefile Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2019/11/02 19:45:26 maya Exp $
+# $NetBSD: Makefile,v 1.107 2019/11/03 09:14:09 rillig Exp $
DISTNAME= kdelibs-4.14.38
PKGNAME= ${DISTNAME:S/-4/4-4/}
@@ -18,9 +18,9 @@ CONFLICTS= kdelibs-[0-9]*
# BUILD_MAKE_FLAGS+= VERBOSE=1
#CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Debug
-CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDELibsDependencies.cmake
-CMAKE_DEPENDENCIES_REWRITE+= _KDE_build/KDELibsDependenciesInternal.cmake
-CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt
+CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDELibsDependencies.cmake
+CMAKE_DEPENDENCIES_REWRITE+= _KDE_build/KDELibsDependenciesInternal.cmake
+CMAKE_MODULE_PATH_OVERRIDE+= kjsembed/qtonly/CMakeLists.txt
CMAKE_ARGS+= -DKDE_DISTRIBUTION_TEXT:STRING="NetBSD pkgsrc"
CMAKE_ARGS+= -DWITH_Avahi:BOOL=off
@@ -51,7 +51,7 @@ REPLACE_PERL+= \
kdeui/preparetips \
plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl
-CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh
+CHECK_PORTABILITY_SKIP+= kate/tests/hl/highlight.sh
SUBST_CLASSES+= kdelibsfix
SUBST_STAGE.kdelibsfix= pre-configure
@@ -98,7 +98,7 @@ CXXFLAGS+= -D__STDC_LIMIT_MACROS
BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../meta-pkgs/kde4/kde4.mk"
-BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
+BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
#BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60
#BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0
Index: pkgsrc/x11/kdelibs4support/Makefile
diff -u pkgsrc/x11/kdelibs4support/Makefile:1.34 pkgsrc/x11/kdelibs4support/Makefile:1.35
--- pkgsrc/x11/kdelibs4support/Makefile:1.34 Wed Sep 18 14:17:19 2019
+++ pkgsrc/x11/kdelibs4support/Makefile Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/09/18 14:17:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.35 2019/11/03 09:14:09 rillig Exp $
DISTNAME= kdelibs4support-${KF5VER}
PKGREVISION= 1
@@ -18,7 +18,7 @@ DEPENDS+= kdesignerplugin>=${KF5VER}:../
USE_TOOLS+= perl:run pkg-config msgfmt
-REPLACE_PERL+= src/kio/fileshareset
+REPLACE_PERL+= src/kio/fileshareset
SUBST_CLASSES+= xdg
SUBST_STAGE.xdg= pre-configure
Index: pkgsrc/x11/kirigami2/buildlink3.mk
diff -u pkgsrc/x11/kirigami2/buildlink3.mk:1.7 pkgsrc/x11/kirigami2/buildlink3.mk:1.8
--- pkgsrc/x11/kirigami2/buildlink3.mk:1.7 Wed Apr 3 00:33:16 2019
+++ pkgsrc/x11/kirigami2/buildlink3.mk Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2019/04/03 00:33:16 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2019/11/03 09:14:09 rillig Exp $
BUILDLINK_TREE+= kirigami2
@@ -7,7 +7,7 @@ KIRIGAMI2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kirigami2+= kirigami2>=5.41.0
BUILDLINK_ABI_DEPENDS.kirigami2?= kirigami2>=5.47.0nb4
-BUILDLINK_PKGSRCDIR.kirigami2?= ../../x11/kirigami2
+BUILDLINK_PKGSRCDIR.kirigami2?= ../../x11/kirigami2
.include "../../x11/qt5-qtquickcontrols2/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
Index: pkgsrc/x11/kterm/Makefile
diff -u pkgsrc/x11/kterm/Makefile:1.63 pkgsrc/x11/kterm/Makefile:1.64
--- pkgsrc/x11/kterm/Makefile:1.63 Tue May 9 14:18:46 2017
+++ pkgsrc/x11/kterm/Makefile Sun Nov 3 09:14:09 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2017/05/09 14:18:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.64 2019/11/03 09:14:09 rillig Exp $
DISTNAME= kterm-6.2.0
PKGREVISION= 24
@@ -6,12 +6,12 @@ CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB:=applications/}
# the following patch includes NFS xauth patch, and kamo's wd0.2 patch.
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCHFILES= kterm-6.2.0-termios-wd0.2.patch2 \
- kterm-6.2.0-scroll-wd0.2.patch \
- kterm-6.2.0.NFS-xauth.patch \
- kterm-6.2.0.ext06.patch.gz
-PATCH_DIST_STRIP= -p1
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCHFILES= kterm-6.2.0-termios-wd0.2.patch2 \
+ kterm-6.2.0-scroll-wd0.2.patch \
+ kterm-6.2.0.NFS-xauth.patch \
+ kterm-6.2.0.ext06.patch.gz
+PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= # none
Index: pkgsrc/x11/labltk/Makefile
diff -u pkgsrc/x11/labltk/Makefile:1.35 pkgsrc/x11/labltk/Makefile:1.36
--- pkgsrc/x11/labltk/Makefile:1.35 Mon Nov 12 16:10:29 2018
+++ pkgsrc/x11/labltk/Makefile Sun Nov 3 09:14:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/11/12 16:10:29 jaapb Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 09:14:10 rillig Exp $
DISTNAME= labltk-8.06.3
PKGREVISION= 5
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1
USE_TOOLS+= gmake
MAKE_JOBS_SAFE= no
-HAS_CONFIGURE= yes
+HAS_CONFIGURE= yes
CONFIGURE_ARGS+= -x11include ${X11BASE}/include
CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib
CONFIGURE_ARGS+= -use-findlib
Index: pkgsrc/x11/libFS/builtin.mk
diff -u pkgsrc/x11/libFS/builtin.mk:1.3 pkgsrc/x11/libFS/builtin.mk:1.4
--- pkgsrc/x11/libFS/builtin.mk:1.3 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libFS/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:10 rillig Exp $
-BUILTIN_PKG:= libFS
+BUILTIN_PKG:= libFS
PKGCONFIG_FILE.libFS= ${X11BASE}/lib/pkgconfig/libfs.pc
PKGCONFIG_FILE.libFS+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/libfs.pc
Index: pkgsrc/x11/libICE/builtin.mk
diff -u pkgsrc/x11/libICE/builtin.mk:1.2 pkgsrc/x11/libICE/builtin.mk:1.3
--- pkgsrc/x11/libICE/builtin.mk:1.2 Sun Oct 5 21:36:33 2008
+++ pkgsrc/x11/libICE/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:10 rillig Exp $
BUILTIN_PKG:= libICE
@@ -19,7 +19,7 @@ IS_BUILTIN.libICE= no
IS_BUILTIN.libICE= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libICE
+MAKEVARS+= IS_BUILTIN.libICE
###
### Determine whether we should use the built-in implementation if it
@@ -46,6 +46,6 @@ USE_BUILTIN.libICE!= \
. endif
. endif # PREFER.libICE
.endif
-MAKEVARS+= USE_BUILTIN.libICE
+MAKEVARS+= USE_BUILTIN.libICE
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libSM/builtin.mk
diff -u pkgsrc/x11/libSM/builtin.mk:1.2 pkgsrc/x11/libSM/builtin.mk:1.3
--- pkgsrc/x11/libSM/builtin.mk:1.2 Sun Oct 5 21:36:33 2008
+++ pkgsrc/x11/libSM/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:10 rillig Exp $
BUILTIN_PKG:= libSM
@@ -19,7 +19,7 @@ IS_BUILTIN.libSM= no
IS_BUILTIN.libSM= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libSM
+MAKEVARS+= IS_BUILTIN.libSM
###
### Determine whether we should use the built-in implementation if it
@@ -46,6 +46,6 @@ USE_BUILTIN.libSM!= \
. endif
. endif # PREFER.libSM
.endif
-MAKEVARS+= USE_BUILTIN.libSM
+MAKEVARS+= USE_BUILTIN.libSM
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libX11/Makefile
diff -u pkgsrc/x11/libX11/Makefile:1.48 pkgsrc/x11/libX11/Makefile:1.49
--- pkgsrc/x11/libX11/Makefile:1.48 Sun Apr 28 10:53:03 2019
+++ pkgsrc/x11/libX11/Makefile Sun Nov 3 09:14:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2019/04/28 10:53:03 rillig Exp $
+# $NetBSD: Makefile,v 1.49 2019/11/03 09:14:10 rillig Exp $
DISTNAME= libX11-1.6.7
CATEGORIES= x11 devel
@@ -27,7 +27,7 @@ CPPFLAGS.MirBSD+= ${PTHREAD_CFLAGS}
LDFLAGS.MirBSD+= ${PTHREAD_LDFLAGS}
LDFLAGS.OpenBSD+= ${PTHREAD_LDFLAGS}
-BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.11.1
+BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11.1
TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
Index: pkgsrc/x11/libX11/builtin.mk
diff -u pkgsrc/x11/libX11/builtin.mk:1.6 pkgsrc/x11/libX11/builtin.mk:1.7
--- pkgsrc/x11/libX11/builtin.mk:1.6 Tue Apr 29 07:45:42 2014
+++ pkgsrc/x11/libX11/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,8 +1,8 @@
-# $NetBSD: builtin.mk,v 1.6 2014/04/29 07:45:42 obache Exp $
+# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:10 rillig Exp $
-BUILTIN_PKG:= libX11
-PKGCONFIG_FILE.libX11= ${X11BASE}/lib/pkgconfig/x11.pc
-PKGCONFIG_FILE.libX11+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc
+BUILTIN_PKG:= libX11
+PKGCONFIG_FILE.libX11= ${X11BASE}/lib/pkgconfig/x11.pc
+PKGCONFIG_FILE.libX11+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc
.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXScrnSaver/builtin.mk
diff -u pkgsrc/x11/libXScrnSaver/builtin.mk:1.3 pkgsrc/x11/libXScrnSaver/builtin.mk:1.4
--- pkgsrc/x11/libXScrnSaver/builtin.mk:1.3 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXScrnSaver/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:10 rillig Exp $
-BUILTIN_PKG:= libXScrnSaver
+BUILTIN_PKG:= libXScrnSaver
PKGCONFIG_FILE.libXScrnSaver= ${X11BASE}/lib/pkgconfig/xscrnsaver.pc
PKGCONFIG_FILE.libXScrnSaver+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xscrnsaver.pc
PKGCONFIG_FILE.libXScrnSaver+= ${X11BASE}/lib/libXss.so
Index: pkgsrc/x11/libXau/builtin.mk
diff -u pkgsrc/x11/libXau/builtin.mk:1.6 pkgsrc/x11/libXau/builtin.mk:1.7
--- pkgsrc/x11/libXau/builtin.mk:1.6 Wed Mar 7 11:57:35 2018
+++ pkgsrc/x11/libXau/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:35 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:10 rillig Exp $
BUILTIN_PKG:= libXau
@@ -19,7 +19,7 @@ IS_BUILTIN.libXau= no
IS_BUILTIN.libXau= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXau
+MAKEVARS+= IS_BUILTIN.libXau
###
### Determine whether we should use the built-in implementation if it
@@ -46,7 +46,7 @@ USE_BUILTIN.libXau!= \
. endif
. endif # PREFER.libXau
.endif
-MAKEVARS+= USE_BUILTIN.libXau
+MAKEVARS+= USE_BUILTIN.libXau
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXcomposite/builtin.mk
diff -u pkgsrc/x11/libXcomposite/builtin.mk:1.1 pkgsrc/x11/libXcomposite/builtin.mk:1.2
--- pkgsrc/x11/libXcomposite/builtin.mk:1.1 Sat Dec 14 09:54:52 2013
+++ pkgsrc/x11/libXcomposite/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2013/12/14 09:54:52 tron Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:10 rillig Exp $
BUILTIN_PKG:= libXcomposite
@@ -19,7 +19,7 @@ IS_BUILTIN.libXcomposite= yes
IS_BUILTIN.libXcomposite= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXcomposite
+MAKEVARS+= IS_BUILTIN.libXcomposite
###
### Determine whether we should use the built-in implementation if it
@@ -46,6 +46,6 @@ USE_BUILTIN.libXcomposite!= \
. endif
. endif # PREFER.libXcomposite
.endif
-MAKEVARS+= USE_BUILTIN.libXcomposite
+MAKEVARS+= USE_BUILTIN.libXcomposite
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXdamage/builtin.mk
diff -u pkgsrc/x11/libXdamage/builtin.mk:1.3 pkgsrc/x11/libXdamage/builtin.mk:1.4
--- pkgsrc/x11/libXdamage/builtin.mk:1.3 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXdamage/builtin.mk Sun Nov 3 09:14:10 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:10 rillig Exp $
-BUILTIN_PKG:= libXdamage
+BUILTIN_PKG:= libXdamage
PKGCONFIG_FILE.libXdamage= ${X11BASE}/lib/pkgconfig/xdamage.pc
PKGCONFIG_FILE.libXdamage+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xdamage.pc
PKGCONFIG_FILE.libXdamage+= ${X11BASE}/lib/libXdamage.so
Index: pkgsrc/x11/libXdmcp/builtin.mk
diff -u pkgsrc/x11/libXdmcp/builtin.mk:1.6 pkgsrc/x11/libXdmcp/builtin.mk:1.7
--- pkgsrc/x11/libXdmcp/builtin.mk:1.6 Wed Mar 7 11:57:36 2018
+++ pkgsrc/x11/libXdmcp/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:36 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:11 rillig Exp $
BUILTIN_PKG:= libXdmcp
@@ -19,7 +19,7 @@ IS_BUILTIN.libXdmcp= no
IS_BUILTIN.libXdmcp= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXdmcp
+MAKEVARS+= IS_BUILTIN.libXdmcp
###
### Determine whether we should use the built-in implementation if it
@@ -46,7 +46,7 @@ USE_BUILTIN.libXdmcp!= \
. endif
. endif # PREFER.libXdmcp
.endif
-MAKEVARS+= USE_BUILTIN.libXdmcp
+MAKEVARS+= USE_BUILTIN.libXdmcp
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXevie/builtin.mk
diff -u pkgsrc/x11/libXevie/builtin.mk:1.3 pkgsrc/x11/libXevie/builtin.mk:1.4
--- pkgsrc/x11/libXevie/builtin.mk:1.3 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXevie/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXevie
+BUILTIN_PKG:= libXevie
PKGCONFIG_FILE.libXevie= ${X11BASE}/lib/pkgconfig/xevie.pc
PKGCONFIG_FILE.libXevie+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xevie.pc
Index: pkgsrc/x11/libXext/builtin.mk
diff -u pkgsrc/x11/libXext/builtin.mk:1.5 pkgsrc/x11/libXext/builtin.mk:1.6
--- pkgsrc/x11/libXext/builtin.mk:1.5 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXext/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.6 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXext
+BUILTIN_PKG:= libXext
PKGCONFIG_FILE.libXext= ${X11BASE}/lib/pkgconfig/xext.pc
PKGCONFIG_FILE.libXext+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xext.pc
Index: pkgsrc/x11/libXfixes/builtin.mk
diff -u pkgsrc/x11/libXfixes/builtin.mk:1.1 pkgsrc/x11/libXfixes/builtin.mk:1.2
--- pkgsrc/x11/libXfixes/builtin.mk:1.1 Thu Apr 24 12:18:09 2014
+++ pkgsrc/x11/libXfixes/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.1 2014/04/24 12:18:09 obache Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXfixes
+BUILTIN_PKG:= libXfixes
PKGCONFIG_FILE.libXfixes= ${X11BASE}/lib/pkgconfig/xfixes.pc
PKGCONFIG_FILE.libXfixes+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfixes.pc
Index: pkgsrc/x11/libXfont/Makefile
diff -u pkgsrc/x11/libXfont/Makefile:1.41 pkgsrc/x11/libXfont/Makefile:1.42
--- pkgsrc/x11/libXfont/Makefile:1.41 Tue Jul 9 09:51:55 2019
+++ pkgsrc/x11/libXfont/Makefile Sun Nov 3 09:14:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/07/09 09:51:55 sevan Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/03 09:14:11 rillig Exp $
DISTNAME= libXfont-1.5.4
PKGREVISION= 2
@@ -14,7 +14,7 @@ LICENSE= mit AND modified-bsd
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-USE_FEATURES+= strnlen
+USE_FEATURES+= strnlen
PKGCONFIG_OVERRIDE+= xfont.pc.in
Index: pkgsrc/x11/libXfont/builtin.mk
diff -u pkgsrc/x11/libXfont/builtin.mk:1.3 pkgsrc/x11/libXfont/builtin.mk:1.4
--- pkgsrc/x11/libXfont/builtin.mk:1.3 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXfont/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXfont
+BUILTIN_PKG:= libXfont
PKGCONFIG_FILE.libXfont= ${X11BASE}/lib/pkgconfig/xfont.pc
PKGCONFIG_FILE.libXfont+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfont.pc
Index: pkgsrc/x11/libXfont2/Makefile
diff -u pkgsrc/x11/libXfont2/Makefile:1.7 pkgsrc/x11/libXfont2/Makefile:1.8
--- pkgsrc/x11/libXfont2/Makefile:1.7 Mon Jul 8 22:11:06 2019
+++ pkgsrc/x11/libXfont2/Makefile Sun Nov 3 09:14:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/07/08 22:11:06 sevan Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 09:14:11 rillig Exp $
DISTNAME= libXfont2-2.0.3
PKGREVISION= 2
@@ -14,7 +14,7 @@ LICENSE= mit AND modified-bsd
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-USE_FEATURES+= strnlen
+USE_FEATURES+= strnlen
PKGCONFIG_OVERRIDE+= xfont2.pc.in
Index: pkgsrc/x11/libXfont2/builtin.mk
diff -u pkgsrc/x11/libXfont2/builtin.mk:1.1 pkgsrc/x11/libXfont2/builtin.mk:1.2
--- pkgsrc/x11/libXfont2/builtin.mk:1.1 Fri Dec 11 14:04:23 2015
+++ pkgsrc/x11/libXfont2/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.1 2015/12/11 14:04:23 wiz Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXfont2
+BUILTIN_PKG:= libXfont2
PKGCONFIG_FILE.libXfont2= ${X11BASE}/lib/pkgconfig/xfont2.pc
PKGCONFIG_FILE.libXfont2+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xfont2.pc
Index: pkgsrc/x11/libXft/builtin.mk
diff -u pkgsrc/x11/libXft/builtin.mk:1.2 pkgsrc/x11/libXft/builtin.mk:1.3
--- pkgsrc/x11/libXft/builtin.mk:1.2 Fri Jun 7 17:43:40 2013
+++ pkgsrc/x11/libXft/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2013/06/07 17:43:40 dholland Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:11 rillig Exp $
BUILTIN_PKG:= libXft
@@ -18,7 +18,7 @@ IS_BUILTIN.libXft= yes
IS_BUILTIN.libXft= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXft
+MAKEVARS+= IS_BUILTIN.libXft
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -40,7 +40,7 @@ BUILTIN_VERSION.libXft!= \
${H_XFT2}
BUILTIN_PKG.libXft= libXft-${BUILTIN_VERSION.libXft}
.endif
-MAKEVARS+= BUILTIN_PKG.libXft
+MAKEVARS+= BUILTIN_PKG.libXft
###
### Determine whether we should use the built-in implementation if it
@@ -68,7 +68,7 @@ USE_BUILTIN.libXft!= \
. endif
. endif # PREFER.libXft
.endif
-MAKEVARS+= USE_BUILTIN.libXft
+MAKEVARS+= USE_BUILTIN.libXft
###
### The section below only applies if we are not including this file
Index: pkgsrc/x11/libXi/builtin.mk
diff -u pkgsrc/x11/libXi/builtin.mk:1.1 pkgsrc/x11/libXi/builtin.mk:1.2
--- pkgsrc/x11/libXi/builtin.mk:1.1 Wed Apr 23 12:22:48 2014
+++ pkgsrc/x11/libXi/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,8 +1,8 @@
-# $NetBSD: builtin.mk,v 1.1 2014/04/23 12:22:48 obache Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXi
-PKGCONFIG_FILE.libXi= ${X11BASE}/lib/pkgconfig/xi.pc
-PKGCONFIG_FILE.libXi+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xi.pc
+BUILTIN_PKG:= libXi
+PKGCONFIG_FILE.libXi= ${X11BASE}/lib/pkgconfig/xi.pc
+PKGCONFIG_FILE.libXi+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xi.pc
BUILTIN_FIND_FILES_VAR:= H_XINPUT
BUILTIN_FIND_FILES.H_XINPUT= ${X11BASE}/include/X11/extensions/XInput.h
@@ -21,7 +21,7 @@ IS_BUILTIN.libXi= no
IS_BUILTIN.libXi= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXi
+MAKEVARS+= IS_BUILTIN.libXi
###
### Determine whether we should use the built-in implementation if it
@@ -38,7 +38,7 @@ USE_BUILTIN.libXi= yes
. endif
. endif # PREFER.libXi
.endif
-MAKEVARS+= USE_BUILTIN.libXi
+MAKEVARS+= USE_BUILTIN.libXi
.include "../../mk/buildlink3/pkgconfig-builtin.mk"
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXinerama/builtin.mk
diff -u pkgsrc/x11/libXinerama/builtin.mk:1.3 pkgsrc/x11/libXinerama/builtin.mk:1.4
--- pkgsrc/x11/libXinerama/builtin.mk:1.3 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXinerama/builtin.mk Sun Nov 3 09:14:11 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:11 rillig Exp $
-BUILTIN_PKG:= libXinerama
+BUILTIN_PKG:= libXinerama
PKGCONFIG_FILE.libXinerama= ${X11BASE}/lib/pkgconfig/xinerama.pc
PKGCONFIG_FILE.libXinerama+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xinerama.pc
Index: pkgsrc/x11/libXmu/builtin.mk
diff -u pkgsrc/x11/libXmu/builtin.mk:1.2 pkgsrc/x11/libXmu/builtin.mk:1.3
--- pkgsrc/x11/libXmu/builtin.mk:1.2 Sun Oct 5 21:36:33 2008
+++ pkgsrc/x11/libXmu/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:12 rillig Exp $
BUILTIN_PKG:= libXmu
@@ -19,7 +19,7 @@ IS_BUILTIN.libXmu= no
IS_BUILTIN.libXmu= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXmu
+MAKEVARS+= IS_BUILTIN.libXmu
###
### Determine whether we should use the built-in implementation if it
@@ -46,6 +46,6 @@ USE_BUILTIN.libXmu!= \
. endif
. endif # PREFER.libXmu
.endif
-MAKEVARS+= USE_BUILTIN.libXmu
+MAKEVARS+= USE_BUILTIN.libXmu
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXpm/builtin.mk
diff -u pkgsrc/x11/libXpm/builtin.mk:1.1 pkgsrc/x11/libXpm/builtin.mk:1.2
--- pkgsrc/x11/libXpm/builtin.mk:1.1 Wed Dec 16 19:57:47 2009
+++ pkgsrc/x11/libXpm/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,9 +1,9 @@
-# $NetBSD: builtin.mk,v 1.1 2009/12/16 19:57:47 joerg Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/11/03 09:14:12 rillig Exp $
BUILTIN_PKG:= libXpm
BUILTIN_FIND_FILES_VAR:= H_XPM
-BUILTIN_FIND_FILES.H_XPM= ${X11BASE}/include/X11/xpm.h
+BUILTIN_FIND_FILES.H_XPM= ${X11BASE}/include/X11/xpm.h
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -19,7 +19,7 @@ IS_BUILTIN.libXpm= no
IS_BUILTIN.libXpm= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXpm
+MAKEVARS+= IS_BUILTIN.libXpm
###
### Determine whether we should use the built-in implementation if it
@@ -36,6 +36,6 @@ USE_BUILTIN.libX11= yes
. endif
. endif # PREFER.libXpm
.endif
-MAKEVARS+= USE_BUILTIN.libXpm
+MAKEVARS+= USE_BUILTIN.libXpm
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXpresent/builtin.mk
diff -u pkgsrc/x11/libXpresent/builtin.mk:1.2 pkgsrc/x11/libXpresent/builtin.mk:1.3
--- pkgsrc/x11/libXpresent/builtin.mk:1.2 Wed Mar 7 11:57:37 2018
+++ pkgsrc/x11/libXpresent/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.2 2018/03/07 11:57:37 wiz Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:12 rillig Exp $
-BUILTIN_PKG:= libXpresent
+BUILTIN_PKG:= libXpresent
PKGCONFIG_FILE.libXpresent= ${X11BASE}/lib/pkgconfig/xpresent.pc
PKGCONFIG_FILE.libXpresent+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xpresent.pc
Index: pkgsrc/x11/libXrandr/builtin.mk
diff -u pkgsrc/x11/libXrandr/builtin.mk:1.6 pkgsrc/x11/libXrandr/builtin.mk:1.7
--- pkgsrc/x11/libXrandr/builtin.mk:1.6 Wed Mar 7 11:57:37 2018
+++ pkgsrc/x11/libXrandr/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.6 2018/03/07 11:57:37 wiz Exp $
+# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:12 rillig Exp $
-BUILTIN_PKG:= libXrandr
+BUILTIN_PKG:= libXrandr
PKGCONFIG_FILE.libXrandr= ${X11BASE}/lib/pkgconfig/xrandr.pc
PKGCONFIG_FILE.libXrandr+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrandr.pc
Index: pkgsrc/x11/libXrender/builtin.mk
diff -u pkgsrc/x11/libXrender/builtin.mk:1.4 pkgsrc/x11/libXrender/builtin.mk:1.5
--- pkgsrc/x11/libXrender/builtin.mk:1.4 Mon Mar 10 11:05:52 2014
+++ pkgsrc/x11/libXrender/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.4 2014/03/10 11:05:52 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.5 2019/11/03 09:14:12 rillig Exp $
-BUILTIN_PKG:= libXrender
+BUILTIN_PKG:= libXrender
PKGCONFIG_FILE.libXrender= ${X11BASE}/lib/pkgconfig/xrender.pc
PKGCONFIG_FILE.libXrender+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xrender.pc
Index: pkgsrc/x11/libXres/builtin.mk
diff -u pkgsrc/x11/libXres/builtin.mk:1.3 pkgsrc/x11/libXres/builtin.mk:1.4
--- pkgsrc/x11/libXres/builtin.mk:1.3 Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/libXres/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:12 rillig Exp $
-BUILTIN_PKG:= libXres
+BUILTIN_PKG:= libXres
PKGCONFIG_FILE.libXres= ${X11BASE}/lib/pkgconfig/xres.pc
PKGCONFIG_FILE.libXres+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xres.pc
PKGCONFIG_FILE.libXres+= ${X11BASE}/lib/libXRes.so
Index: pkgsrc/x11/libXt/builtin.mk
diff -u pkgsrc/x11/libXt/builtin.mk:1.2 pkgsrc/x11/libXt/builtin.mk:1.3
--- pkgsrc/x11/libXt/builtin.mk:1.2 Sun Oct 5 21:36:33 2008
+++ pkgsrc/x11/libXt/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2008/10/05 21:36:33 cube Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:12 rillig Exp $
BUILTIN_PKG:= libXt
@@ -19,7 +19,7 @@ IS_BUILTIN.libXt= no
IS_BUILTIN.libXt= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXt
+MAKEVARS+= IS_BUILTIN.libXt
###
### Determine whether we should use the built-in implementation if it
@@ -46,6 +46,6 @@ USE_BUILTIN.libXt!= \
. endif
. endif # PREFER.libXt
.endif
-MAKEVARS+= USE_BUILTIN.libXt
+MAKEVARS+= USE_BUILTIN.libXt
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libXtst/builtin.mk
diff -u pkgsrc/x11/libXtst/builtin.mk:1.2 pkgsrc/x11/libXtst/builtin.mk:1.3
--- pkgsrc/x11/libXtst/builtin.mk:1.2 Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/libXtst/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:12 rillig Exp $
-BUILTIN_PKG:= libXtst
+BUILTIN_PKG:= libXtst
PKGCONFIG_FILE.libXtst= ${X11BASE}/lib/pkgconfig/xtst.pc
PKGCONFIG_FILE.libXtst+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xtst.pc
PKGCONFIG_FILE.libXtst+= ${X11BASE}/lib/libXtst.so
Index: pkgsrc/x11/libXv/builtin.mk
diff -u pkgsrc/x11/libXv/builtin.mk:1.2 pkgsrc/x11/libXv/builtin.mk:1.3
--- pkgsrc/x11/libXv/builtin.mk:1.2 Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/libXv/builtin.mk Sun Nov 3 09:14:12 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:12 rillig Exp $
-BUILTIN_PKG:= libXv
+BUILTIN_PKG:= libXv
PKGCONFIG_FILE.libXv= ${X11BASE}/lib/pkgconfig/xv.pc
PKGCONFIG_FILE.libXv+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xv.pc
PKGCONFIG_FILE.libXv+= ${X11BASE}/lib/libXv.so
Index: pkgsrc/x11/libXvMC/builtin.mk
diff -u pkgsrc/x11/libXvMC/builtin.mk:1.3 pkgsrc/x11/libXvMC/builtin.mk:1.4
--- pkgsrc/x11/libXvMC/builtin.mk:1.3 Thu Jun 1 13:30:26 2017
+++ pkgsrc/x11/libXvMC/builtin.mk Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2017/06/01 13:30:26 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:13 rillig Exp $
.include "../../mk/bsd.fast.prefs.mk"
@@ -28,7 +28,7 @@ IS_BUILTIN.libXvMC= no
IS_BUILTIN.libXvMC= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.libXvMC
+MAKEVARS+= IS_BUILTIN.libXvMC
###
### Determine whether we should use the built-in implementation if it
@@ -55,6 +55,6 @@ USE_BUILTIN.libXvMC!= \
. endif
. endif # PREFER.libXvMC
.endif
-MAKEVARS+= USE_BUILTIN.libXvMC
+MAKEVARS+= USE_BUILTIN.libXvMC
.include "../../mk/x11.builtin.mk"
Index: pkgsrc/x11/libgnomekbd2/Makefile
diff -u pkgsrc/x11/libgnomekbd2/Makefile:1.5 pkgsrc/x11/libgnomekbd2/Makefile:1.6
--- pkgsrc/x11/libgnomekbd2/Makefile:1.5 Sun Jul 21 22:26:00 2019
+++ pkgsrc/x11/libgnomekbd2/Makefile Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/07/21 22:26:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 09:14:13 rillig Exp $
#
DISTNAME= libgnomekbd-2.32.0
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool gmake msgfmt
-GCONF_SCHEMAS+= desktop_gnome_peripherals_keyboard_xkb.schemas
+GCONF_SCHEMAS+= desktop_gnome_peripherals_keyboard_xkb.schemas
PKGCONFIG_OVERRIDE+= libgnomekbd.pc.in
PKGCONFIG_OVERRIDE+= libgnomekbdui.pc.in
Index: pkgsrc/x11/libkactivities4/Makefile
diff -u pkgsrc/x11/libkactivities4/Makefile:1.12 pkgsrc/x11/libkactivities4/Makefile:1.13
--- pkgsrc/x11/libkactivities4/Makefile:1.12 Thu Aug 22 12:23:56 2019
+++ pkgsrc/x11/libkactivities4/Makefile Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/08/22 12:23:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 09:14:13 rillig Exp $
DISTNAME= kactivities-4.13.3
PKGNAME= libkactivities4-4.13.3
@@ -21,7 +21,7 @@ CMAKE_ARGS.Darwin+= -DCMAKE_OSX_DEPLOYME
PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake
-INSTALLATION_DIRS= share/kde/config
+INSTALLATION_DIRS= share/kde/config
post-install:
${INSTALL_DATA} ${FILESDIR}/activitymanagerrc ${DESTDIR}${PREFIX}/share/kde/config
Index: pkgsrc/x11/liboldXrandr/builtin.mk
diff -u pkgsrc/x11/liboldXrandr/builtin.mk:1.4 pkgsrc/x11/liboldXrandr/builtin.mk:1.5
--- pkgsrc/x11/liboldXrandr/builtin.mk:1.4 Wed Mar 7 11:57:38 2018
+++ pkgsrc/x11/liboldXrandr/builtin.mk Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2018/03/07 11:57:38 wiz Exp $
+# $NetBSD: builtin.mk,v 1.5 2019/11/03 09:14:13 rillig Exp $
BUILTIN_PKG:= Xrandr
@@ -18,7 +18,7 @@ IS_BUILTIN.Xrandr= yes
IS_BUILTIN.Xrandr= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.Xrandr
+MAKEVARS+= IS_BUILTIN.Xrandr
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -47,10 +47,10 @@ BUILTIN_VERSION.Xrandr?= ${_version_}
. endfor
. endfor
. if defined(BUILTIN_VERSION.Xrandr)
-BUILTIN_PKG.Xrandr= Xrandr-${BUILTIN_VERSION.Xrandr}
+BUILTIN_PKG.Xrandr= Xrandr-${BUILTIN_VERSION.Xrandr}
. endif
.endif
-MAKEVARS+= BUILTIN_PKG.Xrandr
+MAKEVARS+= BUILTIN_PKG.Xrandr
###
### Determine whether we should use the built-in implementation if it
@@ -86,7 +86,7 @@ USE_BUILTIN.Xrandr!= \
. endif
. endif # PREFER.Xrandr
.endif
-MAKEVARS+= USE_BUILTIN.Xrandr
+MAKEVARS+= USE_BUILTIN.Xrandr
###
### The section below only applies if we are not including this file
Index: pkgsrc/x11/libxcb/builtin.mk
diff -u pkgsrc/x11/libxcb/builtin.mk:1.3 pkgsrc/x11/libxcb/builtin.mk:1.4
--- pkgsrc/x11/libxcb/builtin.mk:1.3 Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/libxcb/builtin.mk Sun Nov 3 09:14:13 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:13 rillig Exp $
-BUILTIN_PKG:= libxcb
+BUILTIN_PKG:= libxcb
PKGCONFIG_FILE.libxcb= ${X11BASE}/lib/pkgconfig/xcb.pc
PKGCONFIG_FILE.libxcb+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc
Index: pkgsrc/x11/lxlauncher/Makefile
diff -u pkgsrc/x11/lxlauncher/Makefile:1.12 pkgsrc/x11/lxlauncher/Makefile:1.13
--- pkgsrc/x11/lxlauncher/Makefile:1.12 Sun Jul 21 22:26:01 2019
+++ pkgsrc/x11/lxlauncher/Makefile Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/07/21 22:26:01 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2019/11/03 09:14:13 rillig Exp $
DISTNAME= lxlauncher-0.2.5
PKGREVISION= 8
@@ -17,8 +17,8 @@ GNU_CONFIGURE= yes
USE_TOOLS+= intltool pkg-config msgfmt
PKG_SYSCONFSUBDIR= xdg
-MAKE_DIRS+= ${PKG_SYSCONFDIR}/lxlauncher \
- ${PKG_SYSCONFDIR}/menus
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/lxlauncher \
+ ${PKG_SYSCONFDIR}/menus
EGDIR= share/examples
Index: pkgsrc/x11/mcookie/Makefile
diff -u pkgsrc/x11/mcookie/Makefile:1.13 pkgsrc/x11/mcookie/Makefile:1.14
--- pkgsrc/x11/mcookie/Makefile:1.13 Fri Dec 8 08:03:35 2017
+++ pkgsrc/x11/mcookie/Makefile Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/12/08 08:03:35 adam Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 09:14:13 rillig Exp $
#
# Changelog: see
# https://git.kernel.org/cgit/utils/util-linux/util-linux.git/log/misc-utils/mcookie.c
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
COMMENT= Tool for creating cookies for xauth(1)
LICENSE= public-domain
-CONFIGURE_ARGS+= --enable-mcookie
+CONFIGURE_ARGS+= --enable-mcookie
CONFIGURE_ENV.DragonFly+= ac_cv_type_cpu_set_t=no
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/mlterm/options.mk
diff -u pkgsrc/x11/mlterm/options.mk:1.16 pkgsrc/x11/mlterm/options.mk:1.17
--- pkgsrc/x11/mlterm/options.mk:1.16 Fri Apr 5 12:14:58 2019
+++ pkgsrc/x11/mlterm/options.mk Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2019/04/05 12:14:58 tsutsui Exp $
+# $NetBSD: options.mk,v 1.17 2019/11/03 09:14:13 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mlterm
PKG_SUPPORTED_OPTIONS= cairo canna fcitx fribidi gdk_pixbuf2 ibus libind m17nlib mlterm-fb otl scim skk uim utmp wnn4 xft2
@@ -138,10 +138,10 @@ CONFIGURE_ARGS+= --disable-fontconfig
.if !empty(PKG_OPTIONS:Mcairo) && !empty(PKG_OPTIONS:Mxft2)
CONFIGURE_ARGS+= --with-type-engines=xcore,xft,cairo
-.if !empty(PKG_OPTIONS:Mmlterm-fb)
+. if !empty(PKG_OPTIONS:Mmlterm-fb)
# --enable-anti-alias is also required for mlterm-fb
CONFIGURE_ARGS+= --enable-anti-alias
-.endif
+. endif
.elif !empty(PKG_OPTIONS:Mcairo)
CONFIGURE_ARGS+= --with-type-engines=xcore,cairo
.elif !empty(PKG_OPTIONS:Mxft2)
Index: pkgsrc/x11/motif/Makefile
diff -u pkgsrc/x11/motif/Makefile:1.14 pkgsrc/x11/motif/Makefile:1.15
--- pkgsrc/x11/motif/Makefile:1.14 Sat Dec 22 09:42:41 2018
+++ pkgsrc/x11/motif/Makefile Sun Nov 3 09:14:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2018/12/22 09:42:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 09:14:13 rillig Exp $
DISTNAME= motif-2.3.8
CATEGORIES= x11
@@ -27,15 +27,15 @@ SUBST_SED.man_rename= -e 's: Core.3: XC
SUBST_SED.man_rename+= -e 's: Object.3: XObject.3:g'
SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g'
-CONFIGURE_ARGS+= --enable-jpeg
-CONFIGURE_ARGS+= --enable-png
-CONFIGURE_ARGS+= --with-libjpeg-includes=${JPEGBASE}/include
-CONFIGURE_ARGS+= --with-libjpeg-lib=${JPEGBASE}/lib
-CONFIGURE_ARGS+= --with-libpng-includes=${BUILDLINK_PREFIX.png}/include
-CONFIGURE_ARGS+= --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib
-CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS+= --enable-jpeg
+CONFIGURE_ARGS+= --enable-png
+CONFIGURE_ARGS+= --with-libjpeg-includes=${JPEGBASE}/include
+CONFIGURE_ARGS+= --with-libjpeg-lib=${JPEGBASE}/lib
+CONFIGURE_ARGS+= --with-libpng-includes=${BUILDLINK_PREFIX.png}/include
+CONFIGURE_ARGS+= --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib
+CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
-CONFIGURE_ARGS+= --disable-printing
+CONFIGURE_ARGS+= --disable-printing
BUILDLINK_TRANSFORM+= l:Xft:Xft:fontconfig
@@ -48,7 +48,7 @@ CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTI
.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
MAKE_FLAGS+= CROSS_COMPILING=yes CC_FOR_BUILD=${NATIVE_CC:Q} \
- CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
+ CPPFLAGS_FOR_BUILD=-I${PREFIX}/include
.endif
# 1) Fix the man pages to refer to the correct sections.
Index: pkgsrc/x11/mowitz/Makefile
diff -u pkgsrc/x11/mowitz/Makefile:1.20 pkgsrc/x11/mowitz/Makefile:1.21
--- pkgsrc/x11/mowitz/Makefile:1.20 Wed Oct 14 20:17:28 2015
+++ pkgsrc/x11/mowitz/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/10/14 20:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 09:14:14 rillig Exp $
DISTNAME= Mowitz-0.3.1
PKGREVISION= 3
@@ -17,13 +17,13 @@ GNU_CONFIGURE= yes
BUILD_DEFS+= XAW_TYPE
.if ${XAW_TYPE} == "xpm"
-CONFIGURE_ARGS+=--with-xaw3d=XawXpm
+CONFIGURE_ARGS+= --with-xaw3d=XawXpm
.elif ${XAW_TYPE} == "3d"
-CONFIGURE_ARGS+=--with-xaw3d=Xaw3d
+CONFIGURE_ARGS+= --with-xaw3d=Xaw3d
.elif ${XAW_TYPE} == "neXtaw"
-CONFIGURE_ARGS+=--with-xaw3d=neXtaw
+CONFIGURE_ARGS+= --with-xaw3d=neXtaw
.else
-CONFIGURE_ARGS+=--with-xaw3d=Xaw
+CONFIGURE_ARGS+= --with-xaw3d=Xaw
.endif
.include "../../x11/libXpm/buildlink3.mk"
Index: pkgsrc/x11/p5-Wx/Makefile
diff -u pkgsrc/x11/p5-Wx/Makefile:1.61 pkgsrc/x11/p5-Wx/Makefile:1.62
--- pkgsrc/x11/p5-Wx/Makefile:1.61 Sun Aug 11 13:17:50 2019
+++ pkgsrc/x11/p5-Wx/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2019/08/11 13:17:50 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2019/11/03 09:14:14 rillig Exp $
DISTNAME= Wx-0.9932
PKGNAME= p5-${DISTNAME}
@@ -16,9 +16,9 @@ MAKE_JOBS_SAFE= no
# All .so's "Invalid type identifier"
CTF_SUPPORTED= no
-BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.25:../../x11/p5-Alien-wxWidgets
+BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.25:../../x11/p5-Alien-wxWidgets
#BUILD_DEPENDS+= {perl>=5.16.6,p5-ExtUtils-ParseXS>=3.15}:../../devel/p5-ExtUtils-ParseXS
-BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.16.02:../../devel/p5-ExtUtils-XSpp
+BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.16.02:../../devel/p5-ExtUtils-XSpp
#USE_TOOLS+= gmake pkg-config wx-config
USE_TOOLS+= perl
Index: pkgsrc/x11/pixman/Makefile
diff -u pkgsrc/x11/pixman/Makefile:1.71 pkgsrc/x11/pixman/Makefile:1.72
--- pkgsrc/x11/pixman/Makefile:1.71 Sun Aug 11 13:25:14 2019
+++ pkgsrc/x11/pixman/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2019/08/11 13:25:14 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2019/11/03 09:14:14 rillig Exp $
DISTNAME= pixman-0.38.4
PKGREVISION= 1
@@ -11,9 +11,9 @@ HOMEPAGE= http://xorg.freedesktop.org/
COMMENT= Library of low-level pixel manipulation routines
LICENSE= mit
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
.if ${MACHINE_ARCH} == i386
-CONFIGURE_ARGS+= --disable-sse2
+CONFIGURE_ARGS+= --disable-sse2
.endif
USE_LIBTOOL= yes
Index: pkgsrc/x11/pixman/hacks.mk
diff -u pkgsrc/x11/pixman/hacks.mk:1.12 pkgsrc/x11/pixman/hacks.mk:1.13
--- pkgsrc/x11/pixman/hacks.mk:1.12 Fri Feb 26 11:27:16 2016
+++ pkgsrc/x11/pixman/hacks.mk Sun Nov 3 09:14:14 2019
@@ -1,9 +1,9 @@
-# $NetBSD: hacks.mk,v 1.12 2016/02/26 11:27:16 jperkin Exp $
+# $NetBSD: hacks.mk,v 1.13 2019/11/03 09:14:14 rillig Exp $
#
.if !defined(PIXMAN_HACKS_MK)
PIXMAN_HACKS_MK= # empty
-. include "../../mk/bsd.fast.prefs.mk"
-. include "../../mk/compiler.mk"
+.include "../../mk/bsd.fast.prefs.mk"
+.include "../../mk/compiler.mk"
###
### XXX SSE2 intrinsics require gcc-4.2+ to build.
### XXX Need to disable SSSE3 explicitly, too.
Index: pkgsrc/x11/py-Pmw/Makefile
diff -u pkgsrc/x11/py-Pmw/Makefile:1.37 pkgsrc/x11/py-Pmw/Makefile:1.38
--- pkgsrc/x11/py-Pmw/Makefile:1.37 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/py-Pmw/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.38 2019/11/03 09:14:14 rillig Exp $
DISTNAME= Pmw.1.3.2
EGG_NAME= ${DISTNAME:S/./-/}
@@ -17,7 +17,7 @@ DEPENDS+= blt>=2.4i:../../x11/blt
USE_LANGUAGES= # empty
PYSETUPSUBDIR= src
-PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED= 27
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/py-Xlib/Makefile
diff -u pkgsrc/x11/py-Xlib/Makefile:1.13 pkgsrc/x11/py-Xlib/Makefile:1.14
--- pkgsrc/x11/py-Xlib/Makefile:1.13 Wed Oct 2 16:13:48 2019
+++ pkgsrc/x11/py-Xlib/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/10/02 16:13:48 prlw1 Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 09:14:14 rillig Exp $
DISTNAME= python-xlib-0.25
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-x/X/}
@@ -16,7 +16,7 @@ LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= # none
-DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
.include "../../lang/python/egg.mk"
Index: pkgsrc/x11/py-gnome2/Makefile
diff -u pkgsrc/x11/py-gnome2/Makefile:1.123 pkgsrc/x11/py-gnome2/Makefile:1.124
--- pkgsrc/x11/py-gnome2/Makefile:1.123 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/py-gnome2/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.123 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.124 2019/11/03 09:14:14 rillig Exp $
DISTNAME= gnome-python-2.28.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
@@ -11,14 +11,14 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://www.gnome.org/
COMMENT= Python binding for GNOME2
-PY_PATCHPLIST= YES
-USE_LIBTOOL= YES
+PY_PATCHPLIST= YES
+USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in
-GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
+GNU_CONFIGURE= YES
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
USE_TOOLS+= pkg-config gmake
-PYTHON_VERSIONS_ACCEPTED= 27 # py-ORBit, py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-ORBit, py-gtk2
BUILDLINK_TRANSFORM.SunOS+= rm:-std=c9x
Index: pkgsrc/x11/py-gnome2-desktop/Makefile
diff -u pkgsrc/x11/py-gnome2-desktop/Makefile:1.133 pkgsrc/x11/py-gnome2-desktop/Makefile:1.134
--- pkgsrc/x11/py-gnome2-desktop/Makefile:1.133 Sat Sep 14 19:14:23 2019
+++ pkgsrc/x11/py-gnome2-desktop/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2019/09/14 19:14:23 nia Exp $
+# $NetBSD: Makefile,v 1.134 2019/11/03 09:14:14 rillig Exp $
DISTNAME= gnome-python-desktop-2.32.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
@@ -27,8 +27,8 @@ PYTHON_VERSIONS_ACCEPTED= 27 # py-ORBit
# The "real" value here is: 27
# but because of single-version deps of gnome bits this will only
# ever work for the python version those gnome bits were built with.
-PYTHON_VERSIONS_REALLY_ACCEPTED=27
-PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27}
+PYTHON_VERSIONS_REALLY_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED= ${PYTHON_VERSION_DEFAULT:M27}
.include "options.mk"
Index: pkgsrc/x11/py-gnome2-extras/Makefile
diff -u pkgsrc/x11/py-gnome2-extras/Makefile:1.95 pkgsrc/x11/py-gnome2-extras/Makefile:1.96
--- pkgsrc/x11/py-gnome2-extras/Makefile:1.95 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/py-gnome2-extras/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.96 2019/11/03 09:14:14 rillig Exp $
DISTNAME= gnome-python-extras-2.25.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/}
@@ -15,15 +15,15 @@ COMMENT= Python binding for GNOME2
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-PY_PATCHPLIST= YES
+PY_PATCHPLIST= YES
PYTHON_VERSIONS_ACCEPTED= 27 # py-ORBit via py-gnome2
-USE_LIBTOOL= YES
-PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in
-GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-USE_TOOLS+= pkg-config gmake
-USE_LANGUAGES= c c++
-CONFIGURE_ARGS+= --enable-docs
+USE_LIBTOOL= YES
+PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in
+GNU_CONFIGURE= YES
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
+USE_TOOLS+= pkg-config gmake
+USE_LANGUAGES= c c++
+CONFIGURE_ARGS+= --enable-docs
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
Index: pkgsrc/x11/py-gtk2/Makefile
diff -u pkgsrc/x11/py-gtk2/Makefile:1.121 pkgsrc/x11/py-gtk2/Makefile:1.122
--- pkgsrc/x11/py-gtk2/Makefile:1.121 Sat Sep 7 04:32:14 2019
+++ pkgsrc/x11/py-gtk2/Makefile Sun Nov 3 09:14:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.121 2019/09/07 04:32:14 gutteridge Exp $
+# $NetBSD: Makefile,v 1.122 2019/11/03 09:14:14 rillig Exp $
DISTNAME= pygtk-2.24.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
@@ -17,11 +17,11 @@ CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10
# IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
MAKE_JOBS_SAFE= no
-USE_LIBTOOL= YES
+USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in
-GNU_CONFIGURE= YES
-CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-USE_TOOLS+= gmake pkg-config
+GNU_CONFIGURE= YES
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
+USE_TOOLS+= gmake pkg-config
PY_PATCHPLIST= YES
PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.24.0
Index: pkgsrc/x11/py-gtk2/options.mk
diff -u pkgsrc/x11/py-gtk2/options.mk:1.3 pkgsrc/x11/py-gtk2/options.mk:1.4
--- pkgsrc/x11/py-gtk2/options.mk:1.3 Tue Jul 9 15:49:43 2013
+++ pkgsrc/x11/py-gtk2/options.mk Sun Nov 3 09:14:14 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2013/07/09 15:49:43 tsutsui Exp $
+# $NetBSD: options.mk,v 1.4 2019/11/03 09:14:14 rillig Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.py-gtk2
-PKG_SUPPORTED_OPTIONS= py-numpy
+PKG_OPTIONS_VAR= PKG_OPTIONS.py-gtk2
+PKG_SUPPORTED_OPTIONS= py-numpy
PKG_SUGGESTED_OPTIONS=
# Enable py-numpy (which requires fortran support) by default on
# platforms supported by lang/g95.
Index: pkgsrc/x11/py-gtksourceview/Makefile
diff -u pkgsrc/x11/py-gtksourceview/Makefile:1.51 pkgsrc/x11/py-gtksourceview/Makefile:1.52
--- pkgsrc/x11/py-gtksourceview/Makefile:1.51 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/py-gtksourceview/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 09:14:15 rillig Exp $
DISTNAME= pygtksourceview-2.10.1
PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/}
@@ -14,12 +14,12 @@ LICENSE= gnu-lgpl-v2
BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
-USE_LIBTOOL= YES
-PKGCONFIG_OVERRIDE+= pygtksourceview-2.0.pc.in
-GNU_CONFIGURE= YES
-USE_TOOLS+= pkg-config
-PY_PATCHPLIST= YES
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+USE_LIBTOOL= YES
+PKGCONFIG_OVERRIDE+= pygtksourceview-2.0.pc.in
+GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
+PY_PATCHPLIST= YES
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
.include "../../lang/python/extension.mk"
Index: pkgsrc/x11/py-kde4/Makefile
diff -u pkgsrc/x11/py-kde4/Makefile:1.64 pkgsrc/x11/py-kde4/Makefile:1.65
--- pkgsrc/x11/py-kde4/Makefile:1.64 Thu Aug 22 12:23:56 2019
+++ pkgsrc/x11/py-kde4/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2019/08/22 12:23:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2019/11/03 09:14:15 rillig Exp $
PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
PKGREVISION= 17
@@ -23,7 +23,7 @@ REPLACE_PYTHON+= \
docs/html/tutorials/started/*.py
# We need to replace the embedded interpreter
-SUBST_CLASSES+= pykdeuic4
+SUBST_CLASSES+= pykdeuic4
SUBST_STAGE.pykdeuic4= post-build
SUBST_FILES.pykdeuic4= tools/pykdeuic4/pykdeuic4.py
SUBST_SED.pykdeuic4= -e 's:/usr/bin/env python$$:${PYTHONBIN}:'
Index: pkgsrc/x11/py-keybinder/Makefile
diff -u pkgsrc/x11/py-keybinder/Makefile:1.15 pkgsrc/x11/py-keybinder/Makefile:1.16
--- pkgsrc/x11/py-keybinder/Makefile:1.15 Mon Sep 2 13:20:15 2019
+++ pkgsrc/x11/py-keybinder/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/09/02 13:20:15 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 09:14:15 rillig Exp $
PKGREVISION= 8
.include "../../x11/keybinder/Makefile.common"
@@ -14,7 +14,7 @@ CONFIGURE_ARGS+= --disable-lua
CONFIGURE_ARGS+= --enable-python
PY_PATCHPLIST= yes
-PYTHON_VERSIONS_ACCEPTED= 27
+PYTHON_VERSIONS_ACCEPTED= 27
INSTALL_DIRS= python-keybinder
Index: pkgsrc/x11/py-kiwi/Makefile
diff -u pkgsrc/x11/py-kiwi/Makefile:1.51 pkgsrc/x11/py-kiwi/Makefile:1.52
--- pkgsrc/x11/py-kiwi/Makefile:1.51 Mon Sep 2 13:20:16 2019
+++ pkgsrc/x11/py-kiwi/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/09/02 13:20:16 adam Exp $
+# $NetBSD: Makefile,v 1.52 2019/11/03 09:14:15 rillig Exp $
DISTNAME= kiwi-1.9.29
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,10 +12,10 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Framework and a set of enhanced PyGTK widgets
LICENSE= gnu-lgpl-v2.1 # or later
-USE_LANGUAGES= #none
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+USE_LANGUAGES= #none
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= msgfmt
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
SUBST_CLASSES+= localedir
SUBST_STAGE.localedir= pre-configure
Index: pkgsrc/x11/py-qt4/Makefile
diff -u pkgsrc/x11/py-qt4/Makefile:1.84 pkgsrc/x11/py-qt4/Makefile:1.85
--- pkgsrc/x11/py-qt4/Makefile:1.84 Mon Mar 12 11:17:55 2018
+++ pkgsrc/x11/py-qt4/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2018/03/12 11:17:55 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2019/11/03 09:14:15 rillig Exp $
PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
PKGREVISION= 1
@@ -79,10 +79,10 @@ do-configure:
${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
.if !empty(PYVERSSUFFIX:M2*)
-UIC_PORT_REMOVE=port_v3
+UIC_PORT_REMOVE= port_v3
.endif
.if !empty(PYVERSSUFFIX:M3*)
-UIC_PORT_REMOVE=port_v2
+UIC_PORT_REMOVE= port_v2
.endif
post-install:
Index: pkgsrc/x11/py-qwt-qt4/Makefile
diff -u pkgsrc/x11/py-qwt-qt4/Makefile:1.13 pkgsrc/x11/py-qwt-qt4/Makefile:1.14
--- pkgsrc/x11/py-qwt-qt4/Makefile:1.13 Mon Sep 2 13:20:14 2019
+++ pkgsrc/x11/py-qwt-qt4/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/09/02 13:20:14 adam Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 09:14:15 rillig Exp $
DISTNAME= PyQwt-5.2.0
PKGNAME= ${PYPKGPREFIX}-qwt-qt4-${DISTNAME:S/PyQwt-//}
@@ -20,10 +20,10 @@ BUILD_DIRS= configure
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PYTHON_VERSIONS_ACCEPTED= 27 # py-Numeric
+PYTHON_VERSIONS_ACCEPTED= 27 # py-Numeric
-REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/grace.py
-REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/qplt.py
+REPLACE_PYTHON+= qt4lib/PyQt4/Qwt5/grace.py
+REPLACE_PYTHON+= qt4lib/PyQt4/Qwt5/qplt.py
do-configure:
(cd ${WRKSRC}/configure &&\
Index: pkgsrc/x11/py-terminator/Makefile
diff -u pkgsrc/x11/py-terminator/Makefile:1.22 pkgsrc/x11/py-terminator/Makefile:1.23
--- pkgsrc/x11/py-terminator/Makefile:1.22 Mon Sep 2 13:20:14 2019
+++ pkgsrc/x11/py-terminator/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/09/02 13:20:14 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 09:14:15 rillig Exp $
DISTNAME= terminator-0.98
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,9 +13,9 @@ LICENSE= gnu-gpl-v2
PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 0.98
-REPLACE_PYTHON+= *.py
-REPLACE_PYTHON+= terminatorlib/*.py
-REPLACE_PYTHON+= terminatorlib/plugins/*.py
+REPLACE_PYTHON+= *.py
+REPLACE_PYTHON+= terminatorlib/*.py
+REPLACE_PYTHON+= terminatorlib/plugins/*.py
USE_TOOLS+= intltool bash
Index: pkgsrc/x11/py-vte/Makefile
diff -u pkgsrc/x11/py-vte/Makefile:1.39 pkgsrc/x11/py-vte/Makefile:1.40
--- pkgsrc/x11/py-vte/Makefile:1.39 Mon Sep 2 13:20:14 2019
+++ pkgsrc/x11/py-vte/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/09/02 13:20:14 adam Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/03 09:14:15 rillig Exp $
.include "../../x11/vte/Makefile.common"
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --enable-python
CONFIGURE_ARGS+= --disable-freetype-test
CONFIGURE_ARGS+= --enable-Bsymbolic=auto
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
BUILD_DIRS= python
Index: pkgsrc/x11/py-wxWidgets/Makefile
diff -u pkgsrc/x11/py-wxWidgets/Makefile:1.78 pkgsrc/x11/py-wxWidgets/Makefile:1.79
--- pkgsrc/x11/py-wxWidgets/Makefile:1.78 Mon Sep 2 13:20:13 2019
+++ pkgsrc/x11/py-wxWidgets/Makefile Sun Nov 3 09:14:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2019/09/02 13:20:13 adam Exp $
+# $NetBSD: Makefile,v 1.79 2019/11/03 09:14:15 rillig Exp $
VERSION= 2.8.12.0
DISTNAME= wxPython-src-${VERSION}
@@ -17,8 +17,8 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake pkg-config
# previous name of the package
-CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]*
-PYTHON_SELF_CONFLICT= yes
+CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]*
+PYTHON_SELF_CONFLICT= yes
PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.8.10.1
# no scripts to avoid conflicts
Index: pkgsrc/x11/py-xcbgen/Makefile
diff -u pkgsrc/x11/py-xcbgen/Makefile:1.19 pkgsrc/x11/py-xcbgen/Makefile:1.20
--- pkgsrc/x11/py-xcbgen/Makefile:1.19 Mon Mar 5 10:20:24 2018
+++ pkgsrc/x11/py-xcbgen/Makefile Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/03/05 10:20:24 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 09:14:16 rillig Exp $
DISTNAME= xcb-proto-1.13
PKGNAME= ${PYPKGPREFIX}-xcbgen-1.13
@@ -19,7 +19,7 @@ CONFLICTS+= xcb-proto<1.4nb1
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
USE_LANGUAGES= # none
-PY_PATCHPLIST= yes
+PY_PATCHPLIST= yes
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/qt4-libs/Makefile
diff -u pkgsrc/x11/qt4-libs/Makefile:1.130 pkgsrc/x11/qt4-libs/Makefile:1.131
--- pkgsrc/x11/qt4-libs/Makefile:1.130 Sun Jul 21 22:26:03 2019
+++ pkgsrc/x11/qt4-libs/Makefile Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2019/07/21 22:26:03 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2019/11/03 09:14:16 rillig Exp $
PKGNAME= qt4-libs-${QTVERSION}
PKGREVISION= 18
@@ -11,9 +11,9 @@ INSTALL_DIRS+= src
BUILD_TARGET= sub-src
-PTHREAD_OPTS+= require
-UNLIMIT_RESOURCES= datasize
-BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
+PTHREAD_OPTS+= require
+UNLIMIT_RESOURCES= datasize
+BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
Index: pkgsrc/x11/qt4-libs/Makefile.common
diff -u pkgsrc/x11/qt4-libs/Makefile.common:1.48 pkgsrc/x11/qt4-libs/Makefile.common:1.49
--- pkgsrc/x11/qt4-libs/Makefile.common:1.48 Thu Sep 19 20:26:53 2019
+++ pkgsrc/x11/qt4-libs/Makefile.common Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2019/09/19 20:26:53 nros Exp $
+# $NetBSD: Makefile.common,v 1.49 2019/11/03 09:14:16 rillig Exp $
# used by x11/qt4-docs/Makefile
# used by x11/qt4-libs/Makefile
# used by x11/qt4-mng/Makefile
@@ -82,39 +82,39 @@ CXXFLAGS+= -std=c++98
.if ${OPSYS} == "SunOS"
. if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
. if ${ABI:U} == "64"
-CONFIGURE_ARGS+= -platform solaris-g++-64
+CONFIGURE_ARGS+= -platform solaris-g++-64
. else
-CONFIGURE_ARGS+= -platform solaris-g++
+CONFIGURE_ARGS+= -platform solaris-g++
. endif
. else
. if ${ABI:U} == "64"
-CONFIGURE_ARGS+= -platform solaris-cc-64
+CONFIGURE_ARGS+= -platform solaris-cc-64
. else
-CONFIGURE_ARGS+= -platform solaris-cc
+CONFIGURE_ARGS+= -platform solaris-cc
. endif
. endif
-SYS_LIBS= -lresolv -lsocket -lnsl -lrt
+SYS_LIBS= -lresolv -lsocket -lnsl -lrt
.elif ${OPSYS} == "Interix"
-CONFIGURE_ARGS+= -platform interix-g++
-CFLAGS+= -I/usr/local/include/bind
-LDFLAGS+= -L/usr/local/lib/bind -lbind
-BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
-SYS_LIBS= -lbind -ldb -ldl
+CONFIGURE_ARGS+= -platform interix-g++
+CFLAGS+= -I/usr/local/include/bind
+LDFLAGS+= -L/usr/local/lib/bind -lbind
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
+SYS_LIBS= -lbind -ldb -ldl
.elif ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= -platform freebsd-g++
+CONFIGURE_ARGS+= -platform freebsd-g++
.elif ${OPSYS} == "Darwin"
. if !empty(PKGSRC_COMPILER:Mclang)
-CONFIGURE_ARGS+= -platform macx-llvm
+CONFIGURE_ARGS+= -platform macx-llvm
. else
-CONFIGURE_ARGS+= -platform macx-g++
+CONFIGURE_ARGS+= -platform macx-g++
. endif
-CONFIGURE_ARGS+= -no-dwarf2
-CONFIGURE_ARGS+= -no-framework
+CONFIGURE_ARGS+= -no-dwarf2
+CONFIGURE_ARGS+= -no-framework
. if exists(/usr/lib/libresolv.dylib)
-LDFLAGS+= -lresolv
+LDFLAGS+= -lresolv
. endif
.elif ${OPSYS} == "Linux"
-LDFLAGS+= -ldl
+LDFLAGS+= -ldl
.endif
.if ${OPSYS} != "Darwin" && ${X11_TYPE} != "native"
Index: pkgsrc/x11/qt4-mysql/Makefile
diff -u pkgsrc/x11/qt4-mysql/Makefile:1.41 pkgsrc/x11/qt4-mysql/Makefile:1.42
--- pkgsrc/x11/qt4-mysql/Makefile:1.41 Mon Mar 12 11:17:56 2018
+++ pkgsrc/x11/qt4-mysql/Makefile Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/03/12 11:17:56 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2019/11/03 09:14:16 rillig Exp $
PKGREVISION= 2
.include "../../x11/qt4-libs/Makefile.common"
@@ -16,7 +16,7 @@ do-build:
cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE}
-SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
+SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
INSTALLATION_DIRS= ${SQLDRVDIR}
do-install:
Index: pkgsrc/x11/qt4-pgsql/Makefile
diff -u pkgsrc/x11/qt4-pgsql/Makefile:1.50 pkgsrc/x11/qt4-pgsql/Makefile:1.51
--- pkgsrc/x11/qt4-pgsql/Makefile:1.50 Mon Mar 12 11:17:56 2018
+++ pkgsrc/x11/qt4-pgsql/Makefile Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2018/03/12 11:17:56 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2019/11/03 09:14:16 rillig Exp $
PKGREVISION= 3
.include "../../x11/qt4-libs/Makefile.common"
@@ -17,7 +17,7 @@ do-build:
cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE}
-SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
+SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
INSTALLATION_DIRS= ${SQLDRVDIR}
do-install:
Index: pkgsrc/x11/qt4-sqlite3/Makefile
diff -u pkgsrc/x11/qt4-sqlite3/Makefile:1.57 pkgsrc/x11/qt4-sqlite3/Makefile:1.58
--- pkgsrc/x11/qt4-sqlite3/Makefile:1.57 Wed Apr 3 00:33:17 2019
+++ pkgsrc/x11/qt4-sqlite3/Makefile Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2019/04/03 00:33:17 ryoon Exp $
+# $NetBSD: Makefile,v 1.58 2019/11/03 09:14:16 rillig Exp $
PKGREVISION= 12
.include "../../x11/qt4-libs/Makefile.common"
@@ -18,7 +18,7 @@ do-build:
cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE}
-SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
+SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
INSTALLATION_DIRS= ${SQLDRVDIR}
do-install:
Index: pkgsrc/x11/qt5-qtbase/Makefile
diff -u pkgsrc/x11/qt5-qtbase/Makefile:1.84 pkgsrc/x11/qt5-qtbase/Makefile:1.85
--- pkgsrc/x11/qt5-qtbase/Makefile:1.84 Mon Oct 7 11:52:36 2019
+++ pkgsrc/x11/qt5-qtbase/Makefile Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2019/10/07 11:52:36 nros Exp $
+# $NetBSD: Makefile,v 1.85 2019/11/03 09:14:16 rillig Exp $
DISTNAME= qtbase-everywhere-src-${QTVERSION}
PKGNAME= qt5-qtbase-${QTVERSION}
@@ -68,40 +68,40 @@ PLIST_VARS+= egl
.if ${OPSYS} == "SunOS"
. if !empty(PKGSRC_COMPILER:Mgcc) || !empty(PKGSRC_COMPILER:Mclang)
. if ${ABI:U} == "64"
-CONFIGURE_ARGS+= -platform solaris-g++-64
+CONFIGURE_ARGS+= -platform solaris-g++-64
. else
-CONFIGURE_ARGS+= -platform solaris-g++
+CONFIGURE_ARGS+= -platform solaris-g++
. endif
. else
. if ${ABI:U} == "64"
-CONFIGURE_ARGS+= -platform solaris-cc-64
+CONFIGURE_ARGS+= -platform solaris-cc-64
. else
-CONFIGURE_ARGS+= -platform solaris-cc
+CONFIGURE_ARGS+= -platform solaris-cc
. endif
. endif
-NETWORK_LIBS= -lsocket -lnsl
+NETWORK_LIBS= -lsocket -lnsl
.elif ${OPSYS} == "Interix"
-CONFIGURE_ARGS+= -platform interix-g++
-CFLAGS+= -I/usr/local/include/bind
-LDFLAGS+= -L/usr/local/lib/bind -lbind
-BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
-SYS_LIBS= -lbind -ldb -ldl
+CONFIGURE_ARGS+= -platform interix-g++
+CFLAGS+= -I/usr/local/include/bind
+LDFLAGS+= -L/usr/local/lib/bind -lbind
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind /usr/local/lib/bind
+SYS_LIBS= -lbind -ldb -ldl
.elif ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+= -platform freebsd-g++
-LDFLAGS+= -lexecinfo
+CONFIGURE_ARGS+= -platform freebsd-g++
+LDFLAGS+= -lexecinfo
.elif ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= -platform macx-clang
-CONFIGURE_ARGS+= -no-framework
+CONFIGURE_ARGS+= -platform macx-clang
+CONFIGURE_ARGS+= -no-framework
. if exists(/usr/lib/libresolv.dylib)
-LDFLAGS+= -lresolv
+LDFLAGS+= -lresolv
. endif
.elif ${OPSYS} == "Linux"
-LDFLAGS+= -ldl
+LDFLAGS+= -ldl
.elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
. if exists(/usr/lib/libexecinfo.so)
-LDFLAGS+= -lexecinfo
+LDFLAGS+= -lexecinfo
. endif
-LDFLAGS.FreeBSD+= -lutil
+LDFLAGS.FreeBSD+= -lutil
.endif
REPLACE_PERL+= bin/fixqt4headers.pl
@@ -117,16 +117,16 @@ BUILD_TARGET= sub-src
INSTALLATION_DIRS= ${QTPREFIX}/bin lib/pkgconfig
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
-CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/data/mac/objc_namespace.sh
-CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/uikit/device_destinations.sh
-CHECK_INTERPRETER_SKIP+=qt5/mkspecs/features/uikit/devices.py
-CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
+CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/echoplugin/echoplugin.pro
+CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
+CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
+CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
+CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
+CHECK_INTERPRETER_SKIP+= qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
+CHECK_INTERPRETER_SKIP+= qt5/mkspecs/features/data/mac/objc_namespace.sh
+CHECK_INTERPRETER_SKIP+= qt5/mkspecs/features/uikit/device_destinations.sh
+CHECK_INTERPRETER_SKIP+= qt5/mkspecs/features/uikit/devices.py
+CHECK_INTERPRETER_SKIP+= qt5/mkspecs/macx-ios-clang/rename_main.sh
SUBST_CLASSES+= opt
SUBST_STAGE.opt= pre-configure
@@ -187,7 +187,7 @@ pre-configure:
-e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
-e 's:@QMAKE_EXTRA@:${QMAKE_EXTRA:Q}:g' \
${FILESDIR}/${QMAKE_CONF} > ${WRKSRC}/qmake.conf
- for dir in ${WRKSRC}/mkspecs/*; do \
+ for dir in ${WRKSRC}/mkspecs/*; do \
cp ${WRKSRC}/qmake.conf $${dir}; \
rm -f $${dir}/*.orig; \
done
Index: pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.36 pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.37
--- pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.36 Wed Sep 18 14:17:21 2019
+++ pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.36 2019/09/18 14:17:21 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.37 2019/11/03 09:14:16 rillig Exp $
BUILDLINK_TREE+= qt5-qtmultimedia
@@ -7,7 +7,7 @@ QT5_QTMULTIMEDIA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.9.1
BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.13.1nb1
-BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia
+BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia
BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/lib
Index: pkgsrc/x11/qt5-qtserialport/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtserialport/buildlink3.mk:1.27 pkgsrc/x11/qt5-qtserialport/buildlink3.mk:1.28
--- pkgsrc/x11/qt5-qtserialport/buildlink3.mk:1.27 Mon Sep 16 19:24:55 2019
+++ pkgsrc/x11/qt5-qtserialport/buildlink3.mk Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2019/09/16 19:24:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2019/11/03 09:14:16 rillig Exp $
BUILDLINK_TREE+= qt5-qtserialport
@@ -7,7 +7,7 @@ QT5_QTSERIALPORT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.9.1
BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.13.1
-BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport
+BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport
BUILDLINK_INCDIRS.qt5-qtserialport+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtserialport+= qt5/lib
Index: pkgsrc/x11/qt5-qtspeech/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtspeech/buildlink3.mk:1.4 pkgsrc/x11/qt5-qtspeech/buildlink3.mk:1.5
--- pkgsrc/x11/qt5-qtspeech/buildlink3.mk:1.4 Wed Sep 18 14:17:21 2019
+++ pkgsrc/x11/qt5-qtspeech/buildlink3.mk Sun Nov 3 09:14:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2019/09/18 14:17:21 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/11/03 09:14:16 rillig Exp $
BUILDLINK_TREE+= qt5-qtspeech
@@ -9,9 +9,9 @@ BUILDLINK_API_DEPENDS.qt5-qtspeech+= qt5
BUILDLINK_ABI_DEPENDS.qt5-qtspeech?= qt5-qtspeech>=5.13.1nb1
BUILDLINK_PKGSRCDIR.qt5-qtspeech?= ../../x11/qt5-qtspeech
-BUILDLINK_INCDIRS.qt5-qtspeech+= qt5/include
-BUILDLINK_LIBDIRS.qt5-qtspeech+= qt5/lib
-BUILDLINK_LIBDIRS.qt5-qtspeech+= qt5/plugins
+BUILDLINK_INCDIRS.qt5-qtspeech+= qt5/include
+BUILDLINK_LIBDIRS.qt5-qtspeech+= qt5/lib
+BUILDLINK_LIBDIRS.qt5-qtspeech+= qt5/plugins
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
.endif # QT5_QTSPEECH_BUILDLINK3_MK
Index: pkgsrc/x11/qt5-qtsvg/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtsvg/buildlink3.mk:1.27 pkgsrc/x11/qt5-qtsvg/buildlink3.mk:1.28
--- pkgsrc/x11/qt5-qtsvg/buildlink3.mk:1.27 Mon Sep 16 19:24:55 2019
+++ pkgsrc/x11/qt5-qtsvg/buildlink3.mk Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2019/09/16 19:24:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2019/11/03 09:14:17 rillig Exp $
BUILDLINK_TREE+= qt5-qtsvg
@@ -7,7 +7,7 @@ QT5_QTSVG_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.9.1
BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.13.1
-BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg
+BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg
BUILDLINK_INCDIRS.qt5-qtsvg+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtsvg+= qt5/lib
Index: pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk:1.22 pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk:1.23
--- pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk:1.22 Mon Sep 16 19:24:55 2019
+++ pkgsrc/x11/qt5-qtwebchannel/buildlink3.mk Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2019/09/16 19:24:55 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2019/11/03 09:14:17 rillig Exp $
BUILDLINK_TREE+= qt5-qtwebchannel
@@ -7,7 +7,7 @@ QT5_QTWEBCHANNEL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.9.1
BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.13.1
-BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel
+BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel
BUILDLINK_INCDIRS.qt5-qtwebchannel+= qt5/include
BUILDLINK_LIBDIRS.qt5-qtwebchannel+= qt5/lib
Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.66 pkgsrc/x11/qt5-qtwebkit/Makefile:1.67
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.66 Wed Sep 18 14:17:21 2019
+++ pkgsrc/x11/qt5-qtwebkit/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2019/09/18 14:17:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.67 2019/11/03 09:14:17 rillig Exp $
DISTNAME= qtwebkit-${QTWKVERSION}
PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./}
@@ -21,8 +21,8 @@ PYTHON_VERSIONS_ACCEPTED= 27 # as of 5.2
.include "../../mk/dlopen.buildlink3.mk"
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
-USE_LANGUAGES= c c++11
-USE_TOOLS+= gmake perl:build pkg-config bison flex sed
+USE_LANGUAGES= c c++11
+USE_TOOLS+= gmake perl:build pkg-config bison flex sed
USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _build
@@ -45,10 +45,10 @@ pre-configure:
${MKDIR} ${WRKSRC}/_build
# wcstof(3) etc. is used in C++ code.
-CFLAGS.NetBSD+= -D_NETBSD_SOURCE
+CFLAGS.NetBSD+= -D_NETBSD_SOURCE
## for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined.
-#BUILDLINK_TRANSFORM+= rm:-Wundef
+#BUILDLINK_TRANSFORM+= rm:-Wundef
PLIST_VARS+= mac unix
.if ${OPSYS} == "Darwin"
@@ -58,7 +58,7 @@ PLIST.unix= yes
.endif
# avoid creating a .qt directory in the users home directory
-SCRIPTS_ENV+= HOME=${WRKDIR}
+SCRIPTS_ENV+= HOME=${WRKDIR}
BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
Index: pkgsrc/x11/qwt-qt4/Makefile
diff -u pkgsrc/x11/qwt-qt4/Makefile:1.35 pkgsrc/x11/qwt-qt4/Makefile:1.36
--- pkgsrc/x11/qwt-qt4/Makefile:1.35 Mon Mar 12 11:15:57 2018
+++ pkgsrc/x11/qwt-qt4/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2018/03/12 11:15:57 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2019/11/03 09:14:17 rillig Exp $
DISTNAME= qwt-5.2.3
PKGREVISION= 2
@@ -19,7 +19,7 @@ USE_TOOLS+= gmake
CONFLICTS= qwtlib-[0-9]*
-AUTO_MKDIRS= yes
+AUTO_MKDIRS= yes
INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
do-configure:
Index: pkgsrc/x11/qwt6-qt5/Makefile
diff -u pkgsrc/x11/qwt6-qt5/Makefile:1.1 pkgsrc/x11/qwt6-qt5/Makefile:1.2
--- pkgsrc/x11/qwt6-qt5/Makefile:1.1 Mon Oct 28 19:00:37 2019
+++ pkgsrc/x11/qwt6-qt5/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/10/28 19:00:37 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 09:14:17 rillig Exp $
DISTNAME= qwt-6.1.4
PKGNAME= qwt6-qt5-6.1.4
@@ -18,7 +18,7 @@ USE_LIBTOOL= yes
AUTO_MKDIRS= yes
INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
-PLIST_SUBST+= VERSION=${PKGVERSION_NOREV}
+PLIST_SUBST+= VERSION=${PKGVERSION_NOREV}
do-configure:
cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake
Index: pkgsrc/x11/qwt6-qt5/buildlink3.mk
diff -u pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.1 pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.2
--- pkgsrc/x11/qwt6-qt5/buildlink3.mk:1.1 Mon Oct 28 19:00:37 2019
+++ pkgsrc/x11/qwt6-qt5/buildlink3.mk Sun Nov 3 09:14:17 2019
@@ -1,13 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/10/28 19:00:37 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/03 09:14:17 rillig Exp $
BUILDLINK_TREE+= qwt6-qt5
.if !defined(QWT_BUILDLINK3_MK)
QWT_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.4
-BUILDLINK_ABI_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.4
-BUILDLINK_PKGSRCDIR.qwt6-qt5?= ../../x11/qwt6-qt5
+BUILDLINK_API_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.4
+BUILDLINK_ABI_DEPENDS.qwt6-qt5+= qwt6-qt5>=6.1.4
+BUILDLINK_PKGSRCDIR.qwt6-qt5?= ../../x11/qwt6-qt5
QWT_DIR= ${BUILDLINK_PREFIX.qwt6-qt5}/qwt-6.1.4
BUILDLINK_INCDIRS.qwt6-qt5+= qwt-6.1.4/include
Index: pkgsrc/x11/redshift/Makefile
diff -u pkgsrc/x11/redshift/Makefile:1.1 pkgsrc/x11/redshift/Makefile:1.2
--- pkgsrc/x11/redshift/Makefile:1.1 Wed May 18 22:18:43 2016
+++ pkgsrc/x11/redshift/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/05/18 22:18:43 snj Exp $
+# $NetBSD: Makefile,v 1.2 2019/11/03 09:14:17 rillig Exp $
DISTNAME= redshift-1.11
CATEGORIES= x11
@@ -12,11 +12,11 @@ COMMENT= Adjust screen color temperature
LICENSE= gnu-gpl-v3
-BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+=--disable-gui
-USE_LIBTOOL= yes
-USE_TOOLS+= intltool pkg-config
+BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --disable-gui
+USE_LIBTOOL= yes
+USE_TOOLS+= intltool pkg-config
.include "options.mk"
Index: pkgsrc/x11/rofi/Makefile
diff -u pkgsrc/x11/rofi/Makefile:1.13 pkgsrc/x11/rofi/Makefile:1.14
--- pkgsrc/x11/rofi/Makefile:1.13 Sun Jul 21 22:26:03 2019
+++ pkgsrc/x11/rofi/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/07/21 22:26:03 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2019/11/03 09:14:17 rillig Exp $
DISTNAME= rofi-1.5.2
PKGREVISION= 1
@@ -14,7 +14,7 @@ LICENSE= x11
USE_TOOLS+= pkg-config bash bison
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= YACC='bison -y'
REPLACE_BASH+= script/rofi-sensible-terminal
Index: pkgsrc/x11/rox-session/Makefile
diff -u pkgsrc/x11/rox-session/Makefile:1.60 pkgsrc/x11/rox-session/Makefile:1.61
--- pkgsrc/x11/rox-session/Makefile:1.60 Mon Sep 2 13:20:16 2019
+++ pkgsrc/x11/rox-session/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/09/02 13:20:16 adam Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/03 09:14:17 rillig Exp $
DISTNAME= rox-session-0.28
PKGREVISION= 37
@@ -18,7 +18,7 @@ DIST_SUBDIR= rox
NO_BUILD= yes
REPLACE_PYTHON= AppRun tests/testutils.py
-PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
+PYTHON_VERSIONS_ACCEPTED= 27 # py-gtk2
INSTALLATION_DIRS= share/rox/ROX-Session
Index: pkgsrc/x11/ruby-tk/Makefile
diff -u pkgsrc/x11/ruby-tk/Makefile:1.60 pkgsrc/x11/ruby-tk/Makefile:1.61
--- pkgsrc/x11/ruby-tk/Makefile:1.60 Mon Apr 15 14:35:12 2019
+++ pkgsrc/x11/ruby-tk/Makefile Sun Nov 3 09:14:17 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/04/15 14:35:12 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2019/11/03 09:14:17 rillig Exp $
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION}
@@ -11,7 +11,7 @@ HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby interface to the Tk widget set
# Ruby 2.4 and later do not bundle ruby-tk.
-RUBY_VERSIONS_ACCEPTED= 22
+RUBY_VERSIONS_ACCEPTED= 22
USE_TOOLS+= pax
USE_RUBY_EXTCONF= yes
Index: pkgsrc/x11/ruby-tk-gem/Makefile
diff -u pkgsrc/x11/ruby-tk-gem/Makefile:1.4 pkgsrc/x11/ruby-tk-gem/Makefile:1.5
--- pkgsrc/x11/ruby-tk-gem/Makefile:1.4 Sun Feb 3 13:45:07 2019
+++ pkgsrc/x11/ruby-tk-gem/Makefile Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/03 13:45:07 taca Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/03 09:14:18 rillig Exp $
DISTNAME= tk-0.2.0
CATEGORIES= x11 ruby
@@ -8,7 +8,7 @@ HOMEPAGE= https://github.com/ruby/tk
COMMENT= Tk interface module using tcltklib
LICENSE= 2-clause-bsd
-RUBY_VERSIONS_ACCEPTED= 24 25 26
+RUBY_VERSIONS_ACCEPTED= 24 25 26
.include "../../lang/ruby/gem.mk"
.include "../../lang/tcl/buildlink3.mk"
Index: pkgsrc/x11/sessreg/Makefile
diff -u pkgsrc/x11/sessreg/Makefile:1.15 pkgsrc/x11/sessreg/Makefile:1.16
--- pkgsrc/x11/sessreg/Makefile:1.15 Tue Jun 11 08:13:05 2019
+++ pkgsrc/x11/sessreg/Makefile Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/06/11 08:13:05 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 09:14:18 rillig Exp $
DISTNAME= sessreg-1.1.2
CATEGORIES= x11
@@ -12,8 +12,8 @@ COMMENT= Manage utmp/wtmp entries for xd
USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
-BUILD_DEFS+= VARBASE
-CONFIGURE_ARGS+=--localstatedir=${VARBASE:Q}
+BUILD_DEFS+= VARBASE
+CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mgcc)
Index: pkgsrc/x11/stalonetray/Makefile
diff -u pkgsrc/x11/stalonetray/Makefile:1.8 pkgsrc/x11/stalonetray/Makefile:1.9
--- pkgsrc/x11/stalonetray/Makefile:1.8 Thu Aug 11 23:03:26 2016
+++ pkgsrc/x11/stalonetray/Makefile Sun Nov 3 09:14:18 2019
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2016/08/11 23:03:26 mef Exp $
+# $NetBSD: Makefile,v 1.9 2019/11/03 09:14:18 rillig Exp $
#
-DISTNAME=stalonetray-0.8.3
-CATEGORIES=x11
-MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=stalonetray/}
+DISTNAME= stalonetray-0.8.3
+CATEGORIES= x11
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=stalonetray/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://stalonetray.sourceforge.net/
COMMENT= Stand-alone system tray
LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-native-kde
-USE_LANGUAGES+= c
+USE_LANGUAGES+= c
INSTALLATION_DIRS= share/examples
Index: pkgsrc/x11/tk-Tix/options.mk
diff -u pkgsrc/x11/tk-Tix/options.mk:1.2 pkgsrc/x11/tk-Tix/options.mk:1.3
--- pkgsrc/x11/tk-Tix/options.mk:1.2 Tue Dec 29 04:54:39 2015
+++ pkgsrc/x11/tk-Tix/options.mk Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2015/12/29 04:54:39 dholland Exp $
+# $NetBSD: options.mk,v 1.3 2019/11/03 09:14:18 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.Tix
PKG_SUPPORTED_OPTIONS= threads debug
@@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --enable-symbols
.if !empty(PKG_OPTIONS:Mthreads)
CONFIGURE_ARGS+= --enable-threads
-. include "../../mk/pthread.buildlink3.mk"
+. include "../../mk/pthread.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-threads
.endif
Index: pkgsrc/x11/tk85/options.mk
diff -u pkgsrc/x11/tk85/options.mk:1.1 pkgsrc/x11/tk85/options.mk:1.2
--- pkgsrc/x11/tk85/options.mk:1.1 Mon Mar 10 14:22:01 2014
+++ pkgsrc/x11/tk85/options.mk Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/03/10 14:22:01 taca Exp $
+# $NetBSD: options.mk,v 1.2 2019/11/03 09:14:18 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tk
PKG_SUPPORTED_OPTIONS= threads debug xft2
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --enable-symbols
.if !empty(PKG_OPTIONS:Mthreads)
CONFIGURE_ARGS+= --enable-threads
-. include "../../mk/pthread.buildlink3.mk"
+. include "../../mk/pthread.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-threads
.endif
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --disable-threads
.if !empty(PKG_OPTIONS:Mxft2)
CONFIGURE_ARGS+= --enable-xft
USE_TOOLS+= pkg-config
-. include "../../x11/libXft/buildlink3.mk"
+. include "../../x11/libXft/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-xft
.endif
Index: pkgsrc/x11/wmfire/Makefile
diff -u pkgsrc/x11/wmfire/Makefile:1.24 pkgsrc/x11/wmfire/Makefile:1.25
--- pkgsrc/x11/wmfire/Makefile:1.24 Mon Oct 29 05:06:55 2012
+++ pkgsrc/x11/wmfire/Makefile Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/10/29 05:06:55 asau Exp $
+# $NetBSD: Makefile,v 1.25 2019/11/03 09:14:18 rillig Exp $
#
DISTNAME= wmfire-0.0.3.9pre4
@@ -10,8 +10,8 @@ MASTER_SITES= http://staff.xmms.org/zinx
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Displays generated fire according to system load
-GNU_CONFIGURE= YES
-INSTALLATION_DIRS+= share/doc/wmfire
+GNU_CONFIGURE= YES
+INSTALLATION_DIRS+= share/doc/wmfire
post-install:
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wmfire
Index: pkgsrc/x11/wterm/Makefile
diff -u pkgsrc/x11/wterm/Makefile:1.58 pkgsrc/x11/wterm/Makefile:1.59
--- pkgsrc/x11/wterm/Makefile:1.58 Mon Mar 12 11:17:58 2018
+++ pkgsrc/x11/wterm/Makefile Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2018/03/12 11:17:58 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2019/11/03 09:14:18 rillig Exp $
DISTNAME= wterm-6.2.9
PKGREVISION= 25
@@ -13,11 +13,11 @@ MAKE_JOBS_SAFE= no
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --enable-utmp --enable-wtmp
-CONFIGURE_ARGS+= --enable-xpm-background --enable-transparency
-CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll
-CONFIGURE_ARGS+= --enable-half-shadow
-CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}
+CONFIGURE_ARGS+= --enable-utmp --enable-wtmp
+CONFIGURE_ARGS+= --enable-xpm-background --enable-transparency
+CONFIGURE_ARGS+= --enable-menubar --enable-graphics --enable-next-scroll
+CONFIGURE_ARGS+= --enable-half-shadow
+CONFIGURE_ARGS+= --with-xpm-library=${BUILDLINK_PREFIX.libXpm}
INSTALLATION_DIRS+= share/WindowMaker/Icons
Index: pkgsrc/x11/wxGTK28/Makefile.common
diff -u pkgsrc/x11/wxGTK28/Makefile.common:1.18 pkgsrc/x11/wxGTK28/Makefile.common:1.19
--- pkgsrc/x11/wxGTK28/Makefile.common:1.18 Thu May 23 19:23:23 2019
+++ pkgsrc/x11/wxGTK28/Makefile.common Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2019/05/23 19:23:23 rillig Exp $
+# $NetBSD: Makefile.common,v 1.19 2019/11/03 09:14:18 rillig Exp $
#
# used by x11/wxGTK28/Makefile
# used by x11/wxGTK28-contrib/Makefile
@@ -41,7 +41,7 @@ DOCDIR= ${PREFIX}/share/wx-2.8/doc/wxG
CONFIGURE_DIRS= build-non-unicode build-unicode
#CONFIGURE_ARGS+= --enable-debug
-#PLIST_SUBST+= DEBUG_LIB=d DEBUG_CONFIG=-config
+#PLIST_SUBST+= DEBUG_LIB=d DEBUG_CONFIG=-config
PLIST_SUBST+= DEBUG_LIB= DEBUG_CONFIG=-release
@@ -50,7 +50,7 @@ SUBST_STAGE.fix-paths= pre-configure
SUBST_MESSAGE.fix-paths= Fixing absolute paths.
SUBST_FILES.fix-paths= configure
SUBST_SED.fix-paths= -e 's,/usr/pkg/include,${PREFIX}/include,g'
-SUBST_VARS.fix-paths= PREFIX
+SUBST_VARS.fix-paths= PREFIX
SUBST_SED.fix-paths+= -e 's,/usr/X11/,${X11BASE}/,g'
pre-configure:
Index: pkgsrc/x11/xauth/builtin.mk
diff -u pkgsrc/x11/xauth/builtin.mk:1.2 pkgsrc/x11/xauth/builtin.mk:1.3
--- pkgsrc/x11/xauth/builtin.mk:1.2 Sat Jul 4 16:18:43 2015
+++ pkgsrc/x11/xauth/builtin.mk Sun Nov 3 09:14:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2015/07/04 16:18:43 joerg Exp $
+# $NetBSD: builtin.mk,v 1.3 2019/11/03 09:14:18 rillig Exp $
BUILTIN_PKG:= xauth
@@ -18,7 +18,7 @@ IS_BUILTIN.xauth= yes
IS_BUILTIN.xauth= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.xauth
+MAKEVARS+= IS_BUILTIN.xauth
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -33,7 +33,7 @@ BUILTIN_VERSION.xauth= 11.7
BUILTIN_PKG.xauth= xauth-${BUILTIN_VERSION.xauth}
.endif
-MAKEVARS+= BUILTIN_PKG.xauth
+MAKEVARS+= BUILTIN_PKG.xauth
###
### Determine whether we should use the built-in implementation if it
Index: pkgsrc/x11/xbitmaps/builtin.mk
diff -u pkgsrc/x11/xbitmaps/builtin.mk:1.3 pkgsrc/x11/xbitmaps/builtin.mk:1.4
--- pkgsrc/x11/xbitmaps/builtin.mk:1.3 Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/xbitmaps/builtin.mk Sun Nov 3 09:14:19 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:19 rillig Exp $
-BUILTIN_PKG:= xbitmaps
+BUILTIN_PKG:= xbitmaps
PKGCONFIG_FILE.xbitmaps= ${X11BASE}/lib/pkgconfig/xbitmaps.pc
PKGCONFIG_FILE.xbitmaps+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xbitmaps.pc
PKGCONFIG_FILE.xbitmaps+= ${X11BASE}/share/pkgconfig/xbitmaps.pc
Index: pkgsrc/x11/xcb-proto/builtin.mk
diff -u pkgsrc/x11/xcb-proto/builtin.mk:1.3 pkgsrc/x11/xcb-proto/builtin.mk:1.4
--- pkgsrc/x11/xcb-proto/builtin.mk:1.3 Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/xcb-proto/builtin.mk Sun Nov 3 09:14:19 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.3 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.4 2019/11/03 09:14:19 rillig Exp $
-BUILTIN_PKG:= xcb-proto
+BUILTIN_PKG:= xcb-proto
PKGCONFIG_FILE.xcb-proto= ${X11BASE}/lib/pkgconfig/xcb-proto.pc
PKGCONFIG_FILE.xcb-proto+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb-proto.pc
PKGCONFIG_FILE.xcb-proto+= ${X11BASE}/share/pkgconfig/xcb-proto.pc
Index: pkgsrc/x11/xcb-util/builtin.mk
diff -u pkgsrc/x11/xcb-util/builtin.mk:1.5 pkgsrc/x11/xcb-util/builtin.mk:1.6
--- pkgsrc/x11/xcb-util/builtin.mk:1.5 Tue Dec 29 04:54:39 2015
+++ pkgsrc/x11/xcb-util/builtin.mk Sun Nov 3 09:14:19 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.5 2015/12/29 04:54:39 dholland Exp $
+# $NetBSD: builtin.mk,v 1.6 2019/11/03 09:14:19 rillig Exp $
-BUILTIN_PKG:= xcb-util
+BUILTIN_PKG:= xcb-util
PKGCONFIG_FILE.xcb-util= ${X11BASE}/lib/pkgconfig/xcb-atom.pc
PKGCONFIG_FILE.xcb-util+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb-atom.pc
Index: pkgsrc/x11/xcb-util-xrm/Makefile
diff -u pkgsrc/x11/xcb-util-xrm/Makefile:1.3 pkgsrc/x11/xcb-util-xrm/Makefile:1.4
--- pkgsrc/x11/xcb-util-xrm/Makefile:1.3 Wed May 1 08:32:26 2019
+++ pkgsrc/x11/xcb-util-xrm/Makefile Sun Nov 3 09:14:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/05/01 08:32:26 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 09:14:19 rillig Exp $
DISTNAME= xcb-util-xrm-1.3
CATEGORIES= x11
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gm4 pkg-config
-PKGCONFIG_OVERRIDE=xcb-xrm.pc.in
+PKGCONFIG_OVERRIDE= xcb-xrm.pc.in
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
Index: pkgsrc/x11/xcb-util036/Makefile
diff -u pkgsrc/x11/xcb-util036/Makefile:1.5 pkgsrc/x11/xcb-util036/Makefile:1.6
--- pkgsrc/x11/xcb-util036/Makefile:1.5 Wed Aug 16 20:21:18 2017
+++ pkgsrc/x11/xcb-util036/Makefile Sun Nov 3 09:14:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/08/16 20:21:18 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/03 09:14:19 rillig Exp $
#
DISTNAME= xcb-util-0.3.6
@@ -13,12 +13,12 @@ HOMEPAGE= https://xcb.freedesktop.org/
COMMENT= XCB Utilities (old 0.3.6 release)
LICENSE= x11
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_PREFIX= ${PREFIX}/xcb-util036
-USE_TOOLS+= gm4 gmake pkg-config
-USE_LIBTOOL= yes
-LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/xcb-util036/lib
-#LIBS+= ${COMPILER_RPATH_FLAG}${PREFIX}/xcb-util036/lib
+GNU_CONFIGURE= yes
+GNU_CONFIGURE_PREFIX= ${PREFIX}/xcb-util036
+USE_TOOLS+= gm4 gmake pkg-config
+USE_LIBTOOL= yes
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/xcb-util036/lib
+#LIBS+= ${COMPILER_RPATH_FLAG}${PREFIX}/xcb-util036/lib
BUILDLINK_PASSTHRU_RPATHDIRS= ${PREFIX}/xcb-util036/lib
PKGCONFIG_OVERRIDE+= atom/xcb-atom.pc.in
Index: pkgsrc/x11/xcursor/builtin.mk
diff -u pkgsrc/x11/xcursor/builtin.mk:1.15 pkgsrc/x11/xcursor/builtin.mk:1.16
--- pkgsrc/x11/xcursor/builtin.mk:1.15 Mon Mar 19 12:34:22 2012
+++ pkgsrc/x11/xcursor/builtin.mk Sun Nov 3 09:14:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.15 2012/03/19 12:34:22 joerg Exp $
+# $NetBSD: builtin.mk,v 1.16 2019/11/03 09:14:19 rillig Exp $
BUILTIN_PKG:= xcursor
@@ -18,7 +18,7 @@ IS_BUILTIN.xcursor= yes
IS_BUILTIN.xcursor= no
. endif
.endif
-MAKEVARS+= IS_BUILTIN.xcursor
+MAKEVARS+= IS_BUILTIN.xcursor
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -35,7 +35,7 @@ BUILTIN_VERSION.xcursor!= \
${H_XCURSOR}
BUILTIN_PKG.xcursor= xcursor-${BUILTIN_VERSION.xcursor}
.endif
-MAKEVARS+= BUILTIN_PKG.xcursor
+MAKEVARS+= BUILTIN_PKG.xcursor
###
### Determine whether we should use the built-in implementation if it
@@ -69,7 +69,7 @@ USE_BUILTIN.xcursor!= \
. endif
. endif # PREFER.xcursor
.endif
-MAKEVARS+= USE_BUILTIN.xcursor
+MAKEVARS+= USE_BUILTIN.xcursor
###
### The section below only applies if we are not including this file
Index: pkgsrc/x11/xdaemon/Makefile
diff -u pkgsrc/x11/xdaemon/Makefile:1.22 pkgsrc/x11/xdaemon/Makefile:1.23
--- pkgsrc/x11/xdaemon/Makefile:1.22 Mon Apr 8 11:17:26 2013
+++ pkgsrc/x11/xdaemon/Makefile Sun Nov 3 09:14:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/04/08 11:17:26 rodent Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 09:14:19 rillig Exp $
DISTNAME= xdaemon-1.2
CATEGORIES= games x11
@@ -29,9 +29,9 @@ do-extract:
do-install:
.for img in ${IMAGES}
-.for sufx in _bw.xbm _color.xpm _icon.xbm _mask.xbm
+. for sufx in _bw.xbm _color.xpm _icon.xbm _mask.xbm
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}${sufx} ${DESTDIR}${PREFIX}/share/xteddy/pixmaps/${img}${sufx}
-.endfor # sufx
+. endfor # sufx
${RM} -f ${DESTDIR}${PREFIX}/bin/${img}
${LN} -s xteddy ${DESTDIR}${PREFIX}/bin/${img}
.endfor # img
Index: pkgsrc/x11/xdm3d/Makefile
diff -u pkgsrc/x11/xdm3d/Makefile:1.29 pkgsrc/x11/xdm3d/Makefile:1.30
--- pkgsrc/x11/xdm3d/Makefile:1.29 Wed Oct 14 20:17:28 2015
+++ pkgsrc/x11/xdm3d/Makefile Sun Nov 3 09:14:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/10/14 20:17:28 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/11/03 09:14:19 rillig Exp $
DISTNAME= xdm3d-1.0
PKGREVISION= 7
@@ -7,7 +7,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
PATCHFILES= xdm3d-jumbo-patch-20130616.gz
PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xdm3d/
-PATCH_DIST_STRIP= -p1
+PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.hijinks.com/~spade/linux/XBanner/
@@ -23,9 +23,9 @@ INSTALLATION_DIRS= bin
.include "../../mk/bsd.prefs.mk"
.if exists(${X11BASE}/lib/X11/xdm)
-XDMDIR=${X11BASE}/lib/X11/xdm
+XDMDIR= ${X11BASE}/lib/X11/xdm
.elif exists(/etc/X11/xdm)
-XDMDIR=/etc/X11/xdm
+XDMDIR= /etc/X11/xdm
.else
PKG_FAIL_REASON+= "Cannot find xdm directory."
.endif
@@ -34,10 +34,10 @@ PKG_FAIL_REASON+= "Cannot find xdm direc
.if ${OPSYS} == "NetBSD"
. if ${X11_TYPE} == "native"
# wrong in 5.x's native X
-IMAKEOPTS+=-DHasSecureRPC=NO
+IMAKEOPTS+= -DHasSecureRPC=NO
BUILDLINK_TRANSFORM+= rm:-DSECURE_RPC
. endif
-IMAKEOPTS+=-DHasSetUserContext=YES
+IMAKEOPTS+= -DHasSetUserContext=YES
.endif
do-install:
Index: pkgsrc/x11/xearth/Makefile
diff -u pkgsrc/x11/xearth/Makefile:1.22 pkgsrc/x11/xearth/Makefile:1.23
--- pkgsrc/x11/xearth/Makefile:1.22 Sat Apr 6 14:09:35 2013
+++ pkgsrc/x11/xearth/Makefile Sun Nov 3 09:14:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/04/06 14:09:35 rodent Exp $
+# $NetBSD: Makefile,v 1.23 2019/11/03 09:14:19 rillig Exp $
#
DISTNAME= xearth-1.1
@@ -10,7 +10,7 @@ MAINTAINER= agc%NetBSD.org@localhost
HOMEPAGE= # AWOL
COMMENT= Rotating map of the Earth in X11 root window
-USE_IMAKE= yes
+USE_IMAKE= yes
INSTALL_MAKE_FLAGS= MANPATH=${PREFIX}/${PKGMANDIR}
.include "../../x11/libXext/buildlink3.mk"
Index: pkgsrc/x11/xephem/Makefile
diff -u pkgsrc/x11/xephem/Makefile:1.67 pkgsrc/x11/xephem/Makefile:1.68
--- pkgsrc/x11/xephem/Makefile:1.67 Sun Aug 11 13:25:18 2019
+++ pkgsrc/x11/xephem/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2019/08/11 13:25:18 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2019/11/03 09:14:20 rillig Exp $
DISTNAME= xephem-3.7.7
PKGREVISION= 3
@@ -46,7 +46,7 @@ GCC_REQD+= 2.95.3
.endif
INSTALLATION_DIRS= bin lib/X11/app-defaults share/xephem/tools \
- ${PKGMANDIR}/man1
+ ${PKGMANDIR}/man1
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xephem ${DESTDIR}${PREFIX}/bin
Index: pkgsrc/x11/xfce4-tumbler/Makefile
diff -u pkgsrc/x11/xfce4-tumbler/Makefile:1.73 pkgsrc/x11/xfce4-tumbler/Makefile:1.74
--- pkgsrc/x11/xfce4-tumbler/Makefile:1.73 Sat Oct 19 12:46:08 2019
+++ pkgsrc/x11/xfce4-tumbler/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2019/10/19 12:46:08 nia Exp $
+# $NetBSD: Makefile,v 1.74 2019/11/03 09:14:20 rillig Exp $
PKGREVISION= 2
.include "../../meta-pkgs/xfce4/Makefile.common"
@@ -29,7 +29,7 @@ PKG_SYSCONFSUBDIR= xdg
MAKE_DIRS+= ${PKG_SYSCONFDIR}/tumbler
CONF_FILES= ${EGDIR}/tumbler.rc \
- ${PKG_SYSCONFDIR}/tumbler/tumbler.rc
+ ${PKG_SYSCONFDIR}/tumbler/tumbler.rc
.include "options.mk"
Index: pkgsrc/x11/xfce4-wmdock-plugin/Makefile
diff -u pkgsrc/x11/xfce4-wmdock-plugin/Makefile:1.14 pkgsrc/x11/xfce4-wmdock-plugin/Makefile:1.15
--- pkgsrc/x11/xfce4-wmdock-plugin/Makefile:1.14 Sun Aug 11 13:25:20 2019
+++ pkgsrc/x11/xfce4-wmdock-plugin/Makefile Sun Nov 3 09:14:20 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2019/08/11 13:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 09:14:20 rillig Exp $
#
PKGREVISION= 11
.include "../../meta-pkgs/xfce4/Makefile.common"
-DISTNAME= xfce4-wmdock-plugin-0.6.0
-CATEGORIES= x11
+DISTNAME= xfce4-wmdock-plugin-0.6.0
+CATEGORIES= x11
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-wmdock-plugin/0.6/
HOMEPAGE= https://goodies.xfce.org/projects/panel-plugins/xfce4-wmdock-plugin
Index: pkgsrc/x11/xicc/Makefile
diff -u pkgsrc/x11/xicc/Makefile:1.7 pkgsrc/x11/xicc/Makefile:1.8
--- pkgsrc/x11/xicc/Makefile:1.7 Wed Sep 6 10:40:35 2017
+++ pkgsrc/x11/xicc/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/06 10:40:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/11/03 09:14:20 rillig Exp $
#
DISTNAME= xicc-0.1
@@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Load ICC profile into X server
LICENSE= generic-nonlicense
-USE_TOOLS+= pkg-config
-USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
INSTALLATION_DIRS= bin
do-build:
Index: pkgsrc/x11/xkbd/Makefile
diff -u pkgsrc/x11/xkbd/Makefile:1.15 pkgsrc/x11/xkbd/Makefile:1.16
--- pkgsrc/x11/xkbd/Makefile:1.15 Wed Sep 6 10:40:36 2017
+++ pkgsrc/x11/xkbd/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2017/09/06 10:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/11/03 09:14:20 rillig Exp $
#
DISTNAME= xkbd-0.8.5
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
#HOMEPAGE= http://handhelds.org/~mallum/
COMMENT= On-screen keyboard for X, useful for palmtops
-CONFIGURE_ARGS+=--enable-xpm
+CONFIGURE_ARGS+= --enable-xpm
GNU_CONFIGURE= YES
Index: pkgsrc/x11/xlockmore/Makefile
diff -u pkgsrc/x11/xlockmore/Makefile:1.139 pkgsrc/x11/xlockmore/Makefile:1.140
--- pkgsrc/x11/xlockmore/Makefile:1.139 Sun Jul 21 22:26:07 2019
+++ pkgsrc/x11/xlockmore/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.139 2019/07/21 22:26:07 wiz Exp $
+# $NetBSD: Makefile,v 1.140 2019/11/03 09:14:20 rillig Exp $
PKGREVISION= 19
.include "Makefile.common"
@@ -10,16 +10,16 @@ CONFLICTS+= xlockmore-lite-[0-9]*
CONFIGURE_ARGS+= --with-opengl
CONFIGURE_ARGS+= --with-mesa
CONFIGURE_ARGS+= --without-ttf
-XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
-CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
-OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
-CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
-MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
-CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
+XPM_ENV= no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
+CONFIGURE_ENV+= ac_cv_path_xpm=${XPM_ENV:Q}
+OPENGL_ENV= no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
+CONFIGURE_ENV+= ac_cv_path_opengl=${OPENGL_ENV:Q}
+MESA_ENV= no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
+CONFIGURE_ENV+= ac_cv_path_mesa=${MESA_ENV:Q}
#BUILDLINK_TRANSFORM+= l:MesaGL:GL
#BUILDLINK_TRANSFORM+= l:MesaGLU:GLU
-XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
-CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q}
+XEXT_ENV= no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
+CONFIGURE_ENV+= ac_cv_path_ext=${XEXT_ENV:Q}
PLIST_SUBST+= LITE=""
Index: pkgsrc/x11/xlockmore/Makefile.common
diff -u pkgsrc/x11/xlockmore/Makefile.common:1.79 pkgsrc/x11/xlockmore/Makefile.common:1.80
--- pkgsrc/x11/xlockmore/Makefile.common:1.79 Sun Sep 9 20:05:19 2018
+++ pkgsrc/x11/xlockmore/Makefile.common Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.79 2018/09/09 20:05:19 maya Exp $
+# $NetBSD: Makefile.common,v 1.80 2019/11/03 09:14:20 rillig Exp $
#
# used by x11/xlockmore/Makefile
# used by x11/xlockmore-lite/Makefile
@@ -19,14 +19,14 @@ MESSAGE_SRC?= ${.CURDIR}/../xlockmore/M
.include "../../mk/bsd.prefs.mk"
-PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore
-PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms pam
+PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore
+PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms pam
.if ${OPSYS} == "NetBSD"
-PKG_SUPPORTED_OPTIONS+= oss
+PKG_SUPPORTED_OPTIONS+= oss
.endif
-PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms
-PKG_OPTIONS_LEGACY_VARS+=XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root
-PKG_OPTIONS_LEGACY_VARS+=XLOCK_NO_DPMS:-xlockmore-dpms
+PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms
+PKG_OPTIONS_LEGACY_VARS+= XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root
+PKG_OPTIONS_LEGACY_VARS+= XLOCK_NO_DPMS:-xlockmore-dpms
.include "../../mk/bsd.options.mk"
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+= --without-dpms
. if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
BUILDLINK_TRANSFORM+= l:Xdpms:Xext
. endif
-DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
+DPMS_ENV= no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
CONFIGURE_ENV+= ac_cv_path_dpms=${DPMS_ENV:Q}
.endif
Index: pkgsrc/x11/xmindpath/Makefile
diff -u pkgsrc/x11/xmindpath/Makefile:1.21 pkgsrc/x11/xmindpath/Makefile:1.22
--- pkgsrc/x11/xmindpath/Makefile:1.21 Thu Jan 19 18:52:30 2017
+++ pkgsrc/x11/xmindpath/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/01/19 18:52:30 agc Exp $
+# $NetBSD: Makefile,v 1.22 2019/11/03 09:14:20 rillig Exp $
DISTNAME= magicpoint-1.09a
PKGNAME= xmindpath-1.09a
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_FEATURES= err
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-SPECIAL_PERMS= bin/xmindpath uucp ${REAL_ROOT_GROUP} 4511
+SPECIAL_PERMS= bin/xmindpath uucp ${REAL_ROOT_GROUP} 4511
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/x11/xmx/Makefile
diff -u pkgsrc/x11/xmx/Makefile:1.20 pkgsrc/x11/xmx/Makefile:1.21
--- pkgsrc/x11/xmx/Makefile:1.20 Wed Mar 7 11:57:47 2018
+++ pkgsrc/x11/xmx/Makefile Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/03/07 11:57:47 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/11/03 09:14:20 rillig Exp $
DISTNAME= xmx-2.1alpha.pl7
PKGNAME= xmx-2.1a7
@@ -6,9 +6,9 @@ PKGREVISION= 9
CATEGORIES= x11
MASTER_SITES= ftp://ftp.cs.brown.edu/pub/xmx/
-PATCHFILES= xmx-jumbo-patch-20140912.gz
-PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xmx/
-PATCH_DIST_STRIP= -p1
+PATCHFILES= xmx-jumbo-patch-20140912.gz
+PATCH_SITES= http://www.NetBSD.org/~dholland/patchkits/xmx/
+PATCH_DIST_STRIP= -p1
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.cs.brown.edu/software/xmx/
Index: pkgsrc/x11/xorgproto/builtin.mk
diff -u pkgsrc/x11/xorgproto/builtin.mk:1.6 pkgsrc/x11/xorgproto/builtin.mk:1.7
--- pkgsrc/x11/xorgproto/builtin.mk:1.6 Mon Jan 28 12:25:35 2019
+++ pkgsrc/x11/xorgproto/builtin.mk Sun Nov 3 09:14:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2019/01/28 12:25:35 kamil Exp $
+# $NetBSD: builtin.mk,v 1.7 2019/11/03 09:14:20 rillig Exp $
BUILTIN_PKG:= xorgproto
@@ -49,7 +49,7 @@ PRE_XORGPROTO_LIST+= \
# NetBSD-8 has 7.0.31.
# NetBSD-7 has 7.0.26.
# NetBSD-6 has 7.0.22.
-BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n \
+BUILTIN_VERSION_SCRIPT.${BUILTIN_PKG}?= ${SED} -n \
-e 's/Version: 7\.0\.32/2018.4/p' \
-e 's/Version: 7\.0\.31/2018.1/p' \
-e 's/Version: 7\.0\.26/2017.1/p' \
Index: pkgsrc/x11/xosd/Makefile
diff -u pkgsrc/x11/xosd/Makefile:1.14 pkgsrc/x11/xosd/Makefile:1.15
--- pkgsrc/x11/xosd/Makefile:1.14 Sat Mar 16 08:50:47 2019
+++ pkgsrc/x11/xosd/Makefile Sun Nov 3 09:14:21 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2019/03/16 08:50:47 bsiegert Exp $
+# $NetBSD: Makefile,v 1.15 2019/11/03 09:14:21 rillig Exp $
.include "Makefile.common"
-COMMENT= Library to display shaped text on your X display
+COMMENT= Library to display shaped text on your X display
PKGREVISION= 1
CONFIGURE_ENV+= XOSD_XMMS_PLUGIN=NO
Index: pkgsrc/x11/xpmroot/Makefile
diff -u pkgsrc/x11/xpmroot/Makefile:1.66 pkgsrc/x11/xpmroot/Makefile:1.67
--- pkgsrc/x11/xpmroot/Makefile:1.66 Sun Dec 9 21:05:37 2018
+++ pkgsrc/x11/xpmroot/Makefile Sun Nov 3 09:14:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2018/12/09 21:05:37 adam Exp $
+# $NetBSD: Makefile,v 1.67 2019/11/03 09:14:21 rillig Exp $
#
DISTNAME= fvwm-${PKG_VERSION}
@@ -15,7 +15,7 @@ PKG_VERSION= 2.4.20
GNU_CONFIGURE= YES
BUILD_DIRS= libs utils
-MAKE_ENV+= VERSION=${PKG_VERSION:Q}
+MAKE_ENV+= VERSION=${PKG_VERSION:Q}
CONFIGURE_ARGS+= --without-extras --disable-dmalloc --without-gnome
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
Index: pkgsrc/x11/xscribble/Makefile
diff -u pkgsrc/x11/xscribble/Makefile:1.19 pkgsrc/x11/xscribble/Makefile:1.20
--- pkgsrc/x11/xscribble/Makefile:1.19 Wed Sep 6 10:40:36 2017
+++ pkgsrc/x11/xscribble/Makefile Sun Nov 3 09:14:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/09/06 10:40:36 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/11/03 09:14:21 rillig Exp $
DISTNAME= xscribble
PKGNAME= xscribble-20000616
@@ -13,7 +13,7 @@ COMMENT= Handwriting recognition (like g
MAKE_JOBS_SAFE= no
-USE_IMAKE= YES
+USE_IMAKE= YES
NO_INSTALL_MANPAGES= YES
.include "../../mk/bsd.prefs.mk"
Index: pkgsrc/x11/xterm/Makefile
diff -u pkgsrc/x11/xterm/Makefile:1.120 pkgsrc/x11/xterm/Makefile:1.121
--- pkgsrc/x11/xterm/Makefile:1.120 Mon Jul 22 08:37:58 2019
+++ pkgsrc/x11/xterm/Makefile Sun Nov 3 09:14:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2019/07/22 08:37:58 nia Exp $
+# $NetBSD: Makefile,v 1.121 2019/11/03 09:14:21 rillig Exp $
DISTNAME= xterm-344
CATEGORIES= x11
@@ -20,11 +20,11 @@ CONFIGURE_ARGS+= --enable-256-color
CONFIGURE_ARGS+= --enable-paste64
CONFIGURE_ARGS+= --enable-readline-mouse
-CONFIGURE_ARGS.standard=# empty
-CONFIGURE_ARGS.3d= --with-Xaw3d
-CONFIGURE_ARGS.xpm= --with-Xaw3d
-CONFIGURE_ARGS.neXtaw= --with-neXtaw
-CONFIGURE_ARGS+= ${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
+CONFIGURE_ARGS.standard= # empty
+CONFIGURE_ARGS.3d= --with-Xaw3d
+CONFIGURE_ARGS.xpm= --with-Xaw3d
+CONFIGURE_ARGS.neXtaw= --with-neXtaw
+CONFIGURE_ARGS+= ${${CONFIGURE_ARGS.${XAW_TYPE}}:L}
INSTALLATION_DIRS= share/applications
Index: pkgsrc/x11/xterm/options.mk
diff -u pkgsrc/x11/xterm/options.mk:1.14 pkgsrc/x11/xterm/options.mk:1.15
--- pkgsrc/x11/xterm/options.mk:1.14 Thu Jul 11 11:44:07 2013
+++ pkgsrc/x11/xterm/options.mk Sun Nov 3 09:14:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2013/07/11 11:44:07 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2019/11/03 09:14:21 rillig Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xterm
PKG_SUPPORTED_OPTIONS= debug pcre freetype luit xpm xterm-toolbar
@@ -32,7 +32,7 @@ CONFIGURE_ENV+= ac_cv_lib_pcreposix_pcr
.endif
.if !empty(PKG_OPTIONS:Mluit)
-DEPENDS+= luit-[0-9]*:../../x11/luit
+DEPENDS+= luit-[0-9]*:../../x11/luit
CONFIGURE_ARGS+= --enable-luit --enable-mini-luit
.else
CONFIGURE_ARGS+= --disable-luit --disable-mini-luit
Index: pkgsrc/x11/xtrans/builtin.mk
diff -u pkgsrc/x11/xtrans/builtin.mk:1.4 pkgsrc/x11/xtrans/builtin.mk:1.5
--- pkgsrc/x11/xtrans/builtin.mk:1.4 Mon Mar 10 11:05:54 2014
+++ pkgsrc/x11/xtrans/builtin.mk Sun Nov 3 09:14:21 2019
@@ -1,6 +1,6 @@
-# $NetBSD: builtin.mk,v 1.4 2014/03/10 11:05:54 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.5 2019/11/03 09:14:21 rillig Exp $
-BUILTIN_PKG:= xtrans
+BUILTIN_PKG:= xtrans
PKGCONFIG_FILE.xtrans= ${X11BASE}/lib/pkgconfig/xtrans.pc
PKGCONFIG_FILE.xtrans+= ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xtrans.pc
PKGCONFIG_FILE.xtrans+= ${X11BASE}/share/pkgconfig/xtrans.pc
Home |
Main Index |
Thread Index |
Old Index