pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/*: remove :Q modifier from safe variables
Module Name: pkgsrc-wip
Committed By: Roland Illig <roland.illig%gmx.de@localhost>
Pushed By: rillig
Date: Sun Jan 28 20:38:32 2018 +0000
Changeset: 87e7bb622ad23996e1de3f6dfe65b6a33c6a016c
Modified Files:
389-ds-base/Makefile
MesaLib-dfbsd/builtin.mk
MesaLib/builtin.mk
Pythonol/Makefile
ReZound/Makefile
WEPCrack/Makefile
adamem/Makefile
aols-openssl/Makefile
aols-postgres/Makefile
aolserver/Makefile
aolserver4/Makefile
ap2-auth-imap/Makefile
apel-git/Makefile
arla-3.99.14/Makefile
audio-mml/Makefile
auto-complete-git/Makefile
auto-complete-mode/Makefile
avr-libc/Makefile
axel/Makefile
boa/Makefile
bonnie++-current/Makefile
briquolo/Makefile
brltty/Makefile
bsdbuild/Makefile
bss/Makefile
c-news/Makefile
c-news/Makefile.common
c2hs/Makefile
chbg/Makefile
clamassassin/Makefile
clfswm/Makefile
cross-binutils/Makefile
cygwin/Makefile.common
daphne/Makefile
darcs/Makefile
davical-git/Makefile
dbus-dfbsd/Makefile
dhcpd-snmp/Makefile
dnrd/Makefile
dragbox-git/Makefile
e17/Makefile
e2fsprogs/Makefile
elinks-libmm/options.mk
elinks-snapshot/options.mk
emacs-nox11-git/Makefile
emirror/Makefile
fasta/Makefile
fbida/Makefile
fbpanel/Makefile
freecad/Makefile
freedup/Makefile
freedup16/Makefile
fvwm265/Makefile
g21k-binutils/Makefile
gauche-pib/Makefile
gcc42/Makefile
gcc43/Makefile
gcc44/Makefile
gcc45/Makefile
gcc46/Makefile
gcc47/options.mk
gcc6snapshot/options.mk
ghc/Makefile
ghc/bootstrap.mk
gitlab/Makefile
glkgit/Makefile
glulxe/Makefile
gnome-applets/Makefile
gnunet/Makefile
gnunet/options.mk
go/version.mk
gsm/Makefile
gsview/Makefile
haddock/Makefile
haskell-mode/Makefile
hpoj/Makefile
hs-HsSVN/Makefile
hs-terminfo/Makefile
html2latex/Makefile
inetdxtra/Makefile
ipfm/Makefile
java-jbluez/Makefile
jedit/Makefile
jupp/Makefile
jython/Makefile
l2tpd/Makefile
lde/Makefile
leo/Makefile
libgda4/Makefile.common
libgda4/options.mk
libmpg123/Makefile
libmusclecard/Makefile
libneural/Makefile
libtermkey/Makefile
libunibilium/Makefile
libvterm/Makefile
linux-kbd/Makefile
linux-kernel-headers/Makefile
linux-modutils-old/Makefile
linux-modutils/Makefile
linux24-kernel-headers/Makefile
ltrace/Makefile
lzs-lkm/Makefile
man-db/Makefile
man/Makefile
marsyas/Makefile
marsyas/options.mk
meep-openmpi/Makefile
meep/Makefile
mic-paren/Makefile
milter-greylist-devel/options.mk
modular-xorg-server-dfbsd/Makefile.common
mono-git/Makefile
mono-git/buildlink3.mk
mono/Makefile
mono/buildlink3.mk
mpc-el/Makefile
mpg123-svn/Makefile
mplayer-mt/Makefile.common
mplayer-snapshot-share/Makefile.common
mppdec/Makefile
multitail/Makefile
mxallowd/Makefile
mysql++/Makefile
mysqltcl/Makefile
nag/Makefile
nautilus/Makefile
ncbi-bin/Makefile
ncbi-lib/Makefile
netbsd-light-desktop-artwork/Makefile
netbsd-light-desktop-default-settings/Makefile
netkit-base/Makefile
netkit-routed/Makefile
netkit-telnet/Makefile
nqp/Makefile
nspr-hg/Makefile
opal/Makefile
openca/Makefile
opendchub/Makefile
openh264/Makefile
openlogos/Makefile
opensc/Makefile
openscep/Makefile
openssh/Makefile
openssh/options.mk
openssl110/builtin.mk
pal/Makefile
pike-Gettext/Makefile
pkg_fake/Makefile
ppr/Makefile
procps/Makefile
psh/Makefile
pulseaudio-git/Makefile
pwnat/Makefile
py-Brenda/Makefile
py-EMpy/Makefile
py-SQLObject/Makefile
py-grpy/Makefile
py-jabber-aimt/Makefile
py-jabber-yahoo-transport/Makefile
py-remctl/Makefile
qmpdclient/Makefile
qrupdate/Makefile
qt5-qtbase-git/Makefile
quickfix/Makefile
rakudo-star/Makefile
rakudo/Makefile
rc.subr/Makefile
remctl/Makefile
rpki-git/Makefile
sbcl-git/Makefile
scare/Makefile
scilab/Makefile
sendmailX/Makefile
siproxd/Makefile
spamassassin-cvs/Makefile
sxemacs/Makefile
symon/Makefile
sysklogd/Makefile
sysstat/Makefile
sysvinit/Makefile
tc-git/Makefile
tcc-git/Makefile
tcc/Makefile
tcl-iwidgets/Makefile
tcptunnel/Makefile
tcpxtract/Makefile
tktile/Makefile
torcs/Makefile
tsm/Makefile
tsm62/Makefile
tuxpaint-cvs/Makefile
umix/Makefile
undo-tree/Makefile
unnethack/Makefile
unnethack/options.mk
util-linux/Makefile
vmsbackup/Makefile
workrave/Makefile
xalan-c-1.10/Makefile
xalan-c/Makefile
xbnbt/Makefile
xinetd/Makefile
xmail/Makefile
xmms2/Makefile
xoo/Makefile
xrdp/Makefile
ypbind-mt/Makefile
ypserv/Makefile
zapping/Makefile
Log Message:
wip/*: remove :Q modifier from safe variables
pkglint -Wall -F --only ":Q" -r
Cleaned up by pkglint b3814c4cee, which only fixes builtin variables,
leaving package-defined variables untouched since these might contain
spaces or other special characters. Unlikely, but who knows.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=87e7bb622ad23996e1de3f6dfe65b6a33c6a016c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
389-ds-base/Makefile | 2 +-
MesaLib-dfbsd/builtin.mk | 2 +-
MesaLib/builtin.mk | 2 +-
Pythonol/Makefile | 4 +-
ReZound/Makefile | 2 +-
WEPCrack/Makefile | 4 +-
adamem/Makefile | 18 ++++-----
aols-openssl/Makefile | 4 +-
aols-postgres/Makefile | 2 +-
aolserver/Makefile | 2 +-
aolserver4/Makefile | 2 +-
ap2-auth-imap/Makefile | 6 +--
apel-git/Makefile | 6 +--
arla-3.99.14/Makefile | 6 +--
audio-mml/Makefile | 2 +-
auto-complete-git/Makefile | 4 +-
auto-complete-mode/Makefile | 4 +-
avr-libc/Makefile | 2 +-
axel/Makefile | 10 ++---
boa/Makefile | 2 +-
bonnie++-current/Makefile | 2 +-
briquolo/Makefile | 4 +-
brltty/Makefile | 2 +-
bsdbuild/Makefile | 4 +-
bss/Makefile | 16 ++++----
c-news/Makefile | 54 +++++++++++++-------------
c-news/Makefile.common | 2 +-
c2hs/Makefile | 16 ++++----
chbg/Makefile | 2 +-
clamassassin/Makefile | 2 +-
clfswm/Makefile | 2 +-
cross-binutils/Makefile | 2 +-
cygwin/Makefile.common | 4 +-
daphne/Makefile | 38 +++++++++---------
darcs/Makefile | 4 +-
davical-git/Makefile | 2 +-
dbus-dfbsd/Makefile | 4 +-
dhcpd-snmp/Makefile | 2 +-
dnrd/Makefile | 2 +-
dragbox-git/Makefile | 2 +-
e17/Makefile | 2 +-
e2fsprogs/Makefile | 4 +-
elinks-libmm/options.mk | 2 +-
elinks-snapshot/options.mk | 2 +-
emacs-nox11-git/Makefile | 8 ++--
emirror/Makefile | 2 +-
fasta/Makefile | 22 +++++------
fbida/Makefile | 2 +-
fbpanel/Makefile | 4 +-
freecad/Makefile | 2 +-
freedup/Makefile | 4 +-
freedup16/Makefile | 4 +-
fvwm265/Makefile | 30 +++++++-------
g21k-binutils/Makefile | 2 +-
gauche-pib/Makefile | 2 +-
gcc42/Makefile | 8 ++--
gcc43/Makefile | 6 +--
gcc44/Makefile | 2 +-
gcc45/Makefile | 2 +-
gcc46/Makefile | 2 +-
gcc47/options.mk | 10 ++---
gcc6snapshot/options.mk | 10 ++---
ghc/Makefile | 28 ++++++-------
ghc/bootstrap.mk | 30 +++++++-------
gitlab/Makefile | 4 +-
glkgit/Makefile | 2 +-
glulxe/Makefile | 2 +-
gnome-applets/Makefile | 2 +-
gnunet/Makefile | 2 +-
gnunet/options.mk | 4 +-
go/version.mk | 2 +-
gsm/Makefile | 4 +-
gsview/Makefile | 2 +-
haddock/Makefile | 12 +++---
haskell-mode/Makefile | 2 +-
hpoj/Makefile | 8 ++--
hs-HsSVN/Makefile | 2 +-
hs-terminfo/Makefile | 4 +-
html2latex/Makefile | 4 +-
inetdxtra/Makefile | 2 +-
ipfm/Makefile | 4 +-
java-jbluez/Makefile | 2 +-
jedit/Makefile | 2 +-
jupp/Makefile | 2 +-
jython/Makefile | 2 +-
l2tpd/Makefile | 22 +++++------
lde/Makefile | 2 +-
leo/Makefile | 24 ++++++------
libgda4/Makefile.common | 2 +-
libgda4/options.mk | 2 +-
libmpg123/Makefile | 4 +-
libmusclecard/Makefile | 2 +-
libneural/Makefile | 2 +-
libtermkey/Makefile | 2 +-
libunibilium/Makefile | 2 +-
libvterm/Makefile | 2 +-
linux-kbd/Makefile | 2 +-
linux-kernel-headers/Makefile | 18 ++++-----
linux-modutils-old/Makefile | 2 +-
linux-modutils/Makefile | 2 +-
linux24-kernel-headers/Makefile | 16 ++++----
ltrace/Makefile | 2 +-
lzs-lkm/Makefile | 6 +--
man-db/Makefile | 4 +-
man/Makefile | 2 +-
marsyas/Makefile | 2 +-
marsyas/options.mk | 4 +-
meep-openmpi/Makefile | 2 +-
meep/Makefile | 2 +-
mic-paren/Makefile | 2 +-
milter-greylist-devel/options.mk | 10 ++---
modular-xorg-server-dfbsd/Makefile.common | 4 +-
mono-git/Makefile | 4 +-
mono-git/buildlink3.mk | 2 +-
mono/Makefile | 4 +-
mono/buildlink3.mk | 2 +-
mpc-el/Makefile | 2 +-
mpg123-svn/Makefile | 4 +-
mplayer-mt/Makefile.common | 4 +-
mplayer-snapshot-share/Makefile.common | 4 +-
mppdec/Makefile | 2 +-
multitail/Makefile | 16 ++++----
mxallowd/Makefile | 2 +-
mysql++/Makefile | 2 +-
mysqltcl/Makefile | 2 +-
nag/Makefile | 2 +-
nautilus/Makefile | 2 +-
ncbi-bin/Makefile | 2 +-
ncbi-lib/Makefile | 2 +-
netbsd-light-desktop-artwork/Makefile | 2 +-
netbsd-light-desktop-default-settings/Makefile | 4 +-
netkit-base/Makefile | 2 +-
netkit-routed/Makefile | 2 +-
netkit-telnet/Makefile | 2 +-
nqp/Makefile | 2 +-
nspr-hg/Makefile | 2 +-
opal/Makefile | 2 +-
openca/Makefile | 10 ++---
opendchub/Makefile | 14 +++----
openh264/Makefile | 4 +-
openlogos/Makefile | 2 +-
opensc/Makefile | 4 +-
openscep/Makefile | 4 +-
openssh/Makefile | 4 +-
openssh/options.mk | 2 +-
openssl110/builtin.mk | 2 +-
pal/Makefile | 6 +--
pike-Gettext/Makefile | 2 +-
pkg_fake/Makefile | 12 +++---
ppr/Makefile | 4 +-
procps/Makefile | 2 +-
psh/Makefile | 2 +-
pulseaudio-git/Makefile | 4 +-
pwnat/Makefile | 14 +++----
py-Brenda/Makefile | 2 +-
py-EMpy/Makefile | 2 +-
py-SQLObject/Makefile | 2 +-
py-grpy/Makefile | 2 +-
py-jabber-aimt/Makefile | 2 +-
py-jabber-yahoo-transport/Makefile | 2 +-
py-remctl/Makefile | 2 +-
qmpdclient/Makefile | 2 +-
qrupdate/Makefile | 2 +-
qt5-qtbase-git/Makefile | 2 +-
quickfix/Makefile | 2 +-
rakudo-star/Makefile | 2 +-
rakudo/Makefile | 2 +-
rc.subr/Makefile | 2 +-
remctl/Makefile | 2 +-
rpki-git/Makefile | 2 +-
sbcl-git/Makefile | 2 +-
scare/Makefile | 2 +-
scilab/Makefile | 12 +++---
sendmailX/Makefile | 4 +-
siproxd/Makefile | 2 +-
spamassassin-cvs/Makefile | 2 +-
sxemacs/Makefile | 6 +--
symon/Makefile | 4 +-
sysklogd/Makefile | 6 +--
sysstat/Makefile | 2 +-
sysvinit/Makefile | 4 +-
tc-git/Makefile | 4 +-
tcc-git/Makefile | 2 +-
tcc/Makefile | 2 +-
tcl-iwidgets/Makefile | 2 +-
tcptunnel/Makefile | 2 +-
tcpxtract/Makefile | 2 +-
tktile/Makefile | 4 +-
torcs/Makefile | 4 +-
tsm/Makefile | 6 +--
tsm62/Makefile | 6 +--
tuxpaint-cvs/Makefile | 2 +-
umix/Makefile | 2 +-
undo-tree/Makefile | 2 +-
unnethack/Makefile | 2 +-
unnethack/options.mk | 2 +-
util-linux/Makefile | 10 ++---
vmsbackup/Makefile | 2 +-
workrave/Makefile | 2 +-
xalan-c-1.10/Makefile | 2 +-
xalan-c/Makefile | 2 +-
xbnbt/Makefile | 6 +--
xinetd/Makefile | 4 +-
xmail/Makefile | 2 +-
xmms2/Makefile | 2 +-
xoo/Makefile | 2 +-
xrdp/Makefile | 2 +-
ypbind-mt/Makefile | 2 +-
ypserv/Makefile | 2 +-
zapping/Makefile | 4 +-
210 files changed, 496 insertions(+), 496 deletions(-)
diffs:
diff --git a/389-ds-base/Makefile b/389-ds-base/Makefile
index 331ee3899a..0edc26a911 100644
--- a/389-ds-base/Makefile
+++ b/389-ds-base/Makefile
@@ -21,7 +21,7 @@ DEPENDS+= p5-mozldap-[0-9]*:../../wip/p5-mozldap
CONFIGURE_ARGS+= --with-netsnmp=${PREFIX}
CONFIGURE_ARGS+= --with-db=${PREFIX}
CONFIGURE_ARGS+= --with-sasl=${PREFIX}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CPPFLAGS+= -I${BUILDLINK_DIR}/include/nspr
CFLAGS+= -I${BUILDLINK_DIR}/include/nspr
CPPFLAGS+= -I${BUILDLINK_DIR}/include/nss/nss
diff --git a/MesaLib-dfbsd/builtin.mk b/MesaLib-dfbsd/builtin.mk
index bb1a190768..124987bc4d 100644
--- a/MesaLib-dfbsd/builtin.mk
+++ b/MesaLib-dfbsd/builtin.mk
@@ -57,7 +57,7 @@ USE_BUILTIN.MesaLib= yes
. for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
USE_BUILTIN.MesaLib!= \
- if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
+ if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib}; then \
${ECHO} yes; \
else \
${ECHO} no; \
diff --git a/MesaLib/builtin.mk b/MesaLib/builtin.mk
index bb1a190768..124987bc4d 100644
--- a/MesaLib/builtin.mk
+++ b/MesaLib/builtin.mk
@@ -57,7 +57,7 @@ USE_BUILTIN.MesaLib= yes
. for dep in ${BUILDLINK_API_DEPENDS.MesaLib}
. if !empty(USE_BUILTIN.MesaLib:M[yY][eE][sS])
USE_BUILTIN.MesaLib!= \
- if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib:Q}; then \
+ if ${PKG_ADMIN} pmatch ${dep:Q} ${BUILTIN_PKG.MesaLib}; then \
${ECHO} yes; \
else \
${ECHO} no; \
diff --git a/Pythonol/Makefile b/Pythonol/Makefile
index b7eae7319d..86ff506cfa 100644
--- a/Pythonol/Makefile
+++ b/Pythonol/Makefile
@@ -23,8 +23,8 @@ SCRIPTNAME= ${PREFIX}/bin/pythonol
USE_TOOLS+= printf pax
do-build:
- ${RM} -r ${WRKSRC:Q}/sqlite
- ${PYTHONBIN} ${WRKSRC:Q}/dictionary/makedb.py
+ ${RM} -r ${WRKSRC}/sqlite
+ ${PYTHONBIN} ${WRKSRC}/dictionary/makedb.py
do-install:
${INSTALL_DATA_DIR} ${TARGET_DIR}
diff --git a/ReZound/Makefile b/ReZound/Makefile
index 1d48c760eb..82e310d234 100644
--- a/ReZound/Makefile
+++ b/ReZound/Makefile
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-jack
CONFIGURE_ARGS+= --enable-oss
CONFIGURE_ARGS+= --enable-portaudio
-CPPFLAGS+= -DDEVOSSSOUND=\"${DEVOSSSOUND:Q}\"
+CPPFLAGS+= -DDEVOSSSOUND=\"${DEVOSSSOUND}\"
#LDFLAGS+= -lcompat
USE_TOOLS+= flex gmake bison pkg-config
USE_LANGUAGES= c c++
diff --git a/WEPCrack/Makefile b/WEPCrack/Makefile
index f29b7690cf..ac882ac4b7 100644
--- a/WEPCrack/Makefile
+++ b/WEPCrack/Makefile
@@ -19,8 +19,8 @@ INSTALLATION_DIRS+= bin
do-install:
set -e; \
- cd ${WRKSRC:Q} && for f in *.pl; do \
- ${INSTALL_SCRIPT} "./$$f" ${DESTDIR}${PREFIX:Q}/bin/; \
+ cd ${WRKSRC} && for f in *.pl; do \
+ ${INSTALL_SCRIPT} "./$$f" ${DESTDIR}${PREFIX}/bin/; \
done
.include "../../mk/bsd.pkg.mk"
diff --git a/adamem/Makefile b/adamem/Makefile
index 2da92661bf..ad78361fcd 100644
--- a/adamem/Makefile
+++ b/adamem/Makefile
@@ -33,21 +33,21 @@ CPPFLAGS+= -DLSB_FIRST
.endif
post-extract:
- ${CP} ${FILESDIR:Q}/adam ${WRKSRC:Q}/
+ ${CP} ${FILESDIR}/adam ${WRKSRC}/
do-install:
.for f in adamem cvem z80dasm snapedit
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/${f:Q} ${DESTDIR}${PREFIX:Q}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/bin
.endfor
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/adamem
- ${INSTALL_DATA} ${WRKSRC:Q}/adamem.txt ${DESTDIR}${PREFIX:Q}/share/adamem
- ${INSTALL_DATA} ${WRKSRC:Q}/adamem.snd ${DESTDIR}${PREFIX:Q}/share/adamem
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/adamem
+ ${INSTALL_DATA} ${WRKSRC}/adamem.txt ${DESTDIR}${PREFIX}/share/adamem
+ ${INSTALL_DATA} ${WRKSRC}/adamem.snd ${DESTDIR}${PREFIX}/share/adamem
.for f in OS7 EOS WP
- ${INSTALL_DATA} ${WRKSRC:Q}/${f:Q}.rom ${DESTDIR}${PREFIX:Q}/share/adamem
+ ${INSTALL_DATA} ${WRKSRC}/${f:Q}.rom ${DESTDIR}${PREFIX}/share/adamem
.endfor
- ${INSTALL_SCRIPT} ${WRKSRC:Q}/adam ${DESTDIR}${PREFIX:Q}/bin/adam
- ${RM} -f ${DESTDIR}${PREFIX:Q}/bin/coleco
- ${LN} -s adam ${DESTDIR}${PREFIX:Q}/bin/coleco
+ ${INSTALL_SCRIPT} ${WRKSRC}/adam ${DESTDIR}${PREFIX}/bin/adam
+ ${RM} -f ${DESTDIR}${PREFIX}/bin/coleco
+ ${LN} -s adam ${DESTDIR}${PREFIX}/bin/coleco
.include "../../devel/allegro/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/aols-openssl/Makefile b/aols-openssl/Makefile
index 4036e1587d..7d49e2df53 100644
--- a/aols-openssl/Makefile
+++ b/aols-openssl/Makefile
@@ -14,8 +14,8 @@ COMMENT= OpenSSL module for aolserver
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
-MAKE_FLAGS+= INST=/${PREFIX:Q}/include/nsd \
- OPENSSL=${PREFIX:Q} \
+MAKE_FLAGS+= INST=/${PREFIX}/include/nsd \
+ OPENSSL=${PREFIX} \
TCL_CC=gcc
CFLAGS+= -I/usr/pkg/include/nsd/include
diff --git a/aols-postgres/Makefile b/aols-postgres/Makefile
index 153ec73856..8afb1d7621 100644
--- a/aols-postgres/Makefile
+++ b/aols-postgres/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.aolserver.com/
COMMENT= Postgres database access module for aolserver
-MAKE_FLAGS+= POSTGRES=${PREFIX:Q} INST=/${PREFIX:Q}/include/nsd \
+MAKE_FLAGS+= POSTGRES=${PREFIX} INST=/${PREFIX}/include/nsd \
TCL_CC=gcc
CFLAGS+= -I/usr/pkg/include/nsd/include
diff --git a/aolserver/Makefile b/aolserver/Makefile
index 42c7bb269e..a8b1ff217e 100644
--- a/aolserver/Makefile
+++ b/aolserver/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.aolserver.com/
COMMENT= America Online's open source web server
-MAKE_FLAGS+= NSHOME=${WRKSRC:Q}
+MAKE_FLAGS+= NSHOME=${WRKSRC}
CONFIGURE_ARGS+= --with-tcl=${LOCALBASE}/lib
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/aolserver4/Makefile b/aolserver4/Makefile
index 45a6a79e28..98fdbaed06 100644
--- a/aolserver4/Makefile
+++ b/aolserver4/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.aolserver.com/
COMMENT= America Online's open source web server
-MAKE_FLAGS+= NSHOME=${WRKSRC:Q}
+MAKE_FLAGS+= NSHOME=${WRKSRC}
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/ap2-auth-imap/Makefile b/ap2-auth-imap/Makefile
index b603d6e988..ff27b559dd 100644
--- a/ap2-auth-imap/Makefile
+++ b/ap2-auth-imap/Makefile
@@ -24,9 +24,9 @@ do-install:
cd ${WRKSRC} && ${APXS} -n ${APACHE_MODULE_NAME} -i mod_auth_imap.la
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/examples/ap2-auth-imap
- ${INSTALL_DATA} ${WRKSRC:Q}/examples/htaccess-example ${PREFIX:Q}/share/examples/ap2-auth-imap
- ${INSTALL_DATA} ${WRKSRC:Q}/examples/httpd.conf-append-example ${PREFIX:Q}/share/examples/ap2-auth-imap
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ap2-auth-imap
+ ${INSTALL_DATA} ${WRKSRC}/examples/htaccess-example ${PREFIX}/share/examples/ap2-auth-imap
+ ${INSTALL_DATA} ${WRKSRC}/examples/httpd.conf-append-example ${PREFIX}/share/examples/ap2-auth-imap
.include "../../mk/apache.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/apel-git/Makefile b/apel-git/Makefile
index 6e2fb2a4a7..3d0813ffe6 100644
--- a/apel-git/Makefile
+++ b/apel-git/Makefile
@@ -30,9 +30,9 @@ INSTALLATION_DIRS+= ${DOCDIR} \
PLIST_SRC= ${PKGDIR}/PLIST.${EMACS_FLAVOR}
BUILD_TARGET= ${BUILD_TARGET.${EMACS_FLAVOR}}
INSTALL_TARGET= ${INSTALL_TARGET.${EMACS_FLAVOR}}
-MAKE_FLAGS+= EMACS=${EMACS_FLAVOR:Q}
-MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX:Q}
-MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX:Q}
+MAKE_FLAGS+= EMACS=${EMACS_FLAVOR}
+MAKE_FLAGS+= LISPDIR=${EMACS_LISPPREFIX}
+MAKE_FLAGS+= VERSION_SPECIFIC_LISPDIR=${EMACS_LISPPREFIX}
MAKE_FLAGS+= ${MAKE_FLAGS.${EMACS_FLAVOR}}
# apel is included in xemacs-packages
diff --git a/arla-3.99.14/Makefile b/arla-3.99.14/Makefile
index 066e2aade6..3bee554d76 100644
--- a/arla-3.99.14/Makefile
+++ b/arla-3.99.14/Makefile
@@ -32,7 +32,7 @@ PKG_FAIL_REASON+= "${PKGNAME} requires kernel sources available under \$$BSDSRCD
. endif
.endif
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-arlacachedir=${ARLA_CACHE:Q}
CONFIGURE_ARGS+= --enable-shared=no
@@ -50,8 +50,8 @@ SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
SUBST_STAGE.paths= post-patch
INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS}
-INSTALL_MAKE_FLAGS+= lkmdir=${PREFIX:Q}/lkm
-INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS+= lkmdir=${PREFIX}/lkm
+INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
EGDIR= ${PREFIX}/share/examples/arla
EGFILES= CellServDB DynRootDB SuidCells ThisCell arla.conf
diff --git a/audio-mml/Makefile b/audio-mml/Makefile
index c576d41ab3..095b2665d9 100644
--- a/audio-mml/Makefile
+++ b/audio-mml/Makefile
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= tclsh wish # XXX verify
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
-MAKE_ENV+= EGDIR=${EGDIR:Q}
+MAKE_ENV+= EGDIR=${EGDIR}
CONFIGURE_ARGS+= --with-x
CONFIGURE_ARGS+= --with-tcltk=${WISH}
diff --git a/auto-complete-git/Makefile b/auto-complete-git/Makefile
index d67e3c2cfe..a7e627d510 100644
--- a/auto-complete-git/Makefile
+++ b/auto-complete-git/Makefile
@@ -18,8 +18,8 @@ GIT_REPO.auto-complete= git://github.com/auto-complete/auto-complete.git
WRKSRC= ${WRKDIR}/auto-complete
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
-MESSAGE_SUBST+= PKGBASE=${PKGBASE:Q}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
+MESSAGE_SUBST+= PKGBASE=${PKGBASE}
INSTALLATION_DIRS= ${EMACS_LISPPREFIX}/${PKGBASE}
INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/${PKGBASE}/ac-dict
INSTALLATION_DIRS+= share/doc/auto-complete
diff --git a/auto-complete-mode/Makefile b/auto-complete-mode/Makefile
index 2d9ec7c65d..e9446d0e17 100644
--- a/auto-complete-mode/Makefile
+++ b/auto-complete-mode/Makefile
@@ -11,8 +11,8 @@ HOMEPAGE= http://cx4a.org/software/auto-complete/index.html
COMMENT= The most intelligent auto-completion extension for GNU Emacs
LICENSE= gnu-gpl-v3
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
-MESSAGE_SUBST+= PKGBASE=${PKGBASE:Q}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
+MESSAGE_SUBST+= PKGBASE=${PKGBASE}
INSTALLATION_DIRS= ${EMACS_LISPPREFIX}/${PKGBASE}
INSTALLATION_DIRS+= ${EMACS_LISPPREFIX}/${PKGBASE}/ac-dict
diff --git a/avr-libc/Makefile b/avr-libc/Makefile
index f4ee383639..641dfcc021 100644
--- a/avr-libc/Makefile
+++ b/avr-libc/Makefile
@@ -32,7 +32,7 @@ USE_TOOLS+= gmake perl
GNU_CONFIGURE= yes
USE_GNU_CONFIGURE_HOST= no
-CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM}
CONFIGURE_ARGS+= --host=avr
CONFIGURE_ARGS+= --enable-doc
CONFIGURE_ARGS+= --disable-versioned-doc
diff --git a/axel/Makefile b/axel/Makefile
index c26455deec..594707344c 100644
--- a/axel/Makefile
+++ b/axel/Makefile
@@ -11,16 +11,16 @@ COMMENT= HTTP/FTP download accelerator
HAS_CONFIGURE= yes
USE_TOOLS+= gmake
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
INSTALLATION_DIRS= bin etc ${PKGMANDIR}/man1
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
CONF_FILES= ${EGDIR}/axelrc.example ${PKG_SYSCONFDIR}/axelrc
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/axel ${DESTDIR:Q}${PREFIX:Q}/bin/
- ${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC:Q}/axelrc.example ${DESTDIR:Q}${EGDIR}
- ${INSTALL_MAN} ${WRKSRC:Q}/axel.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/
+ ${INSTALL_PROGRAM} ${WRKSRC}/axel ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/axelrc.example ${DESTDIR}${EGDIR}
+ ${INSTALL_MAN} ${WRKSRC}/axel.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
.include "../../mk/bsd.pkg.mk"
diff --git a/boa/Makefile b/boa/Makefile
index 4b9a2a8aae..d14ce0110b 100644
--- a/boa/Makefile
+++ b/boa/Makefile
@@ -11,7 +11,7 @@ COMMENT= Small HTTP server
LICENSE= gnu-gpl-v2
PKG_SYSCONFSUBDIR= boa
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --disable-debug
EGDIR= ${PREFIX}/share/examples/boa
GNU_CONFIGURE= YES
diff --git a/bonnie++-current/Makefile b/bonnie++-current/Makefile
index 0fe0e73cb2..5e68c8abb4 100644
--- a/bonnie++-current/Makefile
+++ b/bonnie++-current/Makefile
@@ -29,6 +29,6 @@ benchmark: build
.PHONY: results
results: build
@${MKDIR} /tmp/benches/`domainname`
- ${CP} ${WRKSRC:Q}/bonnie.out /tmp/benches/`domainname`/bonnie++.`uname`-`uname -m`-`uname -r`.`hostname`
+ ${CP} ${WRKSRC}/bonnie.out /tmp/benches/`domainname`/bonnie++.`uname`-`uname -m`-`uname -r`.`hostname`
.include "../../mk/bsd.pkg.mk"
diff --git a/briquolo/Makefile b/briquolo/Makefile
index 80989243eb..076f4ec301 100644
--- a/briquolo/Makefile
+++ b/briquolo/Makefile
@@ -25,10 +25,10 @@ CONFIGURE_ARGS+= --includedir=${BUILDLINK_PREFIX.MesaLib}/include/GL
post-install:
cd ${WRKSRC}/data/data; set -e; \
for FILE in `ls -A | ${GREP} -v -E '(.xvpics|Makefile)'`; do \
- ${INSTALL_DATA} "$$FILE" ${DESTDIR:Q}${PREFIX:Q}/share/briquolo/data/; \
+ ${INSTALL_DATA} "$$FILE" ${DESTDIR}${PREFIX}/share/briquolo/data/; \
done; \
for FILE in .xvpics/*; do \
- ${INSTALL_DATA} $$FILE ${DESTDIR:Q}${PREFIX:Q}/share/briquolo/data/$$FILE; \
+ ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/briquolo/data/$$FILE; \
done
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/brltty/Makefile b/brltty/Makefile
index 670c6800e7..86a7c13767 100644
--- a/brltty/Makefile
+++ b/brltty/Makefile
@@ -20,7 +20,7 @@ EGDIR= ${PREFIX}/share/examples/brltty
CONF_FILES= ${EGDIR}/brlapi.key ${PKG_SYSCONFDIR}/brlapi.key
CONF_FILES+= ${EGDIR}/brltty.conf ${PKG_SYSCONFDIR}/brltty.conf
-MAKE_ENV+= EGDIR=${EGDIR:Q}
+MAKE_ENV+= EGDIR=${EGDIR}
CONFIGURE_ARGS+= --without-viavoice
CONFIGURE_ARGS+= --without-theta
CONFIGURE_ARGS+= --without-swift
diff --git a/bsdbuild/Makefile b/bsdbuild/Makefile
index 3acc017b6d..92aa46fada 100644
--- a/bsdbuild/Makefile
+++ b/bsdbuild/Makefile
@@ -22,8 +22,8 @@ REPLACE_SH= mkdep configure
### XXX until we have proper glue, take care to set these when
### using this in a package.
###
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-libtool=${LIBTOOL:Q}
###
### XXXX Manual page installation really needs fixing!
diff --git a/bss/Makefile b/bss/Makefile
index bd031a523b..e10de2ac35 100644
--- a/bss/Makefile
+++ b/bss/Makefile
@@ -14,20 +14,20 @@ USE_TOOLS+= pkg-config
do-build:
${CC} ${CFLAGS} ${LDFLAGS} -lbluetooth \
- ${WRKSRC:Q}/bss.c -o ${WRKSRC:Q}/bss
+ ${WRKSRC}/bss.c -o ${WRKSRC}/bss
${CC} ${CFLAGS} ${LDFLAGS} -lbluetooth \
- ${WRKSRC:Q}/replay_packet/replay_l2cap_packet.c \
- -o ${WRKSRC:Q}/replay_packet/replay_l2cap_packet
+ ${WRKSRC}/replay_packet/replay_l2cap_packet.c \
+ -o ${WRKSRC}/replay_packet/replay_l2cap_packet
DOC_FILES= ${WRKSRC}/doc/* ${WRKSRC}/README
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/bss ${DESTDIR:Q}${PREFIX:Q}/bin
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/replay_packet/replay_l2cap_packet \
- ${DESTDIR:Q}${PREFIX:Q}/bin/
- ${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/share/doc/bss/
- ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR:Q}${PREFIX:Q}/share/doc/bss/
+ ${INSTALL_PROGRAM} ${WRKSRC}/bss ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/replay_packet/replay_l2cap_packet \
+ ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/bss/
+ ${INSTALL_DATA} ${DOC_FILES} ${DESTDIR}${PREFIX}/share/doc/bss/
.include "../../wip/bluez-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/c-news/Makefile b/c-news/Makefile
index beeacac73a..35e599ff38 100644
--- a/c-news/Makefile
+++ b/c-news/Makefile
@@ -95,17 +95,17 @@ NOTEBOOK= locking.more makefiles.more locking.ps makefiles.ps
PGPVERIFY?= pgpverify-1.12
pre-patch:
- ${CP} ${DISTDIR:Q}/${DIST_SUBDIR:Q}/${PGPVERIFY:Q} ${WRKSRC:Q}/${PGPVERIFY:Q}
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY:Q} ${WRKSRC}/${PGPVERIFY:Q}
pre-configure:
${SED} ${FILES_SUBST_SED} \
- ${FILESDIR:Q}/substitutions > ${WRKDIR:Q}/conf/substitutions
+ ${FILESDIR}/substitutions > ${WRKDIR}/conf/substitutions
${SED} ${FILES_SUBST_SED} \
- ${FILESDIR:Q}/quiz.def > ${WRKDIR:Q}/conf/quiz.def
+ ${FILESDIR}/quiz.def > ${WRKDIR}/conf/quiz.def
${SED} ${FILES_SUBST_SED} \
- ${FILESDIR:Q}/config.make > ${WRKDIR:Q}/include/config.make
- ${CP} ${FILESDIR:Q}/makeinc ${WRKDIR:Q}/conf/makeinc
- ${CP} ${FILESDIR:Q}/makefile.notebook ${WRKDIR:Q}/notebook/makefile
+ ${FILESDIR}/config.make > ${WRKDIR}/include/config.make
+ ${CP} ${FILESDIR}/makeinc ${WRKDIR}/conf/makeinc
+ ${CP} ${FILESDIR}/makefile.notebook ${WRKDIR}/notebook/makefile
# One of the regression tests does not work correctly if we are in
# a union-mounted directory. In that case, build outside the union-mounted
@@ -114,53 +114,53 @@ post-build: build-doc
.PHONY: regression
regression:
- cd ${WRKSRC:Q} && ${MAKE} ${MAKEFLAGS} r
+ cd ${WRKSRC} && ${MAKE} ${MAKEFLAGS} r
.PHONY: build-doc
build-doc:
- cd ${WRKSRC:Q}/doc && \
+ cd ${WRKSRC}/doc && \
${MAKE} PIC=${PIC:Q} NROFF=${NROFF:Q} ${MAKE_FLAGS}
- cd ${WRKSRC:Q}/notebook && ${MAKE} ${MAKE_FLAGS}
+ cd ${WRKSRC}/notebook && ${MAKE} ${MAKE_FLAGS}
do-install:
- ${RM} -f ${PREFIX:Q}/bin/inews
- ${INSTALL_DATA} ${WRKSRC:Q}/libdbz/dbz.h ${PREFIX:Q}/include
- ${INSTALL_DATA} ${WRKSRC:Q}/libcnews.a ${PREFIX:Q}/lib
+ ${RM} -f ${PREFIX}/bin/inews
+ ${INSTALL_DATA} ${WRKSRC}/libdbz/dbz.h ${PREFIX}/include
+ ${INSTALL_DATA} ${WRKSRC}/libcnews.a ${PREFIX}/lib
${MKDIR} ${CNEWSARTS} ${CNEWSOV} ${CNEWSBIN} ${CNEWSCTL}
${CHOWN} ${BINOWN}:${BINGRP} ${CNEWSBIN}
- ${INSTALL_SCRIPT} ${WRKSRC:Q}/${PGPVERIFY:Q} ${CNEWSBIN:Q}/pgpverify
- cd ${WRKSRC:Q} && ${MAKE} ${MAKE_FLAGS} ${MAKE_FILE} install
- cd ${WRKSRC:Q} && ${MAKE} ${MAKE_FLAGS} ${MAKE_FILE} setup
- cd ${WRKSRC:Q} && ${MAKE} ${MAKE_FLAGS} ${MAKE_FILE} ui readpostcheck
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PGPVERIFY:Q} ${CNEWSBIN:Q}/pgpverify
+ cd ${WRKSRC} && ${MAKE} ${MAKE_FLAGS} ${MAKE_FILE} install
+ cd ${WRKSRC} && ${MAKE} ${MAKE_FLAGS} ${MAKE_FILE} setup
+ cd ${WRKSRC} && ${MAKE} ${MAKE_FLAGS} ${MAKE_FILE} ui readpostcheck
.for f in checknews cnewsdo inews injnews postnews readnews
- ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX:Q}/bin/${f:Q}
+ ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/bin/${f:Q}
.endfor
${CHOWN} -R news:news ${CNEWSARTS} ${CNEWSOV} ${CNEWSCTL}
${CHOWN} news:news ${CNEWSBIN:Q}/input/newsspool
${CHMOD} 6555 ${CNEWSBIN:Q}/input/newsspool
.for i in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/${PKGMANDIR}/man1/${i:R:Q}.1
+ ${INSTALL_MAN} ${WRKSRC}/man/${i:Q} ${PREFIX}/${PKGMANDIR}/man1/${i:R:Q}.1
.endfor
.for i in ${MAN5}
- ${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/${PKGMANDIR}/man5/${i:R:Q}.5
+ ${INSTALL_MAN} ${WRKSRC}/man/${i:Q} ${PREFIX}/${PKGMANDIR}/man5/${i:R:Q}.5
.endfor
.for i in ${MAN8}
- ${INSTALL_MAN} ${WRKSRC:Q}/man/${i:Q} ${PREFIX:Q}/${PKGMANDIR}/man8/${i:R:Q}.8
+ ${INSTALL_MAN} ${WRKSRC}/man/${i:Q} ${PREFIX}/${PKGMANDIR}/man8/${i:R:Q}.8
.endfor
# install docs:
- ${INSTALL_MAN_DIR} ${PREFIX:Q}/share/doc/cnews
+ ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/cnews
.for i in ${DOCS}
- ${INSTALL_MAN} ${WRKSRC:Q}/doc/${i:Q} ${PREFIX:Q}/share/doc/cnews
+ ${INSTALL_MAN} ${WRKSRC}/doc/${i:Q} ${PREFIX}/share/doc/cnews
.endfor
.for i in ${NOTEBOOK}
- ${INSTALL_MAN} ${WRKSRC:Q}/notebook/${i:Q} ${PREFIX:Q}/share/doc/cnews
+ ${INSTALL_MAN} ${WRKSRC}/notebook/${i:Q} ${PREFIX}/share/doc/cnews
.endfor
# install sample config files
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/examples/cnews
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cnews
set -e; \
- for FILE in `ls -1 ${WRKSRC:Q}/conf/*.eg` \
- ${WRKSRC:Q}/conf/cron.proto ${WRKSRC:Q}/conf/organization; do \
- ${INSTALL_DATA} "$$FILE" ${PREFIX:Q}/share/examples/cnews; \
+ for FILE in `ls -1 ${WRKSRC}/conf/*.eg` \
+ ${WRKSRC}/conf/cron.proto ${WRKSRC}/conf/organization; do \
+ ${INSTALL_DATA} "$$FILE" ${PREFIX}/share/examples/cnews; \
done
.include "../../mk/bsd.pkg.mk"
diff --git a/c-news/Makefile.common b/c-news/Makefile.common
index 85600b956a..bb789fa27b 100644
--- a/c-news/Makefile.common
+++ b/c-news/Makefile.common
@@ -21,7 +21,7 @@ MESSAGE_SUBST+= CNEWSCTL=${CNEWSCTL:Q}
# Given foo=${bar}, replace @foo@ with ${bar}.
#
-FILES_SUBST+= PREFIX=${PREFIX:Q}
+FILES_SUBST+= PREFIX=${PREFIX}
FILES_SUBST+= CNEWSCFLAGS=${CFLAGS:M*:Q}
FILES_SUBST+= CNEWSDATA=${CNEWSDATA:Q}
FILES_SUBST+= CNEWSBIN=${CNEWSBIN:Q}
diff --git a/c2hs/Makefile b/c2hs/Makefile
index c99f70c74c..8e4a236e7c 100644
--- a/c2hs/Makefile
+++ b/c2hs/Makefile
@@ -14,22 +14,22 @@ LICENSE= gnu-gpl-v2
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
do-configure:
- cd ${WRKSRC:Q} && \
+ cd ${WRKSRC} && \
runhaskell Setup.hs configure \
--ghc \
- --prefix=${PREFIX:Q} \
- --with-compiler=${PREFIX:Q}/bin/ghc \
- --with-hc-pkg=${PREFIX:Q}/bin/ghc-pkg
+ --prefix=${PREFIX} \
+ --with-compiler=${PREFIX}/bin/ghc \
+ --with-hc-pkg=${PREFIX}/bin/ghc-pkg
do-build:
- cd ${WRKSRC:Q} && runhaskell Setup.hs build
+ cd ${WRKSRC} && runhaskell Setup.hs build
do-install:
- cd ${WRKSRC:Q} && runhaskell Setup.hs install
+ cd ${WRKSRC} && runhaskell Setup.hs install
post-install:
- ${INSTALL_DATA_DIR} ${EGDIR:Q}
- cd ${WRKSRC:Q}/c2hs/tests && ${INSTALL_DATA} * ${EGDIR:Q}
+ ${INSTALL_DATA_DIR} ${EGDIR}
+ cd ${WRKSRC}/c2hs/tests && ${INSTALL_DATA} * ${EGDIR}
.include "../../lang/ghc/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chbg/Makefile b/chbg/Makefile
index 125944d14d..3596c94aee 100644
--- a/chbg/Makefile
+++ b/chbg/Makefile
@@ -19,7 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-image-library=imlib2
pre-configure:
- ${CP} ${FILESDIR:Q}/es.* ${WRKSRC:Q}/po
+ ${CP} ${FILESDIR}/es.* ${WRKSRC}/po
.include "../../devel/glib/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
diff --git a/clamassassin/Makefile b/clamassassin/Makefile
index 22632a26b3..5b2932b627 100644
--- a/clamassassin/Makefile
+++ b/clamassassin/Makefile
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= CONF_RM=${RM:Q}
CONFIGURE_ENV+= CONF_CAT=${CAT:Q}
CONFIGURE_ENV+= CONF_SED=${SED:Q}
-CONFIGURE_ENV+= CONF_ECHO=${TOOLS_ECHO:Q}
+CONFIGURE_ENV+= CONF_ECHO=${TOOLS_ECHO}
PKG_OPTIONS_VAR= PKG_OPTIONS.clamassassin
PKG_SUPPORTED_OPTIONS= clamdscan subject_rewrite
diff --git a/clfswm/Makefile b/clfswm/Makefile
index 4efefa9d0a..3e0208e1ab 100644
--- a/clfswm/Makefile
+++ b/clfswm/Makefile
@@ -4,7 +4,7 @@
DISTNAME= clfswm-1106-2
PKGNAME= ${DISTNAME:S/-2/.2/}
CATEGORIES= wm
-MASTER_SITES= ${HOMEPAGE:Q}
+MASTER_SITES= ${HOMEPAGE}
MAINTAINER= lomka%gero.in@localhost
HOMEPAGE= http://common-lisp.net/project/clfswm/
diff --git a/cross-binutils/Makefile b/cross-binutils/Makefile
index 347290f839..f220d47a74 100644
--- a/cross-binutils/Makefile
+++ b/cross-binutils/Makefile
@@ -33,7 +33,7 @@ PKGSRC_MAKE_ENV+= SH=/bin/ksh
MAKE_ARGS+= CFLAGS="${CFLAGS}"
BUILD_TARGET= all-binutils all-ld
-PLIST_SUBST+= LOCALBASE=${LOCALBASE:Q}
+PLIST_SUBST+= LOCALBASE=${LOCALBASE}
BINDIR= ${PREFIX}/cross/libexec/binutils
diff --git a/cygwin/Makefile.common b/cygwin/Makefile.common
index ac1df7b6f1..8fceb01f23 100644
--- a/cygwin/Makefile.common
+++ b/cygwin/Makefile.common
@@ -18,13 +18,13 @@ BUILD_DEPENDS+= gtexinfo-[0-9]*:../../devel/gtexinfo
.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS= # reset
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
GNU_CONFIGURE_PREFIX= ${PREFIX}/cross
GNU_CONFIGURE_LIBDIR= ${PREFIX}/cross/${CYGWIN_TARGET:Q}/lib
GNU_CONFIGURE_INFODIR= ${PREFIX}/cross/${CYGWIN_TARGET:Q}/info
CONFIGURE_ARGS+= --datadir=${PREFIX}/cross/${CYGWIN_TARGET:Q}/share
#ONFIGURE_ARGS+= --mandir=${PREFIX}/cross/${CYGWIN_TARGET:Q}/man
-CONFIGURE_ARGS+= --exec-prefix=${PREFIX:Q}/cross
+CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/cross
CONFIGURE_ARGS+= --target=${CYGWIN_TARGET:Q}
# following line to avoid getting
# make: exec(i386--netbsdelf-ar) failed (No such file or directory)
diff --git a/daphne/Makefile b/daphne/Makefile
index 9b820aaf9c..b9adb5e5c6 100644
--- a/daphne/Makefile
+++ b/daphne/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE= YES
CONFIGURE_DIRS= src/vldp2
BUILD_DIRS= src
-MAKE_ENV+= DATA_DIR=${LOCALBASE:Q}/share/daphne
-MAKE_ENV+= LIB_DIR=${LOCALBASE:Q}/lib/daphne
+MAKE_ENV+= DATA_DIR=${LOCALBASE}/share/daphne
+MAKE_ENV+= LIB_DIR=${LOCALBASE}/lib/daphne
.if ${MACHINE_ARCH} == "i386"
MAKE_ENV+= USE_MMX_RGB2YUV=1
MAKE_ENV+= PFLAGS="-DNATIVE_CPU_X86 -DMMX_RGB2YUV"
@@ -31,33 +31,33 @@ MAKE_ENV+= PFLAGS="-DNATIVE_CPU_X86 -DMMX_RGB2YUV"
.include "../../mk/dlopen.buildlink3.mk"
post-extract:
- ${CP} ${WRKSRC:Q}/src/Makefile.vars.linux_x86 ${WRKSRC:Q}/src/Makefile.vars
+ ${CP} ${WRKSRC}/src/Makefile.vars.linux_x86 ${WRKSRC}/src/Makefile.vars
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/daphne ${DESTDIR}${PREFIX:Q}/bin
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/lib/daphne
- ${INSTALL_DATA} ${WRKSRC:Q}/libvldp2.so ${DESTDIR}${PREFIX:Q}/lib/daphne
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/daphne
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/daphne/pics
+ ${INSTALL_PROGRAM} ${WRKSRC}/daphne ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/daphne
+ ${INSTALL_DATA} ${WRKSRC}/libvldp2.so ${DESTDIR}${PREFIX}/lib/daphne
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/daphne
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/daphne/pics
set -e; \
- for f in ${WRKSRC:Q}/pics/*.bmp; do \
- ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX:Q}/share/daphne/pics/; \
+ for f in ${WRKSRC}/pics/*.bmp; do \
+ ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/share/daphne/pics/; \
done
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/daphne/sound
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/daphne/sound
set -e; \
- for f in ${WRKSRC:Q}/sound/*.wav ${WRKSRC:Q}/sound/*.ogg; do \
- ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX:Q}/share/daphne/sound/; \
+ for f in ${WRKSRC}/sound/*.wav ${WRKSRC}/sound/*.ogg; do \
+ ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/share/daphne/sound/; \
done
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/doc/daphne
- ${INSTALL_DATA} ${WRKSRC:Q}/doc/docs.html \
- ${DESTDIR}${PREFIX:Q}/share/doc/daphne/index.html
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/doc/daphne/graphics
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/daphne
+ ${INSTALL_DATA} ${WRKSRC}/doc/docs.html \
+ ${DESTDIR}${PREFIX}/share/doc/daphne/index.html
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/daphne/graphics
set -e; \
- for f in ${WRKSRC:Q}/doc/docs_files/*.[Jj][Pp][Gg]; do \
+ for f in ${WRKSRC}/doc/docs_files/*.[Jj][Pp][Gg]; do \
n=`basename "$$f"`; \
n=`echo "$$n" | tr A-Z a-z`; \
${INSTALL_DATA} "$$f" \
- ${DESTDIR}${PREFIX:Q}/share/doc/daphne/graphics/"$$n"; \
+ ${DESTDIR}${PREFIX}/share/doc/daphne/graphics/"$$n"; \
done
.include "../../mk/bsd.pkg.mk"
diff --git a/darcs/Makefile b/darcs/Makefile
index 4236cbb898..6fd200c909 100644
--- a/darcs/Makefile
+++ b/darcs/Makefile
@@ -12,8 +12,8 @@ LICENSE= gnu-gpl-v2
CONFIGURE_ARGS+= -fforce-char8-encoding
.include "options.mk"
-CONFIGURE_ARGS+= --extra-include-dirs=${PREFIX:Q}/include
-CONFIGURE_ARGS+= --extra-lib-dirs=${PREFIX:Q}/lib
+CONFIGURE_ARGS+= --extra-include-dirs=${PREFIX}/include
+CONFIGURE_ARGS+= --extra-lib-dirs=${PREFIX}/lib
.include "../../wip/mk/haskell.mk"
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/davical-git/Makefile b/davical-git/Makefile
index c95d47deae..b646990dc6 100644
--- a/davical-git/Makefile
+++ b/davical-git/Makefile
@@ -53,7 +53,7 @@ DEPENDS+= postgresql${PGSQL_VERSION}-client-[0-9]*:../../databases/postgresql${P
PKG_SYSCONFSUBDIR= davical
MESSAGE_SUBST+= DAVICALDIR=${DAVICALDIR:Q} DOCDIR=${DOCDIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE:Q}
CONF_FILES= ${EGDIR}/davical.conf \
diff --git a/dbus-dfbsd/Makefile b/dbus-dfbsd/Makefile
index 607d935354..2093d1113a 100644
--- a/dbus-dfbsd/Makefile
+++ b/dbus-dfbsd/Makefile
@@ -29,7 +29,7 @@ MESSAGE_SRC+= MESSAGE
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
# Prevent the configure script from picking up a per-user tmp
# directory. See the commit message on revision 1.35
@@ -51,7 +51,7 @@ CONFIGURE_ARGS+= --enable-static
#.endif
CONFIGURE_ARGS+= --with-dbus-user=${DBUS_USER}
-CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR:Q}
+CONFIGURE_ARGS+= --with-test-socket-dir=${WRKDIR}
CONFIGURE_ARGS+= --with-system-pid-file=${VARBASE}/run/dbus/${DBUS_SYSTEM_PID_FILE}
SUBST_CLASSES+= docbook
diff --git a/dhcpd-snmp/Makefile b/dhcpd-snmp/Makefile
index 754c8f3bc5..7ced9289d0 100644
--- a/dhcpd-snmp/Makefile
+++ b/dhcpd-snmp/Makefile
@@ -29,7 +29,7 @@ BUILD_DEFS+= VARBASE NET_SNMP_MIBDIR
SUBST_CLASSES+= paths
SUBST_FILES.paths+= dhcpd-snmp.conf.dist
-SUBST_SED.paths+= -e 's|@VARBASE@|${VARBASE:Q}|g'
+SUBST_SED.paths+= -e 's|@VARBASE@|${VARBASE}|g'
SUBST_STAGE.paths= post-configure
CONF_FILES= ${PREFIX}/${EGDIR}/dhcpd-snmp.conf \
diff --git a/dnrd/Makefile b/dnrd/Makefile
index d448294784..cd2bf5ca11 100644
--- a/dnrd/Makefile
+++ b/dnrd/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
LIBS.NetBSD+= -lrt # for sem_*()
LIBS.SunOS+= -lrt -lsocket -lnsl -lresolv # for sem_*(), inet_ntoa(), inet_aton()
diff --git a/dragbox-git/Makefile b/dragbox-git/Makefile
index f2d237196d..9ee366a01e 100644
--- a/dragbox-git/Makefile
+++ b/dragbox-git/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
GIT_REPOSITORIES= dragbox
GIT_REPO.dragbox= git://repo.or.cz/dragbox.git
-WRKSRC= ${WRKDIR}/${DISTNAME:S|-${PKGVERSION_NOREV}||:Q}
+WRKSRC= ${WRKDIR}/${DISTNAME:S|-${PKGVERSION_NOREV}||}
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_TOOLS+= autoconf
diff --git a/e17/Makefile b/e17/Makefile
index 690c3b16f7..15fde16242 100644
--- a/e17/Makefile
+++ b/e17/Makefile
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --disable-device-hal --disable-device-udev \
--disable-mount-hal --disable-mount-udisks
PKG_SYSCONFSUBDIR= enlightenment
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/enlightenment
CONF_FILES= ${EGDIR}/sysactions.conf \
diff --git a/e2fsprogs/Makefile b/e2fsprogs/Makefile
index 2c8dc6904d..e0519ff8c1 100644
--- a/e2fsprogs/Makefile
+++ b/e2fsprogs/Makefile
@@ -15,7 +15,7 @@ INFO_FILES= yes
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# Only build fsck(8) on platforms that need it.
PLIST_VARS+= fsck
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-fsck
EGDIR= ${PREFIX}/share/examples/ext2fs
CONF_FILES+= ${EGDIR}/mke2fs.conf ${PKG_SYSCONFDIR}/mke2fs.conf
-INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} root_sysconfdir=${EGDIR:Q}
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} root_sysconfdir=${EGDIR}
SUBST_CLASSES+= man
SUBST_MESSAGE.man= Give correct path for man page
diff --git a/elinks-libmm/options.mk b/elinks-libmm/options.mk
index 7f0e666f1f..6cc9d4ed0f 100644
--- a/elinks-libmm/options.mk
+++ b/elinks-libmm/options.mk
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --disable-nntp
.include "../../lang/ossp-js/buildlink3.mk"
-CONFIGURE_ARGS+= --with-spidermonkey=${BUILDLINK_PREFIX.ossp-js:Q}
+CONFIGURE_ARGS+= --with-spidermonkey=${BUILDLINK_PREFIX.ossp-js}
CONFIGURE_ARGS+= --enable-sm-scripting
.else
CONFIGURE_ARGS+= --without-spidermonkey
diff --git a/elinks-snapshot/options.mk b/elinks-snapshot/options.mk
index b311aff62b..8487c806ca 100644
--- a/elinks-snapshot/options.mk
+++ b/elinks-snapshot/options.mk
@@ -114,7 +114,7 @@ CONFIGURE_ARGS+= --enable-no-root
.endif
.if !empty(PKG_OPTIONS:Mboehm-gc)
-CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc:Q}
+CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc}
. include "../../devel/boehm-gc/buildlink3.mk"
.elif !empty(PKG_OPTIONS:Melinks-fastmem)
CONFIGURE_ARGS+= --enable-fastmem
diff --git a/emacs-nox11-git/Makefile b/emacs-nox11-git/Makefile
index 7ca5bb7624..bf0ac4f4ee 100644
--- a/emacs-nox11-git/Makefile
+++ b/emacs-nox11-git/Makefile
@@ -38,8 +38,8 @@ PLIST_SRC= ${PKGDIR}/../emacs-git/PLIST
WRKSRC= ${WRKDIR}/emacs
CONFIGURE_ARGS+= --without-x # nox11
-CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+= --srcdir=${WRKSRC}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ENV+= GAMEOWN=${GAMEOWN:Q}
BUILD_DEFS+= VARBASE
@@ -52,8 +52,8 @@ BUILD_DEFS+= GAMEDATAMODE
#SUBST_SED.test_equal= -e 's/ == / = /g'
MAKE_DIRS_PERMS+= ${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
-CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
-CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
+CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE}
+CONF_FILES_PERMS+= /dev/null ${VARBASE}/games/emacs/tetris-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE}
# build PATH in the dumped emacs is not a problem
CHECK_WRKREF_SKIP+= bin/emacs
diff --git a/emirror/Makefile b/emirror/Makefile
index b733a5d16c..5bbbf96e0d 100644
--- a/emirror/Makefile
+++ b/emirror/Makefile
@@ -15,7 +15,7 @@ COMMENT= FTP mirroring tool with nice HTML logfiles
GNU_CONFIGURE= yes
NO_BUILD= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \
--with-python=${PYTHONBIN:Q}
post-extract:
diff --git a/fasta/Makefile b/fasta/Makefile
index 2c77c96e12..f6ac82705c 100644
--- a/fasta/Makefile
+++ b/fasta/Makefile
@@ -19,30 +19,30 @@ do-test:
cd ${WRKSRC}/src && ../bin/fasta36 -q ../seq/mgstm1.aa ../seq/prot_test.lseg
do-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/doc/fasta
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/fasta
.for f in README.versions README Readme.Mac readme.mpi_3.3 readme.pvm_3.3 \
readme.v30 readme.v30t7 readme.v31t1 readme.v33t0 readme.w32 \
readme.pvm_3.2 readme.pvm_3.4 readme.v30t6 readme.v31t0 \
readme.v32t0 readme.v34t0 fasta20.doc fasta3x.doc fasta_func.doc \
COPYRIGHT FASTA_LIST
- ${INSTALL_DATA} ${WRKSRC:Q}/${f:Q} ${DESTDIR}${PREFIX:Q}/share/doc/fasta
+ ${INSTALL_DATA} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/share/doc/fasta
.endfor
- ${INSTALL_DATA} ${WRKSRC:Q}/fasta3x.me ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man1
+ ${INSTALL_DATA} ${WRKSRC}/fasta3x.me ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.for f in fasta3.1 fastf3.1 fasts3.1 map_db.1 prss3.1 pvcomp.1
- ${INSTALL_DATA} ${WRKSRC:Q}/${f:Q} ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man1
+ ${INSTALL_DATA} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.endfor
.for f in fasta34 fasta34_t fastm34 fastm34_t fasts34 fasts34_t \
fastx34 fastx34_t fasty34 fasty34_t prfx34 prss34 \
ssearch34 ssearch34_t tfasta34 tfasta34_t tfasts34 \
tfasts34_t tfastx34 tfastx34_t tfasty34 tfasty34_t
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/${f:Q} ${DESTDIR}${PREFIX:Q}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${f:Q} ${DESTDIR}${PREFIX}/bin
.endfor
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/share/examples/fasta
- ${INSTALL_DATA} ${WRKSRC:Q}/*.aa ${DESTDIR}${PREFIX:Q}/share/examples/fasta
- ${INSTALL_DATA} ${WRKSRC:Q}/*.seq ${DESTDIR}${PREFIX:Q}/share/examples/fasta
- ${INSTALL_DATA} ${WRKSRC:Q}/*lib ${DESTDIR}${PREFIX:Q}/share/examples/fasta
- ${INSTALL_DATA} ${WRKSRC:Q}/fastlibs ${DESTDIR}${PREFIX:Q}/share/examples/fasta
- ${INSTALL_DATA} ${WRKSRC:Q}/*.mat ${DESTDIR}${PREFIX:Q}/share/examples/fasta
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/fasta
+ ${INSTALL_DATA} ${WRKSRC}/*.aa ${DESTDIR}${PREFIX}/share/examples/fasta
+ ${INSTALL_DATA} ${WRKSRC}/*.seq ${DESTDIR}${PREFIX}/share/examples/fasta
+ ${INSTALL_DATA} ${WRKSRC}/*lib ${DESTDIR}${PREFIX}/share/examples/fasta
+ ${INSTALL_DATA} ${WRKSRC}/fastlibs ${DESTDIR}${PREFIX}/share/examples/fasta
+ ${INSTALL_DATA} ${WRKSRC}/*.mat ${DESTDIR}${PREFIX}/share/examples/fasta
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/fbida/Makefile b/fbida/Makefile
index e269dacb5d..9f0f322c14 100644
--- a/fbida/Makefile
+++ b/fbida/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.kraxel.org/blog/linux/fbida/
COMMENT= Image viewer and editor
MAKE_FILE= GNUmakefile
-MAKE_ENV+= prefix=${PREFIX:Q}
+MAKE_ENV+= prefix=${PREFIX}
USE_TOOLS+= gmake perl
# The jpeg/90 directory doesn't exist yet.
diff --git a/fbpanel/Makefile b/fbpanel/Makefile
index 8a09a3612d..40be9842a0 100644
--- a/fbpanel/Makefile
+++ b/fbpanel/Makefile
@@ -25,8 +25,8 @@ CONFIGURE_ARGS+= --cpu=off
PLIST_SUBST+= CPUPLUGIN="@comment "
.endif
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
-MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
MANCOMPRESSED= yes
.include "../../x11/libXmu/buildlink3.mk"
diff --git a/freecad/Makefile b/freecad/Makefile
index 9ac5120771..4c65405d1e 100644
--- a/freecad/Makefile
+++ b/freecad/Makefile
@@ -21,7 +21,7 @@ USE_TOOLS+= perl
CXXFLAGS.FreeBSD+= -fPIC
LDFLAGS.FreeBSD+= -fPIC
-CMAKE_ARGS+= -DCMAKE_INSTALL_HOMEDIR:PATH=${PREFIX:Q}/freecad
+CMAKE_ARGS+= -DCMAKE_INSTALL_HOMEDIR:PATH=${PREFIX}/freecad
CMAKE_ARGS+= -DCMAKE_CXX_FLAGS=${CXXFLAGS:Q}
CMAKE_ARGS+= -DCMAKE_SHARED_LINKER_FLAGS=${LDFLAGS:Q}
#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON
diff --git a/freedup/Makefile b/freedup/Makefile
index 01bbe19623..333eb5214d 100644
--- a/freedup/Makefile
+++ b/freedup/Makefile
@@ -15,8 +15,8 @@ COMMENT= Free disk space by hard linking duplicate files
USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/freedup-1.3
-MAKE_ENV+= BIN_DIR=${PREFIX:Q}/bin
-MAKE_ENV+= MAN_DIR=${PREFIX:Q}/${PKGMANDIR}
+MAKE_ENV+= BIN_DIR=${PREFIX}/bin
+MAKE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}
DEPENDS+= coreutils>=6.9:../../sysutils/coreutils
diff --git a/freedup16/Makefile b/freedup16/Makefile
index 769bd88147..b3e0e99357 100644
--- a/freedup16/Makefile
+++ b/freedup16/Makefile
@@ -14,8 +14,8 @@ COMMENT= Free disk space by hard linking duplicate files
USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/freedup-1.6
-MAKE_ENV+= BIN_DIR=${PREFIX:Q}/bin
-MAKE_ENV+= MAN_DIR=${PREFIX:Q}/${PKGMANDIR}
+MAKE_ENV+= BIN_DIR=${PREFIX}/bin
+MAKE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}
DEPENDS+= coreutils>=6.9:../../sysutils/coreutils
diff --git a/fvwm265/Makefile b/fvwm265/Makefile
index 0b84e95495..3cc69653b3 100644
--- a/fvwm265/Makefile
+++ b/fvwm265/Makefile
@@ -30,10 +30,10 @@ INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
EVAL_PREFIX+= XPMDIR=xpm
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
-CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2
+CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11
CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include
-CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
+CONFIGURE_ARGS+= --with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
# We don't want to have CPP from the buildlink directory
CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
@@ -41,24 +41,24 @@ CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q}
post-extract:
- mkdir ${WRKDIR:Q}/icons
- cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
+ mkdir ${WRKDIR}/icons
+ cd ${WRKDIR}/icons && tar -xzf ${DISTDIR}/fvwm_icons.tgz
post-install:
${INSTALL_DATA} \
- ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
- ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps
+ ${WRKDIR}/icons/fvwm_icons/*.xpm \
+ ${DESTDIR}${PREFIX}/lib/X11/fvwm2/pixmaps
${INSTALL_DATA} \
- ${WRKSRC:Q}/sample.fvwmrc/decor_examples \
- ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
- ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2
+ ${WRKSRC}/sample.fvwmrc/decor_examples \
+ ${WRKSRC}/sample.fvwmrc/system.fvwm2rc-sample-* \
+ ${DESTDIR}${PREFIX}/lib/X11/fvwm2
${INSTALL_DATA} \
- ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
- ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
- if [ ! -f ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
+ ${WRKSRC}/sample.fvwmrc/system.fvwm2rc \
+ ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example
+ if [ ! -f ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ]; then \
${INSTALL_DATA} \
- ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
- ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
+ ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc.example \
+ ${DESTDIR}${PREFIX}/lib/X11/fvwm2/system.fvwm2rc ; \
fi
.include "options.mk"
diff --git a/g21k-binutils/Makefile b/g21k-binutils/Makefile
index 35bcb79864..00b92f54cb 100644
--- a/g21k-binutils/Makefile
+++ b/g21k-binutils/Makefile
@@ -13,6 +13,6 @@ COMMENT= Assemblre and linker tools for Analog Devices 21k series DSPs
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-adidsp=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-adidsp=${PREFIX}
.include "../../mk/bsd.pkg.mk"
diff --git a/gauche-pib/Makefile b/gauche-pib/Makefile
index c93131461e..4073e53fe0 100644
--- a/gauche-pib/Makefile
+++ b/gauche-pib/Makefile
@@ -20,7 +20,7 @@ USE_TOOLS+= gmake
# Substitute the path to sitelibdir in the PLIST.
.if exists(${PREFIX:Q}/bin/gauche-config)
-GAUCHE_SITE_LIB_DIR!= ${PREFIX:Q}/bin/gauche-config --sitelibdir
+GAUCHE_SITE_LIB_DIR!= ${PREFIX}/bin/gauche-config --sitelibdir
.endif
PLIST_SUBST+= GAUCHE_SITE_LIB_DIR=${GAUCHE_SITE_LIB_DIR:S|${PREFIX}/||:Q}
PRINT_PLIST_AWK+= \
diff --git a/gcc42/Makefile b/gcc42/Makefile
index 4ef0b6986a..343cf20fc5 100644
--- a/gcc42/Makefile
+++ b/gcc42/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+= --with-as=${LOCALBASE}/bin/as
CONFIGURE_ARGS+= --with-ld=${LOCALBASE}/bin/ld
CONFIGURE_ARGS+= --with-gnu-as
CONFIGURE_ARGS+= --with-gnu-ld
-CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv:Q}
+CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
.endif
REPLACE_AWK+= gcc/testsuite/gcc.test-framework/test-framework.awk \
@@ -115,7 +115,7 @@ UNLIMIT_RESOURCES+= datasize
CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
USE_TOOLS+= chmod
-MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
+MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD}
.endif
# GNU pth is useless here
@@ -135,7 +135,7 @@ CONFIGURE_ARGS+= --enable-threads=posix # XXX seems to be needed
USE_TOOLS+= gmake makeinfo msgfmt
HAS_CONFIGURE= YES # no GNU_CONFIGURE!
CONFIG_SHELL?= ${SH}
-CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q}
+CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
#.if !empty(BUILD_ADA:M[Yy][Ee][Ss])
@@ -166,7 +166,7 @@ PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
GCC_SUBPREFIX= gcc42
GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX}
-FILES_SUBST+= PKGNAME=${PKGNAME:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME}
MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q}
CPPFLAGS+= -I${BUILDLINK_DIR}/include
diff --git a/gcc43/Makefile b/gcc43/Makefile
index cfe5b58e21..de9bfe8ab0 100644
--- a/gcc43/Makefile
+++ b/gcc43/Makefile
@@ -18,7 +18,7 @@ GCC_VERSION= 4.3.2
GCC_SUBPREFIX= gcc43
GCC_PREFIX= ${DESTDIR}${PREFIX}/${GCC_SUBPREFIX}
-FILES_SUBST+= PKGNAME=${PKGNAME:Q}
+FILES_SUBST+= PKGNAME=${PKGNAME}
MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX}
# XXX do you really need this? you do it manually
@@ -77,11 +77,11 @@ CONFIGURE_ARGS+= --enable-threads=posix # XXX seems to be needed
CONFIGURE_ARGS+= --with-gmp=${BUILDLINK_PREFIX.gmp}
CONFIGURE_ARGS+= --with-mpfr=${BUILDLINK_PREFIX.mpfr}
-CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q}
+CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv}
MAKE_ENV+= SHELL=${CONFIG_SHELL}
-MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD:Q}
+MAKE_ENV+= ac_cv_path_ac_cv_prog_chmod=${TOOLS_CHMOD}
CPPFLAGS+= -I${BUILDLINK_DIR}/include
CFLAGS+= -I${BUILDLINK_DIR}/include
diff --git a/gcc44/Makefile b/gcc44/Makefile
index acd7d82334..02c16c2bf0 100644
--- a/gcc44/Makefile
+++ b/gcc44/Makefile
@@ -112,7 +112,7 @@ do-configure:
cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS}
do-build:
- (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} )
+ (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1} )
do-test:
#.if (${MACHINE_GNU_ARCH} == "x86_64")
diff --git a/gcc45/Makefile b/gcc45/Makefile
index be58c3ce12..4f900b6758 100644
--- a/gcc45/Makefile
+++ b/gcc45/Makefile
@@ -138,7 +138,7 @@ do-configure:
cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS}
do-build:
- (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} )
+ (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1} )
do-test:
#.if (${MACHINE_GNU_ARCH} == "x86_64")
diff --git a/gcc46/Makefile b/gcc46/Makefile
index 0c11a2f4bf..fdb06a6e6a 100644
--- a/gcc46/Makefile
+++ b/gcc46/Makefile
@@ -149,7 +149,7 @@ do-configure:
cd ${WRKDIR}/obj; ${SETENV} ${CONFIGURE_ENV} ${CONFIG_SHELL} ${WRKSRC}/configure ${CONFIGURE_ARGS}
do-build:
- (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1:Q} )
+ (${_ULIMIT_CMD} cd ${WRKDIR}/obj && ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS:U1} )
do-test:
#.if (${MACHINE_GNU_ARCH} == "x86_64")
diff --git a/gcc47/options.mk b/gcc47/options.mk
index b3bb184c3e..f5bad182e0 100644
--- a/gcc47/options.mk
+++ b/gcc47/options.mk
@@ -102,7 +102,7 @@ LANGS+= java
ECJ_JAR= ecj-4.5.jar
SITES.${ECJ_JAR}= ftp://sourceware.org/pub/java/
DISTFILES+= ${ECJ_JAR}
-CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
+CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR}/${ECJ_JAR:Q}
JAVA_NAME= ${GCC_PKGNAME}
JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
@@ -113,15 +113,15 @@ JAVA_WRAPPERS= appletviewer jar jarsigner java javah keytool \
JAVA_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
PLIST_SRC+= PLIST.java
-PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q}
+PLIST_SUBST+= JAVA_NAME=${JAVA_NAME}
PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q}
# Create a JPackage compatible SDK environment.
CONFIGURE_ARGS+= --enable-java-home
-CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS:Q}
+CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS}
CONFIGURE_ARGS+= --with-arch-directory=${JAVA_ARCH:Q}
-CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME:Q}
-CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q}
+CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME}
+CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME}
REPLACE_PYTHON= libjava/contrib/aot-compile.in
diff --git a/gcc6snapshot/options.mk b/gcc6snapshot/options.mk
index 11b35f697c..41f5425412 100644
--- a/gcc6snapshot/options.mk
+++ b/gcc6snapshot/options.mk
@@ -117,7 +117,7 @@ LANGS+= java
ECJ_JAR= ecj-4.5.jar
SITES.${ECJ_JAR}= ftp://sourceware.org/pub/java/
DISTFILES+= ${ECJ_JAR}
-CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR:Q}/${ECJ_JAR:Q}
+CONFIGURE_ARGS+= --with-ecj-jar=${DISTDIR}/${ECJ_JAR:Q}
JAVA_NAME= ${GCC_PKGNAME}
JAVA_HOME= ${PREFIX}/java/${JAVA_NAME}
@@ -128,15 +128,15 @@ JAVA_WRAPPERS= appletviewer jar jarsigner java javah keytool \
JAVA_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
PLIST_SRC+= PLIST.java
-PLIST_SUBST+= JAVA_NAME=${JAVA_NAME:Q}
+PLIST_SUBST+= JAVA_NAME=${JAVA_NAME}
PLIST_SUBST+= JAVA_ARCH=${JAVA_ARCH:Q}
# Create a JPackage compatible SDK environment.
CONFIGURE_ARGS+= --enable-java-home
-CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS:Q}
+CONFIGURE_ARGS+= --with-os-directory=${LOWER_OPSYS}
CONFIGURE_ARGS+= --with-arch-directory=${JAVA_ARCH:Q}
-CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME:Q}
-CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q}
+CONFIGURE_ARGS+= --with-jvm-root-dir=${JAVA_HOME}
+CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME}
REPLACE_PYTHON= libjava/contrib/aot-compile.in
diff --git a/ghc/Makefile b/ghc/Makefile
index 9cce4421ff..ca1bf0f6af 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -27,10 +27,10 @@ USE_LIBTOOL= yes
USE_TOOLS+= autoconf gmake patch perl:run
CONFIGURE_ARGS+= --with-gcc=${CC:Q}
-CONFIGURE_ARGS+= --with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q}
-CONFIGURE_ARGS+= --with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q}
-CONFIGURE_ARGS+= --with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q}
-CONFIGURE_ARGS+= --with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q}
+CONFIGURE_ARGS+= --with-gmp-includes=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_INCDIRS.gmp:Q}
+CONFIGURE_ARGS+= --with-gmp-libraries=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_LIBDIRS.gmp:Q}
+CONFIGURE_ARGS+= --with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q}
+CONFIGURE_ARGS+= --with-iconv-libraries=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_LIBDIRS.iconv:Q}
CONFIGURE_ENV+= PerlCmd=${PERL5:Q}
.for stage in 0 1 2
@@ -46,8 +46,8 @@ CONFIGURE_ENV+= CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:Q}
# search instead.
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --with-system-libffi
-CONFIGURE_ARGS+= --with-ffi-includes=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_INCDIRS.libffi:Q}
-CONFIGURE_ARGS+= --with-ffi-libraries=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_LIBDIRS.libffi:Q}
+CONFIGURE_ARGS+= --with-ffi-includes=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_INCDIRS.libffi:Q}
+CONFIGURE_ARGS+= --with-ffi-libraries=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_LIBDIRS.libffi:Q}
.include "../../devel/libffi/buildlink3.mk"
.endif
@@ -57,27 +57,27 @@ CONFIGURE_ARGS+= --with-ffi-libraries=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_
# Our pre-configure phase installs a bindist of bootstrapping compiler
# directly into TOOLS_DIR so that ./configure can find it.
do-configure:
- ${RUN} cd ${WRKSRC:Q} && \
+ ${RUN} cd ${WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
- ${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk
- ${RUN} ${ECHO} "BuildFlavour = quick" >${WRKSRC:Q}/mk/build.mk
- ${RUN} ${ECHO} "DYNAMIC_GHC_PROGRAMS = NO" >>${WRKSRC:Q}/mk/build.mk
- ${RUN} ${CAT} ${WRKSRC:Q}/mk/build.mk.sample >>${WRKSRC:Q}/mk/build.mk
+ ${RUN} ${RM} -f ${WRKSRC}/mk/build.mk
+ ${RUN} ${ECHO} "BuildFlavour = quick" >${WRKSRC}/mk/build.mk
+ ${RUN} ${ECHO} "DYNAMIC_GHC_PROGRAMS = NO" >>${WRKSRC}/mk/build.mk
+ ${RUN} ${CAT} ${WRKSRC}/mk/build.mk.sample >>${WRKSRC}/mk/build.mk
${RUN} ${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
--configure-option=--with-curses-includes=${BUILDLINK_PREFIX.curses}/${BUILDLINK_INCDIRS.curses} \
- --configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses}" >> ${WRKSRC:Q}/mk/build.mk
+ --configure-option=--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses}" >> ${WRKSRC}/mk/build.mk
# Substitutions for INSTALL and DEINSTALL that handles package.cache.
FILES_SUBST+= DISTNAME=${DISTNAME}
# We don't want package.cache to be in the PLIST.
post-install:
- ${RM} -f ${DESTDIR:Q}${PREFIX:Q}/lib/${DISTNAME}/package.conf.d/package.cache
+ ${RM} -f ${DESTDIR}${PREFIX}/lib/${DISTNAME}/package.conf.d/package.cache
# We can't use static PLIST because the package installs some files whose
# names are randomly generated (e.g. lib/${PKGNAME}/package.conf.d/*.conf)
GENERATE_PLIST+= \
- cd ${DESTDIR:Q}${PREFIX:Q} && \
+ cd ${DESTDIR}${PREFIX} && \
${FIND} * \( -type f -o -type l \) | ${SORT} -d;
.include "../../converters/libiconv/buildlink3.mk"
diff --git a/ghc/bootstrap.mk b/ghc/bootstrap.mk
index 58b99c29e8..7feb807cdb 100644
--- a/ghc/bootstrap.mk
+++ b/ghc/bootstrap.mk
@@ -77,19 +77,19 @@ USE_BUILTIN.iconv= no
USE_TOOLS+= gmake xzcat xz
pre-configure:
- @${TEST} -f ${DISTDIR:Q}/${DIST_SUBDIR:Q}/${BOOT_ARCHIVE} || \
+ @${TEST} -f ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE} || \
${FAIL_MSG} "Put your trusted bootstrap archive as ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE}"
@${PHASE_MSG} "Extracting bootstrapping compiler for ${PKGNAME}"
- ${RUN} ${MKDIR} ${WRKDIR:Q}/build-extract
- ${RUN} cd ${WRKDIR:Q}/build-extract && \
- ${EXTRACT_CMD_DEFAULT} ${DISTDIR:Q}/${DIST_SUBDIR:Q}/${BOOT_ARCHIVE}
+ ${RUN} ${MKDIR} ${WRKDIR}/build-extract
+ ${RUN} cd ${WRKDIR}/build-extract && \
+ ${EXTRACT_CMD_DEFAULT} ${DISTDIR}/${DIST_SUBDIR}/${BOOT_ARCHIVE}
# It is important to install the stage-0 compiler with our rpath flags
# configured, otherwise it will produce executables with no rpath and
# fail in the configure phase.
@${PHASE_MSG} "Preparing bootstrapping compiler for ${PKGNAME}"
- ${RUN} cd ${WRKDIR:Q}/build-extract/${PKGNAME_NOREV}-boot && \
+ ${RUN} cd ${WRKDIR}/build-extract/${PKGNAME_NOREV}-boot && \
${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure \
--prefix=${TOOLS_DIR:Q} && \
${MAKE_PROGRAM} install
@@ -193,22 +193,22 @@ pre-bootstrap: wrapper
${WRKDIR}/lndir:
@${PHASE_MSG} "Building lndir(1) to duplicate the source tree."
- cd ${WRKSRC:Q}/utils/lndir && \
+ cd ${WRKSRC}/utils/lndir && \
${PKG_CC:Q} lndir.c -o ${.TARGET}
${WRKDIR}/stamp-lndir-boot: ${WRKDIR}/lndir
@${PHASE_MSG} "Duplicating the source tree for bootstrapping ${PKGNAME_NOREV}"
- ${MKDIR} ${WRKDIR:Q}/build-boot
- cd ${WRKDIR:Q}/build-boot && \
- ${WRKDIR}/lndir -silent ../${PKGNAME_NOREV:Q}
+ ${MKDIR} ${WRKDIR}/build-boot
+ cd ${WRKDIR}/build-boot && \
+ ${WRKDIR}/lndir -silent ../${PKGNAME_NOREV}
${TOUCH} ${.TARGET}
# For terminfo_CONFIGURE_OPTS, see
# https://ghc.haskell.org/trac/ghc/ticket/10096
${WRKDIR}/stamp-configure-boot: ${WRKDIR}/stamp-lndir-boot
@${PHASE_MSG} "Configuring bootstrapping compiler ${PKGNAME_NOREV}"
- ${MKDIR} ${WRKDIR:Q}/build-boot
- cd ${WRKDIR:Q}/build-boot && \
+ ${MKDIR} ${WRKDIR}/build-boot
+ cd ${WRKDIR}/build-boot && \
${PKGSRC_SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CONFIGURE_ARGS}
${TOUCH} ${.TARGET}
@@ -216,7 +216,7 @@ ${WRKDIR}/build-boot/mk/build.mk: ${WRKDIR}/stamp-configure-boot
@${PHASE_MSG} "Configuring ${.TARGET}"
${ECHO} "BuildFlavour = quick" >${.TARGET}
${ECHO} "DYNAMIC_GHC_PROGRAMS = NO" >>${.TARGET}
- ${CAT} ${WRKDIR:Q}/build-boot/mk/build.mk.sample >>${.TARGET}
+ ${CAT} ${WRKDIR}/build-boot/mk/build.mk.sample >>${.TARGET}
${ECHO} "INTEGER_LIBRARY = integer-simple" >>${.TARGET}
${ECHO} "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot" >>${.TARGET}
${ECHO} "libraries/terminfo_CONFIGURE_OPTS += \
@@ -225,14 +225,14 @@ ${WRKDIR}/build-boot/mk/build.mk: ${WRKDIR}/stamp-configure-boot
${WRKDIR}/stamp-build-boot: ${WRKDIR}/build-boot/mk/build.mk
@${PHASE_MSG} "Building bootstrapping compiler ${PKGNAME_NOREV}"
- ${RUN} cd ${WRKDIR:Q}/build-boot && ${BUILD_MAKE_CMD}
+ ${RUN} cd ${WRKDIR}/build-boot && ${BUILD_MAKE_CMD}
${TOUCH} ${.TARGET}
${WRKDIR}/${BOOT_ARCHIVE}: ${WRKDIR}/stamp-build-boot
@${PHASE_MSG} "Creating binary distribution of bootstrapping ${PKGNAME_NOREV}"
- ${RUN} cd ${WRKDIR:Q}/build-boot && \
+ ${RUN} cd ${WRKDIR}/build-boot && \
${BUILD_MAKE_CMD} TAR_COMP=xz XZ_CMD="xz -9ev" binary-dist
- ${MV} -f ${WRKDIR:Q}/build-boot/${BOOT_ARCHIVE} ${.TARGET}
+ ${MV} -f ${WRKDIR}/build-boot/${BOOT_ARCHIVE} ${.TARGET}
.PHONY: post-bootstrap
post-bootstrap:
diff --git a/gitlab/Makefile b/gitlab/Makefile
index 0af6971b0d..4d081aeb30 100644
--- a/gitlab/Makefile
+++ b/gitlab/Makefile
@@ -44,9 +44,9 @@ DEST_GITLAB_HOME= ${DESTDIR}${GITLAB_HOME}
# for file: INSTALL
FILES_SUBST+= GITLAB_HOME=${GITLAB_HOME:Q}
-FILES_SUBST+= DESTDIR_VAR=${DESTDIR:Q}${GITLAB_HOME:Q}
+FILES_SUBST+= DESTDIR_VAR=${DESTDIR}${GITLAB_HOME:Q}
FILES_SUBST+= GITLAB_HOME=${GITLAB_HOME:Q}
-FILES_SUBST+= RSYNC=${PREFIX:Q}/bin/rsync
+FILES_SUBST+= RSYNC=${PREFIX}/bin/rsync
MESSAGE_SUBST+= GITLAB_HOME=${GITLAB_HOME:Q}
diff --git a/glkgit/Makefile b/glkgit/Makefile
index 834482520b..edcb922653 100644
--- a/glkgit/Makefile
+++ b/glkgit/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://diden.net/if/git/
COMMENT= Interpreter for Glulx interactive fiction
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/glk//}
-MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
INSTALLATION_DIRS+= bin
diff --git a/glulxe/Makefile b/glulxe/Makefile
index 7607ce46d6..453637dc3f 100644
--- a/glulxe/Makefile
+++ b/glulxe/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.eblong.com/zarf/glulx/index.html
COMMENT= Interpreter for Glulx text adventures
WRKSRC= ${WRKDIR}/glulxe
-MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
PKG_OPTIONS_VAR=PKG_OPTIONS.glulxe
.include "../../wip/glkloader/glk-options.mk"
diff --git a/gnome-applets/Makefile b/gnome-applets/Makefile
index 1c50b5a161..9b5c5e2b52 100644
--- a/gnome-applets/Makefile
+++ b/gnome-applets/Makefile
@@ -18,7 +18,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2
.include "options.mk"
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# obsolete; replaced by PA mixer in gnome-media>=2.26
CONFIGURE_ARGS+= --enable-mixer-applet
# obsolete; replaced by gnome-power-manager>=2.24
diff --git a/gnunet/Makefile b/gnunet/Makefile
index f8b6a7a5c5..8f515bc66c 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -28,7 +28,7 @@ LDFLAGS+= -lpthread -lintl
CONFIGURE_ARGS+= --with-extractor=${BUILDLINK_PREFIX.libextractor}
CONFIGURE_ARGS+= --without-gtk
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
post-patch:
cd ${WRKSRC} && for f in contrib/gnunet.* src/include/gnunet_util.h doc/man/*.?; do \
diff --git a/gnunet/options.mk b/gnunet/options.mk
index dcb3d4116c..5643dea387 100644
--- a/gnunet/options.mk
+++ b/gnunet/options.mk
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.if !empty(PKG_OPTIONS:Mbdb)
BDB_ACCEPTED= db4 db3 db2
.include "../../mk/bdb.buildlink3.mk"
-CONFIGURE_ARGS+= --with-bdb=${BDBBASE:Q}
+CONFIGURE_ARGS+= --with-bdb=${BDBBASE}
GNUNET_PLIST_ADD+= lib/libgnunetafs_database_bdb.la
.else
CONFIGURE_ARGS+= --without-bdb
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --without-gdbm
.if !empty(PKG_OPTIONS:Mtdb)
.include "../../databases/tdb/buildlink3.mk"
-CONFIGURE_ARGS+= --with-tdb=${BDBBASE:Q}
+CONFIGURE_ARGS+= --with-tdb=${BDBBASE}
GNUNET_PLIST_ADD+= lib/libgnunetafs_database_tdb.la
.else
CONFIGURE_ARGS+= --without-tdb
diff --git a/go/version.mk b/go/version.mk
index 70354c8522..f5d513fec0 100644
--- a/go/version.mk
+++ b/go/version.mk
@@ -17,5 +17,5 @@ GOCHAR= 6
GOARCH= arm
GOCHAR= 5
.endif
-PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS:Q}_${GOARCH:Q} GOARCH=${GOARCH:Q}
+PLIST_SUBST+= GO_PLATFORM=${LOWER_OPSYS}_${GOARCH:Q} GOARCH=${GOARCH:Q}
PLIST_SUBST+= GOCHAR=${GOCHAR:Q}
diff --git a/gsm/Makefile b/gsm/Makefile
index f4be95be5b..396654bc16 100644
--- a/gsm/Makefile
+++ b/gsm/Makefile
@@ -14,8 +14,8 @@ WRKSRC= ${WRKDIR}/gsm-1.0-pl14
USE_LIBTOOL= yes
NO_CONFIGURE= yes
-MAKE_ENV+= ROOT=${WRKSRC:Q}
-INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q}${PREFIX:Q}
+MAKE_ENV+= ROOT=${WRKSRC}
+INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}${PREFIX}
INSTALLATION_DIRS= bin include/gsm lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
post-install:
diff --git a/gsview/Makefile b/gsview/Makefile
index c3cf158e10..5fa25e33dd 100644
--- a/gsview/Makefile
+++ b/gsview/Makefile
@@ -34,7 +34,7 @@ BUILD_MAKE_FLAGS+= prefix=# empty
BUILD_MAKE_FLAGS+= CC=${CC}
BUILD_MAKE_FLAGS+= CDEBUG=# empty
BUILD_MAKE_FLAGS+= PFLAGS="-DMULTITHREAD ${PTHREAD_CFLAGS}"
-BUILD_MAKE_FLAGS+= GSVIEW_ETCPATH=${PKG_SYSCONFDIR:Q}
+BUILD_MAKE_FLAGS+= GSVIEW_ETCPATH=${PKG_SYSCONFDIR}
INSTALL_MAKE_FLAGS+= GSVIEW_ROOT=${DESTDIR}${PREFIX}
INSTALL_MAKE_FLAGS+= prefix=# empty
INSTALL_MAKE_FLAGS+= PLINK="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
diff --git a/haddock/Makefile b/haddock/Makefile
index 18fca5daeb..8dd96c4584 100644
--- a/haddock/Makefile
+++ b/haddock/Makefile
@@ -21,17 +21,17 @@ USE_TOOLS+= gmake perl
DOCDIR= ${PREFIX}/share/doc/haddock
do-configure:
- cd ${WRKSRC:Q} && runhaskell Setup.lhs configure \
+ cd ${WRKSRC} && runhaskell Setup.lhs configure \
--ghc \
- --prefix=${PREFIX:Q} \
- --with-compiler=${PREFIX:Q}/bin/ghc \
- --with-hc-pkg=${PREFIX:Q}/bin/ghc-pkg
+ --prefix=${PREFIX} \
+ --with-compiler=${PREFIX}/bin/ghc \
+ --with-hc-pkg=${PREFIX}/bin/ghc-pkg
do-build:
- cd ${WRKSRC:Q} && runhaskell Setup.lhs build
+ cd ${WRKSRC} && runhaskell Setup.lhs build
do-install:
- cd ${WRKSRC:Q} && runhaskell Setup.lhs install
+ cd ${WRKSRC} && runhaskell Setup.lhs install
.include "../../lang/ghc/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/haskell-mode/Makefile b/haskell-mode/Makefile
index cade49448b..35dbd7795b 100644
--- a/haskell-mode/Makefile
+++ b/haskell-mode/Makefile
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.haskell.org/haskell-mode/
COMMENT= Haskell mode for Emacs
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
SRCS= haskell-c.el haskell-cabal.el haskell-decl-scan.el \
haskell-doc.el haskell-font-lock.el haskell-ghci.el \
diff --git a/hpoj/Makefile b/hpoj/Makefile
index f0ff4916c3..34d4f2f8e1 100644
--- a/hpoj/Makefile
+++ b/hpoj/Makefile
@@ -20,10 +20,10 @@ DEPENDS+= bash-[0-9]*:../../shells/bash
USE_TOOLS+= gmake perl
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \
- --with-cups-backend=${PREFIX:Q}/libexec/cups/backend \
- --with-sane-backend=${PREFIX:Q}/lib/sane \
- --with-sane-etc=${PREFIX:Q}/etc/sane.d \
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
+ --with-cups-backend=${PREFIX}/libexec/cups/backend \
+ --with-sane-backend=${PREFIX}/lib/sane \
+ --with-sane-etc=${PREFIX}/etc/sane.d \
--with-usb=libusb \
--without-snmp \
--without-qt
diff --git a/hs-HsSVN/Makefile b/hs-HsSVN/Makefile
index fa848d6499..e6c260511a 100644
--- a/hs-HsSVN/Makefile
+++ b/hs-HsSVN/Makefile
@@ -9,7 +9,7 @@ COMMENT= Subversion binding for Haskell
LICENSE= public-domain
CONFIGURE_ARGS+= \
- --configure-option=--with-subversion-prefix=${PREFIX:Q}
+ --configure-option=--with-subversion-prefix=${PREFIX}
.include "../../wip/mk/haskell.mk"
.include "../../devel/hs-mtl/buildlink3.mk"
diff --git a/hs-terminfo/Makefile b/hs-terminfo/Makefile
index 3e990c8cf7..914b65e450 100644
--- a/hs-terminfo/Makefile
+++ b/hs-terminfo/Makefile
@@ -8,8 +8,8 @@ MAINTAINER= pho%cielonegro.org@localhost
COMMENT= Haskell bindings to the terminfo library
LICENSE= modified-bsd
-CONFIGURE_ARGS+= --configure-option=--with-curses-includes=${PREFIX:Q}/include/ncurses
-CONFIGURE_ARGS+= --configure-option=--with-curses-libraries=${PREFIX:Q}/lib
+CONFIGURE_ARGS+= --configure-option=--with-curses-includes=${PREFIX}/include/ncurses
+CONFIGURE_ARGS+= --configure-option=--with-curses-libraries=${PREFIX}/lib
USE_NCURSES= yes
.include "../../wip/mk/haskell.mk"
diff --git a/html2latex/Makefile b/html2latex/Makefile
index 13425bf52f..80ba64b059 100644
--- a/html2latex/Makefile
+++ b/html2latex/Makefile
@@ -17,7 +17,7 @@ NO_BUILD= YES
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC:Q}/html2latex ${DESTDIR}${PREFIX:Q}/bin/html2latex
- ${INSTALL_MAN} ${WRKSRC:Q}/html2latex.1 ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man1
+ ${INSTALL_SCRIPT} ${WRKSRC}/html2latex ${DESTDIR}${PREFIX}/bin/html2latex
+ ${INSTALL_MAN} ${WRKSRC}/html2latex.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
.include "../../mk/bsd.pkg.mk"
diff --git a/inetdxtra/Makefile b/inetdxtra/Makefile
index 126ec862d0..da9abc6ce7 100644
--- a/inetdxtra/Makefile
+++ b/inetdxtra/Makefile
@@ -13,7 +13,7 @@ COMMENT= Collection of inetd based servers
LICENSE= gnu-gpl-v2
PKG_SYSCONFSUBDIR= inetdxtra
-CFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR:Q}\"
+CFLAGS+= -DSYSCONFDIR=\"${PKG_SYSCONFDIR}\"
CFLAGS+= -DONELOG -DNORELATIVE -DCGI -DUPDATEPS
WRKSRC= ${WRKDIR}/inetdxtra
diff --git a/ipfm/Makefile b/ipfm/Makefile
index 9004f98065..c6c02791a6 100644
--- a/ipfm/Makefile
+++ b/ipfm/Makefile
@@ -11,8 +11,8 @@ COMMENT= Bandwidth analysis tool
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
EGDIR= ${PREFIX}/share/examples/ipfm
CONF_FILES= ${EGDIR}/ipfm.conf ${PKG_SYSCONFDIR}/ipfm.conf
diff --git a/java-jbluez/Makefile b/java-jbluez/Makefile
index 2624d20889..8478b44629 100644
--- a/java-jbluez/Makefile
+++ b/java-jbluez/Makefile
@@ -12,7 +12,7 @@ COMMENT= Java interface for BlueZ stack
USE_TOOLS= gmake
USE_JAVA= YES
-MAKE_ENV= JDK_HOME=${PKG_JAVA_HOME:Q}
+MAKE_ENV= JDK_HOME=${PKG_JAVA_HOME}
WRKSRC= ${WRKDIR}/src
diff --git a/jedit/Makefile b/jedit/Makefile
index 91877dc75d..320b0c2725 100644
--- a/jedit/Makefile
+++ b/jedit/Makefile
@@ -31,7 +31,7 @@ CHECK_SHLIBS_SUPPORTED= no
SUBST_CLASSES+= launcher
SUBST_STAGE.launcher= pre-configure
SUBST_FILES.launcher= jedit
-SUBST_SED.launcher+= -e 's,@PKG_JAVA_HOME@,'${PKG_JAVA_HOME:Q}',g'
+SUBST_SED.launcher+= -e 's,@PKG_JAVA_HOME@,'${PKG_JAVA_HOME}',g'
SUBST_SED.launcher+= -e 's,@JEDIT_HOME@,'${SHAREDIR:Q}',g'
post-extract:
diff --git a/jupp/Makefile b/jupp/Makefile
index ec5e7b7f27..c3a613450e 100644
--- a/jupp/Makefile
+++ b/jupp/Makefile
@@ -18,7 +18,7 @@ CONFLICTS+= joe-[0-9]*
BUILD_DEPENDS+= mksh-[0-9]*:../../shells/mksh
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/share/examples
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/examples
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/jython/Makefile b/jython/Makefile
index edddc148af..0b62b0c19e 100644
--- a/jython/Makefile
+++ b/jython/Makefile
@@ -24,7 +24,7 @@ JYTHON_NAME= ${PKGNAME}
ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* FreeBSD-*-* OpenBSD-*-*
PKG_JVMS_ACCEPTED= sun-jdk6 sun-jdk15
-MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME:Q}
+MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME}
REPLACE_PYTHON+= jython
diff --git a/l2tpd/Makefile b/l2tpd/Makefile
index 09569c7550..fc6f361005 100644
--- a/l2tpd/Makefile
+++ b/l2tpd/Makefile
@@ -16,10 +16,10 @@ NO_CONFIGURE= YES
PKG_SYSCONFSUBDIR?= l2tpd
DOCDIR= ${PREFIX}/share/doc/l2tpd
EGDIR= ${PREFIX}/share/examples/l2tpd
-CONF_FILES= ${EGDIR:Q}/l2tpd.conf.sample ${PKG_SYSCONFDIR:Q}/l2tpd.conf
-CONF_FILES+= ${EGDIR:Q}/l2tp-secrets.sample ${PKG_SYSCONFDIR:Q}/l2tpd-secrets
+CONF_FILES= ${EGDIR}/l2tpd.conf.sample ${PKG_SYSCONFDIR}/l2tpd.conf
+CONF_FILES+= ${EGDIR}/l2tp-secrets.sample ${PKG_SYSCONFDIR}/l2tpd-secrets
-CFLAGS+= -DPREFIX=\"${PREFIX:Q}\" -DSANITY
+CFLAGS+= -DPREFIX=\"${PREFIX}\" -DSANITY
SUBST_CLASSES+= options
SUBST_MESSAGE.options= Fixing build options.
@@ -50,14 +50,14 @@ SUBST_SED.l2tpd+= -e 's|%%SYSCONFDIR%%|${PKG_SYSCONFDIR}|g'
INSTALLATION_DIRS= bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/l2tpd ${DESTDIR}${PREFIX:Q}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/README ${DESTDIR}${DOCDIR:Q}
- ${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tpd.8 ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man8
- ${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tp-secrets.5 ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man5
- ${INSTALL_MAN} ${WRKSRC:Q}/doc/l2tpd.conf.5 ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man5
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/doc/l2tpd.conf.sample ${DESTDIR}${EGDIR:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/doc/l2tp-secrets.sample ${DESTDIR}${EGDIR:Q}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR:Q}
+ ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+ ${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+ ${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${DESTDIR}${EGDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/lde/Makefile b/lde/Makefile
index 2f906a349b..583d8f2bfc 100644
--- a/lde/Makefile
+++ b/lde/Makefile
@@ -14,7 +14,7 @@ COMMENT= Curses based file system viewer/editor for Linux
USE_NCURSES= YES # missing function termname
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
-CONFIGURE_ARGS+= --with-ncurses=${PREFIX:Q} \
+CONFIGURE_ARGS+= --with-ncurses=${PREFIX} \
--disable-root-sbin
.include "../../mk/bsd.prefs.mk"
diff --git a/leo/Makefile b/leo/Makefile
index eb90c1fc80..eb9fb6534e 100644
--- a/leo/Makefile
+++ b/leo/Makefile
@@ -21,23 +21,23 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-docutils
PYCOMPILEALL= ${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
post-extract:
- ${RM} -rf ${WRKSRC:Q}/scripts/CVS
- ${RM} -rf ${WRKSRC:Q}/extensions/Pmw/Pmw_1_2/tests/CVS
- ${RM} -rf ${WRKSRC:Q}/extensions/Pmw/Pmw_1_2/lib/CVS
- ${RM} -rf ${WRKSRC:Q}/extensions/Pmw/Pmw_1_2/doc/CVS
- ${RM} -rf ${WRKSRC:Q}/extensions/Pmw/Pmw_1_2/demos/CVS
- ${RM} -rf ${WRKSRC:Q}/extensions/Pmw/Pmw_1_2/contrib/CVS
- ${RM} -rf ${WRKSRC:Q}/extensions/Pmw/Pmw_1_2/bin/CVS
- ${RM} -rf ${WRKSRC:Q}/doc/html/tigris/CVS
- ${RM} -rf ${WRKSRC:Q}/doc/html/CVS
- ${RM} -rf ${WRKSRC:Q}/Icons/CVS
+ ${RM} -rf ${WRKSRC}/scripts/CVS
+ ${RM} -rf ${WRKSRC}/extensions/Pmw/Pmw_1_2/tests/CVS
+ ${RM} -rf ${WRKSRC}/extensions/Pmw/Pmw_1_2/lib/CVS
+ ${RM} -rf ${WRKSRC}/extensions/Pmw/Pmw_1_2/doc/CVS
+ ${RM} -rf ${WRKSRC}/extensions/Pmw/Pmw_1_2/demos/CVS
+ ${RM} -rf ${WRKSRC}/extensions/Pmw/Pmw_1_2/contrib/CVS
+ ${RM} -rf ${WRKSRC}/extensions/Pmw/Pmw_1_2/bin/CVS
+ ${RM} -rf ${WRKSRC}/doc/html/tigris/CVS
+ ${RM} -rf ${WRKSRC}/doc/html/CVS
+ ${RM} -rf ${WRKSRC}/Icons/CVS
pre-install:
- ${RM} -rf ${WRKSRC:Q}/install.orig
+ ${RM} -rf ${WRKSRC}/install.orig
do-install:
cd ${WRKSRC} && ${CHMOD} 755 ./install && \
- ${SETENV} PREFIX=${PREFIX:Q} PYTHONBIN=${PYTHONBIN:Q} \
+ ${SETENV} PREFIX=${PREFIX} PYTHONBIN=${PYTHONBIN:Q} \
./install
post-install:
diff --git a/libgda4/Makefile.common b/libgda4/Makefile.common
index 9341ec9374..703486b950 100644
--- a/libgda4/Makefile.common
+++ b/libgda4/Makefile.common
@@ -19,7 +19,7 @@ USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
BUILD_DIRS= .
diff --git a/libgda4/options.mk b/libgda4/options.mk
index 6465adfb1e..d17cf54a30 100644
--- a/libgda4/options.mk
+++ b/libgda4/options.mk
@@ -87,7 +87,7 @@ PLIST.mysql= yes
.if !empty(PKG_OPTIONS:Mpostgres)
PKGCONFIG_OVERRIDE+= libgda-postgres-4.0.pc.in
BUILD_DIRS+= providers/postgres
-CONFIGURE_ARGS+= --with-postgres=${PGSQL_PREFIX:Q}
+CONFIGURE_ARGS+= --with-postgres=${PGSQL_PREFIX}
. include "../../mk/pgsql.buildlink3.mk"
PLIST.postgres= yes
.else
diff --git a/libmpg123/Makefile b/libmpg123/Makefile
index 01f2f79f01..a1edb267aa 100644
--- a/libmpg123/Makefile
+++ b/libmpg123/Makefile
@@ -14,8 +14,8 @@ BUILD_DIRS= src/libmpg123
INSTALL_DIRS= src/libmpg123
post-install:
- ${INSTALL_DATA} ${WRKSRC:Q}/libmpg123.pc \
- ${DESTDIR:Q}${PREFIX:Q}/lib/pkgconfig
+ ${INSTALL_DATA} ${WRKSRC}/libmpg123.pc \
+ ${DESTDIR}${PREFIX}/lib/pkgconfig
.include "../../devel/libltdl/buildlink3.mk"
.include "mpg123-options.mk"
diff --git a/libmusclecard/Makefile b/libmusclecard/Makefile
index 4dc9af4f2d..3d232ddd81 100644
--- a/libmusclecard/Makefile
+++ b/libmusclecard/Makefile
@@ -14,7 +14,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --enable-muscledropdir=${PREFIX}/lib/pcsc-lite/drivers
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
.include "../../security/pcsc-lite/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/libneural/Makefile b/libneural/Makefile
index 56f62467bd..df1381b269 100644
--- a/libneural/Makefile
+++ b/libneural/Makefile
@@ -10,7 +10,7 @@ COMMENT= C++ library for creating 3-layer backpropagation neural networks
CONFIGURE_PREFIX+= ${PREFIX}
-MAKE_FLAGS+= prefix=${PREFIX:Q}
+MAKE_FLAGS+= prefix=${PREFIX}
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/libtermkey/Makefile b/libtermkey/Makefile
index 3f7339f2b6..b3a5fb1443 100644
--- a/libtermkey/Makefile
+++ b/libtermkey/Makefile
@@ -12,7 +12,7 @@ USE_LANGUAGES= c
USE_TOOLS+= pkg-config gmake
USE_LIBTOOL= yes
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
PKGCONFIG_OVERRIDE+= termkey.pc.in
diff --git a/libunibilium/Makefile b/libunibilium/Makefile
index 13eee0937f..6d8c59a453 100644
--- a/libunibilium/Makefile
+++ b/libunibilium/Makefile
@@ -14,7 +14,7 @@ USE_LANGUAGES= c
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
PKGCONFIG_OVERRIDE+= unibilium.pc.in
diff --git a/libvterm/Makefile b/libvterm/Makefile
index 6eed4d41d3..938f309708 100644
--- a/libvterm/Makefile
+++ b/libvterm/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES= c
USE_TOOLS+= pkg-config gmake perl
USE_LIBTOOL= yes
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
+MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}
PKGCONFIG_OVERRIDE+= vterm.pc.in
diff --git a/linux-kbd/Makefile b/linux-kbd/Makefile
index a9b7a191fa..e96e444f4b 100644
--- a/linux-kbd/Makefile
+++ b/linux-kbd/Makefile
@@ -19,7 +19,7 @@ HAS_CONFIGURE= YES
USE_TOOLS+= gmake msgfmt # and xgettext
USE_PKGLOCALEDIR= YES
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --mandir=/man
.if !exists(/usr/bin/lex)
diff --git a/linux-kernel-headers/Makefile b/linux-kernel-headers/Makefile
index 5264b828d3..701d8a8cdb 100644
--- a/linux-kernel-headers/Makefile
+++ b/linux-kernel-headers/Makefile
@@ -13,16 +13,16 @@ PLIST_SRC+= ${PKGDIR}/PLIST.common
INSTALLATION_DIRS= include
do-build:
- cd ${WRKSRC:Q} && ${SETENV} ${MAKE_ENV} ${GMAKE} include/linux/version.h
+ cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} include/linux/version.h
do-install:
- cd ${WRKSRC:Q}/include && pax -rw -pe linux ${DESTDIR}${PREFIX:Q}/include
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/include/asm
- ${RM} ${DESTDIR}${PREFIX:Q}/include/asm-generic
- ${LN} -s ${PREFIX:Q}/include/asm ${DESTDIR}${PREFIX:Q}/include/asm-generic
- cd ${WRKSRC:Q}/include/asm-${LOWER_ARCH:Q} && \
- pax -rw -pe . ${DESTDIR}${PREFIX:Q}/include/asm
- cd ${WRKSRC:Q}/include/asm-generic && \
- pax -rw -pe . ${DESTDIR}${PREFIX:Q}/include/asm
+ cd ${WRKSRC}/include && pax -rw -pe linux ${DESTDIR}${PREFIX}/include
+ ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/asm
+ ${RM} ${DESTDIR}${PREFIX}/include/asm-generic
+ ${LN} -s ${PREFIX}/include/asm ${DESTDIR}${PREFIX}/include/asm-generic
+ cd ${WRKSRC}/include/asm-${LOWER_ARCH:Q} && \
+ pax -rw -pe . ${DESTDIR}${PREFIX}/include/asm
+ cd ${WRKSRC}/include/asm-generic && \
+ pax -rw -pe . ${DESTDIR}${PREFIX}/include/asm
.include "../../mk/bsd.pkg.mk"
diff --git a/linux-modutils-old/Makefile b/linux-modutils-old/Makefile
index f11c1121e8..3b42d9456e 100644
--- a/linux-modutils-old/Makefile
+++ b/linux-modutils-old/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= Linux-*-* # This is for the Linux kernel
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --exec-prefix=${PREFIX:Q} --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --exec-prefix=${PREFIX} --sysconfdir=${PKG_SYSCONFDIR}
USE_TOOLS+= gmake
post-install:
diff --git a/linux-modutils/Makefile b/linux-modutils/Makefile
index cb5b742cda..f928879cb2 100644
--- a/linux-modutils/Makefile
+++ b/linux-modutils/Makefile
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= Linux-*-* # This is for the Linux kernel
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --exec-prefix=${PREFIX:Q} --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --exec-prefix=${PREFIX} --sysconfdir=${PKG_SYSCONFDIR}
USE_TOOLS+= gmake
RCD_SCRIPTS= modutils
diff --git a/linux24-kernel-headers/Makefile b/linux24-kernel-headers/Makefile
index 8097520112..9bfea796aa 100644
--- a/linux24-kernel-headers/Makefile
+++ b/linux24-kernel-headers/Makefile
@@ -12,16 +12,16 @@ PLIST_SRC+= ${PKGDIR}/PLIST.${LOWER_ARCH:Q}
PLIST_SRC+= ${PKGDIR}/PLIST.common
do-build:
- (cd ${WRKSRC:Q} && \
+ (cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${GMAKE} include/linux/version.h)
do-install:
- (cd ${WRKSRC:Q}/include && ${GTAR} -cf - linux) | \
- ${GTAR} -xf - -C ${PREFIX:Q}/include
- ${INSTALL_DATA_DIR} ${PREFIX:Q}/include/asm
- (cd ${WRKSRC:Q}/include/asm-generic && ${GTAR} -cf - *) | \
- ${GTAR} -xf - -C ${PREFIX:Q}/include/asm
- (cd ${WRKSRC:Q}/include/asm-${LOWER_ARCH:Q} && ${GTAR} -cf - *) | \
- ${GTAR} -xf - -C ${PREFIX:Q}/include/asm
+ (cd ${WRKSRC}/include && ${GTAR} -cf - linux) | \
+ ${GTAR} -xf - -C ${PREFIX}/include
+ ${INSTALL_DATA_DIR} ${PREFIX}/include/asm
+ (cd ${WRKSRC}/include/asm-generic && ${GTAR} -cf - *) | \
+ ${GTAR} -xf - -C ${PREFIX}/include/asm
+ (cd ${WRKSRC}/include/asm-${LOWER_ARCH:Q} && ${GTAR} -cf - *) | \
+ ${GTAR} -xf - -C ${PREFIX}/include/asm
.include "../../mk/bsd.pkg.mk"
diff --git a/ltrace/Makefile b/ltrace/Makefile
index c2b083af14..5ddc8aeba6 100644
--- a/ltrace/Makefile
+++ b/ltrace/Makefile
@@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM= Linux-*-*
WRKSRC= ${WRKDIR}/ltrace-0.3.36
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# maybe following should be done in devel/libelf/buildlink3.mk instead
#CFLAGS+= -I${BUILDLINK_PREFIX.libelf}/include/libelf
CPPFLAGS+= -I${BUILDLINK_PREFIX.libelf}/include/libelf
diff --git a/lzs-lkm/Makefile b/lzs-lkm/Makefile
index 396b70b885..d70f5e0af8 100644
--- a/lzs-lkm/Makefile
+++ b/lzs-lkm/Makefile
@@ -13,12 +13,12 @@ COMMENT= NetBSD kernel module for LZS decompression with PPP
DEPENDS+= pppd>=2.4.3:../../net/pppd
ONLY_FOR_PLATFORM= NetBSD-*-*
-MESSAGE_SUBST+= PREFIX=${PREFIX:Q}
+MESSAGE_SUBST+= PREFIX=${PREFIX}
NO_CONFIGURE= yes
INSTALLATION_DIRS= lkm
-WRKSRC= ${WRKDIR:Q}/ppp-lzs-1.2
+WRKSRC= ${WRKDIR}/ppp-lzs-1.2
.include "../../mk/bsd.prefs.mk"
@@ -51,6 +51,6 @@ INSTALLATION_DIRS= lkm
do-install:
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${WRKSRC:Q}/lkm/lzs.o ${DESTDIR}${PREFIX:Q}/lkm/lzs.o
+ ${WRKSRC}/lkm/lzs.o ${DESTDIR}${PREFIX}/lkm/lzs.o
.include "../../mk/bsd.pkg.mk"
diff --git a/man-db/Makefile b/man-db/Makefile
index b02b04d1a4..3091c84e71 100644
--- a/man-db/Makefile
+++ b/man-db/Makefile
@@ -36,7 +36,7 @@ GNU_CONFIGURE= YES
USE_TOOLS+= gmake
MAKE_FILE= GNUmakefile
CONFIGURE_ARGS+= --mandir=${PREFIX}/man
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --enable-setuid=${MAN_DB_USER:Q}
CONF_FILES= ${PREFIX}/share/examples/man-db/man_db.conf ${PKG_SYSCONFDIR}/man_db.conf
@@ -52,7 +52,7 @@ pre-install:
USE_DB185= YES
.include "../../mk/bdb.buildlink3.mk"
.if ${BDB_TYPE} != "native"
-CONFIGURE_ARGS+= --with-db=${BDB_TYPE:Q}
+CONFIGURE_ARGS+= --with-db=${BDB_TYPE}
.endif
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/man/Makefile b/man/Makefile
index da50a27923..9d691c257b 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -22,7 +22,7 @@ PKGMANDIR?= man
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= -confdir ${PKG_SYSCONFDIR} +sgid +fhs +lang all
-CONFIGURE_ARGS+= -prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= -prefix=${PREFIX}
CONFIGURE_ARGS+= -mandir=${PREFIX}/${PKGMANDIR}
CONFIGURE_ENV+= deflocale=${PREFIX}/${PKGLOCALEDIR}/locale/
diff --git a/marsyas/Makefile b/marsyas/Makefile
index e90b9d99af..3a46751f8c 100644
--- a/marsyas/Makefile
+++ b/marsyas/Makefile
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --without-matlab
-CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline:Q}
+CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
CONFIGURE_ARGS+= --enable-oss
CONFIGURE_ARGS+= --disable-midi
diff --git a/marsyas/options.mk b/marsyas/options.mk
index 7bc00a2132..10e1fced85 100644
--- a/marsyas/options.mk
+++ b/marsyas/options.mk
@@ -7,7 +7,7 @@ PKG_SUGGESTED_OPTIONS= mad
.if !empty(PKG_OPTIONS:Mmad)
#
. include "../../audio/libmad/buildlink3.mk"
-CONFIGURE_ARGS+= --with-mad=${BUILDLINK_PREFIX.libmad:Q}
+CONFIGURE_ARGS+= --with-mad=${BUILDLINK_PREFIX.libmad}
.else
CONFIGURE_ARGS+= --without-mad
.endif
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --without-mad
.if !empty(PKG_OPTIONS:Mvorbis)
#
. include "../../audio/libvorbis/buildlink3.mk"
-CONFIGURE_ARGS+= --with-vorbis=${BUILDLINK_PREFIX.libvorbis:Q}
+CONFIGURE_ARGS+= --with-vorbis=${BUILDLINK_PREFIX.libvorbis}
.else
CONFIGURE_ARGS+= --without-vorbis
.endif
diff --git a/meep-openmpi/Makefile b/meep-openmpi/Makefile
index 342a83694a..fabfd74752 100644
--- a/meep-openmpi/Makefile
+++ b/meep-openmpi/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-libctl=${PREFIX}/share/libctl \
--prefix=${MPI_PREFIX:Q} \
--mandir=${MPI_PREFIX:Q}/man
-MESSAGE_SUBST+= PREFIX=${PREFIX:Q}
+MESSAGE_SUBST+= PREFIX=${PREFIX}
.include "../../wip/mpb-openmpi/buildlink3.mk"
.include "../../math/gsl/buildlink3.mk"
diff --git a/meep/Makefile b/meep/Makefile
index 883ff385aa..69efe0f5c4 100644
--- a/meep/Makefile
+++ b/meep/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES= c c++ fortran77
CONFIGURE_ARGS+= --with-libctl=${BUILDLINK_PREFIX.libctl}/share/libctl
-MESSAGE_SUBST+= PREFIX=${PREFIX:Q}
+MESSAGE_SUBST+= PREFIX=${PREFIX}
TEST_TARGET= check
diff --git a/mic-paren/Makefile b/mic-paren/Makefile
index 77160932d7..4ad635c8a6 100644
--- a/mic-paren/Makefile
+++ b/mic-paren/Makefile
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v3
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
do-build:
cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el
diff --git a/milter-greylist-devel/options.mk b/milter-greylist-devel/options.mk
index 22cdbd3303..810707f293 100644
--- a/milter-greylist-devel/options.mk
+++ b/milter-greylist-devel/options.mk
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-libspf2
.else
.include "../../mail/libspf2/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libspf2=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-libspf2=${PREFIX}
.endif
###
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-libGeoIP
.else
.include "../../net/GeoIP/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libGeoIP=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-libGeoIP=${PREFIX}
.endif
###
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+= --disable-openldap
.include "../../www/curl/buildlink3.mk"
.include "../../databases/openldap-client/buildlink3.mk"
-CONFIGURE_ARGS+= --with-openldap=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-openldap=${PREFIX}
.endif
###
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --disable-dkim
DEPENDS+= dkim-milter>=2.6:../../mail/dkim-milter
.include "../../mail/dkim-milter/buildlink3.mk"
-CONFIGURE_ARGS+= --with-libdkim=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-libdkim=${PREFIX}
.endif
###
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --disable-p0f
.else
DEPENDS+= p0f-[0-9]*:../../security/p0f
-CONFIGURE_ARGS+= --with-p0f=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-p0f=${PREFIX}
.endif
###
diff --git a/modular-xorg-server-dfbsd/Makefile.common b/modular-xorg-server-dfbsd/Makefile.common
index f18998a0d7..8126d52677 100644
--- a/modular-xorg-server-dfbsd/Makefile.common
+++ b/modular-xorg-server-dfbsd/Makefile.common
@@ -25,7 +25,7 @@ OWN_DIRS+= ${VARBASE}/log
OWN_DIRS+= ${XKB_OUTPUT_DIR}
XKB_OUTPUT_DIR?= ${VARBASE}/db/xkb # XXX sync with xkeyboard-config
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --with-xkb-output=${XKB_OUTPUT_DIR:Q}
# .if !empty(USE_TOOLS:Mauto*)
@@ -47,7 +47,7 @@ CONFIGURE_ENV+= ac_cv_tls=no
CONFIGURE_ARGS+= --disable-glx-tls
. endif
.endif
-CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM:Q}
+CONFIGURE_ARGS+= --with-os-name=${MACHINE_PLATFORM}
CONFIGURE_ARGS+= --with-fontrootdir=${PREFIX}/share/fonts/X11
diff --git a/mono-git/Makefile b/mono-git/Makefile
index 88283803ae..e95b553a2e 100644
--- a/mono-git/Makefile
+++ b/mono-git/Makefile
@@ -14,7 +14,7 @@ LICENSE= mit AND gnu-gpl-v2 AND gnu-lgpl-v2 AND apache-2.0
BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
-ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} PLATFORM=
+ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} PLATFORM=
WRKSRC= ${WRKDIR}/mono
USE_TOOLS+= bash:run bison gmake gtar msgfmt perl:run pkg-config autoconf automake autoreconf gsed
@@ -23,7 +23,7 @@ USE_LANGUAGES+= c c99 c++
EXTRACT_USING= gtar
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} --with-icu=yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} --with-icu=yes
CONFIGURE_ARGS+= --with-preview=yes --with-libgdiplus=installed
CONFIGURE_ARGS+= --disable-dtrace --with-gc=none
diff --git a/mono-git/buildlink3.mk b/mono-git/buildlink3.mk
index cc5adca4ca..67f22c708f 100644
--- a/mono-git/buildlink3.mk
+++ b/mono-git/buildlink3.mk
@@ -8,7 +8,7 @@ MONO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mono+= mono>=4
BUILDLINK_ABI_DEPENDS.mono?= mono>=4.0.1
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
-ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q}
+ALL_ENV+= MONO_SHARED_DIR=${WRKDIR}
BUILDLINK_CONTENTS_FILTER.mono= ${EGREP} '(^include/|^lib/)'
.include "../../textproc/icu/buildlink3.mk"
diff --git a/mono/Makefile b/mono/Makefile
index 794c168630..629b91c5c8 100644
--- a/mono/Makefile
+++ b/mono/Makefile
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
CONFLICTS= pnet-[0-9]* mcsim-[0-9]* lc-[0-9]*
-ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} PLATFORM=
+ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} PLATFORM=
USE_TOOLS+= bash:run bison gmake gtar msgfmt perl:run pkg-config
USE_LIBTOOL= yes
@@ -22,7 +22,7 @@ USE_LANGUAGES+= c c99 c++
EXTRACT_USING= gtar
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} --with-icu=yes
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} --with-icu=yes
CONFIGURE_ARGS+= --with-preview=yes --with-libgdiplus=installed
CONFIGURE_ARGS+= --disable-dtrace --with-gc=none
diff --git a/mono/buildlink3.mk b/mono/buildlink3.mk
index cc5adca4ca..67f22c708f 100644
--- a/mono/buildlink3.mk
+++ b/mono/buildlink3.mk
@@ -8,7 +8,7 @@ MONO_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.mono+= mono>=4
BUILDLINK_ABI_DEPENDS.mono?= mono>=4.0.1
BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono
-ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q}
+ALL_ENV+= MONO_SHARED_DIR=${WRKDIR}
BUILDLINK_CONTENTS_FILTER.mono= ${EGREP} '(^include/|^lib/)'
.include "../../textproc/icu/buildlink3.mk"
diff --git a/mpc-el/Makefile b/mpc-el/Makefile
index 4660891090..14023dc994 100644
--- a/mpc-el/Makefile
+++ b/mpc-el/Makefile
@@ -12,7 +12,7 @@ COMMENT= Emacs front end to the Music Player Daemon
USE_TOOLS+= gmake
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
do-build:
cd ${WRKSRC} && \
diff --git a/mpg123-svn/Makefile b/mpg123-svn/Makefile
index b90f676d35..184f3947b0 100644
--- a/mpg123-svn/Makefile
+++ b/mpg123-svn/Makefile
@@ -36,8 +36,8 @@ CONFIGURE_ARGS+= LIBS=${BUILDLINK_LDADD.oss:Q}
.include "../../mk/oss.buildlink3.mk"
.endif
-CPPFLAGS+= -DDEVOSSAUDIO=\"${DEVOSSAUDIO:Q}\"
-CPPFLAGS+= -DDEVOSSSOUND=\"${DEVOSSSOUND:Q}\"
+CPPFLAGS+= -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\"
+CPPFLAGS+= -DDEVOSSSOUND=\"${DEVOSSSOUND}\"
SVN_REPOSITORIES= mpg123
#SVN_TAG= {${MPG123_TAG}}
diff --git a/mplayer-mt/Makefile.common b/mplayer-mt/Makefile.common
index 13d2e53eb3..d15dddc610 100644
--- a/mplayer-mt/Makefile.common
+++ b/mplayer-mt/Makefile.common
@@ -27,7 +27,7 @@ HAS_CONFIGURE= YES
PTHREAD_OPTS+= require
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
# --with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
--with-extralibdir="${LOCALBASE}/lib" \
--disable-dvdread-internal --disable-smb
@@ -37,7 +37,7 @@ ONLY_FOR_COMPILER= gcc
# The configure script attempts to test-execute compiled programs in /tmp,
# but that directory may be mounted as noexec; work this around by setting
# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
+CONFIGURE_ENV+= TMPDIR=${WRKDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/mplayer-snapshot-share/Makefile.common b/mplayer-snapshot-share/Makefile.common
index 3f02d84f6a..6cd4a75a83 100644
--- a/mplayer-snapshot-share/Makefile.common
+++ b/mplayer-snapshot-share/Makefile.common
@@ -41,7 +41,7 @@ HAS_CONFIGURE= YES
PTHREAD_OPTS+= require
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
#--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
--with-extralibdir="${LOCALBASE}/lib" \
--disable-dvdread-internal --disable-smb
@@ -51,7 +51,7 @@ ONLY_FOR_COMPILER= gcc
# The configure script attempts to test-execute compiled programs in /tmp,
# but that directory may be mounted as noexec; work this around by setting
# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+= TMPDIR=${WRKDIR:Q}
+CONFIGURE_ENV+= TMPDIR=${WRKDIR}
.include "../../mk/bsd.prefs.mk"
diff --git a/mppdec/Makefile b/mppdec/Makefile
index a84846fe3f..f5893fbbb8 100644
--- a/mppdec/Makefile
+++ b/mppdec/Makefile
@@ -12,7 +12,7 @@ COMMENT= Musepack (MPC) audio file decoder
USE_TOOLS+= gmake
-MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q}
+MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO}
.include "../../mk/bsd.prefs.mk"
diff --git a/multitail/Makefile b/multitail/Makefile
index 94bcd44b5d..0374fdd02a 100644
--- a/multitail/Makefile
+++ b/multitail/Makefile
@@ -16,8 +16,8 @@ USE_NCURSES= yes # Needs the <panel> library.
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/multitail \
share/examples/multitail
-CONF_FILES= ${PREFIX:Q}/share/examples/multitail/multitail.conf \
- ${PKG_SYSCONFDIR:Q}/multitail.conf
+CONF_FILES= ${PREFIX}/share/examples/multitail/multitail.conf \
+ ${PKG_SYSCONFDIR}/multitail.conf
SUBST_CLASSES+= path
SUBST_MESSAGE.path= Adjust DESTDIR and PREFIX
@@ -33,12 +33,12 @@ LDFLAGS+= -lsocket -lnsl
.endif
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/multitail ${DESTDIR}${PREFIX:Q}/bin/
- ${INSTALL_MAN} ${WRKSRC:Q}/multitail.1 ${DESTDIR}${PREFIX:Q}/man/man1/
- ${INSTALL_DATA} ${WRKSRC:Q}/multitail.conf \
- ${DESTDIR}${PREFIX:Q}/share/examples/multitail/
- cd ${WRKSRC:Q} && ${INSTALL_DATA} *.txt manual*.html \
- ${DESTDIR}${PREFIX:Q}/share/doc/multitail/
+ ${INSTALL_PROGRAM} ${WRKSRC}/multitail ${DESTDIR}${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/multitail.1 ${DESTDIR}${PREFIX}/man/man1/
+ ${INSTALL_DATA} ${WRKSRC}/multitail.conf \
+ ${DESTDIR}${PREFIX}/share/examples/multitail/
+ cd ${WRKSRC} && ${INSTALL_DATA} *.txt manual*.html \
+ ${DESTDIR}${PREFIX}/share/doc/multitail/
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mxallowd/Makefile b/mxallowd/Makefile
index 5f93f2b06f..7de385e51d 100644
--- a/mxallowd/Makefile
+++ b/mxallowd/Makefile
@@ -9,7 +9,7 @@ HAS_CONFIGURE= YES
USE_TOOLS+= gmake
CONFIGURE_ARGS+= --prefix=/usr/pkg
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR:Q}
+CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
CONF_FILES= ${PREFIX}/share/doc/mxallowd/samples/mxallowd.conf ${PKG_SYSCONFDIR}/mxallowd.conf
RCD_SCRIPTS+= mxallowd
diff --git a/mysql++/Makefile b/mysql++/Makefile
index 81188e29c9..cbe49bf36e 100644
--- a/mysql++/Makefile
+++ b/mysql++/Makefile
@@ -13,7 +13,7 @@ COMMENT= Complex C++ API for MySQL${MYSQL_VER}
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-mysql=${BUILDLINK_PREFIX.mysql-client:Q} --disable-examples
+CONFIGURE_ARGS= --with-mysql=${BUILDLINK_PREFIX.mysql-client} --disable-examples
#USE_LDCONFIG= yes
USE_LANGUAGES+= c c++
diff --git a/mysqltcl/Makefile b/mysqltcl/Makefile
index 3f2d3de6f6..fde4fdb700 100644
--- a/mysqltcl/Makefile
+++ b/mysqltcl/Makefile
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
DIST_SUBDIR= ${PKGNAME_NOREV}
-CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl:Q}/lib
+CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
CONFIGURE_ARGS+= --with-tclinclude=${BUILDLINK_PREFIX.tcl}/include/tcl/generic
CONFIGURE_ARGS+= --with-mysql-include=${LOCALBASE}/include/mysql
CONFIGURE_ARGS+= --with-mysql-lib=${LOCALBASE}/lib/mysql
diff --git a/nag/Makefile b/nag/Makefile
index 3c63a7390d..2b4ce633db 100644
--- a/nag/Makefile
+++ b/nag/Makefile
@@ -40,7 +40,7 @@ REPLACE_FILES.php= scripts/import_vtodos.php \
scripts/upgrades/create_missing_add_histories_sql.php
MESSAGE_SUBST+= NAGDIR=${NAGDIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
PKG_SYSCONFSUBDIR?= httpd
USE_PKGINSTALL= YES
diff --git a/nautilus/Makefile b/nautilus/Makefile
index 8b8ffcf412..c60a2ae874 100644
--- a/nautilus/Makefile
+++ b/nautilus/Makefile
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= libnautilus-extension/libnautilus-extension.pc.in
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
GCONF_SCHEMAS= apps_nautilus_preferences.schemas
diff --git a/ncbi-bin/Makefile b/ncbi-bin/Makefile
index 5e9e43517d..59e219b2ea 100644
--- a/ncbi-bin/Makefile
+++ b/ncbi-bin/Makefile
@@ -13,7 +13,7 @@ COMMENT= Portable modular software for molecular biology
WRKSRC= ${WRKDIR}/ncbi
-MAKE_ENV+= PREFIX=${PREFIX:Q}
+MAKE_ENV+= PREFIX=${PREFIX}
INSTALLATION_DIRS= bin libexec/cgi-bin
diff --git a/ncbi-lib/Makefile b/ncbi-lib/Makefile
index 6e650c446c..938db92d2f 100644
--- a/ncbi-lib/Makefile
+++ b/ncbi-lib/Makefile
@@ -13,7 +13,7 @@ COMMENT= Portable, modular software for molecular biology
WRKSRC= ${WRKDIR}/ncbi
-MAKE_ENV+= PREFIX=${PREFIX:Q}
+MAKE_ENV+= PREFIX=${PREFIX}
post-extract:
${MV} ${WRKSRC}/make/makedis.csh ${WRKSRC}/make/makedis.csh.in
diff --git a/netbsd-light-desktop-artwork/Makefile b/netbsd-light-desktop-artwork/Makefile
index e1960378e1..00fa1f3261 100644
--- a/netbsd-light-desktop-artwork/Makefile
+++ b/netbsd-light-desktop-artwork/Makefile
@@ -35,7 +35,7 @@ do-install:
${INSTALL_DATA} \
${WRKSRC}/usr/share/lxpanel/images/lubuntu-background.png \
${DESTDIR}${PREFIX}/share/lxpanel/images/netbsd-light-desktop-background.png
- cd ${WRKSRC:Q}/usr && \
+ cd ${WRKSRC}/usr && \
pax -rw -s ',.*.orig$$,,' \
share/themes/NetBSD-default ${DESTDIR}${PREFIX}/
diff --git a/netbsd-light-desktop-default-settings/Makefile b/netbsd-light-desktop-default-settings/Makefile
index c0110d03ea..73c4795738 100644
--- a/netbsd-light-desktop-default-settings/Makefile
+++ b/netbsd-light-desktop-default-settings/Makefile
@@ -66,9 +66,9 @@ do-configure:
do-install:
${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- cd ${WRKSRC:Q} && \
+ cd ${WRKSRC} && \
pax -rw -s ',.*/CVS.*,,' -s ',.*.orig$$,,' bin share ${DESTDIR}${PREFIX}/
- cd ${WRKSRC:Q}/etc && \
+ cd ${WRKSRC}/etc && \
pax -rw -s ',.*/CVS.*,,' -s ',.*.orig$$,,' xdg \
${DESTDIR}${PREFIX}/share/examples/netbsd-light-desktop/
diff --git a/netkit-base/Makefile b/netkit-base/Makefile
index fb6fe61d79..ba463943db 100644
--- a/netkit-base/Makefile
+++ b/netkit-base/Makefile
@@ -15,7 +15,7 @@ ONLY_FOR_PLATFORM= Linux-*-*
USE_TOOLS+= gmake
-MAKE_ENV+= _PATH_INETDCONF=${PKG_SYSCONFDIR:Q}
+MAKE_ENV+= _PATH_INETDCONF=${PKG_SYSCONFDIR}
RCD_SCRIPTS= inetd
CONF_FILES= ${PREFIX}/share/examples/${PKGBASE}/inetd.conf ${PKG_SYSCONFDIR}/inetd.conf
diff --git a/netkit-routed/Makefile b/netkit-routed/Makefile
index 27ed46b456..bd9857a206 100644
--- a/netkit-routed/Makefile
+++ b/netkit-routed/Makefile
@@ -16,6 +16,6 @@ HAS_CONFIGURE= yes
USE_TOOLS+= gmake
ONLY_FOR_PLATFORM= Linux-*-*
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
.include "../../mk/bsd.pkg.mk"
diff --git a/netkit-telnet/Makefile b/netkit-telnet/Makefile
index cf11366701..59c02e3e5f 100644
--- a/netkit-telnet/Makefile
+++ b/netkit-telnet/Makefile
@@ -16,7 +16,7 @@ USE_LANGUAGES= c c++
USE_TOOLS+= gmake
ONLY_FOR_PLATFORM= Linux-*-*
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
SUBST_CLASSES+= warn
SUBST_STAGE.warn= pre-configure
diff --git a/nqp/Makefile b/nqp/Makefile
index e9c5d5aa30..0d9e8d78d3 100644
--- a/nqp/Makefile
+++ b/nqp/Makefile
@@ -19,7 +19,7 @@ USE_TOOLS+= perl gmake
HAS_CONFIGURE= yes
CONFIG_SHELL= ${PERL5}
CONFIGURE_SCRIPT= Configure.pl
-CONFIGURE_ARGS= --prefix=${PREFIX:Q} \
+CONFIGURE_ARGS= --prefix=${PREFIX} \
--backends=moar
BUILDLINK_API_DEPENDS.MoarVM+= MoarVM>=2017.07
diff --git a/nspr-hg/Makefile b/nspr-hg/Makefile
index 3d1e8dce37..8887e3611b 100644
--- a/nspr-hg/Makefile
+++ b/nspr-hg/Makefile
@@ -29,7 +29,7 @@ REPLACE_PERL+= pr/src/misc/compile-et.pl
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --with-pthreads
-CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr
+CONFIGURE_ENV+= LIBRUNPATH=${PREFIX}/lib/nspr
.include "../../mk/bsd.prefs.mk"
diff --git a/opal/Makefile b/opal/Makefile
index 63d1291529..cc3dd35f3c 100644
--- a/opal/Makefile
+++ b/opal/Makefile
@@ -39,7 +39,7 @@ PLIST_SUBST+= OPALLIBDIR=${OPALLIBDIR:Q}
.if "${MACHINE_ARCH}" == "i386"
PLIST_SUBST+= LIBARCH=x86
.else
-PLIST_SUBST+= LIBARCH=${MACHINE_ARCH:Q}
+PLIST_SUBST+= LIBARCH=${MACHINE_ARCH}
.endif
post-install:
diff --git a/openca/Makefile b/openca/Makefile
index 8547cb813b..0242bca51a 100644
--- a/openca/Makefile
+++ b/openca/Makefile
@@ -53,16 +53,16 @@ MKDIRS= access_control servers bp bp/functions database \
rbac rbac/cmds scep
OWN_DIRS_PERMS+= ${VARBASE}/openca ${APACHE_USER} ${APACHE_GROUP} 0750
MESSAGE_SUBST+= OPENCA_HOST=${OPENCA_HOST:Q} \
- PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+ PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
RCD_SCRIPTS= openca
PKG_USERS= ${OPENCA_USER:Q}:${OPENCA_GROUP:Q}::OpenCA\ user
PKG_GROUPS= ${OPENCA_GROUP:Q}
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
CONFIGURE_ARGS+= --with-lib-prefix=${PREFIX}/lib/openca
-CONFIGURE_ARGS+= --with-var-prefix=${VARBASE:Q}/openca
-CONFIGURE_ARGS+= --with-etc-prefix=${EGDIR:Q}
+CONFIGURE_ARGS+= --with-var-prefix=${VARBASE}/openca
+CONFIGURE_ARGS+= --with-etc-prefix=${EGDIR}
CONFIGURE_ARGS+= --with-openca-prefix=${PREFIX}/share/openca
CONFIGURE_ARGS+= --with-openca-user=${OPENCA_USER:Q}
CONFIGURE_ARGS+= --with-openca-group=${OPENCA_GROUP:Q}
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+= --disable-external-modules
.for f in ${SERVERS}
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
- ${ROOT_USER:Q} ${APACHE_GROUP:Q} 0644
+ ${ROOT_USER} ${APACHE_GROUP:Q} 0644
EGFILES+= ${EGDIR}/${f}
.endfor
diff --git a/opendchub/Makefile b/opendchub/Makefile
index c23075b043..4d6640f331 100644
--- a/opendchub/Makefile
+++ b/opendchub/Makefile
@@ -21,18 +21,18 @@ DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
INSTALLATION_DIRS+= share/examples share/doc
post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR:Q}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/Samplescripts/functestbot.plz \
- ${DESTDIR:Q}${EGDIR:Q}
+ ${DESTDIR}${EGDIR}
${INSTALL_DATA} ${WRKSRC}/Samplescripts/subtestbot.plz \
- ${DESTDIR:Q}${EGDIR:Q}
- ${INSTALL_DATA_DIR} ${DESTDIR:Q}${DOCDIR:Q}
+ ${DESTDIR}${EGDIR}
+ ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR:Q}
${INSTALL_DATA} ${WRKSRC}/Documentation/configfiles \
- ${DESTDIR:Q}${DOCDIR:Q}
+ ${DESTDIR}${DOCDIR:Q}
${INSTALL_DATA} ${WRKSRC}/Documentation/general \
- ${DESTDIR:Q}${DOCDIR:Q}
+ ${DESTDIR}${DOCDIR:Q}
${INSTALL_DATA} ${WRKSRC}/Documentation/scriptdoc \
- ${DESTDIR:Q}${DOCDIR:Q}
+ ${DESTDIR}${DOCDIR:Q}
.include "../../lang/perl5/buildlink3.mk"
.include "../../mk/bsd.prefs.mk"
diff --git a/openh264/Makefile b/openh264/Makefile
index 0c5c5c74c0..f37056bd34 100644
--- a/openh264/Makefile
+++ b/openh264/Makefile
@@ -20,8 +20,8 @@ BUILD_TARGET= all plugin
PKGCONFIG_OVERRIDE+= openh264.pc.in
PLIST_SUBST+= VERSION=${VERSION:Q}
-MAKE_FLAGS+= PREFIX=${PREFIX:Q}
-MAKE_FLAGS+= ARCH=${MACHINE_ARCH:Q}
+MAKE_FLAGS+= PREFIX=${PREFIX}
+MAKE_FLAGS+= ARCH=${MACHINE_ARCH}
MAKE_FLAGS+= HAVE_GMP_API=Yes
CFLAGS+= -I${BUILDLINK_PREFIX.gmp-api}/include/gmp-api
diff --git a/openlogos/Makefile b/openlogos/Makefile
index a7f7522446..57836bd042 100644
--- a/openlogos/Makefile
+++ b/openlogos/Makefile
@@ -14,7 +14,7 @@ USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_JAVA= yes
-CONFIGURE_ARGS+= --with-java=${PKG_JAVA_HOME:Q}
+CONFIGURE_ARGS+= --with-java=${PKG_JAVA_HOME}
CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -D__int32_t=int32_t -Du_int16_t=uint16_t -D__int16_t=int16_t -Dstrerror_r\(x,y,z\)=strerror\(x\)
diff --git a/opensc/Makefile b/opensc/Makefile
index 15b786a20b..783d2dc597 100644
--- a/opensc/Makefile
+++ b/opensc/Makefile
@@ -30,7 +30,7 @@ USE_TOOLS+= autoreconf autoconf automake
AUTOCONF_REQD= 2.60
AUTOMAKE_REQD= 1.10
pre-configure:
- cd ${WRKSRC:Q} && \
+ cd ${WRKSRC} && \
./bootstrap \
-s ${OPENSC_VERSION_SUFFIX:Q} \
-r ${OPENSC_VERSION_REVISION:Q}
@@ -43,7 +43,7 @@ pre-configure:
#CONFIGURE_ARGS+= --disable-sensitive-logging
# Is this necessary (and non-default)?
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
# This is perhaps an upstream bug.
CONFIGURE_ENV+= PCSC_CFLAGS=-I${PREFIX}/include/PCSC
diff --git a/openscep/Makefile b/openscep/Makefile
index 17d41c0298..6fb1c46530 100644
--- a/openscep/Makefile
+++ b/openscep/Makefile
@@ -23,8 +23,8 @@ PKG_USERS= ${OPENSCEP_USER}:${OPENSCEP_GROUP}
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
PKG_SYSCONFSUBDIR?= openscep # it installs more subdirectories under this
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+= --with-openscep-dir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --with-openscep-dir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-html-dir=/openscep
CONFIGURE_ARGS+= --with-cgi-dir=/cgi-bin/openscep
CONFIGURE_ARGS+= --with-html-install-dir=${PREFIX}/share/httpd/htdocs/openscep
diff --git a/openssh/Makefile b/openssh/Makefile
index 8ccb9e2c7f..1b279353b6 100644
--- a/openssh/Makefile
+++ b/openssh/Makefile
@@ -67,7 +67,7 @@ PKG_SYSCONFSUBDIR= ssh
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mantype=man
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q}
CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q}
CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers}
@@ -190,7 +190,7 @@ post-configure:
${SED} -e '/HAVE_ECDSA_START/,/HAVE_ECDSA_STOP/d' \
${FILESDIR}/sshd.sh > ${WRKDIR}/sshd.sh; \
fi
- ${SED} -e 's,@VARBASE@,${VARBASE:Q},g' \
+ ${SED} -e 's,@VARBASE@,${VARBASE},g' \
< ${FILESDIR}/org.openssh.sshd.sb.in \
> ${WRKDIR}/org.openssh.sshd.sb
diff --git a/openssh/options.mk b/openssh/options.mk
index 1c4f9bc5c6..3c7c8c81c2 100644
--- a/openssh/options.mk
+++ b/openssh/options.mk
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= kerberos hpn-patch pam
.if !empty(PKG_OPTIONS:Mkerberos)
. include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q}
+CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE}
. if ${KRB5_TYPE} == "mit-krb5"
CONFIGURE_ENV+= ac_cv_search_k_hasafs=no
. endif
diff --git a/openssl110/builtin.mk b/openssl110/builtin.mk
index f457b7bdcb..1e5cd67b73 100644
--- a/openssl110/builtin.mk
+++ b/openssl110/builtin.mk
@@ -92,7 +92,7 @@ BUILDLINK_API_DEPENDS.openssl?= openssl>=1.0.1c
. for dep_ in ${BUILDLINK_API_DEPENDS.openssl}
. if !empty(USE_BUILTIN.openssl:M[yY][eE][sS])
USE_BUILTIN.openssl!= \
- if ${PKG_ADMIN} pmatch ${dep_:Q} ${BUILTIN_PKG.openssl:Q}; then \
+ if ${PKG_ADMIN} pmatch ${dep_:Q} ${BUILTIN_PKG.openssl}; then \
${ECHO} yes; \
else \
${ECHO} no; \
diff --git a/pal/Makefile b/pal/Makefile
index 0bf7288ea9..ec5a2bc30f 100644
--- a/pal/Makefile
+++ b/pal/Makefile
@@ -30,7 +30,7 @@ SUBST_SED.path+= -e 's,@EGDIR@,${EGDIR},g'
EGDIR= ${PREFIX}/share/examples/pal
-CONF_FILES= ${EGDIR:Q}/pal.conf ${PKG_SYSCONFDIR:Q}/pal.conf
+CONF_FILES= ${EGDIR}/pal.conf ${PKG_SYSCONFDIR}/pal.conf
MAKE_JOBS_SAFE= no
@@ -39,10 +39,10 @@ USE_NCURSES= yes
CFLAGS+= -DCURSES
do-build:
- cd ${WRKSRC:Q} && make
+ cd ${WRKSRC} && make
do-install:
- cd ${WRKSRC:Q} && make install-no-rm
+ cd ${WRKSRC} && make install-no-rm
.include "../../devel/ncurses/buildlink3.mk"
diff --git a/pike-Gettext/Makefile b/pike-Gettext/Makefile
index 4b6caeab79..62e44ba645 100644
--- a/pike-Gettext/Makefile
+++ b/pike-Gettext/Makefile
@@ -12,6 +12,6 @@ MODULE_SO= Gettext.so
.include "../../wip/pike-core/Makefile.modules_common"
.include "../../converters/libiconv/buildlink3.mk"
-CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv:Q}
+CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/pkg_fake/Makefile b/pkg_fake/Makefile
index 6000ca9d11..2d15e96fee 100644
--- a/pkg_fake/Makefile
+++ b/pkg_fake/Makefile
@@ -17,16 +17,16 @@ DEPENDS+= pkgfind>=20050804:../../pkgtools/pkgfind
INSTALLATION_DIRS= sbin ${PKGMANDIR}/man1
do-extract:
- ${MKDIR} ${WRKSRC:Q}
+ ${MKDIR} ${WRKSRC}
${SED} -e 's,@PREFIX@,${PREFIX},g' \
-e 's,@PKGDB@,${PKG_DBDIR},g' \
-e 's,@PKGSRC@,${PKGSRCDIR},g' \
- < ${FILESDIR:Q}/pkg_fake \
- > ${WRKSRC:Q}/pkg_fake
- ${CP} ${FILESDIR:Q}/pkg_fake.1 ${WRKSRC:Q}/
+ < ${FILESDIR}/pkg_fake \
+ > ${WRKSRC}/pkg_fake
+ ${CP} ${FILESDIR}/pkg_fake.1 ${WRKSRC}/
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC:Q}/pkg_fake ${DESTDIR}${PREFIX:Q}/sbin/
- ${INSTALL_MAN} ${WRKSRC:Q}/pkg_fake.1 ${DESTDIR}${PREFIX:Q}/${PKGMANDIR}/man1/
+ ${INSTALL_SCRIPT} ${WRKSRC}/pkg_fake ${DESTDIR}${PREFIX}/sbin/
+ ${INSTALL_MAN} ${WRKSRC}/pkg_fake.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
.include "../../mk/bsd.pkg.mk"
diff --git a/ppr/Makefile b/ppr/Makefile
index 75fe8e8ba8..c1f65d0976 100644
--- a/ppr/Makefile
+++ b/ppr/Makefile
@@ -23,11 +23,11 @@ EGDIR= ${PREFIX}/share/examples
PKG_SYSCONFSUBDIR= ppr
PPR_CONFDIR= ${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
# Use the EGDIR here?
#CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${EGDIR}
CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec
diff --git a/procps/Makefile b/procps/Makefile
index c16f0ebe70..53cd42c426 100644
--- a/procps/Makefile
+++ b/procps/Makefile
@@ -17,7 +17,7 @@ CONFLICTS+= top-[0-9]*
USE_TOOLS+= gmake
-MAKE_ENV+= DESTDIR=${PREFIX:Q}
+MAKE_ENV+= DESTDIR=${PREFIX}
.include "../../devel/ncurses/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/psh/Makefile b/psh/Makefile
index d8d167117d..3b8a9bdbed 100644
--- a/psh/Makefile
+++ b/psh/Makefile
@@ -33,7 +33,7 @@ SUBST_MESSAGE.postinst= Substituting in post-install script
SUBST_SED.postinst= -e 's,~/[.]psh,${DESTDIR}${PREFIX},'
SUBST_STAGE.postinst= pre-install
-INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR:Q}${PREFIX:Q}
+INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
post-install:
cd ${WRKSRC} && \
diff --git a/pulseaudio-git/Makefile b/pulseaudio-git/Makefile
index b11bf8f304..aede24a93e 100644
--- a/pulseaudio-git/Makefile
+++ b/pulseaudio-git/Makefile
@@ -46,8 +46,8 @@ MAKE_FLAGS+= bashcompletiondir=${PREFIX}/share/bash-completion/completions
CONFIGURE_ARGS+= --enable-samplerate
CONFIGURE_ARGS+= --disable-tcpwrap
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
# Use native atomic ops on NetBSD >= 5.0, otherwise
# fallback to libatomic_ops
diff --git a/pwnat/Makefile b/pwnat/Makefile
index 4450406e84..4737db66cb 100644
--- a/pwnat/Makefile
+++ b/pwnat/Makefile
@@ -22,15 +22,15 @@ INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin share/doc/${PKGBASE}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-docutils
post-build:
- ${PREFIX:Q}/bin/rst2man.py ${FILESDIR:Q}/pwnat.8.rst > ${WRKSRC:Q}/pwnat.8
+ ${PREFIX}/bin/rst2man.py ${FILESDIR}/pwnat.8.rst > ${WRKSRC}/pwnat.8
do-install:
- ${INSTALL_DATA} ${WRKSRC:Q}/COPYING-pingtunnel ${DESTDIR:Q}${PREFIX:Q}/share/doc/${PKGBASE:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/Changes ${DESTDIR:Q}${PREFIX:Q}/share/doc/${PKGBASE:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/README ${DESTDIR:Q}${PREFIX:Q}/share/doc/${PKGBASE:Q}
- ${INSTALL_DATA} ${WRKSRC:Q}/README-udptunnel ${DESTDIR:Q}${PREFIX:Q}/share/doc/${PKGBASE:Q}
- ${INSTALL_PROGRAM} ${WRKSRC:Q}/pwnat ${DESTDIR:Q}${PREFIX:Q}/sbin
- ${INSTALL_MAN} ${WRKSRC:Q}/pwnat.8 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR:Q}/man8
+ ${INSTALL_DATA} ${WRKSRC}/COPYING-pingtunnel ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/Changes ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_DATA} ${WRKSRC}/README-udptunnel ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+ ${INSTALL_PROGRAM} ${WRKSRC}/pwnat ${DESTDIR}${PREFIX}/sbin
+ ${INSTALL_MAN} ${WRKSRC}/pwnat.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
.include "../../wip/mk/git-package.mk"
.include "../../lang/python/pyversion.mk"
diff --git a/py-Brenda/Makefile b/py-Brenda/Makefile
index 9b55612083..0a885c436d 100644
--- a/py-Brenda/Makefile
+++ b/py-Brenda/Makefile
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/PyBrenda-0.4.1
PY_PATCHPLIST= yes
NO_BUILD= yes
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
BRENDA_FILES= Brenda.py einRpc.py myMath.py niftySocket.py
BRENDA_SHARE= INSTALL LICENSE NEWS QuickStart README TODO examples/hello.py
diff --git a/py-EMpy/Makefile b/py-EMpy/Makefile
index 1c2ae226fa..975396f009 100644
--- a/py-EMpy/Makefile
+++ b/py-EMpy/Makefile
@@ -17,7 +17,7 @@ VERSION= 0.1.2
USE_TOOLS+= pax
NO_BUILD= yes
USE_LANGUAGES= # none
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
PY_PATCHPLIST= yes
INSTALLATION_DIRS= ${PYSITELIB}
diff --git a/py-SQLObject/Makefile b/py-SQLObject/Makefile
index 65edde4b38..4106584e3a 100644
--- a/py-SQLObject/Makefile
+++ b/py-SQLObject/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://sqlobject.sourceforge.net/
COMMENT= Allows you to translate RDBMS table rows into Python objects
LICENSE= gnu-lgpl-v2
-WRKSRC= ${WRKDIR}/${DISTNAME:S|.tar||:Q}
+WRKSRC= ${WRKDIR}/${DISTNAME:S|.tar||}
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
diff --git a/py-grpy/Makefile b/py-grpy/Makefile
index 97efb1c68e..80d379fc0d 100644
--- a/py-grpy/Makefile
+++ b/py-grpy/Makefile
@@ -17,7 +17,7 @@ USE_LANGUAGES= # none
NO_BUILD= yes
GRPy_FILES= Christoffel.py Riemann.py Tensor.py
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
PY_PATCHPLIST= yes
INSTALLATION_DIRS= ${PYSITELIB}
diff --git a/py-jabber-aimt/Makefile b/py-jabber-aimt/Makefile
index 8fc05da84e..de6af0c0ef 100644
--- a/py-jabber-aimt/Makefile
+++ b/py-jabber-aimt/Makefile
@@ -41,7 +41,7 @@ TRANSPORTDIR= ${JABBER_TRANSDIR}/pyaimt
FILES_SUBST+= TRANSPORTDIR=${TRANSPORTDIR:Q}
FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
PLIST_SUBST+= TRANSPORTDIR=${TRANSPORTDIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE:Q}
.include "../../wip/jabberd/transports.mk"
diff --git a/py-jabber-yahoo-transport/Makefile b/py-jabber-yahoo-transport/Makefile
index 1f10c7df37..0ee36ff713 100644
--- a/py-jabber-yahoo-transport/Makefile
+++ b/py-jabber-yahoo-transport/Makefile
@@ -38,7 +38,7 @@ TRANSPORTDIR= ${JABBER_TRANSDIR}/yahoo
FILES_SUBST+= TRANSPORTDIR=${TRANSPORTDIR:Q}
FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q}
PLIST_SUBST+= TRANSPORTDIR=${TRANSPORTDIR:Q}
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE:Q}
.include "../../wip/jabberd/transports.mk"
diff --git a/py-remctl/Makefile b/py-remctl/Makefile
index e67b8ca686..11f6e2ca6a 100644
--- a/py-remctl/Makefile
+++ b/py-remctl/Makefile
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q}
+CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE}
CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
GSSIMPL.heimdal= heimdal
GSSIMPL.mit-krb5= mit
diff --git a/qmpdclient/Makefile b/qmpdclient/Makefile
index 37503e7407..a63827c882 100644
--- a/qmpdclient/Makefile
+++ b/qmpdclient/Makefile
@@ -24,7 +24,7 @@ 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}
+MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
QMAKE_FLAGS+= QT_CONFIG=${QT_CONFIG:Q}
# qmake isn't smart enough to integrate with lrelease. We have to run
diff --git a/qrupdate/Makefile b/qrupdate/Makefile
index 273d8100b2..cd5683e131 100644
--- a/qrupdate/Makefile
+++ b/qrupdate/Makefile
@@ -13,7 +13,7 @@ USE_LIBTOOL= yes
USE_LANGUAGES= fortran
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} LIBDIR=lib
do-build:
cd ${WRKDIR}/${DISTNAME}/src && gmake ${MAKE_FLAGS} lalib
diff --git a/qt5-qtbase-git/Makefile b/qt5-qtbase-git/Makefile
index 805b3061a5..a561afeaf3 100644
--- a/qt5-qtbase-git/Makefile
+++ b/qt5-qtbase-git/Makefile
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/qtproject
.if defined(MAKE_JOBS)
. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
-CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
+CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS}
. endif
.endif
HAS_CONFIGURE= yes
diff --git a/quickfix/Makefile b/quickfix/Makefile
index 869deb8330..46fcecce3d 100644
--- a/quickfix/Makefile
+++ b/quickfix/Makefile
@@ -24,7 +24,7 @@ PTHREAD_OPTS+= native
PTHREAD_AUTO_VARS= yes
pre-configure:
- cd ${WRKSRC:Q} && ./bootstrap
+ cd ${WRKSRC} && ./bootstrap
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff --git a/rakudo-star/Makefile b/rakudo-star/Makefile
index 1ae0774959..56687f5e95 100644
--- a/rakudo-star/Makefile
+++ b/rakudo-star/Makefile
@@ -23,7 +23,7 @@ PLIST_SRC+= PLIST.shared
HAS_CONFIGURE= yes
CONFIG_SHELL= ${PERL5}
CONFIGURE_SCRIPT= Configure.pl
-CONFIGURE_ARGS= --prefix=${PREFIX:Q} --backends=moar
+CONFIGURE_ARGS= --prefix=${PREFIX} --backends=moar
.include "../../devel/MoarVM/buildlink3.mk"
.include "../../wip/nqp/buildlink3.mk"
diff --git a/rakudo/Makefile b/rakudo/Makefile
index 747223edf8..4ac5081d97 100644
--- a/rakudo/Makefile
+++ b/rakudo/Makefile
@@ -18,7 +18,7 @@ USE_TOOLS+= perl gmake
HAS_CONFIGURE= yes
CONFIG_SHELL= ${PERL5}
CONFIGURE_SCRIPT= Configure.pl
-CONFIGURE_ARGS= --prefix=${PREFIX:Q} --backends=moar
+CONFIGURE_ARGS= --prefix=${PREFIX} --backends=moar
SUBST_CLASSES+= interp
SUBST_STAGE.interp= pre-configure
diff --git a/rc.subr/Makefile b/rc.subr/Makefile
index dcb224f261..fa58cef9a7 100644
--- a/rc.subr/Makefile
+++ b/rc.subr/Makefile
@@ -40,7 +40,7 @@ PS_ARG= "ax"
.endif
FILES_SUBST+= NICE=${NICE:Q}
-FILES_SUBST+= OPSYS=${OPSYS:Q}
+FILES_SUBST+= OPSYS=${OPSYS}
FILES_SUBST+= PS=${PS:Q}
FILES_SUBST+= PS_ARG=${PS_ARG:Q}
FILES_SUBST+= PS_FORMAT=${PS_FORMAT:Q}
diff --git a/remctl/Makefile b/remctl/Makefile
index bc73637ee6..45a40338cc 100644
--- a/remctl/Makefile
+++ b/remctl/Makefile
@@ -17,7 +17,7 @@ USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared
-CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q}
+CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE}
CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
GSSIMPL.heimdal= heimdal
GSSIMPL.mit-krb5= mit
diff --git a/rpki-git/Makefile b/rpki-git/Makefile
index 2c6d04d434..3b453a8a69 100644
--- a/rpki-git/Makefile
+++ b/rpki-git/Makefile
@@ -17,7 +17,7 @@ DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django
USE_TOOLS+= perl python
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
#CONFIGURE_ARGS+= --disable-django
#CONFIGURE_ARGS+= --disable-system-openssl
diff --git a/sbcl-git/Makefile b/sbcl-git/Makefile
index a784e59f5d..b42c7b4327 100644
--- a/sbcl-git/Makefile
+++ b/sbcl-git/Makefile
@@ -73,7 +73,7 @@ post-build:
cd ${WRKSRC} && ${RM} -f contrib/sb-cover/test-output/*
do-install:
- cd ${WRKSRC} && BUILD_ROOT=${DESTDIR:Q} INSTALL_ROOT=${PREFIX:Q} MAN_DIR=${PREFIX:Q}/${PKGMANDIR} ${SH} install.sh
+ cd ${WRKSRC} && BUILD_ROOT=${DESTDIR} INSTALL_ROOT=${PREFIX} MAN_DIR=${PREFIX}/${PKGMANDIR} ${SH} install.sh
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/asdf-install/installer.lisp.orig
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/posix-tests.lisp.orig
rm -f $(DESTDIR)$(PREFIX)/lib/sbcl/sb-posix/test-output/write-test.txt
diff --git a/scare/Makefile b/scare/Makefile
index dcdf5d8c05..364de8dd63 100644
--- a/scare/Makefile
+++ b/scare/Makefile
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.geocities.com/legion_if/scare.html
COMMENT= Interpreter for interactive fiction written in Adrift
BUILD_TARGET= glkscare
-MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+MAKE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR}
DOCDIR= ${PREFIX}/share/doc/scare
diff --git a/scilab/Makefile b/scilab/Makefile
index 8c49ba7e8a..c8289f57ea 100644
--- a/scilab/Makefile
+++ b/scilab/Makefile
@@ -31,13 +31,13 @@ CONFIGURE_ARGS+= --with-tk-library=${BUILDLINK_PREFIX.tk}/lib
CONFIGURE_ARGS+= --with-tk-include=${BUILDLINK_PREFIX.tk}/include
CONFIGURE_ENV+= TCL_CONFIG_SH=${BUILDLINK_PREFIX.tcl}/lib/tclConfig.sh
CONFIGURE_ENV+= TK_CONFIG_SH=${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh
-CONFIGURE_ENV+= CC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.tk:Q}/lib
-CONFIGURE_ENV+= FC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG:Q}${BUILDLINK_PREFIX.tk:Q}/lib
+CONFIGURE_ENV+= CC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tk}/lib
+CONFIGURE_ENV+= FC_LDFLAGS=${X11_LDFLAGS:Q}\ ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tk}/lib
# override HOME to avoid picking up a bad ${HOME}/.scilab during the build
-MAKE_ENV+= HOME=${WRKSRC:Q}
+MAKE_ENV+= HOME=${WRKSRC}
MAKE_ENV+= PVM_ROOT=${PVM_ROOT:Q}
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q}
+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
# FIXME -- this ugly hack will go away on newer versions of scilab where the build
# system has been improved significantly see:
@@ -51,7 +51,7 @@ CFLAGS+= -DG95_FORTRAN=1
PVM_ROOT?= ${LOCALBASE}/pvm3
CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT:Q}
-CONFIGURE_ENV+= X11BASE=${X11BASE:Q}
+CONFIGURE_ENV+= X11BASE=${X11BASE}
PLIST_SUBST+= SCIBASE=${SCIBASE:Q}
UNWRAP_FILES+= Makemex config/configuration config/Makeso.incl
@@ -125,7 +125,7 @@ GCC_REQD+= 2.95.3
# the "SCI=0 && unset SCI" is done because some of the tests really will
# fail if SCI is set to anything.
-MAKE_ENV+= SCI=${WRKSRC:Q}
+MAKE_ENV+= SCI=${WRKSRC}
do-test:
cd ${WRKSRC}/examples && \
${MAKE_ENV} ${MAKE_PROGRAM} tests 2>&1 | \
diff --git a/sendmailX/Makefile b/sendmailX/Makefile
index 5e727eca22..764fb9d27f 100644
--- a/sendmailX/Makefile
+++ b/sendmailX/Makefile
@@ -26,8 +26,8 @@ USERMOD?= /usr/sbin/usermod
EGDIR= ${PREFIX}/share/examples/smX
DOCDIR= ${PREFIX}/share/doc/smX
-FILES_SUBST+= PREFIX=${PREFIX:Q} SMXCNF=${SMXCNF:Q} USERMOD=${USERMOD:Q}
-FILES_SUBST+= VARBASE=${VARBASE:Q} SED=${SED:Q} UNAME=${UNAME:Q}
+FILES_SUBST+= PREFIX=${PREFIX} SMXCNF=${SMXCNF:Q} USERMOD=${USERMOD:Q}
+FILES_SUBST+= VARBASE=${VARBASE} SED=${SED:Q} UNAME=${UNAME:Q}
MESSAGE_SUBST+= SMXCNF=${SMXCNF}
PKG_SYSCONFSUBDIR= smx
diff --git a/siproxd/Makefile b/siproxd/Makefile
index a497f4b1dc..3d1ba7f995 100644
--- a/siproxd/Makefile
+++ b/siproxd/Makefile
@@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2
GNU_CONFIGURE= YES
USE_TOOLS+= gmake
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --with-libosip-prefix=${BUILDLINK_PREFIX.libosip2}
EGDIR= ${PREFIX}/share/examples/siproxd
diff --git a/spamassassin-cvs/Makefile b/spamassassin-cvs/Makefile
index b0a3471aba..0d07fce7f3 100644
--- a/spamassassin-cvs/Makefile
+++ b/spamassassin-cvs/Makefile
@@ -164,7 +164,7 @@ INTERPRETER_SUPPORT= YES
# These values are substituted into netbsd-rc-script.sh.
FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT:Q}
-FILES_SUBST+= OPSYS=${OPSYS:Q}
+FILES_SUBST+= OPSYS=${OPSYS}
pre-configure: perl5-configure
diff --git a/sxemacs/Makefile b/sxemacs/Makefile
index 688081d9cd..02df0033b2 100644
--- a/sxemacs/Makefile
+++ b/sxemacs/Makefile
@@ -13,8 +13,8 @@ CONFLICTS+= gnuclient-[0-9]*
CONFLICTS+= xemacs-[0-9]*
-PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
-MESSAGE_SUBST+= DISTNAME=${DISTNAME:Q}
+PLIST_SUBST+= DISTNAME=${DISTNAME}
+MESSAGE_SUBST+= DISTNAME=${DISTNAME}
GNU_CONFIGURE= yes
USE_TOOLS+= makeinfo perl
@@ -82,7 +82,7 @@ PLIST_SUBST+= X11ONLY=""
INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info
CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM}
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
CONFIGURE_ARGS+= --with-clash-detection
CONFIGURE_ARGS+= --with-mule=yes
.if ${OPSYS} == "Darwin"
diff --git a/symon/Makefile b/symon/Makefile
index 33667d1332..7884dc5bf9 100644
--- a/symon/Makefile
+++ b/symon/Makefile
@@ -7,8 +7,8 @@ MAINTAINER= charlie%rubberduck.com@localhost
HOMEPAGE= http://www.xs4all.nl/~wpd/symon/
COMMENT= System monitoring suite
-MAKE_ENV+= RRDDIR=${PREFIX:Q}
-MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_ENV+= RRDDIR=${PREFIX}
+MAKE_ENV+= SYSCONFDIR=${PKG_SYSCONFDIR}
SYMON_HOME?= ${VARBASE}/db/symon
EGDIR= share/examples/symon
diff --git a/sysklogd/Makefile b/sysklogd/Makefile
index a93628ae31..5edd96f5eb 100644
--- a/sysklogd/Makefile
+++ b/sysklogd/Makefile
@@ -15,10 +15,10 @@ ONLY_FOR_PLATFORM= Linux-*-* # This has Linux klogd
USE_TOOLS+= gmake
CFLAGS+= -D_PATH_LOGCONF='\"${PKG_SYSCONFBASE}/syslog.conf\"'
-MAKE_ENV+= DESTDIR=${PREFIX:Q} ROOT_GROUP=${ROOT_GROUP:Q} \
- ROOT_USER=${ROOT_USER:Q}
+MAKE_ENV+= DESTDIR=${PREFIX} ROOT_GROUP=${ROOT_GROUP} \
+ ROOT_USER=${ROOT_USER}
PKGMANDIR?= man
-MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
+MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
RCD_SCRIPTS= syslogd klogd
CONF_FILES+= ${PREFIX}/share/examples/sysklogd/syslog.conf ${PKG_SYSCONFDIR}/syslog.conf
diff --git a/sysstat/Makefile b/sysstat/Makefile
index 0395ebc88c..f00452782c 100644
--- a/sysstat/Makefile
+++ b/sysstat/Makefile
@@ -20,7 +20,7 @@ MAKE_ENV+= DOC_DIR=${PREFIX}/share/doc/sysstat
MAKE_ENV+= NLS_DIR=${PREFIX}/${PKGLOCALEDIR}/locale
MAKE_ENV+= SYSCONFIG_DIR=${PREFIX}/share/examples/sysstat
MAKE_ENV+= MAN_DIR=${PREFIX}/${PKGMANDIR}
-MAKE_ENV+= MAN_GROUP=${MANGRP:Q}
+MAKE_ENV+= MAN_GROUP=${MANGRP}
MAKE_ENV+= IOCONF=${PKG_SYSCONFDIR}/sysstat/sysstat.ioconf
CONF_FILES= ${PREFIX}/share/examples/sysstat/sysstat.ioconf \
diff --git a/sysvinit/Makefile b/sysvinit/Makefile
index f61d93dad2..746c19d8f4 100644
--- a/sysvinit/Makefile
+++ b/sysvinit/Makefile
@@ -16,8 +16,8 @@ ONLY_FOR_PLATFORM= Linux-*-* # This is the Linux init
USE_TOOLS+= gmake
-MAKE_ENV+= ROOT=${PREFIX:Q} ROOT_GROUP=${ROOT_GROUP:Q} \
- ROOT_USER=${ROOT_USER:Q}
+MAKE_ENV+= ROOT=${PREFIX} ROOT_GROUP=${ROOT_GROUP} \
+ ROOT_USER=${ROOT_USER}
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/sysvinit
diff --git a/tc-git/Makefile b/tc-git/Makefile
index 901ab25486..c55b5ce763 100644
--- a/tc-git/Makefile
+++ b/tc-git/Makefile
@@ -24,8 +24,8 @@ BUILD_DEPENDS+= web2c-[0-9]*:../../print/web2c
CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${EMACS_FLAVOR}}
-MAKEFLAGS+= EMACS=${EMACS_BIN:Q}
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
+MAKEFLAGS+= EMACS=${EMACS_BIN}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
INFO_FILES= YES
GIT_REPOSITORIES= tc
diff --git a/tcc-git/Makefile b/tcc-git/Makefile
index cf2e535c54..b4b41edd77 100644
--- a/tcc-git/Makefile
+++ b/tcc-git/Makefile
@@ -25,7 +25,7 @@ SUBST_STAGE.ldl= post-patch
SUBST_SED.ldl= -e 's,LIBS=,\#LIBS,'
.endif
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
GIT_REPOSITORIES= tcc
GIT_REPO.tcc= http://repo.or.cz/tinycc.git
diff --git a/tcc/Makefile b/tcc/Makefile
index c710d5cf0a..a908330c47 100644
--- a/tcc/Makefile
+++ b/tcc/Makefile
@@ -26,6 +26,6 @@ SUBST_STAGE.ldl= post-patch
SUBST_SED.ldl= -e 's,LIBS=,\#LIBS,'
.endif
-CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= --prefix=${PREFIX}
.include "../../mk/bsd.pkg.mk"
diff --git a/tcl-iwidgets/Makefile b/tcl-iwidgets/Makefile
index 29bc9e8791..fd4b9520ee 100644
--- a/tcl-iwidgets/Makefile
+++ b/tcl-iwidgets/Makefile
@@ -31,7 +31,7 @@ do-install:
${INSTALL_DATA} README.txt ${DESTDIR}${PREFIX}/share/doc/iwidgets/
cd ${WRKSRC}/demos && \
for FILE in `ls -1 | ${GREP} -v -E '(html|images)'`; do \
- ${INSTALL_DATA} "$$FILE" ${DESTDIR:Q}${PREFIX:Q}/share/examples/iwidgets/; \
+ ${INSTALL_DATA} "$$FILE" ${DESTDIR}${PREFIX}/share/examples/iwidgets/; \
done && \
${INSTALL_DATA} images/* ${DESTDIR}${PREFIX}/share/examples/iwidgets/images/; \
cd ${WRKSRC}/demos/html && \
diff --git a/tcptunnel/Makefile b/tcptunnel/Makefile
index 6450e2fab6..94c12066d4 100644
--- a/tcptunnel/Makefile
+++ b/tcptunnel/Makefile
@@ -11,6 +11,6 @@ LICENSE= gnu-gpl-v2
do-configure:
${RUN} cd ${WRKSRC} && \
- ${SH} ./configure --prefix=${PREFIX:Q}
+ ${SH} ./configure --prefix=${PREFIX}
.include "../../mk/bsd.pkg.mk"
diff --git a/tcpxtract/Makefile b/tcpxtract/Makefile
index d2c36f90d8..27d0ea51ce 100644
--- a/tcpxtract/Makefile
+++ b/tcpxtract/Makefile
@@ -11,7 +11,7 @@ COMMENT= Extract files from network traffic based on file signatures
GNU_CONFIGURE= yes
CPPFLAGS+= -DDEFAULT_CONFIG_FILE="\"${PKG_SYSCONFDIR}/tcpxtract.conf\""
-CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/share/examples/tcpxtract
+CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/examples/tcpxtract
CONF_FILES+= ${PREFIX}/share/examples/tcpxtract/tcpxtract.conf ${PKG_SYSCONFDIR}/tcpxtract.conf
diff --git a/tktile/Makefile b/tktile/Makefile
index b52d330eea..8f9a151b91 100644
--- a/tktile/Makefile
+++ b/tktile/Makefile
@@ -16,8 +16,8 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include
-CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib
+CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
.endif
.include "../../lang/tcl/buildlink3.mk"
diff --git a/torcs/Makefile b/torcs/Makefile
index de8d03f344..1072af517c 100644
--- a/torcs/Makefile
+++ b/torcs/Makefile
@@ -22,8 +22,8 @@ GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_TOOLS= bash gmake
-CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include
-CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib${LIBABISUFFIX:Q}
+CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
REPLACE_BASH+= robotgen
REPLACE_BASH+= src/linux/torcs.in
diff --git a/tsm/Makefile b/tsm/Makefile
index ee4a046f9a..5fe4555b14 100644
--- a/tsm/Makefile
+++ b/tsm/Makefile
@@ -42,12 +42,12 @@ RPMFILES= ${WRKSRC}/TIVsm-API.i386.rpm \
TSMCLIENTSUBDIR= opt/tivoli/tsm/client
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
+PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
PLIST_SUBST+= TSMCLIENTSUBDIR=${TSMCLIENTSUBDIR:Q}
-PLIST_SUBST+= EMULDIR=${EMULDIR:Q}
+PLIST_SUBST+= EMULDIR=${EMULDIR}
MESSAGE_SUBST+= TSMCLIENTSUBDIR=${TSMCLIENTSUBDIR:Q}
-MESSAGE_SUBST+= EMULDIR=${EMULDIR:Q}
+MESSAGE_SUBST+= EMULDIR=${EMULDIR}
MAKE_DIRS+= ${EMULDIR}/etc/ld.so.conf.d
diff --git a/tsm62/Makefile b/tsm62/Makefile
index 4d1297c90e..cd6c165ce0 100644
--- a/tsm62/Makefile
+++ b/tsm62/Makefile
@@ -43,8 +43,8 @@ RPM2PKG_STRIP= 0
RPM2PKG_PLIST= # none generated
RPM2PKG_STAGE= do-install
-PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
-PLIST_SUBST+= EMULDIR=${EMULDIR:Q}
+PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+PLIST_SUBST+= EMULDIR=${EMULDIR}
PLIST_SUBST+= TSMCLIENTSUBDIR=${TSMCLIENTSUBDIR:Q}
TSM_LOCALE= ${PKG_SYSCONFDIR}/en_US
@@ -52,7 +52,7 @@ CHECK_FILES_SKIP+= ${TSM_LOCALE}
TSMCLIENTSUBDIR= opt/tivoli/tsm/client
-MESSAGE_SUBST+= EMULDIR=${EMULDIR:Q}
+MESSAGE_SUBST+= EMULDIR=${EMULDIR}
.if ${EMUL_PLATFORM} == "linux-x86_64"
RPMFILES+= ${WRKDIR}/TIVsm-API64.i386.rpm \
diff --git a/tuxpaint-cvs/Makefile b/tuxpaint-cvs/Makefile
index 977026e797..9069f425dd 100644
--- a/tuxpaint-cvs/Makefile
+++ b/tuxpaint-cvs/Makefile
@@ -26,7 +26,7 @@ BROKEN_GETTEXT_DETECTION= yes
REPLACE_BASH= src/tuxpaint-import.sh
PKG_SYSCONFSUBDIR= tuxpaint
-MAKE_FLAGS+= CONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_FLAGS+= CONFDIR=${PKG_SYSCONFDIR}
MAKE_FLAGS+= CP=${CP:Q}
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= CPPFLAGS=${CPPFLAGS:Q}
diff --git a/umix/Makefile b/umix/Makefile
index 6758fa0a4e..4f3671a860 100644
--- a/umix/Makefile
+++ b/umix/Makefile
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= aclocal autoconf automake gmake pkg-config
USE_LIBTOOL= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
LIBS+= ${LIBOSSAUDIO}
diff --git a/undo-tree/Makefile b/undo-tree/Makefile
index df76722865..a9a99061ca 100644
--- a/undo-tree/Makefile
+++ b/undo-tree/Makefile
@@ -13,7 +13,7 @@ COMMENT= Treat Emacs undo history as a tree
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
-MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX:Q}
+MESSAGE_SUBST+= LISPDIR=${EMACS_LISPPREFIX}
do-build:
cd ${WRKSRC} && ${EMACS_BIN} -batch -f batch-byte-compile ${DISTNAME}.el
diff --git a/unnethack/Makefile b/unnethack/Makefile
index 3c74af716e..5fbb57fe4b 100644
--- a/unnethack/Makefile
+++ b/unnethack/Makefile
@@ -56,7 +56,7 @@ MAN6DIR= ${PREFIX}/${PKGMANDIR}/man6
#MAKE_ENV+= GAMEDIR=${GAMEDIR:Q}
MAKE_ENV+= MANDIR=${MAN6DIR:Q}
#MAKE_ENV+= VARDIR=${VARDIR:Q}
-MAKE_ENV+= CURSESLIBDIR=${BUILDLINK_PREFIX.ncurses:Q}/lib
+MAKE_ENV+= CURSESLIBDIR=${BUILDLINK_PREFIX.ncurses}/lib
CONFIGURE_ARGS+= --with-gamesdir=${VARDIR:Q}
CONFIGURE_ARGS+= --with-sharedir=${GAMEDIR:Q}
CONFIGURE_ARGS+= --with-unsharedir=${GAMEDIR:Q}
diff --git a/unnethack/options.mk b/unnethack/options.mk
index b4cd778c3e..d751e755aa 100644
--- a/unnethack/options.mk
+++ b/unnethack/options.mk
@@ -17,7 +17,7 @@ PKG_SUGGESTED_OPTIONS=
.if !empty(PKG_OPTIONS:Mx11)
PLIST.x11= yes
CONFIGURE_ARGS+= --enable-x11-graphics
-CONFIGURE_ARGS+= LIBXAW_CFLAGS=-I${X11BASE:Q}/include
+CONFIGURE_ARGS+= LIBXAW_CFLAGS=-I${X11BASE}/include
CONFIGURE_ARGS+= LIBXAW_LIBS=${X11_LDFLAGS:Q}" -lXaw"
BUILD_TARGET+= x11tiles
diff --git a/util-linux/Makefile b/util-linux/Makefile
index f6422b740d..c1c192b7c1 100644
--- a/util-linux/Makefile
+++ b/util-linux/Makefile
@@ -19,11 +19,11 @@ ONLY_FOR_PLATFORM= Linux-*-* # Uses Linux kernel headers
USE_TOOLS+= gmake
GNU_CONFIGURE= YES
-MAKE_ENV+= DESTDIR=${PREFIX:Q}
-MAKE_ENV+= ETCDIR=${PREFIX:Q}/share/examples/util-linux
-MAKE_ENV+= FDPRMFILE=${PKG_SYSCONFDIR:Q}/fdprm
-MAKE_ENV+= INFO_DIR=/${PKGINFODIR:Q}
-MAKE_ENV+= MAN_DIR=/${PKGMANDIR:Q}
+MAKE_ENV+= DESTDIR=${PREFIX}
+MAKE_ENV+= ETCDIR=${PREFIX}/share/examples/util-linux
+MAKE_ENV+= FDPRMFILE=${PKG_SYSCONFDIR}/fdprm
+MAKE_ENV+= INFO_DIR=/${PKGINFODIR}
+MAKE_ENV+= MAN_DIR=/${PKGMANDIR}
INFO_FILES= # PLIST
diff --git a/vmsbackup/Makefile b/vmsbackup/Makefile
index 3ca05c8aa0..7bf552cee1 100644
--- a/vmsbackup/Makefile
+++ b/vmsbackup/Makefile
@@ -12,7 +12,7 @@ HOMEPAGE= http://garbo.uwasa.fi/pub/unix/vmsbackup/
COMMENT= Utility to read VMS backup tapes
BUILD_TARGET= vmsbackup
-MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX:Q}
+MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX}
INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
diff --git a/workrave/Makefile b/workrave/Makefile
index d34978a14a..f369441ddb 100644
--- a/workrave/Makefile
+++ b/workrave/Makefile
@@ -15,7 +15,7 @@ USE_LANGUAGES+= c c++
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --docdir="${PREFIX}/share/doc/${PKGBASE}"
# Under NetBSD, /usr/include/wchar.h requires either _ISOC99_SOURCE or
diff --git a/xalan-c-1.10/Makefile b/xalan-c-1.10/Makefile
index 45bc119d92..bc8a0c8687 100755
--- a/xalan-c-1.10/Makefile
+++ b/xalan-c-1.10/Makefile
@@ -32,7 +32,7 @@ XALAN_ENV= XERCESCROOT="${WRKDIR}/xerces-c-src_2_8_0" XALANCROOT="${WRKDIR}/xml-
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ./runConfigure
-CONFIGURE_ARGS+= -C --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= -C --prefix=${PREFIX}
CONFIGURE_ARGS+= -p ${XALAN_PLATFORM}
CONFIGURE_ARGS+= -r pthread
# 1.7.0 needs the following argument.
diff --git a/xalan-c/Makefile b/xalan-c/Makefile
index b89dcaa77d..6bc8a90d15 100755
--- a/xalan-c/Makefile
+++ b/xalan-c/Makefile
@@ -31,7 +31,7 @@ XALAN_ENV= XERCESCROOT="${WRKDIR}/xerces-c-3.1.1" XALANCROOT="${WRKDIR}/xalan-c-
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ./runConfigure
-CONFIGURE_ARGS+= -C --prefix=${PREFIX:Q}
+CONFIGURE_ARGS+= -C --prefix=${PREFIX}
CONFIGURE_ARGS+= -p ${XALAN_PLATFORM}
CONFIGURE_ARGS+= -r pthread
# 1.7.0 needs the following argument.
diff --git a/xbnbt/Makefile b/xbnbt/Makefile
index 4da3406d9c..f9164f4ff8 100644
--- a/xbnbt/Makefile
+++ b/xbnbt/Makefile
@@ -20,9 +20,9 @@ BUILD_TARGET+= bnbt
INSTALLATION_DIRS+= sbin share/doc/xbnbt share/examples/xbnbt share/xbnbt
post-extract:
- mv ${WRKDIR:Q}/"Copy of xbnbt-81b.3" ${WRKDIR:Q}/xbnbt
- mv ${WRKDIR:Q}/xbnbt/bnbt/examples/"XBNBT IPB2 Mod" \
- ${WRKDIR:Q}/xbnbt/bnbt/examples/ipb2_mod
+ mv ${WRKDIR}/"Copy of xbnbt-81b.3" ${WRKDIR}/xbnbt
+ mv ${WRKDIR}/xbnbt/bnbt/examples/"XBNBT IPB2 Mod" \
+ ${WRKDIR}/xbnbt/bnbt/examples/ipb2_mod
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bnbt ${DESTDIR}${PREFIX}/sbin
diff --git a/xinetd/Makefile b/xinetd/Makefile
index 8164f5a1b2..94348dc222 100644
--- a/xinetd/Makefile
+++ b/xinetd/Makefile
@@ -22,12 +22,12 @@ CONFIGURE_ARGS+= --with-loadavg
BUILD_DEFS+= XINETD_USE_TCPWRAPPER
XINETD_USE_TCPWRAPPER?= NO
.if !empty(XINETD_USE_TCPWRAPPER:M[yY][eE][sS])
-CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers:Q}/lib
+CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}/lib
.endif
RCD_SCRIPTS= xinetd
# Some weird quoting in Makefile.in makes this necessary.
-CPPFLAGS+= -DDEFAULT_CONFIG_FILE="\"${PKG_SYSCONFDIR:Q}/etc/xinetd.conf\""
+CPPFLAGS+= -DDEFAULT_CONFIG_FILE="\"${PKG_SYSCONFDIR}/etc/xinetd.conf\""
USE_TOOLS+= perl:run
REPLACE_PERL+= xinetd/xconv.pl
diff --git a/xmail/Makefile b/xmail/Makefile
index 4818c73f3d..9f28b5a033 100644
--- a/xmail/Makefile
+++ b/xmail/Makefile
@@ -13,7 +13,7 @@ LICENSE= gnu-gpl-v2
USE_LANGUAGES= c c++
USE_TOOLS+= gmake
-MAKE_ENV+= OSTYPE=${OPSYS:Q}
+MAKE_ENV+= OSTYPE=${OPSYS}
.include "../../mk/bsd.prefs.mk"
diff --git a/xmms2/Makefile b/xmms2/Makefile
index 97533b9022..1c6ee8ed77 100644
--- a/xmms2/Makefile
+++ b/xmms2/Makefile
@@ -30,7 +30,7 @@ PY_PATCHPLIST= yes
.include "options.mk"
do-configure:
- cd ${WRKSRC:Q} && \
+ cd ${WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} ${PYTHONBIN} ./waf configure \
--destdir=${DESTDIR} --prefix=${PREFIX} \
--conf-prefix="${EXTRA_INCLUDES}" \
diff --git a/xoo/Makefile b/xoo/Makefile
index 59c7f9ae6c..daed063321 100644
--- a/xoo/Makefile
+++ b/xoo/Makefile
@@ -13,7 +13,7 @@ COMMENT= Graphical wrapper around Xnest/Xephyr
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
-CFLAGS= -DPREFIX=\"${PREFIX:Q}\"
+CFLAGS= -DPREFIX=\"${PREFIX}\"
CONFIGURE_ARGS+= CFLAGS=${CFLAGS:M*:Q}
post-install:
diff --git a/xrdp/Makefile b/xrdp/Makefile
index 127d6def47..e5ad8380ef 100644
--- a/xrdp/Makefile
+++ b/xrdp/Makefile
@@ -32,7 +32,7 @@ SUBST_MESSAGE.man= Fixing variables in man-pages
SUBST_STAGE.man= post-patch
SUBST_FILES.man= docs/man/sesman.ini.5 docs/man/xrdp.ini.5
SUBST_FILES.man+= docs/man/xrdp.8 docs/man/xrdp-sesman.8 docs/man/xrdp-sesrun.8
-SUBST_SED.man= -E -e 's,\$$\{(SESMAN|XRDP)_BIN_DIR\},${PREFIX:Q}/bin,g'
+SUBST_SED.man= -E -e 's,\$$\{(SESMAN|XRDP)_BIN_DIR\},${PREFIX}/bin,g'
SUBST_SED.man+= -e 's,\$$\{(SESMAN|XRDP)_CFG_DIR\},${PKG_SYSCONFDIR},g'
SUBST_SED.man+= -e 's,\$$\{(SESMAN|XRDP)_LOG_DIR\},.,g' # FIXME
SUBST_SED.man+= -e 's,\$$\{(SESMAN|XRDP)_PID_DIR\},/var/run,g'
diff --git a/ypbind-mt/Makefile b/ypbind-mt/Makefile
index f869f47b23..610b9a0190 100644
--- a/ypbind-mt/Makefile
+++ b/ypbind-mt/Makefile
@@ -20,6 +20,6 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
RCD_SCRIPTS= ypbind
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/ypserv/Makefile b/ypserv/Makefile
index a051067548..c87b2bfb5f 100644
--- a/ypserv/Makefile
+++ b/ypserv/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
RCD_SCRIPTS= yppasswdd ypserv
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/sbin
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
.include "../../databases/gdbm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/zapping/Makefile b/zapping/Makefile
index 55f13480d5..45c810262c 100644
--- a/zapping/Makefile
+++ b/zapping/Makefile
@@ -21,8 +21,8 @@ USE_TOOLS+= gmake intltool perl
CONFIGURE_ARGS+= --disable-rebuild-man
CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
-CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX:Q}/share/gconf/schemas/
-MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX:Q}/share/gconf/schemas/
+CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
+MAKE_ENV+= GCONF_SCHEMA_FILE_DIR=${PREFIX}/share/gconf/schemas/
GCONF_SCHEMAS+= zapping.schemas
Home |
Main Index |
Thread Index |
Old Index