pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/s*: 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:43:59 2018 +0000
Changeset: 78098c36be6da8480e4ca3afb9d8ded872e1d264
Modified Files:
s3funnel/Makefile
sabnzbdplus/Makefile
sabnzbdplus/options.mk
sais-demo-data/Makefile
samtools0119/PLIST
sara/Makefile
sarf/Makefile
scantailor/Makefile
schur/Makefile
scilab/buildlink3.mk
scim-git/Makefile
scimark/Makefile
scintilla/buildlink3.mk
scite/Makefile
scite/PLIST
scourge/Makefile
scourge/PLIST
scsh-install-lib/PLIST
scummvm-bass/PLIST
scummvm-git/Makefile
scummvm-git/options.mk
sdif-git/Makefile
sector-decomposition/Makefile
seeks/Makefile
semanticscuttle/Makefile
semanticscuttle/options.mk
send-pr/Makefile
serendipity/Makefile
seturgent/Makefile
sgmltools-lite/PLIST
shaarli/Makefile
sharif-univ-ttf/Makefile
shellinabox/Makefile
shellinabox/PLIST
shellinabox/options.mk
sil/Makefile
silky/Makefile
silvertree/Makefile
simgear/Makefile
simpa/Makefile
simulavr-git/Makefile
simulavr/Makefile
simutrans-data/Makefile
simutrans-data/PLIST
simutrans-data/options.mk
simutrans/Makefile
simutrans/PLIST
sipp/Makefile
sipvicious/Makefile
sipwitch/PLIST
siscone/Makefile
slackpkg2pkgsrc/Makefile
slowhttptest/Makefile
slrn-devel/Makefile
slune/Makefile
smallbasic-gui/Makefile
smap/Makefile
smc/Makefile
smproxy/Makefile
softvms/Makefile
soil/Makefile
sollya/Makefile
songwrite2/Makefile
spai/Makefile
spyder/Makefile
spyder/options.mk
squirrel/Makefile
squirrelmail-avelsieve/Makefile
squirrelmail-compatibility/PLIST
squirrelmail-vlogin/Makefile
squirrelmail-vlogin/PLIST
sselp/Makefile
ssid/Makefile
stacks/PLIST
stmd-git/Makefile
stmpclean/Makefile
structure/buildlink3.mk
suitesparse/Makefile
sun-j2me/Makefile
supercat/Makefile
superchic/Makefile
superlfv/Makefile
suse121_libgpg-error/Makefile
swarp/Makefile
swisseph/buildlink3.mk
sxemacs/Makefile
sxid/PLIST
symbolic++/Makefile
symon/Makefile
sympol/Makefile
sympow/Makefile
syn68k/Makefile
synce-orange/buildlink3.mk
syncthing-discosrv/Makefile
synfig/Makefile
synfigstudio/Makefile
Log Message:
wip/s*: fix pkglint indentation warnings
pkglint -Wall -F -o aligned s*/
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=78098c36be6da8480e4ca3afb9d8ded872e1d264
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
s3funnel/Makefile | 2 +-
sabnzbdplus/Makefile | 22 +++++++++---------
sabnzbdplus/options.mk | 2 +-
sais-demo-data/Makefile | 2 +-
samtools0119/PLIST | 2 +-
sara/Makefile | 40 ++++++++++++++++-----------------
sarf/Makefile | 6 ++---
scantailor/Makefile | 2 +-
schur/Makefile | 2 +-
scilab/buildlink3.mk | 2 +-
scim-git/Makefile | 2 +-
scimark/Makefile | 4 ++--
scintilla/buildlink3.mk | 2 +-
scite/Makefile | 12 +++++-----
scite/PLIST | 2 +-
scourge/Makefile | 2 +-
scourge/PLIST | 22 +++++++++---------
scsh-install-lib/PLIST | 2 +-
scummvm-bass/PLIST | 2 +-
scummvm-git/Makefile | 16 +++++++-------
scummvm-git/options.mk | 18 +++++++--------
sdif-git/Makefile | 4 ++--
sector-decomposition/Makefile | 2 +-
seeks/Makefile | 6 ++---
semanticscuttle/Makefile | 42 +++++++++++++++++------------------
semanticscuttle/options.mk | 8 +++----
send-pr/Makefile | 12 +++++-----
serendipity/Makefile | 4 ++--
seturgent/Makefile | 18 +++++++--------
sgmltools-lite/PLIST | 8 +++----
shaarli/Makefile | 4 ++--
sharif-univ-ttf/Makefile | 2 +-
shellinabox/Makefile | 48 ++++++++++++++++++++--------------------
shellinabox/PLIST | 2 +-
shellinabox/options.mk | 20 ++++++++---------
sil/Makefile | 2 +-
silky/Makefile | 2 +-
silvertree/Makefile | 2 +-
simgear/Makefile | 2 +-
simpa/Makefile | 2 +-
simulavr-git/Makefile | 10 ++++-----
simulavr/Makefile | 2 +-
simutrans-data/Makefile | 2 +-
simutrans-data/PLIST | 24 ++++++++++----------
simutrans-data/options.mk | 18 +++++++--------
simutrans/Makefile | 16 ++++++++------
simutrans/PLIST | 2 +-
sipp/Makefile | 4 ++--
sipvicious/Makefile | 4 ++--
sipwitch/PLIST | 8 +++----
siscone/Makefile | 2 +-
slackpkg2pkgsrc/Makefile | 4 ++--
slowhttptest/Makefile | 4 ++--
slrn-devel/Makefile | 2 +-
slune/Makefile | 11 ++++-----
smallbasic-gui/Makefile | 2 +-
smap/Makefile | 2 +-
smc/Makefile | 20 ++++++++---------
smproxy/Makefile | 2 +-
softvms/Makefile | 14 ++++++------
soil/Makefile | 12 +++++-----
sollya/Makefile | 10 ++++-----
songwrite2/Makefile | 6 ++---
spai/Makefile | 4 ++--
spyder/Makefile | 6 ++---
spyder/options.mk | 6 ++---
squirrel/Makefile | 2 +-
squirrelmail-avelsieve/Makefile | 2 +-
squirrelmail-compatibility/PLIST | 4 ++--
squirrelmail-vlogin/Makefile | 2 +-
squirrelmail-vlogin/PLIST | 18 +++++++--------
sselp/Makefile | 24 ++++++++++----------
ssid/Makefile | 18 +++++++--------
stacks/PLIST | 14 ++++++------
stmd-git/Makefile | 2 +-
stmpclean/Makefile | 14 ++++++------
structure/buildlink3.mk | 2 +-
suitesparse/Makefile | 12 +++++-----
sun-j2me/Makefile | 48 ++++++++++++++++++++--------------------
supercat/Makefile | 4 ++--
superchic/Makefile | 4 ++--
superlfv/Makefile | 2 +-
suse121_libgpg-error/Makefile | 2 +-
swarp/Makefile | 24 ++++++++++----------
swisseph/buildlink3.mk | 2 +-
sxemacs/Makefile | 2 +-
sxid/PLIST | 2 +-
symbolic++/Makefile | 4 ++--
symon/Makefile | 26 +++++++++++-----------
sympol/Makefile | 8 +++----
sympow/Makefile | 4 ++--
syn68k/Makefile | 22 +++++++++---------
synce-orange/buildlink3.mk | 2 +-
syncthing-discosrv/Makefile | 38 +++++++++++++++----------------
synfig/Makefile | 2 +-
synfigstudio/Makefile | 2 +-
96 files changed, 434 insertions(+), 431 deletions(-)
diffs:
diff --git a/s3funnel/Makefile b/s3funnel/Makefile
index 1bb85d2dc0..c09b249430 100644
--- a/s3funnel/Makefile
+++ b/s3funnel/Makefile
@@ -9,7 +9,7 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= http://code.google.com/p/s3funnel/
COMMENT= Multithreaded tool for performing operations on Amazon S3
-DEPENDS+= ${PYPKGPREFIX}-boto>=1.9:../../net/py-boto
+DEPENDS+= ${PYPKGPREFIX}-boto>=1.9:../../net/py-boto
DEPENDS+= ${PYPKGPREFIX}-workerpool-[0-9]*:../../wip/py-workerpool
USE_LANGUAGES= # none
diff --git a/sabnzbdplus/Makefile b/sabnzbdplus/Makefile
index 8300e0d972..e42a9c8940 100644
--- a/sabnzbdplus/Makefile
+++ b/sabnzbdplus/Makefile
@@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.6 2015/02/04 10:10:53 thomasklausner Exp $
-DISTNAME= sabnzbdplus-${DISTVERSION}
-DISTVERSION= 0.7.16
-DISTFILES= SABnzbd-${DISTVERSION}-src${EXTRACT_SUFX}
+DISTNAME= sabnzbdplus-${DISTVERSION}
+DISTVERSION= 0.7.16
+DISTFILES= SABnzbd-${DISTVERSION}-src${EXTRACT_SUFX}
CATEGORIES= news
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/sabnzbdplus/}${DISTVERSION}/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/sabnzbdplus/}${DISTVERSION}/
MAINTAINER= wongk%apt.homeunix.net@localhost
HOMEPAGE= http://sabnzbdplus.sourceforge.net/
@@ -28,18 +28,18 @@ PKG_GROUPS= sabnzbd
PKG_USERS= sabnzbd:sabnzbd
PKG_HOME.sabnzbd= ${PREFIX}/sabnzbd
-OWN_DIRS_PERMS= ${PREFIX}/sabnzbd sabnzbd sabnzbd 0755
+OWN_DIRS_PERMS= ${PREFIX}/sabnzbd sabnzbd sabnzbd 0755
INSTALLATION_DIRS+= cherrypy gntp interfaces locale po tools util
-PY_PATCHPLIST= yes
+PY_PATCHPLIST= yes
REPLACE_PYTHON= *.py */*.py */*/*.py
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= pre-configure
-SUBST_MESSAGE.fix-paths= Fix absolute paths.
-SUBST_FILES.fix-paths= SABnzbd.py
-SUBST_SED.fix-paths= -e 's,%%PREFIX%%,${PREFIX},g'
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths= Fix absolute paths.
+SUBST_FILES.fix-paths= SABnzbd.py
+SUBST_SED.fix-paths= -e 's,%%PREFIX%%,${PREFIX},g'
do-install:
${MKDIR} ${DESTDIR}/${PREFIX}/bin
diff --git a/sabnzbdplus/options.mk b/sabnzbdplus/options.mk
index 53758f8ab1..e7eb1fc0f7 100644
--- a/sabnzbdplus/options.mk
+++ b/sabnzbdplus/options.mk
@@ -43,5 +43,5 @@ DEPENDS+= ${PYPKGPREFIX}-yenc-[0-9]*:../../converters/py-yenc
###
.if !empty(PKG_OPTIONS:Mopenssl)
DEPENDS+= openssl-[0-9]*:../../security/openssl
-DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
+DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
.endif
diff --git a/sais-demo-data/Makefile b/sais-demo-data/Makefile
index bded0e308b..5f30346d2a 100644
--- a/sais-demo-data/Makefile
+++ b/sais-demo-data/Makefile
@@ -14,7 +14,7 @@ LICENSE= sais-demo-data-license
LICENSE_FILE= ${FILESDIR}/sais-demo-data-license
RESTRICTED= ${LICENSE}
-USE_LANGUAGES= #
+USE_LANGUAGES= #
INSTALLATION_DIRS= bin share/doc/sais-demo-data share/sais-demo-data
INSTALLATION_DIRS+= share/sais-demo-data/gamedata
INSTALLATION_DIRS+= share/sais-demo-data/graphics
diff --git a/samtools0119/PLIST b/samtools0119/PLIST
index a4434c45b5..e6691a7b30 100644
--- a/samtools0119/PLIST
+++ b/samtools0119/PLIST
@@ -24,9 +24,9 @@ samtools0119/bin/vcfutils.lua
samtools0119/bin/wgsim
samtools0119/bin/wgsim_eval.pl
samtools0119/bin/zoom2sam.pl
+samtools0119/include/bam/bam.h
samtools0119/include/bam/bam2bcf.h
samtools0119/include/bam/bam_endian.h
-samtools0119/include/bam/bam.h
samtools0119/include/bam/bam_tview.h
samtools0119/include/bam/bgzf.h
samtools0119/include/bam/errmod.h
diff --git a/sara/Makefile b/sara/Makefile
index bc14010d90..dfddd10236 100644
--- a/sara/Makefile
+++ b/sara/Makefile
@@ -26,32 +26,32 @@ EGFILES= htm.cf paths.pl paths.sh ports programs sara.cf \
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
.endfor
-SUBST_CLASSES+= grp
-SUBST_STAGE.grp= post-patch
-SUBST_FILES.grp= src/misc/rex.c src/nfs-chk/nfs-chk.c
-SUBST_SED.grp= -e 's,GETGROUPS_T,gid_t,g'
+SUBST_CLASSES+= grp
+SUBST_STAGE.grp= post-patch
+SUBST_FILES.grp= src/misc/rex.c src/nfs-chk/nfs-chk.c
+SUBST_SED.grp= -e 's,GETGROUPS_T,gid_t,g'
# Disable build of fping.
-SUBST_CLASSES+= fping
-SUBST_STAGE.fping= post-patch
-SUBST_FILES.fping= src/fping/Makefile
-SUBST_SED.fping= -e 's,: $$(PROG),:,g'
+SUBST_CLASSES+= fping
+SUBST_STAGE.fping= post-patch
+SUBST_FILES.fping= src/fping/Makefile
+SUBST_SED.fping= -e 's,: $$(PROG),:,g'
# Change default path
-SUBST_CLASSES+= path
-SUBST_STAGE.path= pre-install
-SUBST_FILES.path= sara perl/* perllib/* bin/* html/*.pl
-SUBST_SED.path = -e 's,config\/,${EGDIR}/,g'
-SUBST_SED.path+= -e 's,perl.*\/,${PREFIX}/share/sara/,g'
-SUBST_SED.path+= -e 's,rules/,${PREFIX}/share/sara/rules/,g'
-SUBST_SED.path+= -e 's,`pwd`,\"${PREFIX}/share/sara/\",g'
+SUBST_CLASSES+= path
+SUBST_STAGE.path= pre-install
+SUBST_FILES.path= sara perl/* perllib/* bin/* html/*.pl
+SUBST_SED.path = -e 's,config\/,${EGDIR}/,g'
+SUBST_SED.path+= -e 's,perl.*\/,${PREFIX}/share/sara/,g'
+SUBST_SED.path+= -e 's,rules/,${PREFIX}/share/sara/rules/,g'
+SUBST_SED.path+= -e 's,`pwd`,\"${PREFIX}/share/sara/\",g'
# Default bin path
-SUBST_CLASSES+= defpath
-SUBST_STAGE.defpath=post-build
-SUBST_FILES.defpath=config/paths.pl
-SUBST_SED.defpath = -e 's,\"bin/,\"${PREFIX}/bin/,g'
-SUBST_SED.defpath+= -e 's,config,${EGDIR}/,g'
+SUBST_CLASSES+= defpath
+SUBST_STAGE.defpath= post-build
+SUBST_FILES.defpath= config/paths.pl
+SUBST_SED.defpath = -e 's,\"bin/,\"${PREFIX}/bin/,g'
+SUBST_SED.defpath+= -e 's,config,${EGDIR}/,g'
REPLACE_PERL= bin/get_targets bin/faux_fping sara add_user \
bin/*.sara* bin/*.sara.ext perl/*.pl perl/contrib/* html/*.pl \
diff --git a/sarf/Makefile b/sarf/Makefile
index c57c15dd30..9bd71674e7 100644
--- a/sarf/Makefile
+++ b/sarf/Makefile
@@ -16,10 +16,10 @@ WRKSRC= ${WRKDIR}
VERSION= 1.0
USE_LANGUAGES= # none
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
-USE_JAVA2= yes
+PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
+USE_JAVA2= yes
-INSTALLATION_DIRS= bin lib/java
+INSTALLATION_DIRS= bin lib/java
do-build:
printf "#! ${SH}\\nexec ${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/lib/java/${DISTNAME}.jar \"\$$@\"\\n" > ${WRKSRC}/${DISTNAME}.sh
diff --git a/scantailor/Makefile b/scantailor/Makefile
index 9215c0bb11..fd0a2fc2d6 100644
--- a/scantailor/Makefile
+++ b/scantailor/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
USE_CMAKE= yes
USE_TOOLS+= pkg-config
-SUBST_CLASSES+= paths
+SUBST_CLASSES+= paths
SUBST_SED.paths+= -e 's,/usr/local,${BUILDLINK_DIR},'
SUBST_SED.paths+= -e 's,libpng.lib,png15,'
SUBST_FILES.paths= CMakeLists.txt
diff --git a/schur/Makefile b/schur/Makefile
index 508a2a6c47..d40b9e9fc3 100644
--- a/schur/Makefile
+++ b/schur/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_TOOLS+= flex pax
-USE_LANGUAGES= c
+USE_LANGUAGES= c
CONFIGURE_ARGS+= --without-readline
diff --git a/scilab/buildlink3.mk b/scilab/buildlink3.mk
index 3c63c5df48..a872b1346e 100644
--- a/scilab/buildlink3.mk
+++ b/scilab/buildlink3.mk
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.scilab?= ../../math/scilab
BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl
-SCI= ${BUILDLINK_DIR}/lib/scilab-5.5.2
+SCI= ${BUILDLINK_DIR}/lib/scilab-5.5.2
CONFIGURE_ENV+= SCI=${SCI:Q}
MAKE_ENV+= SCI=${SCI:Q}
diff --git a/scim-git/Makefile b/scim-git/Makefile
index 6b1cb630f2..d99fad56c9 100644
--- a/scim-git/Makefile
+++ b/scim-git/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= https://github.com/andmarti1424/scim/
COMMENT= Text-mode spreadsheet
GIT_REPOSITORIES= scim
-GIT_REPO.scim= git://github.com/andmarti1424/scim.git
+GIT_REPO.scim= git://github.com/andmarti1424/scim.git
WRKSRC= ${WRKDIR}/scim
MAKE_JOBS_SAFE= no
diff --git a/scimark/Makefile b/scimark/Makefile
index 8e551302f6..605964fec0 100644
--- a/scimark/Makefile
+++ b/scimark/Makefile
@@ -13,11 +13,11 @@ COMMENT= Java benchmark for scientific and numerical computing
WRKSRC= ${WRKDIR}
-USE_JAVA= run
+USE_JAVA= run
USE_TOOLS+= pax
USE_LANGUAGES= # none
-SCMDIR= ${PREFIX}/lib/java/scimark2
+SCMDIR= ${PREFIX}/lib/java/scimark2
SCMJDIR= ${PREFIX}/lib/java/scimark2/jnt
INSTALLATION_DIRS= bin ${SCMJDIR}
diff --git a/scintilla/buildlink3.mk b/scintilla/buildlink3.mk
index 224235606b..9f515ca8d1 100755
--- a/scintilla/buildlink3.mk
+++ b/scintilla/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.scintilla?= build
BUILDLINK_API_DEPENDS.scintilla+= scintilla>=2.23
BUILDLINK_ABI_DEPENDS.scintilla+= scintilla>=2.29nb7
-BUILDLINK_PKGSRCDIR.scintilla?= ../../devel/scintilla
+BUILDLINK_PKGSRCDIR.scintilla?= ../../devel/scintilla
#.include "../../x11/gtk2/buildlink3.mk"
.endif # SCINTILLA_BUILDLINK3_MK
diff --git a/scite/Makefile b/scite/Makefile
index bd0635a259..282dd0c59d 100755
--- a/scite/Makefile
+++ b/scite/Makefile
@@ -12,12 +12,12 @@ HOMEPAGE= http://scintilla.sourceforge.net/
COMMENT= Source code editor
LICENSE= mit
-WRKSRC= ${WRKDIR}/scite
-USE_LANGUAGES= c c++
-BUILD_DIRS+= gtk
-USE_TOOLS+= gmake pkg-config
-MAKE_FILE= makefile
-INSTALLATION_DIRS= share/applications share/pixmaps
+WRKSRC= ${WRKDIR}/scite
+USE_LANGUAGES= c c++
+BUILD_DIRS+= gtk
+USE_TOOLS+= gmake pkg-config
+MAKE_FILE= makefile
+INSTALLATION_DIRS= share/applications share/pixmaps
.include "../../mk/bsd.prefs.mk"
diff --git a/scite/PLIST b/scite/PLIST
index 2883017798..8de066469d 100755
--- a/scite/PLIST
+++ b/scite/PLIST
@@ -8,6 +8,7 @@ share/scite/PaneAPI.html
share/scite/PrintHi.png
share/scite/SciTE.html
share/scite/SciTE.properties
+share/scite/SciTE.properties
share/scite/SciTEDirector.html
share/scite/SciTEDoc.html
share/scite/SciTEDownload.html
@@ -15,7 +16,6 @@ share/scite/SciTEExtension.html
share/scite/SciTEExternalLexer.html
share/scite/SciTEExtras.html
share/scite/SciTEFAQ.html
-share/scite/SciTE.properties
share/scite/SciTEGlobal.properties
share/scite/SciTEIco.png
share/scite/SciTEImage.html
diff --git a/scourge/Makefile b/scourge/Makefile
index 8846afe41f..524f8ec397 100644
--- a/scourge/Makefile
+++ b/scourge/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+= pax
post-extract:
${CP} ${FILESDIR}/scourge.sh ${WRKSRC}
-SUBST_CLASSES+= scourge
+SUBST_CLASSES+= scourge
SUBST_MESSAGE.scourge= Replacing prefix.
SUBST_STAGE.scourge= post-patch
SUBST_FILES.scourge= scourge.sh
diff --git a/scourge/PLIST b/scourge/PLIST
index a8acbfb0f6..5f30d27571 100644
--- a/scourge/PLIST
+++ b/scourge/PLIST
@@ -1,7 +1,7 @@
@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:17 thomasklausner Exp $
bin/scourge
-share/scourgedir/scourge
share/scourgedir/data/.DS_Store
+share/scourgedir/data/Thumbs.db
share/scourgedir/data/bookshelf.bmp
share/scourgedir/data/candle.bmp
share/scourgedir/data/chestfront.bmp
@@ -14,6 +14,7 @@ share/scourgedir/data/doorNS.bmp
share/scourgedir/data/flame.bmp
share/scourgedir/data/floor.bmp
share/scourgedir/data/floor2.bmp
+share/scourgedir/data/floor3.bmp
share/scourgedir/data/fonts/.DS_Store
share/scourgedir/data/fonts/curlfont.txf
share/scourgedir/data/fonts/default.txf
@@ -32,6 +33,7 @@ share/scourgedir/data/gui.bmp
share/scourgedir/data/gui_small.bmp
share/scourgedir/data/light.bmp
share/scourgedir/data/logo.bmp
+share/scourgedir/data/marble.bmp
share/scourgedir/data/models/.DS_Store
share/scourgedir/data/models/m1.bmp
share/scourgedir/data/models/m1.md2
@@ -46,17 +48,17 @@ share/scourgedir/data/models/m5.md2
share/scourgedir/data/models/m6.bmp
share/scourgedir/data/models/m6.md2
share/scourgedir/data/objects/axe.3ds
-share/scourgedir/data/objects/sword.3ds
-share/scourgedir/data/objects/corpse.3ds
-share/scourgedir/data/objects/table.3ds
+share/scourgedir/data/objects/board.3ds
share/scourgedir/data/objects/chair.3ds
-share/scourgedir/data/objects/helmet.3ds
share/scourgedir/data/objects/column.3ds
-share/scourgedir/data/objects/board.3ds
-share/scourgedir/data/objects/stairs.3ds
-share/scourgedir/data/objects/gate.3ds
+share/scourgedir/data/objects/corpse.3ds
share/scourgedir/data/objects/gate-down.3ds
share/scourgedir/data/objects/gate-up.3ds
+share/scourgedir/data/objects/gate.3ds
+share/scourgedir/data/objects/helmet.3ds
+share/scourgedir/data/objects/stairs.3ds
+share/scourgedir/data/objects/sword.3ds
+share/scourgedir/data/objects/table.3ds
share/scourgedir/data/portraits/.DS_Store
share/scourgedir/data/portraits/p1.bmp
share/scourgedir/data/portraits/p10.bmp
@@ -73,7 +75,5 @@ share/scourgedir/data/scourge.bmp
share/scourgedir/data/torchback.bmp
share/scourgedir/data/wood.bmp
share/scourgedir/data/woodtop.bmp
-share/scourgedir/data/Thumbs.db
-share/scourgedir/data/marble.bmp
-share/scourgedir/data/floor3.bmp
share/scourgedir/saved/scourge.cfg
+share/scourgedir/scourge
diff --git a/scsh-install-lib/PLIST b/scsh-install-lib/PLIST
index 9b2fa7b5b6..ac46c946f0 100644
--- a/scsh-install-lib/PLIST
+++ b/scsh-install-lib/PLIST
@@ -1,8 +1,8 @@
@comment $NetBSD: PLIST,v 1.5 2009/10/11 10:45:17 thomasklausner Exp $
bin/scsh-install-pkg
-share/doc/scsh/modules/install-lib-1.2.0/pdf/install-lib.pdf
lib/scsh/modules/install-lib
lib/scsh/modules/install-lib-1.2.0/load.scm
lib/scsh/modules/install-lib-1.2.0/scheme/install-lib-module.scm
lib/scsh/modules/install-lib-1.2.0/scheme/install-lib-version.scm
lib/scsh/modules/install-lib-1.2.0/scheme/install-lib.scm
+share/doc/scsh/modules/install-lib-1.2.0/pdf/install-lib.pdf
diff --git a/scummvm-bass/PLIST b/scummvm-bass/PLIST
index 1899dbf5ca..6c189390ae 100644
--- a/scummvm-bass/PLIST
+++ b/scummvm-bass/PLIST
@@ -1,5 +1,5 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:55 joerg Exp $
bin/bass
+${PLIST.cd}share/games/bass/sky.cpt
share/games/bass/sky.dnr
share/games/bass/sky.dsk
-${PLIST.cd}share/games/bass/sky.cpt
diff --git a/scummvm-git/Makefile b/scummvm-git/Makefile
index f3e16bc542..f90a6d1511 100644
--- a/scummvm-git/Makefile
+++ b/scummvm-git/Makefile
@@ -8,14 +8,14 @@ HOMEPAGE= http://scummvm.sourceforge.net/
COMMENT= LucasArts Script Creation Utility for Maniac Mansion
LICENSE= gnu-gpl-v2
-NO_SRC_ON_FTP= # changes daily
-NO_SRC_ON_CDROM=# changes daily
-USE_TOOLS+= gmake perl
-USE_LANGUAGES= c c++
-HAS_CONFIGURE= yes
-CONFIGURE_ARGS+=--prefix=${LOCALBASE}
-CONFIGURE_ARGS+=--mandir=${LOCALBASE}/${PKGMANDIR}
-WRKSRC= ${WRKDIR}/scummvm
+NO_SRC_ON_FTP= # changes daily
+NO_SRC_ON_CDROM= # changes daily
+USE_TOOLS+= gmake perl
+USE_LANGUAGES= c c++
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS+= --prefix=${LOCALBASE}
+CONFIGURE_ARGS+= --mandir=${LOCALBASE}/${PKGMANDIR}
+WRKSRC= ${WRKDIR}/scummvm
.include "options.mk"
diff --git a/scummvm-git/options.mk b/scummvm-git/options.mk
index 2e962964e5..73b473918e 100644
--- a/scummvm-git/options.mk
+++ b/scummvm-git/options.mk
@@ -15,29 +15,29 @@ PKG_SUGGESTED_OPTIONS= ${PKG_SUPPORTED_OPTIONS}
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mscummvm-nightly-cruise)
-CONFIGURE_ARGS+=--enable-cruise
+CONFIGURE_ARGS+= --enable-cruise
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-groovie2)
-CONFIGURE_ARGS+=--enable-groovie2
+CONFIGURE_ARGS+= --enable-groovie2
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-lol)
-CONFIGURE_ARGS+=--enable-lol
+CONFIGURE_ARGS+= --enable-lol
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-m4)
-CONFIGURE_ARGS+=--enable-m4
+CONFIGURE_ARGS+= --enable-m4
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-saga2)
-CONFIGURE_ARGS+=--enable-saga2
+CONFIGURE_ARGS+= --enable-saga2
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-sci)
-CONFIGURE_ARGS+=--enable-sci
+CONFIGURE_ARGS+= --enable-sci
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-sci32)
-CONFIGURE_ARGS+=--enable-sci32
+CONFIGURE_ARGS+= --enable-sci32
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-teenagent)
-CONFIGURE_ARGS+=--enable-teenagent
+CONFIGURE_ARGS+= --enable-teenagent
.endif
.if !empty(PKG_OPTIONS:Mscummvm-nightly-tinsel)
-CONFIGURE_ARGS+=--enable-tinsel
+CONFIGURE_ARGS+= --enable-tinsel
.endif
diff --git a/sdif-git/Makefile b/sdif-git/Makefile
index 63cf8d1ff8..21073eb5f0 100644
--- a/sdif-git/Makefile
+++ b/sdif-git/Makefile
@@ -17,8 +17,8 @@ WRKSRC= ${WRKDIR}/${PKGBASE}
USE_TOOLS+= perl:run
USE_LANGUAGES= # none
-NO_BUILD= yes
-REPLACE_PERL= sdif
+NO_BUILD= yes
+REPLACE_PERL= sdif
INSTALLATION_DIRS= bin
do-install:
diff --git a/sector-decomposition/Makefile b/sector-decomposition/Makefile
index d17b7b7b57..b384a4fa94 100644
--- a/sector-decomposition/Makefile
+++ b/sector-decomposition/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://wwwthep.physik.uni-mainz.de/~stefanw/download/
MAINTAINER= jihbed.research%gmail.com@localhost
HOMEPAGE= http://wwwthep.physik.uni-mainz.de/~stefanw/sector_decomposition/
-COMMENT= Used to compute numerically the Laurent expansion of Feynman integrals
+COMMENT= Used to compute numerically the Laurent expansion of Feynman integrals
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
diff --git a/seeks/Makefile b/seeks/Makefile
index fe2fab39ce..f6af1b14ee 100644
--- a/seeks/Makefile
+++ b/seeks/Makefile
@@ -12,9 +12,9 @@ COMMENT= Decentralized metasearch engine
MAKE_JOBS_SAFE= no
-DEPENDS+= autogen-[0-9]*:../../devel/autogen
-DEPENDS+= autoconf>=2.59:../../devel/autoconf
-DEPENDS+= automake>=1.8.2:../../devel/automake
+DEPENDS+= autogen-[0-9]*:../../devel/autogen
+DEPENDS+= autoconf>=2.59:../../devel/autoconf
+DEPENDS+= automake>=1.8.2:../../devel/automake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/semanticscuttle/Makefile b/semanticscuttle/Makefile
index bc54750218..7fda2c5481 100644
--- a/semanticscuttle/Makefile
+++ b/semanticscuttle/Makefile
@@ -1,38 +1,38 @@
# $NetBSD: Makefile,v 1.5 2012/11/16 18:26:10 kristerw Exp $
#
-PKGNAME= semanticscuttle-${VERSION}
-DISTNAME= SemanticScuttle-${VERSION}
-VERSION= 0.98.3
+PKGNAME= semanticscuttle-${VERSION}
+DISTNAME= SemanticScuttle-${VERSION}
+VERSION= 0.98.3
PKGREVISION= 1
-CATEGORIES= www
+CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=semanticscuttle/}
-EXTRACT_SUFX= .zip
+EXTRACT_SUFX= .zip
-MAINTAINER= frederic%fauberteau.org@localhost
-HOMEPAGE= http://semanticscuttle.sourceforge.net/
-COMMENT= SemanticScuttle is a social bookmarking tool
-LICENSE= gnu-gpl-v2
+MAINTAINER= frederic%fauberteau.org@localhost
+HOMEPAGE= http://semanticscuttle.sourceforge.net/
+COMMENT= SemanticScuttle is a social bookmarking tool
+LICENSE= gnu-gpl-v2
.include "../../lang/php/phpversion.mk"
.include "../../mk/apache.mk"
DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}-[0-9]*:../../www/ap-php
-USE_TOOLS+= pax
+USE_TOOLS+= pax
#NO_BUILD= yes
-DOCDIR= ${PREFIX}/share/doc/semanticscuttle
-EGDIR= ${PREFIX}/share/examples/semanticscuttle
-SSDIR= ${PREFIX}/share/semanticscuttle
-PAXDIRS= scripts src www
+DOCDIR= ${PREFIX}/share/doc/semanticscuttle
+EGDIR= ${PREFIX}/share/examples/semanticscuttle
+SSDIR= ${PREFIX}/share/semanticscuttle
+PAXDIRS= scripts src www
-CONF_FILES+= ${EGDIR}/apache.conf ${PKG_SYSCONFDIR}/apache.conf
+CONF_FILES+= ${EGDIR}/apache.conf ${PKG_SYSCONFDIR}/apache.conf
-SUBST_CLASSES+= files
-SUBST_STAGE.files= post-build
-SUBST_FILES.files= apache.conf.dist
-SUBST_SED.files= -e "s|@SSHOME@|${SSDIR}/www|g"
-SUBST_MESSAGE.files= Fixing configuration files.
+SUBST_CLASSES+= files
+SUBST_STAGE.files= post-build
+SUBST_FILES.files= apache.conf.dist
+SUBST_SED.files= -e "s|@SSHOME@|${SSDIR}/www|g"
+SUBST_MESSAGE.files= Fixing configuration files.
.include "options.mk"
@@ -40,7 +40,7 @@ do-build:
${CP} ${FILESDIR}/apache.conf.dist ${WRKSRC}/apache.conf.dist
${CP} ${FILESDIR}/pgsql.inittables.sql ${WRKSRC}/pgsql.inittables.sql
-INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
+INSTALLATION_DIRS+= ${DOCDIR} ${EGDIR}
do-install:
.for d in ${PAXDIRS}
diff --git a/semanticscuttle/options.mk b/semanticscuttle/options.mk
index 309f6fc8a5..76b2bb113c 100644
--- a/semanticscuttle/options.mk
+++ b/semanticscuttle/options.mk
@@ -1,11 +1,11 @@
# $NetBSD: options.mk,v 1.3 2012/11/16 18:26:10 kristerw Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.semanticscuttle
+PKG_OPTIONS_VAR= PKG_OPTIONS.semanticscuttle
-PKG_OPTIONS_REQUIRED_GROUPS= db
-PKG_OPTIONS_GROUP.db= mysql pgsql sqlite oracle
+PKG_OPTIONS_REQUIRED_GROUPS= db
+PKG_OPTIONS_GROUP.db= mysql pgsql sqlite oracle
-PKG_SUGGESTED_OPTIONS= mysql
+PKG_SUGGESTED_OPTIONS= mysql
.include "../../mk/bsd.options.mk"
diff --git a/send-pr/Makefile b/send-pr/Makefile
index ecec885d30..d92abd9554 100644
--- a/send-pr/Makefile
+++ b/send-pr/Makefile
@@ -38,12 +38,12 @@ CONF_FILES= ${EGDIR}/send-pr.NetBSD.conf \
MAKE_DIRS+= ${PKG_SYSCONFDIR}/gnats
# ${PKG_SYSCONFDIR}/gnats/gnats-adm
-SUBST_CLASSES+= fix-paths
-SUBST_STAGE.fix-paths= post-patch
-SUBST_MESSAGE.fix-paths=Fixing paths
-SUBST_FILES.fix-paths= send-pr.sh
-SUBST_SED.fix-paths= -e 's,install-sid,${PREFIX}/bin/install-sid,'
-SUBST_SED.fix-paths+= -e 's,send-pr --request-id,${PREFIX}/bin/send-pr --request-id,'
+SUBST_CLASSES+= fix-paths
+SUBST_STAGE.fix-paths= post-patch
+SUBST_MESSAGE.fix-paths= Fixing paths
+SUBST_FILES.fix-paths= send-pr.sh
+SUBST_SED.fix-paths= -e 's,install-sid,${PREFIX}/bin/install-sid,'
+SUBST_SED.fix-paths+= -e 's,send-pr --request-id,${PREFIX}/bin/send-pr --request-id,'
post-install:
${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/gnats/dist/INSTALL.send-pr
diff --git a/serendipity/Makefile b/serendipity/Makefile
index ca8ecba578..d4c7edfd51 100644
--- a/serendipity/Makefile
+++ b/serendipity/Makefile
@@ -28,8 +28,8 @@ REPLACE_FILES.perl= htmlarea/plugins/SpellChecker/spell-check-logic.cgi
NO_BUILD= yes
WRKSRC= ${WRKDIR}/serendipity
-WWW_USER?= ${APACHE_USER}
-WWW_GROUP?= ${APACHE_GROUP}
+WWW_USER?= ${APACHE_USER}
+WWW_GROUP?= ${APACHE_GROUP}
PKG_GROUPS_VARS+= WWW_GROUP
PKG_USERS_VARS+= WWW_USER
diff --git a/seturgent/Makefile b/seturgent/Makefile
index cd753a3ec1..b1c993b805 100644
--- a/seturgent/Makefile
+++ b/seturgent/Makefile
@@ -11,15 +11,15 @@ COMMENT= Set an application urgency hint using x11
LICENSE= mit
# Adjust config.mk
-SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-build
-SUBST_MESSAGE.makefile= Fixing config.mk
-SUBST_FILES.makefile= config.mk
-SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
-SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
+SUBST_CLASSES+= makefile
+SUBST_STAGE.makefile= pre-build
+SUBST_MESSAGE.makefile= Fixing config.mk
+SUBST_FILES.makefile= config.mk
+SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sgmltools-lite/PLIST b/sgmltools-lite/PLIST
index bb4c01c5d3..595a1d8c06 100644
--- a/sgmltools-lite/PLIST
+++ b/sgmltools-lite/PLIST
@@ -4,6 +4,10 @@ bin/gensgmlenv
bin/sgmltools
bin/sgmlwhich
man/man1/sgmltools-lite.1
+share/examples/sgmltools-lite/aliases
+share/examples/sgmltools-lite/catalog
+share/examples/sgmltools-lite/catalog.rh62
+share/examples/sgmltools-lite/catalog.suse
share/sgml/dtd/sgmltools/catalog
share/sgml/dtd/sgmltools/common
share/sgml/dtd/sgmltools/deprec96
@@ -31,8 +35,4 @@ share/sgml/stylesheets/sgmltools/html.dsl
share/sgml/stylesheets/sgmltools/ld2db.dsl
share/sgml/stylesheets/sgmltools/print.dsl
share/sgml/stylesheets/sgmltools/sgmltools.cat
-share/examples/sgmltools-lite/aliases
-share/examples/sgmltools-lite/catalog
-share/examples/sgmltools-lite/catalog.rh62
-share/examples/sgmltools-lite/catalog.suse
@exec ${MKDIR} %D/share/sgml/misc/sgmltools/site-backends
diff --git a/shaarli/Makefile b/shaarli/Makefile
index b25fb3c348..8467e4c98b 100644
--- a/shaarli/Makefile
+++ b/shaarli/Makefile
@@ -26,7 +26,7 @@ WWW_GROUP?= ${APACHE_GROUP}
PKG_GROUPS_VARS+= WWW_GROUP
PKG_USERS_VARS= WWW_USER
-BUILD_DEFS+= WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP VARBASE
+BUILD_DEFS+= WWW_USER WWW_GROUP APACHE_USER APACHE_GROUP VARBASE
RCDIR= ${PREFIX}/share/shaarli
EGDIR= ${PREFIX}/share/examples/shaarli
@@ -62,7 +62,7 @@ post-extract:
#.endfor
${CP} ${FILESDIR}/apache.conf.dist ${WRKSRC}/apache.conf.dist
-INSTALLATION_DIRS+= ${RCDIR} ${EGDIR}
+INSTALLATION_DIRS+= ${RCDIR} ${EGDIR}
do-install:
${INSTALL_DATA} ${WRKSRC}/index.php ${DESTDIR}${RCDIR}
diff --git a/sharif-univ-ttf/Makefile b/sharif-univ-ttf/Makefile
index 2d9cdd6034..7485ca1eaa 100644
--- a/sharif-univ-ttf/Makefile
+++ b/sharif-univ-ttf/Makefile
@@ -15,7 +15,7 @@ COMMENT= This font was created by Sharif University
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
-NO_BUILD= yes
+NO_BUILD= yes
FONTS_DIRS.ttf= lib/X11/fonts/TTF
diff --git a/shellinabox/Makefile b/shellinabox/Makefile
index 46df40c1de..80d3012519 100644
--- a/shellinabox/Makefile
+++ b/shellinabox/Makefile
@@ -1,27 +1,27 @@
# $NetBSD$
-PKGBASE= shellinabox
-SIB_VER= v2.20
-DISTNAME= ${PKGBASE}-${SIB_VER}
-PKGREVISION= 1
-CATEGORIES= www
+PKGBASE= shellinabox
+SIB_VER= v2.20
+DISTNAME= ${PKGBASE}-${SIB_VER}
+PKGREVISION= 1
+CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_GITHUB:=shellinabox/}
-GITHUB_PROJECT= ${PKGBASE}
-GITHUB_TAG= ${SIB_VER}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=shellinabox/}
+GITHUB_PROJECT= ${PKGBASE}
+GITHUB_TAG= ${SIB_VER}
-MAINTAINER= ast%NetBSD.org@localhost
-HOMEPAGE= https://code.google.com/archive/p/shellinabox/
-COMMENT= Shell In A Box implements a web server for terminal emulation
-LICENSE= gnu-gpl-v2
+MAINTAINER= ast%NetBSD.org@localhost
+HOMEPAGE= https://code.google.com/archive/p/shellinabox/
+COMMENT= Shell In A Box implements a web server for terminal emulation
+LICENSE= gnu-gpl-v2
-EXTRACT_USING= gtar
+EXTRACT_USING= gtar
-USE_TOOLS+= gtar aclocal automake autoconf gm4 gmake autoheader
-USE_LANGUAGES= c
-USE_LIBTOOL= yes
+USE_TOOLS+= gtar aclocal automake autoconf gm4 gmake autoheader
+USE_LANGUAGES= c
+USE_LIBTOOL= yes
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
SIB_USER?= shellinabox
@@ -31,16 +31,16 @@ PKG_USERS= ${SIB_USER}:${SIB_GROUP}
PKG_GROUPS_VARS= SIB_USER
PKG_USERS_VARS= SIB_GROUP
-RCD_SCRIPTS+= shellinaboxd
+RCD_SCRIPTS+= shellinaboxd
RCD_SCRIPT_SRC.shellinaboxd = ${WRKSRC}/shellinaboxd.in
-SUBST_CLASSES+= sib
-SUBST_STAGE.sib= pre-configure
-SUBST_MESSAGE.sib= Crafting a shellinaboxd rc.d script with sane defaults
-SUBST_FILES.sib+= ${WRKSRC}/shellinaboxd.in
-SUBST_VARS.sib+= PREFIX SIB_USER SIB_GROUP
+SUBST_CLASSES+= sib
+SUBST_STAGE.sib= pre-configure
+SUBST_MESSAGE.sib= Crafting a shellinaboxd rc.d script with sane defaults
+SUBST_FILES.sib+= ${WRKSRC}/shellinaboxd.in
+SUBST_VARS.sib+= PREFIX SIB_USER SIB_GROUP
-INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1
+INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1
post-extract:
${CP} ${FILESDIR}/shellinaboxd.in ${WRKSRC}
diff --git a/shellinabox/PLIST b/shellinabox/PLIST
index 51a592cb0b..6c96c827cf 100644
--- a/shellinabox/PLIST
+++ b/shellinabox/PLIST
@@ -1,8 +1,8 @@
@comment $NetBSD$
bin/shellinaboxd
man/man1/shellinaboxd.1
-share/examples/rc.d/shellinaboxd
share/doc/shellinabox/AUTHORS
share/doc/shellinabox/COPYING
share/doc/shellinabox/GPL-2
share/doc/shellinabox/NEWS
+share/examples/rc.d/shellinaboxd
diff --git a/shellinabox/options.mk b/shellinabox/options.mk
index b03edbe780..71f2e87e99 100644
--- a/shellinabox/options.mk
+++ b/shellinabox/options.mk
@@ -2,21 +2,21 @@
# cores: patches shellinaboxd to enable core dumps
# nologin: disable it and do login through ssh
-PKG_OPTIONS_VAR= PKG_OPTIONS.shellinabox
-PKG_SUPPORTED_OPTIONS= cores nologin
-PKG_SUGGESTED_OPTIONS= cores nologin
+PKG_OPTIONS_VAR= PKG_OPTIONS.shellinabox
+PKG_SUPPORTED_OPTIONS= cores nologin
+PKG_SUGGESTED_OPTIONS= cores nologin
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mnologin)
-CONFIGURE_ARGS+= --disable-login
+CONFIGURE_ARGS+= --disable-login
.endif
.if !empty(PKG_OPTIONS:Mcores)
-SUBST_CLASSES+= cores
-SUBST_STAGE.cores= pre-patch
-SUBST_MESSAGE.cores= Enabling core files in shellinabox/shellinaboxd.c
-SUBST_FILES.cores= shellinabox/shellinaboxd.c
-SUBST_SED.cores+= -e 's|prctl(PR_SET_DUMPABLE,|// &|'
-SUBST_SED.cores+= -e 's|setrlimit(RLIMIT_CORE,|// &|'
+SUBST_CLASSES+= cores
+SUBST_STAGE.cores= pre-patch
+SUBST_MESSAGE.cores= Enabling core files in shellinabox/shellinaboxd.c
+SUBST_FILES.cores= shellinabox/shellinaboxd.c
+SUBST_SED.cores+= -e 's|prctl(PR_SET_DUMPABLE,|// &|'
+SUBST_SED.cores+= -e 's|setrlimit(RLIMIT_CORE,|// &|'
.endif
diff --git a/sil/Makefile b/sil/Makefile
index 0b0763c37f..471344d1c1 100644
--- a/sil/Makefile
+++ b/sil/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.amirrorclear.net/flowers/game/sil/index.html
COMMENT= Roguelike that stays true to the writing of Tolkien
LICENSE= gnu-gpl-v2 OR angband
-WRKSRC=${WRKDIR}/Sil/src
+WRKSRC= ${WRKDIR}/Sil/src
USE_TOOLS+= gmake
USE_GAMESGROUP= yes
diff --git a/silky/Makefile b/silky/Makefile
index 9955a6160c..599aa808df 100644
--- a/silky/Makefile
+++ b/silky/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://silky.sourceforge.net/
COMMENT= Silky is an easy-to-use graphical SILC client
-USE_TOOLS+=gmake
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/silvertree/Makefile b/silvertree/Makefile
index 5fcc69d10a..64303e9c90 100644
--- a/silvertree/Makefile
+++ b/silvertree/Makefile
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/silvertree
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-boost-regex=boost_regex-mt
.include "../../devel/SDL/buildlink3.mk"
diff --git a/simgear/Makefile b/simgear/Makefile
index d741c63584..fc2b5fb64f 100644
--- a/simgear/Makefile
+++ b/simgear/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_CMAKE= yes
-BUILDLINK_API_DEPENDS.plib+= plib>=1.8.5
+BUILDLINK_API_DEPENDS.plib+= plib>=1.8.5
.include "../../audio/freealut/buildlink3.mk"
.include "../../audio/openal-soft/buildlink3.mk"
diff --git a/simpa/Makefile b/simpa/Makefile
index 46d4693e3f..1916fca9de 100644
--- a/simpa/Makefile
+++ b/simpa/Makefile
@@ -15,7 +15,7 @@ USE_TOOLS+= pax
NO_BUILD= yes
USE_LANGUAGES= # none
-PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
+PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
INSTALLATION_DIRS= lib/java/simpa/lib share/doc/simpa
diff --git a/simulavr-git/Makefile b/simulavr-git/Makefile
index 48b1959aac..aebae7031f 100644
--- a/simulavr-git/Makefile
+++ b/simulavr-git/Makefile
@@ -48,11 +48,11 @@ SUBST_FILES.makeinfo= examples/anacomp/Makefile.in
SUBST_FILES.makeinfo+= examples/python/Makefile.in
SUBST_SED.makeinfo= -e 's,@MAKEINFO@,${PREFIX}/bin/makeinfo,g'
-SUBST_CLASSES+= build-dir
-SUBST_STAGE.build-dir= post-configure
-SUBST_MESSAGE.build-dir= Deleting option not to get -o output only asks for single arg.
-SUBST_FILES.build-dir= doc/Makefile.in doc/Makefile
-SUBST_SED.build-dir= -e 's,--build-dir.*-o,-o,g'
+SUBST_CLASSES+= build-dir
+SUBST_STAGE.build-dir= post-configure
+SUBST_MESSAGE.build-dir= Deleting option not to get -o output only asks for single arg.
+SUBST_FILES.build-dir= doc/Makefile.in doc/Makefile
+SUBST_SED.build-dir= -e 's,--build-dir.*-o,-o,g'
## gcc 2.95 gives warnings that it cannot inline all functions.
#BUILDLINK_TRANSFORM+= rm:-Werror
diff --git a/simulavr/Makefile b/simulavr/Makefile
index c442a1559a..f29fe69877 100644
--- a/simulavr/Makefile
+++ b/simulavr/Makefile
@@ -77,7 +77,7 @@ SUBST_SED.intrpt0= -e 's/SIG_INTERRUPT0/INT0_vect/g'
SUBST_CLASSES+= makeinfo
SUBST_STAGE.makeinfo= post-configure
-SUBST_MESSAGE.makeinfo= set MAKEINFO path (to avoid work-directory references included)
+SUBST_MESSAGE.makeinfo= set MAKEINFO path (to avoid work-directory references included)
SUBST_FILES.makeinfo= examples/anacomp/Makefile.in
SUBST_FILES.makeinfo+= examples/python/Makefile.in
SUBST_SED.makeinfo= -e 's,@MAKEINFO@,${PREFIX}/bin/makeinfo,g'
diff --git a/simutrans-data/Makefile b/simutrans-data/Makefile
index a078e529c6..84a75327fc 100644
--- a/simutrans-data/Makefile
+++ b/simutrans-data/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.simutrans.com/en/paksets/
COMMENT= Game data for Simutrans
#LICENSE= # TODO: (see mk/license.mk)
-NO_BUILD= yes
+NO_BUILD= yes
#DEPENDS+= unzip-[0-9]*:../../archivers/unzip
diff --git a/simutrans-data/PLIST b/simutrans-data/PLIST
index 09cfeaa614..1d13d80cfa 100644
--- a/simutrans-data/PLIST
+++ b/simutrans-data/PLIST
@@ -1,16 +1,4 @@
@comment $NetBSD$
-${PLIST.pak64}share/simutrans/pak/scenario/millionaire/de.tab
-${PLIST.pak64}share/simutrans/pak/sound/buzzsaw.wav
-${PLIST.pak64}share/simutrans/pak/sound/tree-cutting.wav
-${PLIST.pak64}share/simutrans/pak/symbol.CompassIso.pak
-${PLIST.pak64}share/simutrans/pak/symbol.CompassMap.pak
-${PLIST.pak64}share/simutrans/pak/text/frp.tab
-${PLIST.pak64}share/simutrans/pak/tree.Tree10.pak
-${PLIST.pak64}share/simutrans/pak/tree.Tree11.pak
-${PLIST.pak64}share/simutrans/pak/tree.Tree12.pak
-${PLIST.pak64}share/simutrans/pak/vehicle.Fahrradrikscha.pak
-${PLIST.pak64}share/simutrans/pak/vehicle.Rikscha.pak
-${PLIST.pak64}share/simutrans/pak/vehicle.Saenfte.pak
${PLIST.pak64}share/simutrans/pak/bridge.ClassicRail.pak
${PLIST.pak64}share/simutrans/pak/bridge.ClassicRoad.pak
${PLIST.pak64}share/simutrans/pak/bridge.MaglevBridge.pak
@@ -420,6 +408,7 @@ ${PLIST.pak64}share/simutrans/pak/scenario/anthill/en.tab
${PLIST.pak64}share/simutrans/pak/scenario/anthill/scenario.nut
${PLIST.pak64}share/simutrans/pak/scenario/book-empire/book-empire.sve
${PLIST.pak64}share/simutrans/pak/scenario/book-empire/scenario.nut
+${PLIST.pak64}share/simutrans/pak/scenario/millionaire/de.tab
${PLIST.pak64}share/simutrans/pak/scenario/millionaire/millionaire.sve
${PLIST.pak64}share/simutrans/pak/scenario/millionaire/scenario.nut
${PLIST.pak64}share/simutrans/pak/scenario/pharmacy-max/de.tab
@@ -436,6 +425,7 @@ ${PLIST.pak64}share/simutrans/pak/sound/arctic.wav
${PLIST.pak64}share/simutrans/pak/sound/boat-horn.wav
${PLIST.pak64}share/simutrans/pak/sound/boing.wav
${PLIST.pak64}share/simutrans/pak/sound/bus.wav
+${PLIST.pak64}share/simutrans/pak/sound/buzzsaw.wav
${PLIST.pak64}share/simutrans/pak/sound/cash.wav
${PLIST.pak64}share/simutrans/pak/sound/click.wav
${PLIST.pak64}share/simutrans/pak/sound/comet-jet.wav
@@ -451,6 +441,7 @@ ${PLIST.pak64}share/simutrans/pak/sound/jackhammer.wav
${PLIST.pak64}share/simutrans/pak/sound/planelow.wav
${PLIST.pak64}share/simutrans/pak/sound/sound.tab
${PLIST.pak64}share/simutrans/pak/sound/steam.wav
+${PLIST.pak64}share/simutrans/pak/sound/tree-cutting.wav
${PLIST.pak64}share/simutrans/pak/sound/tropic.wav
${PLIST.pak64}share/simutrans/pak/sound/truck.wav
${PLIST.pak64}share/simutrans/pak/symbol.AirStop.pak
@@ -458,6 +449,8 @@ ${PLIST.pak64}share/simutrans/pak/symbol.BigLogo.pak
${PLIST.pak64}share/simutrans/pak/symbol.BusStop.pak
${PLIST.pak64}share/simutrans/pak/symbol.CarStop.pak
${PLIST.pak64}share/simutrans/pak/symbol.ColorOptions.pak
+${PLIST.pak64}share/simutrans/pak/symbol.CompassIso.pak
+${PLIST.pak64}share/simutrans/pak/symbol.CompassMap.pak
${PLIST.pak64}share/simutrans/pak/symbol.Electricity.pak
${PLIST.pak64}share/simutrans/pak/symbol.Flags.pak
${PLIST.pak64}share/simutrans/pak/symbol.InTown.pak
@@ -514,6 +507,7 @@ ${PLIST.pak64}share/simutrans/pak/text/es.tab
${PLIST.pak64}share/simutrans/pak/text/et.tab
${PLIST.pak64}share/simutrans/pak/text/fi.tab
${PLIST.pak64}share/simutrans/pak/text/fr.tab
+${PLIST.pak64}share/simutrans/pak/text/frp.tab
${PLIST.pak64}share/simutrans/pak/text/gr.tab
${PLIST.pak64}share/simutrans/pak/text/hr.tab
${PLIST.pak64}share/simutrans/pak/text/hu.tab
@@ -561,6 +555,9 @@ ${PLIST.pak64}share/simutrans/pak/tree.Tanne_4.pak
${PLIST.pak64}share/simutrans/pak/tree.Tanne_5.pak
${PLIST.pak64}share/simutrans/pak/tree.Tanne_6.pak
${PLIST.pak64}share/simutrans/pak/tree.Tree1.pak
+${PLIST.pak64}share/simutrans/pak/tree.Tree10.pak
+${PLIST.pak64}share/simutrans/pak/tree.Tree11.pak
+${PLIST.pak64}share/simutrans/pak/tree.Tree12.pak
${PLIST.pak64}share/simutrans/pak/tree.Tree3.pak
${PLIST.pak64}share/simutrans/pak/tree.Tree5.pak
${PLIST.pak64}share/simutrans/pak/tree.Tree6.pak
@@ -683,6 +680,7 @@ ${PLIST.pak64}share/simutrans/pak/vehicle.Erztrailer.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Erztransporter.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Erzwagen.pak
${PLIST.pak64}share/simutrans/pak/vehicle.F7back.pak
+${PLIST.pak64}share/simutrans/pak/vehicle.Fahrradrikscha.pak
${PLIST.pak64}share/simutrans/pak/vehicle.FastFerry.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Flachwagen.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Fokker_F27.pak
@@ -780,9 +778,11 @@ ${PLIST.pak64}share/simutrans/pak/vehicle.Postwagen.pak
${PLIST.pak64}share/simutrans/pak/vehicle.PrPersonenwagen.pak
${PLIST.pak64}share/simutrans/pak/vehicle.PrPostwagen.pak
${PLIST.pak64}share/simutrans/pak/vehicle.RenaultTH5.pak
+${PLIST.pak64}share/simutrans/pak/vehicle.Rikscha.pak
${PLIST.pak64}share/simutrans/pak/vehicle.SD40-2-back.pak
${PLIST.pak64}share/simutrans/pak/vehicle.SD40-2-front.pak
${PLIST.pak64}share/simutrans/pak/vehicle.SMPoiltruck.pak
+${PLIST.pak64}share/simutrans/pak/vehicle.Saenfte.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Sandanhaenger.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Sandtransporter.pak
${PLIST.pak64}share/simutrans/pak/vehicle.Schooner_Bark.pak
diff --git a/simutrans-data/options.mk b/simutrans-data/options.mk
index 2aebafc395..debdc1a7c0 100644
--- a/simutrans-data/options.mk
+++ b/simutrans-data/options.mk
@@ -8,27 +8,27 @@ PLIST_VARS+= pak64 pak128
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpak96hd)
-DISTFILES=-http://hd.simutrans.com/release/PakHD_v04B_100-0.zip
+DISTFILES= -http://hd.simutrans.com/release/PakHD_v04B_100-0.zip
.endif
.if !empty(PKG_OPTIONS:Mpak64jp)
-DISTFILES=simupak64.japan-120-0-1.zip
+DISTFILES= simupak64.japan-120-0-1.zip
.endif
.if !empty(PKG_OPTIONS:Mpak128de)
-DISTFILES=PAK128.german_0.9_120.x.zip
+DISTFILES= PAK128.german_0.9_120.x.zip
.endif
.if !empty(PKG_OPTIONS:Mpak64)
-DISTFILES+=simupak64-120-2.zip
-DISTNAME=simupak64-120-2
+DISTFILES+= simupak64-120-2.zip
+DISTNAME= simupak64-120-2
WRKSRC= ${WRKDIR}/simutrans
-PLIST.pak64= yes
+PLIST.pak64= yes
.endif
.if !empty(PKG_OPTIONS:Mpak128)
-DISTFILES=pak128-2.6--ST120.zip
-DISTNAME=pak128-2.6
+DISTFILES= pak128-2.6--ST120.zip
+DISTNAME= pak128-2.6
WRKSRC= ${WRKDIR}/pak128
-PLIST.pak128= yes
+PLIST.pak128= yes
.endif
diff --git a/simutrans/Makefile b/simutrans/Makefile
index edc2a2acc9..597354cd82 100644
--- a/simutrans/Makefile
+++ b/simutrans/Makefile
@@ -4,10 +4,12 @@ PKGNAME= simutrans-120.2.2
DISTNAME= simutrans-src-120-2-2
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=simutrans/}
-DISTFILES+= language_pack-Base+texts.zip
-SITES.language_pack-Base+texts.zip=http://simutrans-germany.com/translator/data/tab/
-DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
-SITES.${DISTNAME}${EXTRACT_SUFX}=${MASTER_SITE_SOURCEFORGE:=simutrans/}120-2-2/${DISTNAME}${EXTRACT_SUFX}
+DISTFILES+= language_pack-Base+texts.zip
+SITES.language_pack-Base+texts.zip= \
+ http://simutrans-germany.com/translator/data/tab/
+DISTFILES+= ${DISTNAME}${EXTRACT_SUFX}
+SITES.${DISTNAME}${EXTRACT_SUFX}= \
+ ${MASTER_SITE_SOURCEFORGE:=simutrans/}120-2-2/${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX= .zip
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -18,9 +20,9 @@ LICENSE= artistic
USE_TOOLS+= pkg-config unzip gmake pax grep
USE_LANGUAGES= c++ c
-DEPENDS+= simutrans-data-0.1{,nb*}:../../wip/simutrans-data
+DEPENDS+= simutrans-data-0.1{,nb*}:../../wip/simutrans-data
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/configure.sh
@@ -33,7 +35,7 @@ PTHREAD_OPTS+= require
#AUTO_MKDIRS= yes
WRKSRC= ${WRKDIR}/simutrans
-SUBST_CLASSES+= testeq
+SUBST_CLASSES+= testeq
SUBST_STAGE.testeq= post-extract
SUBST_MESSAGE.testeq= Replace non-portable "==" operator for test(1)
SUBST_FILES.testeq= *.sh
diff --git a/simutrans/PLIST b/simutrans/PLIST
index 97ffaff25e..cece865863 100644
--- a/simutrans/PLIST
+++ b/simutrans/PLIST
@@ -1,6 +1,7 @@
@comment $NetBSD$
bin/sim
bin/simutrans
+share/simutrans/ai/readme.txt
share/simutrans/change_request.txt
share/simutrans/config/simuconf.tab
share/simutrans/copyright.txt
@@ -14,7 +15,6 @@ share/simutrans/font/ro_font.fnt
share/simutrans/history.txt
share/simutrans/license.txt
share/simutrans/license_squirrel.txt
-share/simutrans/ai/readme.txt
share/simutrans/music/01-Simutrans-Main-Theme.mid
share/simutrans/music/02-Gotta-catch-that-train.mid
share/simutrans/music/03-Sunday-drivers.mid
diff --git a/sipp/Makefile b/sipp/Makefile
index f36d930e1e..12585ae117 100644
--- a/sipp/Makefile
+++ b/sipp/Makefile
@@ -14,8 +14,8 @@ USE_TOOLS+= gmake autoconf automake autoreconf
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-INSTALL_TARGET= install install-man1
+WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
+INSTALL_TARGET= install install-man1
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
pre-configure:
diff --git a/sipvicious/Makefile b/sipvicious/Makefile
index 26a5b2a733..7b5d01a7d7 100644
--- a/sipvicious/Makefile
+++ b/sipvicious/Makefile
@@ -12,8 +12,8 @@ LICENSE= gnu-gpl-v2
PYTHON_SCRIPTS= svcrack.py svcrash.py svmap.py svreport.py svwar.py
-USE_LANGUAGES= #perl scripts only
-NO_BUILD= YES
+USE_LANGUAGES= #perl scripts only
+NO_BUILD= YES
REPLACE_PYTHON+= ${PYTHON_SCRIPTS}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/sipwitch/PLIST b/sipwitch/PLIST
index e717698869..b433f19ccc 100644
--- a/sipwitch/PLIST
+++ b/sipwitch/PLIST
@@ -22,12 +22,12 @@ lib/sipwitch/forward.so
lib/sipwitch/scripting.so
lib/sipwitch/subscriber.so
lib/sipwitch/zeroconf.so
-sbin/sipw
-share/examples/sipwitch/sipwitch.conf
-share/examples/sipwitch/sipwitch.d/lab.xml-example
-share/examples/sipwitch/sipwitch.d/tests.xml
man/man1/sippasswd.1
man/man1/sipquery.1
man/man1/sipwitch.1
man/man8/sipw.8
man/man8/sipwitch.cgi.8
+sbin/sipw
+share/examples/sipwitch/sipwitch.conf
+share/examples/sipwitch/sipwitch.d/lab.xml-example
+share/examples/sipwitch/sipwitch.d/tests.xml
diff --git a/siscone/Makefile b/siscone/Makefile
index 500002597b..3c0bbcd2cf 100644
--- a/siscone/Makefile
+++ b/siscone/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://projects.hepforge.org/siscone/
COMMENT= C++ code for a Seedless Infrared-Safe Cone jet finder
LICENSE= gnu-gpl-v2
-CHECK_PORTABILITY_SKIP= configure
+CHECK_PORTABILITY_SKIP= configure
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/slackpkg2pkgsrc/Makefile b/slackpkg2pkgsrc/Makefile
index 8d68c2402b..44b024b8a0 100644
--- a/slackpkg2pkgsrc/Makefile
+++ b/slackpkg2pkgsrc/Makefile
@@ -11,8 +11,8 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= # none
COMMENT= Simple script for easy generation of Slackware binary packages
-PY_PATCHPLIST= yes
-NO_BUILD= yes
+PY_PATCHPLIST= yes
+NO_BUILD= yes
REPLACE_PYTHON= slackpkg2pkgsrc.py
INSTALLATION_DIRS= bin
diff --git a/slowhttptest/Makefile b/slowhttptest/Makefile
index 47118436c0..ba4be9deb5 100644
--- a/slowhttptest/Makefile
+++ b/slowhttptest/Makefile
@@ -10,8 +10,8 @@ HOMEPAGE= https://github.com/shekyan/slowhttptest
COMMENT= Tool implementing some Slow HTTP attacks
LICENSE= apache-2.0
-GNU_CONFIGURE= yes
-USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
.include "../../security/openssl/buildlink3.mk"
diff --git a/slrn-devel/Makefile b/slrn-devel/Makefile
index d136730eaa..246bf5c058 100644
--- a/slrn-devel/Makefile
+++ b/slrn-devel/Makefile
@@ -2,7 +2,7 @@
DISTNAME= slrn-pre1.0.0-26
PKGNAME= slrn-pre1.0.0-26
-CONFLICTS= slrn-pl-[0-9]* slrn-[0-9]*
+CONFLICTS= slrn-pl-[0-9]* slrn-[0-9]*
LICENSE= gnu-gpl-v2
#PKGREVISION= 1
CATEGORIES= news
diff --git a/slune/Makefile b/slune/Makefile
index feff20904d..83ee4c60d3 100644
--- a/slune/Makefile
+++ b/slune/Makefile
@@ -22,11 +22,12 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-vorbis, py-EditObj2
PYSETUPINSTALLARGS= --install-lib ${PYSITELIB} --install-scripts ${PREFIX}/bin --install-data ${PREFIX}/share/
-PYFILES= __init__.py character.py circuit_generator.py controler.py \
- fight.py freestyle.py globdef.py gui.py gui_gl.py \
- gui_option.py hunt.py ia_algogen.py init_editobj.py level.py \
- player.py race.py race_algogen.py race_algogen2.py \
- sound.py videosequence.py
+PYFILES= \
+ __init__.py character.py circuit_generator.py controler.py \
+ fight.py freestyle.py globdef.py gui.py gui_gl.py \
+ gui_option.py hunt.py ia_algogen.py init_editobj.py level.py \
+ player.py race.py race_algogen.py race_algogen2.py \
+ sound.py videosequence.py
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/${PYSITELIB}/slune
diff --git a/smallbasic-gui/Makefile b/smallbasic-gui/Makefile
index dbc5302550..a3c2ae0cb6 100644
--- a/smallbasic-gui/Makefile
+++ b/smallbasic-gui/Makefile
@@ -8,7 +8,7 @@ CATEGORIES+= x11
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= SmallBASIC with GUI
-CONFIGURE_ARGS+= --enable-sdl
+CONFIGURE_ARGS+= --enable-sdl
.include "../../devel/SDL2/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/smap/Makefile b/smap/Makefile
index 236053f7b9..a4457ecded 100644
--- a/smap/Makefile
+++ b/smap/Makefile
@@ -21,7 +21,7 @@ LDFLAGS+= -lm
LDFLAGS+= ${PTHREAD_LDFLAGS}
LDFLAGS+= ${PTHREAD_LIBS}
-SUBST_CLASSES+= cflags
+SUBST_CLASSES+= cflags
SUBST_FILES.cflags= Makefile
SUBST_SED.cflags= -e 's/^CFLAGS=/CFLAGS?=/g'
SUBST_SED.cflags+= -e 's/^LDFLAGS=/LDFLAGS?=/g'
diff --git a/smc/Makefile b/smc/Makefile
index 65ea9c09e1..c5e541b69f 100644
--- a/smc/Makefile
+++ b/smc/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_TOOLS+= gmake automake autoconf
-SMCSHARE=${PREFIX}/share/smc
+SMCSHARE= ${PREFIX}/share/smc
post-extract:
# Extracting music files
@@ -56,15 +56,15 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DESTDIR}${PREFIX}/share/doc/smc
${INSTALL_DATA} ${WRKSRC}/docs/licenses/* ${DESTDIR}${PREFIX}/share/doc/smc/licenses
-SUBST_CLASSES+= libpath sharepath
-SUBST_STAGE.libpath= pre-install
-SUBST_FILES.libpath= ${WRKDIR}/.smc
-SUBST_SED.libpath= -e 's|LIBPATH|${PREFIX}/lib/smc|g'
-SUBST_MESSAGE.libpath= Setting smc lib path in execution script
-SUBST_STAGE.sharepath= pre-install
-SUBST_FILES.sharepath= ${WRKDIR}/.smc
-SUBST_SED.sharepath= -e 's|SHAREPATH|${SMCSHARE}|g'
-SUBST_MESSAGE.sharepath=Setting smc share path in execution script
+SUBST_CLASSES+= libpath sharepath
+SUBST_STAGE.libpath= pre-install
+SUBST_FILES.libpath= ${WRKDIR}/.smc
+SUBST_SED.libpath= -e 's|LIBPATH|${PREFIX}/lib/smc|g'
+SUBST_MESSAGE.libpath= Setting smc lib path in execution script
+SUBST_STAGE.sharepath= pre-install
+SUBST_FILES.sharepath= ${WRKDIR}/.smc
+SUBST_SED.sharepath= -e 's|SHAREPATH|${SMCSHARE}|g'
+SUBST_MESSAGE.sharepath= Setting smc share path in execution script
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../devel/SDL_gfx/buildlink3.mk"
diff --git a/smproxy/Makefile b/smproxy/Makefile
index 5aa9915f63..cd0bb07b2e 100644
--- a/smproxy/Makefile
+++ b/smproxy/Makefile
@@ -11,7 +11,7 @@ COMMENT= Proxy to allow non-XSMP apps to be managed by xsm
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
.include "../../x11/xextproto/buildlink3.mk"
.include "../../x11/libXmu/buildlink3.mk"
diff --git a/softvms/Makefile b/softvms/Makefile
index defde44ec9..c3aeddb875 100644
--- a/softvms/Makefile
+++ b/softvms/Makefile
@@ -1,9 +1,9 @@
# $NetBSD$
-PKGNAME= softvms-1.9
-DISTNAME= softvms
-CATEGORIES= emulators
-MASTER_SITES= https://mc.pp.se/dc/files/
+PKGNAME= softvms-1.9
+DISTNAME= softvms
+CATEGORIES= emulators
+MASTER_SITES= https://mc.pp.se/dc/files/
MASTER_SITE_BACKUP= https://travispaul.me/distfiles/
MAINTAINER= tr%vispaul.me@localhost
@@ -11,9 +11,9 @@ HOMEPAGE= https://mc.pp.se/dc/sw.html
COMMENT= Emulator capable of running some VMS games
LICENSE= mit
-WRKSRC= ${WRKDIR}/vms
-GNU_CONFIGURE= yes
-BUILD_TARGET= vms
+WRKSRC= ${WRKDIR}/vms
+GNU_CONFIGURE= yes
+BUILD_TARGET= vms
USE_TOOLS+= gmake
INSTALLATION_DIRS= bin
diff --git a/soil/Makefile b/soil/Makefile
index 4043d8b8c8..2c72222c7d 100644
--- a/soil/Makefile
+++ b/soil/Makefile
@@ -13,12 +13,12 @@ HOMEPAGE= http://www.lonesock.net/soil.html
COMMENT= Tiny C library used primarily for uploading textures into OpenGL
LICENSE= public-domain
-WRKSRC= ${WRKDIR}/SOIL
-USE_LANGUAGES= c c++
-USE_TOOLS+= gmake pax
-NO_CONFIGURE= yes
-BUILD_DIRS= projects/makefile
-MAKE_FILE= makefile
+WRKSRC= ${WRKDIR}/SOIL
+USE_LANGUAGES= c c++
+USE_TOOLS+= gmake pax
+NO_CONFIGURE= yes
+BUILD_DIRS= projects/makefile
+MAKE_FILE= makefile
INSTALLATION_DIRS+= include lib
SUBST_CLASSES+= prefix
diff --git a/sollya/Makefile b/sollya/Makefile
index c02b6f5619..d29162b659 100644
--- a/sollya/Makefile
+++ b/sollya/Makefile
@@ -10,11 +10,11 @@ COMMENT= Environment and library for safe floating-point code development
LICENSE= cecil-1.0 AND gnu-gpl-v3
# XXX Form is optional, check the licence terms if distribution is allowed
-RESTRICTED= Optional form on download page
-NO_SRC_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_CDROM= ${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
+RESTRICTED= Optional form on download page
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/songwrite2/Makefile b/songwrite2/Makefile
index d8f349bbd0..0bb170f209 100644
--- a/songwrite2/Makefile
+++ b/songwrite2/Makefile
@@ -12,9 +12,9 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-USE_PKGLOCALEDIR= yes
-USE_LANGUAGES= # none
-BUILD_OPTIONS= # blank
+USE_PKGLOCALEDIR= yes
+USE_LANGUAGES= # none
+BUILD_OPTIONS= # blank
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2, py-EditObj2
#INSTALLATION_DIRS+= share/doc/${PKGBASE} share/locale/en/LC_MESSAGES/
diff --git a/spai/Makefile b/spai/Makefile
index 034398f8ff..625d288e12 100644
--- a/spai/Makefile
+++ b/spai/Makefile
@@ -11,12 +11,12 @@ HOMEPAGE= http://www.computational.unibas.ch/software/spai/
COMMENT= Sparse Approximate Inverses
LICENSE= gnu-gpl-v2
-MAKE_JOBS_SAFE=NO
+MAKE_JOBS_SAFE= NO
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= bash:run
-CONFIG_SHELL= bash
+CONFIG_SHELL= bash
USE_LANGUAGES= c fortran
CONFIGURE_ARGS+= --with-mpi=${BUILDLINK_PREFIX.mpi}
diff --git a/spyder/Makefile b/spyder/Makefile
index be4909ad2f..52a52f7fbf 100644
--- a/spyder/Makefile
+++ b/spyder/Makefile
@@ -7,11 +7,11 @@ EXTRACT_SUFX= .zip
MAINTAINER= kamelderouiche%yahoo.com@localhost
HOMEPAGE= https://github.com/spyder-ide/spyder/wiki
-COMMENT= Scientific PYthon Development EnviRonment, alternative to IDLE
+COMMENT= Scientific PYthon Development EnviRonment, alternative to IDLE
LICENSE= mit
-DEPENDS+= ${PYPKGPREFIX}-rope>=0.9.3:../../devel/py-rope
-DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2.3:../../textproc/py-sphinx
+DEPENDS+= ${PYPKGPREFIX}-rope>=0.9.3:../../devel/py-rope
+DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2.3:../../textproc/py-sphinx
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
diff --git a/spyder/options.mk b/spyder/options.mk
index 4e41e5b846..76eb5b46db 100644
--- a/spyder/options.mk
+++ b/spyder/options.mk
@@ -2,13 +2,13 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.spyder
PKG_SUPPORTED_OPTIONS= ipython numpy scipy sympy pandas pylint \
- flakes matplotlib psutil pygments pep8
+ flakes matplotlib psutil pygments pep8
PKG_SUGGESTED_OPTIONS+= ipython numpy scipy sympy pandas pylint \
- flakes matplotlib pygments
+ flakes matplotlib pygments
PKG_OPTIONS_OPTIONAL_GROUPS+= np plint
PKG_OPTIONS_GROUP.np= scipy pandas
-PKG_OPTIONS_GROUP.plint= pylint pyflakes pep8
+PKG_OPTIONS_GROUP.plint= pylint pyflakes pep8
.include "../../mk/bsd.options.mk"
diff --git a/squirrel/Makefile b/squirrel/Makefile
index 7e76c5c4f4..5cf5a64f6e 100644
--- a/squirrel/Makefile
+++ b/squirrel/Makefile
@@ -16,7 +16,7 @@ USE_TOOLS+= gmake
USE_LANGUAGES+= c c++
AUTO_MKDIRS= yes
-WRKSRC= ${WRKDIR}/SQUIRREL3
+WRKSRC= ${WRKDIR}/SQUIRREL3
NO_CONFIGURE= yes
BUILD_TARGET= sq64
diff --git a/squirrelmail-avelsieve/Makefile b/squirrelmail-avelsieve/Makefile
index 6492f5396d..9241889cba 100644
--- a/squirrelmail-avelsieve/Makefile
+++ b/squirrelmail-avelsieve/Makefile
@@ -13,7 +13,7 @@ COMMENT= Sieve Script editing plugin for SquirrelMail
NO_CONFIGURE= yes
WRKSRC= ${WRKDIR}
-USE_TOOLS+= tar
+USE_TOOLS+= tar
SMDIR= ${PREFIX}/share/squirrelmail
MESSAGE_SUBST+= SMDIR=${SMDIR}
diff --git a/squirrelmail-compatibility/PLIST b/squirrelmail-compatibility/PLIST
index fbb47de6fe..8f70b9a558 100644
--- a/squirrelmail-compatibility/PLIST
+++ b/squirrelmail-compatibility/PLIST
@@ -1,7 +1,7 @@
@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:19 thomasklausner Exp $
-share/squirrelmail/plugins/compatibility/functions.php
share/squirrelmail/plugins/compatibility/INSTALL
-share/squirrelmail/plugins/compatibility/index.php
share/squirrelmail/plugins/compatibility/README
+share/squirrelmail/plugins/compatibility/functions.php
+share/squirrelmail/plugins/compatibility/index.php
share/squirrelmail/plugins/compatibility/setup.php
share/squirrelmail/plugins/compatibility/version
diff --git a/squirrelmail-vlogin/Makefile b/squirrelmail-vlogin/Makefile
index 6dcc66f447..bac461a063 100644
--- a/squirrelmail-vlogin/Makefile
+++ b/squirrelmail-vlogin/Makefile
@@ -10,7 +10,7 @@ MAINTAINER= eric%cirr.com@localhost
HOMEPAGE= http://www.squirrelmail.org/
COMMENT= Easy Virtual domain support plugin for SquirrelMail
-DEPENDS+= squirrelmail-compatibility>=1.3:../../wip/squirrelmail-compatibility
+DEPENDS+= squirrelmail-compatibility>=1.3:../../wip/squirrelmail-compatibility
WRKSRC= ${WRKDIR}
diff --git a/squirrelmail-vlogin/PLIST b/squirrelmail-vlogin/PLIST
index 93b141185d..10c8bf8a4d 100644
--- a/squirrelmail-vlogin/PLIST
+++ b/squirrelmail-vlogin/PLIST
@@ -1,17 +1,17 @@
@comment $NetBSD: PLIST,v 1.2 2009/10/11 10:45:19 thomasklausner Exp $
-share/squirrelmail/plugins/vlogin/functions.php
-share/squirrelmail/plugins/vlogin/setup.php
-share/squirrelmail/plugins/vlogin/INSTALL
share/squirrelmail/plugins/vlogin/COPYING
-share/squirrelmail/plugins/vlogin/index.php
+share/squirrelmail/plugins/vlogin/INSTALL
share/squirrelmail/plugins/vlogin/README
-share/squirrelmail/plugins/vlogin/data/config.php.sample
share/squirrelmail/plugins/vlogin/data/.htaccess
-share/squirrelmail/plugins/vlogin/data/index.php
+share/squirrelmail/plugins/vlogin/data/config.php.sample
+share/squirrelmail/plugins/vlogin/data/config.php.sample.per_user_functions_only
+share/squirrelmail/plugins/vlogin/data/config.php.sample.typical
share/squirrelmail/plugins/vlogin/data/domains/domain.com.vlogin.config.php
share/squirrelmail/plugins/vlogin/data/hostmap.dat.sample
-share/squirrelmail/plugins/vlogin/data/config.php.sample.typical
+share/squirrelmail/plugins/vlogin/data/index.php
share/squirrelmail/plugins/vlogin/data/users.dat.sample
-share/squirrelmail/plugins/vlogin/data/config.php.sample.per_user_functions_only
-share/squirrelmail/plugins/vlogin/version
+share/squirrelmail/plugins/vlogin/functions.php
share/squirrelmail/plugins/vlogin/functions.php.debug
+share/squirrelmail/plugins/vlogin/index.php
+share/squirrelmail/plugins/vlogin/setup.php
+share/squirrelmail/plugins/vlogin/version
diff --git a/sselp/Makefile b/sselp/Makefile
index 2f6be99a32..6cf83277e7 100644
--- a/sselp/Makefile
+++ b/sselp/Makefile
@@ -2,8 +2,8 @@
#
DISTNAME= sselp-0.2
-PKGREVISION= 1
-CATEGORIES= x11
+PKGREVISION= 1
+CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/tools/
MAINTAINER= rga%sdf.lonestar.org@localhost
@@ -11,20 +11,20 @@ HOMEPAGE= http://tools.suckless.org/sselp
COMMENT= Simple X selection printer. Prints the X selection to stdout
LICENSE= mit
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
# Adjust config.mk
-SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-build
-SUBST_MESSAGE.makefile= Fixing config.mk
-SUBST_FILES.makefile= config.mk
-SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
+SUBST_CLASSES+= makefile
+SUBST_STAGE.makefile= pre-build
+SUBST_MESSAGE.makefile= Fixing config.mk
+SUBST_FILES.makefile= config.mk
+SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
# no manual avaiable
#SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g'
-SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
+SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
# no manual avaiable
#INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/ssid/Makefile b/ssid/Makefile
index 04020ce998..f0eae3c206 100644
--- a/ssid/Makefile
+++ b/ssid/Makefile
@@ -10,16 +10,16 @@ HOMEPAGE= http://tools.suckless.org/ssid/
COMMENT= Simple setsid replacement
LICENSE= mit
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
# Adjust config.mk
-SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-build
-SUBST_MESSAGE.makefile= Fixing config.mk
-SUBST_FILES.makefile= config.mk
-SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
-SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
+SUBST_CLASSES+= makefile
+SUBST_STAGE.makefile= pre-build
+SUBST_MESSAGE.makefile= Fixing config.mk
+SUBST_FILES.makefile= config.mk
+SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
+SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
.include "../../mk/bsd.pkg.mk"
diff --git a/stacks/PLIST b/stacks/PLIST
index c0e8ddf05d..da2459ea72 100644
--- a/stacks/PLIST
+++ b/stacks/PLIST
@@ -22,18 +22,19 @@ bin/sort_read_pairs.pl
bin/sstacks
bin/stacks_export_notify.pl
bin/ustacks
+share/stacks/php/CatalogClass.php
+share/stacks/php/Locus.php
share/stacks/php/ajax.js
share/stacks/php/annotate.js
share/stacks/php/annotate_marker.php
-share/stacks/php/CatalogClass.php
-share/stacks/php/catalog_genotypes.php
share/stacks/php/catalog.php
+share/stacks/php/catalog_genotypes.php
share/stacks/php/constants.php.dist
share/stacks/php/correct_genotype.php
share/stacks/php/correct_genotypes.php
share/stacks/php/db_functions.php
-share/stacks/php/export_batch.php
share/stacks/php/export.js
+share/stacks/php/export_batch.php
share/stacks/php/fst_view.php
share/stacks/php/hapstat_view.php
share/stacks/php/header.php
@@ -48,16 +49,15 @@ share/stacks/php/images/stacks_bg.png
share/stacks/php/images/stacks_logo_rev_small.png
share/stacks/php/index.php
share/stacks/php/last_modified.php
-share/stacks/php/Locus.php
share/stacks/php/phist_view.php
-share/stacks/php/population_view.js
share/stacks/php/pop_view.php
+share/stacks/php/population_view.js
share/stacks/php/samples.php
share/stacks/php/sequence_blast.php
+share/stacks/php/stack_view.php
share/stacks/php/stacks.css
-share/stacks/php/stacks_functions.php
share/stacks/php/stacks.js
-share/stacks/php/stack_view.php
+share/stacks/php/stacks_functions.php
share/stacks/php/sumstat_view.php
share/stacks/php/tags.php
share/stacks/php/version.php
diff --git a/stmd-git/Makefile b/stmd-git/Makefile
index 44191af70f..1c7c852833 100644
--- a/stmd-git/Makefile
+++ b/stmd-git/Makefile
@@ -10,7 +10,7 @@ COMMENT= Standard markdown converter implementation
LICENSE= modified-bsd
GIT_REPOSITORIES= stmd
-GIT_REPO.stmd= git://github.com/jgm/stmd.git
+GIT_REPO.stmd= git://github.com/jgm/stmd.git
BUILD_DEPENDS+= re2c-[0-9]*:../../devel/re2c
diff --git a/stmpclean/Makefile b/stmpclean/Makefile
index 53cde096af..5fedf00858 100644
--- a/stmpclean/Makefile
+++ b/stmpclean/Makefile
@@ -1,16 +1,16 @@
# $NetBSD: Makefile,v 1.8 2012/11/25 23:32:31 othyro Exp $
#
-DISTNAME= stmpclean-0.3
-CATEGORIES= sysutils
-MASTER_SITES= http://shlang.com/stmpclean/
+DISTNAME= stmpclean-0.3
+CATEGORIES= sysutils
+MASTER_SITES= http://shlang.com/stmpclean/
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://shlang.com/stmpclean/
-COMMENT= Secure /tmp cleaner
+MAINTAINER= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://shlang.com/stmpclean/
+COMMENT= Secure /tmp cleaner
LICENSE= gnu-gpl-v2
-DOCDIR= ${PREFIX}/share/doc/stmpclean
+DOCDIR= ${PREFIX}/share/doc/stmpclean
INSTALLATION_DIRS= sbin ${DOCDIR} ${PKGMANDIR}/man8
diff --git a/structure/buildlink3.mk b/structure/buildlink3.mk
index 577aebf95f..574020432d 100644
--- a/structure/buildlink3.mk
+++ b/structure/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= structure
STRUCTURE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.structure+= structure>=2.3.4
-BUILDLINK_PKGSRCDIR.structure?= ../../wip/structure
+BUILDLINK_PKGSRCDIR.structure?= ../../wip/structure
.endif # STRUCTURE_BUILDLINK3_MK
BUILDLINK_TREE+= -structure
diff --git a/suitesparse/Makefile b/suitesparse/Makefile
index b6d731fede..dea434b593 100644
--- a/suitesparse/Makefile
+++ b/suitesparse/Makefile
@@ -22,9 +22,9 @@ LICENSE= gnu-gpl-v2
CFLAGS+= -O ${PTHREAD_CFLAGS} ${PICFLAG}
.if ( ${MACHINE_ARCH} == "sparc" ) || ( ${MACHINE_ARCH} == "powerpc" )
-PICFLAG?= -fPIC
+PICFLAG?= -fPIC
.else
-PICFLAG?= -fpic
+PICFLAG?= -fpic
.endif
# Platforms without librt
@@ -44,15 +44,15 @@ USE_TOOLS+= gmake gsed
USE_LANGUAGES= c c++ fortran77
-WRKSRC=${WRKDIR}/SuiteSparse
+WRKSRC= ${WRKDIR}/SuiteSparse
# Creating shared libs for all platforms is complicated. Putting this off
# for now.
# WRKSRC_SHARED=${WRKSRC}_shared
-SVERSION=1
+SVERSION= 1
.if defined (WITH_METIS)
-METIS=${PREFIX}/lib/libmetis.a
-METIS_PATH=${PREFIX}/include/metis
+METIS= ${PREFIX}/lib/libmetis.a
+METIS_PATH= ${PREFIX}/include/metis
CHOLMOD_CONFIG =
.else
CHOLMOD_CONFIG = -DNPARTITION
diff --git a/sun-j2me/Makefile b/sun-j2me/Makefile
index 41d4d08781..a24fc797f6 100644
--- a/sun-j2me/Makefile
+++ b/sun-j2me/Makefile
@@ -1,39 +1,39 @@
# $NetBSD: Makefile,v 1.6 2012/10/07 16:11:39 asau Exp $
#
-DISTNAME=j2me_wireless_toolkit-2_1_01-linux-i386
-PKGNAME=sun-j2me-2.1.1
-CATEGORIES=lang java
+DISTNAME= j2me_wireless_toolkit-2_1_01-linux-i386
+PKGNAME= sun-j2me-2.1.1
+CATEGORIES= lang java
MASTER_SITES=
-MAINTAINER=--@--.--
-HOMEPAGE=http://java.sun.com/j2me/
-COMMENT= Sun's Java(tm) 2 Micro Edition Environment
-LICENSE=jdk13-license
+MAINTAINER= --@--.--
+HOMEPAGE= http://java.sun.com/j2me/
+COMMENT= Sun's Java(tm) 2 Micro Edition Environment
+LICENSE= jdk13-license
-ARCHIVE=http://java.sun.com/products/archive/index.html
-DOWNLOAD=http://java.sun.com/products/j2mewtoolkit/download-2_1.html
-EXTRACT_SUFX=.bin
-EXTRACT_CMD=unzip ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} -d ${WRKSRC} # VERY UGLY!
+ARCHIVE= http://java.sun.com/products/archive/index.html
+DOWNLOAD= http://java.sun.com/products/j2mewtoolkit/download-2_1.html
+EXTRACT_SUFX= .bin
+EXTRACT_CMD= unzip ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} -d ${WRKSRC} # VERY UGLY!
SUPPORT_FILES=
-NO_BUILD=#
-NO_FETCH=#
-NO_CONFIGURE=#
-NO_MTREE=yes
+NO_BUILD= #
+NO_FETCH= #
+NO_CONFIGURE= #
+NO_MTREE= yes
-RESTRICTED=Redistribution of repackaged binaries not permitted
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP= ${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_FTP= ${RESTRICTED}
+RESTRICTED= Redistribution of repackaged binaries not permitted
+NO_SRC_ON_CDROM= ${RESTRICTED}
+NO_SRC_ON_FTP= ${RESTRICTED}
+NO_BIN_ON_CDROM= ${RESTRICTED}
+NO_BIN_ON_FTP= ${RESTRICTED}
-JAVA_HOME=${LOCALBASE}/java/sun-j2me/
+JAVA_HOME= ${LOCALBASE}/java/sun-j2me/
-MESSAGE_SUBST+= JAVA_HOME="${JAVA_HOME}"
+MESSAGE_SUBST+= JAVA_HOME="${JAVA_HOME}"
-INTERACTIVE_STAGE=fetch
+INTERACTIVE_STAGE= fetch
_FETCH_MESSAGE= \
${ECHO} "======================================================================"; \
@@ -50,7 +50,7 @@ _FETCH_MESSAGE= \
${ECHO} -e ${END_MESSAGE}; \
${ECHO} "======================================================================"
-ONLY_FOR_PLATFORM=Linux-*-i[3-6]86
+ONLY_FOR_PLATFORM= Linux-*-i[3-6]86
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${JAVA_HOME}/bin
diff --git a/supercat/Makefile b/supercat/Makefile
index 6fb3edc879..b69ecf111a 100644
--- a/supercat/Makefile
+++ b/supercat/Makefile
@@ -9,7 +9,7 @@ HOMEPAGE= http://supercat.nosredna.net/
COMMENT= Supercat is a text colorizer
LICENSE= gnu-gpl-v3
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-system-directory=${PREFIX}/share/supercat
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-system-directory=${PREFIX}/share/supercat
.include "../../mk/bsd.pkg.mk"
diff --git a/superchic/Makefile b/superchic/Makefile
index 55d7ddda92..ede2d784c1 100644
--- a/superchic/Makefile
+++ b/superchic/Makefile
@@ -13,10 +13,10 @@ COMMENT= Monte Carlo Event Generator for Central Exclusive Production
WRKSRC= ${WRKDIR}
-NO_BUILD= yes
+NO_BUILD= yes
USE_LANGUAGES= fortran
-INSTALLATION_DIRS= lib
+INSTALLATION_DIRS= lib
do-install:
${INSTALL_DATA} ${WRKSRC}/superchicv1.3.f ${DESTDIR}${PREFIX}/lib/
diff --git a/superlfv/Makefile b/superlfv/Makefile
index 77b97cbd51..b926a09769 100644
--- a/superlfv/Makefile
+++ b/superlfv/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.1 2014/07/27 00:10:12 jihbed Exp $
DISTNAME= superlfv-1.0-0
-PKGNAME=${DISTNAME:S/-0//}
+PKGNAME= ${DISTNAME:S/-0//}
CATEGORIES= math java
MASTER_SITES= http://www.hepforge.org/archive/superlfv/
EXTRACT_SUFX= .zip
diff --git a/suse121_libgpg-error/Makefile b/suse121_libgpg-error/Makefile
index d3ecb3427e..70fd1e2c1c 100644
--- a/suse121_libgpg-error/Makefile
+++ b/suse121_libgpg-error/Makefile
@@ -2,7 +2,7 @@
PKGNAME= suse_libgpg-error-${SUSE_VERSION}
CATEGORIES= emulators
-RPMPKGS+= libgpg-error0-1.10-2.1.2.${SUSE_ARCH}
+RPMPKGS+= libgpg-error0-1.10-2.1.2.${SUSE_ARCH}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
COMMENT= Linux compatibility package for libgpg-error
diff --git a/swarp/Makefile b/swarp/Makefile
index 5e0ffa883b..81665508e3 100644
--- a/swarp/Makefile
+++ b/swarp/Makefile
@@ -2,8 +2,8 @@
#
DISTNAME= swarp-0.1
-PKGREVISION= 1
-CATEGORIES= x11
+PKGREVISION= 1
+CATEGORIES= x11
MASTER_SITES= http://dl.suckless.org/tools/
MAINTAINER= rga%sdf.lonestar.org@localhost
@@ -11,20 +11,20 @@ HOMEPAGE= http://tools.suckless.org/swarp
COMMENT= Simple mouse pointer warping tool for X
LICENSE= mit
-NO_CONFIGURE= yes
+NO_CONFIGURE= yes
# Adjust config.mk
-SUBST_CLASSES+= makefile
-SUBST_STAGE.makefile= pre-build
-SUBST_MESSAGE.makefile= Fixing config.mk
-SUBST_FILES.makefile= config.mk
-SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
+SUBST_CLASSES+= makefile
+SUBST_STAGE.makefile= pre-build
+SUBST_MESSAGE.makefile= Fixing config.mk
+SUBST_FILES.makefile= config.mk
+SUBST_SED.makefile+= -e 's,/usr/local,${PREFIX},g'
# no manual avaiable
#SUBST_SED.makefile+= -e 's,share/man,${PKGMANDIR},g'
-SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
-SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
-SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
-SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
+SUBST_SED.makefile+= -e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.makefile+= -e 's,^CFLAGS = ,CFLAGS += ,'
+SUBST_SED.makefile+= -e 's,^LDFLAGS = ,LDFLAGS += ,'
+SUBST_SED.makefile+= -e 's/cc/${CC:Q}/'
# no manual avaiable
#INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/swisseph/buildlink3.mk b/swisseph/buildlink3.mk
index 583add7ffb..b31af6ba09 100644
--- a/swisseph/buildlink3.mk
+++ b/swisseph/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= swisseph
SWISSEPH_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.swisseph+= swisseph>=1.78.00
-BUILDLINK_PKGSRCDIR.swisseph?= ../../wip/swisseph
+BUILDLINK_PKGSRCDIR.swisseph?= ../../wip/swisseph
.endif # SWISSEPH_BUILDLINK3_MK
BUILDLINK_TREE+= -swisseph
diff --git a/sxemacs/Makefile b/sxemacs/Makefile
index 67cbe956e8..688081d9cd 100644
--- a/sxemacs/Makefile
+++ b/sxemacs/Makefile
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
CONFIGURE_ARGS+= --with-clash-detection
CONFIGURE_ARGS+= --with-mule=yes
.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --with-ncurses
+CONFIGURE_ARGS+= --with-ncurses
.elif ${OPSYS} != "Linux"
CONFIGURE_ARGS+= --with-ncurses=no
.endif
diff --git a/sxid/PLIST b/sxid/PLIST
index dcc9a14846..87ebc30468 100644
--- a/sxid/PLIST
+++ b/sxid/PLIST
@@ -2,8 +2,8 @@
bin/sxid
man/man1/sxid.1
man/man5/sxid.conf.5
-share/examples/sxid/sxid.conf
share/doc/sxid/COPYING
share/doc/sxid/ChangeLog
share/doc/sxid/NEWS
share/doc/sxid/README.md
+share/examples/sxid/sxid.conf
diff --git a/symbolic++/Makefile b/symbolic++/Makefile
index ba3e0195c1..2da75e50f9 100644
--- a/symbolic++/Makefile
+++ b/symbolic++/Makefile
@@ -13,8 +13,8 @@ LICENSE= gnu-gpl-v2
WRKSRC= ${WRKDIR}/SymbolicC++3-3.35
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+USE_LIBTOOL= yes
USE_LANGUAGES= c c++
.include "../../mk/bsd.pkg.mk"
diff --git a/symon/Makefile b/symon/Makefile
index 7dd1a5834b..33667d1332 100644
--- a/symon/Makefile
+++ b/symon/Makefile
@@ -12,8 +12,8 @@ MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
SYMON_HOME?= ${VARBASE}/db/symon
EGDIR= share/examples/symon
-CONF_FILES= ${EGDIR}/symon.conf ${PKG_SYSCONFDIR}/symon.conf
-CONF_FILES+= ${EGDIR}/symux.conf ${PKG_SYSCONFDIR}/symux.conf
+CONF_FILES= ${EGDIR}/symon.conf ${PKG_SYSCONFDIR}/symon.conf
+CONF_FILES+= ${EGDIR}/symux.conf ${PKG_SYSCONFDIR}/symux.conf
BUILD_DEFS+= VARBASE
@@ -31,20 +31,20 @@ REPLACE_PERL+= client/getsymonitem.pl
SYMON_USER?= _symon
SYMON_GROUP?= _symon
-PKG_GROUPS_VARS+= SYMON_GROUP
-PKG_USERS_VARS+= SYMON_USER
-PKG_GROUPS= ${SYMON_GROUP}
-PKG_USERS= ${SYMON_USER}:${SYMON_GROUP}
-PKG_GECOS.${SYMON_USER}= Symon pseudo-user
-PKG_HOME.${SYMON_USER}= ${SYMON_HOME}
+PKG_GROUPS_VARS+= SYMON_GROUP
+PKG_USERS_VARS+= SYMON_USER
+PKG_GROUPS= ${SYMON_GROUP}
+PKG_USERS= ${SYMON_USER}:${SYMON_GROUP}
+PKG_GECOS.${SYMON_USER}= Symon pseudo-user
+PKG_HOME.${SYMON_USER}= ${SYMON_HOME}
-SUBST_CLASSES+= paths
+SUBST_CLASSES+= paths
SUBST_MESSAGE.paths= Fixing hardcoded paths.
-SUBST_FILES.paths= symon/symon.8 symux/symux.8
+SUBST_FILES.paths= symon/symon.8 symux/symux.8
SUBST_FILES.paths+= symux/c_smrrds.sh
-SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,@PKG_PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths= post-patch
+SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+= -e 's,@PKG_PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths= post-patch
RCD_SCRIPTS= symux symon
diff --git a/sympol/Makefile b/sympol/Makefile
index 92cc2696b9..fb7f8055be 100644
--- a/sympol/Makefile
+++ b/sympol/Makefile
@@ -15,11 +15,11 @@ DEPENDS+= lrslib>=4.3:../../wip/lrslib
USE_CMAKE= yes
USE_LANGUAGES= c c++
-SUBST_CLASSES+= installman
-SUBST_STAGE.installman= pre-configure
-SUBST_SED.installman+= -e 's,share/man/man1,man/man1,g'
+SUBST_CLASSES+= installman
+SUBST_STAGE.installman= pre-configure
+SUBST_SED.installman+= -e 's,share/man/man1,man/man1,g'
SUBST_FILES.installman+= sympol/CMakeLists.txt
-SUBST_MESSAGE.paths= Fixing header search paths.
+SUBST_MESSAGE.paths= Fixing header search paths.
.include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/boost-libs/buildlink3.mk"
diff --git a/sympow/Makefile b/sympow/Makefile
index bd6eba9d2b..a232cf4aba 100644
--- a/sympow/Makefile
+++ b/sympow/Makefile
@@ -11,9 +11,9 @@ HOMEPAGE= http://www.maths.bris.ac.uk/~mamjw/
COMMENT= Special values of symmetric power elliptic curve L-functions
#LICENSE= # TODO: (see mk/license.mk)
-WRKSRC= ${WRKDIR}/sympow-1.019
+WRKSRC= ${WRKDIR}/sympow-1.019
USE_TOOLS+= pax
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++
SYMPOW_DIRECTORY= ${PREFIX}/lib/sympow
DOCDIR= ${PREFIX}/share/doc/sympow
diff --git a/syn68k/Makefile b/syn68k/Makefile
index 6c9685197a..d760ffd2e9 100644
--- a/syn68k/Makefile
+++ b/syn68k/Makefile
@@ -12,19 +12,19 @@ COMMENT= ARDI's 68LC040 CPU emulator
LICENSE= mit
FETCH_BEFORE_ARGS= --no-check-certificate
-USE_TOOLS+= autoconf automake bash gmake perl
-REPLACE_BASH= test/testall.sh
-REPLACE_SH= configure
-REPLACE_PERL= runtime/fold.pl runtime/i486-cleanup.pl \
- runtime/i486-optimize.pl runtime/sched.pl \
- runtime/x86_recog.pl test/maketestbattery.pl
-GNU_CONFIGURE= yes
+USE_TOOLS+= autoconf automake bash gmake perl
+REPLACE_BASH= test/testall.sh
+REPLACE_SH= configure
+REPLACE_PERL= runtime/fold.pl runtime/i486-cleanup.pl \
+ runtime/i486-optimize.pl runtime/sched.pl \
+ runtime/x86_recog.pl test/maketestbattery.pl
+GNU_CONFIGURE= yes
-SUBST_CLASSES+= replace_bash_early
-SUBST_STAGE.replace_bash_early= pre-configure
+SUBST_CLASSES+= replace_bash_early
+SUBST_STAGE.replace_bash_early= pre-configure
SUBST_MESSAGE.replace_bash_early= Fixing bash path.
-SUBST_FILES.replace_bash_early= autogen.sh
-SUBST_SED.replace_bash_early= -e 's,/bin/bash,${TOOLS_PATH.bash},g'
+SUBST_FILES.replace_bash_early= autogen.sh
+SUBST_SED.replace_bash_early= -e 's,/bin/bash,${TOOLS_PATH.bash},g'
pre-configure:
cd ${WRKSRC} && ./autogen.sh
diff --git a/synce-orange/buildlink3.mk b/synce-orange/buildlink3.mk
index 4d4264ce60..81f6708035 100644
--- a/synce-orange/buildlink3.mk
+++ b/synce-orange/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= orange
ORANGE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.orange+= orange>=0.3
-BUILDLINK_PKGSRCDIR.orange?= ../../wip/synce-orange
+BUILDLINK_PKGSRCDIR.orange?= ../../wip/synce-orange
.include "../../archivers/unshield/buildlink3.mk"
.include "../../comms/synce-libsynce/buildlink3.mk"
diff --git a/syncthing-discosrv/Makefile b/syncthing-discosrv/Makefile
index b01fbc1706..efa805de5e 100644
--- a/syncthing-discosrv/Makefile
+++ b/syncthing-discosrv/Makefile
@@ -15,27 +15,27 @@ LICENSE= mit
EXTRACT_USING= bsdtar
BUILD_DEPENDS+= go-[0-9]*:../../lang/go
NO_CONFIGURE= yes
-USE_LANGUAGES= c # and go
+USE_LANGUAGES= c # and go
INSTALLATION_DIRS= bin
-BUILD_DEFS+= VARBASE
-STDISCO_USER?= stdisco
-STDISCO_GROUP?= stdisco
-PKG_USERS_VARS= STDISCO_USER
-PKG_GROUPS_VARS= STDISCO_GROUP
-PKG_USERS= ${STDISCO_USER}:${STDISCO_GROUP}
-PKG_GROUPS= ${STDISCO_GROUP}
-PKG_GECOS.${STDISCO_USER}= syncthing-discosrv
-PKG_HOME.${STDISCO_USER}= ${VARBASE}/chroot/stdisco
-OWN_DIRS_PERMS= ${PKG_HOME.${STDISCO_USER}} ${STDISCO_USER} ${STDISCO_GROUP} 0700
-
-USE_TOOLS+= pax
-FILES_SUBST+= INSTALL=${INSTALL}
-FILES_SUBST+= PAX=${PAX}
-FILES_SUBST+= PKG_HOME=${PKG_HOME.${STDISCO_USER}}
-FILES_SUBST+= STDISCO_GROUP=${STDISCO_GROUP}
-FILES_SUBST+= STDISCO_USER=${STDISCO_USER}
-RCD_SCRIPTS= stdisco
+BUILD_DEFS+= VARBASE
+STDISCO_USER?= stdisco
+STDISCO_GROUP?= stdisco
+PKG_USERS_VARS= STDISCO_USER
+PKG_GROUPS_VARS= STDISCO_GROUP
+PKG_USERS= ${STDISCO_USER}:${STDISCO_GROUP}
+PKG_GROUPS= ${STDISCO_GROUP}
+PKG_GECOS.${STDISCO_USER}= syncthing-discosrv
+PKG_HOME.${STDISCO_USER}= ${VARBASE}/chroot/stdisco
+OWN_DIRS_PERMS= ${PKG_HOME.${STDISCO_USER}} ${STDISCO_USER} ${STDISCO_GROUP} 0700
+
+USE_TOOLS+= pax
+FILES_SUBST+= INSTALL=${INSTALL}
+FILES_SUBST+= PAX=${PAX}
+FILES_SUBST+= PKG_HOME=${PKG_HOME.${STDISCO_USER}}
+FILES_SUBST+= STDISCO_GROUP=${STDISCO_GROUP}
+FILES_SUBST+= STDISCO_USER=${STDISCO_USER}
+RCD_SCRIPTS= stdisco
MAKE_ENV+= GOPATH=${WRKSRC}
diff --git a/synfig/Makefile b/synfig/Makefile
index a850d21176..3d19c7729a 100644
--- a/synfig/Makefile
+++ b/synfig/Makefile
@@ -11,7 +11,7 @@ COMMENT= Vector-based 2D animation renderer
LICENSE= gnu-gpl-v3
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/synfigstudio/Makefile b/synfigstudio/Makefile
index f93abda079..e5ec0249a2 100644
--- a/synfigstudio/Makefile
+++ b/synfigstudio/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake
GCONF_SCHEMAS+= synfigstudio-thumbnailer.schemas
post-install:
Home |
Main Index |
Thread Index |
Old Index