pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wip/q*: fix pkglint indentation warnings



Module Name:	pkgsrc-wip
Committed By:	Roland Illig <roland.illig%gmx.de@localhost>
Pushed By:	rillig
Date:		Sat Jan 27 23:22:39 2018 +0000
Changeset:	3019e33feb3b4dc70df35555f27998de0583bd89

Modified Files:
	qmc2/options.mk
	qmpdclient/Makefile
	qn-x11/Makefile
	qn-x11/PLIST
	qrupdate/Makefile
	qrupdate/buildlink3.mk
	qt4-libqtlua/Makefile
	qt5-libqtlua/Makefile
	qt5-qtbase-git/Makefile
	qt5-qtbase-git/buildlink3.mk
	qtractor/Makefile
	quantlib/PLIST
	quantlib/buildlink3.mk
	quarkcoin/Makefile
	quickie/PLIST

Log Message:
wip/q*: fix pkglint indentation warnings

pkglint -Wall -F -o aligned q*/

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3019e33feb3b4dc70df35555f27998de0583bd89

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qmc2/options.mk              | 10 +++----
 qmpdclient/Makefile          | 10 +++----
 qn-x11/Makefile              |  2 +-
 qn-x11/PLIST                 |  2 +-
 qrupdate/Makefile            |  6 ++--
 qrupdate/buildlink3.mk       |  2 +-
 qt4-libqtlua/Makefile        |  2 +-
 qt5-libqtlua/Makefile        |  2 +-
 qt5-qtbase-git/Makefile      | 64 ++++++++++++++++++++--------------------
 qt5-qtbase-git/buildlink3.mk |  2 +-
 qtractor/Makefile            |  2 +-
 quantlib/PLIST               | 70 ++++++++++++++++++++++----------------------
 quantlib/buildlink3.mk       |  2 +-
 quarkcoin/Makefile           | 30 +++++++++----------
 quickie/PLIST                | 14 ++++-----
 15 files changed, 110 insertions(+), 110 deletions(-)

diffs:
diff --git a/qmc2/options.mk b/qmc2/options.mk
index 84b2f6ad30..87901d1bec 100644
--- a/qmc2/options.mk
+++ b/qmc2/options.mk
@@ -1,11 +1,11 @@
 # $NetBSD: options.mk,v 1.2 2013/12/07 00:39:22 thomasklausner Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.qmc2
-PKG_SUPPORTED_OPTIONS=	phonon sdl
+PKG_OPTIONS_VAR=		PKG_OPTIONS.qmc2
+PKG_SUPPORTED_OPTIONS=		phonon sdl
 PKG_OPTIONS_REQUIRED_GROUPS+=	emu
-PKG_OPTIONS_GROUP.emu=	mame mess
-PKG_SUGGESTED_OPTIONS=	mame phonon sdl
-PLIST_VARS+=		mame mess
+PKG_OPTIONS_GROUP.emu=		mame mess
+PKG_SUGGESTED_OPTIONS=		mame phonon sdl
+PLIST_VARS+=			mame mess
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/qmpdclient/Makefile b/qmpdclient/Makefile
index 5764af75f0..37503e7407 100644
--- a/qmpdclient/Makefile
+++ b/qmpdclient/Makefile
@@ -14,18 +14,18 @@ HOMEPAGE=	http://bitcheese.net/wiki/QMPDClient
 COMMENT=	QT4 based mpd client
 LICENSE=	gnu-gpl-v2
 
-USE_LANGUAGES= c c++
+USE_LANGUAGES=	c c++
 
-SUBST_CLASSES+=			fix-proj
+SUBST_CLASSES+=		fix-proj
 SUBST_STAGE.fix-proj=	post-patch
 SUBST_MESSAGE.fix-proj=	Fixing qmake project file.
 SUBST_FILES.fix-proj=	qmpdclient.pro
-SUBST_SED.fix-proj=		-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.fix-proj=	-e 's,/usr/local,${PREFIX},g'
 SUBST_SED.fix-proj+=	-e 's,lrelease,${QTDIR}/bin/lrelease,g'
 SUBST_SED.fix-proj+=	-e 's,-g0 -s,,g'
 
-MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR:Q}
-QMAKE_FLAGS+= QT_CONFIG=${QT_CONFIG:Q}
+MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR:Q}
+QMAKE_FLAGS+=	QT_CONFIG=${QT_CONFIG:Q}
 
 # qmake isn't smart enough to integrate with lrelease. We have to run
 # it before actually invoking qmake, or lang/*.qm won't be installed.
diff --git a/qn-x11/Makefile b/qn-x11/Makefile
index 7abb3309c8..183cf2d1f4 100644
--- a/qn-x11/Makefile
+++ b/qn-x11/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	qnx11__-1.2.x
 PKGNAME=	qn-x11-0.1
-WRKSRC=	${WRKDIR}/gtk-qn-x11-theme-0.1
+WRKSRC=		${WRKDIR}/gtk-qn-x11-theme-0.1
 CATEGORIES=	x11
 MASTER_SITES=	http://download.freshmeat.net/themes/qnx11__/
 
diff --git a/qn-x11/PLIST b/qn-x11/PLIST
index 3d88c3dc3b..a9ba522f7a 100644
--- a/qn-x11/PLIST
+++ b/qn-x11/PLIST
@@ -1,5 +1,5 @@
 @comment $NetBSD: PLIST,v 1.4 2009/10/11 10:45:13 thomasklausner Exp $
 lib/gtk/themes/engines/libqnx.la
-share/themes/QN-X11/gtk/gtkrc
 share/themes/QN-X11/ICON.png
 share/themes/QN-X11/README.html
+share/themes/QN-X11/gtk/gtkrc
diff --git a/qrupdate/Makefile b/qrupdate/Makefile
index d23e7de78f..273d8100b2 100644
--- a/qrupdate/Makefile
+++ b/qrupdate/Makefile
@@ -9,11 +9,11 @@ HOMEPAGE=	https://qrupdate.sourceforge.io/
 COMMENT=	Library for fast updating of QR and Cholesky decompositions
 LICENSE=	gnu-gpl-v2
 
-USE_LIBTOOL=    yes
+USE_LIBTOOL=	yes
 USE_LANGUAGES=	fortran
-USE_TOOLS=      gmake
+USE_TOOLS=	gmake
 
-MAKE_FLAGS= FC=${FC:Q} FFLAGS=${FFLAGS:Q} PREFIX=${PREFIX:Q} LIBDIR=lib
+MAKE_FLAGS=	FC=${FC:Q} FFLAGS=${FFLAGS:Q} PREFIX=${PREFIX:Q} LIBDIR=lib
 
 do-build:
 	cd ${WRKDIR}/${DISTNAME}/src && gmake ${MAKE_FLAGS} lalib
diff --git a/qrupdate/buildlink3.mk b/qrupdate/buildlink3.mk
index 79a7e2d54a..99efda171b 100644
--- a/qrupdate/buildlink3.mk
+++ b/qrupdate/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	qrupdate
 QRUPDATE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.qrupdate+=	qrupdate>=1.1.2
-BUILDLINK_PKGSRCDIR.qrupdate?=	../../wip/qrupdate
+BUILDLINK_PKGSRCDIR.qrupdate?=		../../wip/qrupdate
 .endif	# QRUPDATE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-qrupdate
diff --git a/qt4-libqtlua/Makefile b/qt4-libqtlua/Makefile
index 8ad2a119dc..ec3629079d 100644
--- a/qt4-libqtlua/Makefile
+++ b/qt4-libqtlua/Makefile
@@ -14,7 +14,7 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 CMAKE_ARGS+=	-DINSTALL_BIN=${QTDIR}/bin
-CMAKE_ARGS+=    -DINSTALL_INC=${QTDIR}/include
+CMAKE_ARGS+=	-DINSTALL_INC=${QTDIR}/include
 CMAKE_ARGS+=	-DINSTALL_LIB=${QTDIR}/lib
 
 .include "../../lang/lua51/buildlink3.mk"
diff --git a/qt5-libqtlua/Makefile b/qt5-libqtlua/Makefile
index 72dbf1ec09..2998db9fb0 100644
--- a/qt5-libqtlua/Makefile
+++ b/qt5-libqtlua/Makefile
@@ -14,7 +14,7 @@ USE_CMAKE=	yes
 USE_LANGUAGES=	c c++
 
 CMAKE_ARGS+=	-DINSTALL_BIN=${QTDIR}/bin
-CMAKE_ARGS+=    -DINSTALL_INC=${QTDIR}/include
+CMAKE_ARGS+=	-DINSTALL_INC=${QTDIR}/include
 CMAKE_ARGS+=	-DINSTALL_LIB=${QTDIR}/lib
 
 .include "../../lang/lua51/buildlink3.mk"
diff --git a/qt5-qtbase-git/Makefile b/qt5-qtbase-git/Makefile
index a7a12de21b..805b3061a5 100644
--- a/qt5-qtbase-git/Makefile
+++ b/qt5-qtbase-git/Makefile
@@ -1,12 +1,12 @@
 # $NetBSD: Makefile,v 1.35 2016/04/11 19:01:40 ryoon Exp $
 
-PKGNAME=	qt5-qtbase-${QTVERSION}
-PKGREVISION=	1
+PKGNAME=		qt5-qtbase-${QTVERSION}
+PKGREVISION=		1
 GIT_REPOSITORIES=	qtproject
 GIT_REPO.qtproject=	https://github.com/qtproject/qtbase.git
 # 5.6 will go up to 5.7 and dev automatically
 GIT_BRANCH.qtproject=	5.6
-COMMENT=	C++ X GUI toolkit
+COMMENT=		C++ X GUI toolkit
 
 WRKSRC=		${WRKDIR}/qtproject
 
@@ -32,14 +32,14 @@ CONFIGURE_ARGS+=	-openssl-linked
 CONFIGURE_ARGS+=	-nomake examples
 CONFIGURE_ARGS+=	-nomake tests
 CONFIGURE_ARGS+=	-no-pch
-CONFIGURE_ARGS+=        -no-sql-db2
-CONFIGURE_ARGS+=        -no-sql-ibase
+CONFIGURE_ARGS+=	-no-sql-db2
+CONFIGURE_ARGS+=	-no-sql-ibase
 CONFIGURE_ARGS+=	-no-sql-mysql
-CONFIGURE_ARGS+=        -no-sql-oci
-CONFIGURE_ARGS+=        -no-sql-odbc
+CONFIGURE_ARGS+=	-no-sql-oci
+CONFIGURE_ARGS+=	-no-sql-odbc
 CONFIGURE_ARGS+=	-no-sql-psql
 CONFIGURE_ARGS+=	-no-sql-sqlite
-CONFIGURE_ARGS+=        -no-sql-sqlite2
+CONFIGURE_ARGS+=	-no-sql-sqlite2
 CONFIGURE_ARGS+=	-no-sql-tds
 CONFIGURE_ARGS+=	-no-strip
 CONFIGURE_ARGS+=	-system-harfbuzz
@@ -69,41 +69,41 @@ PLIST_VARS+=		egl
 .if ${OPSYS} == "SunOS"
 .  if !empty(CC_VERSION:Mgcc*)
 .    if ${ABI:U} == "64"
-CONFIGURE_ARGS+=	-platform solaris-g++-64
+CONFIGURE_ARGS+=		-platform solaris-g++-64
 .    else
-CONFIGURE_ARGS+=	-platform solaris-g++
+CONFIGURE_ARGS+=		-platform solaris-g++
 .    endif
 .  else
 .    if ${ABI:U} == "64"
-CONFIGURE_ARGS+=	-platform solaris-cc-64
+CONFIGURE_ARGS+=		-platform solaris-cc-64
 .    else
-CONFIGURE_ARGS+=	-platform solaris-cc
+CONFIGURE_ARGS+=		-platform solaris-cc
 .    endif
 .  endif
-SYS_LIBS=		-lresolv -lsocket -lnsl -lrt
+SYS_LIBS=			-lresolv -lsocket -lnsl -lrt
 .elif ${OPSYS} == "Interix"
-CONFIGURE_ARGS+=	-platform interix-g++
-CFLAGS+=		-I/usr/local/include/bind
-LDFLAGS+=		-L/usr/local/lib/bind -lbind
-BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
-SYS_LIBS=		-lbind -ldb -ldl
+CONFIGURE_ARGS+=		-platform interix-g++
+CFLAGS+=			-I/usr/local/include/bind
+LDFLAGS+=			-L/usr/local/lib/bind -lbind
+BUILDLINK_PASSTHRU_DIRS+=	/usr/local/include/bind /usr/local/lib/bind
+SYS_LIBS=			-lbind -ldb -ldl
 .elif ${OPSYS} == "DragonFly"
-CONFIGURE_ARGS+=	-platform freebsd-g++
+CONFIGURE_ARGS+=		-platform freebsd-g++
 .elif ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	-platform macx-clang
-CONFIGURE_ARGS+=	-no-framework
+CONFIGURE_ARGS+=		-platform macx-clang
+CONFIGURE_ARGS+=		-no-framework
 .  if exists(/usr/lib/libresolv.dylib)
-LDFLAGS+=		-lresolv
+LDFLAGS+=			-lresolv
 .  endif
 .elif ${OPSYS} == "Linux"
-LDFLAGS+=		-ldl
+LDFLAGS+=			-ldl
 .elif ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD"
 .  if exists(/usr/lib/libexecinfo.so)
-LDFLAGS+=		-lexecinfo
+LDFLAGS+=			-lexecinfo
 .  endif
 .endif
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-LDFLAGS+=		-lkvm	# see patch-src_corelib_io_qlockfile__unix.cpp
+LDFLAGS+=			-lkvm	# see patch-src_corelib_io_qlockfile__unix.cpp
 .endif
 
 REPLACE_PERL+=		bin/syncqt.pl
@@ -117,13 +117,13 @@ BUILD_TARGET=		sub-src
 INSTALLATION_DIRS=	${QTPREFIX}/bin lib/pkgconfig
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/echoplugin.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
-CHECK_INTERPRETER_SKIP+=qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
-CHECK_INTERPRETER_SKIP+=qt5/mkspecs/macx-ios-clang/rename_main.sh
+CHECK_INTERPRETER_SKIP+=	qt5/examples/widgets/tools/echoplugin/echoplugin.pro
+CHECK_INTERPRETER_SKIP+=	qt5/examples/widgets/tools/echoplugin/plugin/plugin.pro
+CHECK_INTERPRETER_SKIP+=	qt5/examples/widgets/tools/plugandpaint/plugandpaint.pro
+CHECK_INTERPRETER_SKIP+=	qt5/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro
+CHECK_INTERPRETER_SKIP+=	qt5/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro
+CHECK_INTERPRETER_SKIP+=	qt5/examples/widgets/tools/styleplugin/plugin/plugin.pro
+CHECK_INTERPRETER_SKIP+=	qt5/mkspecs/macx-ios-clang/rename_main.sh
 
 SUBST_CLASSES+=		opt path
 SUBST_STAGE.opt=	pre-configure
diff --git a/qt5-qtbase-git/buildlink3.mk b/qt5-qtbase-git/buildlink3.mk
index a8c9847eb8..26528012fa 100644
--- a/qt5-qtbase-git/buildlink3.mk
+++ b/qt5-qtbase-git/buildlink3.mk
@@ -17,7 +17,7 @@ QTDIR=		${BUILDLINK_PREFIX.qt5-qtbase}/qt5
 CMAKE_PREFIX_PATH+=	${QTDIR}
 
 CONFIGURE_ENV+=	QTDIR=${QTDIR}
-MAKE_ENV+= 	QTDIR=${QTDIR}
+MAKE_ENV+=	QTDIR=${QTDIR}
 
 PTHREAD_OPTS+=	require
 
diff --git a/qtractor/Makefile b/qtractor/Makefile
index fef46e0466..b1f3579b77 100644
--- a/qtractor/Makefile
+++ b/qtractor/Makefile
@@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=     gmake pkg-config
+USE_TOOLS+=	gmake pkg-config
 
 QTDIR?=			${PREFIX}/qt5
 CONFIGURE_ENV+=		QTDIR=${QTDIR:Q}
diff --git a/quantlib/PLIST b/quantlib/PLIST
index 9ae4629ac3..c82bbc6455 100644
--- a/quantlib/PLIST
+++ b/quantlib/PLIST
@@ -55,15 +55,15 @@ include/ql/experimental/barrieroption/all.hpp
 include/ql/experimental/barrieroption/perturbativebarrieroptionengine.hpp
 include/ql/experimental/callablebonds/all.hpp
 include/ql/experimental/callablebonds/blackcallablebondengine.hpp
-include/ql/experimental/callablebonds/callablebondconstantvol.hpp
 include/ql/experimental/callablebonds/callablebond.hpp
+include/ql/experimental/callablebonds/callablebondconstantvol.hpp
 include/ql/experimental/callablebonds/callablebondvolstructure.hpp
 include/ql/experimental/callablebonds/discretizedcallablefixedratebond.hpp
 include/ql/experimental/callablebonds/treecallablebondengine.hpp
 include/ql/experimental/commodities/all.hpp
+include/ql/experimental/commodities/commodity.hpp
 include/ql/experimental/commodities/commoditycashflow.hpp
 include/ql/experimental/commodities/commoditycurve.hpp
-include/ql/experimental/commodities/commodity.hpp
 include/ql/experimental/commodities/commodityindex.hpp
 include/ql/experimental/commodities/commoditypricinghelpers.hpp
 include/ql/experimental/commodities/commoditysettings.hpp
@@ -80,9 +80,9 @@ include/ql/experimental/commodities/paymentterm.hpp
 include/ql/experimental/commodities/petroleumunitsofmeasure.hpp
 include/ql/experimental/commodities/pricingperiod.hpp
 include/ql/experimental/commodities/quantity.hpp
+include/ql/experimental/commodities/unitofmeasure.hpp
 include/ql/experimental/commodities/unitofmeasureconversion.hpp
 include/ql/experimental/commodities/unitofmeasureconversionmanager.hpp
-include/ql/experimental/commodities/unitofmeasure.hpp
 include/ql/experimental/compoundoption/all.hpp
 include/ql/experimental/compoundoption/analyticcompoundoptionengine.hpp
 include/ql/experimental/compoundoption/compoundoption.hpp
@@ -106,8 +106,8 @@ include/ql/experimental/credit/defaulttype.hpp
 include/ql/experimental/credit/distribution.hpp
 include/ql/experimental/credit/factorspreadedhazardratecurve.hpp
 include/ql/experimental/credit/issuer.hpp
-include/ql/experimental/credit/lossdistribution.hpp
 include/ql/experimental/credit/loss.hpp
+include/ql/experimental/credit/lossdistribution.hpp
 include/ql/experimental/credit/nthtodefault.hpp
 include/ql/experimental/credit/onefactorcopula.hpp
 include/ql/experimental/credit/onefactorgaussiancopula.hpp
@@ -121,8 +121,8 @@ include/ql/experimental/credit/riskyassetswap.hpp
 include/ql/experimental/credit/riskyassetswapoption.hpp
 include/ql/experimental/credit/riskybond.hpp
 include/ql/experimental/credit/spreadedhazardratecurve.hpp
-include/ql/experimental/credit/syntheticcdoengines.hpp
 include/ql/experimental/credit/syntheticcdo.hpp
+include/ql/experimental/credit/syntheticcdoengines.hpp
 include/ql/experimental/exoticoptions/all.hpp
 include/ql/experimental/exoticoptions/analyticamericanmargrabeengine.hpp
 include/ql/experimental/exoticoptions/analyticeuropeanmargrabeengine.hpp
@@ -175,12 +175,12 @@ include/ql/experimental/finitedifferences/fdmhestonsolver.hpp
 include/ql/experimental/finitedifferences/fdmhestonvariancemesher.hpp
 include/ql/experimental/finitedifferences/fdmhullwhitemesher.hpp
 include/ql/experimental/finitedifferences/fdminnervaluecalculator.hpp
-include/ql/experimental/finitedifferences/fdmlinearopcomposite.hpp
 include/ql/experimental/finitedifferences/fdmlinearop.hpp
+include/ql/experimental/finitedifferences/fdmlinearopcomposite.hpp
 include/ql/experimental/finitedifferences/fdmlinearopiterator.hpp
 include/ql/experimental/finitedifferences/fdmlinearoplayout.hpp
-include/ql/experimental/finitedifferences/fdmmeshercomposite.hpp
 include/ql/experimental/finitedifferences/fdmmesher.hpp
+include/ql/experimental/finitedifferences/fdmmeshercomposite.hpp
 include/ql/experimental/finitedifferences/fdmquantohelper.hpp
 include/ql/experimental/finitedifferences/fdmsimple2dbssolver.hpp
 include/ql/experimental/finitedifferences/fdmsnapshotcondition.hpp
@@ -257,6 +257,7 @@ include/ql/experimental/volatility/sabrvolsurface.hpp
 include/ql/experimental/volatility/volcube.hpp
 include/ql/grid.hpp
 include/ql/handle.hpp
+include/ql/index.hpp
 include/ql/indexes/all.hpp
 include/ql/indexes/bmaindex.hpp
 include/ql/indexes/ibor/all.hpp
@@ -269,7 +270,6 @@ include/ql/indexes/ibor/eonia.hpp
 include/ql/indexes/ibor/euribor.hpp
 include/ql/indexes/ibor/eurlibor.hpp
 include/ql/indexes/ibor/gbplibor.hpp
-include/ql/indexes/iborindex.hpp
 include/ql/indexes/ibor/jibar.hpp
 include/ql/indexes/ibor/jpylibor.hpp
 include/ql/indexes/ibor/libor.hpp
@@ -280,14 +280,15 @@ include/ql/indexes/ibor/tibor.hpp
 include/ql/indexes/ibor/trlibor.hpp
 include/ql/indexes/ibor/usdlibor.hpp
 include/ql/indexes/ibor/zibor.hpp
+include/ql/indexes/iborindex.hpp
 include/ql/indexes/indexmanager.hpp
 include/ql/indexes/inflation/all.hpp
 include/ql/indexes/inflation/aucpi.hpp
 include/ql/indexes/inflation/euhicp.hpp
 include/ql/indexes/inflation/frhicp.hpp
-include/ql/indexes/inflationindex.hpp
 include/ql/indexes/inflation/ukrpi.hpp
 include/ql/indexes/inflation/uscpi.hpp
+include/ql/indexes/inflationindex.hpp
 include/ql/indexes/interestrateindex.hpp
 include/ql/indexes/region.hpp
 include/ql/indexes/swap/all.hpp
@@ -295,10 +296,9 @@ include/ql/indexes/swap/chfliborswap.hpp
 include/ql/indexes/swap/euriborswap.hpp
 include/ql/indexes/swap/eurliborswap.hpp
 include/ql/indexes/swap/gbpliborswap.hpp
-include/ql/indexes/swapindex.hpp
 include/ql/indexes/swap/jpyliborswap.hpp
 include/ql/indexes/swap/usdliborswap.hpp
-include/ql/index.hpp
+include/ql/indexes/swapindex.hpp
 include/ql/instrument.hpp
 include/ql/instruments/all.hpp
 include/ql/instruments/asianoption.hpp
@@ -377,7 +377,6 @@ include/ql/math/bernsteinpolynomial.hpp
 include/ql/math/beta.hpp
 include/ql/math/bspline.hpp
 include/ql/math/comparison.hpp
-include/ql/mathconstants.hpp
 include/ql/math/copulas/alimikhailhaqcopula.hpp
 include/ql/math/copulas/all.hpp
 include/ql/math/copulas/claytoncopula.hpp
@@ -427,8 +426,8 @@ include/ql/math/interpolations/extrapolation.hpp
 include/ql/math/interpolations/flatextrapolation2d.hpp
 include/ql/math/interpolations/forwardflatinterpolation.hpp
 include/ql/math/interpolations/interpolation2d.hpp
-include/ql/math/interpolations/kernelinterpolation2d.hpp
 include/ql/math/interpolations/kernelinterpolation.hpp
+include/ql/math/interpolations/kernelinterpolation2d.hpp
 include/ql/math/interpolations/linearinterpolation.hpp
 include/ql/math/interpolations/loginterpolation.hpp
 include/ql/math/interpolations/mixedinterpolation.hpp
@@ -458,8 +457,8 @@ include/ql/math/optimization/costfunction.hpp
 include/ql/math/optimization/endcriteria.hpp
 include/ql/math/optimization/leastsquare.hpp
 include/ql/math/optimization/levenbergmarquardt.hpp
-include/ql/math/optimization/linesearchbasedmethod.hpp
 include/ql/math/optimization/linesearch.hpp
+include/ql/math/optimization/linesearchbasedmethod.hpp
 include/ql/math/optimization/lmdif.hpp
 include/ql/math/optimization/method.hpp
 include/ql/math/optimization/problem.hpp
@@ -511,6 +510,7 @@ include/ql/math/statistics/sequencestatistics.hpp
 include/ql/math/statistics/statistics.hpp
 include/ql/math/surface.hpp
 include/ql/math/transformedgrid.hpp
+include/ql/mathconstants.hpp
 include/ql/methods/all.hpp
 include/ql/methods/finitedifferences/all.hpp
 include/ql/methods/finitedifferences/americancondition.hpp
@@ -519,8 +519,8 @@ include/ql/methods/finitedifferences/bsmoperator.hpp
 include/ql/methods/finitedifferences/bsmtermoperator.hpp
 include/ql/methods/finitedifferences/cranknicolson.hpp
 include/ql/methods/finitedifferences/dminus.hpp
-include/ql/methods/finitedifferences/dplusdminus.hpp
 include/ql/methods/finitedifferences/dplus.hpp
+include/ql/methods/finitedifferences/dplusdminus.hpp
 include/ql/methods/finitedifferences/dzero.hpp
 include/ql/methods/finitedifferences/expliciteuler.hpp
 include/ql/methods/finitedifferences/fdtypedefs.hpp
@@ -531,8 +531,8 @@ include/ql/methods/finitedifferences/onefactoroperator.hpp
 include/ql/methods/finitedifferences/operatorfactory.hpp
 include/ql/methods/finitedifferences/operatortraits.hpp
 include/ql/methods/finitedifferences/parallelevolver.hpp
-include/ql/methods/finitedifferences/pdebsm.hpp
 include/ql/methods/finitedifferences/pde.hpp
+include/ql/methods/finitedifferences/pdebsm.hpp
 include/ql/methods/finitedifferences/pdeshortrate.hpp
 include/ql/methods/finitedifferences/shoutcondition.hpp
 include/ql/methods/finitedifferences/stepcondition.hpp
@@ -541,9 +541,9 @@ include/ql/methods/finitedifferences/zerocondition.hpp
 include/ql/methods/lattices/all.hpp
 include/ql/methods/lattices/binomialtree.hpp
 include/ql/methods/lattices/bsmlattice.hpp
+include/ql/methods/lattices/lattice.hpp
 include/ql/methods/lattices/lattice1d.hpp
 include/ql/methods/lattices/lattice2d.hpp
-include/ql/methods/lattices/lattice.hpp
 include/ql/methods/lattices/tree.hpp
 include/ql/methods/lattices/trinomialtree.hpp
 include/ql/methods/montecarlo/all.hpp
@@ -555,12 +555,12 @@ include/ql/methods/montecarlo/longstaffschwartzpathpricer.hpp
 include/ql/methods/montecarlo/lsmbasissystem.hpp
 include/ql/methods/montecarlo/mctraits.hpp
 include/ql/methods/montecarlo/montecarlomodel.hpp
-include/ql/methods/montecarlo/multipathgenerator.hpp
 include/ql/methods/montecarlo/multipath.hpp
+include/ql/methods/montecarlo/multipathgenerator.hpp
 include/ql/methods/montecarlo/nodedata.hpp
 include/ql/methods/montecarlo/parametricexercise.hpp
-include/ql/methods/montecarlo/pathgenerator.hpp
 include/ql/methods/montecarlo/path.hpp
+include/ql/methods/montecarlo/pathgenerator.hpp
 include/ql/methods/montecarlo/pathpricer.hpp
 include/ql/methods/montecarlo/sample.hpp
 include/ql/models/all.hpp
@@ -568,8 +568,8 @@ include/ql/models/calibrationhelper.hpp
 include/ql/models/equity/all.hpp
 include/ql/models/equity/batesmodel.hpp
 include/ql/models/equity/gjrgarchmodel.hpp
-include/ql/models/equity/hestonmodelhelper.hpp
 include/ql/models/equity/hestonmodel.hpp
+include/ql/models/equity/hestonmodelhelper.hpp
 include/ql/models/equity/piecewisetimedependenthestonmodel.hpp
 include/ql/models/marketmodels/accountingengine.hpp
 include/ql/models/marketmodels/all.hpp
@@ -615,8 +615,8 @@ include/ql/models/marketmodels/evolvers/all.hpp
 include/ql/models/marketmodels/evolvers/lognormalcmswapratepc.hpp
 include/ql/models/marketmodels/evolvers/lognormalcotswapratepc.hpp
 include/ql/models/marketmodels/evolvers/lognormalfwdrateballand.hpp
-include/ql/models/marketmodels/evolvers/lognormalfwdrateeulerconstrained.hpp
 include/ql/models/marketmodels/evolvers/lognormalfwdrateeuler.hpp
+include/ql/models/marketmodels/evolvers/lognormalfwdrateeulerconstrained.hpp
 include/ql/models/marketmodels/evolvers/lognormalfwdrateiballand.hpp
 include/ql/models/marketmodels/evolvers/lognormalfwdrateipc.hpp
 include/ql/models/marketmodels/evolvers/lognormalfwdratepc.hpp
@@ -628,13 +628,13 @@ include/ql/models/marketmodels/evolvers/volprocesses/squarerootandersen.hpp
 include/ql/models/marketmodels/forwardforwardmappings.hpp
 include/ql/models/marketmodels/historicalforwardratesanalysis.hpp
 include/ql/models/marketmodels/historicalratesanalysis.hpp
-include/ql/models/marketmodels/marketmodeldifferences.hpp
 include/ql/models/marketmodels/marketmodel.hpp
+include/ql/models/marketmodels/marketmodeldifferences.hpp
 include/ql/models/marketmodels/models/abcdvol.hpp
 include/ql/models/marketmodels/models/all.hpp
 include/ql/models/marketmodels/models/alphafinder.hpp
-include/ql/models/marketmodels/models/alphaformconcrete.hpp
 include/ql/models/marketmodels/models/alphaform.hpp
+include/ql/models/marketmodels/models/alphaformconcrete.hpp
 include/ql/models/marketmodels/models/capletcoterminalalphacalibration.hpp
 include/ql/models/marketmodels/models/capletcoterminalmaxhomogeneity.hpp
 include/ql/models/marketmodels/models/capletcoterminalperiodic.hpp
@@ -647,8 +647,8 @@ include/ql/models/marketmodels/models/fwdtocotswapadapter.hpp
 include/ql/models/marketmodels/models/piecewiseconstantabcdvariance.hpp
 include/ql/models/marketmodels/models/piecewiseconstantvariance.hpp
 include/ql/models/marketmodels/models/pseudorootfacade.hpp
-include/ql/models/marketmodels/models/volatilityinterpolationspecifierabcd.hpp
 include/ql/models/marketmodels/models/volatilityinterpolationspecifier.hpp
+include/ql/models/marketmodels/models/volatilityinterpolationspecifierabcd.hpp
 include/ql/models/marketmodels/multiproduct.hpp
 include/ql/models/marketmodels/pathwiseaccountingengine.hpp
 include/ql/models/marketmodels/pathwisediscounter.hpp
@@ -741,8 +741,8 @@ include/ql/pricingengines/asian/analytic_discr_geom_av_price.hpp
 include/ql/pricingengines/asian/analytic_discr_geom_av_strike.hpp
 include/ql/pricingengines/asian/mc_discr_arith_av_price.hpp
 include/ql/pricingengines/asian/mc_discr_arith_av_strike.hpp
-include/ql/pricingengines/asian/mcdiscreteasianengine.hpp
 include/ql/pricingengines/asian/mc_discr_geom_av_price.hpp
+include/ql/pricingengines/asian/mcdiscreteasianengine.hpp
 include/ql/pricingengines/barrier/all.hpp
 include/ql/pricingengines/barrier/analyticbarrierengine.hpp
 include/ql/pricingengines/barrier/mcbarrierengine.hpp
@@ -790,13 +790,13 @@ include/ql/pricingengines/quanto/quantoengine.hpp
 include/ql/pricingengines/swap/all.hpp
 include/ql/pricingengines/swap/discountingswapengine.hpp
 include/ql/pricingengines/swap/discretizedswap.hpp
+include/ql/pricingengines/swap/treeswapengine.hpp
 include/ql/pricingengines/swaption/all.hpp
 include/ql/pricingengines/swaption/blackswaptionengine.hpp
 include/ql/pricingengines/swaption/discretizedswaption.hpp
 include/ql/pricingengines/swaption/g2swaptionengine.hpp
 include/ql/pricingengines/swaption/jamshidianswaptionengine.hpp
 include/ql/pricingengines/swaption/treeswaptionengine.hpp
-include/ql/pricingengines/swap/treeswapengine.hpp
 include/ql/pricingengines/vanilla/all.hpp
 include/ql/pricingengines/vanilla/analyticbsmhullwhiteengine.hpp
 include/ql/pricingengines/vanilla/analyticdigitalamericanengine.hpp
@@ -892,8 +892,8 @@ include/ql/termstructures/inflationtermstructure.hpp
 include/ql/termstructures/interpolatedcurve.hpp
 include/ql/termstructures/iterativebootstrap.hpp
 include/ql/termstructures/localbootstrap.hpp
-include/ql/termstructures/volatility/abcdcalibration.hpp
 include/ql/termstructures/volatility/abcd.hpp
+include/ql/termstructures/volatility/abcdcalibration.hpp
 include/ql/termstructures/volatility/all.hpp
 include/ql/termstructures/volatility/capfloor/all.hpp
 include/ql/termstructures/volatility/capfloor/capfloortermvolatilitystructure.hpp
@@ -917,27 +917,27 @@ include/ql/termstructures/volatility/interpolatedsmilesection.hpp
 include/ql/termstructures/volatility/optionlet/all.hpp
 include/ql/termstructures/volatility/optionlet/capletvariancecurve.hpp
 include/ql/termstructures/volatility/optionlet/constantoptionletvol.hpp
+include/ql/termstructures/volatility/optionlet/optionletstripper.hpp
 include/ql/termstructures/volatility/optionlet/optionletstripper1.hpp
 include/ql/termstructures/volatility/optionlet/optionletstripper2.hpp
-include/ql/termstructures/volatility/optionlet/optionletstripper.hpp
 include/ql/termstructures/volatility/optionlet/optionletvolatilitystructure.hpp
 include/ql/termstructures/volatility/optionlet/spreadedoptionletvol.hpp
+include/ql/termstructures/volatility/optionlet/strippedoptionlet.hpp
 include/ql/termstructures/volatility/optionlet/strippedoptionletadapter.hpp
 include/ql/termstructures/volatility/optionlet/strippedoptionletbase.hpp
-include/ql/termstructures/volatility/optionlet/strippedoptionlet.hpp
 include/ql/termstructures/volatility/sabr.hpp
 include/ql/termstructures/volatility/sabrinterpolatedsmilesection.hpp
 include/ql/termstructures/volatility/sabrsmilesection.hpp
 include/ql/termstructures/volatility/smilesection.hpp
 include/ql/termstructures/volatility/spreadedsmilesection.hpp
 include/ql/termstructures/volatility/swaption/all.hpp
-include/ql/termstructures/volatility/swaption/cmsmarketcalibration.hpp
 include/ql/termstructures/volatility/swaption/cmsmarket.hpp
+include/ql/termstructures/volatility/swaption/cmsmarketcalibration.hpp
 include/ql/termstructures/volatility/swaption/spreadedswaptionvol.hpp
 include/ql/termstructures/volatility/swaption/swaptionconstantvol.hpp
+include/ql/termstructures/volatility/swaption/swaptionvolcube.hpp
 include/ql/termstructures/volatility/swaption/swaptionvolcube1.hpp
 include/ql/termstructures/volatility/swaption/swaptionvolcube2.hpp
-include/ql/termstructures/volatility/swaption/swaptionvolcube.hpp
 include/ql/termstructures/volatility/swaption/swaptionvoldiscrete.hpp
 include/ql/termstructures/volatility/swaption/swaptionvolmatrix.hpp
 include/ql/termstructures/volatility/swaption/swaptionvolstructure.hpp
@@ -959,10 +959,10 @@ include/ql/termstructures/yield/piecewiseyieldcurve.hpp
 include/ql/termstructures/yield/piecewisezerospreadedtermstructure.hpp
 include/ql/termstructures/yield/quantotermstructure.hpp
 include/ql/termstructures/yield/ratehelpers.hpp
-include/ql/termstructures/yieldtermstructure.hpp
 include/ql/termstructures/yield/zerocurve.hpp
 include/ql/termstructures/yield/zerospreadedtermstructure.hpp
 include/ql/termstructures/yield/zeroyieldstructure.hpp
+include/ql/termstructures/yieldtermstructure.hpp
 include/ql/time/all.hpp
 include/ql/time/businessdayconvention.hpp
 include/ql/time/calendar.hpp
@@ -1005,8 +1005,8 @@ include/ql/time/calendars/ukraine.hpp
 include/ql/time/calendars/unitedkingdom.hpp
 include/ql/time/calendars/unitedstates.hpp
 include/ql/time/calendars/weekendsonly.hpp
-include/ql/time/dategenerationrule.hpp
 include/ql/time/date.hpp
+include/ql/time/dategenerationrule.hpp
 include/ql/time/daycounter.hpp
 include/ql/time/daycounters/actual360.hpp
 include/ql/time/daycounters/actual365fixed.hpp
@@ -1018,13 +1018,13 @@ include/ql/time/daycounters/simpledaycounter.hpp
 include/ql/time/daycounters/thirty360.hpp
 include/ql/time/ecb.hpp
 include/ql/time/frequency.hpp
-include/ql/timegrid.hpp
 include/ql/time/imm.hpp
 include/ql/time/period.hpp
 include/ql/time/schedule.hpp
-include/ql/timeseries.hpp
 include/ql/time/timeunit.hpp
 include/ql/time/weekday.hpp
+include/ql/timegrid.hpp
+include/ql/timeseries.hpp
 include/ql/types.hpp
 include/ql/utilities/all.hpp
 include/ql/utilities/clone.hpp
diff --git a/quantlib/buildlink3.mk b/quantlib/buildlink3.mk
index 30cbc4ecd6..1be7fa9361 100644
--- a/quantlib/buildlink3.mk
+++ b/quantlib/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	QuantLib
 QUANTLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.QuantLib+=	QuantLib>=1.1
-BUILDLINK_PKGSRCDIR.QuantLib?=	../../wip/quantlib
+BUILDLINK_PKGSRCDIR.QuantLib?=		../../wip/quantlib
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .endif	# QUANTLIB_BUILDLINK3_MK
diff --git a/quarkcoin/Makefile b/quarkcoin/Makefile
index 95e1b90158..214bbcddc4 100644
--- a/quarkcoin/Makefile
+++ b/quarkcoin/Makefile
@@ -17,23 +17,23 @@ USE_TOOLS+=	gmake pkg-config autoconf aclocal autoheader automake libtoolize
 USE_LANGUAGES=	c c++
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV:S/coin//1}
 AUTO_MKDIRS=	yes
-HAS_CONFIGURE=  yes
-GNU_CONFIGURE=  yes
+HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 
-CFLAGS+=        -fPIC
+CFLAGS+=	-fPIC
 #CXXFLAGS+=	-std=c++0x
-CXXFLAGS+= -Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/quarkcoin -L${BUILDLINK_PREFIX.boost-libs}/lib/quarkcoin
-CXXFLAGS+=      -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1
-CXXFLAGS+=      -I${BUILDLINK_PREFIX.boost-libs}/include/boost
+CXXFLAGS+=	-Wl,-R${BUILDLINK_PREFIX.boost-libs}/lib/quarkcoin -L${BUILDLINK_PREFIX.boost-libs}/lib/quarkcoin
+CXXFLAGS+=	-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1
+CXXFLAGS+=	-I${BUILDLINK_PREFIX.boost-libs}/include/boost
 
 
-BUILDLINK_TRANSFORM+=   l:db_cxx:db4_cxx
+BUILDLINK_TRANSFORM+=	l:db_cxx:db4_cxx
 
-CONFIGURE_ARGS+=  --with-boost=${BUILDLINK_PREFIX.boost-libs}
-CONFIGURE_ARGS+=  --enable-hardening
-CONFIGURE_ARGS+=  ${PREFIX}/include/db4
+CONFIGURE_ARGS+=	--with-boost=${BUILDLINK_PREFIX.boost-libs}
+CONFIGURE_ARGS+=	--enable-hardening
+CONFIGURE_ARGS+=	${PREFIX}/include/db4
 
-LIBTOOLIZE=     ${PREFIX}/bin/libtoolize
+LIBTOOLIZE=	${PREFIX}/bin/libtoolize
 
 
 
@@ -46,10 +46,10 @@ QMAKE_OPTIONS+=	BDB_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	OPENSSL_LIB_PATH=${PREFIX}/lib
 QMAKE_OPTIONS+=	LIB_RPATH=${PREFIX}/lib
 
-RCD_SCRIPTS=	quarkcoind
-OWN_DIRS=	${VARBASE}/quarkcoin
-EGDIR=		${PREFIX}/share/examples/quarkcoin
-CONF_FILES=	${EGDIR}/quarkcoin.conf ${PKG_SYSCONFDIR}/quarkcoin.conf
+RCD_SCRIPTS=		quarkcoind
+OWN_DIRS=		${VARBASE}/quarkcoin
+EGDIR=			${PREFIX}/share/examples/quarkcoin
+CONF_FILES=		${EGDIR}/quarkcoin.conf ${PKG_SYSCONFDIR}/quarkcoin.conf
 CONF_FILES_PERMS=	${EGDIR}/quarkcoin.conf ${PKG_SYSCONFDIR}/quarkcoin.conf ${ROOT_USER} ${ROOT_GROUP} 0600
 
 pre-configure:
diff --git a/quickie/PLIST b/quickie/PLIST
index 5aebe91978..62105a02a4 100644
--- a/quickie/PLIST
+++ b/quickie/PLIST
@@ -4,6 +4,13 @@ bin/quickie-config
 bin/quickie_post_install
 bin/quickie_prime
 bin/quickie_svt
+man/man1/quickie-config.1
+man/man1/quickie.1
+man/man1/quickie_license.1
+man/man1/quickie_post_install.1
+man/man1/quickie_prime.1
+man/man1/quickie_svt.1
+share/doc/quickie/quickie-1.1.pdf
 share/quickie/admin/default.css
 share/quickie/admin/external.png
 share/quickie/admin/quickie.png
@@ -49,10 +56,3 @@ share/quickie/sidebar.refers_to
 share/quickie/sidebar.wiki
 share/quickie/square_brackets.referred_to_by
 share/quickie/square_brackets.unlink_on_create
-share/doc/quickie/quickie-1.1.pdf
-man/man1/quickie-config.1
-man/man1/quickie_prime.1
-man/man1/quickie.1
-man/man1/quickie_svt.1
-man/man1/quickie_license.1
-man/man1/quickie_post_install.1


Home | Main Index | Thread Index | Old Index