pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/o*: fix pkglint indentation warnings
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Sat Jan 27 22:06:20 2018 +0000
Changeset: d57e266573c5506af81a457b41db77594a3995bf
Modified Files:
objfw-git/Makefile
ocaml-biniou/Makefile
ocaml-camomile/Makefile
ocaml-comparelib/buildlink3.mk
ocaml-custom_printf/Makefile
ocaml-easy-format/Makefile
ocaml-easy-format/buildlink3.mk
ocaml-enumerate/Makefile
ocaml-fieldslib/Makefile
ocaml-herelib/Makefile
ocaml-pa_bench/Makefile
ocaml-pa_ounit/Makefile
ocaml-pa_test/Makefile
ocaml-pipebang/Makefile
ocaml-typerep/Makefile
ocaml-variantslib/Makefile
ocaml-variantslib/buildlink3.mk
ocaml-zed/buildlink3.mk
ogmrip/Makefile
ogre/Makefile
olsrd/Makefile
oneloop/Makefile
oolite/PLIST
oops/Makefile
open21xx/Makefile
openaxiom-svn/Makefile
openblas-devel/buildlink3.mk
openblas-devel/options.mk
openca/Makefile.config
openerp-server/Makefile
openjdk8-openjfx-hg/Makefile
openlogos/Makefile
openlogos/PLIST
openmpi/PLIST.NetBSD
openmpi163/Makefile
openmpi163/PLIST.Darwin
openmpi163/PLIST.Linux
openmpi163/PLIST.Linux.noib
opennurbs/buildlink3.mk
openra/Makefile
opensc/Makefile
opensc/options.mk
openscep/Makefile
opensips/Makefile
openssh/Makefile
openssl110/builtin.mk
openttd-opengfx/Makefile
openttd-openmsx/Makefile
openttd-opensfx/Makefile
opentyrian/options.mk
openvrml/Makefile
openvrml/buildlink3.mk
or1ksim/Makefile
org-caldav-git/Makefile
oslc/Makefile
osmo/Makefile
ozymandns/Makefile
Log Message:
wip/o*: fix pkglint indentation warnings
pkglint -Wall -F -o aligned o*/
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d57e266573c5506af81a457b41db77594a3995bf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
objfw-git/Makefile | 4 +-
ocaml-biniou/Makefile | 2 +-
ocaml-camomile/Makefile | 6 +-
ocaml-comparelib/buildlink3.mk | 2 +-
ocaml-custom_printf/Makefile | 2 +-
ocaml-easy-format/Makefile | 4 +-
ocaml-easy-format/buildlink3.mk | 2 +-
ocaml-enumerate/Makefile | 8 +-
ocaml-fieldslib/Makefile | 2 +-
ocaml-herelib/Makefile | 8 +-
ocaml-pa_bench/Makefile | 4 +-
ocaml-pa_ounit/Makefile | 2 +-
ocaml-pa_test/Makefile | 2 +-
ocaml-pipebang/Makefile | 2 +-
ocaml-typerep/Makefile | 4 +-
ocaml-variantslib/Makefile | 2 +-
ocaml-variantslib/buildlink3.mk | 2 +-
ocaml-zed/buildlink3.mk | 2 +-
ogmrip/Makefile | 8 +-
ogre/Makefile | 8 +-
olsrd/Makefile | 14 +-
oneloop/Makefile | 2 +-
oolite/PLIST | 378 ++++++++++++++++++++--------------------
oops/Makefile | 36 ++--
open21xx/Makefile | 6 +-
openaxiom-svn/Makefile | 2 +-
openblas-devel/buildlink3.mk | 2 +-
openblas-devel/options.mk | 4 +-
openca/Makefile.config | 4 +-
openerp-server/Makefile | 52 +++---
openjdk8-openjfx-hg/Makefile | 6 +-
openlogos/Makefile | 14 +-
openlogos/PLIST | 218 +++++++++++------------
openmpi/PLIST.NetBSD | 2 +-
openmpi163/Makefile | 2 +-
openmpi163/PLIST.Darwin | 2 +-
openmpi163/PLIST.Linux | 58 +++---
openmpi163/PLIST.Linux.noib | 58 +++---
opennurbs/buildlink3.mk | 2 +-
openra/Makefile | 2 +-
opensc/Makefile | 14 +-
opensc/options.mk | 2 +-
openscep/Makefile | 20 +--
opensips/Makefile | 2 +-
openssh/Makefile | 22 +--
openssl110/builtin.mk | 22 +--
openttd-opengfx/Makefile | 6 +-
openttd-openmsx/Makefile | 6 +-
openttd-opensfx/Makefile | 6 +-
opentyrian/options.mk | 4 +-
openvrml/Makefile | 8 +-
openvrml/buildlink3.mk | 2 +-
or1ksim/Makefile | 2 +-
org-caldav-git/Makefile | 2 +-
oslc/Makefile | 19 +-
osmo/Makefile | 4 +-
ozymandns/Makefile | 14 +-
57 files changed, 548 insertions(+), 547 deletions(-)
diffs:
diff --git a/objfw-git/Makefile b/objfw-git/Makefile
index 881da702c3..656f6565ca 100644
--- a/objfw-git/Makefile
+++ b/objfw-git/Makefile
@@ -23,9 +23,9 @@ PLIST_VARS+= runtime bridge
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} != "Darwin"
-PLIST.runtime = yes
+PLIST.runtime = yes
.else
-PLIST.bridge = yes
+PLIST.bridge = yes
.endif
pre-configure:
diff --git a/ocaml-biniou/Makefile b/ocaml-biniou/Makefile
index a393fff243..a370a5ddc2 100644
--- a/ocaml-biniou/Makefile
+++ b/ocaml-biniou/Makefile
@@ -13,7 +13,7 @@ LICENSE= modified-bsd
USE_TOOLS+= gmake
OCAML_USE_FINDLIB= yes
-BUILD_TARGET+= opt
+BUILD_TARGET+= opt
.include "../../wip/ocaml-easy-format/buildlink3.mk"
.include "../../mk/ocaml.mk"
diff --git a/ocaml-camomile/Makefile b/ocaml-camomile/Makefile
index fefbff90d7..517acd188f 100644
--- a/ocaml-camomile/Makefile
+++ b/ocaml-camomile/Makefile
@@ -4,19 +4,19 @@ PKGNAME= ocaml-${DISTNAME}
DISTNAME= camomile-0.8.4
CATEGORIES= converters
MASTER_SITES= https://github.com/downloads/yoriyuki/Camomile/
-EXTRACT_SUFX= .tar.bz2
+EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/yoriyuki/Camomile/tree/master/Camomile
COMMENT= Unicode library for ocaml
LICENSE= gnu-lgpl-v2.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir="${DESTDIR}${PREFIX}/lib/ocaml/site-lib"
-OCAML_USE_FINDLIB=yes
+OCAML_USE_FINDLIB= yes
.include "../../lang/camlp4/buildlink3.mk"
.include "../../mk/ocaml.mk"
diff --git a/ocaml-comparelib/buildlink3.mk b/ocaml-comparelib/buildlink3.mk
index 24b6f1697a..b5c8fdd1fb 100644
--- a/ocaml-comparelib/buildlink3.mk
+++ b/ocaml-comparelib/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= ocaml-comparelib
OCAML_COMPARELIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-comparelib+= ocaml-comparelib>=109.60.00
-BUILDLINK_PKGSRCDIR.ocaml-comparelib?= ../../wip/ocaml-comparelib
+BUILDLINK_PKGSRCDIR.ocaml-comparelib?= ../../wip/ocaml-comparelib
.endif # OCAML_COMPARELIB_BUILDLINK3_MK
BUILDLINK_TREE+= -ocaml-comparelib
diff --git a/ocaml-custom_printf/Makefile b/ocaml-custom_printf/Makefile
index 13c0847851..f314c91282 100644
--- a/ocaml-custom_printf/Makefile
+++ b/ocaml-custom_printf/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.2 2015/04/17 22:25:04 jgoamakf Exp $
DISTNAME= custom_printf-112.24.00
-CATEGORIES= devel
+CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
GITHUB_PROJECT= custom_printf
GITHUB_TAG= 112.24.00
diff --git a/ocaml-easy-format/Makefile b/ocaml-easy-format/Makefile
index d1b7e38c29..542cbaf2d2 100644
--- a/ocaml-easy-format/Makefile
+++ b/ocaml-easy-format/Makefile
@@ -12,8 +12,8 @@ LICENSE= modified-bsd
USE_TOOLS+= gmake
-OCAML_USE_FINDLIB=yes
-BUILD_TARGET+= opt
+OCAML_USE_FINDLIB= yes
+BUILD_TARGET+= opt
.include "../../mk/ocaml.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ocaml-easy-format/buildlink3.mk b/ocaml-easy-format/buildlink3.mk
index a0fa3d9503..a386fe138d 100644
--- a/ocaml-easy-format/buildlink3.mk
+++ b/ocaml-easy-format/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= ocaml-easy-format
OCAML_EASY_FORMAT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-easy-format+= ocaml-easy-format>=1.0.2
-BUILDLINK_PKGSRCDIR.ocaml-easy-format?= ../../wip/ocaml-easy-format
+BUILDLINK_PKGSRCDIR.ocaml-easy-format?= ../../wip/ocaml-easy-format
.endif # OCAML_EASY_FORMAT_BUILDLINK3_MK
diff --git a/ocaml-enumerate/Makefile b/ocaml-enumerate/Makefile
index 52eeaaae25..9e28c304ae 100644
--- a/ocaml-enumerate/Makefile
+++ b/ocaml-enumerate/Makefile
@@ -2,10 +2,10 @@
DISTNAME= enumerate-${VERS}
VERS= 111.08.00
-CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/enumerate/archive/
-DISTFILES= ${VERS}${EXTRACT_SUFX}
-DIST_SUBDIR= ocaml-enumerate
+CATEGORIES= devel
+MASTER_SITES= https://github.com/janestreet/enumerate/archive/
+DISTFILES= ${VERS}${EXTRACT_SUFX}
+DIST_SUBDIR= ocaml-enumerate
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/janestreet/enumerate/
diff --git a/ocaml-fieldslib/Makefile b/ocaml-fieldslib/Makefile
index 917293d49b..4b4d7f89ac 100644
--- a/ocaml-fieldslib/Makefile
+++ b/ocaml-fieldslib/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/janestreet/fieldslib/
COMMENT= Define first class values representing record fields
LICENSE= apache-2.0
-OCAML_USE_OASIS= yes
+OCAML_USE_OASIS= yes
.include "../../devel/ocaml-type_conv/buildlink3.mk"
.include "../../mk/ocaml.mk"
diff --git a/ocaml-herelib/Makefile b/ocaml-herelib/Makefile
index 8ca8e22b4d..bc2c64314c 100644
--- a/ocaml-herelib/Makefile
+++ b/ocaml-herelib/Makefile
@@ -2,10 +2,10 @@
DISTNAME= herelib-${VERS}
VERS= 109.35.02
-CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/herelib/archive/
-DISTFILES= ${VERS}${EXTRACT_SUFX}
-DIST_SUBDIR= ocaml-herelib
+CATEGORIES= devel
+MASTER_SITES= https://github.com/janestreet/herelib/archive/
+DISTFILES= ${VERS}${EXTRACT_SUFX}
+DIST_SUBDIR= ocaml-herelib
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://github.com/janestreet/herelib/
diff --git a/ocaml-pa_bench/Makefile b/ocaml-pa_bench/Makefile
index 67703f3fdd..833bda3af9 100644
--- a/ocaml-pa_bench/Makefile
+++ b/ocaml-pa_bench/Makefile
@@ -3,7 +3,7 @@
DISTNAME= pa_bench-${VERS}
VERS= 112.06.00
CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/pa_bench/archive/
+MASTER_SITES= https://github.com/janestreet/pa_bench/archive/
DISTFILES= ${VERS}${EXTRACT_SUFX}
DIST_SUBDIR= ocaml-pa_bench
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/janestreet/pa_bench/
COMMENT= Syntax extension for inline benchmarks
LICENSE= apache-2.0
-OCAML_USE_OASIS=yes
+OCAML_USE_OASIS= yes
.include "../../wip/ocaml-pa_ounit/buildlink3.mk"
.include "../../devel/ocaml-type_conv/buildlink3.mk"
diff --git a/ocaml-pa_ounit/Makefile b/ocaml-pa_ounit/Makefile
index eb93428c89..1b7354c2c3 100644
--- a/ocaml-pa_ounit/Makefile
+++ b/ocaml-pa_ounit/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.5 2015/04/17 22:28:58 jgoamakf Exp $
DISTNAME= pa_ounit-112.24.00
-CATEGORIES= devel
+CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
GITHUB_PROJECT= pa_ounit
GITHUB_TAG= 112.24.00
diff --git a/ocaml-pa_test/Makefile b/ocaml-pa_test/Makefile
index 1759fe9ba6..718856fc86 100644
--- a/ocaml-pa_test/Makefile
+++ b/ocaml-pa_test/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/janestreet/pa_test/
COMMENT= Quotation expanders for assertions
LICENSE= apache-2.0
-OCAML_USE_OASIS=yes
+OCAML_USE_OASIS= yes
.include "../../devel/ocaml-sexplib/buildlink3.mk"
.include "../../devel/ocaml-type_conv/buildlink3.mk"
diff --git a/ocaml-pipebang/Makefile b/ocaml-pipebang/Makefile
index 9a0c543174..d61f8de444 100644
--- a/ocaml-pipebang/Makefile
+++ b/ocaml-pipebang/Makefile
@@ -3,7 +3,7 @@
DISTNAME= pipebang-${VERS}
VERS= 110.01.00
CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/pipebang/archive/
+MASTER_SITES= https://github.com/janestreet/pipebang/archive/
DISTFILES= ${VERS}${EXTRACT_SUFX}
DIST_SUBDIR= ocaml-pa_test
diff --git a/ocaml-typerep/Makefile b/ocaml-typerep/Makefile
index 53a35a91ae..29c812ba9d 100644
--- a/ocaml-typerep/Makefile
+++ b/ocaml-typerep/Makefile
@@ -3,7 +3,7 @@
DISTNAME= typerep-${VERS}
VERS= 112.17.00
CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/typerep/archive/
+MASTER_SITES= https://github.com/janestreet/typerep/archive/
DISTFILES= ${VERS}${EXTRACT_SUFX}
DIST_SUBDIR= ocaml-typerep
@@ -12,7 +12,7 @@ HOMEPAGE= https://github.com/janestreet/typerep/
COMMENT= Runtime types for OCaml
LICENSE= apache-2.0
-OCAML_USE_OASIS=yes
+OCAML_USE_OASIS= yes
.include "../../devel/ocaml-type_conv/buildlink3.mk"
.include "../../lang/camlp4/buildlink3.mk"
diff --git a/ocaml-variantslib/Makefile b/ocaml-variantslib/Makefile
index f0145f9b02..e4c550195e 100644
--- a/ocaml-variantslib/Makefile
+++ b/ocaml-variantslib/Makefile
@@ -3,7 +3,7 @@
DISTNAME= variantslib-${VERS}
VERS= 109.15.03
CATEGORIES= devel
-MASTER_SITES= https://github.com/janestreet/variantslib/archive/
+MASTER_SITES= https://github.com/janestreet/variantslib/archive/
DISTFILES= ${VERS}${EXTRACT_SUFX}
DIST_SUBDIR= ocaml-variantslib
diff --git a/ocaml-variantslib/buildlink3.mk b/ocaml-variantslib/buildlink3.mk
index 5b1729b3f9..e45018dca3 100644
--- a/ocaml-variantslib/buildlink3.mk
+++ b/ocaml-variantslib/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-variantslib
OCAML_VARIANTSLIB_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-variantslib+= ocaml-variantslib>=109.10.00
-BUILDLINK_PKGSRCDIR.ocaml-variantslib?= ../../wip/ocaml-variantslib
+BUILDLINK_PKGSRCDIR.ocaml-variantslib?= ../../wip/ocaml-variantslib
.endif # OCAML_VARIANTSLIB_BUILDLINK3_MK
BUILDLINK_TREE+= -ocaml-variantslib
diff --git a/ocaml-zed/buildlink3.mk b/ocaml-zed/buildlink3.mk
index 785a1007fa..5a95bf014a 100644
--- a/ocaml-zed/buildlink3.mk
+++ b/ocaml-zed/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-zed
OCAML_ZED_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.ocaml-zed+= ocaml-zed>=1.2
-BUILDLINK_PKGSRCDIR.ocaml-zed?= ../../wip/ocaml-zed
+BUILDLINK_PKGSRCDIR.ocaml-zed?= ../../wip/ocaml-zed
.include "../../wip/ocaml-camomile/buildlink3.mk"
.endif # OCAML_ZED_BUILDLINK3_MK
diff --git a/ogmrip/Makefile b/ogmrip/Makefile
index 65542ae2a3..50e800a47a 100644
--- a/ogmrip/Makefile
+++ b/ogmrip/Makefile
@@ -6,10 +6,10 @@ DISTNAME= ogmrip-0.13.7
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ogmrip/}
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://ogmrip.sourceforge.net/
-COMMENT= Application for ripping and encoding DVD into DivX/OGM files
-LICENSE= gnu-lgpl-v2.1
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://ogmrip.sourceforge.net/
+COMMENT= Application for ripping and encoding DVD into DivX/OGM files
+LICENSE= gnu-lgpl-v2.1
DEPENDS+= mencoder-[0-9]*:../../multimedia/mencoder
DEPENDS+= mkvtoolnix-[0-9]*:../../multimedia/mkvtoolnix
diff --git a/ogre/Makefile b/ogre/Makefile
index bd4d63abd6..ac82928c3c 100644
--- a/ogre/Makefile
+++ b/ogre/Makefile
@@ -12,11 +12,11 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://ogre.sourceforge.net/
COMMENT= Object-Oriented Graphics Rendering Engine
-WRKSRC= ${WRKDIR}/${DISTNAME}
+WRKSRC= ${WRKDIR}/${DISTNAME}
USE_CMAKE= YES
-USE_TOOLS+= gmake pkg-config xmkmf
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
+USE_TOOLS+= gmake pkg-config xmkmf
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= CMake/Templates/OGRE-PCZ.pc.in
PKGCONFIG_OVERRIDE+= CMake/Templates/OGREStatic.pc.in
diff --git a/olsrd/Makefile b/olsrd/Makefile
index 9bd2a22616..fb5684ef39 100644
--- a/olsrd/Makefile
+++ b/olsrd/Makefile
@@ -17,15 +17,15 @@ USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
-PKG_SYSCONFSUBDIR=olsrd
+PKG_SYSCONFSUBDIR= olsrd
-MAKE_FLAGS+=ETCDIR=${DESTDIR}${PKG_SYSCONFDIR}
-MAKE_FLAGS+=MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+=SBINDIR=${DESTDIR}${PREFIX}/sbin
-MAKE_FLAGS+=EXTRA_CPPFLAGS=-DETCDIR=\\\"${PKG_SYSCONFDIR}\\\"
+MAKE_FLAGS+= ETCDIR=${DESTDIR}${PKG_SYSCONFDIR}
+MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+= SBINDIR=${DESTDIR}${PREFIX}/sbin
+MAKE_FLAGS+= EXTRA_CPPFLAGS=-DETCDIR=\\\"${PKG_SYSCONFDIR}\\\"
-EGDIR= ${PREFIX}/share/examples/olsrd
-CONF_FILES= ${EGDIR}/olsrd.conf ${PKG_SYSCONFDIR}/olsrd.conf
+EGDIR= ${PREFIX}/share/examples/olsrd
+CONF_FILES= ${EGDIR}/olsrd.conf ${PKG_SYSCONFDIR}/olsrd.conf
INSTALLATION_DIRS= ${EGDIR}
INSTALLATION_DIRS+= ${PKG_SYSCONFDIR}
diff --git a/oneloop/Makefile b/oneloop/Makefile
index ba26888809..e010caf956 100644
--- a/oneloop/Makefile
+++ b/oneloop/Makefile
@@ -11,7 +11,7 @@ MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= http://helac-phegas.web.cern.ch/helac-phegas/OneLOop.html
COMMENT= Evaluate the one-loop scalar 1-point, 2-point, 3-point
-MAKE_FILE= makefile
+MAKE_FILE= makefile
USE_LANGUAGES= fortran
INSTALLATION_DIRS= lib
diff --git a/oolite/PLIST b/oolite/PLIST
index aeb268b644..1a01a7bd7a 100644
--- a/oolite/PLIST
+++ b/oolite/PLIST
@@ -1,216 +1,216 @@
@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:00 thomasklausner Exp $
+bin/oolite
share/GNUstep/Local/Tools/oolite
-share/oolite.debug/Resources/Info-gnustep.plist
-share/oolite.debug/Contents/Resources/Sounds/buy.ogg
-share/oolite.debug/Contents/Resources/Sounds/warning.ogg
-share/oolite.debug/Contents/Resources/Sounds/trumble.ogg
-share/oolite.debug/Contents/Resources/Sounds/ecm.ogg
-share/oolite.debug/Contents/Resources/Sounds/beep.ogg
-share/oolite.debug/Contents/Resources/Sounds/missile.ogg
-share/oolite.debug/Contents/Resources/Sounds/scoop.ogg
-share/oolite.debug/Contents/Resources/Sounds/trumblesqueal.ogg
-share/oolite.debug/Contents/Resources/Sounds/afterburner1.ogg
-share/oolite.debug/Contents/Resources/Sounds/afterburner2.ogg
-share/oolite.debug/Contents/Resources/Sounds/sell.ogg
-share/oolite.debug/Contents/Resources/Sounds/hit.ogg
-share/oolite.debug/Contents/Resources/Sounds/laser.ogg
-share/oolite.debug/Contents/Resources/Sounds/witchabort.ogg
-share/oolite.debug/Contents/Resources/Sounds/breakpattern.ogg
-share/oolite.debug/Contents/Resources/Sounds/boop.ogg
-share/oolite.debug/Contents/Resources/Sounds/hullbang.ogg
-share/oolite.debug/Contents/Resources/Sounds/guiclick.ogg
-share/oolite.debug/Contents/Resources/Sounds/bigbang.ogg
-share/oolite.debug/Contents/Resources/Sounds/laserhits.ogg
-share/oolite.debug/Contents/Resources/Config/missiontext.plist
+share/oolite.debug/Contents/Resources/AIReference.html
+share/oolite.debug/Contents/Resources/AIs/buoyAI.plist
+share/oolite.debug/Contents/Resources/AIs/collectLootAI.plist
+share/oolite.debug/Contents/Resources/AIs/dockingAI.plist
+share/oolite.debug/Contents/Resources/AIs/dumbAI.plist
+share/oolite.debug/Contents/Resources/AIs/enteringPirateAI.plist
+share/oolite.debug/Contents/Resources/AIs/enteringTraderAI.plist
+share/oolite.debug/Contents/Resources/AIs/escortAI.plist
+share/oolite.debug/Contents/Resources/AIs/exitingTraderAI.plist
+share/oolite.debug/Contents/Resources/AIs/fallingShuttleAI.plist
+share/oolite.debug/Contents/Resources/AIs/fttAI.plist
+share/oolite.debug/Contents/Resources/AIs/gotoWaypointAI.plist
+share/oolite.debug/Contents/Resources/AIs/hardMissileAI.plist
+share/oolite.debug/Contents/Resources/AIs/homeAI.plist
+share/oolite.debug/Contents/Resources/AIs/interceptAI.plist
+share/oolite.debug/Contents/Resources/AIs/minerAI.plist
+share/oolite.debug/Contents/Resources/AIs/missileAI.plist
+share/oolite.debug/Contents/Resources/AIs/nullAI.plist
+share/oolite.debug/Contents/Resources/AIs/pirateAI.plist
+share/oolite.debug/Contents/Resources/AIs/planetPatrolAI.plist
+share/oolite.debug/Contents/Resources/AIs/policeInterceptAI.plist
+share/oolite.debug/Contents/Resources/AIs/receiveDockingAI.plist
+share/oolite.debug/Contents/Resources/AIs/risingShuttleAI.plist
+share/oolite.debug/Contents/Resources/AIs/rockHermitAI.plist
+share/oolite.debug/Contents/Resources/AIs/route1patrolAI.plist
+share/oolite.debug/Contents/Resources/AIs/route1traderAI.plist
+share/oolite.debug/Contents/Resources/AIs/route2patrolAI.plist
+share/oolite.debug/Contents/Resources/AIs/route2sunskimAI.plist
+share/oolite.debug/Contents/Resources/AIs/scavengerAI.plist
+share/oolite.debug/Contents/Resources/AIs/shuttleAI.plist
+share/oolite.debug/Contents/Resources/AIs/stationAI.plist
+share/oolite.debug/Contents/Resources/AIs/sunSkimExitAI.plist
+share/oolite.debug/Contents/Resources/AIs/thargletAI.plist
+share/oolite.debug/Contents/Resources/AIs/thargoidAI.plist
+share/oolite.debug/Contents/Resources/AIs/timebombAI.plist
share/oolite.debug/Contents/Resources/Config/characters.plist
+share/oolite.debug/Contents/Resources/Config/commodities.plist
+share/oolite.debug/Contents/Resources/Config/customsounds.plist
+share/oolite.debug/Contents/Resources/Config/demoships.plist
share/oolite.debug/Contents/Resources/Config/descriptions.plist
-share/oolite.debug/Contents/Resources/Config/keyconfig.plist
share/oolite.debug/Contents/Resources/Config/equipment.plist
-share/oolite.debug/Contents/Resources/Config/shipdata.plist
share/oolite.debug/Contents/Resources/Config/hud-small.plist
-share/oolite.debug/Contents/Resources/Config/demoships.plist
-share/oolite.debug/Contents/Resources/Config/speech_pronunciation_guide.plist
share/oolite.debug/Contents/Resources/Config/hud.plist
-share/oolite.debug/Contents/Resources/Config/commodities.plist
+share/oolite.debug/Contents/Resources/Config/illegal_goods.plist
+share/oolite.debug/Contents/Resources/Config/keyconfig.plist
+share/oolite.debug/Contents/Resources/Config/missiontext.plist
share/oolite.debug/Contents/Resources/Config/script.plist
+share/oolite.debug/Contents/Resources/Config/shipdata.plist
share/oolite.debug/Contents/Resources/Config/shipyard.plist
-share/oolite.debug/Contents/Resources/Config/customsounds.plist
-share/oolite.debug/Contents/Resources/Config/illegal_goods.plist
-share/oolite.debug/Contents/Resources/Music/BlueDanube.ogg
-share/oolite.debug/Contents/Resources/Music/OoliteTheme.ogg
-share/oolite.debug/Contents/Resources/Images/splashback.png
+share/oolite.debug/Contents/Resources/Config/speech_pronunciation_guide.plist
+share/oolite.debug/Contents/Resources/Images/greendot.png
+share/oolite.debug/Contents/Resources/Images/reddot.png
share/oolite.debug/Contents/Resources/Images/solar.png
-share/oolite.debug/Contents/Resources/Images/trumblebox.png
share/oolite.debug/Contents/Resources/Images/splash.png
-share/oolite.debug/Contents/Resources/Images/reddot.png
-share/oolite.debug/Contents/Resources/Images/greendot.png
-share/oolite.debug/Contents/Resources/Textures/galaxy256.png
-share/oolite.debug/Contents/Resources/Textures/left_metal.png
-share/oolite.debug/Contents/Resources/Textures/right_metal.png
-share/oolite.debug/Contents/Resources/Textures/transporter_redux1.png
-share/oolite.debug/Contents/Resources/Textures/shuttle_redux.png
-share/oolite.debug/Contents/Resources/Textures/trumblekit.png
-share/oolite.debug/Contents/Resources/Textures/flare256.png
-share/oolite.debug/Contents/Resources/Textures/krait_redux.png
-share/oolite.debug/Contents/Resources/Textures/asciitext.png
-share/oolite.debug/Contents/Resources/Textures/worm_redux.png
+share/oolite.debug/Contents/Resources/Images/splashback.png
+share/oolite.debug/Contents/Resources/Images/trumblebox.png
+share/oolite.debug/Contents/Resources/InfoPlist.strings
+share/oolite.debug/Contents/Resources/Models/adder_redux.dat
+share/oolite.debug/Contents/Resources/Models/alloy.dat
+share/oolite.debug/Contents/Resources/Models/anaconda_redux.dat
+share/oolite.debug/Contents/Resources/Models/arcdetail.dat
+share/oolite.debug/Contents/Resources/Models/asp_redux.dat
+share/oolite.debug/Contents/Resources/Models/asteroid.dat
+share/oolite.debug/Contents/Resources/Models/asteroid1.dat
+share/oolite.debug/Contents/Resources/Models/barrel.dat
+share/oolite.debug/Contents/Resources/Models/boa2_redux.dat
+share/oolite.debug/Contents/Resources/Models/boa_redux.dat
+share/oolite.debug/Contents/Resources/Models/boulder.dat
+share/oolite.debug/Contents/Resources/Models/boulder1.dat
+share/oolite.debug/Contents/Resources/Models/buoy.dat
+share/oolite.debug/Contents/Resources/Models/cobra1_redux.dat
+share/oolite.debug/Contents/Resources/Models/cobra1_redux1.dat
+share/oolite.debug/Contents/Resources/Models/cobra1_redux2.dat
+share/oolite.debug/Contents/Resources/Models/cobra3_redux.dat
+share/oolite.debug/Contents/Resources/Models/cobra3_redux1.dat
+share/oolite.debug/Contents/Resources/Models/constrictor_redux.dat
+share/oolite.debug/Contents/Resources/Models/dock-flat.dat
+share/oolite.debug/Contents/Resources/Models/dock.dat
+share/oolite.debug/Contents/Resources/Models/escpod_redux.dat
+share/oolite.debug/Contents/Resources/Models/exhaust.dat
+share/oolite.debug/Contents/Resources/Models/ferdelance_redux.dat
+share/oolite.debug/Contents/Resources/Models/gecko_redux.dat
+share/oolite.debug/Contents/Resources/Models/icosahedron.dat
+share/oolite.debug/Contents/Resources/Models/icostextured.dat
+share/oolite.debug/Contents/Resources/Models/krait_redux.dat
+share/oolite.debug/Contents/Resources/Models/mamba_redux.dat
+share/oolite.debug/Contents/Resources/Models/mamba_redux1.dat
+share/oolite.debug/Contents/Resources/Models/missile.dat
+share/oolite.debug/Contents/Resources/Models/moray_redux.dat
+share/oolite.debug/Contents/Resources/Models/moray_redux1.dat
+share/oolite.debug/Contents/Resources/Models/new-dodo.dat
+share/oolite.debug/Contents/Resources/Models/new-icos.dat
+share/oolite.debug/Contents/Resources/Models/new-rock.dat
+share/oolite.debug/Contents/Resources/Models/new_coriolis.dat
+share/oolite.debug/Contents/Resources/Models/python_redux.dat
+share/oolite.debug/Contents/Resources/Models/python_redux1.dat
+share/oolite.debug/Contents/Resources/Models/python_redux2.dat
+share/oolite.debug/Contents/Resources/Models/qbomb.dat
+share/oolite.debug/Contents/Resources/Models/ring.dat
+share/oolite.debug/Contents/Resources/Models/rock-box.dat
+share/oolite.debug/Contents/Resources/Models/rock-dock.dat
+share/oolite.debug/Contents/Resources/Models/scarred_alloy.dat
+share/oolite.debug/Contents/Resources/Models/shuttle_redux.dat
+share/oolite.debug/Contents/Resources/Models/sidewinder_redux.dat
+share/oolite.debug/Contents/Resources/Models/splinter.dat
+share/oolite.debug/Contents/Resources/Models/splinter1.dat
+share/oolite.debug/Contents/Resources/Models/strut.dat
+share/oolite.debug/Contents/Resources/Models/thargoid_redux.dat
+share/oolite.debug/Contents/Resources/Models/thargon_redux.dat
+share/oolite.debug/Contents/Resources/Models/transporter_redux.dat
+share/oolite.debug/Contents/Resources/Models/transporter_redux1.dat
+share/oolite.debug/Contents/Resources/Models/viper_redux.dat
+share/oolite.debug/Contents/Resources/Models/viperi_redux.dat
+share/oolite.debug/Contents/Resources/Models/worm_redux.dat
+share/oolite.debug/Contents/Resources/Models/worm_redux1.dat
+share/oolite.debug/Contents/Resources/Models/wreck1.dat
+share/oolite.debug/Contents/Resources/Models/wreck2.dat
+share/oolite.debug/Contents/Resources/Models/wreck3.dat
+share/oolite.debug/Contents/Resources/Models/wreck4.dat
+share/oolite.debug/Contents/Resources/Models/wreck5.dat
+share/oolite.debug/Contents/Resources/Music/BlueDanube.ogg
+share/oolite.debug/Contents/Resources/Music/OoliteTheme.ogg
+share/oolite.debug/Contents/Resources/README.TXT
+share/oolite.debug/Contents/Resources/Sounds/afterburner1.ogg
+share/oolite.debug/Contents/Resources/Sounds/afterburner2.ogg
+share/oolite.debug/Contents/Resources/Sounds/beep.ogg
+share/oolite.debug/Contents/Resources/Sounds/bigbang.ogg
+share/oolite.debug/Contents/Resources/Sounds/boop.ogg
+share/oolite.debug/Contents/Resources/Sounds/breakpattern.ogg
+share/oolite.debug/Contents/Resources/Sounds/buy.ogg
+share/oolite.debug/Contents/Resources/Sounds/ecm.ogg
+share/oolite.debug/Contents/Resources/Sounds/guiclick.ogg
+share/oolite.debug/Contents/Resources/Sounds/hit.ogg
+share/oolite.debug/Contents/Resources/Sounds/hullbang.ogg
+share/oolite.debug/Contents/Resources/Sounds/laser.ogg
+share/oolite.debug/Contents/Resources/Sounds/laserhits.ogg
+share/oolite.debug/Contents/Resources/Sounds/missile.ogg
+share/oolite.debug/Contents/Resources/Sounds/scoop.ogg
+share/oolite.debug/Contents/Resources/Sounds/sell.ogg
+share/oolite.debug/Contents/Resources/Sounds/trumble.ogg
+share/oolite.debug/Contents/Resources/Sounds/trumblesqueal.ogg
+share/oolite.debug/Contents/Resources/Sounds/warning.ogg
+share/oolite.debug/Contents/Resources/Sounds/witchabort.ogg
+share/oolite.debug/Contents/Resources/Textures/MorayMED_bottom.png
+share/oolite.debug/Contents/Resources/Textures/MorayMED_top.png
share/oolite.debug/Contents/Resources/Textures/adder_redux.png
+share/oolite.debug/Contents/Resources/Textures/anaconda_redux.png
+share/oolite.debug/Contents/Resources/Textures/arcdetail.png
+share/oolite.debug/Contents/Resources/Textures/asciitext.png
+share/oolite.debug/Contents/Resources/Textures/asp_redux.png
+share/oolite.debug/Contents/Resources/Textures/asteroid.png
+share/oolite.debug/Contents/Resources/Textures/back_metal.png
+share/oolite.debug/Contents/Resources/Textures/barrel_metal.png
+share/oolite.debug/Contents/Resources/Textures/blur256.png
share/oolite.debug/Contents/Resources/Textures/boa2_left.png
-share/oolite.debug/Contents/Resources/Textures/oolite-expansion-document.png
-share/oolite.debug/Contents/Resources/Textures/gecko_redux.png
-share/oolite.debug/Contents/Resources/Textures/oolite-document.png
-share/oolite.debug/Contents/Resources/Textures/wreck.png
-share/oolite.debug/Contents/Resources/Textures/MorayMED_bottom.png
+share/oolite.debug/Contents/Resources/Textures/boa2_rear.png
share/oolite.debug/Contents/Resources/Textures/boa2_redux.png
-share/oolite.debug/Contents/Resources/Textures/moray_redux.png
-share/oolite.debug/Contents/Resources/Textures/sidewinder_redux.png
-share/oolite.debug/Contents/Resources/Textures/oolite-logo1.png
-share/oolite.debug/Contents/Resources/Textures/asteroid.png
-share/oolite.debug/Contents/Resources/Textures/mamba_redux.png
-share/oolite.debug/Contents/Resources/Textures/worm_redux1.png
-share/oolite.debug/Contents/Resources/Textures/dark_metal.png
-share/oolite.debug/Contents/Resources/Textures/missile.png
-share/oolite.debug/Contents/Resources/Textures/anaconda_redux.png
-share/oolite.debug/Contents/Resources/Textures/cobra1_redux.png
+share/oolite.debug/Contents/Resources/Textures/boa2_right.png
+share/oolite.debug/Contents/Resources/Textures/boa2_top.png
share/oolite.debug/Contents/Resources/Textures/boa_redux.png
+share/oolite.debug/Contents/Resources/Textures/bottom_metal.png
+share/oolite.debug/Contents/Resources/Textures/cobra1_redux.png
share/oolite.debug/Contents/Resources/Textures/cobra1_redux1.png
share/oolite.debug/Contents/Resources/Textures/cobra1_redux2.png
-share/oolite.debug/Contents/Resources/Textures/viperi_redux.png
-share/oolite.debug/Contents/Resources/Textures/python_redux1.png
-share/oolite.debug/Contents/Resources/Textures/python_redux2.png
-share/oolite.debug/Contents/Resources/Textures/front_metal.png
-share/oolite.debug/Contents/Resources/Textures/moray_redux1.png
+share/oolite.debug/Contents/Resources/Textures/cobra1miner_top.png
+share/oolite.debug/Contents/Resources/Textures/cobra3_redux.png
share/oolite.debug/Contents/Resources/Textures/cobra3_redux1.png
-share/oolite.debug/Contents/Resources/Textures/star64.png
+share/oolite.debug/Contents/Resources/Textures/constrictor_redux.png
+share/oolite.debug/Contents/Resources/Textures/dark_metal.png
share/oolite.debug/Contents/Resources/Textures/ferdelance_redux.png
-share/oolite.debug/Contents/Resources/Textures/transporter_redux.png
-share/oolite.debug/Contents/Resources/Textures/arcdetail.png
-share/oolite.debug/Contents/Resources/Textures/qbomb.png
-share/oolite.debug/Contents/Resources/Textures/barrel_metal.png
+share/oolite.debug/Contents/Resources/Textures/flare256.png
+share/oolite.debug/Contents/Resources/Textures/front_metal.png
+share/oolite.debug/Contents/Resources/Textures/galaxy256.png
+share/oolite.debug/Contents/Resources/Textures/gecko_redux.png
+share/oolite.debug/Contents/Resources/Textures/krait_redux.png
+share/oolite.debug/Contents/Resources/Textures/left_metal.png
+share/oolite.debug/Contents/Resources/Textures/mamba_redux.png
+share/oolite.debug/Contents/Resources/Textures/mamba_redux1.png
share/oolite.debug/Contents/Resources/Textures/metal.png
-share/oolite.debug/Contents/Resources/Textures/thargon_redux.png
-share/oolite.debug/Contents/Resources/Textures/back_metal.png
-share/oolite.debug/Contents/Resources/Textures/blur256.png
-share/oolite.debug/Contents/Resources/Textures/boa2_rear.png
-share/oolite.debug/Contents/Resources/Textures/cobra1miner_top.png
+share/oolite.debug/Contents/Resources/Textures/missile.png
+share/oolite.debug/Contents/Resources/Textures/moray_redux.png
+share/oolite.debug/Contents/Resources/Textures/moray_redux1.png
+share/oolite.debug/Contents/Resources/Textures/oolite-document.png
+share/oolite.debug/Contents/Resources/Textures/oolite-expansion-document.png
+share/oolite.debug/Contents/Resources/Textures/oolite-logo.png
+share/oolite.debug/Contents/Resources/Textures/oolite-logo1.png
share/oolite.debug/Contents/Resources/Textures/pod2_redux.png
-share/oolite.debug/Contents/Resources/Textures/top_metal.png
-share/oolite.debug/Contents/Resources/Textures/target_metal.png
-share/oolite.debug/Contents/Resources/Textures/bottom_metal.png
-share/oolite.debug/Contents/Resources/Textures/constrictor_redux.png
-share/oolite.debug/Contents/Resources/Textures/viper_redux.png
-share/oolite.debug/Contents/Resources/Textures/boa2_top.png
share/oolite.debug/Contents/Resources/Textures/python_redux.png
-share/oolite.debug/Contents/Resources/Textures/MorayMED_top.png
-share/oolite.debug/Contents/Resources/Textures/cobra3_redux.png
-share/oolite.debug/Contents/Resources/Textures/mamba_redux1.png
+share/oolite.debug/Contents/Resources/Textures/python_redux1.png
+share/oolite.debug/Contents/Resources/Textures/python_redux2.png
+share/oolite.debug/Contents/Resources/Textures/qbomb.png
+share/oolite.debug/Contents/Resources/Textures/right_metal.png
share/oolite.debug/Contents/Resources/Textures/scarred_metal.png
-share/oolite.debug/Contents/Resources/Textures/boa2_right.png
-share/oolite.debug/Contents/Resources/Textures/oolite-logo.png
-share/oolite.debug/Contents/Resources/Textures/asp_redux.png
+share/oolite.debug/Contents/Resources/Textures/shuttle_redux.png
+share/oolite.debug/Contents/Resources/Textures/sidewinder_redux.png
+share/oolite.debug/Contents/Resources/Textures/star64.png
+share/oolite.debug/Contents/Resources/Textures/target_metal.png
share/oolite.debug/Contents/Resources/Textures/thargoid_redux.png
-share/oolite.debug/Contents/Resources/Models/asp_redux.dat
-share/oolite.debug/Contents/Resources/Models/thargoid_redux.dat
-share/oolite.debug/Contents/Resources/Models/boulder1.dat
-share/oolite.debug/Contents/Resources/Models/shuttle_redux.dat
-share/oolite.debug/Contents/Resources/Models/splinter.dat
-share/oolite.debug/Contents/Resources/Models/new-icos.dat
-share/oolite.debug/Contents/Resources/Models/new-rock.dat
-share/oolite.debug/Contents/Resources/Models/krait_redux.dat
-share/oolite.debug/Contents/Resources/Models/worm_redux.dat
-share/oolite.debug/Contents/Resources/Models/alloy.dat
-share/oolite.debug/Contents/Resources/Models/new_coriolis.dat
-share/oolite.debug/Contents/Resources/Models/adder_redux.dat
-share/oolite.debug/Contents/Resources/Models/gecko_redux.dat
-share/oolite.debug/Contents/Resources/Models/dock-flat.dat
-share/oolite.debug/Contents/Resources/Models/icosahedron.dat
-share/oolite.debug/Contents/Resources/Models/boa2_redux.dat
-share/oolite.debug/Contents/Resources/Models/strut.dat
-share/oolite.debug/Contents/Resources/Models/sidewinder_redux.dat
-share/oolite.debug/Contents/Resources/Models/scarred_alloy.dat
-share/oolite.debug/Contents/Resources/Models/moray_redux.dat
-share/oolite.debug/Contents/Resources/Models/escpod_redux.dat
-share/oolite.debug/Contents/Resources/Models/asteroid.dat
-share/oolite.debug/Contents/Resources/Models/mamba_redux.dat
-share/oolite.debug/Contents/Resources/Models/worm_redux1.dat
-share/oolite.debug/Contents/Resources/Models/missile.dat
-share/oolite.debug/Contents/Resources/Models/anaconda_redux.dat
-share/oolite.debug/Contents/Resources/Models/cobra1_redux.dat
-share/oolite.debug/Contents/Resources/Models/boa_redux.dat
-share/oolite.debug/Contents/Resources/Models/barrel.dat
-share/oolite.debug/Contents/Resources/Models/icostextured.dat
-share/oolite.debug/Contents/Resources/Models/cobra1_redux1.dat
-share/oolite.debug/Contents/Resources/Models/cobra1_redux2.dat
-share/oolite.debug/Contents/Resources/Models/wreck1.dat
-share/oolite.debug/Contents/Resources/Models/wreck2.dat
-share/oolite.debug/Contents/Resources/Models/wreck3.dat
-share/oolite.debug/Contents/Resources/Models/wreck4.dat
-share/oolite.debug/Contents/Resources/Models/wreck5.dat
-share/oolite.debug/Contents/Resources/Models/viperi_redux.dat
-share/oolite.debug/Contents/Resources/Models/splinter1.dat
-share/oolite.debug/Contents/Resources/Models/python_redux1.dat
-share/oolite.debug/Contents/Resources/Models/python_redux2.dat
-share/oolite.debug/Contents/Resources/Models/rock-box.dat
-share/oolite.debug/Contents/Resources/Models/moray_redux1.dat
-share/oolite.debug/Contents/Resources/Models/transporter_redux.dat
-share/oolite.debug/Contents/Resources/Models/cobra3_redux1.dat
-share/oolite.debug/Contents/Resources/Models/ring.dat
-share/oolite.debug/Contents/Resources/Models/new-dodo.dat
-share/oolite.debug/Contents/Resources/Models/ferdelance_redux.dat
-share/oolite.debug/Contents/Resources/Models/thargon_redux.dat
-share/oolite.debug/Contents/Resources/Models/arcdetail.dat
-share/oolite.debug/Contents/Resources/Models/qbomb.dat
-share/oolite.debug/Contents/Resources/Models/boulder.dat
-share/oolite.debug/Contents/Resources/Models/buoy.dat
-share/oolite.debug/Contents/Resources/Models/constrictor_redux.dat
-share/oolite.debug/Contents/Resources/Models/viper_redux.dat
-share/oolite.debug/Contents/Resources/Models/python_redux.dat
-share/oolite.debug/Contents/Resources/Models/cobra3_redux.dat
-share/oolite.debug/Contents/Resources/Models/rock-dock.dat
-share/oolite.debug/Contents/Resources/Models/asteroid1.dat
-share/oolite.debug/Contents/Resources/Models/dock.dat
-share/oolite.debug/Contents/Resources/Models/mamba_redux1.dat
-share/oolite.debug/Contents/Resources/Models/exhaust.dat
-share/oolite.debug/Contents/Resources/Models/transporter_redux1.dat
-share/oolite.debug/Contents/Resources/AIs/fttAI.plist
-share/oolite.debug/Contents/Resources/AIs/hardMissileAI.plist
-share/oolite.debug/Contents/Resources/AIs/risingShuttleAI.plist
-share/oolite.debug/Contents/Resources/AIs/minerAI.plist
-share/oolite.debug/Contents/Resources/AIs/fallingShuttleAI.plist
-share/oolite.debug/Contents/Resources/AIs/rockHermitAI.plist
-share/oolite.debug/Contents/Resources/AIs/missileAI.plist
-share/oolite.debug/Contents/Resources/AIs/buoyAI.plist
-share/oolite.debug/Contents/Resources/AIs/sunSkimExitAI.plist
-share/oolite.debug/Contents/Resources/AIs/nullAI.plist
-share/oolite.debug/Contents/Resources/AIs/exitingTraderAI.plist
-share/oolite.debug/Contents/Resources/AIs/route1patrolAI.plist
-share/oolite.debug/Contents/Resources/AIs/stationAI.plist
-share/oolite.debug/Contents/Resources/AIs/route2sunskimAI.plist
-share/oolite.debug/Contents/Resources/AIs/enteringTraderAI.plist
-share/oolite.debug/Contents/Resources/AIs/dockingAI.plist
-share/oolite.debug/Contents/Resources/AIs/policeInterceptAI.plist
-share/oolite.debug/Contents/Resources/AIs/route2patrolAI.plist
-share/oolite.debug/Contents/Resources/AIs/escortAI.plist
-share/oolite.debug/Contents/Resources/AIs/thargletAI.plist
-share/oolite.debug/Contents/Resources/AIs/homeAI.plist
-share/oolite.debug/Contents/Resources/AIs/thargoidAI.plist
-share/oolite.debug/Contents/Resources/AIs/gotoWaypointAI.plist
-share/oolite.debug/Contents/Resources/AIs/planetPatrolAI.plist
-share/oolite.debug/Contents/Resources/AIs/shuttleAI.plist
-share/oolite.debug/Contents/Resources/AIs/dumbAI.plist
-share/oolite.debug/Contents/Resources/AIs/route1traderAI.plist
-share/oolite.debug/Contents/Resources/AIs/collectLootAI.plist
-share/oolite.debug/Contents/Resources/AIs/enteringPirateAI.plist
-share/oolite.debug/Contents/Resources/AIs/scavengerAI.plist
-share/oolite.debug/Contents/Resources/AIs/interceptAI.plist
-share/oolite.debug/Contents/Resources/AIs/timebombAI.plist
-share/oolite.debug/Contents/Resources/AIs/pirateAI.plist
-share/oolite.debug/Contents/Resources/AIs/receiveDockingAI.plist
+share/oolite.debug/Contents/Resources/Textures/thargon_redux.png
+share/oolite.debug/Contents/Resources/Textures/top_metal.png
+share/oolite.debug/Contents/Resources/Textures/transporter_redux.png
+share/oolite.debug/Contents/Resources/Textures/transporter_redux1.png
+share/oolite.debug/Contents/Resources/Textures/trumblekit.png
+share/oolite.debug/Contents/Resources/Textures/viper_redux.png
+share/oolite.debug/Contents/Resources/Textures/viperi_redux.png
+share/oolite.debug/Contents/Resources/Textures/worm_redux.png
+share/oolite.debug/Contents/Resources/Textures/worm_redux1.png
+share/oolite.debug/Contents/Resources/Textures/wreck.png
share/oolite.debug/Contents/Resources/oolite-document.icns
-share/oolite.debug/Contents/Resources/InfoPlist.strings
-share/oolite.debug/Contents/Resources/AIReference.html
-share/oolite.debug/Contents/Resources/README.TXT
-share/oolite.debug/Contents/Resources/oolite-icon.icns
share/oolite.debug/Contents/Resources/oolite-expansion-document.icns
+share/oolite.debug/Contents/Resources/oolite-icon.icns
+share/oolite.debug/Resources/Info-gnustep.plist
share/oolite.debug/oolite
-bin/oolite
diff --git a/oops/Makefile b/oops/Makefile
index 0478958191..5dbe76e76a 100644
--- a/oops/Makefile
+++ b/oops/Makefile
@@ -26,30 +26,30 @@ CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/oops
.include "../../mk/bsd.prefs.mk"
-OOPSVAR?= /var/run/oops
-OOPSUSER?= oops
-OOPSGROUP?= oops
-PKG_GROUPS= ${OOPSGROUP}
-PKG_USERS= ${OOPSUSER}:${OOPSGROUP}::Oops\ proxy\ server
+OOPSVAR?= /var/run/oops
+OOPSUSER?= oops
+OOPSGROUP?= oops
+PKG_GROUPS= ${OOPSGROUP}
+PKG_USERS= ${OOPSUSER}:${OOPSGROUP}::Oops\ proxy\ server
OWN_DIRS_PERMS+= ${OOPSVAR} ${OOPSUSER} ${OOPSGROUP} 755
MAKE_DIRS_PERMS+= ${PREFIX}/oops/storages ${OOPSUSER} ${OOPSGROUP} 700
MAKE_DIRS_PERMS+= ${PREFIX}/oops/DB ${OOPSUSER} ${OOPSGROUP} 700
MAKE_DIRS_PERMS+= ${PREFIX}/oops/logs ${OOPSUSER} ${OOPSGROUP} 700
PKG_SYSCONFSUBDIR= oops
-EGDIR= ${PREFIX}/share/examples/oops
-CONF_FILES= ${EGDIR}/oops.cfg ${PKG_SYSCONFDIR}/oops.cfg
-CONF_FILES+= ${EGDIR}/accel_maps ${PKG_SYSCONFDIR}/accel_maps
-CONF_FILES+= ${EGDIR}/acl_local_networks ${PKG_SYSCONFDIR}/acl_local_networks
-CONF_FILES+= ${EGDIR}/passwd ${PKG_SYSCONFDIR}/passwd
-CONF_FILES+= ${EGDIR}/redir_rules ${PKG_SYSCONFDIR}/redir_rules
-CONF_FILES+= ${EGDIR}/select.sql ${PKG_SYSCONFDIR}/select.sql
-CONF_FILES+= ${EGDIR}/auth_template.html ${PKG_SYSCONFDIR}/auth_template.html
-CONF_FILES+= ${EGDIR}/err_template.html ${PKG_SYSCONFDIR}/err_template.html
-CONF_FILES+= ${EGDIR}/redir_template.html ${PKG_SYSCONFDIR}/redir_template.html
-CONF_FILES+= ${EGDIR}/tables/koi-alt.tab ${PKG_SYSCONFDIR}/tables/koi-alt.tab
-CONF_FILES+= ${EGDIR}/tables/koi-iso.tab ${PKG_SYSCONFDIR}/tables/koi-iso.tab
-CONF_FILES+= ${EGDIR}/tables/koi-win.tab ${PKG_SYSCONFDIR}/tables/koi-win.tab
+EGDIR= ${PREFIX}/share/examples/oops
+CONF_FILES= ${EGDIR}/oops.cfg ${PKG_SYSCONFDIR}/oops.cfg
+CONF_FILES+= ${EGDIR}/accel_maps ${PKG_SYSCONFDIR}/accel_maps
+CONF_FILES+= ${EGDIR}/acl_local_networks ${PKG_SYSCONFDIR}/acl_local_networks
+CONF_FILES+= ${EGDIR}/passwd ${PKG_SYSCONFDIR}/passwd
+CONF_FILES+= ${EGDIR}/redir_rules ${PKG_SYSCONFDIR}/redir_rules
+CONF_FILES+= ${EGDIR}/select.sql ${PKG_SYSCONFDIR}/select.sql
+CONF_FILES+= ${EGDIR}/auth_template.html ${PKG_SYSCONFDIR}/auth_template.html
+CONF_FILES+= ${EGDIR}/err_template.html ${PKG_SYSCONFDIR}/err_template.html
+CONF_FILES+= ${EGDIR}/redir_template.html ${PKG_SYSCONFDIR}/redir_template.html
+CONF_FILES+= ${EGDIR}/tables/koi-alt.tab ${PKG_SYSCONFDIR}/tables/koi-alt.tab
+CONF_FILES+= ${EGDIR}/tables/koi-iso.tab ${PKG_SYSCONFDIR}/tables/koi-iso.tab
+CONF_FILES+= ${EGDIR}/tables/koi-win.tab ${PKG_SYSCONFDIR}/tables/koi-win.tab
RCD_SCRIPTS= oops
diff --git a/open21xx/Makefile b/open21xx/Makefile
index e9b091f065..19312c206b 100644
--- a/open21xx/Makefile
+++ b/open21xx/Makefile
@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.5 2012/10/03 21:32:46 asau Exp $
#
-DISTNAME= open21xx0.7.2
-PKGNAME= open21xx-0.7.2
-CATEGORIES= lang
+DISTNAME= open21xx0.7.2
+PKGNAME= open21xx-0.7.2
+CATEGORIES= lang
MASTER_SITES= http://www3.telus.net/sharpshin/downloads/
MAINTAINER= ianzag%mail.ru@localhost
diff --git a/openaxiom-svn/Makefile b/openaxiom-svn/Makefile
index f04131ba5b..14a90aeccd 100644
--- a/openaxiom-svn/Makefile
+++ b/openaxiom-svn/Makefile
@@ -47,7 +47,7 @@ pre-configure:
${RUN} cd ${WRKSRC} && ./build-setup.sh
# Skip these checks for now:
-CHECK_WRKREF_SKIP= lib/*/hypertex lib/*/viewAlone lib/*/view2D lib/*/view3D lib/*/viewman
+CHECK_WRKREF_SKIP= lib/*/hypertex lib/*/viewAlone lib/*/view2D lib/*/view3D lib/*/viewman
# Get it from Subversion repository:
diff --git a/openblas-devel/buildlink3.mk b/openblas-devel/buildlink3.mk
index 17cd5c0986..ee425b3629 100644
--- a/openblas-devel/buildlink3.mk
+++ b/openblas-devel/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= openblas
OPENBLAS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.openblas+= openblas>=0.2.20
-BUILDLINK_PKGSRCDIR.openblas?= ../../wip/openblas-devel
+BUILDLINK_PKGSRCDIR.openblas?= ../../wip/openblas-devel
.endif # OPENBLAS_BUILDLINK3_MK
BUILDLINK_TREE+= -openblas
diff --git a/openblas-devel/options.mk b/openblas-devel/options.mk
index bc09428bb5..578bc57150 100644
--- a/openblas-devel/options.mk
+++ b/openblas-devel/options.mk
@@ -1,5 +1,5 @@
-PKG_OPTIONS_VAR= PKG_OPTIONS.openblas
-PKG_SUPPORTED_OPTIONS= avx avx2 openmp interface64 dynamic_arch
+PKG_OPTIONS_VAR= PKG_OPTIONS.openblas
+PKG_SUPPORTED_OPTIONS= avx avx2 openmp interface64 dynamic_arch
PKG_SUGGESTED_OPTIONS= dynamic_arch
.include "../../mk/bsd.prefs.mk"
diff --git a/openca/Makefile.config b/openca/Makefile.config
index 5a3fb944c5..b64de84e0a 100644
--- a/openca/Makefile.config
+++ b/openca/Makefile.config
@@ -21,11 +21,11 @@ OPENCA_OPENCA= log.xml loa.xml backup.xml.template \
access_control/node.xml.template access_control/scep.xml.template \
access_control/ca.xml.template token.xml
-SERVERS=servers/ra.conf.template servers/pub.conf.template \
+SERVERS= servers/ra.conf.template servers/pub.conf.template \
servers/ldap.conf.template servers/node.conf.template \
servers/scep.conf.template servers/ca.conf.template
-WWW_WWW=openssl/openssl/CA_Operator.conf.template \
+WWW_WWW= openssl/openssl/CA_Operator.conf.template \
openssl/openssl/Cross_CA.conf.template \
openssl/openssl/Domain_Controller.conf.template \
openssl/openssl/Mail_Server.conf.template \
diff --git a/openerp-server/Makefile b/openerp-server/Makefile
index b186c78c1a..8da77b916a 100644
--- a/openerp-server/Makefile
+++ b/openerp-server/Makefile
@@ -10,38 +10,38 @@ HOMEPAGE= http://www.openerp.com/
COMMENT= Open source application ERP & CRM in Python using Postgresql
LICENSE= gnu-agpl-v3
-DEPENDS += ${PYPKGPREFIX}-psycopg2>0:../../databases/py-psycopg2
-DEPENDS += ${PYPKGPREFIX}-babel>0:../../devel/py-babel
-DEPENDS += ${PYPKGPREFIX}-simplejson>0:../../converters/py-simplejson
-DEPENDS += ${PYPKGPREFIX}-chart>0:../../graphics/py-chart
-DEPENDS += ${PYPKGPREFIX}-dot>0:../../graphics/py-dot
-DEPENDS += ${PYPKGPREFIX}-libxslt>0:../../textproc/py-libxslt
-DEPENDS += ${PYPKGPREFIX}-lxml>0:../../textproc/py-lxml
-DEPENDS += ${PYPKGPREFIX}-yaml>0:../../textproc/py-yaml
-DEPENDS += ${PYPKGPREFIX}-mako>0:../../devel/py-mako
-DEPENDS += ${PYPKGPREFIX}-werkzeug>0:../../www/py-werkzeug
-DEPENDS += ${PYPKGPREFIX}-dateutil>0:../../time/py-dateutil
-DEPENDS += ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
+DEPENDS += ${PYPKGPREFIX}-psycopg2>0:../../databases/py-psycopg2
+DEPENDS += ${PYPKGPREFIX}-babel>0:../../devel/py-babel
+DEPENDS += ${PYPKGPREFIX}-simplejson>0:../../converters/py-simplejson
+DEPENDS += ${PYPKGPREFIX}-chart>0:../../graphics/py-chart
+DEPENDS += ${PYPKGPREFIX}-dot>0:../../graphics/py-dot
+DEPENDS += ${PYPKGPREFIX}-libxslt>0:../../textproc/py-libxslt
+DEPENDS += ${PYPKGPREFIX}-lxml>0:../../textproc/py-lxml
+DEPENDS += ${PYPKGPREFIX}-yaml>0:../../textproc/py-yaml
+DEPENDS += ${PYPKGPREFIX}-mako>0:../../devel/py-mako
+DEPENDS += ${PYPKGPREFIX}-werkzeug>0:../../www/py-werkzeug
+DEPENDS += ${PYPKGPREFIX}-dateutil>0:../../time/py-dateutil
+DEPENDS += ${PYPKGPREFIX}-reportlab-[0-9]*:../../print/py-reportlab
NIGHTLY= 20140115-002435
WRKSRC= ${WRKDIR}/${DISTNAME}
RCD_SCRIPTS= openerpd
-SUBST_CLASSES+= python
-SUBST_STAGE.python= post-patch
-SUBST_MESSAGE.python= Fixing path to python interpreter.
-SUBST_SED.python+= -e "s|/usr/bin/env python|${PYTHONBIN}|g"
-SUBST_FILES.python+= openerp/addons/base_quality_interrogation.py
-SUBST_FILES.python+= openerp/addons/document_ftp/ftpserver/ftpserver.py
-SUBST_FILES.python+= openerp/addons/email_template/html2text.py
-SUBST_FILES.python+= openerp/addons/l10n_fr_hr_payroll/report/fiche_paye.py
-SUBST_FILES.python+= openerp/addons/mail/static/scripts/openerp_mailgate.py
-SUBST_FILES.python+= openerp/report/render/rml2txt/rml2txt.py
-SUBST_FILES.python+= openerp/tests/test_mail.py
-SUBST_FILES.python+= openerp/tools/graph.py
-SUBST_FILES.python+= openerp/tools/test-config-values
-SUBST_FILES.python+= openerp/tools/which.py
+SUBST_CLASSES+= python
+SUBST_STAGE.python= post-patch
+SUBST_MESSAGE.python= Fixing path to python interpreter.
+SUBST_SED.python+= -e "s|/usr/bin/env python|${PYTHONBIN}|g"
+SUBST_FILES.python+= openerp/addons/base_quality_interrogation.py
+SUBST_FILES.python+= openerp/addons/document_ftp/ftpserver/ftpserver.py
+SUBST_FILES.python+= openerp/addons/email_template/html2text.py
+SUBST_FILES.python+= openerp/addons/l10n_fr_hr_payroll/report/fiche_paye.py
+SUBST_FILES.python+= openerp/addons/mail/static/scripts/openerp_mailgate.py
+SUBST_FILES.python+= openerp/report/render/rml2txt/rml2txt.py
+SUBST_FILES.python+= openerp/tests/test_mail.py
+SUBST_FILES.python+= openerp/tools/graph.py
+SUBST_FILES.python+= openerp/tools/test-config-values
+SUBST_FILES.python+= openerp/tools/which.py
post-build:
${SED} -e "s#@PYSITELIB@#${PREFIX}/${PYSITELIB}#g" < \
diff --git a/openjdk8-openjfx-hg/Makefile b/openjdk8-openjfx-hg/Makefile
index d6533c7bf7..3fde1ef57a 100644
--- a/openjdk8-openjfx-hg/Makefile
+++ b/openjdk8-openjfx-hg/Makefile
@@ -13,10 +13,10 @@ COMMENT= JavaFX application toolkit
#DISTFILES= ${DEFAULT_DISTFILES}
#EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-GRADLE_ZIP= gradle-1.8-bin.zip
+GRADLE_ZIP= gradle-1.8-bin.zip
SITES.${GRADLE_ZIP}= https://services.gradle.org/distributions/
-DISTFILES+= ${GRADLE_ZIP}
-EXTRACT_ONLY+= ${GRADLE_ZIP}
+DISTFILES+= ${GRADLE_ZIP}
+EXTRACT_ONLY+= ${GRADLE_ZIP}
HG_REPOSITORIES= rt
HG_REPO.rt= http://hg.openjdk.java.net/openjfx/8u-dev/rt
diff --git a/openlogos/Makefile b/openlogos/Makefile
index 0c7039a779..a7f7522446 100644
--- a/openlogos/Makefile
+++ b/openlogos/Makefile
@@ -9,16 +9,16 @@ HOMEPAGE= http://logos-os.dfki.de/
COMMENT= Openlogos is a language translation system
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
-USE_JAVA= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake
+USE_LIBTOOL= YES
+GNU_CONFIGURE= YES
+USE_JAVA= yes
CONFIGURE_ARGS+= --with-java=${PKG_JAVA_HOME:Q}
-CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -D__int32_t=int32_t -Du_int16_t=uint16_t -D__int16_t=int16_t -Dstrerror_r\(x,y,z\)=strerror\(x\)
+CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -D__int32_t=int32_t -Du_int16_t=uint16_t -D__int16_t=int16_t -Dstrerror_r\(x,y,z\)=strerror\(x\)
-SUBST_CLASSES+= sysio
+SUBST_CLASSES+= sysio
SUBST_STAGE.sysio= post-patch
SUBST_FILES.sysio= logos_libs/dbcache/CacheCompanyData.cpp \
logos_libs/dbcache/CacheDerivedFormData.cpp \
diff --git a/openlogos/PLIST b/openlogos/PLIST
index 3ce7b2008c..1a54a82194 100644
--- a/openlogos/PLIST
+++ b/openlogos/PLIST
@@ -1,154 +1,154 @@
@comment $NetBSD: PLIST,v 1.5 2009/12/13 22:50:29 gschwarz Exp $
+bin/APITest
+bin/ConvertMini
bin/logos_batch
bin/openlogos
-bin/ConvertMini
-bin/APITest
bin/patstemgenerator
-lib/liblgs_base.la
lib/libgrammarrules.la
-lib/libxlationinterface.la
-lib/liblgs_tran1dll.la
-lib/liblgs_tran_rule_io.la
-lib/libtransl.la
-lib/liblgs_parsetran1dll.la
+lib/libhalfnoun.la
lib/libhalfnounjava.la
-lib/liblgs_tran2dll.la
-lib/liblgs_res.la
-lib/liblinguistic.la
+lib/liblgs_base.la
+lib/liblgs_db_io.la
+lib/liblgs_parsetran1dll.la
lib/liblgs_parsetran2dll.la
-lib/libmultithreadlib.la
-lib/liblgs_tran3dll.la
-lib/libhalfnoun.la
lib/liblgs_parsetran3dll.la
-lib/liblgs_tran4dll.la
-lib/liblgs_db_io.la
lib/liblgs_parsetran4dll.la
-share/openlogos/bin/server.properties
+lib/liblgs_res.la
+lib/liblgs_tran1dll.la
+lib/liblgs_tran2dll.la
+lib/liblgs_tran3dll.la
+lib/liblgs_tran4dll.la
+lib/liblgs_tran_rule_io.la
+lib/liblinguistic.la
+lib/libmultithreadlib.la
+lib/libtransl.la
+lib/libxlationinterface.la
+share/openlogos/bin/filenames.ini
share/openlogos/bin/finish.rules
share/openlogos/bin/lgssgml_tag.tbl
share/openlogos/bin/pgm_constants.ini
+share/openlogos/bin/proper_names.patterns
+share/openlogos/bin/server.properties
share/openlogos/bin/start.rules
share/openlogos/bin/transl
-share/openlogos/bin/filenames.ini
-share/openlogos/bin/proper_names.patterns
-share/openlogos/bin_data/other/finish.rules
-share/openlogos/bin_data/other/pgm_constants.ini
-share/openlogos/bin_data/other/start.rules
-share/openlogos/bin_data/other/proper_names.patterns
-share/openlogos/bin_data/other/vssver.scc
-share/openlogos/bin_data/english/res/erescsf.resform
-share/openlogos/bin_data/english/res/english.res22.lgr
-share/openlogos/bin_data/english/res/english.res1.lgr
-share/openlogos/bin_data/english/res/english.res2.lgr
-share/openlogos/bin_data/english/res/eresnoun.resform
-share/openlogos/bin_data/english/res/eresverb.resform
-share/openlogos/bin_data/english/res/vssver.scc
-share/openlogos/bin_data/english/portuguese.parsetran.lgr50
-share/openlogos/bin_data/english/engptg.parsetran1.lgr30
-share/openlogos/bin_data/english/engita.parsetran.lgr40
share/openlogos/bin_data/english/engfre.parsetran.lgr40
+share/openlogos/bin_data/english/engfre.parsetran1.lgr30
+share/openlogos/bin_data/english/engfre.parsetran2.lgr30
+share/openlogos/bin_data/english/engfre.parsetran3.lgr30
+share/openlogos/bin_data/english/engfre.parsetran4.lgr30
+share/openlogos/bin_data/english/engger.parsetran.lgr40
+share/openlogos/bin_data/english/engger.parsetran1.lgr30
+share/openlogos/bin_data/english/engger.parsetran2.lgr30
+share/openlogos/bin_data/english/engger.parsetran3.lgr30
+share/openlogos/bin_data/english/engger.parsetran4.lgr30
+share/openlogos/bin_data/english/engita.parsetran.lgr40
share/openlogos/bin_data/english/engita.parsetran1.lgr30
-share/openlogos/bin_data/english/german.parsetran.lgr50
-share/openlogos/bin_data/english/engspa.parsetran1.lgr30
-share/openlogos/bin_data/english/engptg.parsetran2.lgr30
-share/openlogos/bin_data/english/english.o3btab
share/openlogos/bin_data/english/engita.parsetran2.lgr30
+share/openlogos/bin_data/english/engita.parsetran3.lgr30
+share/openlogos/bin_data/english/engita.parsetran4.lgr30
+share/openlogos/bin_data/english/english.months
+share/openlogos/bin_data/english/english.nevereos
+share/openlogos/bin_data/english/english.nounform
+share/openlogos/bin_data/english/english.o3btab
+share/openlogos/bin_data/english/english.ordinal
+share/openlogos/bin_data/english/english.othrform
share/openlogos/bin_data/english/english.parsetran1.lgr
share/openlogos/bin_data/english/english.parsetran2.lgr
share/openlogos/bin_data/english/english.parsetran3.lgr
share/openlogos/bin_data/english/english.parsetran4.lgr
-share/openlogos/bin_data/english/english.months
+share/openlogos/bin_data/english/english.verbform
share/openlogos/bin_data/english/english_general.tbl
-share/openlogos/bin_data/english/italian.parsetran.lgr50
-share/openlogos/bin_data/english/english.nounform
-share/openlogos/bin_data/english/engspa.parsetran2.lgr30
+share/openlogos/bin_data/english/engptg.parsetran.lgr40
+share/openlogos/bin_data/english/engptg.parsetran1.lgr30
+share/openlogos/bin_data/english/engptg.parsetran2.lgr30
share/openlogos/bin_data/english/engptg.parsetran3.lgr30
-share/openlogos/bin_data/english/engsrc.form25
-share/openlogos/bin_data/english/engfre.parsetran1.lgr30
-share/openlogos/bin_data/english/engita.parsetran3.lgr30
-share/openlogos/bin_data/english/engspa.parsetran3.lgr30
-share/openlogos/bin_data/english/english.othrform
-share/openlogos/bin_data/english/french.parsetran.lgr50
-share/openlogos/bin_data/english/engger.parsetran1.lgr30
share/openlogos/bin_data/english/engptg.parsetran4.lgr30
-share/openlogos/bin_data/english/engfre.parsetran2.lgr30
-share/openlogos/bin_data/english/engita.parsetran4.lgr30
-share/openlogos/bin_data/english/engspa.parsetran4.lgr30
-share/openlogos/bin_data/english/engger.parsetran2.lgr30
-share/openlogos/bin_data/english/english.verbform
-share/openlogos/bin_data/english/engfre.parsetran3.lgr30
-share/openlogos/bin_data/english/engger.parsetran.lgr40
-share/openlogos/bin_data/english/engger.parsetran3.lgr30
-share/openlogos/bin_data/english/engfre.parsetran4.lgr30
-share/openlogos/bin_data/english/spanish.parsetran.lgr50
-share/openlogos/bin_data/english/english.nevereos
share/openlogos/bin_data/english/engspa.parsetran.lgr40
-share/openlogos/bin_data/english/engger.parsetran4.lgr30
-share/openlogos/bin_data/english/english.ordinal
-share/openlogos/bin_data/english/engptg.parsetran.lgr40
+share/openlogos/bin_data/english/engspa.parsetran1.lgr30
+share/openlogos/bin_data/english/engspa.parsetran2.lgr30
+share/openlogos/bin_data/english/engspa.parsetran3.lgr30
+share/openlogos/bin_data/english/engspa.parsetran4.lgr30
+share/openlogos/bin_data/english/engsrc.form25
share/openlogos/bin_data/english/engsrc.sw36
share/openlogos/bin_data/english/engsrc.sw38
+share/openlogos/bin_data/english/french.parsetran.lgr50
+share/openlogos/bin_data/english/german.parsetran.lgr50
+share/openlogos/bin_data/english/italian.parsetran.lgr50
+share/openlogos/bin_data/english/portuguese.parsetran.lgr50
+share/openlogos/bin_data/english/res/english.res1.lgr
+share/openlogos/bin_data/english/res/english.res2.lgr
+share/openlogos/bin_data/english/res/english.res22.lgr
+share/openlogos/bin_data/english/res/erescsf.resform
+share/openlogos/bin_data/english/res/eresnoun.resform
+share/openlogos/bin_data/english/res/eresverb.resform
+share/openlogos/bin_data/english/res/vssver.scc
+share/openlogos/bin_data/english/spanish.parsetran.lgr50
share/openlogos/bin_data/english/vssver.scc
-share/openlogos/bin_data/spanish/spanish.months
-share/openlogos/bin_data/spanish/spanish.nevereos
-share/openlogos/bin_data/spanish/spanish.ordinal
-share/openlogos/bin_data/spanish/vssver.scc
-share/openlogos/bin_data/portuguese/portuguese.nevereos
-share/openlogos/bin_data/portuguese/portuguese.months
-share/openlogos/bin_data/portuguese/portuguese.ordinal
-share/openlogos/bin_data/portuguese/vssver.scc
-share/openlogos/bin_data/german/res/gresverb.resform
-share/openlogos/bin_data/german/res/german.res1.lgr
-share/openlogos/bin_data/german/res/german.res2.lgr
-share/openlogos/bin_data/german/res/german.res22.lgr
-share/openlogos/bin_data/german/res/gresnoun.resform
-share/openlogos/bin_data/german/res/vssver.scc
+share/openlogos/bin_data/french/french.months
+share/openlogos/bin_data/french/french.nevereos
+share/openlogos/bin_data/french/french.ordinal
+share/openlogos/bin_data/french/vssver.scc
+share/openlogos/bin_data/german/english.parsetran.lgr50
+share/openlogos/bin_data/german/french.parsetran.lgr50
+share/openlogos/bin_data/german/gereng.parsetran.lgr40
+share/openlogos/bin_data/german/gereng.parsetran1.lgr30
share/openlogos/bin_data/german/gereng.parsetran2.lgr30
-share/openlogos/bin_data/german/german.o3btab
-share/openlogos/bin_data/german/german.months
-share/openlogos/bin_data/german/gerfre.parsetran3.lgr30
share/openlogos/bin_data/german/gereng.parsetran3.lgr30
-share/openlogos/bin_data/german/halfnoun.ini
-share/openlogos/bin_data/german/propername.txt
-share/openlogos/bin_data/german/italian.parsetran.lgr50
-share/openlogos/bin_data/german/gerfre.parsetran4.lgr30
share/openlogos/bin_data/german/gereng.parsetran4.lgr30
-share/openlogos/bin_data/german/german.proper_names
-share/openlogos/bin_data/german/halfnoun.wordlist-GOOD
-share/openlogos/bin_data/german/german.nounform
-share/openlogos/bin_data/german/gerita.parsetran.lgr40
-share/openlogos/bin_data/german/french.parsetran.lgr50
share/openlogos/bin_data/german/gerfre.parsetran.lgr40
-share/openlogos/bin_data/german/german.ordinal
-share/openlogos/bin_data/german/gereng.parsetran.lgr40
-share/openlogos/bin_data/german/english.parsetran.lgr50
-share/openlogos/bin_data/german/gersrc.sw36
-share/openlogos/bin_data/german/gersrc.sw38
+share/openlogos/bin_data/german/gerfre.parsetran1.lgr30
+share/openlogos/bin_data/german/gerfre.parsetran2.lgr30
+share/openlogos/bin_data/german/gerfre.parsetran3.lgr30
+share/openlogos/bin_data/german/gerfre.parsetran4.lgr30
+share/openlogos/bin_data/german/gerita.parsetran.lgr40
share/openlogos/bin_data/german/gerita.parsetran1.lgr30
-share/openlogos/bin_data/german/german.othrform
-share/openlogos/bin_data/german/german.place_names
share/openlogos/bin_data/german/gerita.parsetran2.lgr30
-share/openlogos/bin_data/german/halfnoun.wordlist
+share/openlogos/bin_data/german/gerita.parsetran3.lgr30
+share/openlogos/bin_data/german/gerita.parsetran4.lgr30
+share/openlogos/bin_data/german/german.months
+share/openlogos/bin_data/german/german.nevereos
+share/openlogos/bin_data/german/german.nounform
+share/openlogos/bin_data/german/german.o3btab
+share/openlogos/bin_data/german/german.ordinal
+share/openlogos/bin_data/german/german.othrform
share/openlogos/bin_data/german/german.parsetran1.lgr
share/openlogos/bin_data/german/german.parsetran2.lgr
share/openlogos/bin_data/german/german.parsetran3.lgr
share/openlogos/bin_data/german/german.parsetran4.lgr
-share/openlogos/bin_data/german/gersrc.form25
+share/openlogos/bin_data/german/german.place_names
+share/openlogos/bin_data/german/german.proper_names
share/openlogos/bin_data/german/german.verbform
share/openlogos/bin_data/german/german_general.tbl
-share/openlogos/bin_data/german/gerfre.parsetran1.lgr30
+share/openlogos/bin_data/german/gersrc.form25
+share/openlogos/bin_data/german/gersrc.sw36
+share/openlogos/bin_data/german/gersrc.sw38
+share/openlogos/bin_data/german/halfnoun.ini
+share/openlogos/bin_data/german/halfnoun.wordlist
+share/openlogos/bin_data/german/halfnoun.wordlist-GOOD
+share/openlogos/bin_data/german/italian.parsetran.lgr50
share/openlogos/bin_data/german/placename.txt
-share/openlogos/bin_data/german/gerita.parsetran3.lgr30
-share/openlogos/bin_data/german/gereng.parsetran1.lgr30
-share/openlogos/bin_data/german/german.nevereos
+share/openlogos/bin_data/german/propername.txt
+share/openlogos/bin_data/german/res/german.res1.lgr
+share/openlogos/bin_data/german/res/german.res2.lgr
+share/openlogos/bin_data/german/res/german.res22.lgr
+share/openlogos/bin_data/german/res/gresnoun.resform
+share/openlogos/bin_data/german/res/gresverb.resform
+share/openlogos/bin_data/german/res/vssver.scc
share/openlogos/bin_data/german/vssver.scc
-share/openlogos/bin_data/german/gerfre.parsetran2.lgr30
-share/openlogos/bin_data/german/gerita.parsetran4.lgr30
-share/openlogos/bin_data/french/french.months
-share/openlogos/bin_data/french/french.nevereos
-share/openlogos/bin_data/french/french.ordinal
-share/openlogos/bin_data/french/vssver.scc
-share/openlogos/bin_data/italian/italian.ordinal
share/openlogos/bin_data/italian/italian.months
share/openlogos/bin_data/italian/italian.nevereos
+share/openlogos/bin_data/italian/italian.ordinal
share/openlogos/bin_data/italian/vssver.scc
+share/openlogos/bin_data/other/finish.rules
+share/openlogos/bin_data/other/pgm_constants.ini
+share/openlogos/bin_data/other/proper_names.patterns
+share/openlogos/bin_data/other/start.rules
+share/openlogos/bin_data/other/vssver.scc
+share/openlogos/bin_data/portuguese/portuguese.months
+share/openlogos/bin_data/portuguese/portuguese.nevereos
+share/openlogos/bin_data/portuguese/portuguese.ordinal
+share/openlogos/bin_data/portuguese/vssver.scc
+share/openlogos/bin_data/spanish/spanish.months
+share/openlogos/bin_data/spanish/spanish.nevereos
+share/openlogos/bin_data/spanish/spanish.ordinal
+share/openlogos/bin_data/spanish/vssver.scc
diff --git a/openmpi/PLIST.NetBSD b/openmpi/PLIST.NetBSD
index 9edd4c84f9..782a06f4a6 100644
--- a/openmpi/PLIST.NetBSD
+++ b/openmpi/PLIST.NetBSD
@@ -1,6 +1,6 @@
-lib/openmpi/mca_pstat_test.la
bin/mpiCC
bin/orteCC
+lib/openmpi/mca_pstat_test.la
man/man1/mpiCC.1
man/man1/orteCC.1
share/openmpi/mpiCC-wrapper-data.txt
diff --git a/openmpi163/Makefile b/openmpi163/Makefile
index 86943520c8..51ef67ff56 100644
--- a/openmpi163/Makefile
+++ b/openmpi163/Makefile
@@ -65,7 +65,7 @@ REPLACE_PERL+= ompi/tools/wrappers/mpijavac.pl.in
# The same -R appears on Linux, but does not cause problems.
# SUBST refused to edit binary files, so do it manually.
.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
-SUBST_CLASSES+= opal
+SUBST_CLASSES+= opal
SUBST_STAGE.opal= post-build
SUBST_FILES.opal= ${WRKSRC}/opal/tools/wrappers/.libs/opal_wrapper
SUBST_SED.opal= -e 's|-R|-L|g'
diff --git a/openmpi163/PLIST.Darwin b/openmpi163/PLIST.Darwin
index 2114982aa3..4cf86bff11 100644
--- a/openmpi163/PLIST.Darwin
+++ b/openmpi163/PLIST.Darwin
@@ -26,9 +26,9 @@ openmpi/bin/ortecc
openmpi/bin/orted
openmpi/bin/orterun
openmpi/etc/cshrc
-openmpi/etc/shrc
openmpi/etc/modulefiles/openmpi/1.6.3
openmpi/etc/openmpi-default-hostfile
+openmpi/etc/shrc
openmpi/include/mpi-ext.h
openmpi/include/mpi.h
openmpi/include/mpi_portable_platform.h
diff --git a/openmpi163/PLIST.Linux b/openmpi163/PLIST.Linux
index 891678de0e..54b4375043 100644
--- a/openmpi163/PLIST.Linux
+++ b/openmpi163/PLIST.Linux
@@ -1,43 +1,43 @@
@comment $NetBSD: PLIST.Linux,v 1.4 2015/06/19 19:17:41 outpaddling Exp $
+openmpi/bin/mpiCC
openmpi/bin/mpic++
openmpi/bin/mpicc
-openmpi/bin/mpiCC
openmpi/bin/mpicxx
openmpi/bin/mpiexec
openmpi/bin/mpif77
openmpi/bin/mpif90
openmpi/bin/mpirun
openmpi/bin/ompi-clean
-openmpi/bin/ompi_info
openmpi/bin/ompi-iof
openmpi/bin/ompi-probe
openmpi/bin/ompi-profiler
openmpi/bin/ompi-ps
openmpi/bin/ompi-server
openmpi/bin/ompi-top
+openmpi/bin/ompi_info
openmpi/bin/opal_wrapper
openmpi/bin/orte-bootproxy.sh
-openmpi/bin/ortec++
-openmpi/bin/ortecc
-openmpi/bin/orteCC
openmpi/bin/orte-clean
-openmpi/bin/orted
openmpi/bin/orte-iof
openmpi/bin/orte-ps
-openmpi/bin/orterun
openmpi/bin/orte-top
+openmpi/bin/orteCC
openmpi/bin/orte_wrapper_script
+openmpi/bin/ortec++
+openmpi/bin/ortecc
+openmpi/bin/orted
+openmpi/bin/orterun
openmpi/etc/cshrc
openmpi/etc/modulefiles/openmpi/1.6.3
openmpi/etc/openmpi-default-hostfile
openmpi/etc/shrc
openmpi/include/mpi-ext.h
+openmpi/include/mpi.h
+openmpi/include/mpi_portable_platform.h
openmpi/include/mpif-common.h
openmpi/include/mpif-config.h
-openmpi/include/mpif.h
openmpi/include/mpif-mpi-io.h
-openmpi/include/mpi.h
-openmpi/include/mpi_portable_platform.h
+openmpi/include/mpif.h
openmpi/include/openmpi/ompi/mpi/cxx/comm.h
openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h
openmpi/include/openmpi/ompi/mpi/cxx/constants.h
@@ -70,10 +70,10 @@ openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h
openmpi/include/openmpi/ompi/mpi/cxx/win.h
openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h
openmpi/lib/libmca_common_sm.la
+openmpi/lib/libmpi.la
openmpi/lib/libmpi_cxx.la
openmpi/lib/libmpi_f77.la
openmpi/lib/libmpi_f90.la
-openmpi/lib/libmpi.la
openmpi/lib/libompitrace.la
openmpi/lib/libopen-pal.la
openmpi/lib/libopen-rte.la
@@ -103,16 +103,16 @@ openmpi/lib/openmpi/mca_ess_env.la
openmpi/lib/openmpi/mca_ess_hnp.la
openmpi/lib/openmpi/mca_ess_singleton.la
openmpi/lib/openmpi/mca_ess_slave.la
-openmpi/lib/openmpi/mca_ess_slurmd.la
openmpi/lib/openmpi/mca_ess_slurm.la
+openmpi/lib/openmpi/mca_ess_slurmd.la
openmpi/lib/openmpi/mca_ess_tool.la
openmpi/lib/openmpi/mca_filem_rsh.la
openmpi/lib/openmpi/mca_grpcomm_bad.la
openmpi/lib/openmpi/mca_grpcomm_basic.la
+openmpi/lib/openmpi/mca_io_romio.la
openmpi/lib/openmpi/mca_iof_hnp.la
openmpi/lib/openmpi/mca_iof_orted.la
openmpi/lib/openmpi/mca_iof_tool.la
-openmpi/lib/openmpi/mca_io_romio.la
openmpi/lib/openmpi/mca_maffinity_first_use.la
openmpi/lib/openmpi/mca_maffinity_hwloc.la
openmpi/lib/openmpi/mca_mpool_fake.la
@@ -163,30 +163,30 @@ openmpi/lib/pkgconfig/ompi-f77.pc
openmpi/lib/pkgconfig/ompi-f90.pc
openmpi/lib/pkgconfig/ompi.pc
openmpi/lib/pkgconfig/orte.pc
+openmpi/man/man1/mpiCC.1
openmpi/man/man1/mpic++.1
openmpi/man/man1/mpicc.1
-openmpi/man/man1/mpiCC.1
openmpi/man/man1/mpicxx.1
openmpi/man/man1/mpiexec.1
openmpi/man/man1/mpif77.1
openmpi/man/man1/mpif90.1
openmpi/man/man1/mpirun.1
openmpi/man/man1/ompi-clean.1
-openmpi/man/man1/ompi_info.1
openmpi/man/man1/ompi-iof.1
openmpi/man/man1/ompi-probe.1
openmpi/man/man1/ompi-profiler.1
openmpi/man/man1/ompi-ps.1
openmpi/man/man1/ompi-server.1
openmpi/man/man1/ompi-top.1
+openmpi/man/man1/ompi_info.1
openmpi/man/man1/opal_wrapper.1
-openmpi/man/man1/orteCC.1
openmpi/man/man1/orte-clean.1
-openmpi/man/man1/orted.1
openmpi/man/man1/orte-iof.1
openmpi/man/man1/orte-ps.1
-openmpi/man/man1/orterun.1
openmpi/man/man1/orte-top.1
+openmpi/man/man1/orteCC.1
+openmpi/man/man1/orted.1
+openmpi/man/man1/orterun.1
openmpi/man/man3/MPI.3
openmpi/man/man3/MPI_Abort.3
openmpi/man/man3/MPI_Accumulate.3
@@ -213,12 +213,12 @@ openmpi/man/man3/MPI_Buffer_detach.3
openmpi/man/man3/MPI_Cancel.3
openmpi/man/man3/MPI_Cart_coords.3
openmpi/man/man3/MPI_Cart_create.3
-openmpi/man/man3/MPI_Cartdim_get.3
openmpi/man/man3/MPI_Cart_get.3
openmpi/man/man3/MPI_Cart_map.3
openmpi/man/man3/MPI_Cart_rank.3
openmpi/man/man3/MPI_Cart_shift.3
openmpi/man/man3/MPI_Cart_sub.3
+openmpi/man/man3/MPI_Cartdim_get.3
openmpi/man/man3/MPI_Close_port.3
openmpi/man/man3/MPI_Comm_accept.3
openmpi/man/man3/MPI_Comm_c2f.3
@@ -328,11 +328,11 @@ openmpi/man/man3/MPI_Get_elements.3
openmpi/man/man3/MPI_Get_processor_name.3
openmpi/man/man3/MPI_Get_version.3
openmpi/man/man3/MPI_Graph_create.3
-openmpi/man/man3/MPI_Graphdims_get.3
openmpi/man/man3/MPI_Graph_get.3
openmpi/man/man3/MPI_Graph_map.3
openmpi/man/man3/MPI_Graph_neighbors.3
openmpi/man/man3/MPI_Graph_neighbors_count.3
+openmpi/man/man3/MPI_Graphdims_get.3
openmpi/man/man3/MPI_Grequest_complete.3
openmpi/man/man3/MPI_Grequest_start.3
openmpi/man/man3/MPI_Group_c2f.3
@@ -362,24 +362,24 @@ openmpi/man/man3/MPI_Info_get_nthkey.3
openmpi/man/man3/MPI_Info_get_valuelen.3
openmpi/man/man3/MPI_Info_set.3
openmpi/man/man3/MPI_Init.3
-openmpi/man/man3/MPI_Initialized.3
openmpi/man/man3/MPI_Init_thread.3
+openmpi/man/man3/MPI_Initialized.3
openmpi/man/man3/MPI_Intercomm_create.3
openmpi/man/man3/MPI_Intercomm_merge.3
openmpi/man/man3/MPI_Iprobe.3
openmpi/man/man3/MPI_Irecv.3
openmpi/man/man3/MPI_Irsend.3
+openmpi/man/man3/MPI_Is_thread_main.3
openmpi/man/man3/MPI_Isend.3
openmpi/man/man3/MPI_Issend.3
-openmpi/man/man3/MPI_Is_thread_main.3
openmpi/man/man3/MPI_Keyval_create.3
openmpi/man/man3/MPI_Keyval_free.3
openmpi/man/man3/MPI_Lookup_name.3
openmpi/man/man3/MPI_Op_c2f.3
openmpi/man/man3/MPI_Op_create.3
-openmpi/man/man3/MPI_Open_port.3
openmpi/man/man3/MPI_Op_f2c.3
openmpi/man/man3/MPI_Op_free.3
+openmpi/man/man3/MPI_Open_port.3
openmpi/man/man3/MPI_Pack.3
openmpi/man/man3/MPI_Pack_external.3
openmpi/man/man3/MPI_Pack_external_size.3
@@ -418,9 +418,9 @@ openmpi/man/man3/MPI_Status_f2c.3
openmpi/man/man3/MPI_Status_set_cancelled.3
openmpi/man/man3/MPI_Status_set_elements.3
openmpi/man/man3/MPI_Test.3
+openmpi/man/man3/MPI_Test_cancelled.3
openmpi/man/man3/MPI_Testall.3
openmpi/man/man3/MPI_Testany.3
-openmpi/man/man3/MPI_Test_cancelled.3
openmpi/man/man3/MPI_Testsome.3
openmpi/man/man3/MPI_Topo_test.3
openmpi/man/man3/MPI_Type_c2f.3
@@ -533,11 +533,11 @@ openmpi/share/openmpi/help-odls-default.txt
openmpi/share/openmpi/help-ompi-crcp-base.txt
openmpi/share/openmpi/help-ompi-dpm-base.txt
openmpi/share/openmpi/help-ompi-dpm-orte.txt
-openmpi/share/openmpi/help-ompi_info.txt
openmpi/share/openmpi/help-ompi-probe.txt
openmpi/share/openmpi/help-ompi-profiler.txt
openmpi/share/openmpi/help-ompi-pubsub-orte.txt
openmpi/share/openmpi/help-ompi-server.txt
+openmpi/share/openmpi/help-ompi_info.txt
openmpi/share/openmpi/help-oob-tcp.txt
openmpi/share/openmpi/help-opal-carto-file.txt
openmpi/share/openmpi/help-opal-crs-base.txt
@@ -551,7 +551,6 @@ openmpi/share/openmpi/help-opal-shmem-sysv.txt
openmpi/share/openmpi/help-opal-util.txt
openmpi/share/openmpi/help-opal-wrapper.txt
openmpi/share/openmpi/help-orte-clean.txt
-openmpi/share/openmpi/help-orted.txt
openmpi/share/openmpi/help-orte-filem-base.txt
openmpi/share/openmpi/help-orte-filem-rsh.txt
openmpi/share/openmpi/help-orte-iof.txt
@@ -565,9 +564,10 @@ openmpi/share/openmpi/help-orte-rmaps-rr.txt
openmpi/share/openmpi/help-orte-rmaps-seq.txt
openmpi/share/openmpi/help-orte-rmaps-topo.txt
openmpi/share/openmpi/help-orte-runtime.txt
-openmpi/share/openmpi/help-orterun.txt
openmpi/share/openmpi/help-orte-snapc-base.txt
openmpi/share/openmpi/help-orte-top.txt
+openmpi/share/openmpi/help-orted.txt
+openmpi/share/openmpi/help-orterun.txt
openmpi/share/openmpi/help-plm-base.txt
openmpi/share/openmpi/help-plm-rsh.txt
openmpi/share/openmpi/help-plm-slurm.txt
@@ -576,13 +576,13 @@ openmpi/share/openmpi/help-ras-slurm.txt
openmpi/share/openmpi/help-regex.txt
openmpi/share/openmpi/help-rmaps_rank_file.txt
openmpi/share/openmpi/mca-btl-openib-device-params.ini
-openmpi/share/openmpi/mpicc-wrapper-data.txt
openmpi/share/openmpi/mpiCC-wrapper-data.txt
openmpi/share/openmpi/mpic++-wrapper-data.txt
+openmpi/share/openmpi/mpicc-wrapper-data.txt
openmpi/share/openmpi/mpicxx-wrapper-data.txt
openmpi/share/openmpi/mpif77-wrapper-data.txt
openmpi/share/openmpi/mpif90-wrapper-data.txt
openmpi/share/openmpi/openmpi-valgrind.supp
-openmpi/share/openmpi/ortecc-wrapper-data.txt
openmpi/share/openmpi/orteCC-wrapper-data.txt
openmpi/share/openmpi/ortec++-wrapper-data.txt
+openmpi/share/openmpi/ortecc-wrapper-data.txt
diff --git a/openmpi163/PLIST.Linux.noib b/openmpi163/PLIST.Linux.noib
index 71412c2012..47500012e9 100644
--- a/openmpi163/PLIST.Linux.noib
+++ b/openmpi163/PLIST.Linux.noib
@@ -1,43 +1,43 @@
@comment $NetBSD: PLIST.Linux.noib,v 1.2 2015/06/19 19:17:41 outpaddling Exp $
+openmpi/bin/mpiCC
openmpi/bin/mpic++
openmpi/bin/mpicc
-openmpi/bin/mpiCC
openmpi/bin/mpicxx
openmpi/bin/mpiexec
openmpi/bin/mpif77
openmpi/bin/mpif90
openmpi/bin/mpirun
openmpi/bin/ompi-clean
-openmpi/bin/ompi_info
openmpi/bin/ompi-iof
openmpi/bin/ompi-probe
openmpi/bin/ompi-profiler
openmpi/bin/ompi-ps
openmpi/bin/ompi-server
openmpi/bin/ompi-top
+openmpi/bin/ompi_info
openmpi/bin/opal_wrapper
openmpi/bin/orte-bootproxy.sh
-openmpi/bin/ortec++
-openmpi/bin/ortecc
-openmpi/bin/orteCC
openmpi/bin/orte-clean
-openmpi/bin/orted
openmpi/bin/orte-iof
openmpi/bin/orte-ps
-openmpi/bin/orterun
openmpi/bin/orte-top
+openmpi/bin/orteCC
openmpi/bin/orte_wrapper_script
+openmpi/bin/ortec++
+openmpi/bin/ortecc
+openmpi/bin/orted
+openmpi/bin/orterun
openmpi/etc/cshrc
openmpi/etc/modulefiles/openmpi/1.6.3
openmpi/etc/openmpi-default-hostfile
openmpi/etc/shrc
openmpi/include/mpi-ext.h
+openmpi/include/mpi.h
+openmpi/include/mpi_portable_platform.h
openmpi/include/mpif-common.h
openmpi/include/mpif-config.h
-openmpi/include/mpif.h
openmpi/include/mpif-mpi-io.h
-openmpi/include/mpi.h
-openmpi/include/mpi_portable_platform.h
+openmpi/include/mpif.h
openmpi/include/openmpi/ompi/mpi/cxx/comm.h
openmpi/include/openmpi/ompi/mpi/cxx/comm_inln.h
openmpi/include/openmpi/ompi/mpi/cxx/constants.h
@@ -70,10 +70,10 @@ openmpi/include/openmpi/ompi/mpi/cxx/topology_inln.h
openmpi/include/openmpi/ompi/mpi/cxx/win.h
openmpi/include/openmpi/ompi/mpi/cxx/win_inln.h
openmpi/lib/libmca_common_sm.la
+openmpi/lib/libmpi.la
openmpi/lib/libmpi_cxx.la
openmpi/lib/libmpi_f77.la
openmpi/lib/libmpi_f90.la
-openmpi/lib/libmpi.la
openmpi/lib/libompitrace.la
openmpi/lib/libopen-pal.la
openmpi/lib/libopen-rte.la
@@ -101,16 +101,16 @@ openmpi/lib/openmpi/mca_ess_env.la
openmpi/lib/openmpi/mca_ess_hnp.la
openmpi/lib/openmpi/mca_ess_singleton.la
openmpi/lib/openmpi/mca_ess_slave.la
-openmpi/lib/openmpi/mca_ess_slurmd.la
openmpi/lib/openmpi/mca_ess_slurm.la
+openmpi/lib/openmpi/mca_ess_slurmd.la
openmpi/lib/openmpi/mca_ess_tool.la
openmpi/lib/openmpi/mca_filem_rsh.la
openmpi/lib/openmpi/mca_grpcomm_bad.la
openmpi/lib/openmpi/mca_grpcomm_basic.la
+openmpi/lib/openmpi/mca_io_romio.la
openmpi/lib/openmpi/mca_iof_hnp.la
openmpi/lib/openmpi/mca_iof_orted.la
openmpi/lib/openmpi/mca_iof_tool.la
-openmpi/lib/openmpi/mca_io_romio.la
openmpi/lib/openmpi/mca_maffinity_first_use.la
openmpi/lib/openmpi/mca_maffinity_hwloc.la
openmpi/lib/openmpi/mca_mpool_fake.la
@@ -161,30 +161,30 @@ openmpi/lib/pkgconfig/ompi-f77.pc
openmpi/lib/pkgconfig/ompi-f90.pc
openmpi/lib/pkgconfig/ompi.pc
openmpi/lib/pkgconfig/orte.pc
+openmpi/man/man1/mpiCC.1
openmpi/man/man1/mpic++.1
openmpi/man/man1/mpicc.1
-openmpi/man/man1/mpiCC.1
openmpi/man/man1/mpicxx.1
openmpi/man/man1/mpiexec.1
openmpi/man/man1/mpif77.1
openmpi/man/man1/mpif90.1
openmpi/man/man1/mpirun.1
openmpi/man/man1/ompi-clean.1
-openmpi/man/man1/ompi_info.1
openmpi/man/man1/ompi-iof.1
openmpi/man/man1/ompi-probe.1
openmpi/man/man1/ompi-profiler.1
openmpi/man/man1/ompi-ps.1
openmpi/man/man1/ompi-server.1
openmpi/man/man1/ompi-top.1
+openmpi/man/man1/ompi_info.1
openmpi/man/man1/opal_wrapper.1
-openmpi/man/man1/orteCC.1
openmpi/man/man1/orte-clean.1
-openmpi/man/man1/orted.1
openmpi/man/man1/orte-iof.1
openmpi/man/man1/orte-ps.1
-openmpi/man/man1/orterun.1
openmpi/man/man1/orte-top.1
+openmpi/man/man1/orteCC.1
+openmpi/man/man1/orted.1
+openmpi/man/man1/orterun.1
openmpi/man/man3/MPI.3
openmpi/man/man3/MPI_Abort.3
openmpi/man/man3/MPI_Accumulate.3
@@ -211,12 +211,12 @@ openmpi/man/man3/MPI_Buffer_detach.3
openmpi/man/man3/MPI_Cancel.3
openmpi/man/man3/MPI_Cart_coords.3
openmpi/man/man3/MPI_Cart_create.3
-openmpi/man/man3/MPI_Cartdim_get.3
openmpi/man/man3/MPI_Cart_get.3
openmpi/man/man3/MPI_Cart_map.3
openmpi/man/man3/MPI_Cart_rank.3
openmpi/man/man3/MPI_Cart_shift.3
openmpi/man/man3/MPI_Cart_sub.3
+openmpi/man/man3/MPI_Cartdim_get.3
openmpi/man/man3/MPI_Close_port.3
openmpi/man/man3/MPI_Comm_accept.3
openmpi/man/man3/MPI_Comm_c2f.3
@@ -326,11 +326,11 @@ openmpi/man/man3/MPI_Get_elements.3
openmpi/man/man3/MPI_Get_processor_name.3
openmpi/man/man3/MPI_Get_version.3
openmpi/man/man3/MPI_Graph_create.3
-openmpi/man/man3/MPI_Graphdims_get.3
openmpi/man/man3/MPI_Graph_get.3
openmpi/man/man3/MPI_Graph_map.3
openmpi/man/man3/MPI_Graph_neighbors.3
openmpi/man/man3/MPI_Graph_neighbors_count.3
+openmpi/man/man3/MPI_Graphdims_get.3
openmpi/man/man3/MPI_Grequest_complete.3
openmpi/man/man3/MPI_Grequest_start.3
openmpi/man/man3/MPI_Group_c2f.3
@@ -360,24 +360,24 @@ openmpi/man/man3/MPI_Info_get_nthkey.3
openmpi/man/man3/MPI_Info_get_valuelen.3
openmpi/man/man3/MPI_Info_set.3
openmpi/man/man3/MPI_Init.3
-openmpi/man/man3/MPI_Initialized.3
openmpi/man/man3/MPI_Init_thread.3
+openmpi/man/man3/MPI_Initialized.3
openmpi/man/man3/MPI_Intercomm_create.3
openmpi/man/man3/MPI_Intercomm_merge.3
openmpi/man/man3/MPI_Iprobe.3
openmpi/man/man3/MPI_Irecv.3
openmpi/man/man3/MPI_Irsend.3
+openmpi/man/man3/MPI_Is_thread_main.3
openmpi/man/man3/MPI_Isend.3
openmpi/man/man3/MPI_Issend.3
-openmpi/man/man3/MPI_Is_thread_main.3
openmpi/man/man3/MPI_Keyval_create.3
openmpi/man/man3/MPI_Keyval_free.3
openmpi/man/man3/MPI_Lookup_name.3
openmpi/man/man3/MPI_Op_c2f.3
openmpi/man/man3/MPI_Op_create.3
-openmpi/man/man3/MPI_Open_port.3
openmpi/man/man3/MPI_Op_f2c.3
openmpi/man/man3/MPI_Op_free.3
+openmpi/man/man3/MPI_Open_port.3
openmpi/man/man3/MPI_Pack.3
openmpi/man/man3/MPI_Pack_external.3
openmpi/man/man3/MPI_Pack_external_size.3
@@ -416,9 +416,9 @@ openmpi/man/man3/MPI_Status_f2c.3
openmpi/man/man3/MPI_Status_set_cancelled.3
openmpi/man/man3/MPI_Status_set_elements.3
openmpi/man/man3/MPI_Test.3
+openmpi/man/man3/MPI_Test_cancelled.3
openmpi/man/man3/MPI_Testall.3
openmpi/man/man3/MPI_Testany.3
-openmpi/man/man3/MPI_Test_cancelled.3
openmpi/man/man3/MPI_Testsome.3
openmpi/man/man3/MPI_Topo_test.3
openmpi/man/man3/MPI_Type_c2f.3
@@ -527,11 +527,11 @@ openmpi/share/openmpi/help-odls-default.txt
openmpi/share/openmpi/help-ompi-crcp-base.txt
openmpi/share/openmpi/help-ompi-dpm-base.txt
openmpi/share/openmpi/help-ompi-dpm-orte.txt
-openmpi/share/openmpi/help-ompi_info.txt
openmpi/share/openmpi/help-ompi-probe.txt
openmpi/share/openmpi/help-ompi-profiler.txt
openmpi/share/openmpi/help-ompi-pubsub-orte.txt
openmpi/share/openmpi/help-ompi-server.txt
+openmpi/share/openmpi/help-ompi_info.txt
openmpi/share/openmpi/help-oob-tcp.txt
openmpi/share/openmpi/help-opal-carto-file.txt
openmpi/share/openmpi/help-opal-crs-base.txt
@@ -545,7 +545,6 @@ openmpi/share/openmpi/help-opal-shmem-sysv.txt
openmpi/share/openmpi/help-opal-util.txt
openmpi/share/openmpi/help-opal-wrapper.txt
openmpi/share/openmpi/help-orte-clean.txt
-openmpi/share/openmpi/help-orted.txt
openmpi/share/openmpi/help-orte-filem-base.txt
openmpi/share/openmpi/help-orte-filem-rsh.txt
openmpi/share/openmpi/help-orte-iof.txt
@@ -559,9 +558,10 @@ openmpi/share/openmpi/help-orte-rmaps-rr.txt
openmpi/share/openmpi/help-orte-rmaps-seq.txt
openmpi/share/openmpi/help-orte-rmaps-topo.txt
openmpi/share/openmpi/help-orte-runtime.txt
-openmpi/share/openmpi/help-orterun.txt
openmpi/share/openmpi/help-orte-snapc-base.txt
openmpi/share/openmpi/help-orte-top.txt
+openmpi/share/openmpi/help-orted.txt
+openmpi/share/openmpi/help-orterun.txt
openmpi/share/openmpi/help-plm-base.txt
openmpi/share/openmpi/help-plm-rsh.txt
openmpi/share/openmpi/help-plm-slurm.txt
@@ -569,13 +569,13 @@ openmpi/share/openmpi/help-ras-base.txt
openmpi/share/openmpi/help-ras-slurm.txt
openmpi/share/openmpi/help-regex.txt
openmpi/share/openmpi/help-rmaps_rank_file.txt
-openmpi/share/openmpi/mpicc-wrapper-data.txt
openmpi/share/openmpi/mpiCC-wrapper-data.txt
openmpi/share/openmpi/mpic++-wrapper-data.txt
+openmpi/share/openmpi/mpicc-wrapper-data.txt
openmpi/share/openmpi/mpicxx-wrapper-data.txt
openmpi/share/openmpi/mpif77-wrapper-data.txt
openmpi/share/openmpi/mpif90-wrapper-data.txt
openmpi/share/openmpi/openmpi-valgrind.supp
-openmpi/share/openmpi/ortecc-wrapper-data.txt
openmpi/share/openmpi/orteCC-wrapper-data.txt
openmpi/share/openmpi/ortec++-wrapper-data.txt
+openmpi/share/openmpi/ortecc-wrapper-data.txt
diff --git a/opennurbs/buildlink3.mk b/opennurbs/buildlink3.mk
index 79aac44cf4..a2f09a9b45 100644
--- a/opennurbs/buildlink3.mk
+++ b/opennurbs/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= opennurbs
OPENNURBS_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.opennurbs+= opennurbs>=20130711
-BUILDLINK_PKGSRCDIR.opennurbs?= ../../wip/opennurbs
+BUILDLINK_PKGSRCDIR.opennurbs?= ../../wip/opennurbs
.include "../../devel/zlib/buildlink3.mk"
.endif # OPENNURBS_BUILDLINK3_MK
diff --git a/openra/Makefile b/openra/Makefile
index 9820e55e56..a3ae00cc3f 100644
--- a/openra/Makefile
+++ b/openra/Makefile
@@ -48,7 +48,7 @@ PKG_USERS_VARS= OPENRA_GROUP
PKG_HOME.${OPENRA_USER}= ${OPENRA_HOME}
-OWN_DIRS+= ${OPENRA_HOME}
+OWN_DIRS+= ${OPENRA_HOME}
OWN_DIRS_PERMS+= ${OPENRA_HOME} ${OPENRA_USER} ${OPENRA_GROUP} 0770
FILES_SUBST+= OPENRA_USER=${OPENRA_USER}
diff --git a/opensc/Makefile b/opensc/Makefile
index 07f1e84139..15b786a20b 100644
--- a/opensc/Makefile
+++ b/opensc/Makefile
@@ -1,18 +1,18 @@
# $NetBSD: Makefile,v 1.16 2015/08/23 20:33:34 thomasklausner Exp $
# the Git SHA1 ID of the snapshot
-OPENSC_GIT_REVISION= a399905d234d3d6d2a9aa8501a4c8ba1224c6b31
+OPENSC_GIT_REVISION= a399905d234d3d6d2a9aa8501a4c8ba1224c6b31
# this suffix is what is generated by the '-S' option to './bootstrap'
# (when run from a Git clone of the OpenSC repository)
-OPENSC_VERSION_SUFFIX= git20140221130957
+OPENSC_VERSION_SUFFIX= git20140221130957
# this revision is what is generated by the '-R' option to './bootstrap'
# (when run from a Git clone of the OpenSC repository)
OPENSC_VERSION_REVISION= 220
-OPENSC_PKG_VERSION= 0.13.0${OPENSC_VERSION_SUFFIX}
-DISTNAME= opensc-${OPENSC_PKG_VERSION}
-CATEGORIES= security
-MASTER_SITES= -https://github.com/OpenSC/OpenSC/archive/${OPENSC_GIT_REVISION}.tar.gz
-WRKSRC= ${WRKDIR}/OpenSC-${OPENSC_GIT_REVISION}
+OPENSC_PKG_VERSION= 0.13.0${OPENSC_VERSION_SUFFIX}
+DISTNAME= opensc-${OPENSC_PKG_VERSION}
+CATEGORIES= security
+MASTER_SITES= -https://github.com/OpenSC/OpenSC/archive/${OPENSC_GIT_REVISION}.tar.gz
+WRKSRC= ${WRKDIR}/OpenSC-${OPENSC_GIT_REVISION}
MAINTAINER= rhansen%bbn.com@localhost
HOMEPAGE= https://github.com/OpenSC/OpenSC/wiki
diff --git a/opensc/options.mk b/opensc/options.mk
index b28272b0b6..955ebfb21f 100644
--- a/opensc/options.mk
+++ b/opensc/options.mk
@@ -6,7 +6,7 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.opensc
# that exactly one be chosen.
PKG_OPTIONS_REQUIRED_GROUPS= cardreader
PKG_OPTIONS_GROUP.cardreader= pcsc-lite openct
-PKG_SUGGESTED_OPTIONS= pcsc-lite
+PKG_SUGGESTED_OPTIONS= pcsc-lite
.include "../../mk/bsd.options.mk"
diff --git a/openscep/Makefile b/openscep/Makefile
index c49cf06f6c..17d41c0298 100644
--- a/openscep/Makefile
+++ b/openscep/Makefile
@@ -17,8 +17,8 @@ BUILD_DEPENDS+= w3m>=0.5.1:../../www/w3m
USE_TOOLS+= automake autoconf grep perl:run
OPENSCEP_USER?= openscep
OPENSCEP_GROUP?= openscep
-PKG_GROUPS= ${OPENSCEP_USER}
-PKG_USERS= ${OPENSCEP_USER}:${OPENSCEP_GROUP}
+PKG_GROUPS= ${OPENSCEP_USER}
+PKG_USERS= ${OPENSCEP_USER}:${OPENSCEP_GROUP}
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -73,12 +73,12 @@ OPENSCEP_CRL_EXPIRY?= 1
.for def in \
OPENSCEP_USER OPENSCEP_GROUP APACHE_GROUP OPENSCEP_CA_EXPIRY
-SETUPSH_SUBST+= ${def:Q}=${${def}:Q}
+SETUPSH_SUBST+= ${def:Q}=${${def}:Q}
BUILD_DEFS+= ${def}
.endfor
.for def in \
PREFIX SSLBASE CHOWN MKDIR CHMOD RM TOUCH SED GREP PKG_SYSCONFDIR
-SETUPSH_SUBST+= ${def:Q}=${${def}:Q}
+SETUPSH_SUBST+= ${def:Q}=${${def}:Q}
.endfor
SUBST_CLASSES+= setupsh
@@ -92,15 +92,15 @@ temp_OPENSCEP_LDAP_BASE= nonce example org
.else
temp_OPENSCEP_LDAP_BASE= ${:!hostname!:S/./ /g}
.endif
-OPENSCEP_LDAP_HOST?= ${temp_OPENSCEP_LDAP_BASE:ts.}
-OPENSCEP_LDAP_BASE?= ${temp_OPENSCEP_LDAP_BASE:[2..-1]:S/^/dc=/:ts,}
+OPENSCEP_LDAP_HOST?= ${temp_OPENSCEP_LDAP_BASE:ts.}
+OPENSCEP_LDAP_BASE?= ${temp_OPENSCEP_LDAP_BASE:[2..-1]:S/^/dc=/:ts,}
.for def in \
OPENSCEP_CERT_EXPIRY OPENSCEP_CRL_EXPIRY OPENSCEP_LDAP_BASE
-CNF_SUBST+= ${def:Q}=${${def}:Q}
-BUILD_DEFS+= ${def}
+CNF_SUBST+= ${def:Q}=${${def}:Q}
+BUILD_DEFS+= ${def}
.endfor
-CNF_SUBST+= PREFIX=${PREFIX:Q}
-CNF_SUBST+= OPENSCEP_LDAP_HOST=${OPENSCEP_LDAP_HOST:Q}
+CNF_SUBST+= PREFIX=${PREFIX:Q}
+CNF_SUBST+= OPENSCEP_LDAP_HOST=${OPENSCEP_LDAP_HOST:Q}
SUBST_CLASSES+= cnf
SUBST_STAGE.cnf= pre-configure
diff --git a/opensips/Makefile b/opensips/Makefile
index f0f10a2817..c4554cb0b6 100644
--- a/opensips/Makefile
+++ b/opensips/Makefile
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/opensips-${VER}-tls
USE_TOOLS+= gmake
-CHECK_INTERPRETER_SKIP+=lib/opensips/opensipsctl/dbtextdb/dbtextdb.py
+CHECK_INTERPRETER_SKIP+= lib/opensips/opensipsctl/dbtextdb/dbtextdb.py
REPLACE_PERL+= scripts/osipsconsole
PKG_SYSCONFSUBDIR= opensips
diff --git a/openssh/Makefile b/openssh/Makefile
index c82301a0c5..8ccb9e2c7f 100644
--- a/openssh/Makefile
+++ b/openssh/Makefile
@@ -36,20 +36,20 @@ CONFIGURE_ARGS.Darwin+= --disable-strip
# OpenSSH on Interix has some important caveats
.if ${OPSYS} == "Interix"
-MESSAGE_SRC= ${.CURDIR}/MESSAGE.Interix
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind
-CONFIGURE_ENV+= ac_cv_func_openpty=no
-CONFIGURE_ENV+= ac_cv_type_struct_timespec=yes
-CPPFLAGS+= -DIOV_MAX=16 # default is INT_MAX, way too large
+MESSAGE_SRC= ${.CURDIR}/MESSAGE.Interix
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/lib/bind
+CONFIGURE_ENV+= ac_cv_func_openpty=no
+CONFIGURE_ENV+= ac_cv_type_struct_timespec=yes
+CPPFLAGS+= -DIOV_MAX=16 # default is INT_MAX, way too large
.if exists(/usr/local/include/bind/resolv.h)
-CPPFLAGS+= -I/usr/local/include/bind
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind
+CPPFLAGS+= -I/usr/local/include/bind
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/include/bind
.elif exists(/usr/local/bind/include/resolv.h)
-CPPFLAGS+= -I/usr/local/bind/include
-BUILDLINK_PASSTHRU_DIRS+= /usr/local/bind/include
+CPPFLAGS+= -I/usr/local/bind/include
+BUILDLINK_PASSTHRU_DIRS+= /usr/local/bind/include
.endif
-LDFLAGS+= -L/usr/local/lib/bind
-LIBS+= -lbind -ldb -lcrypt
+LDFLAGS+= -L/usr/local/lib/bind
+LIBS+= -lbind -ldb -lcrypt
.else # not Interix
diff --git a/openssl110/builtin.mk b/openssl110/builtin.mk
index f7a4c4f919..f457b7bdcb 100644
--- a/openssl110/builtin.mk
+++ b/openssl110/builtin.mk
@@ -2,8 +2,8 @@
BUILTIN_PKG:= openssl
-BUILTIN_FIND_LIBS:= crypto des ssl
-BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV
+BUILTIN_FIND_LIBS:= crypto des ssl
+BUILTIN_FIND_HEADERS_VAR:= H_OPENSSLCONF H_OPENSSLV
BUILTIN_FIND_HEADERS.H_OPENSSLCONF= openssl/opensslconf.h
BUILTIN_FIND_HEADERS.H_OPENSSLV= openssl/opensslv.h
@@ -19,7 +19,7 @@ IS_BUILTIN.openssl= no
IS_BUILTIN.openssl= yes
. endif
.endif
-MAKEVARS+= IS_BUILTIN.openssl
+MAKEVARS+= IS_BUILTIN.openssl
###
### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
@@ -57,8 +57,8 @@ BUILTIN_VERSION.openssl!= \
' ${H_OPENSSLV}
BUILTIN_PKG.openssl= openssl-${BUILTIN_VERSION.openssl}
.endif
-MAKEVARS+= BUILTIN_PKG.openssl
-MAKEVARS+= BUILTIN_VERSION.openssl
+MAKEVARS+= BUILTIN_PKG.openssl
+MAKEVARS+= BUILTIN_VERSION.openssl
.if !defined(BUILTIN_OPENSSL_HAS_THREADS) && \
!empty(IS_BUILTIN.openssl:M[yY][eE][sS]) && \
@@ -78,14 +78,14 @@ MAKEVARS+= BUILTIN_OPENSSL_HAS_THREADS
###
.if !defined(USE_BUILTIN.openssl)
. if ${PREFER.openssl} == "pkgsrc"
-USE_BUILTIN.openssl= no
+USE_BUILTIN.openssl= no
. else
-USE_BUILTIN.openssl= ${IS_BUILTIN.openssl}
+USE_BUILTIN.openssl= ${IS_BUILTIN.openssl}
. if defined(BUILTIN_PKG.openssl) && \
!empty(IS_BUILTIN.openssl:M[yY][eE][sS])
-USE_BUILTIN.openssl= yes
+USE_BUILTIN.openssl= yes
### take care builtin check case, BUILDLINK_API_DEPENDS may not be defined yet.
-CHECK_BUILTIN.openssl?= no
+CHECK_BUILTIN.openssl?= no
. if !empty(CHECK_BUILTIN.openssl:M[yY][eE][sS])
BUILDLINK_API_DEPENDS.openssl?= openssl>=1.0.1c
. endif
@@ -104,12 +104,12 @@ USE_BUILTIN.openssl!= \
defined(USE_FEATURES.openssl)
. if !empty(USE_FEATURES.openssl:Mthreads) && \
!empty(BUILTIN_OPENSSL_HAS_THREADS:M[nN][oO])
-USE_BUILTIN.openssl= no
+USE_BUILTIN.openssl= no
. endif
. endif
. endif # PREFER.openssl
.endif
-MAKEVARS+= USE_BUILTIN.openssl
+MAKEVARS+= USE_BUILTIN.openssl
###
### The section below only applies if we are not including this file
diff --git a/openttd-opengfx/Makefile b/openttd-opengfx/Makefile
index ee6714f1db..756f985b99 100644
--- a/openttd-opengfx/Makefile
+++ b/openttd-opengfx/Makefile
@@ -14,15 +14,15 @@ HOMEPAGE= http://openttd.org/
COMMENT= Free and open source graphics data files for the game OpenTTD
#LICENSE= # TODO: (see mk/license.mk)
-INSTALLATION_DIRS= share/openttd/data
+INSTALLATION_DIRS= share/openttd/data
WRKSRC= ${WRKDIR}/opengfx-${VERSION}
USE_LANGUAGES= # none
-NO_BUILD= YES
+NO_BUILD= YES
NO_CONFIGURE= YES
-OPENTTD_DATADIR= ${DESTDIR}${PREFIX}/share/openttd/data
+OPENTTD_DATADIR= ${DESTDIR}${PREFIX}/share/openttd/data
do-install:
# The single tar version has been dropped for some reason
diff --git a/openttd-openmsx/Makefile b/openttd-openmsx/Makefile
index 5b7ba58c67..9d142005b7 100644
--- a/openttd-openmsx/Makefile
+++ b/openttd-openmsx/Makefile
@@ -14,15 +14,15 @@ HOMEPAGE= http://openttd.org/
COMMENT= Free and open source music data files for the game OpenTTD
#LICENSE= # TODO: (see mk/license.mk)
-INSTALLATION_DIRS= share/openttd/gm
+INSTALLATION_DIRS= share/openttd/gm
WRKSRC= ${WRKDIR}/openmsx-${VERSION}
USE_LANGUAGES= # none
-NO_BUILD= YES
+NO_BUILD= YES
NO_CONFIGURE= YES
-OPENTTD_GMDIR= ${DESTDIR}${PREFIX}/share/openttd/gm
+OPENTTD_GMDIR= ${DESTDIR}${PREFIX}/share/openttd/gm
do-install:
${INSTALL_DATA} ${WRKSRC}/*.mid \
diff --git a/openttd-opensfx/Makefile b/openttd-opensfx/Makefile
index 4d3995b18c..b0946b83b4 100644
--- a/openttd-opensfx/Makefile
+++ b/openttd-opensfx/Makefile
@@ -13,15 +13,15 @@ HOMEPAGE= http://openttd.org/
COMMENT= Free and open source sound data files for the game OpenTTD
#LICENSE= # TODO: (see mk/license.mk)
-INSTALLATION_DIRS= share/openttd/data
+INSTALLATION_DIRS= share/openttd/data
WRKSRC= ${WRKDIR}/opensfx-${VERSION}
USE_LANGUAGES= # none
-NO_BUILD= YES
+NO_BUILD= YES
NO_CONFIGURE= YES
-OPENTTD_DATADIR= ${DESTDIR}${PREFIX}/share/openttd/data
+OPENTTD_DATADIR= ${DESTDIR}${PREFIX}/share/openttd/data
do-install:
# the readme is already bumped to the single tar version
diff --git a/opentyrian/options.mk b/opentyrian/options.mk
index d69820c8d7..a0ccab9e86 100644
--- a/opentyrian/options.mk
+++ b/opentyrian/options.mk
@@ -8,9 +8,9 @@ PKG_SUGGESTED_OPTIONS=
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mopl3)
-CFLAGS+=-DOPLTYPE_IS_OPL3
+CFLAGS+= -DOPLTYPE_IS_OPL3
.endif
.if !empty(PKG_OPTIONS:Mtyrian2000)
-CFLAGS+=-DTYRIAN2000
+CFLAGS+= -DTYRIAN2000
.endif
diff --git a/openvrml/Makefile b/openvrml/Makefile
index 31e31048c7..2e854eb107 100644
--- a/openvrml/Makefile
+++ b/openvrml/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE= http://www.openvrml.org/
COMMENT= Portable C++ library for displaying VRML97 files
-GNU_CONFIGURE= YES
-USE_LIBTOOL= yes
-CONFIGURE_ARGS+=--disable-script-node-java --disable-script-node-javascript
-USE_TOOLS+= gmake
+GNU_CONFIGURE= YES
+USE_LIBTOOL= yes
+CONFIGURE_ARGS+= --disable-script-node-java --disable-script-node-javascript
+USE_TOOLS+= gmake
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/glut/buildlink3.mk"
diff --git a/openvrml/buildlink3.mk b/openvrml/buildlink3.mk
index 37e004ace2..5d70564deb 100644
--- a/openvrml/buildlink3.mk
+++ b/openvrml/buildlink3.mk
@@ -7,7 +7,7 @@ OPENVRML_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.openvrml+= openvrml>=0.14.3
BUILDLINK_ABI_DEPENDS.openvrml?= openvrml>=0.14.3nb2
-BUILDLINK_PKGSRCDIR.openvrml?= ../../wip/openvrml
+BUILDLINK_PKGSRCDIR.openvrml?= ../../wip/openvrml
.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/glut/buildlink3.mk"
diff --git a/or1ksim/Makefile b/or1ksim/Makefile
index 4d2f5027a2..edd5c43e56 100644
--- a/or1ksim/Makefile
+++ b/or1ksim/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
INFO_FILES= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --target=or32
# rl_event_hook
diff --git a/org-caldav-git/Makefile b/org-caldav-git/Makefile
index fb4f34a68b..88b77be4ad 100644
--- a/org-caldav-git/Makefile
+++ b/org-caldav-git/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://github.com/dengste/org-caldav
COMMENT= Caldav sync for Emacs Orgmode
GIT_REPOSITORIES= org-caldav
-GIT_REPO.org-caldav= git://github.com/dengste/org-caldav.git
+GIT_REPO.org-caldav= git://github.com/dengste/org-caldav.git
WRKSRC= ${WRKDIR}/org-caldav
EGG_NAME= ${DISTNAME}.dev
diff --git a/oslc/Makefile b/oslc/Makefile
index 4b7d59b6ad..cb4477a362 100644
--- a/oslc/Makefile
+++ b/oslc/Makefile
@@ -21,17 +21,18 @@ USE_TOOLS+= bash pax perl
USE_LANGUAGES= # none
REPLACE_BASH+= licenses/test.sh licenses/create_template.sh \
- licenses/buildall.sh licenses/create_meta.sh
+ licenses/buildall.sh licenses/create_meta.sh
-REPLACE_PERL+= licenses/add_compatible.pl
+REPLACE_PERL+= licenses/add_compatible.pl
+
+INSTALLATION_DIRS= \
+ bin \
+ share/applications \
+ lib/java/oslc \
+ lib/java/oslc/doc \
+ lib/java/oslc/licenses \
+ lib/java/oslc/resources
-INSTALLATION_DIRS= \
- bin \
- share/applications \
- lib/java/oslc \
- lib/java/oslc/doc \
- lib/java/oslc/licenses \
- lib/java/oslc/resources
do-build:
${ECHO} "Create oslc.desktop:"
${ECHO} "[Desktop Entry]" > ${WRKSRC}/oslc.desktop
diff --git a/osmo/Makefile b/osmo/Makefile
index d1eb171509..2db0ef33c4 100644
--- a/osmo/Makefile
+++ b/osmo/Makefile
@@ -3,14 +3,14 @@
DISTNAME= osmo-0.2.12
CATEGORIES= misc time
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=osmo-pim/osmo-0.2.10/}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=osmo-pim/osmo-0.2.10/}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://clayo.org/osmo/
COMMENT= Personal organizer, calendar and task manager
LICENSE= gnu-gpl-v2
-CONFIGURE_ENV+= LIBICAL_CFLAGS="-I${BUILDLINK_PREFIX.libical}/include/libical"
+CONFIGURE_ENV+= LIBICAL_CFLAGS="-I${BUILDLINK_PREFIX.libical}/include/libical"
GNU_CONFIGURE= yes
#USE_TOOLS= msgfmt pkg-config
USE_TOOLS= gmake msgfmt pkg-config
diff --git a/ozymandns/Makefile b/ozymandns/Makefile
index f69c865ad0..e536260294 100644
--- a/ozymandns/Makefile
+++ b/ozymandns/Makefile
@@ -15,19 +15,19 @@ DEPENDS+= p5-LWP-UserAgent-Determined-[0-9]*:../../www/p5-LWP-UserAgent-Determi
DEPENDS+= p5-MIME-Base32-[0-9]*:../../converters/p5-MIME-Base32
DEPENDS+= p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
-WRKSRC= ${WRKDIR}
-NO_CONFIGURE= YES
+WRKSRC= ${WRKDIR}
+NO_CONFIGURE= YES
OZYMAN_PERLSCRIPTS= aska.pl droute.pl geta.pl nomde.pl
USE_TOOLS+= perl:run
INSTALLATION_DIRS= sbin
-SUBST_CLASSES+= perlfix
-SUBST_STAGE.perlfix= post-patch
-SUBST_MESSAGE.perlfix= Fixing perl path
-SUBST_FILES.perlfix= ${OZYMAN_PERLSCRIPTS}
-SUBST_SED.perlfix= -e 's:^\#!/usr/bin/perl:\#!${PERL5}:g'
+SUBST_CLASSES+= perlfix
+SUBST_STAGE.perlfix= post-patch
+SUBST_MESSAGE.perlfix= Fixing perl path
+SUBST_FILES.perlfix= ${OZYMAN_PERLSCRIPTS}
+SUBST_SED.perlfix= -e 's:^\#!/usr/bin/perl:\#!${PERL5}:g'
LIBS.SunOS+= -lnsl # for gethostbyname
Home |
Main Index |
Thread Index |
Old Index