pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/g*: fix pkglint indentation warnings
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Sat Jan 27 21:03:01 2018 +0000
Changeset: 4a195bf644290421f9191db437b40f083fdc4804
Modified Files:
g21k-binutils/Makefile
gDesklets-rssgrab/Makefile
gDesklets-starterbar/Makefile
gambatte-dev/Makefile
gambit/Makefile
ganglia-monitor-core/Makefile
ganglia-monitor-core/PLIST
ganglia-monitor-core319/Makefile
ganglia-monitor-core319/PLIST
ganglia-web/Makefile
ganglia-web/PLIST
gat/Makefile
gauche-pib/Makefile
gcc42/Makefile
gcc42/buildlink3.mk
gcc43/Makefile
gcc43/buildlink3.mk
gcc44/Makefile
gcc45/Makefile
gcc46-libs/Makefile
gcc46/Makefile
gcc46/options.mk
gcc47-libs/Makefile
gcc47/Makefile
gcc47/options.mk
gcc6snapshot/options.mk
gcc6snapshot/version.mk
gcc7snapshot/options.mk
gcc7snapshot/version.mk
gcc8snapshot/options.mk
gcc8snapshot/version.mk
gdal-docs/Makefile
gdal-grass/Makefile
gdb-git/Makefile
gdb-git/PLIST
gdb5/Makefile
gdb6/Makefile
gecko-sharp/Makefile
gecode/Makefile
geoloc/PLIST
gerris-snapshot/PLIST
getdp/Makefile
gfeedline/Makefile
gfsview-snapshot/PLIST
ggz-gtk-client/Makefile
ggz-gtk-games/Makefile
ggz-gtk-games/PLIST
ggz-server/Makefile
ggz-server/PLIST
ghc/Makefile
ghc/bootstrap.mk
ghmm/buildlink3.mk
ghostpcl-urwfonts-ttf/Makefile
ghostscript-cidfonts-ryumin/Makefile
ghostscript-cidfonts-ryumin/options.mk
gimmie/Makefile
git-modes-git/Makefile
git-modes-git/buildlink3.mk
gitlab/Makefile
gitlab/options.mk
gjots2/Makefile
gksu/Makefile
gl2ps/Makefile
gle/Makefile
gle/buildlink3.mk
glib-java/buildlink3.mk
glibc/Makefile
glkloader/Makefile
glkloader/buildlink3.mk
glkterm/buildlink3.mk
gmetadom/Makefile
gmetadom/Makefile.common
gmetadom/buildlink3.mk
gmrender-resurrect-git/Makefile
gnome-activity-journal/Makefile
gnome-applets/Makefile
gnome-keyring-sharp/options.mk
gnome-panel/Makefile
gnome-panel/buildlink3.mk
gnome-settings-daemon/Makefile
gnome-tracker/Makefile
gnormalize/Makefile
gnubg-cvs/Makefile
gnucash-devel/PLIST
gnucash-devel/options.mk
gnucash-git/PLIST
gnucash-git/options.mk
gnujump/Makefile
gnump3d/Makefile
gnunet/options.mk
gnuradio-core/Makefile.common
gnuradio-core/Makefile.version
gnuradio-core/options.mk
gnuradio-default/Makefile
gnuradio-default/buildlink3.mk
gnuradio-digital/buildlink3.mk
gnuradio-trellis/buildlink3.mk
gnuradio-vocoder/buildlink3.mk
gnuradio-wavelet/buildlink3.mk
gnuradio/Makefile
go-backoff/Makefile
go-collectd/buildlink3.mk
go-flags/buildlink3.mk
go-fsnotify/Makefile
go-humanize/buildlink3.mk
go-notify/buildlink3.mk
go-rateio/buildlink3.mk
go-upspin/Makefile
go/Makefile
go/version.mk
goattracker/Makefile
golly/Makefile
golly/PLIST
gr-osmosdr-git/Makefile
grass/options.mk
grc/Makefile
gretl/Makefile
gretl/PLIST
grisbi/Makefile
grsync/Makefile
grsync/PLIST
gsegrafix/Makefile
gsettings-desktop-schemas/buildlink3.mk
gsm/Makefile
gsm/buildlink3.mk
gstreamer-plugins/Makefile
gsview/Makefile
gtextutils/Makefile
gtg/Makefile
gtimelog/Makefile
gtk-server/options.mk
gtk2-murrina-fancy-clearlooks/PLIST
gtk2hs-buildtools/buildlink3.mk
gtkglk/buildlink3.mk
gtkhotkey/Makefile
gtkhotkey/buildlink3.mk
gtkmathview/Makefile
gtksourcecompletion/Makefile
gts-snapshot/Makefile
gucharmap/Makefile
gucharmap/buildlink3.mk
guichan/Makefile
guitone/Makefile
gupnp-ui/Makefile
gupnp-ui/buildlink3.mk
gvariant/Makefile
gvariant/buildlink3.mk
gwget/options.mk
gwhois/Makefile
gwyddion/Makefile
gxconsole/Makefile
Log Message:
wip/g*: fix pkglint indentation warnings
pkglint -Wall -F -o aligned g*/
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4a195bf644290421f9191db437b40f083fdc4804
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
g21k-binutils/Makefile | 6 +-
gDesklets-rssgrab/Makefile | 4 +-
gDesklets-starterbar/Makefile | 2 +-
gambatte-dev/Makefile | 2 +-
gambit/Makefile | 10 +-
ganglia-monitor-core/Makefile | 2 +-
ganglia-monitor-core/PLIST | 4 +-
ganglia-monitor-core319/Makefile | 2 +-
ganglia-monitor-core319/PLIST | 2 +-
ganglia-web/Makefile | 13 +-
ganglia-web/PLIST | 190 ++++----
gat/Makefile | 20 +-
gauche-pib/Makefile | 2 +-
gcc42/Makefile | 40 +-
gcc42/buildlink3.mk | 8 +-
gcc43/Makefile | 8 +-
gcc43/buildlink3.mk | 8 +-
gcc44/Makefile | 22 +-
gcc45/Makefile | 22 +-
gcc46-libs/Makefile | 12 +-
gcc46/Makefile | 26 +-
gcc46/options.mk | 4 +-
gcc47-libs/Makefile | 8 +-
gcc47/Makefile | 4 +-
gcc47/options.mk | 4 +-
gcc6snapshot/options.mk | 10 +-
gcc6snapshot/version.mk | 2 +-
gcc7snapshot/options.mk | 10 +-
gcc7snapshot/version.mk | 2 +-
gcc8snapshot/options.mk | 10 +-
gcc8snapshot/version.mk | 2 +-
gdal-docs/Makefile | 10 +-
gdal-grass/Makefile | 2 +-
gdb-git/Makefile | 22 +-
gdb-git/PLIST | 2 +-
gdb5/Makefile | 16 +-
gdb6/Makefile | 16 +-
gecko-sharp/Makefile | 2 +-
gecode/Makefile | 2 +-
geoloc/PLIST | 4 +-
gerris-snapshot/PLIST | 4 +-
getdp/Makefile | 12 +-
gfeedline/Makefile | 10 +-
gfsview-snapshot/PLIST | 2 +-
ggz-gtk-client/Makefile | 2 +-
ggz-gtk-games/Makefile | 2 +-
ggz-gtk-games/PLIST | 58 +--
ggz-server/Makefile | 2 +-
ggz-server/PLIST | 120 ++---
ghc/Makefile | 10 +-
ghc/bootstrap.mk | 8 +-
ghmm/buildlink3.mk | 2 +-
ghostpcl-urwfonts-ttf/Makefile | 2 +-
ghostscript-cidfonts-ryumin/Makefile | 2 +-
ghostscript-cidfonts-ryumin/options.mk | 26 +-
gimmie/Makefile | 10 +-
git-modes-git/Makefile | 6 +-
git-modes-git/buildlink3.mk | 6 +-
gitlab/Makefile | 6 +-
gitlab/options.mk | 12 +-
gjots2/Makefile | 2 +-
gksu/Makefile | 12 +-
gl2ps/Makefile | 2 +-
gle/Makefile | 8 +-
gle/buildlink3.mk | 2 +-
glib-java/buildlink3.mk | 2 +-
glibc/Makefile | 8 +-
glkloader/Makefile | 4 +-
glkloader/buildlink3.mk | 2 +-
glkterm/buildlink3.mk | 4 +-
gmetadom/Makefile | 2 +-
gmetadom/Makefile.common | 4 +-
gmetadom/buildlink3.mk | 2 +-
gmrender-resurrect-git/Makefile | 2 +-
gnome-activity-journal/Makefile | 2 +-
gnome-applets/Makefile | 6 +-
gnome-keyring-sharp/options.mk | 2 +-
gnome-panel/Makefile | 16 +-
gnome-panel/buildlink3.mk | 4 +-
gnome-settings-daemon/Makefile | 18 +-
gnome-tracker/Makefile | 24 +-
gnormalize/Makefile | 2 +-
gnubg-cvs/Makefile | 2 +-
gnucash-devel/PLIST | 2 +-
gnucash-devel/options.mk | 10 +-
gnucash-git/PLIST | 2 +-
gnucash-git/options.mk | 10 +-
gnujump/Makefile | 2 +-
gnump3d/Makefile | 4 +-
gnunet/options.mk | 6 +-
gnuradio-core/Makefile.common | 6 +-
gnuradio-core/Makefile.version | 2 +-
gnuradio-core/options.mk | 6 +-
gnuradio-default/Makefile | 6 +-
gnuradio-default/buildlink3.mk | 2 +-
gnuradio-digital/buildlink3.mk | 2 +-
gnuradio-trellis/buildlink3.mk | 2 +-
gnuradio-vocoder/buildlink3.mk | 2 +-
gnuradio-wavelet/buildlink3.mk | 2 +-
gnuradio/Makefile | 2 +-
go-backoff/Makefile | 6 +-
go-collectd/buildlink3.mk | 2 +-
go-flags/buildlink3.mk | 2 +-
go-fsnotify/Makefile | 8 +-
go-humanize/buildlink3.mk | 2 +-
go-notify/buildlink3.mk | 2 +-
go-rateio/buildlink3.mk | 2 +-
go-upspin/Makefile | 18 +-
go/Makefile | 4 +-
go/version.mk | 16 +-
goattracker/Makefile | 2 +-
golly/Makefile | 4 +-
golly/PLIST | 808 ++++++++++++++++----------------
gr-osmosdr-git/Makefile | 4 +-
grass/options.mk | 4 +-
grc/Makefile | 2 +-
gretl/Makefile | 8 +-
gretl/PLIST | 2 +-
grisbi/Makefile | 6 +-
grsync/Makefile | 6 +-
grsync/PLIST | 2 +-
gsegrafix/Makefile | 2 +-
gsettings-desktop-schemas/buildlink3.mk | 2 +-
gsm/Makefile | 6 +-
gsm/buildlink3.mk | 2 +-
gstreamer-plugins/Makefile | 64 +--
gsview/Makefile | 12 +-
gtextutils/Makefile | 2 +-
gtg/Makefile | 6 +-
gtimelog/Makefile | 4 +-
gtk-server/options.mk | 6 +-
gtk2-murrina-fancy-clearlooks/PLIST | 50 +-
gtk2hs-buildtools/buildlink3.mk | 2 +-
gtkglk/buildlink3.mk | 4 +-
gtkhotkey/Makefile | 10 +-
gtkhotkey/buildlink3.mk | 2 +-
gtkmathview/Makefile | 2 +-
gtksourcecompletion/Makefile | 8 +-
gts-snapshot/Makefile | 2 +-
gucharmap/Makefile | 4 +-
gucharmap/buildlink3.mk | 2 +-
guichan/Makefile | 4 +-
guitone/Makefile | 2 +-
gupnp-ui/Makefile | 2 +-
gupnp-ui/buildlink3.mk | 2 +-
gvariant/Makefile | 2 +-
gvariant/buildlink3.mk | 2 +-
gwget/options.mk | 8 +-
gwhois/Makefile | 4 +-
gwyddion/Makefile | 6 +-
gxconsole/Makefile | 2 +-
151 files changed, 1089 insertions(+), 1086 deletions(-)
diffs:
diff --git a/g21k-binutils/Makefile b/g21k-binutils/Makefile
index 4ede6e5105..35bcb79864 100644
--- a/g21k-binutils/Makefile
+++ b/g21k-binutils/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= http://www.kvaleberg.org/g21.html
COMMENT= Assemblre and linker tools for Analog Devices 21k series DSPs
-USE_TOOLS+= gmake
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-adidsp=${PREFIX:Q}
+USE_TOOLS+= gmake
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS+= --with-adidsp=${PREFIX:Q}
.include "../../mk/bsd.pkg.mk"
diff --git a/gDesklets-rssgrab/Makefile b/gDesklets-rssgrab/Makefile
index c5007bb9aa..d36a052301 100644
--- a/gDesklets-rssgrab/Makefile
+++ b/gDesklets-rssgrab/Makefile
@@ -14,8 +14,8 @@ DEPENDS+= gDesklets-[0-9]*:../../wip/gDesklets
NO_CONFIGURE= yes
NO_BUILD= yes
-NAME=rssgrab
-GDESKLETSDIR= ${LOCALBASE}/share/gdesklets
+NAME= rssgrab
+GDESKLETSDIR= ${LOCALBASE}/share/gdesklets
REPLACE_PYTHON= ${NAME}/feedparser.py
diff --git a/gDesklets-starterbar/Makefile b/gDesklets-starterbar/Makefile
index 14e0ac57bf..9810df98f8 100644
--- a/gDesklets-starterbar/Makefile
+++ b/gDesklets-starterbar/Makefile
@@ -15,7 +15,7 @@ NO_CONFIGURE= yes
NO_BUILD= yes
USE_TOOLS+= pax
-NAME=StarterBar
+NAME= StarterBar
GDESKLETSDIR= ${LOCALBASE}/share/gdesklets
post-extract:
diff --git a/gambatte-dev/Makefile b/gambatte-dev/Makefile
index 355c59861b..41c4a00cec 100644
--- a/gambatte-dev/Makefile
+++ b/gambatte-dev/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
PKG_DESTDIR_SUPPORT= user-destdir
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
INSTALLATION_DIRS= bin share/doc/gambatte
SUBST_CLASSES+= sdl
diff --git a/gambit/Makefile b/gambit/Makefile
index 7de8e4309e..af2c2bb808 100644
--- a/gambit/Makefile
+++ b/gambit/Makefile
@@ -9,12 +9,12 @@ HOMEPAGE= http://www.gambit-project.org/gambit13/index.html#
COMMENT= Software Tools for Game Theory
LICENSE= gnu-gpl-v2
-CHECK_PORTABILITY_SKIP= configure
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
+CHECK_PORTABILITY_SKIP= configure
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
-INSTALLATION_DIRS= share/applications
+INSTALLATION_DIRS= share/applications
post-install:
${INSTALL_DATA} ${WRKSRC}/gambit.desktop \
diff --git a/ganglia-monitor-core/Makefile b/ganglia-monitor-core/Makefile
index 9b86712ac7..3d35c92dc1 100644
--- a/ganglia-monitor-core/Makefile
+++ b/ganglia-monitor-core/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-SUBST_CLASSES+= pkg_sysconfdir
+SUBST_CLASSES+= pkg_sysconfdir
SUBST_STAGE.pkg_sysconfdir= pre-configure
SUBST_MESSAGE.pkg_sysconfdir= Fixing PKG_SYSCONFDIR
SUBST_FILES.pkg_sysconfdir= ganglia.html \
diff --git a/ganglia-monitor-core/PLIST b/ganglia-monitor-core/PLIST
index 1eba08552b..91e3e43d2e 100644
--- a/ganglia-monitor-core/PLIST
+++ b/ganglia-monitor-core/PLIST
@@ -3,8 +3,8 @@ bin/ganglia-config
bin/gmetric
bin/gstat
etc/gmond.conf.d/modpython.conf
-include/ganglia_gexec.h
include/ganglia.h
+include/ganglia_gexec.h
include/gm_file.h
include/gm_metric.h
include/gm_mmn.h
@@ -31,7 +31,7 @@ sbin/gmetad
sbin/gmetasnap
sbin/gmond
share/examples/ganglia-monitor-core/gmetad.conf
-share/examples/ganglia-monitor-core/gmond.conf
share/examples/ganglia-monitor-core/gmetad.init.linux
+share/examples/ganglia-monitor-core/gmond.conf
share/examples/ganglia-monitor-core/gmond.init.linux
@pkgdir lib/ganglia/python_modules
diff --git a/ganglia-monitor-core319/Makefile b/ganglia-monitor-core319/Makefile
index b4a43582a3..6d6819b44a 100644
--- a/ganglia-monitor-core319/Makefile
+++ b/ganglia-monitor-core319/Makefile
@@ -34,7 +34,7 @@ PLIST.python= yes
CONFIGURE_ARGS+= --disable-python
.endif
-SUBST_CLASSES+= pkg_sysconfdir
+SUBST_CLASSES+= pkg_sysconfdir
SUBST_STAGE.pkg_sysconfdir= pre-configure
SUBST_MESSAGE.pkg_sysconfdir= Fixing PKG_SYSCONFDIR
SUBST_FILES.pkg_sysconfdir= ganglia.html \
diff --git a/ganglia-monitor-core319/PLIST b/ganglia-monitor-core319/PLIST
index 19f793846d..1aca17928a 100644
--- a/ganglia-monitor-core319/PLIST
+++ b/ganglia-monitor-core319/PLIST
@@ -3,8 +3,8 @@ bin/ganglia-config
bin/gmetric
bin/gstat
etc/gmetad.conf
-include/ganglia_gexec.h
include/ganglia.h
+include/ganglia_gexec.h
include/gm_metric.h
include/gm_mmn.h
include/gm_msg.h
diff --git a/ganglia-web/Makefile b/ganglia-web/Makefile
index 9b0bafcf8c..b927c915e7 100644
--- a/ganglia-web/Makefile
+++ b/ganglia-web/Makefile
@@ -40,17 +40,16 @@ USE_LANGUAGES= c c++
SUBST_CLASSES+= makefile
SUBST_STAGE.makefile= post-patch
SUBST_FILES.makefile= ${WRKSRC}/Makefile
-SUBST_SED.makefile= \
- -e 's|/usr/share/ganglia-webfrontend|${PREFIX}/${WEBDIR}|g' \
- -e 's|/etc|${PREFIX}/etc|g' \
- -e 's|www-data|${APACHE_USER}|g' \
- -e 's|/var/lib/ganglia|${PREFIX}/var/lib/ganglia|g'
+SUBST_SED.makefile= \
+ -e 's|/usr/share/ganglia-webfrontend|${PREFIX}/${WEBDIR}|g' \
+ -e 's|/etc|${PREFIX}/etc|g' \
+ -e 's|www-data|${APACHE_USER}|g' \
+ -e 's|/var/lib/ganglia|${PREFIX}/var/lib/ganglia|g'
SUBST_CLASSES+= conf_php
SUBST_STAGE.conf_php= post-patch
SUBST_FILES.conf_php= ${WRKSRC}/conf_default.php
-SUBST_SED.conf_php= \
- -e 's|/usr/bin/rrdtool|${PREFIX}/bin/rrdtool|g'
+SUBST_SED.conf_php= -e 's|/usr/bin/rrdtool|${PREFIX}/bin/rrdtool|g'
# -e 's|/var/lib/ganglia|/var/db/ganglia|g'
diff --git a/ganglia-web/PLIST b/ganglia-web/PLIST
index 1167db04a1..28b47835e7 100644
--- a/ganglia-web/PLIST
+++ b/ganglia-web/PLIST
@@ -1,23 +1,31 @@
@comment $NetBSD: PLIST,v 1.2 2015/04/03 17:39:25 outpaddling Exp $
@comment $NetBSD: PLIST,v 1.2 2015/04/03 17:39:25 outpaddling Exp $
+share/httpd/htdocs/ganglia/AUTHORS
+share/httpd/htdocs/ganglia/COPYING
+share/httpd/htdocs/ganglia/README
+share/httpd/htdocs/ganglia/TODO
share/httpd/htdocs/ganglia/actions.php
share/httpd/htdocs/ganglia/aggregate_graphs.php
+share/httpd/htdocs/ganglia/api/.htaccess
share/httpd/htdocs/ganglia/api/events.php
share/httpd/htdocs/ganglia/api/host.php
-share/httpd/htdocs/ganglia/api/.htaccess
-share/httpd/htdocs/ganglia/api/metrics_autocomplete.php
share/httpd/htdocs/ganglia/api/metrics.php
+share/httpd/htdocs/ganglia/api/metrics_autocomplete.php
share/httpd/htdocs/ganglia/api/rundeck.php
share/httpd/htdocs/ganglia/api/search.php
share/httpd/htdocs/ganglia/api/views.php
-share/httpd/htdocs/ganglia/AUTHORS
share/httpd/htdocs/ganglia/autorotation.php
share/httpd/htdocs/ganglia/calendar.php
share/httpd/htdocs/ganglia/cluster_legend.html
share/httpd/htdocs/ganglia/cluster_view.php
share/httpd/htdocs/ganglia/compare_hosts.php
share/httpd/htdocs/ganglia/conf_default.php
+share/httpd/htdocs/ganglia/contrib/README.txt
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/AUTHORS.txt
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/Gruntfile.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/MANIFEST
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/MIT-LICENSE.txt
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/README.md
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/accordion/collapsible.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/accordion/custom-icons.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/accordion/default.html
@@ -43,11 +51,11 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/images/ui
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/london.xml
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/maxheight.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/multiple.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/multiple-remote.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/remote.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/multiple.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/remote-jsonp.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/remote-with-cache.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/remote.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/search.php
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/autocomplete/xml.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/button/checkbox.html
@@ -83,8 +91,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/default.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/modal-confirmation.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/modal-form.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/modal.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/modal-message.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/dialog/modal.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/draggable/constrain-movement.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/draggable/cursor-style.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/draggable/default.html
@@ -99,13 +107,13 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/draggable/sortable.htm
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/draggable/visual-feedback.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/accepted-elements.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/default.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras2.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras2_min.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras3.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras3_min.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras4.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras4_min.jpg
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/images/high_tatras_min.jpg
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/droppable/photo-manager.html
@@ -119,8 +127,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/effect/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/hide/default.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/hide/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/calendar.gif
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/demo-config-on.gif
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/demo-config-on-tile.gif
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/demo-config-on.gif
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/demo-spindown-closed.gif
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/demo-spindown-open.gif
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/images/icon-docs-info.gif
@@ -165,15 +173,15 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/default.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/hotelrooms.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/multiple-vertical.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/range-vertical.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/range.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/rangemax.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/rangemin.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/range-vertical.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/side-scroll.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/slider-vertical.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/slider/steps.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/sortable/connect-lists.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/sortable/connect-lists-through-tabs.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/sortable/connect-lists.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/sortable/default.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/sortable/delay-start.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/sortable/display-grid.html
@@ -191,11 +199,11 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/spinner/overflow.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/spinner/time.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/switchClass/default.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/switchClass/index.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/ajax.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/ajax/content1.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/ajax/content2.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/ajax/content3-slow.php
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/ajax/content4-broken.php
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/ajax.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/bottom.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/collapsible.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/default.html
@@ -204,10 +212,10 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/manipulation.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/mouseover.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/sortable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tabs/vertical.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/toggleClass/default.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/toggleClass/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/toggle/default.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/toggle/index.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/toggleClass/default.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/toggleClass/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tooltip/ajax/content1.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tooltip/ajax/content2.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/demos/tooltip/custom-animation.html
@@ -228,12 +236,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/external/globalize.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/external/jquery.mousewheel.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/external/qunit.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/external/qunit.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/Gruntfile.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/jquery-1.9.1.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/MANIFEST
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/MIT-LICENSE.txt
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/package.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/README.md
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/index.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/index.js
@@ -253,129 +257,129 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/jquery-1.9.0.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/jquery-1.9.1.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/jquery.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/jquery.simulate.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/accordion_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/accordion/all.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/all.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/autocomplete_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/remote_object_array_labels.txt
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/remote_object_array_values.txt
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/autocomplete/remote_string_array.txt
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/button/button_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/datepicker_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/datepicker/images/calendar.gif
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_deprecated.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_deprecated.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/dialog/dialog_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/draggable/draggable_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/droppable/droppable_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/effects/all.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/effects/effects_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/effects/effects.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/effects/effects_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/effects/effects_scale.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/images/jqueryui_32x32.png
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/menu/menu_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/position/all.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/position/position_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/position/position.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/position/position_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/progressbar/progressbar_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/qunit-composite.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/qunit-composite.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/all.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/images/test.jpg
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/resizable/resizable_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/selectable/selectable_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/slider/slider_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/sortable/sortable_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/spinner/spinner_test_helpers.js
@@ -383,26 +387,26 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/subsuite.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/swarminject.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/all.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/data/test.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tabs/tabs_test_helpers.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/testsuite.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip_common.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip_events.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip_methods.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/tooltip/tooltip_options.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/widget/all.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/widget/widget.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/widget/widget_animation.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/widget/widget_core.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/widget/widget_extend.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/unit/widget/widget.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/accordion/icons.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/addClass/queue.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/button/button.html
@@ -410,8 +414,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/button/performa
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/accordion_tabs.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/datepicker_dialog.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/dialog_widgets.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/draggable_accordion.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/draggable_accordion_accordion_tabs_draggable.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/sortable_accordion_sortable_tabs.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/tabs_tabs.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/compound/tabs_tooltips.html
@@ -425,8 +429,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/effects/effects
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/effects/scale.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/index.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/menu/menu.html
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/position/position_feedback.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/position/position.html
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/position/position_feedback.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/theme.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/tooltip/animations.html
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/tests/visual/tooltip/tooltip.html
@@ -445,13 +449,13 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/images/ui-icons_
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/images/ui-icons_454545_256x240.png
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/images/ui-icons_888888_256x240.png
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/images/ui-icons_cd0a0a_256x240.png
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery-ui.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.accordion.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.all.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.autocomplete.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.base.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.button.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.core.css
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery-ui.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.datepicker.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.dialog.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/jquery.ui.menu.css
@@ -477,6 +481,7 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/images/
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/images/ui-icons_454545_256x240.png
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/images/ui-icons_888888_256x240.png
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/images/ui-icons_cd0a0a_256x240.png
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery-ui.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.accordion.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.autocomplete.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.button.min.css
@@ -484,7 +489,6 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.datepicker.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.dialog.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.menu.min.css
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery-ui.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.progressbar.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.resizable.min.css
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/themes/base/minified/jquery.ui.selectable.min.css
@@ -509,12 +513,26 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-explode.jquery.jso
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-fade.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-fold.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-highlight.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-pulsate.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-scale.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-shake.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-slide.jquery.json
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect-transfer.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.effect.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.menu.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.mouse.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.position.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.progressbar.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.resizable.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.selectable.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.slider.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.sortable.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.spinner.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.tabs.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.tooltip.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.widget.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/.jshintrc
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery-ui-i18n.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-af.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-ar-DZ.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-ar.js
@@ -576,8 +594,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sk.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sl.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sq.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sr.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sr-SR.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sr.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-sv.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-ta.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-th.js
@@ -588,7 +606,7 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-zh-CN.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-zh-HK.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery.ui.datepicker-zh-TW.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/i18n/jquery-ui-i18n.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery-ui.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.accordion.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.autocomplete.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.button.js
@@ -605,13 +623,12 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-explode.
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-fade.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-fold.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-highlight.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-pulsate.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-scale.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-shake.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-slide.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect-transfer.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery-ui.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.effect.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.menu.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.mouse.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.position.js
@@ -624,8 +641,7 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.spinner.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.tabs.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.tooltip.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/jquery.ui.widget.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/.jshintrc
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.menu.jquery.json
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery-ui-i18n.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-af.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-ar-DZ.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-ar.min.js
@@ -687,8 +703,8 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.d
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sk.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sl.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sq.min.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sr.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sr-SR.min.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sr.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-sv.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-ta.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-th.min.js
@@ -699,7 +715,7 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.d
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-zh-CN.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-zh-HK.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery.ui.datepicker-zh-TW.min.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/i18n/jquery-ui-i18n.min.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery-ui.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.accordion.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.autocomplete.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.button.min.js
@@ -716,14 +732,13 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-fade.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-fold.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-highlight.min.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-pulsate.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-scale.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-shake.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-slide.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect-transfer.min.js
+share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.effect.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.menu.min.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery-ui.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.mouse.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.position.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.progressbar.min.js
@@ -735,34 +750,21 @@ share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.spinne
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.tabs.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.tooltip.min.js
share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui/minified/jquery.ui.widget.min.js
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.mouse.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.position.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.progressbar.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.resizable.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.selectable.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.slider.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.sortable.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.spinner.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.tabs.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.tooltip.jquery.json
-share/httpd/htdocs/ganglia/contrib/jquery-ui-1.10.2/ui.widget.jquery.json
-share/httpd/htdocs/ganglia/contrib/README.txt
-share/httpd/htdocs/ganglia/COPYING
+share/httpd/htdocs/ganglia/css/chosen-sprite.png
+share/httpd/htdocs/ganglia/css/chosen-sprite%2x.png@localhost
share/httpd/htdocs/ganglia/css/chosen.css
share/httpd/htdocs/ganglia/css/chosen.min.css
-share/httpd/htdocs/ganglia/css/chosen-sprite%2x.png@localhost
-share/httpd/htdocs/ganglia/css/chosen-sprite.png
share/httpd/htdocs/ganglia/css/fullcalendar.css
share/httpd/htdocs/ganglia/css/images/ajax-loader.png
share/httpd/htdocs/ganglia/css/images/form-check-off.png
share/httpd/htdocs/ganglia/css/images/form-check-on.png
share/httpd/htdocs/ganglia/css/images/form-radio-off.png
share/httpd/htdocs/ganglia/css/images/form-radio-on.png
+share/httpd/htdocs/ganglia/css/images/icon-search-black.png
share/httpd/htdocs/ganglia/css/images/icons-18-black.png
share/httpd/htdocs/ganglia/css/images/icons-18-white.png
share/httpd/htdocs/ganglia/css/images/icons-36-black.png
share/httpd/htdocs/ganglia/css/images/icons-36-white.png
-share/httpd/htdocs/ganglia/css/images/icon-search-black.png
share/httpd/htdocs/ganglia/css/jquery.flot.events.css
share/httpd/htdocs/ganglia/css/jquery.liveSearch.css
share/httpd/htdocs/ganglia/css/jquery.mobile-1.0.min.css
@@ -787,33 +789,33 @@ share/httpd/htdocs/ganglia/css/smoothness/jquery-ui-1.10.2.custom.min.css
share/httpd/htdocs/ganglia/css/tasseo.css
share/httpd/htdocs/ganglia/decompose_graph.php
share/httpd/htdocs/ganglia/docs/ad-hoc-views.mdown
-share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/t.php
-share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/url.php
+share/httpd/htdocs/ganglia/dwoo/Dwoo.compiled.php
+share/httpd/htdocs/ganglia/dwoo/Dwoo.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/Agavi/DwooRenderer.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/Agavi/README
-share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CakePHP/dwoo.php
+share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/t.php
+share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/Agavi/dwoo_plugins/url.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CakePHP/README
+share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CakePHP/dwoo.php
+share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/README
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/config/dwootemplate.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/controllers/dwoowelcome.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/libraries/Dwootemplate.php
-share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/README
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/views/dwoowelcome.tpl
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/CodeIgniter/views/page.tpl
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/ZendFramework/Dwoo.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/ZendFramework/PluginProxy.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/ZendFramework/README
share/httpd/htdocs/ganglia/dwoo/Dwoo/Adapters/ZendFramework/View.php
-share/httpd/htdocs/ganglia/dwoo/dwooAutoload.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Block/Plugin.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Compilation/Exception.php
-share/httpd/htdocs/ganglia/dwoo/Dwoo.compiled.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Compiler.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Core.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Data.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Exception.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Filter.php
-share/httpd/htdocs/ganglia/dwoo/Dwoo/ICompilable/Block.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/ICompilable.php
+share/httpd/htdocs/ganglia/dwoo/Dwoo/ICompilable/Block.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/ICompiler.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/IDataProvider.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/IElseable.php
@@ -821,7 +823,6 @@ share/httpd/htdocs/ganglia/dwoo/Dwoo/ILoader.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/IPluginProxy.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/ITemplate.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Loader.php
-share/httpd/htdocs/ganglia/dwoo/Dwoo.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Plugin.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Processor.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Security/Exception.php
@@ -829,17 +830,18 @@ share/httpd/htdocs/ganglia/dwoo/Dwoo/Security/Policy.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Smarty/Adapter.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Template/File.php
share/httpd/htdocs/ganglia/dwoo/Dwoo/Template/String.php
+share/httpd/htdocs/ganglia/dwoo/dwooAutoload.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/a.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/auto_escape.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/block.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/capture.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/dynamic.php
-share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/elseif.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/else.php
-share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/foreachelse.php
+share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/elseif.php
+share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/for.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/foreach.php
+share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/foreachelse.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/forelse.php
-share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/for.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/if.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/loop.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/section.php
@@ -848,17 +850,17 @@ share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/strip.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/template.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/textformat.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/topLevelBlock.php
-share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/withelse.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/with.php
+share/httpd/htdocs/ganglia/dwoo/plugins/builtin/blocks/withelse.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/filters/html_format.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/assign.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/capitalize.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/cat.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/count_characters.php
-share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/counter.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/count_paragraphs.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/count_sentences.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/count_words.php
+share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/counter.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/cycle.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/date_format.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/default.php
@@ -866,8 +868,8 @@ share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/dump.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/eol.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/escape.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/eval.php
-share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/extendsCheck.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/extends.php
+share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/extendsCheck.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/fetch.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/include.php
share/httpd/htdocs/ganglia/dwoo/plugins/builtin/functions/indent.php
@@ -903,7 +905,6 @@ share/httpd/htdocs/ganglia/get_context.php
share/httpd/htdocs/ganglia/get_ganglia.php
share/httpd/htdocs/ganglia/get_overlay_events.php
share/httpd/htdocs/ganglia/global.php
-share/httpd/htdocs/ganglia/graph_all_periods.php
share/httpd/htdocs/ganglia/graph.d/apache_report.json
share/httpd/htdocs/ganglia/graph.d/apache_response_report.json
share/httpd/htdocs/ganglia/graph.d/cpu_report.json
@@ -919,6 +920,7 @@ share/httpd/htdocs/ganglia/graph.d/packet_report.json
share/httpd/htdocs/ganglia/graph.d/sample_report.php
share/httpd/htdocs/ganglia/graph.d/varnish_report.php
share/httpd/htdocs/ganglia/graph.php
+share/httpd/htdocs/ganglia/graph_all_periods.php
share/httpd/htdocs/ganglia/grid_tree.php
share/httpd/htdocs/ganglia/header.php
share/httpd/htdocs/ganglia/host_overview.php
@@ -926,9 +928,9 @@ share/httpd/htdocs/ganglia/host_view.php
share/httpd/htdocs/ganglia/img/access-denied.jpg
share/httpd/htdocs/ganglia/img/calendar.gif
share/httpd/htdocs/ganglia/img/red-pointer.png
+share/httpd/htdocs/ganglia/img/spin-night.gif
share/httpd/htdocs/ganglia/img/spin.gif
share/httpd/htdocs/ganglia/img/spinner.gif
-share/httpd/htdocs/ganglia/img/spin-night.gif
share/httpd/htdocs/ganglia/img/toggle-night.png
share/httpd/htdocs/ganglia/img/toggle-number.png
share/httpd/htdocs/ganglia/index.php
@@ -947,6 +949,8 @@ share/httpd/htdocs/ganglia/js/jquery-1.7.1.js
share/httpd/htdocs/ganglia/js/jquery-1.7.1.min.js
share/httpd/htdocs/ganglia/js/jquery-1.9.1.js
share/httpd/htdocs/ganglia/js/jquery-1.9.1.min.js
+share/httpd/htdocs/ganglia/js/jquery-ui-timepicker-addon.js
+share/httpd/htdocs/ganglia/js/jquery-ui.min.js
share/httpd/htdocs/ganglia/js/jquery.ba-bbq.js
share/httpd/htdocs/ganglia/js/jquery.ba-bbq.min.js
share/httpd/htdocs/ganglia/js/jquery.buttonsetv.js
@@ -973,8 +977,6 @@ share/httpd/htdocs/ganglia/js/jquery.multiselect.js
share/httpd/htdocs/ganglia/js/jquery.qtip.min.js
share/httpd/htdocs/ganglia/js/jquery.scrollTo-1.4.2.js
share/httpd/htdocs/ganglia/js/jquery.scrollTo-1.4.3.1-min.js
-share/httpd/htdocs/ganglia/js/jquery-ui.min.js
-share/httpd/htdocs/ganglia/js/jquery-ui-timepicker-addon.js
share/httpd/htdocs/ganglia/js/jstree/jstree.js
share/httpd/htdocs/ganglia/js/jstree/jstree.min.js
share/httpd/htdocs/ganglia/js/jstree/libs/jquery.js
@@ -991,30 +993,30 @@ share/httpd/htdocs/ganglia/js/rickshaw.min.js
share/httpd/htdocs/ganglia/js/tasseo.js
share/httpd/htdocs/ganglia/lib/Cache/Driver_Json.php
share/httpd/htdocs/ganglia/lib/Cache/Driver_Memcache.php
-share/httpd/htdocs/ganglia/lib/cache.php
-share/httpd/htdocs/ganglia/lib/common_api.php
share/httpd/htdocs/ganglia/lib/Events/Driver_Json.php
share/httpd/htdocs/ganglia/lib/Events/Driver_Mdb2.php
share/httpd/htdocs/ganglia/lib/GangliaAcl.php
share/httpd/htdocs/ganglia/lib/GangliaAuth.php
-share/httpd/htdocs/ganglia/lib/json.php
share/httpd/htdocs/ganglia/lib/Services/JSON.php
+share/httpd/htdocs/ganglia/lib/Zend/Acl.php
share/httpd/htdocs/ganglia/lib/Zend/Acl/Assert/Interface.php
share/httpd/htdocs/ganglia/lib/Zend/Acl/Exception.php
-share/httpd/htdocs/ganglia/lib/Zend/Acl.php
-share/httpd/htdocs/ganglia/lib/Zend/Acl/Resource/Interface.php
share/httpd/htdocs/ganglia/lib/Zend/Acl/Resource.php
-share/httpd/htdocs/ganglia/lib/Zend/Acl/Role/Interface.php
+share/httpd/htdocs/ganglia/lib/Zend/Acl/Resource/Interface.php
share/httpd/htdocs/ganglia/lib/Zend/Acl/Role.php
-share/httpd/htdocs/ganglia/lib/Zend/Acl/Role/Registry/Exception.php
+share/httpd/htdocs/ganglia/lib/Zend/Acl/Role/Interface.php
share/httpd/htdocs/ganglia/lib/Zend/Acl/Role/Registry.php
+share/httpd/htdocs/ganglia/lib/Zend/Acl/Role/Registry/Exception.php
share/httpd/htdocs/ganglia/lib/Zend/Exception.php
+share/httpd/htdocs/ganglia/lib/cache.php
+share/httpd/htdocs/ganglia/lib/common_api.php
+share/httpd/htdocs/ganglia/lib/json.php
share/httpd/htdocs/ganglia/login.php
share/httpd/htdocs/ganglia/logout.php
share/httpd/htdocs/ganglia/meta_view.php
share/httpd/htdocs/ganglia/metric_group_view.php
-share/httpd/htdocs/ganglia/mobile_helper.php
share/httpd/htdocs/ganglia/mobile.php
+share/httpd/htdocs/ganglia/mobile_helper.php
share/httpd/htdocs/ganglia/nagios/check_for_stuck_gmonds.php
share/httpd/htdocs/ganglia/nagios/check_for_stuck_gmonds.sh
share/httpd/htdocs/ganglia/nagios/check_ganglia_metric.sh
@@ -1037,7 +1039,6 @@ share/httpd/htdocs/ganglia/nagios/warmup_metric_cache.sh
share/httpd/htdocs/ganglia/node_legend.html
share/httpd/htdocs/ganglia/physical_view.php
share/httpd/htdocs/ganglia/pie.php
-share/httpd/htdocs/ganglia/README
share/httpd/htdocs/ganglia/search.php
share/httpd/htdocs/ganglia/show_node.php
share/httpd/htdocs/ganglia/stacked.php
@@ -1086,7 +1087,6 @@ share/httpd/htdocs/ganglia/templates/default/view_content.tpl
share/httpd/htdocs/ganglia/templates/default/views_view.tpl
share/httpd/htdocs/ganglia/test/GangliaAclTest.php
share/httpd/htdocs/ganglia/test/GangliaAuthTest.php
-share/httpd/htdocs/ganglia/TODO
share/httpd/htdocs/ganglia/trend_navigation.php
share/httpd/htdocs/ganglia/version.php
share/httpd/htdocs/ganglia/view_content.php
diff --git a/gat/Makefile b/gat/Makefile
index 21fdbee973..0f110fe307 100644
--- a/gat/Makefile
+++ b/gat/Makefile
@@ -1,19 +1,19 @@
# $NetBSD$
-DISTNAME= gat-1.0
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=RyuKojiro/}
+DISTNAME= gat-1.0
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_GITHUB:=RyuKojiro/}
-MAINTAINER= daniel+netbsd%loffgren.org@localhost
-HOMEPAGE= https://github.com/RyuKojiro/gat/
-COMMENT= GTK ACPI Tray Battery Monitor
-LICENSE= mit
+MAINTAINER= daniel+netbsd%loffgren.org@localhost
+HOMEPAGE= https://github.com/RyuKojiro/gat/
+COMMENT= GTK ACPI Tray Battery Monitor
+LICENSE= mit
-ONLY_FOR_PLATFORM= NetBSD-*-*
+ONLY_FOR_PLATFORM= NetBSD-*-*
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
.include "../../x11/gtk3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gauche-pib/Makefile b/gauche-pib/Makefile
index 116270604c..c93131461e 100644
--- a/gauche-pib/Makefile
+++ b/gauche-pib/Makefile
@@ -23,7 +23,7 @@ USE_TOOLS+= gmake
GAUCHE_SITE_LIB_DIR!= ${PREFIX:Q}/bin/gauche-config --sitelibdir
.endif
PLIST_SUBST+= GAUCHE_SITE_LIB_DIR=${GAUCHE_SITE_LIB_DIR:S|${PREFIX}/||:Q}
-PRINT_PLIST_AWK+= \
+PRINT_PLIST_AWK+= \
{ gsub(/${GAUCHE_SITE_LIB_DIR:S|${PREFIX}/||:S|/|\\/|g}/, \
"$${GAUCHE_SITE_LIB_DIR}"); \
}
diff --git a/gcc42/Makefile b/gcc42/Makefile
index c99211293a..730f235876 100644
--- a/gcc42/Makefile
+++ b/gcc42/Makefile
@@ -15,7 +15,7 @@ GCC_VERSION= 4.2.3
NOT_FOR_PLATFORM= Interix-*-*
-PKG_NO_CPUFLAGS=# empty
+PKG_NO_CPUFLAGS= # empty
.undef PKG_DEVELOPER
@@ -24,29 +24,31 @@ PKG_NO_CPUFLAGS=# empty
# Determine whether to use binutils
.if ${OPSYS} == "NetBSD"
. if !defined(USE_BINUTILS)
-AS_PATH:= ${AS}
+AS_PATH:= ${AS}
. for _dir_ in ${PATH:C/\:/ /g}
. if empty(AS_PATH:M/*)
. if exists(${_dir_}/${AS})
-AS_PATH:= ${_dir_}/${AS}
+AS_PATH:= ${_dir_}/${AS}
. endif
. endif
. endfor
. if !empty(AS_PATH:M${LOCALBASE}/*)
-USE_BINUTILS= YES
+USE_BINUTILS= YES
. else
-AS_VERSION!= ${AS_PATH} --version | ${AWK} '{ \
- split($$3, v, /[.]/); \
- printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4]; \
- exit; \
- }'
-USE_BINUTILS!= ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
+AS_VERSION!= \
+ ${AS_PATH} --version | ${AWK} '{ \
+ split($$3, v, /[.]/); \
+ printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4]; \
+ exit; \
+ }'
+USE_BINUTILS!= \
+ ${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
. endif
-MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q}
+MAKEFLAGS+= USE_BINUTILS=${USE_BINUTILS:Q}
. endif
.endif
.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
-DEPENDS+= binutils>=2.14:../../devel/binutils
+DEPENDS+= binutils>=2.14:../../devel/binutils
CONFIGURE_ARGS+= --with-as=${LOCALBASE}/bin/as
CONFIGURE_ARGS+= --with-ld=${LOCALBASE}/bin/ld
CONFIGURE_ARGS+= --with-gnu-as
@@ -78,21 +80,21 @@ BUILD_FORTRAN?= NO
BUILD_JAVA?= NO
BUILD_OBJC?= YES
-LANGS='c'
+LANGS= 'c'
#.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
#LANGS+='ada'
#.endif
.if !empty(BUILD_CXX:M[Yy][Ee][Ss])
-LANGS+='c++'
+LANGS+= 'c++'
.endif
.if !empty(BUILD_FORTRAN:M[Yy][Ee][Ss])
-LANGS+='fortran'
+LANGS+= 'fortran'
.endif
#.if !empty(BUILD_JAVA:M[Yy][Ee][Ss])
#LANGS+='java'
#.endif
.if !empty(BUILD_OBJC:M[Yy][Ee][Ss])
-LANGS+='objc'
+LANGS+= 'objc'
.endif
CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
CONFIGURE_ARGS+= --with-system-zlib
@@ -167,11 +169,11 @@ GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
FILES_SUBST+= PKGNAME=${PKGNAME:Q}
MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
-CPPFLAGS+= -I${BUILDLINK_DIR}/include
-CFLAGS+= -I${BUILDLINK_DIR}/include
+CPPFLAGS+= -I${BUILDLINK_DIR}/include
+CFLAGS+= -I${BUILDLINK_DIR}/include
.if ${OPSYS} == "NetBSD"
# thread / crtbegin / __cxa_atexit support depend on a "netbsd2" OS name
-GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
+GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//}
CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q}
#ABI_BASELINE_PAIR= ${GCC_PLATFORM:C/--/-/}
#MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q}
diff --git a/gcc42/buildlink3.mk b/gcc42/buildlink3.mk
index 7694517a48..9c24ddd9c9 100644
--- a/gcc42/buildlink3.mk
+++ b/gcc42/buildlink3.mk
@@ -1,6 +1,6 @@
# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:43:41 jsonn Exp $
-BUILDLINK_PREFIX.gcc42:=${LOCALBASE}/gcc42
+BUILDLINK_PREFIX.gcc42:= ${LOCALBASE}/gcc42
BUILDLINK_TREE+= gcc42
@@ -11,12 +11,12 @@ BUILDLINK_API_DEPENDS.gcc42+= gcc42>=${_GCC_REQD}
BUILDLINK_ABI_DEPENDS.gcc42?= gcc42>=4.2.0
BUILDLINK_PKGSRCDIR.gcc42?= ../../wip/gcc42
. if exists(${BUILDLINK_PREFIX.gcc42}/bin/gcc)
-_GNAT1!=${BUILDLINK_PREFIX.gcc42}/bin/gcc -print-prog-name=gnat1
+_GNAT1!= ${BUILDLINK_PREFIX.gcc42}/bin/gcc -print-prog-name=gnat1
. if exists(${_GNAT1})
-BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc42}/bin/gcc
+BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc42}/bin/gcc
. endif
BUILDLINK_LIBDIRS.gcc42+= lib
-_GCC_ARCHDIR!= ${DIRNAME} `${BUILDLINK_PREFIX.gcc42}/bin/gcc --print-libgcc-file-name`
+_GCC_ARCHDIR!= ${DIRNAME} `${BUILDLINK_PREFIX.gcc42}/bin/gcc --print-libgcc-file-name`
. if empty(_GCC_ARCHDIR:M*not_found*)
BUILDLINK_LIBDIRS.gcc42+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc42}\///}/
. if exists(${_GNAT1})
diff --git a/gcc43/Makefile b/gcc43/Makefile
index 12b08d158f..eab2331de0 100644
--- a/gcc43/Makefile
+++ b/gcc43/Makefile
@@ -54,15 +54,15 @@ BUILD_CXX?= YES
BUILD_FORTRAN?= YES
BUILD_OBJC?= YES
-LANGS= c
+LANGS= c
.if !empty(BUILD_CXX:M[Yy][Ee][Ss])
-LANGS+= c++
+LANGS+= c++
.endif
.if !empty(BUILD_FORTRAN:M[Yy][Ee][Ss])
-LANGS+= fortran
+LANGS+= fortran
.endif
.if !empty(BUILD_OBJC:M[Yy][Ee][Ss])
-LANGS+= objc
+LANGS+= objc
.endif
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
diff --git a/gcc43/buildlink3.mk b/gcc43/buildlink3.mk
index ac9b3df44a..4f467e9127 100644
--- a/gcc43/buildlink3.mk
+++ b/gcc43/buildlink3.mk
@@ -1,6 +1,6 @@
# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:43:41 jsonn Exp $
-BUILDLINK_PREFIX.gcc43:=${LOCALBASE}/gcc43
+BUILDLINK_PREFIX.gcc43:= ${LOCALBASE}/gcc43
BUILDLINK_TREE+= gcc43
@@ -11,12 +11,12 @@ BUILDLINK_API_DEPENDS.gcc43+= gcc43>=${_GCC_REQD}
BUILDLINK_ABI_DEPENDS.gcc43?= gcc43>=4.3.0
BUILDLINK_PKGSRCDIR.gcc43?= ../../wip/gcc43
. if exists(${BUILDLINK_PREFIX.gcc43}/bin/gcc)
-_GNAT1!=${BUILDLINK_PREFIX.gcc43}/bin/gcc -print-prog-name=gnat1
+_GNAT1!= ${BUILDLINK_PREFIX.gcc43}/bin/gcc -print-prog-name=gnat1
. if exists(${_GNAT1})
-BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc43}/bin/gcc
+BUILDLINK_ENV+= ADAC=${BUILDLINK_PREFIX.gcc43}/bin/gcc
. endif
BUILDLINK_LIBDIRS.gcc43+= lib
-_GCC_ARCHDIR!= ${DIRNAME} `${BUILDLINK_PREFIX.gcc43}/bin/gcc --print-libgcc-file-name`
+_GCC_ARCHDIR!= ${DIRNAME} `${BUILDLINK_PREFIX.gcc43}/bin/gcc --print-libgcc-file-name`
. if empty(_GCC_ARCHDIR:M*not_found*)
BUILDLINK_LIBDIRS.gcc43+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc43}\///}/
. if exists(${_GNAT1})
diff --git a/gcc44/Makefile b/gcc44/Makefile
index 331702b989..3367e233f1 100644
--- a/gcc44/Makefile
+++ b/gcc44/Makefile
@@ -50,17 +50,17 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
# gcc/opth-gen.awk \
# gcc/opt-functions.awk
-REPLACE_BASH+= contrib/dg-cmp-results.sh
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
-REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
-REPLACE_BASH+= contrib/reghunt/bin/reg-test
-REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
-REPLACE_BASH+= contrib/reghunt/date_based/reg_search
-REPLACE_BASH+= gcc/dbgcnt.def
-REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
-REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
+REPLACE_BASH+= contrib/dg-cmp-results.sh
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
+REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
+REPLACE_BASH+= contrib/reghunt/bin/reg-test
+REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
+REPLACE_BASH+= contrib/reghunt/date_based/reg_search
+REPLACE_BASH+= gcc/dbgcnt.def
+REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
+REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
diff --git a/gcc45/Makefile b/gcc45/Makefile
index fd4882ebe6..3d2c426d0e 100644
--- a/gcc45/Makefile
+++ b/gcc45/Makefile
@@ -52,17 +52,17 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
# gcc/opth-gen.awk \
# gcc/opt-functions.awk
-REPLACE_BASH+= contrib/dg-cmp-results.sh
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
-REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
-REPLACE_BASH+= contrib/reghunt/bin/reg-test
-REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
-REPLACE_BASH+= contrib/reghunt/date_based/reg_search
-REPLACE_BASH+= gcc/dbgcnt.def
-REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
-REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
+REPLACE_BASH+= contrib/dg-cmp-results.sh
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
+REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
+REPLACE_BASH+= contrib/reghunt/bin/reg-test
+REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
+REPLACE_BASH+= contrib/reghunt/date_based/reg_search
+REPLACE_BASH+= gcc/dbgcnt.def
+REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
+REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
diff --git a/gcc46-libs/Makefile b/gcc46-libs/Makefile
index 00f6ab3cb6..fab0dbffe9 100644
--- a/gcc46-libs/Makefile
+++ b/gcc46-libs/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2016/09/06 14:01:20 maya Exp $
-GCC_PKGNAME= gcc46
+GCC_PKGNAME= gcc46
GCC46_DIST_VERSION:= 4.6.4
DISTNAME= gcc-${GCC46_DIST_VERSION}
@@ -41,10 +41,12 @@ SHLIB_EXT= so
LIBRARY_FILES= ${WRKDIR}/lib_files
-GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
- ${LIBRARY_FILES};
-GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
- ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
+GENERATE_PLIST+= \
+ ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
+ ${LIBRARY_FILES};
+GENERATE_PLIST+= \
+ ${GREP} -q 'lib/' ${LIBRARY_FILES} \
+ || ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib';
${LIBRARY_FILES}:
${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC46_DIST_VERSION}*' | \
diff --git a/gcc46/Makefile b/gcc46/Makefile
index cf70308016..098904578e 100644
--- a/gcc46/Makefile
+++ b/gcc46/Makefile
@@ -58,17 +58,17 @@ CONFIGURE_ARGS+= --with-gnu-as --with-as=/usr/sfw/bin/gas
# gcc/opth-gen.awk \
# gcc/opt-functions.awk
-REPLACE_BASH+= contrib/dg-cmp-results.sh
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
-REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
-REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
-REPLACE_BASH+= contrib/reghunt/bin/reg-test
-REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
-REPLACE_BASH+= contrib/reghunt/date_based/reg_search
-REPLACE_BASH+= gcc/dbgcnt.def
-REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
-REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
+REPLACE_BASH+= contrib/dg-cmp-results.sh
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-patchlist
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update
+REPLACE_BASH+= contrib/reghunt/bin/gcc-svn-update-fix
+REPLACE_BASH+= contrib/reghunt/bin/reg-hunt
+REPLACE_BASH+= contrib/reghunt/bin/reg-test
+REPLACE_BASH+= contrib/reghunt/date_based/reg_periodic
+REPLACE_BASH+= contrib/reghunt/date_based/reg_search
+REPLACE_BASH+= gcc/dbgcnt.def
+REPLACE_BASH+= gcc/testsuite/gcc.test-framework/gen_directive_tests
+REPLACE_BASH+= libstdc++-v3/scripts/run_doxygen
.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
# on NetBSD, use the native SSP code in libc
@@ -97,11 +97,11 @@ CONFIGURE_ARGS.Linux+= --disable-libquadmath --disable-libquadmath-support
CONFIGURE_ARGS.Darwin+= STRIP_FOR_TARGET=${TOOLS_PLATFORM.strip}
.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
-CONFIGURE_ARGS+= --with-dwarf2
+CONFIGURE_ARGS+= --with-dwarf2
.endif
.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-powerpc)
-CONFIGURE_ARGS+= --disable-multilib
+CONFIGURE_ARGS+= --disable-multilib
.endif
CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
diff --git a/gcc46/options.mk b/gcc46/options.mk
index e226cc50e8..0b28513fa6 100644
--- a/gcc46/options.mk
+++ b/gcc46/options.mk
@@ -19,9 +19,9 @@ MULTILIB_SUPPORTED?= unknown
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
. if exists(/usr/include/gnu/stubs-64.h) && \
!exists(/usr/include/gnu/stubs-32.h)
-MULTILIB_SUPPORTED=No
+MULTILIB_SUPPORTED= No
. else
-MULTILIB_SUPPORTED=Yes
+MULTILIB_SUPPORTED= Yes
. endif
.endif
.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
diff --git a/gcc47-libs/Makefile b/gcc47-libs/Makefile
index 25f0c91831..3bb19a590d 100644
--- a/gcc47-libs/Makefile
+++ b/gcc47-libs/Makefile
@@ -42,10 +42,10 @@ SHLIB_EXT= so
LIBRARY_FILES= ${WRKDIR}/lib_files
-GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
- ${LIBRARY_FILES};
-GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
- ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
+GENERATE_PLIST+= ${SED} -e 's,^,${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/,' \
+ ${LIBRARY_FILES};
+GENERATE_PLIST+= ${GREP} -q 'lib/' ${LIBRARY_FILES} || \
+ ${ECHO} '@pkgdir ${LIBGCC_SUBPREFIX}/${GCC_TARGET_MACHINE}/lib' ;
${LIBRARY_FILES}:
${PKG_INFO} -qL '${GCC_PKGNAME}-${GCC47_DIST_VERSION}*' | \
diff --git a/gcc47/Makefile b/gcc47/Makefile
index 64b008ee08..40b9e34a13 100644
--- a/gcc47/Makefile
+++ b/gcc47/Makefile
@@ -75,9 +75,9 @@ CONFIGURE_ARGS+= --disable-libstdcxx-pch
.if !empty(MACHINE_PLATFORM:MNetBSD-*-*)
# on NetBSD, use the native SSP code in libc
-CONFIGURE_ARGS+= --disable-libssp
+CONFIGURE_ARGS+= --disable-libssp
.else
-CONFIGURE_ARGS+= --enable-libssp
+CONFIGURE_ARGS+= --enable-libssp
.endif
CONFIGURE_ARGS+= --enable-languages=${LANGS:Q}
diff --git a/gcc47/options.mk b/gcc47/options.mk
index f66cb71993..b3bb184c3e 100644
--- a/gcc47/options.mk
+++ b/gcc47/options.mk
@@ -19,9 +19,9 @@ MULTILIB_SUPPORTED?= unknown
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
. if exists(/usr/include/gnu/stubs-64.h) && \
!exists(/usr/include/gnu/stubs-32.h)
-MULTILIB_SUPPORTED=No
+MULTILIB_SUPPORTED= No
. else
-MULTILIB_SUPPORTED=Yes
+MULTILIB_SUPPORTED= Yes
. endif
.endif
.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
diff --git a/gcc6snapshot/options.mk b/gcc6snapshot/options.mk
index b60e9f8fc2..11b35f697c 100644
--- a/gcc6snapshot/options.mk
+++ b/gcc6snapshot/options.mk
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
+PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "SunOS"
PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
.else
@@ -24,9 +24,9 @@ MULTILIB_SUPPORTED?= unknown
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
. if exists(/usr/include/gnu/stubs-64.h) && \
!exists(/usr/include/gnu/stubs-32.h)
-MULTILIB_SUPPORTED=No
+MULTILIB_SUPPORTED= No
. else
-MULTILIB_SUPPORTED=Yes
+MULTILIB_SUPPORTED= Yes
. endif
.endif
.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
@@ -81,9 +81,9 @@ LIBS.SunOS+= -lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL14 = isl-0.14
+ISL14 = isl-0.14
SITES.${ISL14}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES += ${ISL14}.tar.bz2
+DISTFILES += ${ISL14}.tar.bz2
.endif
###
diff --git a/gcc6snapshot/version.mk b/gcc6snapshot/version.mk
index a4fb3e6de5..549a8fe8a6 100644
--- a/gcc6snapshot/version.mk
+++ b/gcc6snapshot/version.mk
@@ -1,2 +1,2 @@
# $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC6S_DIST_VERSION:=6-20160908
+GCC6S_DIST_VERSION:= 6-20160908
diff --git a/gcc7snapshot/options.mk b/gcc7snapshot/options.mk
index 77587ea979..d03dd2f8f8 100644
--- a/gcc7snapshot/options.mk
+++ b/gcc7snapshot/options.mk
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
+PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "SunOS"
PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
.else
@@ -24,9 +24,9 @@ MULTILIB_SUPPORTED?= unknown
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
. if exists(/usr/include/gnu/stubs-64.h) && \
!exists(/usr/include/gnu/stubs-32.h)
-MULTILIB_SUPPORTED=No
+MULTILIB_SUPPORTED= No
. else
-MULTILIB_SUPPORTED=Yes
+MULTILIB_SUPPORTED= Yes
. endif
.endif
.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
@@ -81,10 +81,10 @@ LIBS.SunOS+= -lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 = isl-0.16.1
+ISL16 = isl-0.16.1
SITES.${ISL16}.tar.bz2 = ftp://ftp.fu-berlin.de/unix/languages/gcc/infrastructure/
#SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES += ${ISL16}.tar.bz2
+DISTFILES += ${ISL16}.tar.bz2
.endif
###
diff --git a/gcc7snapshot/version.mk b/gcc7snapshot/version.mk
index b023366bbb..c2cb462c03 100644
--- a/gcc7snapshot/version.mk
+++ b/gcc7snapshot/version.mk
@@ -1,2 +1,2 @@
# $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC7S_DIST_VERSION:=7-20170420
+GCC7S_DIST_VERSION:= 7-20170420
diff --git a/gcc8snapshot/options.mk b/gcc8snapshot/options.mk
index 25fda10308..f570c760c1 100644
--- a/gcc8snapshot/options.mk
+++ b/gcc8snapshot/options.mk
@@ -11,7 +11,7 @@ PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "Linux"
PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "DragonFly"
-PKG_SUGGESTED_OPTIONS+= nls
+PKG_SUGGESTED_OPTIONS+= nls
.elif ${OPSYS} == "SunOS"
PKG_SUGGESTED_OPTIONS+= gcc-inplace-math
.else
@@ -24,9 +24,9 @@ MULTILIB_SUPPORTED?= unknown
.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
. if exists(/usr/include/gnu/stubs-64.h) && \
!exists(/usr/include/gnu/stubs-32.h)
-MULTILIB_SUPPORTED=No
+MULTILIB_SUPPORTED= No
. else
-MULTILIB_SUPPORTED=Yes
+MULTILIB_SUPPORTED= Yes
. endif
.endif
.if !empty(MULTILIB_SUPPORTED:M[Yy][Ee][Ss])
@@ -81,9 +81,9 @@ LIBS.SunOS+= -lgmp
### Graphite Support
###
.if !empty(PKG_OPTIONS:Mgcc-graphite)
-ISL16 = isl-0.16.1
+ISL16 = isl-0.16.1
SITES.${ISL16}.tar.bz2 = ${MASTER_SITE_GNU:=gcc/infrastructure/}
-DISTFILES += ${ISL16}.tar.bz2
+DISTFILES += ${ISL16}.tar.bz2
.endif
###
diff --git a/gcc8snapshot/version.mk b/gcc8snapshot/version.mk
index 886f81120d..45640ad71d 100644
--- a/gcc8snapshot/version.mk
+++ b/gcc8snapshot/version.mk
@@ -1,2 +1,2 @@
# $NetBSD: version.mk,v 1.21 2015/05/06 05:25:00 keckhardt Exp $
-GCC8S_DIST_VERSION:=8-20180107
+GCC8S_DIST_VERSION:= 8-20180107
diff --git a/gdal-docs/Makefile b/gdal-docs/Makefile
index 114fbe2906..436b6fc606 100644
--- a/gdal-docs/Makefile
+++ b/gdal-docs/Makefile
@@ -22,11 +22,11 @@ MAKE_FILE= GNUmakefile
BUILD_TARGET= docs
INSTALL_TARGET= install-docs
-SUBST_CLASSES+= pyversion
-SUBST_STAGE.pyversion= do-configure
-SUBST_FILES.pyversion= GNUmakefile
-SUBST_SED.pyversion= -e 's:python:${PYTHONBIN}:g'
-SUBST_MESSAGE.pyversion=Fixing Python Version
+SUBST_CLASSES+= pyversion
+SUBST_STAGE.pyversion= do-configure
+SUBST_FILES.pyversion= GNUmakefile
+SUBST_SED.pyversion= -e 's:python:${PYTHONBIN}:g'
+SUBST_MESSAGE.pyversion= Fixing Python Version
SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-configure
diff --git a/gdal-grass/Makefile b/gdal-grass/Makefile
index 3cd73f7725..3a34371c76 100644
--- a/gdal-grass/Makefile
+++ b/gdal-grass/Makefile
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-grass=${GRASS_HOME}
USE_LANGUAGES= c++
BUILD_TARGET= default
-BUILDLINK_PASSTHRU_RPATHDIRS+= ${GRASS_HOME}/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+= ${GRASS_HOME}/lib
.include "../../geography/gdal-lib/buildlink3.mk"
.include "../../geography/proj/buildlink3.mk"
diff --git a/gdb-git/Makefile b/gdb-git/Makefile
index 4282d68f7b..19e02be276 100644
--- a/gdb-git/Makefile
+++ b/gdb-git/Makefile
@@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.11 2015/03/15 14:22:19 bsiegert Exp $
#
-DISTNAME= gdb-8.0
-CATEGORIES= devel
+DISTNAME= gdb-8.0
+CATEGORIES= devel
GIT_REPOSITORIES= gdb
#GIT_REPO.gdb= git://sourceware.org/git/binutils-gdb.git # broken?
#GIT_REPO.gdb= http://sourceware.org/git/binutils-gdb.git # broken?
GIT_REPO.gdb= https://github.com/wallento/binutils-gdb.git
#GIT_DEEP_CLONE.gdb= yes # server dies on shallow clones
-WRKSRC= ${WRKDIR}/gdb
+WRKSRC= ${WRKDIR}/gdb
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://www.gnu.org/software/gdb/gdb.html
@@ -20,15 +20,15 @@ NOT_FOR_PLATFORM+= DragonFly-*-*
USE_LANGUAGES= c c++11
-GNU_CONFIGURE= YES
-USE_PKGLOCALEDIR= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= gmake msgfmt makeinfo perl:build
+GNU_CONFIGURE= YES
+USE_PKGLOCALEDIR= YES
+USE_LIBTOOL= YES
+USE_TOOLS+= gmake msgfmt makeinfo perl:build
REPLACE_LOCALEDIR_PATTERNS+= Make-in
-INSTALL_TARGET= install install-info
-TEST_TARGET= check
-INFO_FILES= yes
-CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
+INSTALL_TARGET= install install-info
+TEST_TARGET= check
+INFO_FILES= yes
+CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
CONFIGURE_ARGS+= --disable-binutils
CONFIGURE_ARGS+= --disable-gprof
diff --git a/gdb-git/PLIST b/gdb-git/PLIST
index a15baae570..91c96e0f73 100644
--- a/gdb-git/PLIST
+++ b/gdb-git/PLIST
@@ -1,6 +1,6 @@
@comment $NetBSD: PLIST.common,v 1.6 2015/03/15 14:22:19 bsiegert Exp $
-bin/gdb
${PLIST.gcore}bin/gcore
+bin/gdb
${PLIST.gdbserver}bin/gdbserver
include/gdb/jit-reader.h
info/annotate.info
diff --git a/gdb5/Makefile b/gdb5/Makefile
index 1f7da89ba4..15afb38980 100644
--- a/gdb5/Makefile
+++ b/gdb5/Makefile
@@ -18,15 +18,15 @@ COMMENT= Symbolic debugger for multiple language frontends
NOT_FOR_PLATFORM= Darwin-*-* DragonFly-*-* NetBSD-*-x86_64
BROKEN_GETTEXT_DETECTION= yes
-GNU_CONFIGURE= YES
-USE_PKGLOCALEDIR= YES
-USE_LIBTOOL= YES
-USE_TOOLS+= gmake msgfmt
+GNU_CONFIGURE= YES
+USE_PKGLOCALEDIR= YES
+USE_LIBTOOL= YES
+USE_TOOLS+= gmake msgfmt
REPLACE_LOCALEDIR_PATTERNS+= Make-in
-INSTALL_TARGET= install install-info
-TEST_TARGET= check
-INFO_FILES= yes
-CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
+INSTALL_TARGET= install install-info
+TEST_TARGET= check
+INFO_FILES= yes
+CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/gdb6/Makefile b/gdb6/Makefile
index 95114002f6..598f7a5bb2 100644
--- a/gdb6/Makefile
+++ b/gdb6/Makefile
@@ -15,15 +15,15 @@ COMMENT= The GNU Project Debugger
# never heard of dragonfly either, and is not worth fixing.
NOT_FOR_PLATFORM= Darwin-*-* DragonFly-*-*
-USE_TOOLS+= gmake makeinfo msgfmt
-USE_LIBTOOL= yes
-USE_PKGLOCALEDIR= yes
+USE_TOOLS+= gmake makeinfo msgfmt
+USE_LIBTOOL= yes
+USE_PKGLOCALEDIR= yes
REPLACE_LOCALEDIR_PATTERNS+= Make-in
-GNU_CONFIGURE= yes
-GNU_CONFIGURE_LIBSUBDIR=gdb6
-CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gdb6
-CONFIGURE_ARGS+= --enable-libada
-INFO_FILES= yes
+GNU_CONFIGURE= yes
+GNU_CONFIGURE_LIBSUBDIR= gdb6
+CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gdb6
+CONFIGURE_ARGS+= --enable-libada
+INFO_FILES= yes
.include "options.mk"
diff --git a/gecko-sharp/Makefile b/gecko-sharp/Makefile
index 1ae6c30361..c6b2212539 100644
--- a/gecko-sharp/Makefile
+++ b/gecko-sharp/Makefile
@@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1
GNU_CONFIGURE= yes
USE_TOOLS+= pkg-config
-USE_LANGUAGES= c
+USE_LANGUAGES= c
PKGCONFIG_OVERRIDE+= gecko-sharp-2.0.pc.in
diff --git a/gecode/Makefile b/gecode/Makefile
index 6e37ba4e98..74a104c413 100644
--- a/gecode/Makefile
+++ b/gecode/Makefile
@@ -16,6 +16,6 @@ USE_TOOLS= gmake perl bash
CONFIG_SHELL= ${TOOLS_PATH.bash}
-CONFIGURE_ARGS+=--enable-examples=no
+CONFIGURE_ARGS+= --enable-examples=no
.include "../../mk/bsd.pkg.mk"
diff --git a/geoloc/PLIST b/geoloc/PLIST
index 6987dbb9ad..5b869de0fb 100644
--- a/geoloc/PLIST
+++ b/geoloc/PLIST
@@ -1,5 +1,5 @@
@comment $NetBSD$
-sbin/geolocd
-sbin/geolocctl
man1/geolocctl.1
man8/geolocd.8
+sbin/geolocctl
+sbin/geolocd
diff --git a/gerris-snapshot/PLIST b/gerris-snapshot/PLIST
index c9306f3758..538e164bd6 100644
--- a/gerris-snapshot/PLIST
+++ b/gerris-snapshot/PLIST
@@ -114,12 +114,12 @@ man/man1/xyz2rsurface.1
share/gerris/build_function
share/gerris/gerris.dic
share/gerris/gfs-keywords.el
+share/gerris/gfs-mode.el
share/gerris/gfs.hva
-share/gerris/gfs2tex.py
share/gerris/gfs.lang
-share/gerris/gfs-mode.el
share/gerris/gfs.php
share/gerris/gfs.sty
+share/gerris/gfs2tex.py
share/gerris/kaltura.sh
share/gerris/libtool
share/gerris/m4.awk
diff --git a/getdp/Makefile b/getdp/Makefile
index 106b743391..205f6ab049 100644
--- a/getdp/Makefile
+++ b/getdp/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.1 2013/09/02 21:05:56 jihbed Exp $
DISTNAME= getdp-2.4.1-source
-PKGNAME= getdp-2.4.1
+PKGNAME= getdp-2.4.1
CATEGORIES= math
MASTER_SITES= http://www.geuz.org/getdp/src/
EXTRACT_SUFX= .tgz
@@ -14,11 +14,11 @@ LICENSE= gnu-gpl-v2 AND gnu-gpl-v3
USE_CMAKE= yes
USE_LANGUAGES= c c++ fortran
-SUBST_CLASSES+= setup
-SUBST_STAGE.setup= pre-configure
-SUBST_MESSAGE.setup= Fixing ${PYSETUP}
-SUBST_FILES.setup= CMakeLists.txt
-SUBST_SED.setup+= -e 's,share/man/,${PKGMANDIR}/,g'
+SUBST_CLASSES+= setup
+SUBST_STAGE.setup= pre-configure
+SUBST_MESSAGE.setup= Fixing ${PYSETUP}
+SUBST_FILES.setup= CMakeLists.txt
+SUBST_SED.setup+= -e 's,share/man/,${PKGMANDIR}/,g'
.include "../../math/blas/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
diff --git a/gfeedline/Makefile b/gfeedline/Makefile
index 0df9eee9fd..49d8675885 100644
--- a/gfeedline/Makefile
+++ b/gfeedline/Makefile
@@ -22,11 +22,11 @@ DEPENDS+= ${PYPKGPREFIX}-distutils-extra-[0-9]*:../../wip/py-distutils-extra
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-beautifulsoup, py-gobject
-USE_LANGUAGES= # none
-NO_BUILD= YES
-USE_TOOLS+= intltool
-PY_PATCHPLIST= yes
-PLIST_SUBST+= EGG_INFODIR=${DISTNAME}-py${PYVERSSUFFIX}.egg-info
+USE_LANGUAGES= # none
+NO_BUILD= YES
+USE_TOOLS+= intltool
+PY_PATCHPLIST= yes
+PLIST_SUBST+= EGG_INFODIR=${DISTNAME}-py${PYVERSSUFFIX}.egg-info
INSTALLATION_DIRS= share/applications \
${PKGMANDIR}/man1 \
etc \
diff --git a/gfsview-snapshot/PLIST b/gfsview-snapshot/PLIST
index d97c8f5500..8645c4d158 100644
--- a/gfsview-snapshot/PLIST
+++ b/gfsview-snapshot/PLIST
@@ -4,9 +4,9 @@ bin/gfsview2D
bin/gfsview3D
lib/libgfsgl2D.la
lib/libgfsgl3D.la
+share/applications/gfsview.desktop
share/applications/gfsview2D.desktop
share/applications/gfsview3D.desktop
-share/applications/gfsview.desktop
share/gfsview/fonts/Garuda.ttf
share/gfsview/pixmaps/boundaries-16x16.png
share/gfsview/pixmaps/cells-16x16.png
diff --git a/ggz-gtk-client/Makefile b/ggz-gtk-client/Makefile
index c3a643b4da..32240a4e8a 100644
--- a/ggz-gtk-client/Makefile
+++ b/ggz-gtk-client/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.ggzgamingzone.org
COMMENT= GGZ Gaming Zone libraries
-CONFIGURE_ARGS+= --enable-debug-gdb
+CONFIGURE_ARGS+= --enable-debug-gdb
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/ggz-gtk-games/Makefile b/ggz-gtk-games/Makefile
index 528ce6720a..180816b0c6 100644
--- a/ggz-gtk-games/Makefile
+++ b/ggz-gtk-games/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.ggzgamingzone.org
COMMENT= GGZ Gaming Zone libraries
-CONFIGURE_ARGS+= --enable-debug-gdb
+CONFIGURE_ARGS+= --enable-debug-gdb
GNU_CONFIGURE= yes
diff --git a/ggz-gtk-games/PLIST b/ggz-gtk-games/PLIST
index ff89bf4f83..26057947ad 100644
--- a/ggz-gtk-games/PLIST
+++ b/ggz-gtk-games/PLIST
@@ -8,20 +8,6 @@ lib/ggz/ggz.hastings
lib/ggz/ggz.reversi
lib/ggz/ggz.spades
lib/ggz/ggz.ttt
-share/ggz/pixmaps/cards-1.png
-share/ggz/pixmaps/cards-b1.png
-share/ggz/chess/pixmaps/bishop_b.svg
-share/ggz/chess/pixmaps/bishop_w.svg
-share/ggz/chess/pixmaps/king_b.svg
-share/ggz/chess/pixmaps/king_w.svg
-share/ggz/chess/pixmaps/knight_b.svg
-share/ggz/chess/pixmaps/knight_w.svg
-share/ggz/chess/pixmaps/pawn_b.svg
-share/ggz/chess/pixmaps/pawn_w.svg
-share/ggz/chess/pixmaps/queen_b.svg
-share/ggz/chess/pixmaps/queen_w.svg
-share/ggz/chess/pixmaps/rook_b.svg
-share/ggz/chess/pixmaps/rook_w.svg
share/ggz/ccheckers/pixmaps/Dragon/blue.png
share/ggz/ccheckers/pixmaps/Dragon/board.png
share/ggz/ccheckers/pixmaps/Dragon/cyan.png
@@ -46,6 +32,7 @@ share/ggz/ccheckers/pixmaps/default/hole.png
share/ggz/ccheckers/pixmaps/default/purple.png
share/ggz/ccheckers/pixmaps/default/red.png
share/ggz/ccheckers/pixmaps/default/yellow.png
+share/ggz/ccheckers/pixmaps/templates/README
share/ggz/ccheckers/pixmaps/templates/blue.svg
share/ggz/ccheckers/pixmaps/templates/board.svg
share/ggz/ccheckers/pixmaps/templates/cyan.svg
@@ -54,19 +41,18 @@ share/ggz/ccheckers/pixmaps/templates/hole.svg
share/ggz/ccheckers/pixmaps/templates/purple.svg
share/ggz/ccheckers/pixmaps/templates/red.svg
share/ggz/ccheckers/pixmaps/templates/yellow.svg
-share/ggz/ccheckers/pixmaps/templates/README
-share/ggz/combat/pixmaps/default/bomb.png
-share/ggz/combat/pixmaps/default/captain.png
-share/ggz/combat/pixmaps/default/colonel.png
-share/ggz/combat/pixmaps/default/flag.png
-share/ggz/combat/pixmaps/default/general.png
-share/ggz/combat/pixmaps/default/lieutenant.png
-share/ggz/combat/pixmaps/default/major.png
-share/ggz/combat/pixmaps/default/marshall.png
-share/ggz/combat/pixmaps/default/miner.png
-share/ggz/combat/pixmaps/default/scout.png
-share/ggz/combat/pixmaps/default/sergeant.png
-share/ggz/combat/pixmaps/default/spy.png
+share/ggz/chess/pixmaps/bishop_b.svg
+share/ggz/chess/pixmaps/bishop_w.svg
+share/ggz/chess/pixmaps/king_b.svg
+share/ggz/chess/pixmaps/king_w.svg
+share/ggz/chess/pixmaps/knight_b.svg
+share/ggz/chess/pixmaps/knight_w.svg
+share/ggz/chess/pixmaps/pawn_b.svg
+share/ggz/chess/pixmaps/pawn_w.svg
+share/ggz/chess/pixmaps/queen_b.svg
+share/ggz/chess/pixmaps/queen_w.svg
+share/ggz/chess/pixmaps/rook_b.svg
+share/ggz/chess/pixmaps/rook_w.svg
share/ggz/combat/maps/8x8.127742
share/ggz/combat/maps/Bridge.127237
share/ggz/combat/maps/Checkers+Options.5003353
@@ -80,6 +66,18 @@ share/ggz/combat/maps/Isles.3312569487
share/ggz/combat/maps/Pipes.1854974081
share/ggz/combat/maps/Plenty_of_options.8183865
share/ggz/combat/maps/Small.4176275962
+share/ggz/combat/pixmaps/default/bomb.png
+share/ggz/combat/pixmaps/default/captain.png
+share/ggz/combat/pixmaps/default/colonel.png
+share/ggz/combat/pixmaps/default/flag.png
+share/ggz/combat/pixmaps/default/general.png
+share/ggz/combat/pixmaps/default/lieutenant.png
+share/ggz/combat/pixmaps/default/major.png
+share/ggz/combat/pixmaps/default/marshall.png
+share/ggz/combat/pixmaps/default/miner.png
+share/ggz/combat/pixmaps/default/scout.png
+share/ggz/combat/pixmaps/default/sergeant.png
+share/ggz/combat/pixmaps/default/spy.png
share/ggz/hastings/pixmaps/bayeux.png
share/ggz/hastings/pixmaps/frame_black.png
share/ggz/hastings/pixmaps/frame_ll.png
@@ -93,16 +91,18 @@ share/ggz/hastings/pixmaps/newmangreen.png
share/ggz/hastings/pixmaps/newmanred.png
share/ggz/hastings/pixmaps/newmanyellow.png
share/ggz/hastings/pixmaps/shadow.png
-share/ggz/reversi/pixmaps/white.svg
+share/ggz/pixmaps/cards-1.png
+share/ggz/pixmaps/cards-b1.png
share/ggz/reversi/pixmaps/black.svg
share/ggz/reversi/pixmaps/dot.svg
share/ggz/reversi/pixmaps/enemydot.svg
+share/ggz/reversi/pixmaps/white.svg
share/ggz/tictactoe/pixmaps/o.svg
share/ggz/tictactoe/pixmaps/x.svg
-share/locale/de/LC_MESSAGES/common.mo
share/locale/de/LC_MESSAGES/chess.mo
share/locale/de/LC_MESSAGES/chinese-checkers.mo
share/locale/de/LC_MESSAGES/combat.mo
+share/locale/de/LC_MESSAGES/common.mo
share/locale/de/LC_MESSAGES/dots.mo
share/locale/de/LC_MESSAGES/ggzcards.mo
share/locale/de/LC_MESSAGES/hastings.mo
diff --git a/ggz-server/Makefile b/ggz-server/Makefile
index 7d52a63567..1397c8b313 100644
--- a/ggz-server/Makefile
+++ b/ggz-server/Makefile
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-CONFIGURE_ARGS+= --enable-debug-gdb
+CONFIGURE_ARGS+= --enable-debug-gdb
.include "../../games/libggz/buildlink3.mk"
.include "../../databases/db4/buildlink3.mk"
diff --git a/ggz-server/PLIST b/ggz-server/PLIST
index 9e147fac13..d9daf225df 100644
--- a/ggz-server/PLIST
+++ b/ggz-server/PLIST
@@ -1,16 +1,41 @@
@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:44:39 thomasklausner Exp $
bin/ggzd
bin/ggzduedit
+etc/ggzd/games/ccheckers.dsc
+etc/ggzd/games/chess.dsc
+etc/ggzd/games/combat.dsc
+etc/ggzd/games/connectx.dsc
+etc/ggzd/games/dots.dsc
+etc/ggzd/games/escape.dsc
+etc/ggzd/games/geekgame.dsc
+etc/ggzd/games/ggzcards-bridge.dsc
+etc/ggzd/games/ggzcards-fortytwo.dsc
+etc/ggzd/games/ggzcards-hearts.dsc
+etc/ggzd/games/ggzcards-lapocha.dsc
+etc/ggzd/games/ggzcards-spades.dsc
+etc/ggzd/games/ggzcards-suaro.dsc
+etc/ggzd/games/ggzcards-sueca.dsc
+etc/ggzd/games/ggzcards-whist.dsc
+etc/ggzd/games/ggzcards.dsc
+etc/ggzd/games/hastings.dsc
+etc/ggzd/games/keepalive.dsc
+etc/ggzd/games/krosswater.dsc
+etc/ggzd/games/muehle.dsc
+etc/ggzd/games/reversi.dsc
+etc/ggzd/games/spades.dsc
+etc/ggzd/games/tictactoe.dsc
+etc/ggzd/games/tuxman.dsc
+etc/ggzd/games/widelands.dsc
etc/ggzd/ggzd.conf.example
etc/ggzd/ggzd.motd
-etc/ggzd/rooms/entry.room
-etc/ggzd/rooms/tictactoe.room
-etc/ggzd/rooms/reversi.room
-etc/ggzd/rooms/chess.room
etc/ggzd/rooms/ccheckers.room
+etc/ggzd/rooms/chess.room
etc/ggzd/rooms/combat.room
+etc/ggzd/rooms/connectx.room
etc/ggzd/rooms/dots.room
-etc/ggzd/rooms/ggzcards.room
+etc/ggzd/rooms/entry.room
+etc/ggzd/rooms/escape.room
+etc/ggzd/rooms/geekgame.room
etc/ggzd/rooms/ggzcards-bridge.room
etc/ggzd/rooms/ggzcards-fortytwo.room
etc/ggzd/rooms/ggzcards-hearts.room
@@ -19,84 +44,59 @@ etc/ggzd/rooms/ggzcards-spades.room
etc/ggzd/rooms/ggzcards-suaro.room
etc/ggzd/rooms/ggzcards-sueca.room
etc/ggzd/rooms/ggzcards-whist.room
+etc/ggzd/rooms/ggzcards.room
etc/ggzd/rooms/hastings.room
+etc/ggzd/rooms/keepalive.room
etc/ggzd/rooms/krosswater.room
-etc/ggzd/rooms/spades.room
etc/ggzd/rooms/muehle.room
-etc/ggzd/rooms/escape.room
-etc/ggzd/rooms/connectx.room
-etc/ggzd/rooms/keepalive.room
-etc/ggzd/rooms/geekgame.room
+etc/ggzd/rooms/reversi.room
+etc/ggzd/rooms/spades.room
+etc/ggzd/rooms/tictactoe.room
etc/ggzd/rooms/tuxman.room
etc/ggzd/rooms/widelands.room
-etc/ggzd/games/tictactoe.dsc
-etc/ggzd/games/reversi.dsc
-etc/ggzd/games/chess.dsc
-etc/ggzd/games/ccheckers.dsc
-etc/ggzd/games/combat.dsc
-etc/ggzd/games/dots.dsc
-etc/ggzd/games/ggzcards.dsc
-etc/ggzd/games/ggzcards-bridge.dsc
-etc/ggzd/games/ggzcards-fortytwo.dsc
-etc/ggzd/games/ggzcards-hearts.dsc
-etc/ggzd/games/ggzcards-lapocha.dsc
-etc/ggzd/games/ggzcards-spades.dsc
-etc/ggzd/games/ggzcards-suaro.dsc
-etc/ggzd/games/ggzcards-sueca.dsc
-etc/ggzd/games/ggzcards-whist.dsc
-etc/ggzd/games/hastings.dsc
-etc/ggzd/games/krosswater.dsc
-etc/ggzd/games/spades.dsc
-etc/ggzd/games/muehle.dsc
-etc/ggzd/games/escape.dsc
-etc/ggzd/games/connectx.dsc
-etc/ggzd/games/keepalive.dsc
-etc/ggzd/games/geekgame.dsc
-etc/ggzd/games/tuxman.dsc
-etc/ggzd/games/widelands.dsc
-include/ggzdmod.h
include/ggzdmod++/ggzgameserver.h
-include/ggzdmod++/net.h
include/ggzdmod++/mnet.h
-lib/libggzdmod.so.6.0
-lib/libggzdmod.so.6
-lib/libggzdmod.so
-lib/libggzdmod.la
-lib/libggzdmod.a
-lib/libggzdmod++.so.1.0
-lib/libggzdmod++.so.1
-lib/libggzdmod++.so
-lib/libggzdmod++.la
-lib/libggzdmod++.a
-lib/ggzd/ggzd.tictactoe
-lib/ggzd/ggzd.reversi
-lib/ggzd/ggzd.chess
+include/ggzdmod++/net.h
+include/ggzdmod.h
+lib/ggzd/geekgameserver
lib/ggzd/ggzd.ccheckers
+lib/ggzd/ggzd.chess
lib/ggzd/ggzd.combat
+lib/ggzd/ggzd.connectx
lib/ggzd/ggzd.dots
+lib/ggzd/ggzd.escape
+lib/ggzd/ggzd.ggzcards
lib/ggzd/ggzd.ggzcards.ai-random
lib/ggzd/ggzd.ggzcards.ai-spades
lib/ggzd/ggzd.ggzcards.ai-suaro
-lib/ggzd/ggzd.ggzcards
lib/ggzd/ggzd.hastings
-lib/ggzd/krosswater_server
+lib/ggzd/ggzd.reversi
lib/ggzd/ggzd.spades
-lib/ggzd/muehleserv
-lib/ggzd/ggzd.escape
-lib/ggzd/ggzd.connectx
+lib/ggzd/ggzd.tictactoe
lib/ggzd/keepalivesrv
-lib/ggzd/geekgameserver
+lib/ggzd/krosswater_server
+lib/ggzd/muehleserv
lib/ggzd/tuxmanserv
lib/ggzd/widelands_server
-share/man/man3/ggzdmod.h.3
-share/man/man6/ggzd.6
-share/man/man6/ggzduedit.6
+lib/libggzdmod++.a
+lib/libggzdmod++.la
+lib/libggzdmod++.so
+lib/libggzdmod++.so.1
+lib/libggzdmod++.so.1.0
+lib/libggzdmod.a
+lib/libggzdmod.la
+lib/libggzdmod.so
+lib/libggzdmod.so.6
+lib/libggzdmod.so.6.0
share/ggz/ggzd/ggzcards/spades.aispec
share/ggz/ggzd/ggzcards/suaro.aispec
share/ggz/ggzd/hastings1066/battle_of_hastings
-share/ggz/ggzd/hastings1066/yorkshire
share/ggz/ggzd/hastings1066/coast
+share/ggz/ggzd/hastings1066/yorkshire
share/ggz/ggzd/muehle/classic
share/ggz/ggzd/muehle/roman
share/ggz/ggzd/muehle/twelvemensmorris
share/ggz/ggzd/tuxmanserv/level9.pac
+share/man/man3/ggzdmod.h.3
+share/man/man6/ggzd.6
+share/man/man6/ggzduedit.6
diff --git a/ghc/Makefile b/ghc/Makefile
index c4356a8dc3..9cce4421ff 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -26,11 +26,11 @@ USE_GNU_CONFIGURE_HOST= no
USE_LIBTOOL= yes
USE_TOOLS+= autoconf gmake patch perl:run
-CONFIGURE_ARGS+= --with-gcc=${CC:Q}
-CONFIGURE_ARGS+= --with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q}
-CONFIGURE_ARGS+= --with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q}
-CONFIGURE_ARGS+= --with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q}
-CONFIGURE_ARGS+= --with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q}
+CONFIGURE_ARGS+= --with-gcc=${CC:Q}
+CONFIGURE_ARGS+= --with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q}
+CONFIGURE_ARGS+= --with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q}
+CONFIGURE_ARGS+= --with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q}
+CONFIGURE_ARGS+= --with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q}
CONFIGURE_ENV+= PerlCmd=${PERL5:Q}
.for stage in 0 1 2
diff --git a/ghc/bootstrap.mk b/ghc/bootstrap.mk
index 86883f0f45..58b99c29e8 100644
--- a/ghc/bootstrap.mk
+++ b/ghc/bootstrap.mk
@@ -18,25 +18,25 @@ BOOT_VERSION:= ${PKGNAME:C/^.*-//}
.if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo)
BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-apple-darwin.tar.xz
DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE}
-SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/distfiles-local/
+SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/distfiles-local/
.endif
.if !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) || make(distinfo)
BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-i386-unknown-solaris2.tar.xz
DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE}
-SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/distfiles-local/
+SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/distfiles-local/
.endif
.if !empty(MACHINE_PLATFORM:MSunOS-5.11-x86_64) || make(distinfo)
BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-solaris2.tar.xz
DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE}
-SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/distfiles-local/
+SITES.${BOOT_ARCHIVE}= https://us-east.manta.joyent.com/pkgsrc/public/distfiles-local/
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
BOOT_ARCHIVE:= ghc-${BOOT_VERSION}-boot-x86_64-unknown-netbsd.tar.xz
DISTFILES:= ${DISTFILES} ${BOOT_ARCHIVE}
-SITES.${BOOT_ARCHIVE}= ftp://ftp.netbsd.org/pub/NetBSD/misc/kamil/
+SITES.${BOOT_ARCHIVE}= ftp://ftp.netbsd.org/pub/NetBSD/misc/kamil/
.endif
.if empty(BOOT_ARCHIVE)
diff --git a/ghmm/buildlink3.mk b/ghmm/buildlink3.mk
index d488d55a5d..f5ae66e17c 100644
--- a/ghmm/buildlink3.mk
+++ b/ghmm/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ghmm-0.9
GHMM_0.9_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ghmm-0.9+= ghmm>=0.9
-BUILDLINK_PKGSRCDIR.ghmm-0.9?= ../../wip/ghmm
+BUILDLINK_PKGSRCDIR.ghmm-0.9?= ../../wip/ghmm
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/ghostpcl-urwfonts-ttf/Makefile b/ghostpcl-urwfonts-ttf/Makefile
index d3096bd4ba..b87ad286f9 100644
--- a/ghostpcl-urwfonts-ttf/Makefile
+++ b/ghostpcl-urwfonts-ttf/Makefile
@@ -21,7 +21,7 @@ USE_X11BASE= YES
NO_CONFIGURE= YES
NO_BUILD= YES
-DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
+DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS= lib/X11/fonts/TTF \
${DOCSDIR}
diff --git a/ghostscript-cidfonts-ryumin/Makefile b/ghostscript-cidfonts-ryumin/Makefile
index 4c55b09411..a5791339f6 100644
--- a/ghostscript-cidfonts-ryumin/Makefile
+++ b/ghostscript-cidfonts-ryumin/Makefile
@@ -29,7 +29,7 @@ SUBST_VARS= GCR_INSTALL_TYPE
.if !empty(GS_CIDFMAP)
SUBST_CLASSES+= ttf_path
SUBST_STAGE.ttf_path= post-build
-SUBST_MESSAGE.ttf_path=Fixing ttf install directory in cidfmap
+SUBST_MESSAGE.ttf_path= Fixing ttf install directory in cidfmap
SUBST_FILES.ttf_path= ${GS_CIDFMAP}
SUBST_SED.ttf_path= -e 's|%%PREFIX%%|${PREFIX}|'
.endif
diff --git a/ghostscript-cidfonts-ryumin/options.mk b/ghostscript-cidfonts-ryumin/options.mk
index 39c1769747..073eee533a 100644
--- a/ghostscript-cidfonts-ryumin/options.mk
+++ b/ghostscript-cidfonts-ryumin/options.mk
@@ -11,31 +11,31 @@ PKG_SUGGESTED_OPTIONS= adobe-cidfonts
# -------- Adobe CID font requested -------------
.if !empty(PKG_OPTIONS:Madobe-cidfonts)
-GS_CIDFMAP= cidfmap-adobe
-DEPENDS+= adobe-cidfonts-[0-9]*:../../fonts/adobe-cidfonts
-DEPENDS+= ghostscript-cidfonts-[0-9]*:../../fonts/ghostscript-cidfonts
-GCR_INSTALL_TYPE= adobe
+GS_CIDFMAP= cidfmap-adobe
+DEPENDS+= adobe-cidfonts-[0-9]*:../../fonts/adobe-cidfonts
+DEPENDS+= ghostscript-cidfonts-[0-9]*:../../fonts/ghostscript-cidfonts
+GCR_INSTALL_TYPE= adobe
.endif
# -------- motoya-fonts (TTF) requested -------------
.if !empty(PKG_OPTIONS:Mmotoya)
-GS_CIDFMAP= cidfmap-motoya
-DEPENDS+= ipafont-[0-9]*:../../fonts/motoya-fonts
-GCR_INSTALL_TYPE= ttf
+GS_CIDFMAP= cidfmap-motoya
+DEPENDS+= ipafont-[0-9]*:../../fonts/motoya-fonts
+GCR_INSTALL_TYPE= ttf
.endif
# -------- umefont (TTF) requested -------------
.if !empty(PKG_OPTIONS:Mumefont)
-GS_CIDFMAP= cidfmap-umefont
-DEPENDS+= ipafont-[0-9]*:../../fonts/umefont-ttf
-GCR_INSTALL_TYPE= ttf
+GS_CIDFMAP= cidfmap-umefont
+DEPENDS+= ipafont-[0-9]*:../../fonts/umefont-ttf
+GCR_INSTALL_TYPE= ttf
.endif
# -------- IPA (TTF) font requested -------------
.if !empty(PKG_OPTIONS:Mipa)
-GS_CIDFMAP= cidfmap-ipa
-DEPENDS+= ipafont-[0-9]*:../../fonts/ipafont
-GCR_INSTALL_TYPE= ttf
+GS_CIDFMAP= cidfmap-ipa
+DEPENDS+= ipafont-[0-9]*:../../fonts/ipafont
+GCR_INSTALL_TYPE= ttf
.endif
# fonts/ja-sazanami-ttf/DESCR:Free Japanese TrueType font based on Wada lab. font (CLWFK) and
diff --git a/gimmie/Makefile b/gimmie/Makefile
index a41c1c740a..26902ae8f8 100644
--- a/gimmie/Makefile
+++ b/gimmie/Makefile
@@ -9,11 +9,11 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://beatniksoftware.com/gimmie/
COMMENT= Creative panel replacement
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake intltool msgfmt pkg-config
-USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake intltool msgfmt pkg-config
+USE_LANGUAGES= c c++
PY_PATCHPLIST= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
diff --git a/git-modes-git/Makefile b/git-modes-git/Makefile
index 71f2b68e7d..a0ed1694ad 100644
--- a/git-modes-git/Makefile
+++ b/git-modes-git/Makefile
@@ -12,13 +12,13 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/magit/git-modes
COMMENT= Git-modes submodule for magit.el
-WRKSRC= ${WRKDIR}/git-modes
+WRKSRC= ${WRKDIR}/git-modes
USE_TOOLS+= gmake
-BUILD_TARGET= lisp
+BUILD_TARGET= lisp
INSTALLATION_DIRS= ${DESTDIR}${PREFIX}/share/emacs/site-lisp/git-modes
-AUTO_MKDIRS= yes
+AUTO_MKDIRS= yes
do-install:
${INSTALL_DATA_DIR} ${INSTALLATION_DIRS}
diff --git a/git-modes-git/buildlink3.mk b/git-modes-git/buildlink3.mk
index 38d3823c63..9954d06c2d 100644
--- a/git-modes-git/buildlink3.mk
+++ b/git-modes-git/buildlink3.mk
@@ -4,10 +4,10 @@ BUILDLINK_TREE+= git_modes
.if !defined(GIT_MODES_BUILDLINK3_MK)
GIT_MODES_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.git_modes?= git-modes-git-[0-9]*
-BUILDLINK_PKGSRCDIR.git_modes?= ../../wip/git-modes-git
+BUILDLINK_API_DEPENDS.git_modes?= git-modes-git-[0-9]*
+BUILDLINK_PKGSRCDIR.git_modes?= ../../wip/git-modes-git
-BUILDLINK_CONTENTS_FILTER.git_modes= ${EGREP} '.*\.el$$|.*\.elc$$'
+BUILDLINK_CONTENTS_FILTER.git_modes= ${EGREP} '.*\.el$$|.*\.elc$$'
.endif # GIT_MODES_BUILDLINK3_MK
diff --git a/gitlab/Makefile b/gitlab/Makefile
index e593103c0a..0af6971b0d 100644
--- a/gitlab/Makefile
+++ b/gitlab/Makefile
@@ -33,8 +33,8 @@ DEPENDS+= git-base-[0-9]*:../../devel/git-base
#EPENDS+= nodejs-[0-9]*:../../lang/nodejs
# Following lines are too late, passwd and groups should be made before this make
-PKG_GROUPS= gitlab
-PKG_USERS= git:gitlab
+PKG_GROUPS= gitlab
+PKG_USERS= git:gitlab
PKG_GECOS.gitlab= GitLab
# Actual install PATH (after INSTALL.script run), this can NOT be easily changed
@@ -48,7 +48,7 @@ FILES_SUBST+= DESTDIR_VAR=${DESTDIR:Q}${GITLAB_HOME:Q}
FILES_SUBST+= GITLAB_HOME=${GITLAB_HOME:Q}
FILES_SUBST+= RSYNC=${PREFIX:Q}/bin/rsync
-MESSAGE_SUBST+= GITLAB_HOME=${GITLAB_HOME:Q}
+MESSAGE_SUBST+= GITLAB_HOME=${GITLAB_HOME:Q}
SUBST_CLASSES+= conf.yml
SUBST_STAGE.conf.yml= post-build
diff --git a/gitlab/options.mk b/gitlab/options.mk
index 89de6b024f..b19d3e0830 100644
--- a/gitlab/options.mk
+++ b/gitlab/options.mk
@@ -1,17 +1,17 @@
# $NetBSD: options.mk,v 1.1 2014/02/13 03:39:33 makoto Exp $
### Set options
-PKG_OPTIONS_VAR= PKG_OPTIONS.gitlab
+PKG_OPTIONS_VAR= PKG_OPTIONS.gitlab
PKG_OPTIONS_OPTIONAL_GROUPS+= database
-PKG_OPTIONS_GROUP.database= mysql postgres sqlite3
+PKG_OPTIONS_GROUP.database= mysql postgres sqlite3
PKG_OPTIONS_OPTIONAL_GROUPS+= webserver
PKG_OPTIONS_GROUP.webserver= apache24 nginx
-PKG_OPTIONS_OPTIONAL_GROUPS+= database
-PKG_OPTIONS_GROUP.database= mysql postgres sqlite3
-PKG_SUGGESTED_OPTIONS= sqlite3 nginx
-PKG_SUGGESTED_OPTIONS= sqlite3 apache24
+PKG_OPTIONS_OPTIONAL_GROUPS+= database
+PKG_OPTIONS_GROUP.database= mysql postgres sqlite3
+PKG_SUGGESTED_OPTIONS= sqlite3 nginx
+PKG_SUGGESTED_OPTIONS= sqlite3 apache24
.include "../../mk/bsd.options.mk"
diff --git a/gjots2/Makefile b/gjots2/Makefile
index c2ead10b0c..d6bc8ce4c1 100644
--- a/gjots2/Makefile
+++ b/gjots2/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://bhepple.freeshell.org/gjots/
COMMENT= Jotter application for your Gnome desktop
LICENSE= gnu-gpl-v2
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG= yes
USE_TOOLS+= bash pkg-config
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2
diff --git a/gksu/Makefile b/gksu/Makefile
index a01a501034..17ed262bdd 100644
--- a/gksu/Makefile
+++ b/gksu/Makefile
@@ -11,13 +11,13 @@ COMMENT= Authorization dialog library
LICENSE= gnu-gpl-v2
USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES+= c c++ fortran
-USE_TOOLS+= bash:run gmake gsed intltool msgfmt msgmerge perl:build
-USE_TOOLS+= pkg-config xgettext
-GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES+= c c++ fortran
+USE_TOOLS+= bash:run gmake gsed intltool msgfmt msgmerge perl:build
+USE_TOOLS+= pkg-config xgettext
+GNU_CONFIGURE= yes
-USE_X11=YES
+USE_X11= YES
CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
diff --git a/gl2ps/Makefile b/gl2ps/Makefile
index d97f22ae25..066562f172 100644
--- a/gl2ps/Makefile
+++ b/gl2ps/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-lgpl-v2
WRKSRC= ${WRKDIR}/gl2ps-1.4.0-source
USE_CMAKE= yes
-DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glut/buildlink3.mk"
diff --git a/gle/Makefile b/gle/Makefile
index 8462394527..29468670b6 100644
--- a/gle/Makefile
+++ b/gle/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE= http://www.linas.org/gle/
COMMENT= GL subroutines for drawing tubing and extrusions
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE= platform/autoconf/gle-graphics.pc.in
diff --git a/gle/buildlink3.mk b/gle/buildlink3.mk
index 4d7d07d938..07c537aedd 100644
--- a/gle/buildlink3.mk
+++ b/gle/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= gle
.if !defined(GLE_BUILDLINK3_MK)
GLE_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3
+BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3
BUILDLINK_ABI_DEPENDS.gle+= gle>=3.1.0nb4
BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle
diff --git a/glib-java/buildlink3.mk b/glib-java/buildlink3.mk
index f997e2c726..cb25d6141f 100644
--- a/glib-java/buildlink3.mk
+++ b/glib-java/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= glib-java
GLIB_JAVA_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.glib-java+= glib-java>=0.2.5
-BUILDLINK_PKGSRCDIR.glib-java?= ../../wip/glib-java
+BUILDLINK_PKGSRCDIR.glib-java?= ../../wip/glib-java
.include "../../devel/glib2/buildlink3.mk"
diff --git a/glibc/Makefile b/glibc/Makefile
index 4925aa8b32..44b4b09b7f 100644
--- a/glibc/Makefile
+++ b/glibc/Makefile
@@ -19,10 +19,10 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/work
CFLAGS+= -I${PREFIX}/include
-CONFIGURE_SCRIPT=../${DISTNAME}/configure
-CONFIGURE_ARGS+=--disable-profile
-CONFIGURE_ARGS+=--enable-add-ons=linuxthreads
-CONFIGURE_ARGS+=--with-headers=${PREFIX}/include
+CONFIGURE_SCRIPT= ../${DISTNAME}/configure
+CONFIGURE_ARGS+= --disable-profile
+CONFIGURE_ARGS+= --enable-add-ons=linuxthreads
+CONFIGURE_ARGS+= --with-headers=${PREFIX}/include
BUILD_DEPENDS+= linux-kernel-headers-[0-9]*:../../wip/linux-kernel-headers
diff --git a/glkloader/Makefile b/glkloader/Makefile
index 95741d394f..67b3058540 100644
--- a/glkloader/Makefile
+++ b/glkloader/Makefile
@@ -14,8 +14,8 @@ DEPENDS+= glkterm-[0-9]*:../../wip/glkterm
USE_TOOLS+= perl
-DOCDIR= ${PREFIX}/share/doc/glkloader
-EGDIR= ${DOCDIR}/samples
+DOCDIR= ${PREFIX}/share/doc/glkloader
+EGDIR= ${DOCDIR}/samples
CONF_FILES= ${EGDIR}/glkloaderrc ${PKG_SYSCONFDIR}/glkloaderrc
post-install:
diff --git a/glkloader/buildlink3.mk b/glkloader/buildlink3.mk
index 4bd1e0e277..8f68257d99 100644
--- a/glkloader/buildlink3.mk
+++ b/glkloader/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= glkloader
GLKLOADER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.glkloader+= glkloader>=0.3.2
-BUILDLINK_PKGSRCDIR.glkloader?= ../../wip/glkloader
+BUILDLINK_PKGSRCDIR.glkloader?= ../../wip/glkloader
BUILDLINK_TRANSFORM+= l:glk:glkloader
BUILDLINK_TARGETS+= buildlink-glkloader-hook
diff --git a/glkterm/buildlink3.mk b/glkterm/buildlink3.mk
index ceada9d641..551ed2f927 100644
--- a/glkterm/buildlink3.mk
+++ b/glkterm/buildlink3.mk
@@ -17,8 +17,8 @@ buildlink-glkterm-hook:
${LN} -s Make.glkterm ${BUILDLINK_DIR}/include/glk/Make.glk
# uses halfkey (present since 1.6M)
-INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6-* NetBSD-1.6.*
-INCOMPAT_CURSES+= NetBSD-1.6[A-L]*
+INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6-* NetBSD-1.6.*
+INCOMPAT_CURSES+= NetBSD-1.6[A-L]*
.include "../../devel/ncurses/buildlink3.mk"
.endif # GLKTERM_BUILDLINK3_MK
diff --git a/gmetadom/Makefile b/gmetadom/Makefile
index e35dd63764..bfb428fa73 100644
--- a/gmetadom/Makefile
+++ b/gmetadom/Makefile
@@ -2,7 +2,7 @@
.include "Makefile.common"
-COMMENT=C++ bindings for GDome2 DOM implementaion
+COMMENT= C++ bindings for GDome2 DOM implementaion
CONFIGURE_ARGS+= --with-modules=gdome_cpp_smart
PKGCONFIG_OVERRIDE+= gdome2-cpp-smart.pc.in
diff --git a/gmetadom/Makefile.common b/gmetadom/Makefile.common
index 59febf980d..38fdd2476a 100644
--- a/gmetadom/Makefile.common
+++ b/gmetadom/Makefile.common
@@ -12,8 +12,8 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://gmetadom.sf.net/
LICENSE= gnu-lgpl-v2.1
-DISTINFO_FILE= ${.CURDIR}/../../wip/gmetadom/distinfo
-PATCHDIR= ${.CURDIR}/../../wip/gmetadom/patches
+DISTINFO_FILE= ${.CURDIR}/../../wip/gmetadom/distinfo
+PATCHDIR= ${.CURDIR}/../../wip/gmetadom/patches
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/gmetadom/buildlink3.mk b/gmetadom/buildlink3.mk
index 2500eef235..cd0d34d732 100644
--- a/gmetadom/buildlink3.mk
+++ b/gmetadom/buildlink3.mk
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= gmetadom
GMETADOM_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gmetadom+= gmetadom>=0.2.6
-BUILDLINK_PKGSRCDIR.gmetadom?= ../../wip/gmetadom
+BUILDLINK_PKGSRCDIR.gmetadom?= ../../wip/gmetadom
.include "../../textproc/gdome2/buildlink3.mk"
.endif # GMETADOM_BUILDLINK3_MK
diff --git a/gmrender-resurrect-git/Makefile b/gmrender-resurrect-git/Makefile
index 49d47bcafe..38aabe82e8 100644
--- a/gmrender-resurrect-git/Makefile
+++ b/gmrender-resurrect-git/Makefile
@@ -11,7 +11,7 @@ COMMENT= Resource efficient UPnP/DLNA renderer
LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= gmrender-resurrect
-GIT_REPO.gmrender-resurrect= git://github.com/hzeller/gmrender-resurrect.git
+GIT_REPO.gmrender-resurrect= git://github.com/hzeller/gmrender-resurrect.git
# not really hard depends, but without most of them, it's useless
DEPENDS+= gst-plugins1-bad-[0-9]*:../../multimedia/gst-plugins1-bad
diff --git a/gnome-activity-journal/Makefile b/gnome-activity-journal/Makefile
index 47af9d32b8..66582e4b1e 100644
--- a/gnome-activity-journal/Makefile
+++ b/gnome-activity-journal/Makefile
@@ -19,7 +19,7 @@ DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_TOOLS+= intltool
USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
GCONF_SCHEMAS+= extra/gnome-activity-journal.schemas
diff --git a/gnome-applets/Makefile b/gnome-applets/Makefile
index c98da797f7..3049619d23 100644
--- a/gnome-applets/Makefile
+++ b/gnome-applets/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --disable-cpufreq
EGDIR= ${PREFIX}/share/examples/gnome-applets
-GCONF_SCHEMAS= charpick.schemas
+GCONF_SCHEMAS= charpick.schemas
GCONF_SCHEMAS+= drivemount.schemas
GCONF_SCHEMAS+= geyes.schemas
#GCONF_SCHEMAS+= gswitchit.schemas
@@ -39,7 +39,7 @@ GCONF_SCHEMAS+= stickynotes.schemas
PLIST_VARS+= battstat
.if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" || \
(${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h))
-GCONF_SCHEMAS+= battstat.schemas
+GCONF_SCHEMAS+= battstat.schemas
PLIST.battstat= yes
CONF_FILES+= ${EGDIR}/sound/events/battstat_applet.soundlist \
${PKG_SYSCONFDIR}/sound/events/battstat_applet.soundlist
@@ -52,7 +52,7 @@ PRINT_PLIST_AWK+= /examples/ { print "$${PLIST.battstat}"$$0; next; }
.include "../../devel/GConf/schemas.mk"
-PY_PATCHPLIST= yes
+PY_PATCHPLIST= yes
REPLACE_PYTHON+= invest-applet/invest/invest-applet.py
REPLACE_PYTHON+= invest-applet/invest/invest-chart
diff --git a/gnome-keyring-sharp/options.mk b/gnome-keyring-sharp/options.mk
index 121057e0a1..cd998d2fe6 100644
--- a/gnome-keyring-sharp/options.mk
+++ b/gnome-keyring-sharp/options.mk
@@ -1,6 +1,6 @@
# $NetBSD: options.mk,v 1.2 2009/04/19 23:16:56 thomasklausner Exp $
-PKG_OPTIONS_VAR=PKG_OPTIONS.gnome-keyring-sharp
+PKG_OPTIONS_VAR= PKG_OPTIONS.gnome-keyring-sharp
PKG_SUPPORTED_OPTIONS= ndesk-dbus
PKG_SUGGESTED_OPTIONS= ndesk-dbus
diff --git a/gnome-panel/Makefile b/gnome-panel/Makefile
index 516a88444e..a3fcc52426 100644
--- a/gnome-panel/Makefile
+++ b/gnome-panel/Makefile
@@ -14,13 +14,13 @@ COMMENT= GNOME3 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_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2
@@ -49,7 +49,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
diff --git a/gnome-panel/buildlink3.mk b/gnome-panel/buildlink3.mk
index bb537e1505..5d6dbf7f4f 100644
--- a/gnome-panel/buildlink3.mk
+++ b/gnome-panel/buildlink3.mk
@@ -5,8 +5,8 @@ BUILDLINK_TREE+= gnome-panel
.if !defined(GNOME_PANEL_BUILDLINK3_MK)
GNOME_PANEL_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=3.16.1
-BUILDLINK_PKGSRCDIR.gnome-panel?= ../../wip/gnome-panel
+BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=3.16.1
+BUILDLINK_PKGSRCDIR.gnome-panel?= ../../wip/gnome-panel
pkgbase:= gnome-panel
.include "../../mk/pkg-build-options.mk"
diff --git a/gnome-settings-daemon/Makefile b/gnome-settings-daemon/Makefile
index 756cb396c5..28cc9cd56e 100644
--- a/gnome-settings-daemon/Makefile
+++ b/gnome-settings-daemon/Makefile
@@ -19,20 +19,20 @@ USE_TOOLS+= pkg-config intltool gmake msgfmt
CONFLICTS+= gnome-control-center<2.22.0
-CONFIGURE_ARGS= --disable-gudev
+CONFIGURE_ARGS= --disable-gudev
CONFIGURE_ARGS+= --disable-rfkill
CONFIGURE_ARGS+= --disable-network-manager
PYTHON_VERSIONS_ACCEPTED= 27
-GCONF_SCHEMAS+= gnome-settings-daemon.schemas
-GCONF_SCHEMAS+= desktop_gnome_font_rendering.schemas
-GCONF_SCHEMAS+= desktop_gnome_keybindings.schemas
-GCONF_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
-GCONF_SCHEMAS+= apps_gnome_settings_daemon_xrandr.schemas
-GCONF_SCHEMAS+= apps_gnome_settings_daemon_housekeeping.schemas
-GCONF_SCHEMAS+= desktop_gnome_peripherals_touchpad.schemas
-GCONF_SCHEMAS+= desktop_gnome_peripherals_smartcard.schemas
+GCONF_SCHEMAS+= gnome-settings-daemon.schemas
+GCONF_SCHEMAS+= desktop_gnome_font_rendering.schemas
+GCONF_SCHEMAS+= desktop_gnome_keybindings.schemas
+GCONF_SCHEMAS+= apps_gnome_settings_daemon_keybindings.schemas
+GCONF_SCHEMAS+= apps_gnome_settings_daemon_xrandr.schemas
+GCONF_SCHEMAS+= apps_gnome_settings_daemon_housekeeping.schemas
+GCONF_SCHEMAS+= desktop_gnome_peripherals_touchpad.schemas
+GCONF_SCHEMAS+= desktop_gnome_peripherals_smartcard.schemas
PKGCONFIG_OVERRIDE+= data/gnome-settings-daemon.pc.in
.include "../../audio/pulseaudio/buildlink3.mk"
diff --git a/gnome-tracker/Makefile b/gnome-tracker/Makefile
index ba5def87ce..12d2c2e655 100644
--- a/gnome-tracker/Makefile
+++ b/gnome-tracker/Makefile
@@ -19,18 +19,18 @@ USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config intltool gmake
PKG_SYSCONFSUBDIR= xdg/autostart
-MAKE_DIRS+= ${PKG_SYSCONFDIR}
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-extract.desktop \
- ${PKG_SYSCONFDIR}/tracker-extract.desktop
-CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-miner-apps.desktop \
- ${PKG_SYSCONFDIR}/tracker-miner-apps.desktop
-CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-miner-fs.desktop \
- ${PKG_SYSCONFDIR}/tracker-miner-fs.desktop
-CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-miner-user-guides.desktop \
- ${PKG_SYSCONFDIR}/tracker-miner-user-guides.desktop
-CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-store.desktop \
- ${PKG_SYSCONFDIR}/tracker-store.desktop
+MAKE_DIRS+= ${PKG_SYSCONFDIR}
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-extract.desktop \
+ ${PKG_SYSCONFDIR}/tracker-extract.desktop
+CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-miner-apps.desktop \
+ ${PKG_SYSCONFDIR}/tracker-miner-apps.desktop
+CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-miner-fs.desktop \
+ ${PKG_SYSCONFDIR}/tracker-miner-fs.desktop
+CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-miner-user-guides.desktop \
+ ${PKG_SYSCONFDIR}/tracker-miner-user-guides.desktop
+CONF_FILES+= ${EGDIR}/xdg/autostart/tracker-store.desktop \
+ ${PKG_SYSCONFDIR}/tracker-store.desktop
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
diff --git a/gnormalize/Makefile b/gnormalize/Makefile
index d7d3234de1..39bcceb6e2 100644
--- a/gnormalize/Makefile
+++ b/gnormalize/Makefile
@@ -15,7 +15,7 @@ DEPENDS+= p5-MP3-Info>=1:../../audio/p5-MP3-Info
USE_TOOLS+= perl
NO_BUILD= YES
-REPLACE_PERL=${WRKSRC}/gnormalize
+REPLACE_PERL= ${WRKSRC}/gnormalize
INSTALLATION_DIRS= bin
diff --git a/gnubg-cvs/Makefile b/gnubg-cvs/Makefile
index 5326e0e2b0..755273eb56 100644
--- a/gnubg-cvs/Makefile
+++ b/gnubg-cvs/Makefile
@@ -15,7 +15,7 @@ CVS_MODULE.gnubg= gnubg
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= automake autoconf bison flex gmake pkg-config
+USE_TOOLS+= automake autoconf bison flex gmake pkg-config
pre-configure:
cd ${WRKSRC} && sh autogen.sh
diff --git a/gnucash-devel/PLIST b/gnucash-devel/PLIST
index c2ab925118..e53594fe47 100644
--- a/gnucash-devel/PLIST
+++ b/gnucash-devel/PLIST
@@ -233,13 +233,13 @@ lib/gnucash/libgncmod-csv-import.la
lib/gnucash/libgncmod-customer-import.la
lib/gnucash/libgncmod-engine.la
lib/gnucash/libgncmod-generic-import.la
-${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
lib/gnucash/libgncmod-gnome-search.la
lib/gnucash/libgncmod-gnome-utils.la
lib/gnucash/libgncmod-html.la
lib/gnucash/libgncmod-ledger-core.la
lib/gnucash/libgncmod-locale-reports-us.la
lib/gnucash/libgncmod-log-replay.la
+${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
lib/gnucash/libgncmod-qif-import.la
lib/gnucash/libgncmod-qif.la
lib/gnucash/libgncmod-register-core.la
diff --git a/gnucash-devel/options.mk b/gnucash-devel/options.mk
index 35676652f6..4cdd2f03e0 100644
--- a/gnucash-devel/options.mk
+++ b/gnucash-devel/options.mk
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --disable-ofx
.if !empty(PKG_OPTIONS:Mlibdbi)
CONFIGURE_ARGS+= --enable-dbi
-PLIST.dbi= yes
+PLIST.dbi= yes
# to make a configure test happy
BUILD_DEPENDS+= libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
@@ -27,11 +27,11 @@ CONFIGURE_ARGS+= --disable-dbi
.endif
.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+= --enable-python
+CONFIGURE_ARGS+= --enable-python
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.6.1
-REPLACE_PYTHON+= src/python/pycons/*.py src/python/pycons/pycons
-PY_PATCHPLIST= yes
-PLIST_SRC+= PLIST.python
+REPLACE_PYTHON+= src/python/pycons/*.py src/python/pycons/pycons
+PY_PATCHPLIST= yes
+PLIST_SRC+= PLIST.python
DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
# /usr/pkg/share/gnucash/python/pycons/console.py imports readline
diff --git a/gnucash-git/PLIST b/gnucash-git/PLIST
index 80ce076f36..c05dad6194 100644
--- a/gnucash-git/PLIST
+++ b/gnucash-git/PLIST
@@ -233,13 +233,13 @@ lib/gnucash/libgncmod-csv-import.la
lib/gnucash/libgncmod-customer-import.la
lib/gnucash/libgncmod-engine.la
lib/gnucash/libgncmod-generic-import.la
-${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
lib/gnucash/libgncmod-gnome-search.la
lib/gnucash/libgncmod-gnome-utils.la
lib/gnucash/libgncmod-html.la
lib/gnucash/libgncmod-ledger-core.la
lib/gnucash/libgncmod-locale-reports-us.la
lib/gnucash/libgncmod-log-replay.la
+${PLIST.ofx}lib/gnucash/libgncmod-ofx.la
lib/gnucash/libgncmod-qif-import.la
lib/gnucash/libgncmod-qif.la
lib/gnucash/libgncmod-register-core.la
diff --git a/gnucash-git/options.mk b/gnucash-git/options.mk
index 35676652f6..4cdd2f03e0 100644
--- a/gnucash-git/options.mk
+++ b/gnucash-git/options.mk
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --disable-ofx
.if !empty(PKG_OPTIONS:Mlibdbi)
CONFIGURE_ARGS+= --enable-dbi
-PLIST.dbi= yes
+PLIST.dbi= yes
# to make a configure test happy
BUILD_DEPENDS+= libdbi-driver-sqlite3-[0-9]*:../../databases/libdbi-driver-sqlite3
@@ -27,11 +27,11 @@ CONFIGURE_ARGS+= --disable-dbi
.endif
.if !empty(PKG_OPTIONS:Mpython)
-CONFIGURE_ARGS+= --enable-python
+CONFIGURE_ARGS+= --enable-python
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.6.1
-REPLACE_PYTHON+= src/python/pycons/*.py src/python/pycons/pycons
-PY_PATCHPLIST= yes
-PLIST_SRC+= PLIST.python
+REPLACE_PYTHON+= src/python/pycons/*.py src/python/pycons/pycons
+PY_PATCHPLIST= yes
+PLIST_SRC+= PLIST.python
DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
# /usr/pkg/share/gnucash/python/pycons/console.py imports readline
diff --git a/gnujump/Makefile b/gnujump/Makefile
index e5a147f230..38c94064f2 100644
--- a/gnujump/Makefile
+++ b/gnujump/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/gnump3d/Makefile b/gnump3d/Makefile
index 73f1eb528d..3425859457 100644
--- a/gnump3d/Makefile
+++ b/gnump3d/Makefile
@@ -15,9 +15,9 @@ CFGFILE= ${PKG_SYSCONFDIR}/gnump3d/gnump3d.conf
RCD_SCRIPTS= gnump3d
CONF_FILES= none ${CFGFILE}
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl
REPLACE_PERL= ${WRKSRC}/bin/*
-NO_BUILD= yes
+NO_BUILD= yes
SUBST_CLASSES+= gnump3d
SUBST_FILES.gnump3d= bin/gnump3d-index bin/gnump3d-top bin/gnump3d2 \
diff --git a/gnunet/options.mk b/gnunet/options.mk
index 5e4b5904bf..dcb3d4116c 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -1,11 +1,11 @@
# $NetBSD: options.mk,v 1.5 2012/06/12 15:46:34 thomasklausner Exp $
#
-PKG_OPTIONS_VAR= PKG_OPTIONS.gnunet
+PKG_OPTIONS_VAR= PKG_OPTIONS.gnunet
PKG_OPTIONS_REQUIRED_GROUPS= security
PKG_OPTIONS_GROUP.security= libgcrypt ssl
-PKG_SUPPORTED_OPTIONS= bdb gdbm inet6 tdb
-PKG_SUGGESTED_OPTIONS= inet6
+PKG_SUPPORTED_OPTIONS= bdb gdbm inet6 tdb
+PKG_SUGGESTED_OPTIONS= inet6
# some sane defaults to use base OS functionality where appropriate
.if !empty(OPSYS:M*BSD)
diff --git a/gnuradio-core/Makefile.common b/gnuradio-core/Makefile.common
index b434e4b8fe..3a0c7f5300 100644
--- a/gnuradio-core/Makefile.common
+++ b/gnuradio-core/Makefile.common
@@ -33,8 +33,8 @@
DISTNAME?= gnuradio-${VERSION}
CATEGORIES+= ham
-MASTER_SITES= http://s3-dist.gnuradio.org/
-MASTER_SITES= http://gnuradio.org/releases/gnuradio/
+MASTER_SITES= http://s3-dist.gnuradio.org/
+MASTER_SITES= http://gnuradio.org/releases/gnuradio/
MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE?= http://www.gnu.org/software/gnuradio/
@@ -51,7 +51,7 @@ DEPENDS+= ${PYPKGPREFIX}-qwt-qt4-[0-9]*:../../x11/py-qwt-qt4
DISTINFO_FILE= ${.CURDIR}/../../wip/gnuradio-core/distinfo
PATCHDIR= ${.CURDIR}/../../wip/gnuradio-core/patches
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 3.3.0
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 3.3.0
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
PY_PATCHPLIST= yes
diff --git a/gnuradio-core/Makefile.version b/gnuradio-core/Makefile.version
index 5b60a7db98..4dec01aa06 100644
--- a/gnuradio-core/Makefile.version
+++ b/gnuradio-core/Makefile.version
@@ -1,3 +1,3 @@
# $NetBSD: Makefile.version,v 1.5 2015/09/17 13:48:04 makoto Exp $
-VERSION= 3.7.9.1
+VERSION= 3.7.9.1
diff --git a/gnuradio-core/options.mk b/gnuradio-core/options.mk
index e717dff236..192e75504d 100644
--- a/gnuradio-core/options.mk
+++ b/gnuradio-core/options.mk
@@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.17 2015/09/17 13:48:04 makoto Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
-PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
+PKG_OPTIONS_VAR= PKG_OPTIONS.gnuradio
+PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
# ninja-build is said supported, but not working
# alas is said supported, but not good on NetBSD
@@ -10,7 +10,7 @@ PKG_SUPPORTED_OPTIONS= ninja-build filter-design alsa
# FAILED: cd /PATH/wip/gnuradio-core/work/gnuradio-3.7.5/build/gr-audio/swig && ""
# : permission denied
-PKG_SUGGESTED_OPTIONS= filter-design
+PKG_SUGGESTED_OPTIONS= filter-design
.include "../../mk/bsd.options.mk"
diff --git a/gnuradio-default/Makefile b/gnuradio-default/Makefile
index a52fc7d264..50fc747c2a 100644
--- a/gnuradio-default/Makefile
+++ b/gnuradio-default/Makefile
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.10 2015/02/07 22:08:46 tnn2 Exp $
-PKGNAME= gnuradio-default-${VERSION}
-COMMENT= Full package of gnuradio (conflict to meta-pkgs)
-INSTALLATION_DIRS+= ${EGDIR}
+PKGNAME= gnuradio-default-${VERSION}
+COMMENT= Full package of gnuradio (conflict to meta-pkgs)
+INSTALLATION_DIRS+= ${EGDIR}
# The half of the same target in Nocore.mk
post-install:
diff --git a/gnuradio-default/buildlink3.mk b/gnuradio-default/buildlink3.mk
index 19a10776b8..800389df0e 100644
--- a/gnuradio-default/buildlink3.mk
+++ b/gnuradio-default/buildlink3.mk
@@ -7,7 +7,7 @@ GNURADIO_DEFAULT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-default+= gnuradio-default>=3.7.5
BUILDLINK_ABI_DEPENDS.gnuradio-default+= gnuradio-default>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-default?= ../../wip/gnuradio-default
+BUILDLINK_PKGSRCDIR.gnuradio-default?= ../../wip/gnuradio-default
.endif # GNURADIO_DEFAULT_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-default
diff --git a/gnuradio-digital/buildlink3.mk b/gnuradio-digital/buildlink3.mk
index 48695d6030..b6719428c9 100644
--- a/gnuradio-digital/buildlink3.mk
+++ b/gnuradio-digital/buildlink3.mk
@@ -7,7 +7,7 @@ GNURADIO_DIGITAL_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-digital+= gnuradio-digital>=3.7.5
BUILDLINK_ABI_DEPENDS.gnuradio-digital+= gnuradio-digital>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-digital?= ../../wip/gnuradio-digital
+BUILDLINK_PKGSRCDIR.gnuradio-digital?= ../../wip/gnuradio-digital
.endif # GNURADIO_DIGITAL_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-digital
diff --git a/gnuradio-trellis/buildlink3.mk b/gnuradio-trellis/buildlink3.mk
index 540940f664..ac18138a5f 100644
--- a/gnuradio-trellis/buildlink3.mk
+++ b/gnuradio-trellis/buildlink3.mk
@@ -7,7 +7,7 @@ GNURADIO_TRELLIS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-trellis+= gnuradio-trellis>=3.7.5
BUILDLINK_ABI_DEPENDS.gnuradio-trellis+= gnuradio-trellis>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-trellis?= ../../wip/gnuradio-trellis
+BUILDLINK_PKGSRCDIR.gnuradio-trellis?= ../../wip/gnuradio-trellis
.endif # GNURADIO_TRELLIS_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-trellis
diff --git a/gnuradio-vocoder/buildlink3.mk b/gnuradio-vocoder/buildlink3.mk
index 180ef99dde..4f8a7d4848 100644
--- a/gnuradio-vocoder/buildlink3.mk
+++ b/gnuradio-vocoder/buildlink3.mk
@@ -7,7 +7,7 @@ GNURADIO_VOCODER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-vocoder+= gnuradio-vocoder>=3.7.5
BUILDLINK_ABI_DEPENDS.gnuradio-vocoder+= gnuradio-vocoder>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-vocoder?= ../../wip/gnuradio-vocoder
+BUILDLINK_PKGSRCDIR.gnuradio-vocoder?= ../../wip/gnuradio-vocoder
.endif # GNURADIO_VOCODER_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-vocoder
diff --git a/gnuradio-wavelet/buildlink3.mk b/gnuradio-wavelet/buildlink3.mk
index 8b64363ba9..968c8290db 100644
--- a/gnuradio-wavelet/buildlink3.mk
+++ b/gnuradio-wavelet/buildlink3.mk
@@ -7,7 +7,7 @@ GNURADIO_WAVELET_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnuradio-wavelet+= gnuradio-wavelet>=3.7.5
BUILDLINK_ABI_DEPENDS.gnuradio-wavelet+= gnuradio-wavelet>=3.7.5
-BUILDLINK_PKGSRCDIR.gnuradio-wavelet?= ../../wip/gnuradio-wavelet
+BUILDLINK_PKGSRCDIR.gnuradio-wavelet?= ../../wip/gnuradio-wavelet
.endif # GNURADIO_WAVELET_BUILDLINK3_MK
BUILDLINK_TREE+= -gnuradio-wavelet
diff --git a/gnuradio/Makefile b/gnuradio/Makefile
index 2200b0167d..61e100119d 100644
--- a/gnuradio/Makefile
+++ b/gnuradio/Makefile
@@ -4,7 +4,7 @@ META_PACKAGE= yes
.include "../../wip/gnuradio-core/Makefile.version"
-DISTNAME= gnuradio-${VERSION}
+DISTNAME= gnuradio-${VERSION}
CATEGORIES= meta-pkgs ham
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/go-backoff/Makefile b/go-backoff/Makefile
index 7dc08b990e..1d7dba9a43 100644
--- a/go-backoff/Makefile
+++ b/go-backoff/Makefile
@@ -2,10 +2,10 @@
#
DISTNAME= go-backoff-20141124
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=cenkalti/}
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GITHUB:=cenkalti/}
GITHUB_PROJECT= backoff
-GITHUB_TAG= 9831e1e25c
+GITHUB_TAG= 9831e1e25c
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/cenkalti/backoff
diff --git a/go-collectd/buildlink3.mk b/go-collectd/buildlink3.mk
index 51d3c5f650..0d9f98ffc5 100644
--- a/go-collectd/buildlink3.mk
+++ b/go-collectd/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-collectd
GO_COLLECTD_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-collectd= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-collectd?= build
+BUILDLINK_DEPMETHOD.go-collectd?= build
BUILDLINK_API_DEPENDS.go-collectd+= go-collectd>=20150830
BUILDLINK_PKGSRCDIR.go-collectd?= ../../wip/go-collectd
diff --git a/go-flags/buildlink3.mk b/go-flags/buildlink3.mk
index 113c83667b..1c5f9e57be 100644
--- a/go-flags/buildlink3.mk
+++ b/go-flags/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-flags= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-flags?= build
BUILDLINK_API_DEPENDS.go-flags+= go-flags>=1.3.0
-BUILDLINK_PKGSRCDIR.go-flags?= ../../wip/go-flags
+BUILDLINK_PKGSRCDIR.go-flags?= ../../wip/go-flags
.endif # GO_FLAGS_BUILDLINK3_MK
BUILDLINK_TREE+= -go-flags
diff --git a/go-fsnotify/Makefile b/go-fsnotify/Makefile
index 6fc296ae21..828ab15bff 100644
--- a/go-fsnotify/Makefile
+++ b/go-fsnotify/Makefile
@@ -2,10 +2,10 @@
#
DISTNAME= go-fsnotify-1.2.0
-GITHUB_PROJECT= fsnotify
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_GITHUB:=go-fsnotify/}
-GITHUB_TAG= v${PKGVERSION_NOREV}
+GITHUB_PROJECT= fsnotify
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_GITHUB:=go-fsnotify/}
+GITHUB_TAG= v${PKGVERSION_NOREV}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://fsnotify.org/
diff --git a/go-humanize/buildlink3.mk b/go-humanize/buildlink3.mk
index b02730b422..d3f88d98b5 100644
--- a/go-humanize/buildlink3.mk
+++ b/go-humanize/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-humanize
GO_HUMANIZE_BUILDLINK3_MK:=
BUILDLINK_CONTENTS_FILTER.go-humanize= ${EGREP} gopkg/
-BUILDLINK_DEPMETHOD.go-humanize?= build
+BUILDLINK_DEPMETHOD.go-humanize?= build
BUILDLINK_API_DEPENDS.go-humanize+= go-humanize>=0.0.1
BUILDLINK_PKGSRCDIR.go-humanize?= ../../wip/go-humanize
diff --git a/go-notify/buildlink3.mk b/go-notify/buildlink3.mk
index b9722135c9..5d245a60d8 100644
--- a/go-notify/buildlink3.mk
+++ b/go-notify/buildlink3.mk
@@ -7,7 +7,7 @@ GO_NOTIFY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.go-notify+= go-notify>=20150316
BUILDLINK_DEPMETHOD.go-notify?= build
-BUILDLINK_PKGSRCDIR.go-notify?= ../../wip/go-notify
+BUILDLINK_PKGSRCDIR.go-notify?= ../../wip/go-notify
.endif # GO_NOTIFY_BUILDLINK3_MK
BUILDLINK_TREE+= -go-notify
diff --git a/go-rateio/buildlink3.mk b/go-rateio/buildlink3.mk
index 67d4ed7439..07bdc45ce2 100644
--- a/go-rateio/buildlink3.mk
+++ b/go-rateio/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-rateio= ${EGREP} gopkg/
BUILDLINK_DEPMETHOD.go-rateio?= build
BUILDLINK_API_DEPENDS.go-rateio+= go-rateio>=0.0.1
-BUILDLINK_PKGSRCDIR.go-rateio?= ../../wip/go-rateio
+BUILDLINK_PKGSRCDIR.go-rateio?= ../../wip/go-rateio
.endif # GO_RATEIO_BUILDLINK3_MK
BUILDLINK_TREE+= -go-rateio
diff --git a/go-upspin/Makefile b/go-upspin/Makefile
index 337423eb69..bade504214 100644
--- a/go-upspin/Makefile
+++ b/go-upspin/Makefile
@@ -1,10 +1,10 @@
# $NetBSD$
DISTNAME= upspin
-PKGNAME= go-${DISTNAME}-19012018
+PKGNAME= go-${DISTNAME}-19012018
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GITHUB:=upspin/}
-GITHUB_TAG= 92dbfa892997e629cf73c00784cecb212ec9f056
+GITHUB_TAG= 92dbfa892997e629cf73c00784cecb212ec9f056
GITHUB_PROJECT= ${PKGBASE:S/^go-//}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -12,14 +12,14 @@ HOMEPAGE= https://upspin.io/
COMMENT= Secure, shared, distributed, information system
LICENSE= modified-bsd
-GO_SRCPATH= upspin.io
-GO_BUILD_PATTERN= ${GO_SRCPATH}/cmd/...
-GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}
+GO_SRCPATH= upspin.io
+GO_BUILD_PATTERN= ${GO_SRCPATH}/cmd/...
+GO_DIST_BASE= ${DISTNAME}-${GITHUB_TAG}
-REPLACE_BASH= cmd/upspin/mkdoc.sh
-REPLACE_BASH+= cmd/upspinfs/scripts/fstabfortest
-REPLACE_BASH+= cmd/upspinfs/scripts/mount_darwin
-REPLACE_BASH+= cmd/upspinfs/scripts/mount_linux
+REPLACE_BASH= cmd/upspin/mkdoc.sh
+REPLACE_BASH+= cmd/upspinfs/scripts/fstabfortest
+REPLACE_BASH+= cmd/upspinfs/scripts/mount_darwin
+REPLACE_BASH+= cmd/upspinfs/scripts/mount_linux
post-patch:
${FIND} ${WRKSRC} -type f -name \*.orig -delete
diff --git a/go/Makefile b/go/Makefile
index bef59a6f2a..23dcec44cf 100644
--- a/go/Makefile
+++ b/go/Makefile
@@ -23,8 +23,8 @@ USE_TOOLS+= bash:run perl:run pax
TMPDIR?= /tmp
BUILDLINK_PASSTHRU_DIRS+= ${TMPDIR}
-GOROOT_FINAL= ${PREFIX}/go
-INSTALLATION_DIRS= bin
+GOROOT_FINAL= ${PREFIX}/go
+INSTALLATION_DIRS= bin
REPLACE_BASH+= doc/articles/wiki/test.bash
REPLACE_BASH+= doc/codewalk/run
diff --git a/go/version.mk b/go/version.mk
index 725839893b..8f637cbd74 100644
--- a/go/version.mk
+++ b/go/version.mk
@@ -8,14 +8,14 @@ GO14_VERSION= 1.4.3
ONLY_FOR_PLATFORM= *-*-i386 *-*-x86_64 *-*-*arm*
NOT_FOR_PLATFORM= SunOS-*-i386
.if ${MACHINE_ARCH} == "i386"
-GOARCH= 386
-GOCHAR= 8
+GOARCH= 386
+GOCHAR= 8
.elif ${MACHINE_ARCH} == "x86_64"
-GOARCH= amd64
-GOCHAR= 6
+GOARCH= amd64
+GOCHAR= 6
.elif !empty(MACHINE_ARCH:M*arm*)
-GOARCH= arm
-GOCHAR= 5
+GOARCH= arm
+GOCHAR= 5
.endif
-PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
-PLIST_SUBST+= GOCHAR=${GOCHAR:Q}
+PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
+PLIST_SUBST+= GOCHAR=${GOCHAR:Q}
diff --git a/goattracker/Makefile b/goattracker/Makefile
index 0dcdeef571..6aa9ea8f30 100644
--- a/goattracker/Makefile
+++ b/goattracker/Makefile
@@ -7,7 +7,7 @@ CATEGORIES= audio
MASTER_SITES= http://cadaver.homeftp.net/tools/
EXTRACT_SUFX= .zip
-MAINTAINER= rodo%zlug.org@localhost
+MAINTAINER= rodo%zlug.org@localhost
HOMEPAGE= http://cadaver.homeftp.net/tools/
COMMENT= Crossplatform C64 Music Editor
diff --git a/golly/Makefile b/golly/Makefile
index 32daa2967e..3220bcdd61 100644
--- a/golly/Makefile
+++ b/golly/Makefile
@@ -19,8 +19,8 @@ USE_TOOLS= make
CONFIGURE_DIRS= gui-wx/configure
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+="CFLAGS=--std=c99" # for long long in luaconf.h -> limits.h
-CONFIGURE_ARGS+="--with-python-shlib=libpython2.7.so"
+CONFIGURE_ARGS+= "CFLAGS=--std=c99" # for long long in luaconf.h -> limits.h
+CONFIGURE_ARGS+= "--with-python-shlib=libpython2.7.so"
.include "../../graphics/MesaLib/buildlink3.mk"
#.include "../../lang/lua/buildlink3.mk" # uses its own built-in version 5.2
diff --git a/golly/PLIST b/golly/PLIST
index 75d434c862..be1a79b983 100644
--- a/golly/PLIST
+++ b/golly/PLIST
@@ -1,18 +1,185 @@
@comment $NetBSD$
-bin/golly
bin/bgolly
+bin/golly
share/doc/golly/License.html
share/doc/golly/ReadMe.html
-share/golly/Patterns/Life/Rakes/2c5-engineless-rake-p185.rle
-share/golly/Patterns/Life/Rakes/2c5-spaceship-rake-p240.rle
-share/golly/Patterns/Life/Rakes/basic-rakes.rle
-share/golly/Patterns/Life/Rakes/c2-Cordership-rake.rle
-share/golly/Patterns/Life/Rakes/c3-forward-rake-p333.rle
-share/golly/Patterns/Life/Rakes/c4-sideways-rake.rle
-share/golly/Patterns/Life/Rakes/c5-adjustable-rake.rle
-share/golly/Patterns/Life/Rakes/forward-LWSS-rake-p90.rle
-share/golly/Patterns/Life/Rakes/p270-frothing-puffer-rake.rle
-share/golly/Patterns/Life/Rakes/spider-rake.rle
+share/golly/Help/Algorithms/Generations.html
+share/golly/Help/Algorithms/HashLife.html
+share/golly/Help/Algorithms/JvN.html
+share/golly/Help/Algorithms/Larger_than_Life.html
+share/golly/Help/Algorithms/QuickLife.html
+share/golly/Help/Algorithms/RuleLoader.html
+share/golly/Help/Algorithms/extended.png
+share/golly/Help/Algorithms/hensel.png
+share/golly/Help/Lexicon/lex.htm
+share/golly/Help/Lexicon/lex_1.htm
+share/golly/Help/Lexicon/lex_a.htm
+share/golly/Help/Lexicon/lex_b.htm
+share/golly/Help/Lexicon/lex_bib.htm
+share/golly/Help/Lexicon/lex_c.htm
+share/golly/Help/Lexicon/lex_d.htm
+share/golly/Help/Lexicon/lex_e.htm
+share/golly/Help/Lexicon/lex_f.htm
+share/golly/Help/Lexicon/lex_g.htm
+share/golly/Help/Lexicon/lex_h.htm
+share/golly/Help/Lexicon/lex_i.htm
+share/golly/Help/Lexicon/lex_j.htm
+share/golly/Help/Lexicon/lex_k.htm
+share/golly/Help/Lexicon/lex_l.htm
+share/golly/Help/Lexicon/lex_m.htm
+share/golly/Help/Lexicon/lex_n.htm
+share/golly/Help/Lexicon/lex_o.htm
+share/golly/Help/Lexicon/lex_p.htm
+share/golly/Help/Lexicon/lex_q.htm
+share/golly/Help/Lexicon/lex_r.htm
+share/golly/Help/Lexicon/lex_s.htm
+share/golly/Help/Lexicon/lex_t.htm
+share/golly/Help/Lexicon/lex_u.htm
+share/golly/Help/Lexicon/lex_v.htm
+share/golly/Help/Lexicon/lex_w.htm
+share/golly/Help/Lexicon/lex_x.htm
+share/golly/Help/Lexicon/lex_y.htm
+share/golly/Help/Lexicon/lex_z.htm
+share/golly/Help/Lexicon/modify.pl
+share/golly/Help/about.html
+share/golly/Help/algos.html
+share/golly/Help/archives.html
+share/golly/Help/bounded.html
+share/golly/Help/changes.html
+share/golly/Help/changes.html~
+share/golly/Help/control.html
+share/golly/Help/credits.html
+share/golly/Help/edit.html
+share/golly/Help/file.html
+share/golly/Help/formats.html
+share/golly/Help/help.html
+share/golly/Help/images/about.gif
+share/golly/Help/images/blend0.png
+share/golly/Help/images/blend1.png
+share/golly/Help/images/clips.png
+share/golly/Help/images/hex.png
+share/golly/Help/images/layers.png
+share/golly/Help/images/lifeviewer.png
+share/golly/Help/images/theme.png
+share/golly/Help/images/transforms.png
+share/golly/Help/index.html
+share/golly/Help/intro.html
+share/golly/Help/layer.html
+share/golly/Help/lifeviewer.html
+share/golly/Help/lua.html
+share/golly/Help/lua.html~
+share/golly/Help/mouse.html
+share/golly/Help/overlay.html
+share/golly/Help/problems.html
+share/golly/Help/python.html
+share/golly/Help/refs.html
+share/golly/Help/tips.html
+share/golly/Help/view.html
+share/golly/Patterns/Generations/Banner.mcl
+share/golly/Patterns/Generations/Bloomerang.mcl
+share/golly/Patterns/Generations/Burst.mcl
+share/golly/Patterns/Generations/Caterpillars.mcl
+share/golly/Patterns/Generations/Delta.rle
+share/golly/Patterns/Generations/Ebb-and-Flow.mcl
+share/golly/Patterns/Generations/Fireworks.mcl
+share/golly/Patterns/Generations/Lava.mcl
+share/golly/Patterns/Generations/Lines.mcl
+share/golly/Patterns/Generations/MeteorGuns.mcl
+share/golly/Patterns/Generations/Nova.mcl
+share/golly/Patterns/Generations/Perfect-spiral.mcl
+share/golly/Patterns/Generations/Sawfish.rle
+share/golly/Patterns/Generations/SediMental.mcl
+share/golly/Patterns/Generations/Steeplechase.mcl
+share/golly/Patterns/Generations/Transers.mcl
+share/golly/Patterns/Generations/What-a-mess.mcl
+share/golly/Patterns/HashLife/broken-lines.mc
+share/golly/Patterns/HashLife/catacryst.mc
+share/golly/Patterns/HashLife/gotts-dots.mc
+share/golly/Patterns/HashLife/hashlife-oddity1.mc
+share/golly/Patterns/HashLife/hashlife-oddity2.mc
+share/golly/Patterns/HashLife/hexadecimal.mc.gz
+share/golly/Patterns/HashLife/jagged.mc
+share/golly/Patterns/HashLife/jagged2.mc
+share/golly/Patterns/HashLife/linear-propagator-p237228340.mc.gz
+share/golly/Patterns/HashLife/loafer-gun-p8388608-linear.mc.gz
+share/golly/Patterns/HashLife/logarithmic-width.mc
+share/golly/Patterns/HashLife/metacatacryst.mc
+share/golly/Patterns/HashLife/metapixel-galaxy.mc.gz
+share/golly/Patterns/HashLife/metapixel-p216-gun.mc.gz
+share/golly/Patterns/HashLife/metapixel-parity64.mc.gz
+share/golly/Patterns/HashLife/mosquito5.mc
+share/golly/Patterns/HashLife/nick-gotts-1.mc
+share/golly/Patterns/HashLife/nick-gotts-2.mc
+share/golly/Patterns/HashLife/puzzle.mc
+share/golly/Patterns/HashLife/ruler.mc
+share/golly/Patterns/HashLife/totalperiodic.mc
+share/golly/Patterns/HashLife/triple-Snark-wick-extruder.rle.gz
+share/golly/Patterns/HashLife/unlimited-novelty.mc
+share/golly/Patterns/HashLife/wedge-grow.mc
+share/golly/Patterns/HashLife/wolfram22.mc
+share/golly/Patterns/Larger-than-Life/Blinkers.mcl
+share/golly/Patterns/Larger-than-Life/Bosco.mcl
+share/golly/Patterns/Larger-than-Life/BugCollection.rle
+share/golly/Patterns/Larger-than-Life/BugGun.rle
+share/golly/Patterns/Larger-than-Life/BugReactions.rle
+share/golly/Patterns/Larger-than-Life/Butterfly.rle
+share/golly/Patterns/Larger-than-Life/Globe.mcl
+share/golly/Patterns/Larger-than-Life/Gnarl.mcl
+share/golly/Patterns/Larger-than-Life/GunCollection.rle
+share/golly/Patterns/Larger-than-Life/Jitterbug.rle
+share/golly/Patterns/Larger-than-Life/Majority.mcl
+share/golly/Patterns/Larger-than-Life/ModernArt.mcl
+share/golly/Patterns/Larger-than-Life/R100-NN-bug.rle
+share/golly/Patterns/Larger-than-Life/R100-alien-bug.rle
+share/golly/Patterns/Larger-than-Life/R500-alien-bug.rle
+share/golly/Patterns/Larger-than-Life/SlowShip.rle
+share/golly/Patterns/Larger-than-Life/SoldierBugs.rle
+share/golly/Patterns/Larger-than-Life/Waffle.mcl
+share/golly/Patterns/Life-Like/Day-and-Night-gun-and-antigun.rle
+share/golly/Patterns/Life-Like/HighLife-replicator-spaceship.rle
+share/golly/Patterns/Life-Like/Morley/breeder2.rle
+share/golly/Patterns/Life-Like/Morley/enterprise-gun.rle
+share/golly/Patterns/Life-Like/Morley/growing-ship.rle
+share/golly/Patterns/Life-Like/alt-wicks.lua
+share/golly/Patterns/Life-Like/coral.rle
+share/golly/Patterns/Life-Like/ice-nine.rle
+share/golly/Patterns/Life-Like/p168-knightship.rle
+share/golly/Patterns/Life-Like/persian-rugs.lif
+share/golly/Patterns/Life-Like/replicator.rle
+share/golly/Patterns/Life-Like/spiral-growth.rle
+share/golly/Patterns/Life-Like/white-whale.rle
+share/golly/Patterns/Life/Bounded-Grids/Klein-bottle.rle
+share/golly/Patterns/Life/Bounded-Grids/agar-p3.rle
+share/golly/Patterns/Life/Bounded-Grids/cross-surface.rle
+share/golly/Patterns/Life/Bounded-Grids/herringbone-agar-p14.rle
+share/golly/Patterns/Life/Bounded-Grids/lightspeed-bubble.rle
+share/golly/Patterns/Life/Bounded-Grids/pulsars-in-tube.rle
+share/golly/Patterns/Life/Bounded-Grids/sphere.rle
+share/golly/Patterns/Life/Bounded-Grids/torus-with-shift.rle
+share/golly/Patterns/Life/Bounded-Grids/torus.rle
+share/golly/Patterns/Life/Breeders/LWSS-breeder.rle
+share/golly/Patterns/Life/Breeders/breeder.lif
+share/golly/Patterns/Life/Breeders/c4-diag-switch-engines.rle
+share/golly/Patterns/Life/Breeders/p100-H-channel-breeder.rle
+share/golly/Patterns/Life/Breeders/p90-rake-factory.rle
+share/golly/Patterns/Life/Breeders/pi-blink-breeder1.rle
+share/golly/Patterns/Life/Breeders/pi-blink-breeder2.rle
+share/golly/Patterns/Life/Breeders/rake-breeder.rle
+share/golly/Patterns/Life/Breeders/slide-breeder.rle
+share/golly/Patterns/Life/Breeders/spacefiller.rle
+share/golly/Patterns/Life/Breeders/switch-engine-breeder-MR.rle
+share/golly/Patterns/Life/Breeders/switch-engine-breeder.rle
+share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p416.rle
+share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p690.rle
+share/golly/Patterns/Life/Guns/7-in-a-row-Cordership-V-gun.rle
+share/golly/Patterns/Life/Guns/Cordership-gun-p784.rle
+share/golly/Patterns/Life/Guns/golly-ticker.rle
+share/golly/Patterns/Life/Guns/gun-p165mwss.rle
+share/golly/Patterns/Life/Guns/loafer-gun-p210.rle
+share/golly/Patterns/Life/Guns/p59-gun-with-Snark-reflectors.rle
+share/golly/Patterns/Life/Guns/p690-PT-Cordership-gun.rle
+share/golly/Patterns/Life/Guns/pseudo-p34-gun.rle
+share/golly/Patterns/Life/Guns/vacuum-cleaner.rle
share/golly/Patterns/Life/Methuselahs/acorn.lif
share/golly/Patterns/Life/Methuselahs/ark1.rle
share/golly/Patterns/Life/Methuselahs/ark2.rle
@@ -21,12 +188,30 @@ share/golly/Patterns/Life/Methuselahs/iwona.rle
share/golly/Patterns/Life/Methuselahs/justyna.rle
share/golly/Patterns/Life/Methuselahs/lidka-predecessor.rle
share/golly/Patterns/Life/Methuselahs/natural-LWSS.rle
-share/golly/Patterns/Life/Methuselahs/rabbits.lif
share/golly/Patterns/Life/Methuselahs/rabbits-relation-17423.rle
share/golly/Patterns/Life/Methuselahs/rabbits-relation-17465.rle
+share/golly/Patterns/Life/Methuselahs/rabbits.lif
share/golly/Patterns/Life/Methuselahs/temp-pulsars-big-s.rle
-share/golly/Patterns/Life/Oscillators/billiard-table.rle
+share/golly/Patterns/Life/Miscellaneous/Calcyman-primer.zip
+share/golly/Patterns/Life/Miscellaneous/Cambrian-Explosion.rle
+share/golly/Patterns/Life/Miscellaneous/blockstacker.rle
+share/golly/Patterns/Life/Miscellaneous/diagfuse1.rle
+share/golly/Patterns/Life/Miscellaneous/die658.rle
+share/golly/Patterns/Life/Miscellaneous/elbow-ladders.rle
+share/golly/Patterns/Life/Miscellaneous/fermat-primes.rle
+share/golly/Patterns/Life/Miscellaneous/four-primers.rle.gz
+share/golly/Patterns/Life/Miscellaneous/infinity-hotel0.rle
+share/golly/Patterns/Life/Miscellaneous/infinity-hotel1.rle
+share/golly/Patterns/Life/Miscellaneous/infinity-hotel2.rle
+share/golly/Patterns/Life/Miscellaneous/infinity-hotel3.rle
+share/golly/Patterns/Life/Miscellaneous/lightspeed.rle
+share/golly/Patterns/Life/Miscellaneous/loggrow-corder.rle
+share/golly/Patterns/Life/Miscellaneous/sawtooth6b.rle
+share/golly/Patterns/Life/Miscellaneous/tubstretch-c124b.rle
+share/golly/Patterns/Life/Miscellaneous/twinprimes.rle
+share/golly/Patterns/Life/Miscellaneous/wicks-DRH-2002.rle
share/golly/Patterns/Life/Oscillators/DRH-oscillators.rle
+share/golly/Patterns/Life/Oscillators/billiard-table.rle
share/golly/Patterns/Life/Oscillators/extensible-low-period.rle
share/golly/Patterns/Life/Oscillators/glider-stream-crystal.rle
share/golly/Patterns/Life/Oscillators/low-period.rle
@@ -37,85 +222,65 @@ share/golly/Patterns/Life/Oscillators/phase-shift.rle
share/golly/Patterns/Life/Oscillators/queen-bee-turn.rle
share/golly/Patterns/Life/Oscillators/traffic-light-hasslers.rle
share/golly/Patterns/Life/Oscillators/unique-high-period.rle
+share/golly/Patterns/Life/Puffers/c4-diagonal-puffer.rle
+share/golly/Patterns/Life/Puffers/line-puffer-superstable.rle
+share/golly/Patterns/Life/Puffers/line-puffer-unstable.rle
+share/golly/Patterns/Life/Puffers/p100-H-track-puffer.rle
+share/golly/Patterns/Life/Puffers/pi-fuse-puffer.rle
+share/golly/Patterns/Life/Puffers/puffer-2c5.rle
+share/golly/Patterns/Life/Puffers/puffer-train.rle
+share/golly/Patterns/Life/Puffers/zigzag-wickstretcher.rle
+share/golly/Patterns/Life/Rakes/2c5-engineless-rake-p185.rle
+share/golly/Patterns/Life/Rakes/2c5-spaceship-rake-p240.rle
+share/golly/Patterns/Life/Rakes/basic-rakes.rle
+share/golly/Patterns/Life/Rakes/c2-Cordership-rake.rle
+share/golly/Patterns/Life/Rakes/c3-forward-rake-p333.rle
+share/golly/Patterns/Life/Rakes/c4-sideways-rake.rle
+share/golly/Patterns/Life/Rakes/c5-adjustable-rake.rle
+share/golly/Patterns/Life/Rakes/forward-LWSS-rake-p90.rle
+share/golly/Patterns/Life/Rakes/p270-frothing-puffer-rake.rle
+share/golly/Patterns/Life/Rakes/spider-rake.rle
+share/golly/Patterns/Life/Signal-Circuitry/Turing-Machine-3-state.rle
+share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Cell-512x512.rle
+share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Deep-Cell.rle
share/golly/Patterns/Life/Signal-Circuitry/advancer.rle
share/golly/Patterns/Life/Signal-Circuitry/chase-the-glider.rle
share/golly/Patterns/Life/Signal-Circuitry/constructor-memory-loop.rle
share/golly/Patterns/Life/Signal-Circuitry/constructor-memory-tape.rle
+share/golly/Patterns/Life/Signal-Circuitry/h-to-h-collection-26Aug2017.zip
share/golly/Patterns/Life/Signal-Circuitry/heisenblinker-30.rle
share/golly/Patterns/Life/Signal-Circuitry/heisenburp-30.rle
share/golly/Patterns/Life/Signal-Circuitry/heisenburp-46-natural.rle
share/golly/Patterns/Life/Signal-Circuitry/heisenburp-46.rle
share/golly/Patterns/Life/Signal-Circuitry/high-bandwidth-telegraph.rle.gz
-share/golly/Patterns/Life/Signal-Circuitry/h-to-h-collection-26Aug2017.zip
share/golly/Patterns/Life/Signal-Circuitry/p30-racetrack.rle
share/golly/Patterns/Life/Signal-Circuitry/p46racetrack.rle
-share/golly/Patterns/Life/Signal-Circuitry/reflectors2.rle
share/golly/Patterns/Life/Signal-Circuitry/reflectors.rle
-share/golly/Patterns/Life/Signal-Circuitry/stargate.rle
+share/golly/Patterns/Life/Signal-Circuitry/reflectors2.rle
+share/golly/Patterns/Life/Signal-Circuitry/signal-turns-and-fizzles.rle.gz
share/golly/Patterns/Life/Signal-Circuitry/single-channel-spiral-growth.rle.gz
+share/golly/Patterns/Life/Signal-Circuitry/stargate.rle
share/golly/Patterns/Life/Signal-Circuitry/traffic-lights-extruder.rle
-share/golly/Patterns/Life/Signal-Circuitry/Turing-Machine-3-state.rle
-share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Cell-512x512.rle
-share/golly/Patterns/Life/Signal-Circuitry/Unit-Life-Deep-Cell.rle
-share/golly/Patterns/Life/Puffers/c4-diagonal-puffer.rle
-share/golly/Patterns/Life/Puffers/line-puffer-superstable.rle
-share/golly/Patterns/Life/Puffers/line-puffer-unstable.rle
-share/golly/Patterns/Life/Puffers/p100-H-track-puffer.rle
-share/golly/Patterns/Life/Puffers/pi-fuse-puffer.rle
-share/golly/Patterns/Life/Puffers/puffer-2c5.rle
-share/golly/Patterns/Life/Puffers/puffer-train.rle
-share/golly/Patterns/Life/Puffers/zigzag-wickstretcher.rle
-share/golly/Patterns/Life/Still-Lifes/1998-eater-stamp-collection.rle
-share/golly/Patterns/Life/Still-Lifes/eaters-misc.rle
-share/golly/Patterns/Life/Still-Lifes/eaters.rle
-share/golly/Patterns/Life/Still-Lifes/random.rle
-share/golly/Patterns/Life/Still-Lifes/ss-eaters.rle
-share/golly/Patterns/Life/Still-Lifes/stripey.rle
-share/golly/Patterns/Life/Breeders/breeder.lif
-share/golly/Patterns/Life/Breeders/c4-diag-switch-engines.rle
-share/golly/Patterns/Life/Breeders/LWSS-breeder.rle
-share/golly/Patterns/Life/Breeders/p100-H-channel-breeder.rle
-share/golly/Patterns/Life/Breeders/p90-rake-factory.rle
-share/golly/Patterns/Life/Breeders/pi-blink-breeder1.rle
-share/golly/Patterns/Life/Breeders/pi-blink-breeder2.rle
-share/golly/Patterns/Life/Breeders/rake-breeder.rle
-share/golly/Patterns/Life/Breeders/slide-breeder.rle
-share/golly/Patterns/Life/Breeders/spacefiller.rle
-share/golly/Patterns/Life/Breeders/switch-engine-breeder-MR.rle
-share/golly/Patterns/Life/Breeders/switch-engine-breeder.rle
-share/golly/Patterns/Life/Bounded-Grids/agar-p3.rle
-share/golly/Patterns/Life/Bounded-Grids/cross-surface.rle
-share/golly/Patterns/Life/Bounded-Grids/herringbone-agar-p14.rle
-share/golly/Patterns/Life/Bounded-Grids/Klein-bottle.rle
-share/golly/Patterns/Life/Bounded-Grids/lightspeed-bubble.rle
-share/golly/Patterns/Life/Bounded-Grids/pulsars-in-tube.rle
-share/golly/Patterns/Life/Bounded-Grids/sphere.rle
-share/golly/Patterns/Life/Bounded-Grids/torus.rle
-share/golly/Patterns/Life/Bounded-Grids/torus-with-shift.rle
-share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p416.rle
-share/golly/Patterns/Life/Guns/2c5-spaceship-gun-p690.rle
-share/golly/Patterns/Life/Guns/7-in-a-row-Cordership-V-gun.rle
-share/golly/Patterns/Life/Guns/Cordership-gun-p784.rle
-share/golly/Patterns/Life/Guns/golly-ticker.rle
-share/golly/Patterns/Life/Guns/gun-p165mwss.rle
-share/golly/Patterns/Life/Guns/loafer-gun-p210.rle
-share/golly/Patterns/Life/Guns/p59-gun-with-Snark-reflectors.rle
-share/golly/Patterns/Life/Guns/p690-PT-Cordership-gun.rle
-share/golly/Patterns/Life/Guns/pseudo-p34-gun.rle
-share/golly/Patterns/Life/Guns/vacuum-cleaner.rle
share/golly/Patterns/Life/Spaceships/2c5-orthogonal.rle
+share/golly/Patterns/Life/Spaceships/Corder-lineship.rle
+share/golly/Patterns/Life/Spaceships/Cordership-LWSS-freeze-tag.rle
+share/golly/Patterns/Life/Spaceships/Cordership-boat-burner.rle
share/golly/Patterns/Life/Spaceships/adjustable-Corder-lineship.rle
share/golly/Patterns/Life/Spaceships/c3-orthogonal.rle
share/golly/Patterns/Life/Spaceships/c4-diagonal.rle
share/golly/Patterns/Life/Spaceships/c4-orthogonal.rle
-share/golly/Patterns/Life/Spaceships/Corder-lineship.rle
-share/golly/Patterns/Life/Spaceships/Cordership-boat-burner.rle
-share/golly/Patterns/Life/Spaceships/Cordership-LWSS-freeze-tag.rle
share/golly/Patterns/Life/Spaceships/corderships.rle
share/golly/Patterns/Life/Spaceships/diagonal.rle
share/golly/Patterns/Life/Spaceships/orthogonal.rle
+share/golly/Patterns/Life/Spaceships/short-thin.rle
share/golly/Patterns/Life/Spaceships/smallest-low-period.rle
share/golly/Patterns/Life/Spaceships/spaceship-types.rle
+share/golly/Patterns/Life/Still-Lifes/1998-eater-stamp-collection.rle
+share/golly/Patterns/Life/Still-Lifes/eaters-misc.rle
+share/golly/Patterns/Life/Still-Lifes/eaters.rle
+share/golly/Patterns/Life/Still-Lifes/random.rle
+share/golly/Patterns/Life/Still-Lifes/ss-eaters.rle
+share/golly/Patterns/Life/Still-Lifes/stripey.rle
share/golly/Patterns/Life/Syntheses/109-still-lifes.rle
share/golly/Patterns/Life/Syntheses/29-still-lifes.rle
share/golly/Patterns/Life/Syntheses/blockish-and-blockic-seeds.rle
@@ -131,26 +296,51 @@ share/golly/Patterns/Life/Syntheses/make-p33.rle
share/golly/Patterns/Life/Syntheses/oscillator-syntheses.rle
share/golly/Patterns/Life/Syntheses/slow-salvo-eater-recipes.rle
share/golly/Patterns/Life/Syntheses/two-glider-collisions.rle
-share/golly/Patterns/Life/Miscellaneous/blockstacker.rle
-share/golly/Patterns/Life/Miscellaneous/Calcyman-primer.zip
-share/golly/Patterns/Life/Miscellaneous/Cambrian-Explosion.rle
-share/golly/Patterns/Life/Miscellaneous/diagfuse1.rle
-share/golly/Patterns/Life/Miscellaneous/die658.rle
-share/golly/Patterns/Life/Miscellaneous/elbow-ladders.rle
-share/golly/Patterns/Life/Miscellaneous/fermat-primes.rle
-share/golly/Patterns/Life/Miscellaneous/four-primers.rle.gz
-share/golly/Patterns/Life/Miscellaneous/infinity-hotel0.rle
-share/golly/Patterns/Life/Miscellaneous/infinity-hotel1.rle
-share/golly/Patterns/Life/Miscellaneous/infinity-hotel2.rle
-share/golly/Patterns/Life/Miscellaneous/infinity-hotel3.rle
-share/golly/Patterns/Life/Miscellaneous/lightspeed.rle
-share/golly/Patterns/Life/Miscellaneous/loggrow-corder.rle
-share/golly/Patterns/Life/Miscellaneous/sawtooth6b.rle
-share/golly/Patterns/Life/Miscellaneous/tubstretch-c124b.rle
-share/golly/Patterns/Life/Miscellaneous/twinprimes.rle
-share/golly/Patterns/Life/Miscellaneous/wicks-DRH-2002.rle
-share/golly/Patterns/Life/Signal-Circuitry/signal-turns-and-fizzles.rle.gz
-share/golly/Patterns/Life/Spaceships/short-thin.rle
+share/golly/Patterns/Loops/Byl-Loop.rle
+share/golly/Patterns/Loops/Chou-Reggia-Loop-1.rle
+share/golly/Patterns/Loops/Chou-Reggia-Loop-2.rle
+share/golly/Patterns/Loops/Evoloop-finite.rle
+share/golly/Patterns/Loops/Evoloop.rle
+share/golly/Patterns/Loops/Langtons-Loops.rle
+share/golly/Patterns/Loops/Perrier-Loop.rle
+share/golly/Patterns/Loops/Perrier-Parenthesis-Checker.rle
+share/golly/Patterns/Loops/SDSR-Loop.rle
+share/golly/Patterns/Loops/Tempesti-Loop.rle
+share/golly/Patterns/Margolus/BBM.rle
+share/golly/Patterns/Margolus/CrittersCircle.rle
+share/golly/Patterns/Margolus/CrittersOscillators.rle
+share/golly/Patterns/Margolus/DLA.rle
+share/golly/Patterns/Margolus/HPP.rle
+share/golly/Patterns/Margolus/HPP_large.rle
+share/golly/Patterns/Margolus/Sand-Test.rle
+share/golly/Patterns/Margolus/Sand.rle
+share/golly/Patterns/Margolus/TMGas.rle
+share/golly/Patterns/Margolus/TMGas_largeWithHole.rle
+share/golly/Patterns/Margolus/TripATron.rle
+share/golly/Patterns/Margolus/TripATron_BlockAligned.rle
+share/golly/Patterns/Non-Totalistic/JustFriends/oscillators.rle
+share/golly/Patterns/Non-Totalistic/JustFriends/p137loop.rle
+share/golly/Patterns/Non-Totalistic/JustFriends/p384drifter.rle
+share/golly/Patterns/Non-Totalistic/JustFriends/p8256c4dirtyrake.rle
+share/golly/Patterns/Non-Totalistic/JustFriends/spaceships.rle
+share/golly/Patterns/Non-Totalistic/Sierpinski-builder.rle
+share/golly/Patterns/Non-Totalistic/horiship-guns.rle
+share/golly/Patterns/Non-Totalistic/infinite-binary-ruler-generator.rle
+share/golly/Patterns/Non-Totalistic/intergalactic-cruise-ship-factory.rle
+share/golly/Patterns/Non-Totalistic/limited-spacefiller.rle
+share/golly/Patterns/Non-Totalistic/p42-knightship.rle
+share/golly/Patterns/Non-Totalistic/pondpuffer-spaceship.rle
+share/golly/Patterns/Non-Totalistic/reflectorless-rotating-oscillator-puffer.rle
+share/golly/Patterns/Non-Totalistic/rr14gun.rle
+share/golly/Patterns/Non-Totalistic/unit-fraction-orthogonal-spaceships.zip
+share/golly/Patterns/Other-Rules/Ed-rep.rle
+share/golly/Patterns/Other-Rules/HPP-demo-small.rle
+share/golly/Patterns/Other-Rules/HPP-demo.rle
+share/golly/Patterns/Other-Rules/Langtons-Ant.rle
+share/golly/Patterns/Other-Rules/factorize-84.zip
+share/golly/Patterns/Other-Rules/golly-ants.rle
+share/golly/Patterns/Other-Rules/life-on-the-edge.rle
+share/golly/Patterns/Other-Rules/life-on-the-slope.rle
share/golly/Patterns/Patersons-Worms/worm-1040512.rle
share/golly/Patterns/Patersons-Worms/worm-1042015.rle
share/golly/Patterns/Patersons-Worms/worm-1042020.rle
@@ -161,23 +351,7 @@ share/golly/Patterns/Self-Rep/Banks/Banks-II-demo.rle
share/golly/Patterns/Self-Rep/Banks/Banks-III-demo.rle
share/golly/Patterns/Self-Rep/Banks/Banks-IV-constructor.rle.gz
share/golly/Patterns/Self-Rep/Banks/Banks-IV-demo.rle
-share/golly/Patterns/Self-Rep/JvN/Boustrophedon-replicator.rle
-share/golly/Patterns/Self-Rep/JvN/cell-coders-demo.rle
-share/golly/Patterns/Self-Rep/JvN/codon4-auto-retract.rle
-share/golly/Patterns/Self-Rep/JvN/codon5-auto-retract.rle
-share/golly/Patterns/Self-Rep/JvN/construction-arm-demo.rle
-share/golly/Patterns/Self-Rep/JvN/counter-demo.rle
-share/golly/Patterns/Self-Rep/JvN/golly-constructor.rle
-share/golly/Patterns/Self-Rep/JvN/Hutton-replicator.rle
-share/golly/Patterns/Self-Rep/JvN/JvN-loop-replicator.rle.gz
-share/golly/Patterns/Self-Rep/JvN/N-compressed-replicator.rle
-share/golly/Patterns/Self-Rep/JvN/NP-mutation.rle.gz
-share/golly/Patterns/Self-Rep/JvN/NP-replicator.rle.gz
-share/golly/Patterns/Self-Rep/JvN/partial-constructor.mc.gz
-share/golly/Patterns/Self-Rep/JvN/read-arm-demo.rle
-share/golly/Patterns/Self-Rep/JvN/sphinx.mc.gz
-share/golly/Patterns/Self-Rep/JvN/sphinx-midpoint.mc.gz
-share/golly/Patterns/Self-Rep/JvN/sphinx-spark.mc.gz
+share/golly/Patterns/Self-Rep/Codd/Goucher-replicator.mc.gz
share/golly/Patterns/Self-Rep/Codd/clocking-on-demo.rle
share/golly/Patterns/Self-Rep/Codd/coders-demo.rle
share/golly/Patterns/Self-Rep/Codd/construction-arm-demo.rle
@@ -188,148 +362,33 @@ share/golly/Patterns/Self-Rep/Codd/echo-switch-demo.rle
share/golly/Patterns/Self-Rep/Codd/extend-coder-demo.rle
share/golly/Patterns/Self-Rep/Codd/gates-demo.rle
share/golly/Patterns/Self-Rep/Codd/golly-constructor.rle.gz
-share/golly/Patterns/Self-Rep/Codd/Goucher-replicator.mc.gz
share/golly/Patterns/Self-Rep/Codd/repeater-emitter-demo.rle
share/golly/Patterns/Self-Rep/Codd/sensing-demo.rle
share/golly/Patterns/Self-Rep/Codd/sheathing-demo.rle
share/golly/Patterns/Self-Rep/Codd/sheathing-problems.rle
share/golly/Patterns/Self-Rep/Codd/signals-demo.rle
share/golly/Patterns/Self-Rep/Codd/tape-reader-demo.rle
-share/golly/Patterns/Self-Rep/Devore/crossover.rle
share/golly/Patterns/Self-Rep/Devore/Devore-body.rle
share/golly/Patterns/Self-Rep/Devore/Devore-rep.rle
+share/golly/Patterns/Self-Rep/Devore/crossover.rle
share/golly/Patterns/Self-Rep/Devore/discriminator.rle
-share/golly/Patterns/Other-Rules/Ed-rep.rle
-share/golly/Patterns/Other-Rules/factorize-84.zip
-share/golly/Patterns/Other-Rules/golly-ants.rle
-share/golly/Patterns/Other-Rules/HPP-demo.rle
-share/golly/Patterns/Other-Rules/HPP-demo-small.rle
-share/golly/Patterns/Other-Rules/Langtons-Ant.rle
-share/golly/Patterns/Other-Rules/life-on-the-edge.rle
-share/golly/Patterns/Other-Rules/life-on-the-slope.rle
-share/golly/Patterns/Non-Totalistic/horiship-guns.rle
-share/golly/Patterns/Non-Totalistic/infinite-binary-ruler-generator.rle
-share/golly/Patterns/Non-Totalistic/intergalactic-cruise-ship-factory.rle
-share/golly/Patterns/Non-Totalistic/limited-spacefiller.rle
-share/golly/Patterns/Non-Totalistic/p42-knightship.rle
-share/golly/Patterns/Non-Totalistic/reflectorless-rotating-oscillator-puffer.rle
-share/golly/Patterns/Non-Totalistic/rr14gun.rle
-share/golly/Patterns/Non-Totalistic/Sierpinski-builder.rle
-share/golly/Patterns/Non-Totalistic/unit-fraction-orthogonal-spaceships.zip
-share/golly/Patterns/Non-Totalistic/JustFriends/oscillators.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/p137loop.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/p384drifter.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/p8256c4dirtyrake.rle
-share/golly/Patterns/Non-Totalistic/JustFriends/spaceships.rle
-share/golly/Patterns/HashLife/broken-lines.mc
-share/golly/Patterns/HashLife/catacryst.mc
-share/golly/Patterns/HashLife/gotts-dots.mc
-share/golly/Patterns/HashLife/hashlife-oddity1.mc
-share/golly/Patterns/HashLife/hashlife-oddity2.mc
-share/golly/Patterns/HashLife/hexadecimal.mc.gz
-share/golly/Patterns/HashLife/jagged2.mc
-share/golly/Patterns/HashLife/jagged.mc
-share/golly/Patterns/HashLife/linear-propagator-p237228340.mc.gz
-share/golly/Patterns/HashLife/loafer-gun-p8388608-linear.mc.gz
-share/golly/Patterns/HashLife/logarithmic-width.mc
-share/golly/Patterns/HashLife/metacatacryst.mc
-share/golly/Patterns/HashLife/metapixel-galaxy.mc.gz
-share/golly/Patterns/HashLife/metapixel-p216-gun.mc.gz
-share/golly/Patterns/HashLife/metapixel-parity64.mc.gz
-share/golly/Patterns/HashLife/mosquito5.mc
-share/golly/Patterns/HashLife/nick-gotts-1.mc
-share/golly/Patterns/HashLife/nick-gotts-2.mc
-share/golly/Patterns/HashLife/puzzle.mc
-share/golly/Patterns/HashLife/ruler.mc
-share/golly/Patterns/HashLife/totalperiodic.mc
-share/golly/Patterns/HashLife/triple-Snark-wick-extruder.rle.gz
-share/golly/Patterns/HashLife/unlimited-novelty.mc
-share/golly/Patterns/HashLife/wedge-grow.mc
-share/golly/Patterns/HashLife/wolfram22.mc
-share/golly/Patterns/Larger-than-Life/Blinkers.mcl
-share/golly/Patterns/Larger-than-Life/Bosco.mcl
-share/golly/Patterns/Larger-than-Life/BugCollection.rle
-share/golly/Patterns/Larger-than-Life/BugGun.rle
-share/golly/Patterns/Larger-than-Life/BugReactions.rle
-share/golly/Patterns/Larger-than-Life/Butterfly.rle
-share/golly/Patterns/Larger-than-Life/Globe.mcl
-share/golly/Patterns/Larger-than-Life/Gnarl.mcl
-share/golly/Patterns/Larger-than-Life/GunCollection.rle
-share/golly/Patterns/Larger-than-Life/Jitterbug.rle
-share/golly/Patterns/Larger-than-Life/Majority.mcl
-share/golly/Patterns/Larger-than-Life/ModernArt.mcl
-share/golly/Patterns/Larger-than-Life/R100-alien-bug.rle
-share/golly/Patterns/Larger-than-Life/R100-NN-bug.rle
-share/golly/Patterns/Larger-than-Life/R500-alien-bug.rle
-share/golly/Patterns/Larger-than-Life/SlowShip.rle
-share/golly/Patterns/Larger-than-Life/SoldierBugs.rle
-share/golly/Patterns/Larger-than-Life/Waffle.mcl
-share/golly/Patterns/Life-Like/alt-wicks.lua
-share/golly/Patterns/Life-Like/coral.rle
-share/golly/Patterns/Life-Like/Day-and-Night-gun-and-antigun.rle
-share/golly/Patterns/Life-Like/ice-nine.rle
-share/golly/Patterns/Life-Like/p168-knightship.rle
-share/golly/Patterns/Life-Like/persian-rugs.lif
-share/golly/Patterns/Life-Like/replicator.rle
-share/golly/Patterns/Life-Like/spiral-growth.rle
-share/golly/Patterns/Life-Like/white-whale.rle
-share/golly/Patterns/Life-Like/HighLife-replicator-spaceship.rle
-share/golly/Patterns/Life-Like/Morley/breeder2.rle
-share/golly/Patterns/Life-Like/Morley/enterprise-gun.rle
-share/golly/Patterns/Life-Like/Morley/growing-ship.rle
-share/golly/Patterns/Non-Totalistic/pondpuffer-spaceship.rle
-share/golly/Patterns/Margolus/BBM.rle
-share/golly/Patterns/Margolus/CrittersCircle.rle
-share/golly/Patterns/Margolus/CrittersOscillators.rle
-share/golly/Patterns/Margolus/DLA.rle
-share/golly/Patterns/Margolus/HPP_large.rle
-share/golly/Patterns/Margolus/HPP.rle
-share/golly/Patterns/Margolus/Sand.rle
-share/golly/Patterns/Margolus/Sand-Test.rle
-share/golly/Patterns/Margolus/TMGas_largeWithHole.rle
-share/golly/Patterns/Margolus/TMGas.rle
-share/golly/Patterns/Margolus/TripATron_BlockAligned.rle
-share/golly/Patterns/Margolus/TripATron.rle
-share/golly/Patterns/Generations/Banner.mcl
-share/golly/Patterns/Generations/Bloomerang.mcl
-share/golly/Patterns/Generations/Burst.mcl
-share/golly/Patterns/Generations/Caterpillars.mcl
-share/golly/Patterns/Generations/Delta.rle
-share/golly/Patterns/Generations/Ebb-and-Flow.mcl
-share/golly/Patterns/Generations/Fireworks.mcl
-share/golly/Patterns/Generations/Lava.mcl
-share/golly/Patterns/Generations/Lines.mcl
-share/golly/Patterns/Generations/MeteorGuns.mcl
-share/golly/Patterns/Generations/Nova.mcl
-share/golly/Patterns/Generations/Perfect-spiral.mcl
-share/golly/Patterns/Generations/Sawfish.rle
-share/golly/Patterns/Generations/SediMental.mcl
-share/golly/Patterns/Generations/Steeplechase.mcl
-share/golly/Patterns/Generations/Transers.mcl
-share/golly/Patterns/Generations/What-a-mess.mcl
-share/golly/Patterns/Loops/Byl-Loop.rle
-share/golly/Patterns/Loops/Chou-Reggia-Loop-1.rle
-share/golly/Patterns/Loops/Chou-Reggia-Loop-2.rle
-share/golly/Patterns/Loops/Evoloop-finite.rle
-share/golly/Patterns/Loops/Evoloop.rle
-share/golly/Patterns/Loops/Langtons-Loops.rle
-share/golly/Patterns/Loops/Perrier-Loop.rle
-share/golly/Patterns/Loops/Perrier-Parenthesis-Checker.rle
-share/golly/Patterns/Loops/SDSR-Loop.rle
-share/golly/Patterns/Loops/Tempesti-Loop.rle
-share/golly/Patterns/WireWorld/circuit.mcl
-share/golly/Patterns/WireWorld/clocks.mcl
-share/golly/Patterns/WireWorld/flip-flop.mcl
-share/golly/Patterns/WireWorld/gate-AND.mcl
-share/golly/Patterns/WireWorld/gate-NOT.mcl
-share/golly/Patterns/WireWorld/gate-OR.mcl
-share/golly/Patterns/WireWorld/gate-XOR.mcl
-share/golly/Patterns/WireWorld/Langtons-ant.zip
-share/golly/Patterns/WireWorld/memory-cell.mcl
-share/golly/Patterns/WireWorld/NickGardner.mcl
-share/golly/Patterns/WireWorld/NylesHeise.mcl
-share/golly/Patterns/WireWorld/primes.mc
-share/golly/Patterns/WireWorld/unary-multiplier.mcl
+share/golly/Patterns/Self-Rep/JvN/Boustrophedon-replicator.rle
+share/golly/Patterns/Self-Rep/JvN/Hutton-replicator.rle
+share/golly/Patterns/Self-Rep/JvN/JvN-loop-replicator.rle.gz
+share/golly/Patterns/Self-Rep/JvN/N-compressed-replicator.rle
+share/golly/Patterns/Self-Rep/JvN/NP-mutation.rle.gz
+share/golly/Patterns/Self-Rep/JvN/NP-replicator.rle.gz
+share/golly/Patterns/Self-Rep/JvN/cell-coders-demo.rle
+share/golly/Patterns/Self-Rep/JvN/codon4-auto-retract.rle
+share/golly/Patterns/Self-Rep/JvN/codon5-auto-retract.rle
+share/golly/Patterns/Self-Rep/JvN/construction-arm-demo.rle
+share/golly/Patterns/Self-Rep/JvN/counter-demo.rle
+share/golly/Patterns/Self-Rep/JvN/golly-constructor.rle
+share/golly/Patterns/Self-Rep/JvN/partial-constructor.mc.gz
+share/golly/Patterns/Self-Rep/JvN/read-arm-demo.rle
+share/golly/Patterns/Self-Rep/JvN/sphinx-midpoint.mc.gz
+share/golly/Patterns/Self-Rep/JvN/sphinx-spark.mc.gz
+share/golly/Patterns/Self-Rep/JvN/sphinx.mc.gz
share/golly/Patterns/Turmites/AlienCounter.rle
share/golly/Patterns/Turmites/ComputerArt.rle
share/golly/Patterns/Turmites/Extinction.rle
@@ -340,47 +399,67 @@ share/golly/Patterns/Turmites/Perfectionist.rle
share/golly/Patterns/Turmites/TriangularAnt_period92.rle
share/golly/Patterns/Turmites/TriangularLangtonsAnt.rle
share/golly/Patterns/Turmites/WormTrails.rle
+share/golly/Patterns/WireWorld/Langtons-ant.zip
+share/golly/Patterns/WireWorld/NickGardner.mcl
+share/golly/Patterns/WireWorld/NylesHeise.mcl
+share/golly/Patterns/WireWorld/circuit.mcl
+share/golly/Patterns/WireWorld/clocks.mcl
+share/golly/Patterns/WireWorld/flip-flop.mcl
+share/golly/Patterns/WireWorld/gate-AND.mcl
+share/golly/Patterns/WireWorld/gate-NOT.mcl
+share/golly/Patterns/WireWorld/gate-OR.mcl
+share/golly/Patterns/WireWorld/gate-XOR.mcl
+share/golly/Patterns/WireWorld/memory-cell.mcl
+share/golly/Patterns/WireWorld/primes.mc
+share/golly/Patterns/WireWorld/unary-multiplier.mcl
share/golly/Rules/AbsoluteTurmite_0N21S10E00S01W11N2.rule
share/golly/Rules/AbsoluteTurmite_0S11W11E21S21W00N0.rule
share/golly/Rules/AbsoluteTurmite_1N10S11S30N21W01N11S20E1.rule
-share/golly/Rules/Banks-III.rule
-share/golly/Rules/Banks-II.rule
+share/golly/Rules/BBM-Margolus-emulated.rule
share/golly/Rules/Banks-I.rule
+share/golly/Rules/Banks-II.rule
+share/golly/Rules/Banks-III.rule
share/golly/Rules/Banks-IV.rule
-share/golly/Rules/BBM-Margolus-emulated.rule
share/golly/Rules/BriansBrain.rule
share/golly/Rules/Byl-Loop.rule
share/golly/Rules/Caterpillars.rule
share/golly/Rules/Chou-Reggia-1.rule
share/golly/Rules/Chou-Reggia-2.rule
-share/golly/Rules/Codd2.rule
share/golly/Rules/Codd.rule
-share/golly/Rules/Devore.rule
+share/golly/Rules/Codd2.rule
share/golly/Rules/CrittersMargolus_emulated.rule
share/golly/Rules/DLA-Margolus-emulated.rule
+share/golly/Rules/Devore.rule
share/golly/Rules/Ed-rep.rule
share/golly/Rules/Evoloop-finite.rule
share/golly/Rules/Evoloop.rule
-share/golly/Rules/HPPMargolus_emulated.rule
share/golly/Rules/HPP.rule
-share/golly/Rules/LangtonsAnt_LLRR.rule
+share/golly/Rules/HPPMargolus_emulated.rule
share/golly/Rules/Langtons-Ant.rule
share/golly/Rules/Langtons-Loops.rule
+share/golly/Rules/LangtonsAnt_LLRR.rule
+share/golly/Rules/Life.rule
share/golly/Rules/LifeHistory.rule
share/golly/Rules/LifeOnTheEdge.rule
share/golly/Rules/LifeOnTheSlope.rule
-share/golly/Rules/Life.rule
share/golly/Rules/Perrier.rule
+share/golly/Rules/SDSR-Loop.rule
share/golly/Rules/Sand-Margolus-emulated.rule
share/golly/Rules/Sand-square4cyclic_emulated.rule
-share/golly/Rules/SDSR-Loop.rule
share/golly/Rules/StarWars.rule
-share/golly/Rules/Tempesti.rule
share/golly/Rules/TMGasMargolus_emulated.rule
-share/golly/Rules/TripATronMargolus_emulated.rule
+share/golly/Rules/TableGenerators/make-ruletable.cpp
+share/golly/Rules/Tempesti.rule
+share/golly/Rules/TreeGenerators/LifeOnTheEdge.cpp
+share/golly/Rules/TreeGenerators/LifeOnTheSlope.cpp
+share/golly/Rules/TreeGenerators/RuleTreeGen.cpp
+share/golly/Rules/TreeGenerators/RuleTreeGen.java
+share/golly/Rules/TreeGenerators/RuleTreeGen.lua
+share/golly/Rules/TreeGenerators/RuleTreeGen.pl
+share/golly/Rules/TreeGenerators/RuleTreeGen.py
share/golly/Rules/TriTurmite_120010.rule
+share/golly/Rules/TripATronMargolus_emulated.rule
share/golly/Rules/Turmite_1202822111121111812a0281282.rule
-share/golly/Rules/TableGenerators/make-ruletable.cpp
share/golly/Rules/Turmite_121181121020.rule
share/golly/Rules/Turmite_180121020081.rule
share/golly/Rules/Turmite_181181121010.rule
@@ -392,86 +471,6 @@ share/golly/Rules/Worm-1252121.rule
share/golly/Rules/Worm-1525115.rule
share/golly/Rules/Worm-complement.rule
share/golly/Rules/Worm-shared.rule
-share/golly/Rules/TreeGenerators/LifeOnTheEdge.cpp
-share/golly/Rules/TreeGenerators/LifeOnTheSlope.cpp
-share/golly/Rules/TreeGenerators/RuleTreeGen.cpp
-share/golly/Rules/TreeGenerators/RuleTreeGen.java
-share/golly/Rules/TreeGenerators/RuleTreeGen.lua
-share/golly/Rules/TreeGenerators/RuleTreeGen.pl
-share/golly/Rules/TreeGenerators/RuleTreeGen.py
-share/golly/Scripts/Python/Margolus/convert-MCell-string.py
-share/golly/Scripts/Python/Margolus/export.py
-share/golly/Scripts/Python/Margolus/import.py
-share/golly/Scripts/Python/bricklayer.py
-share/golly/Scripts/Python/density.py
-share/golly/Scripts/Python/draw-lines.py
-share/golly/Scripts/Python/envelope.py
-share/golly/Scripts/Python/flood-fill.py
-share/golly/Scripts/Python/goto_expression.py
-share/golly/Scripts/Python/goto.py
-share/golly/Scripts/Python/gun-demo.py
-share/golly/Scripts/Python/heisenburp.py
-share/golly/Scripts/Python/invert.py
-share/golly/Scripts/Python/life-integer-gun30.py
-share/golly/Scripts/Python/make-Banks-IV-constructor.py
-share/golly/Scripts/Python/make-Codd-constructor.py
-share/golly/Scripts/Python/make-Devore-tape.py
-share/golly/Scripts/Python/make-torus.py
-share/golly/Scripts/Python/metafier.py
-share/golly/Scripts/Python/move-object.py
-share/golly/Scripts/Python/move-selection.py
-share/golly/Scripts/Python/tile.py
-share/golly/Scripts/Python/oscar.py
-share/golly/Scripts/Python/p1100-MWSS-gun.py
-share/golly/Scripts/Python/pd-glider.py
-share/golly/Scripts/Python/pop-plot.py
-share/golly/Scripts/Python/shift.py
-share/golly/Scripts/Python/slide-show.py
-share/golly/Scripts/Python/tile-with-clip.py
-share/golly/Scripts/Python/Rule-Generators/AbsoluteHexTurmite-gen.py
-share/golly/Scripts/Python/Rule-Generators/AbsoluteTurmite-gen.py
-share/golly/Scripts/Python/Rule-Generators/FredkinModN-gen.py
-share/golly/Scripts/Python/Rule-Generators/HexTurmite-gen.py
-share/golly/Scripts/Python/Rule-Generators/icon-exporter.py
-share/golly/Scripts/Python/Rule-Generators/icon-importer.py
-share/golly/Scripts/Python/Rule-Generators/Langtons-Ant-gen.py
-share/golly/Scripts/Python/Rule-Generators/make-ruletree.py
-share/golly/Scripts/Python/Rule-Generators/RuleTableToTree.py
-share/golly/Scripts/Python/Rule-Generators/TriTurmite-gen.py
-share/golly/Scripts/Python/Rule-Generators/Turmite-gen.py
-share/golly/Scripts/Python/glife/base.py
-share/golly/Scripts/Python/glife/base.pyc
-share/golly/Scripts/Python/glife/BuiltinIcons.py
-share/golly/Scripts/Python/glife/BuiltinIcons.pyc
-share/golly/Scripts/Python/glife/EmulateHexagonal.py
-share/golly/Scripts/Python/glife/EmulateMargolus.py
-share/golly/Scripts/Python/glife/EmulateOneDimensional.py
-share/golly/Scripts/Python/glife/EmulateTriangular.py
-share/golly/Scripts/Python/glife/gun24.py
-share/golly/Scripts/Python/glife/gun24.pyc
-share/golly/Scripts/Python/glife/gun256.py
-share/golly/Scripts/Python/glife/gun30.py
-share/golly/Scripts/Python/glife/gun30.pyc
-share/golly/Scripts/Python/glife/gun46.py
-share/golly/Scripts/Python/glife/gun46.pyc
-share/golly/Scripts/Python/glife/herschel.py
-share/golly/Scripts/Python/glife/__init__.py
-share/golly/Scripts/Python/glife/__init__.pyc
-share/golly/Scripts/Python/glife/ReadRuleTable.py
-share/golly/Scripts/Python/glife/RuleTree.py
-share/golly/Scripts/Python/glife/text.py
-share/golly/Scripts/Python/glife/text.pyc
-share/golly/Scripts/Python/glife/WriteBMP.py
-share/golly/Scripts/Python/glife/WriteRuleTable.py
-share/golly/Scripts/Lua/oplus/images/lifeviewer.png
-share/golly/Scripts/Lua/oplus/sounds/README.txt
-share/golly/Scripts/Lua/oplus/init.lua
-share/golly/Scripts/Lua/oplus/init.lua~
-share/golly/Scripts/Lua/gplus/guns.lua
-share/golly/Scripts/Lua/gplus/init.lua
-share/golly/Scripts/Lua/gplus/objects.lua
-share/golly/Scripts/Lua/gplus/strict.lua
-share/golly/Scripts/Lua/gplus/text.lua
share/golly/Scripts/Lua/breakout.lua
share/golly/Scripts/Lua/bricklayer.lua
share/golly/Scripts/Lua/browse-patterns.lua
@@ -481,6 +480,11 @@ share/golly/Scripts/Lua/envelope.lua
share/golly/Scripts/Lua/flood-fill.lua
share/golly/Scripts/Lua/giffer.lua
share/golly/Scripts/Lua/goto.lua
+share/golly/Scripts/Lua/gplus/guns.lua
+share/golly/Scripts/Lua/gplus/init.lua
+share/golly/Scripts/Lua/gplus/objects.lua
+share/golly/Scripts/Lua/gplus/strict.lua
+share/golly/Scripts/Lua/gplus/text.lua
share/golly/Scripts/Lua/gun-demo.lua
share/golly/Scripts/Lua/heisenburp.lua
share/golly/Scripts/Lua/hexgrid.lua
@@ -491,6 +495,10 @@ share/golly/Scripts/Lua/make-torus.lua
share/golly/Scripts/Lua/metafier.lua
share/golly/Scripts/Lua/move-object.lua
share/golly/Scripts/Lua/move-selection.lua
+share/golly/Scripts/Lua/oplus/images/lifeviewer.png
+share/golly/Scripts/Lua/oplus/init.lua
+share/golly/Scripts/Lua/oplus/init.lua~
+share/golly/Scripts/Lua/oplus/sounds/README.txt
share/golly/Scripts/Lua/oscar.lua
share/golly/Scripts/Lua/overlay-demo.lua
share/golly/Scripts/Lua/p1100-MWSS-gun.lua
@@ -498,79 +506,71 @@ share/golly/Scripts/Lua/pd-glider.lua
share/golly/Scripts/Lua/pop-plot.lua
share/golly/Scripts/Lua/shift.lua
share/golly/Scripts/Lua/slide-show.lua
-share/golly/Scripts/Lua/tile.lua
share/golly/Scripts/Lua/tile-with-clip.lua
-share/golly/Scripts/Lua/toLifeHistory.lua
+share/golly/Scripts/Lua/tile.lua
share/golly/Scripts/Lua/toLife.lua
-share/golly/Help/images/about.gif
-share/golly/Help/images/blend0.png
-share/golly/Help/images/blend1.png
-share/golly/Help/images/clips.png
-share/golly/Help/images/hex.png
-share/golly/Help/images/layers.png
-share/golly/Help/images/lifeviewer.png
-share/golly/Help/images/theme.png
-share/golly/Help/images/transforms.png
-share/golly/Help/Lexicon/lex_1.htm
-share/golly/Help/Lexicon/lex_a.htm
-share/golly/Help/Lexicon/lex_b.htm
-share/golly/Help/Lexicon/lex_bib.htm
-share/golly/Help/Lexicon/lex_c.htm
-share/golly/Help/Lexicon/lex_d.htm
-share/golly/Help/Lexicon/lex_e.htm
-share/golly/Help/Lexicon/lex_f.htm
-share/golly/Help/Lexicon/lex_g.htm
-share/golly/Help/Lexicon/lex_h.htm
-share/golly/Help/Lexicon/lex.htm
-share/golly/Help/Lexicon/lex_i.htm
-share/golly/Help/Lexicon/lex_j.htm
-share/golly/Help/Lexicon/lex_k.htm
-share/golly/Help/Lexicon/lex_l.htm
-share/golly/Help/Lexicon/lex_m.htm
-share/golly/Help/Lexicon/lex_n.htm
-share/golly/Help/Lexicon/lex_o.htm
-share/golly/Help/Lexicon/lex_p.htm
-share/golly/Help/Lexicon/lex_q.htm
-share/golly/Help/Lexicon/lex_r.htm
-share/golly/Help/Lexicon/lex_s.htm
-share/golly/Help/Lexicon/lex_t.htm
-share/golly/Help/Lexicon/lex_u.htm
-share/golly/Help/Lexicon/lex_v.htm
-share/golly/Help/Lexicon/lex_w.htm
-share/golly/Help/Lexicon/lex_x.htm
-share/golly/Help/Lexicon/lex_y.htm
-share/golly/Help/Lexicon/lex_z.htm
-share/golly/Help/Lexicon/modify.pl
-share/golly/Help/about.html
-share/golly/Help/algos.html
-share/golly/Help/archives.html
-share/golly/Help/bounded.html
-share/golly/Help/changes.html
-share/golly/Help/changes.html~
-share/golly/Help/control.html
-share/golly/Help/credits.html
-share/golly/Help/edit.html
-share/golly/Help/file.html
-share/golly/Help/formats.html
-share/golly/Help/help.html
-share/golly/Help/index.html
-share/golly/Help/intro.html
-share/golly/Help/layer.html
-share/golly/Help/lifeviewer.html
-share/golly/Help/lua.html
-share/golly/Help/lua.html~
-share/golly/Help/mouse.html
-share/golly/Help/overlay.html
-share/golly/Help/python.html
-share/golly/Help/problems.html
-share/golly/Help/refs.html
-share/golly/Help/tips.html
-share/golly/Help/view.html
-share/golly/Help/Algorithms/extended.png
-share/golly/Help/Algorithms/Generations.html
-share/golly/Help/Algorithms/HashLife.html
-share/golly/Help/Algorithms/hensel.png
-share/golly/Help/Algorithms/JvN.html
-share/golly/Help/Algorithms/Larger_than_Life.html
-share/golly/Help/Algorithms/QuickLife.html
-share/golly/Help/Algorithms/RuleLoader.html
+share/golly/Scripts/Lua/toLifeHistory.lua
+share/golly/Scripts/Python/Margolus/convert-MCell-string.py
+share/golly/Scripts/Python/Margolus/export.py
+share/golly/Scripts/Python/Margolus/import.py
+share/golly/Scripts/Python/Rule-Generators/AbsoluteHexTurmite-gen.py
+share/golly/Scripts/Python/Rule-Generators/AbsoluteTurmite-gen.py
+share/golly/Scripts/Python/Rule-Generators/FredkinModN-gen.py
+share/golly/Scripts/Python/Rule-Generators/HexTurmite-gen.py
+share/golly/Scripts/Python/Rule-Generators/Langtons-Ant-gen.py
+share/golly/Scripts/Python/Rule-Generators/RuleTableToTree.py
+share/golly/Scripts/Python/Rule-Generators/TriTurmite-gen.py
+share/golly/Scripts/Python/Rule-Generators/Turmite-gen.py
+share/golly/Scripts/Python/Rule-Generators/icon-exporter.py
+share/golly/Scripts/Python/Rule-Generators/icon-importer.py
+share/golly/Scripts/Python/Rule-Generators/make-ruletree.py
+share/golly/Scripts/Python/bricklayer.py
+share/golly/Scripts/Python/density.py
+share/golly/Scripts/Python/draw-lines.py
+share/golly/Scripts/Python/envelope.py
+share/golly/Scripts/Python/flood-fill.py
+share/golly/Scripts/Python/glife/BuiltinIcons.py
+share/golly/Scripts/Python/glife/BuiltinIcons.pyc
+share/golly/Scripts/Python/glife/EmulateHexagonal.py
+share/golly/Scripts/Python/glife/EmulateMargolus.py
+share/golly/Scripts/Python/glife/EmulateOneDimensional.py
+share/golly/Scripts/Python/glife/EmulateTriangular.py
+share/golly/Scripts/Python/glife/ReadRuleTable.py
+share/golly/Scripts/Python/glife/RuleTree.py
+share/golly/Scripts/Python/glife/WriteBMP.py
+share/golly/Scripts/Python/glife/WriteRuleTable.py
+share/golly/Scripts/Python/glife/__init__.py
+share/golly/Scripts/Python/glife/__init__.pyc
+share/golly/Scripts/Python/glife/base.py
+share/golly/Scripts/Python/glife/base.pyc
+share/golly/Scripts/Python/glife/gun24.py
+share/golly/Scripts/Python/glife/gun24.pyc
+share/golly/Scripts/Python/glife/gun256.py
+share/golly/Scripts/Python/glife/gun30.py
+share/golly/Scripts/Python/glife/gun30.pyc
+share/golly/Scripts/Python/glife/gun46.py
+share/golly/Scripts/Python/glife/gun46.pyc
+share/golly/Scripts/Python/glife/herschel.py
+share/golly/Scripts/Python/glife/text.py
+share/golly/Scripts/Python/glife/text.pyc
+share/golly/Scripts/Python/goto.py
+share/golly/Scripts/Python/goto_expression.py
+share/golly/Scripts/Python/gun-demo.py
+share/golly/Scripts/Python/heisenburp.py
+share/golly/Scripts/Python/invert.py
+share/golly/Scripts/Python/life-integer-gun30.py
+share/golly/Scripts/Python/make-Banks-IV-constructor.py
+share/golly/Scripts/Python/make-Codd-constructor.py
+share/golly/Scripts/Python/make-Devore-tape.py
+share/golly/Scripts/Python/make-torus.py
+share/golly/Scripts/Python/metafier.py
+share/golly/Scripts/Python/move-object.py
+share/golly/Scripts/Python/move-selection.py
+share/golly/Scripts/Python/oscar.py
+share/golly/Scripts/Python/p1100-MWSS-gun.py
+share/golly/Scripts/Python/pd-glider.py
+share/golly/Scripts/Python/pop-plot.py
+share/golly/Scripts/Python/shift.py
+share/golly/Scripts/Python/slide-show.py
+share/golly/Scripts/Python/tile-with-clip.py
+share/golly/Scripts/Python/tile.py
diff --git a/gr-osmosdr-git/Makefile b/gr-osmosdr-git/Makefile
index 99edbc0603..5b831cb2d6 100644
--- a/gr-osmosdr-git/Makefile
+++ b/gr-osmosdr-git/Makefile
@@ -8,8 +8,8 @@ HOMEPAGE= http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
COMMENT= SDR Hardware support for OsmoSDR and so many more
LICENSE= gnu-gpl-v2
-GIT_REPOSITORIES= master
-GIT_REPO.master= git://git.osmocom.org/gr-osmosdr
+GIT_REPOSITORIES= master
+GIT_REPO.master= git://git.osmocom.org/gr-osmosdr
GIT_MODULE.master= gr-osmosdr
USE_LANGUAGES= c c++
diff --git a/grass/options.mk b/grass/options.mk
index 05f7ca64c1..4e725a496e 100644
--- a/grass/options.mk
+++ b/grass/options.mk
@@ -6,8 +6,8 @@ PKG_SUPPORTED_OPTIONS+= opengl pgsql python sqlite unixodbc
# PKG_SUPPORTED_OPTIONS+= ffmpeg # XXX - handle includes
# PKG_SUPPORTED_OPTIONS+= glw # XXX - requires libGLw(M)
# PKG_SUPPORTED_OPTIONS+= wxWidgets # XXX - need new version
-PKG_SUGGESTED_OPTIONS+= fftw freetype gmath iodbc motif
-PKG_SUGGESTED_OPTIONS+= opengl pgsql python sqlite
+PKG_SUGGESTED_OPTIONS+= fftw freetype gmath iodbc motif
+PKG_SUGGESTED_OPTIONS+= opengl pgsql python sqlite
.include "../../mk/bsd.options.mk"
diff --git a/grc/Makefile b/grc/Makefile
index 48573c206e..65486a3e56 100644
--- a/grc/Makefile
+++ b/grc/Makefile
@@ -11,7 +11,7 @@ COMMENT= Generic colouriser
LICENSE= gnu-gpl-v2
INSTALLATION_DIRS= share/grc share/examples/grc bin ${PKGMANDIR}/man1
-CONF_FILES+= ${PREFIX}/share/examples/grc/grc.conf ${PKG_SYSCONFDIR}/grc.conf
+CONF_FILES+= ${PREFIX}/share/examples/grc/grc.conf ${PKG_SYSCONFDIR}/grc.conf
REPLACE_PYTHON= grc grcat
diff --git a/gretl/Makefile b/gretl/Makefile
index 08daa8a0d5..8240410a22 100644
--- a/gretl/Makefile
+++ b/gretl/Makefile
@@ -11,10 +11,10 @@ MAINTAINER= asau%users.sourceforge.net@localhost
HOMEPAGE= http://gretl.sourceforge.net/
COMMENT= Gnu Regression, Econometrics and Time-series Library
-USE_LANGUAGES= c fortran77 # problems with LAPACK
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
-USE_LIBTOOL= yes
+USE_LANGUAGES= c fortran77 # problems with LAPACK
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake
+USE_LIBTOOL= yes
BUILD_TARGET=
TEST_TARGET= check
USE_PKGLOCALEDIR= yes
diff --git a/gretl/PLIST b/gretl/PLIST
index cf2e4fd383..79259e265c 100644
--- a/gretl/PLIST
+++ b/gretl/PLIST
@@ -102,6 +102,7 @@ lib/gretl-gtk2/urcdist.la
lib/gretl-gtk2/vif.la
lib/libgretl-1.0.la
lib/pkgconfig/gretl.pc
+man/man1/gretl.1
share/gretl/data/data10-1.gdt
share/gretl/data/data10-2.gdt
share/gretl/data/data10-3.gdt
@@ -460,5 +461,4 @@ share/locale/pt_BR/LC_MESSAGES/gretl.mo
share/locale/ru/LC_MESSAGES/gretl.mo
share/locale/tr/LC_MESSAGES/gretl.mo
share/locale/zh_TW/LC_MESSAGES/gretl.mo
-man/man1/gretl.1
@pkgdir share/gretl/doc
diff --git a/grisbi/Makefile b/grisbi/Makefile
index facdfa0d20..3e638ad0cd 100644
--- a/grisbi/Makefile
+++ b/grisbi/Makefile
@@ -17,9 +17,9 @@ USE_TOOLS+= pkg-config intltool gmake
INSTALLATION_DIRS= ${PREFIX}${PKGMANDIR}/man1 ${PREFIX}/share/applications/
-PKG_OPTIONS_VAR= PKG_OPTIONS.gribsi
-PKG_SUPPORTED_OPTIONS= libofx
-PKG_SUGGESTED_OPTIONS= libofx
+PKG_OPTIONS_VAR= PKG_OPTIONS.gribsi
+PKG_SUPPORTED_OPTIONS= libofx
+PKG_SUGGESTED_OPTIONS= libofx
.include "../../mk/bsd.options.mk"
diff --git a/grsync/Makefile b/grsync/Makefile
index 05707a1dd9..c90976ce68 100644
--- a/grsync/Makefile
+++ b/grsync/Makefile
@@ -10,9 +10,9 @@ HOMEPAGE= http://www.opbyte.it/grsync/
COMMENT= Grsync is a GUI for rsync
LICENSE= gnu-gpl-v2
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config intltool msgfmt bash:run
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
+USE_TOOLS+= pkg-config intltool msgfmt bash:run
REPLACE_BASH+= src/grsync-batch
diff --git a/grsync/PLIST b/grsync/PLIST
index 2db80b71b2..15eab9ebf6 100644
--- a/grsync/PLIST
+++ b/grsync/PLIST
@@ -7,5 +7,5 @@ share/applications/grsync.desktop
share/grsync/grsync.glade
share/icons/hicolor/48x48/mimetypes/application-x-grsync-session.png
share/mime/packages/grsync.xml
-share/pixmaps/grsync.png
share/pixmaps/grsync-busy.png
+share/pixmaps/grsync.png
diff --git a/gsegrafix/Makefile b/gsegrafix/Makefile
index a8f6528005..0263df84b4 100644
--- a/gsegrafix/Makefile
+++ b/gsegrafix/Makefile
@@ -10,7 +10,7 @@ COMMENT= GNOME canvas for creating scientific and engineering plots
LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/gsettings-desktop-schemas/buildlink3.mk b/gsettings-desktop-schemas/buildlink3.mk
index 9784fab0f6..2e62e7c9af 100644
--- a/gsettings-desktop-schemas/buildlink3.mk
+++ b/gsettings-desktop-schemas/buildlink3.mk
@@ -7,7 +7,7 @@ BUILDLINK_TREE+= gsettings-desktop-schemas
GSETTINGS_DESKTOP_SCHEMAS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+= gsettings-desktop-schemas>=3.4.2
-BUILDLINK_PKGSRCDIR.gsettings-desktop-schemas?= ../../sysutils/gsettings-desktop-schemas
+BUILDLINK_PKGSRCDIR.gsettings-desktop-schemas?= ../../sysutils/gsettings-desktop-schemas
.endif # GSETTINGS_DESKTOP_SCHEMAS_BUILDLINK3_MK
diff --git a/gsm/Makefile b/gsm/Makefile
index bbc4dd0643..f4be95be5b 100644
--- a/gsm/Makefile
+++ b/gsm/Makefile
@@ -13,9 +13,9 @@ LICENSE= mit
WRKSRC= ${WRKDIR}/gsm-1.0-pl14
USE_LIBTOOL= yes
-NO_CONFIGURE= yes
-MAKE_ENV+= ROOT=${WRKSRC:Q}
-INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q}
+NO_CONFIGURE= yes
+MAKE_ENV+= ROOT=${WRKSRC:Q}
+INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q}
INSTALLATION_DIRS= bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
post-install:
diff --git a/gsm/buildlink3.mk b/gsm/buildlink3.mk
index 0d4d2e6a47..e779e7401f 100644
--- a/gsm/buildlink3.mk
+++ b/gsm/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= gsm
.if !defined(GSM_BUILDLINK3_MK)
GSM_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10
+BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10
BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.12
BUILDLINK_PKGSRCDIR.gsm?= ../../wip/gsm
.endif # GSM_BUILDLINK3_MK
diff --git a/gstreamer-plugins/Makefile b/gstreamer-plugins/Makefile
index fa491b601e..93a6d03f84 100644
--- a/gstreamer-plugins/Makefile
+++ b/gstreamer-plugins/Makefile
@@ -12,37 +12,37 @@ COMMENT= GStreamer plug-ins meta-pkg
META_PACKAGE= # empty
-DEPENDS+= gst-plugins0.10-faad-[0-9]*:../../audio/gst-plugins0.10-faad
-DEPENDS+= gst-plugins0.10-flac-[0-9]*:../../audio/gst-plugins0.10-flac
-DEPENDS+= gst-fluendo-mp3-[0-9]*:../../audio/gst-plugins0.10-fluendo-mp3
-DEPENDS+= gst-plugins0.10-libvisual-[0-9]*:../../audio/gst-plugins0.10-libvisual
-DEPENDS+= gst-plugins0.10-mad-[0-9]*:../../audio/gst-plugins0.10-mad
-DEPENDS+= gst-plugins0.10-oss-[0-9]*:../../audio/gst-plugins0.10-oss
-DEPENDS+= gst-plugins0.10-speex-[0-9]*:../../audio/gst-plugins0.10-speex
-DEPENDS+= gst-plugins0.10-vorbis-[0-9]*:../../audio/gst-plugins0.10-vorbis
-DEPENDS+= gst-plugins0.10-a52-[0-9]*:../../audio/gst-plugins0.10-a52
-DEPENDS+= gst-plugins0.10-dts-[0-9]*:../../audio/gst-plugins0.10-dts
-DEPENDS+= gst-plugins0.10-musepack-[0-9]*:../../audio/gst-plugins0.10-musepack
-DEPENDS+= gst-plugins0.10-sid-[0-9]*:../../audio/gst-plugins0.10-sid
-DEPENDS+= gst-plugins0.10-spc-[0-9]*:../../audio/gst-plugins0.10-spc
-DEPENDS+= gst-plugins0.10-wavpack-[0-9]*:../../audio/gst-plugins0.10-wavpack
-DEPENDS+= gst-plugins0.10-pango-[0-9]*:../../devel/gst-plugins0.10-pango
-DEPENDS+= gst-plugins0.10-cairo-[0-9]*:../../graphics/gst-plugins0.10-cairo
-DEPENDS+= gst-plugins0.10-png-[0-9]*:../../graphics/gst-plugins0.10-png
-DEPENDS+= gst-plugins0.10-bad-[0-9]*:../../multimedia/gst-plugins0.10-bad
-DEPENDS+= gst-plugins0.10-base-[0-9]*:../../multimedia/gst-plugins0.10-base
-DEPENDS+= gst-ffmpeg-[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
-DEPENDS+= gst-plugins0.10-good-[0-9]*:../../multimedia/gst-plugins0.10-good
-DEPENDS+= gst-plugins0.10-mpeg2dec-[0-9]*:../../multimedia/gst-plugins0.10-mpeg2dec
-DEPENDS+= gst-plugins0.10-ogg-[0-9]*:../../multimedia/gst-plugins0.10-ogg
-DEPENDS+= gst-plugins0.10-theora-[0-9]*:../../multimedia/gst-plugins0.10-theora
-DEPENDS+= gst-plugins0.10-ugly-[0-9]*:../../multimedia/gst-plugins0.10-ugly
-DEPENDS+= gst-plugins0.10-xvid-[0-9]*:../../multimedia/gst-plugins0.10-xvid
-DEPENDS+= gst-plugins0.10-dvdread-[0-9]*:../../multimedia/gst-plugins0.10-dvdread
-DEPENDS+= gst-gnonlin-[0-9]*:../../multimedia/gst-plugins0.10-gnonlin
-DEPENDS+= gst-plugins0.10-gnomevfs-[0-9]*:../../sysutils/gst-plugins0.10-gnomevfs
-DEPENDS+= gst-plugins0.10-x11-[0-9]*:../../x11/gst-plugins0.10-x11
-DEPENDS+= gst-plugins0.10-esound-[0-9]*:../../audio/gst-plugins0.10-esound
-DEPENDS+= gst-plugins0.10-cdparanoia-[0-9]*:../../audio/gst-plugins0.10-cdparanoia
+DEPENDS+= gst-plugins0.10-faad-[0-9]*:../../audio/gst-plugins0.10-faad
+DEPENDS+= gst-plugins0.10-flac-[0-9]*:../../audio/gst-plugins0.10-flac
+DEPENDS+= gst-fluendo-mp3-[0-9]*:../../audio/gst-plugins0.10-fluendo-mp3
+DEPENDS+= gst-plugins0.10-libvisual-[0-9]*:../../audio/gst-plugins0.10-libvisual
+DEPENDS+= gst-plugins0.10-mad-[0-9]*:../../audio/gst-plugins0.10-mad
+DEPENDS+= gst-plugins0.10-oss-[0-9]*:../../audio/gst-plugins0.10-oss
+DEPENDS+= gst-plugins0.10-speex-[0-9]*:../../audio/gst-plugins0.10-speex
+DEPENDS+= gst-plugins0.10-vorbis-[0-9]*:../../audio/gst-plugins0.10-vorbis
+DEPENDS+= gst-plugins0.10-a52-[0-9]*:../../audio/gst-plugins0.10-a52
+DEPENDS+= gst-plugins0.10-dts-[0-9]*:../../audio/gst-plugins0.10-dts
+DEPENDS+= gst-plugins0.10-musepack-[0-9]*:../../audio/gst-plugins0.10-musepack
+DEPENDS+= gst-plugins0.10-sid-[0-9]*:../../audio/gst-plugins0.10-sid
+DEPENDS+= gst-plugins0.10-spc-[0-9]*:../../audio/gst-plugins0.10-spc
+DEPENDS+= gst-plugins0.10-wavpack-[0-9]*:../../audio/gst-plugins0.10-wavpack
+DEPENDS+= gst-plugins0.10-pango-[0-9]*:../../devel/gst-plugins0.10-pango
+DEPENDS+= gst-plugins0.10-cairo-[0-9]*:../../graphics/gst-plugins0.10-cairo
+DEPENDS+= gst-plugins0.10-png-[0-9]*:../../graphics/gst-plugins0.10-png
+DEPENDS+= gst-plugins0.10-bad-[0-9]*:../../multimedia/gst-plugins0.10-bad
+DEPENDS+= gst-plugins0.10-base-[0-9]*:../../multimedia/gst-plugins0.10-base
+DEPENDS+= gst-ffmpeg-[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
+DEPENDS+= gst-plugins0.10-good-[0-9]*:../../multimedia/gst-plugins0.10-good
+DEPENDS+= gst-plugins0.10-mpeg2dec-[0-9]*:../../multimedia/gst-plugins0.10-mpeg2dec
+DEPENDS+= gst-plugins0.10-ogg-[0-9]*:../../multimedia/gst-plugins0.10-ogg
+DEPENDS+= gst-plugins0.10-theora-[0-9]*:../../multimedia/gst-plugins0.10-theora
+DEPENDS+= gst-plugins0.10-ugly-[0-9]*:../../multimedia/gst-plugins0.10-ugly
+DEPENDS+= gst-plugins0.10-xvid-[0-9]*:../../multimedia/gst-plugins0.10-xvid
+DEPENDS+= gst-plugins0.10-dvdread-[0-9]*:../../multimedia/gst-plugins0.10-dvdread
+DEPENDS+= gst-gnonlin-[0-9]*:../../multimedia/gst-plugins0.10-gnonlin
+DEPENDS+= gst-plugins0.10-gnomevfs-[0-9]*:../../sysutils/gst-plugins0.10-gnomevfs
+DEPENDS+= gst-plugins0.10-x11-[0-9]*:../../x11/gst-plugins0.10-x11
+DEPENDS+= gst-plugins0.10-esound-[0-9]*:../../audio/gst-plugins0.10-esound
+DEPENDS+= gst-plugins0.10-cdparanoia-[0-9]*:../../audio/gst-plugins0.10-cdparanoia
.include "../../mk/bsd.pkg.mk"
diff --git a/gsview/Makefile b/gsview/Makefile
index a9a852b264..c3cf158e10 100644
--- a/gsview/Makefile
+++ b/gsview/Makefile
@@ -9,19 +9,19 @@ MAINTAINER= schaecsn%gmx.net@localhost
HOMEPAGE= http://pages.cs.wisc.edu/~ghost/
COMMENT= Graphical interface for ghostscript
-LICENSE= afpl-license
-RESTRICTED= Commercial distribution prohibited in most cases.
+LICENSE= afpl-license
+RESTRICTED= Commercial distribution prohibited in most cases.
# CDROM distribution may be acceptable in some cases, but not all, so
# the variables are set.
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-USE_TOOLS+= gmake pkg-config gs:run
+USE_TOOLS+= gmake pkg-config gs:run
-SUBST_CLASSES+= pstotext
+SUBST_CLASSES+= pstotext
SUBST_STAGE.pstotext= do-configure
SUBST_FILES.pstotext= srcunx/gvxdll.c
-SUBST_SED.pstotext= -e 's|@PSTOTEXT_CMD@|${PSTOTEXT_DIR}/bin/pstotext|'
+SUBST_SED.pstotext= -e 's|@PSTOTEXT_CMD@|${PSTOTEXT_DIR}/bin/pstotext|'
SUBST_CLASSES+= gs
SUBST_STAGE.gs= do-configure
@@ -52,7 +52,7 @@ post-install:
${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/src/printer.ini ${DESTDIR}${EGDIR}/printer.ini
-DEPENDS+= pstotext-[0-9]*:../../converters/pstotext
+DEPENDS+= pstotext-[0-9]*:../../converters/pstotext
.include "../../mk/pthread.buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/gtextutils/Makefile b/gtextutils/Makefile
index 6d52ee4ac7..884dc72fd3 100644
--- a/gtextutils/Makefile
+++ b/gtextutils/Makefile
@@ -14,7 +14,7 @@ COMMENT= Gordon text utilities
# LICENSE= AGPLv3
USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/gtg/Makefile b/gtg/Makefile
index b352c12a16..191b08a19b 100644
--- a/gtg/Makefile
+++ b/gtg/Makefile
@@ -15,10 +15,10 @@ DEPENDS+= ${PYPKGPREFIX}-configobj>=4.6.0:../../devel/py-configobj
DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= intltool msgfmt
-USE_LANGUAGES= # none
+USE_TOOLS+= intltool msgfmt
+USE_LANGUAGES= # none
-PYDISTUTILSPKG= yes
+PYDISTUTILSPKG= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
diff --git a/gtimelog/Makefile b/gtimelog/Makefile
index 70a1bd4dd2..df3730a24c 100644
--- a/gtimelog/Makefile
+++ b/gtimelog/Makefile
@@ -11,8 +11,8 @@ LICENSE= gnu-gpl-v3
USE_LANGUAGES= # none
-REPLACE_PYTHON+= src/gtimelog/main.py src/gtimelog/test_gtimelog.py scripts/*.py
-PYDISTUTILSPKG= yes
+REPLACE_PYTHON+= src/gtimelog/main.py src/gtimelog/test_gtimelog.py scripts/*.py
+PYDISTUTILSPKG= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
.include "../../lang/python/application.mk"
diff --git a/gtk-server/options.mk b/gtk-server/options.mk
index 700fdd3e77..69a935c2e9 100644
--- a/gtk-server/options.mk
+++ b/gtk-server/options.mk
@@ -1,8 +1,8 @@
# $NetBSD: options.mk,v 1.1 2013/01/01 01:38:05 othyro Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-server
-PKG_SUPPORTED_OPTIONS= gtk gtk2 openssl slang xforms #ksh93 needs includes (shell.h)
-PKG_SUGGESTED_OPTIONS+= gtk2 openssl slang
+PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-server
+PKG_SUPPORTED_OPTIONS= gtk gtk2 openssl slang xforms #ksh93 needs includes (shell.h)
+PKG_SUGGESTED_OPTIONS+= gtk2 openssl slang
PKG_OPTIONS_OPTIONAL_GROUPS= backend
PKG_OPTIONS_GROUP.backend= gtk gtk2 xforms
diff --git a/gtk2-murrina-fancy-clearlooks/PLIST b/gtk2-murrina-fancy-clearlooks/PLIST
index dd465bf068..1b854e062f 100644
--- a/gtk2-murrina-fancy-clearlooks/PLIST
+++ b/gtk2-murrina-fancy-clearlooks/PLIST
@@ -1,31 +1,31 @@
@comment $NetBSD: PLIST,v 1.2 2015/03/05 20:41:52 tnn2 Exp $
-share/themes/MurrinaFancySky/gtk-2.0/0
-share/themes/MurrinaFancySky/gtk-2.0/1
-share/themes/MurrinaFancySky/gtk-2.0/2
-share/themes/MurrinaFancySky/gtk-2.0/3
-share/themes/MurrinaFancySky/gtk-2.0/gtkrc
-share/themes/MurrinaFancySea/gtk-2.0/0
-share/themes/MurrinaFancySea/gtk-2.0/1
-share/themes/MurrinaFancySea/gtk-2.0/2
-share/themes/MurrinaFancySea/gtk-2.0/3
-share/themes/MurrinaFancySea/gtk-2.0/gtkrc
-share/themes/MurrinaFancySand/gtk-2.0/0
-share/themes/MurrinaFancySand/gtk-2.0/1
-share/themes/MurrinaFancySand/gtk-2.0/2
-share/themes/MurrinaFancySand/gtk-2.0/3
-share/themes/MurrinaFancySand/gtk-2.0/gtkrc
-share/themes/MurrinaFancyGrass/gtk-2.0/0
-share/themes/MurrinaFancyGrass/gtk-2.0/1
-share/themes/MurrinaFancyGrass/gtk-2.0/2
-share/themes/MurrinaFancyGrass/gtk-2.0/3
-share/themes/MurrinaFancyGrass/gtk-2.0/gtkrc
-share/themes/MurrinaFancyEarth/gtk-2.0/0
-share/themes/MurrinaFancyEarth/gtk-2.0/1
-share/themes/MurrinaFancyEarth/gtk-2.0/2
-share/themes/MurrinaFancyEarth/gtk-2.0/3
-share/themes/MurrinaFancyEarth/gtk-2.0/gtkrc
share/themes/MurrinaFancyAncient/gtk-2.0/0
share/themes/MurrinaFancyAncient/gtk-2.0/1
share/themes/MurrinaFancyAncient/gtk-2.0/2
share/themes/MurrinaFancyAncient/gtk-2.0/3
share/themes/MurrinaFancyAncient/gtk-2.0/gtkrc
+share/themes/MurrinaFancyEarth/gtk-2.0/0
+share/themes/MurrinaFancyEarth/gtk-2.0/1
+share/themes/MurrinaFancyEarth/gtk-2.0/2
+share/themes/MurrinaFancyEarth/gtk-2.0/3
+share/themes/MurrinaFancyEarth/gtk-2.0/gtkrc
+share/themes/MurrinaFancyGrass/gtk-2.0/0
+share/themes/MurrinaFancyGrass/gtk-2.0/1
+share/themes/MurrinaFancyGrass/gtk-2.0/2
+share/themes/MurrinaFancyGrass/gtk-2.0/3
+share/themes/MurrinaFancyGrass/gtk-2.0/gtkrc
+share/themes/MurrinaFancySand/gtk-2.0/0
+share/themes/MurrinaFancySand/gtk-2.0/1
+share/themes/MurrinaFancySand/gtk-2.0/2
+share/themes/MurrinaFancySand/gtk-2.0/3
+share/themes/MurrinaFancySand/gtk-2.0/gtkrc
+share/themes/MurrinaFancySea/gtk-2.0/0
+share/themes/MurrinaFancySea/gtk-2.0/1
+share/themes/MurrinaFancySea/gtk-2.0/2
+share/themes/MurrinaFancySea/gtk-2.0/3
+share/themes/MurrinaFancySea/gtk-2.0/gtkrc
+share/themes/MurrinaFancySky/gtk-2.0/0
+share/themes/MurrinaFancySky/gtk-2.0/1
+share/themes/MurrinaFancySky/gtk-2.0/2
+share/themes/MurrinaFancySky/gtk-2.0/3
+share/themes/MurrinaFancySky/gtk-2.0/gtkrc
diff --git a/gtk2hs-buildtools/buildlink3.mk b/gtk2hs-buildtools/buildlink3.mk
index e274627939..d674d1893e 100644
--- a/gtk2hs-buildtools/buildlink3.mk
+++ b/gtk2hs-buildtools/buildlink3.mk
@@ -7,7 +7,7 @@ GTK2HS_BUILDTOOLS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtk2hs-buildtools+= gtk2hs-buildtools>=0.12.3
BUILDLINK_ABI_DEPENDS.gtk2hs-buildtools+= gtk2hs-buildtools>=0.12.3
-BUILDLINK_PKGSRCDIR.gtk2hs-buildtools?= ../../wip/gtk2hs-buildtools
+BUILDLINK_PKGSRCDIR.gtk2hs-buildtools?= ../../wip/gtk2hs-buildtools
.include "../../devel/hs-random/buildlink3.mk"
.endif # GTK2HS_BUILDTOOLS_BUILDLINK3_MK
diff --git a/gtkglk/buildlink3.mk b/gtkglk/buildlink3.mk
index 5ad956a20f..0f736c7758 100644
--- a/gtkglk/buildlink3.mk
+++ b/gtkglk/buildlink3.mk
@@ -9,8 +9,8 @@ BUILDLINK_API_DEPENDS.gtkglk+= gtkglk>=0.2
BUILDLINK_ABI_DEPENDS.gtkglk?= gtkglk>=0.2nb2
BUILDLINK_PKGSRCDIR.gtkglk?= ../../wip/gtkglk
-BUILDLINK_TRANSFORM+= l:glk:gtkglk
-BUILDLINK_TARGETS+= buildlink-gtkglk-hook
+BUILDLINK_TRANSFORM+= l:glk:gtkglk
+BUILDLINK_TARGETS+= buildlink-gtkglk-hook
buildlink-gtkglk-hook:
${LN} -s gtkglk ${BUILDLINK_DIR}/include/glk
diff --git a/gtkhotkey/Makefile b/gtkhotkey/Makefile
index 55153a0890..a2aee175f3 100644
--- a/gtkhotkey/Makefile
+++ b/gtkhotkey/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE= https://launchpad.net/gtkhotkey/
COMMENT= GtkHotkey library Platform independent hotkey handling for Gtk+
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config intltool msgfmt perl
-USE_LANGUAGES+= c c++
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config intltool msgfmt perl
+USE_LANGUAGES+= c c++
PKGCONFIG_OVERRIDE+= gtkhotkey-1.0.pc.in
diff --git a/gtkhotkey/buildlink3.mk b/gtkhotkey/buildlink3.mk
index 51188f8a78..d9e1743256 100644
--- a/gtkhotkey/buildlink3.mk
+++ b/gtkhotkey/buildlink3.mk
@@ -7,7 +7,7 @@ GTKHOTKEY_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gtkhotkey+= gtkhotkey>=0.2.0
BUILDLINK_ABI_DEPENDS.gtkhotkey?= gtkhotkey>=0.2.1nb1
-BUILDLINK_PKGSRCDIR.gtkhotkey?= ../../wip/gtkhotkey
+BUILDLINK_PKGSRCDIR.gtkhotkey?= ../../wip/gtkhotkey
.include "../../devel/glib2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/gtkmathview/Makefile b/gtkmathview/Makefile
index 611afeaa62..a89978b2a8 100644
--- a/gtkmathview/Makefile
+++ b/gtkmathview/Makefile
@@ -27,7 +27,7 @@ PKGCONFIG_OVERRIDE+= mathview-frontend-gmetadom.pc.in
PKGCONFIG_OVERRIDE+= mathview-frontend-libxml2-reader.pc.in
PKGCONFIG_OVERRIDE+= mathview-frontend-libxml2.pc.in
-EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/${PKGBASE}.conf.xml \
${PKG_SYSCONFDIR}/${PKGBASE}.conf.xml
PKG_SYSCONFSUBDIR= ${PKGBASE}
diff --git a/gtksourcecompletion/Makefile b/gtksourcecompletion/Makefile
index 1f0d1bcb07..5de0ab2f21 100644
--- a/gtksourcecompletion/Makefile
+++ b/gtksourcecompletion/Makefile
@@ -11,10 +11,10 @@ HOMEPAGE= http://gtksourcecomple.sourceforge.net/
COMMENT= GtkSourceCompletion
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
-USE_PKGLOCALEDIR= yes
-USE_LIBTOOL= yes
-USE_TOOLS+= pkg-config gmake intltool msgfmt
+GNU_CONFIGURE= yes
+USE_PKGLOCALEDIR= yes
+USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config gmake intltool msgfmt
PKGCONFIG_OVERRIDE+= gtksourcecompletion-1.0.pc.in
diff --git a/gts-snapshot/Makefile b/gts-snapshot/Makefile
index ea6664cd58..bfa0a1986a 100644
--- a/gts-snapshot/Makefile
+++ b/gts-snapshot/Makefile
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+= gts.pc.in
INSTALLATION_DIRS+= bin
-WRKSRC=${WRKDIR}/gts-snapshot-${SNAPDATE}
+WRKSRC= ${WRKDIR}/gts-snapshot-${SNAPDATE}
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0
.include "../../devel/glib2/buildlink3.mk"
diff --git a/gucharmap/Makefile b/gucharmap/Makefile
index 3fdbb16c64..8db7544cdd 100644
--- a/gucharmap/Makefile
+++ b/gucharmap/Makefile
@@ -24,8 +24,8 @@ UNICODE_DISTFILES= \
Unihan.zip
.for ud in ${UNICODE_DISTFILES}
-DISTFILES+= ${ud}
-SITES.${ud}= http://www.unicode.org/Public/10.0.0/ucd/
+DISTFILES+= ${ud}
+SITES.${ud}= http://www.unicode.org/Public/10.0.0/ucd/
.endfor
CONFIGURE_ARGS+= --with-unicode-data=${DISTDIR}/${DIST_SUBDIR}
diff --git a/gucharmap/buildlink3.mk b/gucharmap/buildlink3.mk
index 0916f3310a..98d2e1334b 100644
--- a/gucharmap/buildlink3.mk
+++ b/gucharmap/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gucharmap
GUCHARMAP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gucharmap+= gucharmap>=10.0.0
-BUILDLINK_PKGSRCDIR.gucharmap?= ../../wip/gucharmap
+BUILDLINK_PKGSRCDIR.gucharmap?= ../../wip/gucharmap
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
diff --git a/guichan/Makefile b/guichan/Makefile
index a062519f80..fccc3e5eea 100644
--- a/guichan/Makefile
+++ b/guichan/Makefile
@@ -7,8 +7,8 @@ PKGREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=guichan/}
-MAINTAINER= Pseudo.Statistic%gmail.com@localhost
-HOMEPAGE= http://guichan.sourceforge.net/
+MAINTAINER= Pseudo.Statistic%gmail.com@localhost
+HOMEPAGE= http://guichan.sourceforge.net/
COMMENT= Portable C++ GUI library for games
diff --git a/guitone/Makefile b/guitone/Makefile
index 747a01f6fa..4d6bc9872c 100644
--- a/guitone/Makefile
+++ b/guitone/Makefile
@@ -19,7 +19,7 @@ COMMENT= Graphical Monotone VCS Tool
###
NOT_FOR_PLATFORM= Darwin-*-*
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
do-configure:
diff --git a/gupnp-ui/Makefile b/gupnp-ui/Makefile
index a20a287b34..e61b10a179 100644
--- a/gupnp-ui/Makefile
+++ b/gupnp-ui/Makefile
@@ -14,7 +14,7 @@ COMMENT= GTK+ widgets for use with GUPnP
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config intltool msgfmt
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= gupnp-ui-1.0.pc.in
diff --git a/gupnp-ui/buildlink3.mk b/gupnp-ui/buildlink3.mk
index c3473b8b3e..d27ae39185 100644
--- a/gupnp-ui/buildlink3.mk
+++ b/gupnp-ui/buildlink3.mk
@@ -7,7 +7,7 @@ GUPNP_UI_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gupnp-ui+= gupnp-ui>=0.1.1
BUILDLINK_ABI_DEPENDS.gupnp-ui?= gupnp-ui>=0.1.1nb2
-BUILDLINK_PKGSRCDIR.gupnp-ui?= ../../wip/gupnp-ui
+BUILDLINK_PKGSRCDIR.gupnp-ui?= ../../wip/gupnp-ui
.include "../../net/gupnp/buildlink3.mk"
diff --git a/gvariant/Makefile b/gvariant/Makefile
index 16fbdfe233..687cd82e20 100644
--- a/gvariant/Makefile
+++ b/gvariant/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= glib/gvariant.pc.in
diff --git a/gvariant/buildlink3.mk b/gvariant/buildlink3.mk
index f7597de134..d1623bea35 100644
--- a/gvariant/buildlink3.mk
+++ b/gvariant/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gvariant
GVARIANT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gvariant+= gvariant>=0
-BUILDLINK_PKGSRCDIR.gvariant?= ../../wip/gvariant
+BUILDLINK_PKGSRCDIR.gvariant?= ../../wip/gvariant
.include "../../devel/glib2/buildlink3.mk"
diff --git a/gwget/options.mk b/gwget/options.mk
index 785d9d0a1e..84f8cfbbb7 100644
--- a/gwget/options.mk
+++ b/gwget/options.mk
@@ -1,14 +1,14 @@
# $NetBSD: options.mk,v 1.1.1.1 2010/03/19 19:40:00 jihbed Exp $
#
-PKG_OPTIONS_VAR= PKG_OPTIONS.gwget
-PKG_SUPPORTED_OPTIONS= libnotify epiphany-extension epiphany-version
-PKG_SUGGESTED_OPTIONS= libnotify epiphany-extension epiphany-version
+PKG_OPTIONS_VAR= PKG_OPTIONS.gwget
+PKG_SUPPORTED_OPTIONS= libnotify epiphany-extension epiphany-version
+PKG_SUGGESTED_OPTIONS= libnotify epiphany-extension epiphany-version
.include "../../mk/bsd.options.mk"
.if !empty (PKG_OPTIONS:Mepiphany-extension)
-DEPENDS+= epiphany-extensions>=2.28.1:../../www/epiphany-extensions
+DEPENDS+= epiphany-extensions>=2.28.1:../../www/epiphany-extensions
CONFIGURE_ARGS+= --enable-epiphany-extension
.endif
diff --git a/gwhois/Makefile b/gwhois/Makefile
index 8d7090c82d..9ce52c6fee 100644
--- a/gwhois/Makefile
+++ b/gwhois/Makefile
@@ -21,8 +21,8 @@ INSTALLATION_DIRS= share/${PKGBASE} ${PKGMANDIR}/man1
SUBST_CLASSES+= fix-paths
SUBST_MESSAGE.fix-paths= Fixing paths
-SUBST_FILES.fix-paths= gwhois
-SUBST_FILES.fix-paths+= gwhois.1
+SUBST_FILES.fix-paths= gwhois
+SUBST_FILES.fix-paths+= gwhois.1
SUBST_SED.fix-paths+= -e 's,/etc/gwhois,${PREFIX}/share/gwhois,g'
SUBST_STAGE.fix-paths= post-patch
diff --git a/gwyddion/Makefile b/gwyddion/Makefile
index 488b30b767..38df482e71 100644
--- a/gwyddion/Makefile
+++ b/gwyddion/Makefile
@@ -26,9 +26,9 @@ SUBST_MESSAGE.schema= Fixing schema installation path.
SUBST_FILES.schema+= data/Makefile.in
SUBST_SED.schema+= -e "s,..sysconfdir./gconf/schemas,${PREFIX}/share/gconf/schemas/,"
-PKG_OPTIONS_VAR= PKG_OPTIONS.gwyddion
-PKG_SUPPORTED_OPTIONS= pygwy fftw3
-PKG_SUGGESTED_OPTIONS= pygwy fftw3
+PKG_OPTIONS_VAR= PKG_OPTIONS.gwyddion
+PKG_SUPPORTED_OPTIONS= pygwy fftw3
+PKG_SUGGESTED_OPTIONS= pygwy fftw3
.include "../../mk/bsd.options.mk"
diff --git a/gxconsole/Makefile b/gxconsole/Makefile
index 409d3e9835..d6a59dccda 100644
--- a/gxconsole/Makefile
+++ b/gxconsole/Makefile
@@ -12,7 +12,7 @@ COMMENT= Gxconsole is gtk-based reading system console messages like xconsole
WRKSRC= ${WRKDIR}/gxconsole
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Home |
Main Index |
Thread Index |
Old Index