From owner-svn-ports-all@freebsd.org Thu Nov 5 12:36:34 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 16F23A23A93; Thu, 5 Nov 2015 12:36:34 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9E7341C70; Thu, 5 Nov 2015 12:36:33 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA5CaWw1076241; Thu, 5 Nov 2015 12:36:32 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA5CaPmN076170; Thu, 5 Nov 2015 12:36:25 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201511051236.tA5CaPmN076170@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 5 Nov 2015 12:36:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400848 - in head: archivers/paq archivers/szip archivers/undms astro/geographiclib audio/chordpack audio/cue2toc benchmarks/raidtest benchmarks/stream biology/gff2ps chinese/CJKUnifont... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2015 12:36:34 -0000 Author: mat Date: Thu Nov 5 12:36:25 2015 New Revision: 400848 URL: https://svnweb.freebsd.org/changeset/ports/400848 Log: Fix ports that confused the meaning of WRKDIR and WRKSRC. PR: 204056 Submitted by: mat Reviewed by: bapt Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D2735 Modified: head/archivers/paq/Makefile head/archivers/szip/Makefile head/archivers/undms/Makefile head/astro/geographiclib/Makefile head/audio/chordpack/Makefile head/audio/cue2toc/Makefile head/benchmarks/raidtest/Makefile head/benchmarks/stream/Makefile head/biology/gff2ps/Makefile head/chinese/CJKUnifonts/Makefile head/chinese/xpdf/Makefile head/comms/cdr_read/Makefile head/converters/unix2dos/Makefile head/devel/apr1/Makefile head/devel/cvs2html/Makefile head/devel/cweb/Makefile head/devel/easygit/Makefile head/devel/libcii/Makefile head/devel/libdlmalloc/Makefile head/devel/mingw32-bin-msvcrt/Makefile head/devel/py-json-py/Makefile head/devel/py-urlimport/Makefile head/devel/ruby-dialogs/Makefile head/devel/sedsed/Makefile head/devel/sfio/Makefile head/dns/dnswalk/Makefile head/dns/ipcheck/Makefile head/editors/omegaT/Makefile head/emulators/linux_base-c6/Makefile head/emulators/linux_base-f10/Makefile head/emulators/qmc2/Makefile head/emulators/simh/Makefile head/emulators/yape/Makefile head/games/alephone-data/Makefile head/games/alephone-scenarios/Makefile head/games/arkanoidsb/Makefile head/games/bogged/Makefile head/games/crafty-open-enormous/Makefile head/games/crafty-open-large/Makefile head/games/crafty-open-medium/Makefile head/games/doom-data/Makefile head/games/doom-hacx/Makefile head/games/doom-wolfendoom/Makefile head/games/legends/Makefile head/games/linux-darwinia-demo/Makefile head/games/linux-doom3/Makefile head/games/linux-quake3-demo/Makefile head/games/linux-quake3/Makefile head/games/linux-quake4-demo/Makefile head/games/linux-quake4/Makefile head/games/linux-uplink-demo/Makefile head/games/quake-dpmod/Makefile head/games/quake2-data/Makefile head/games/quake2-rogue/Makefile head/games/quake2-xatrix/Makefile head/games/quake3-data/Makefile head/games/rfksay/Makefile head/games/robocode/Makefile head/games/thudboard/Makefile head/games/traindirector/Makefile head/games/xasteroids/Makefile head/graphics/fujiplay/Makefile head/graphics/geoapi/Makefile head/graphics/gimp-jagged-border-script/Makefile head/graphics/mapyrus/Makefile head/graphics/openjump/Makefile head/graphics/pstoepsi/Makefile head/graphics/springgraph/Makefile head/irc/irssi-dcc_send_limiter/Makefile head/japanese/VTPSfont/Makefile head/japanese/a2ps/Makefile head/japanese/bugzilla44/Makefile head/japanese/edict-utf-8/Makefile head/japanese/edict/Makefile head/japanese/font-ayu18/Makefile head/japanese/font-ayu20/Makefile head/japanese/font-elisa10/Makefile head/japanese/font-elisa8/Makefile head/japanese/font-jisx0213/Makefile head/japanese/font-kaname12/Makefile head/japanese/font-kanji18/Makefile head/japanese/font-mona-ttf/Makefile head/japanese/gskk/Makefile head/japanese/jcode.pl/Makefile head/japanese/skk-jisyo/Makefile head/japanese/yc.el/Makefile head/japanese/zipcodes/Makefile head/java/eclipse-ecj/Makefile head/java/eclipse-pydev/Makefile head/java/javavmwrapper/Makefile head/java/jtiger/Makefile head/korean/kaistfonts/Makefile head/korean/ko.TeX-fonts-base/Makefile head/korean/ko.TeX-fonts-extra/Makefile head/korean/ko.TeX/Makefile head/lang/cmucl-extra/Makefile head/lang/cmucl/Makefile head/lang/linux-j/Makefile head/lang/smlnj/Makefile head/lang/tcl-manual/Makefile head/mail/gml/Makefile head/mail/imaptools/Makefile head/mail/mb2md/Makefile head/mail/msgconvert/Makefile head/mail/py-cyruslib/Makefile head/mail/rlytest/Makefile head/mail/x-face-e21/Makefile head/mail/xcite/Makefile head/math/jts/Makefile head/math/lll_spect/Makefile head/math/physcalc/Makefile head/math/solitaire/Makefile head/misc/amfm/Makefile head/misc/astrolog/Makefile head/misc/colwide/Makefile head/misc/figlet-fonts/Makefile head/misc/kenny/Makefile head/misc/metalink-editor/Makefile head/misc/umodunpack/Makefile head/multimedia/linux-tsmuxer/Makefile head/net-mgmt/icmpquery/Makefile head/net-mgmt/nagios-check_dhcp.pl/Makefile head/net-mgmt/nagios-check_tftp/Makefile head/net-p2p/frost/Makefile head/net-p2p/vuze/Makefile head/net/dictd-database/Makefile head/net/linux-f10-nss_ldap/Makefile head/net/lla/Makefile head/net/netpipes/Makefile head/net/radreport/Makefile head/net/spideroak/Makefile head/net/tcpshow/Makefile head/news/c-nocem/Makefile head/news/nnap/Makefile head/palm/pilot_makedoc/Makefile head/print/adobe-cmaps/Makefile head/print/enscriptfonts/Makefile head/print/ghostscript7-commfont/Makefile head/print/texlive-texmf/Makefile head/print/txtbdf2ps/Makefile head/russian/p5-XML-Parser-encodings/Makefile head/science/checkmol/Makefile head/science/medit/Makefile head/science/mol2ps/Makefile head/security/chaosreader/Makefile head/security/ipfilter2dshield/Makefile head/security/l0phtcrack/Makefile head/security/pxytest/Makefile head/security/py-htpasswd/Makefile head/security/sig2dot/Makefile head/security/sshblock/Makefile head/security/unhide/Makefile head/shells/v7sh/Makefile head/sysutils/3dm/Makefile head/sysutils/copytape/Makefile head/sysutils/pdixtract/Makefile head/sysutils/pstree/Makefile head/sysutils/sb16config/Makefile head/sysutils/setcdboot/Makefile head/sysutils/storcli/Makefile head/sysutils/vils/Makefile head/textproc/clit/Makefile head/textproc/diffsplit/Makefile head/textproc/foiltex/Makefile head/textproc/jarnal/Makefile head/textproc/ppower4/Makefile head/textproc/saxon-devel/Makefile head/vietnamese/vnroff/Makefile head/www/bareos-webui/Makefile head/www/cgi-lib.pl/Makefile head/www/closure-compiler/Makefile head/www/demoroniser/Makefile head/www/efront/Makefile head/www/fira-webfont/Makefile head/www/htmlpp/Makefile head/www/jawstats/Makefile head/www/jawstats/pkg-plist head/www/linux-c6-flashplugin11/Makefile head/www/mimetex/Makefile head/www/ruby-wgettsv/Makefile head/www/scloader/Makefile head/www/skytemplate/Makefile head/x11-fonts/fira/Makefile head/x11-fonts/noto/Makefile head/x11-fonts/proggy_fonts/Makefile head/x11-fonts/symbola/Makefile head/x11-fonts/tmu/Makefile head/x11-fonts/wqy/Makefile head/x11-themes/gnome-icons-aqua-fusion/Makefile head/x11-themes/gnome-icons-crystal/Makefile head/x11-themes/gnome-icons-dropline-neu/Makefile head/x11-themes/gnome-icons-dropline-nou/Makefile head/x11-themes/gnome-icons-elementary/Makefile head/x11-themes/gnome-icons-gentoo-test/Makefile head/x11-themes/gnome-icons-gion/Makefile head/x11-themes/gnome-icons-iris/Makefile head/x11-themes/gnome-icons-noia-full/Makefile head/x11-themes/gnome-icons-noia-warm/Makefile head/x11-themes/gnome-icons-refined/Makefile head/x11-themes/gnome-icons-slick/Makefile head/x11-themes/gnome-icons-snow-apple/Makefile head/x11-themes/gnome-icons-stylish/Makefile head/x11-themes/gnome-icons-ximian-south/Makefile head/x11-themes/gnome-icons/bsd.gnome-icons.mk head/x11/xkbctrl/Makefile head/x11/xnodecor/Makefile Modified: head/archivers/paq/Makefile ============================================================================== --- head/archivers/paq/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/archivers/paq/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -17,7 +17,7 @@ LICENSE_COMB= multi USES= dos2unix zip:infozip -EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt -d ${WRKDIR} +EXTRACT_AFTER_ARGS= -x *.bat *.exe readme.txt -d ${WRKSRC} NO_WRKSUBDIR= yes OPTIONS_DEFINE= OPENMP DOCS SUB_FILES= pkg-message Modified: head/archivers/szip/Makefile ============================================================================== --- head/archivers/szip/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/archivers/szip/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -28,8 +28,8 @@ post-patch: ${WRKSRC}/makefile do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR} .include Modified: head/archivers/undms/Makefile ============================================================================== --- head/archivers/undms/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/archivers/undms/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -16,8 +16,8 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/undms do-extract: - ${MKDIR} ${WRKDIR} - ${GZCAT} ${DISTDIR}/${DISTFILES} > ${WRKDIR}/${DISTNAME} + ${MKDIR} ${WRKSRC} + ${GZCAT} ${DISTDIR}/${DISTFILES} > ${WRKSRC}/${DISTNAME} do-build: cd ${WRKSRC} && ${CC} ${CFLAGS} -o undms undms-1.3.c Modified: head/astro/geographiclib/Makefile ============================================================================== --- head/astro/geographiclib/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/astro/geographiclib/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,8 +19,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:${PORTSDIR}/devel/autoconf-archive USES= autoreconf gmake libtool python -WRKSRC= ${WRKDIR}/${DISTNAME} -NO_WRKSUBDIR= yes PORTDOCS= * FETCH_ENV+= HTTP_REFERER= GNU_CONFIGURE= yes Modified: head/audio/chordpack/Makefile ============================================================================== --- head/audio/chordpack/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/audio/chordpack/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,12 +19,12 @@ NO_BUILD= true OPTIONS_DEFINE= DOCS do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/chordpack ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/chordpack ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp - ${INSTALL_DATA} ${WRKDIR}/chordpro-mode.el \ + ${INSTALL_DATA} ${WRKSRC}/chordpro-mode.el \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKDIR}/chordpack-documentation.html \ + ${INSTALL_MAN} ${WRKSRC}/chordpack-documentation.html \ ${STAGEDIR}${DOCSDIR} .include Modified: head/audio/cue2toc/Makefile ============================================================================== --- head/audio/cue2toc/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/audio/cue2toc/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,9 +19,9 @@ PLIST_FILES= bin/cue2toc.pl SHEBANG_FILES= cue2toc pre-patch: - @${REINPLACE_CMD} -e 's|use warnings;||' ${WRKDIR}/cue2toc + @${REINPLACE_CMD} -e 's|use warnings;||' ${WRKSRC}/cue2toc do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/cue2toc ${STAGEDIR}${PREFIX}/bin/cue2toc.pl + ${INSTALL_SCRIPT} ${WRKSRC}/cue2toc ${STAGEDIR}${PREFIX}/bin/cue2toc.pl .include Modified: head/benchmarks/raidtest/Makefile ============================================================================== --- head/benchmarks/raidtest/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/benchmarks/raidtest/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -17,7 +17,7 @@ PLIST_FILES= bin/raidtest do-fetch: do-extract: - ${MKDIR} ${WRKDIR} - ${LN} -sf ${FILESDIR}/${PORTNAME}.c ${FILESDIR}/Makefile ${WRKDIR} + ${MKDIR} ${WRKSRC} + ${LN} -sf ${FILESDIR}/${PORTNAME}.c ${FILESDIR}/Makefile ${WRKSRC} .include Modified: head/benchmarks/stream/Makefile ============================================================================== --- head/benchmarks/stream/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/benchmarks/stream/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} PORTDOCS= stream.c PLIST_FILES= bin/stream_bench Modified: head/biology/gff2ps/Makefile ============================================================================== --- head/biology/gff2ps/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/biology/gff2ps/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -32,11 +32,11 @@ DOCS_DISTFILES= ${GFF2PS_MAN}.gz:doc .include do-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} @${GZCAT} ${DISTDIR}/${PORTNAME}_v${PORTVERSION}.gz \ - > ${WRKDIR}/${PORTNAME} + > ${WRKSRC}/${PORTNAME} do-extract-DOCS-on: - @${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKDIR}/${GFF2PS_MAN} + @${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKSRC}/${GFF2PS_MAN} post-patch: @${REINPLACE_CMD} -e \ @@ -44,9 +44,9 @@ post-patch: s|/usr/local/bin/gawk|${LOCALBASE}/bin/gawk|' ${WRKSRC}/gff2ps do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/gff2ps ${STAGEDIR}${PREFIX}/bin do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${GFF2PS_MAN} ${STAGEDIR}${DOCSDIR} .include Modified: head/chinese/CJKUnifonts/Makefile ============================================================================== --- head/chinese/CJKUnifonts/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/chinese/CJKUnifonts/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -23,8 +23,8 @@ TTF= ukai.ttc uming.ttc do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKDIR}/ukai.ttc ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKDIR}/uming.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/ukai.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/uming.ttc ${STAGEDIR}${FONTSDIR} .include "${.CURDIR}/../ttfm/Makefile.ttf" .include Modified: head/chinese/xpdf/Makefile ============================================================================== --- head/chinese/xpdf/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/chinese/xpdf/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -47,7 +47,7 @@ do-install: cd ${WRKSRC}/xpdf-chinese-traditional && \ ${INSTALL_DATA} ${TRAD_FILES} \ ${STAGEDIR}${DATADIR}/chinese-traditional - ${INSTALL_DATA} ${WRKSRC}/dot.xpdfrc \ + ${INSTALL_DATA} ${WRKDIR}/dot.xpdfrc \ ${STAGEDIR}${DATADIR}/chinese-traditional ${MKDIR} ${STAGEDIR}${DATADIR}/chinese-traditional/CMap cd ${STAGEDIR}${DATADIR}/chinese-traditional/CMap && \ Modified: head/comms/cdr_read/Makefile ============================================================================== --- head/comms/cdr_read/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/comms/cdr_read/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -18,8 +18,8 @@ NO_WRKSUBDIR= yes OPTIONS_DEFINE= DOCS do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/readme_eng.txt ${STAGEDIR}${DOCSDIR}/readme.txt + ${INSTALL_DATA} ${WRKSRC}/readme_eng.txt ${STAGEDIR}${DOCSDIR}/readme.txt .include Modified: head/converters/unix2dos/Makefile ============================================================================== --- head/converters/unix2dos/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/converters/unix2dos/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -14,9 +14,9 @@ PLIST_FILES= bin/dos2unix bin/unix2dos \ NO_WRKSUBDIR= yes do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/unix2dos ${STAGEDIR}${PREFIX}/bin/unix2dos + ${INSTALL_PROGRAM} ${WRKSRC}/unix2dos ${STAGEDIR}${PREFIX}/bin/unix2dos ${LN} -f ${STAGEDIR}${PREFIX}/bin/unix2dos ${STAGEDIR}${PREFIX}/bin/dos2unix - ${INSTALL_MAN} ${WRKDIR}/man1/unix2dos.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/man1/dos2unix.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man1/unix2dos.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man1/dos2unix.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Modified: head/devel/apr1/Makefile ============================================================================== --- head/devel/apr1/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/apr1/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -50,9 +50,11 @@ PGSQL_USES= pgsql SQLITE_USE= SQLITE=yes SSL_USE= OPENSSL=yes -NO_WRKSUBDIR= yes APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} +WRKSRC= ${APR_WRKDIR} +PATCH_WRKSRC= ${WRKDIR} +PATHFIX_WRKSRC= ${WRKDIR} SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/} SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/} Modified: head/devel/cvs2html/Makefile ============================================================================== --- head/devel/cvs2html/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/cvs2html/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -34,6 +34,6 @@ do-extract: @${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Modified: head/devel/cweb/Makefile ============================================================================== --- head/devel/cweb/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/cweb/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -34,6 +34,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cwebmac.tex \ ${STAGEDIR}${PREFIX}/share/texmf/tex/generic/misc @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/cwebman.tex ${STAGEDIR}${DOCSDIR} .include Modified: head/devel/easygit/Makefile ============================================================================== --- head/devel/easygit/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/easygit/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -17,18 +17,18 @@ DISTREVISION= 0 # bump this if distfile DIST_SUBDIR= eg/${PORTVERSION}_${DISTREVISION} USES= perl5 shebangfix -SHEBANG_FILES= ${WRKDIR}/eg +SHEBANG_FILES= ${WRKSRC}/eg USE_PERL5= run NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/eg bin/easygit do-extract: - @${CP} ${_DISTDIR}/${DISTNAME} ${WRKDIR} + @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/eg ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/eg ${STAGEDIR}${PREFIX}/bin/ cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ./eg ${STAGEDIR}${PREFIX}/bin/easygit .include Modified: head/devel/libcii/Makefile ============================================================================== --- head/devel/libcii/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/libcii/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -18,7 +18,7 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} LD="${CC}" LDFLAGS="" EXTRAS="" BUILDDIR=${PKGNAME} PLIST_SUB= CIIMAJOR="${CIIMAJOR}" -CIIBUILD= ${WRKDIR}/${PKGNAME} +CIIBUILD= ${WRKSRC}/${PKGNAME} CIIMAJOR= 1 CIIDEST= ${PREFIX}/lib/cii @@ -48,7 +48,7 @@ post-patch: pre-build: @${MKDIR} ${CIIBUILD} @${MKDIR} ${CIIBUILD}/include - @${CP} ${WRKDIR}/include/*.h ${CIIBUILD}/include + @${CP} ${WRKSRC}/include/*.h ${CIIBUILD}/include # ${PREFIX}/lib/cii/${CIIMAJOR}/ # ${PREFIX}/lib/cii/${CIIMAJOR}/include Modified: head/devel/libdlmalloc/Makefile ============================================================================== --- head/devel/libdlmalloc/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/libdlmalloc/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -14,10 +14,10 @@ NO_WRKSUBDIR= yes USE_LDCONFIG= yes do-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} .for f in ${DISTFILES} - ${CP} -p ${DISTDIR}/${f} ${WRKDIR} + ${CP} -p ${DISTDIR}/${f} ${WRKSRC} .endfor - ${CP} -p ${FILESDIR}/Makefile ${WRKDIR} + ${CP} -p ${FILESDIR}/Makefile ${WRKSRC} .include Modified: head/devel/mingw32-bin-msvcrt/Makefile ============================================================================== --- head/devel/mingw32-bin-msvcrt/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/mingw32-bin-msvcrt/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -26,6 +26,6 @@ NO_MTREE= yes NO_WRKSUBDIR= yes post-extract: - @${CP} ${FILESDIR}/Makefile ${WRKDIR} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} .include Modified: head/devel/py-json-py/Makefile ============================================================================== --- head/devel/py-json-py/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/py-json-py/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,7 +19,7 @@ USES= python zip do-build: # compile python files - cd ${WRKDIR}; \ + cd ${WRKSRC}; \ FILES=$$(${FIND} . -name "*.py" ); \ for FILE in $${FILES}; do \ ${ECHO} import `basename $${FILE} .py` | ${PYTHON_CMD}; \ @@ -27,7 +27,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - @cd ${WRKDIR}; \ + @cd ${WRKSRC}; \ ${FIND} . \( -name "*.py" -or -name "*.pyc" \) -exec ${INSTALL_SCRIPT} \{\} ${STAGEDIR}${PYTHON_SITELIBDIR} \; .include Modified: head/devel/py-urlimport/Makefile ============================================================================== --- head/devel/py-urlimport/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/py-urlimport/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -18,8 +18,8 @@ USES= python USE_PYTHON= distutils autoplist do-extract: - ${MKDIR} ${WRKDIR} - ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PORTNAME}.py + ${MKDIR} ${WRKSRC} + ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${PORTNAME}.py ${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${FILESDIR}/setup.py \ > ${WRKSRC}/setup.py Modified: head/devel/ruby-dialogs/Makefile ============================================================================== --- head/devel/ruby-dialogs/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/ruby-dialogs/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -21,9 +21,9 @@ OPTIONS_DEFINE= DOCS do-install: ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR} - ${INSTALL_DATA} ${WRKDIR}/dialogs.rb ${STAGEDIR}${RUBY_SITELIBDIR}/ + ${INSTALL_DATA} ${WRKSRC}/dialogs.rb ${STAGEDIR}${RUBY_SITELIBDIR}/ ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR} - ${INSTALL_DATA} ${WRKDIR}/dialogs.html ${STAGEDIR}${RUBY_MODDOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/dialogs.html ${STAGEDIR}${RUBY_MODDOCDIR}/ .include Modified: head/devel/sedsed/Makefile ============================================================================== --- head/devel/sedsed/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/sedsed/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -13,7 +13,7 @@ COMMENT= Python script that masters SED PLIST_FILES= bin/sedsed EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} NO_WRKSUBDIR= yes NO_BUILD= yes Modified: head/devel/sfio/Makefile ============================================================================== --- head/devel/sfio/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/devel/sfio/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -18,17 +18,17 @@ NO_WRKSUBDIR= yes # Remove a test that's too clever for its own good post-extract: - @${MV} ${WRKDIR}/src/lib/sfio/Sfio_t/tmmap2read.c \ - ${WRKDIR}/src/lib/sfio/Sfio_t/.tmmap2read.c + @${MV} ${WRKSRC}/src/lib/sfio/Sfio_t/tmmap2read.c \ + ${WRKSRC}/src/lib/sfio/Sfio_t/.tmmap2read.c do-build: - @cd ${WRKDIR}/src/lib/sfio && ${MAKE} all -f makefile + @cd ${WRKSRC}/src/lib/sfio && ${MAKE} all -f makefile do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/sfio - ${INSTALL_DATA} ${WRKDIR}/include/* ${STAGEDIR}${PREFIX}/include/sfio - (cd ${WRKDIR}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib) - ${INSTALL_MAN} ${WRKDIR}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3 + ${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include/sfio + (cd ${WRKSRC}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib) + ${INSTALL_MAN} ${WRKSRC}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3 .include Modified: head/dns/dnswalk/Makefile ============================================================================== --- head/dns/dnswalk/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/dns/dnswalk/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -22,15 +22,15 @@ SHEBANG_FILES= dnswalk makereports do-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/do-dnswalk \ - ${WRKDIR}/makereports \ - ${WRKDIR}/sendreports \ + ${INSTALL_SCRIPT} ${WRKSRC}/do-dnswalk \ + ${WRKSRC}/makereports \ + ${WRKSRC}/sendreports \ ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/README \ - ${WRKDIR}/dnswalk.errors \ + ${INSTALL_DATA} ${WRKSRC}/README \ + ${WRKSRC}/dnswalk.errors \ ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${WRKDIR}/dnswalk.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_SCRIPT} ${WRKDIR}/dnswalk ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/dnswalk.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/dnswalk ${STAGEDIR}${PREFIX}/bin .include Modified: head/dns/ipcheck/Makefile ============================================================================== --- head/dns/ipcheck/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/dns/ipcheck/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -25,9 +25,9 @@ do-patch: @${SED} \ -e "s!/usr/bin/python!${LOCALBASE}/bin/python!" \ -e "s!ppp0!tun0!" \ - ${DISTDIR}/${DISTNAME} > ${WRKDIR}/${DISTNAME} + ${DISTDIR}/${DISTNAME} > ${WRKSRC}/${DISTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} \ + ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.py .include Modified: head/editors/omegaT/Makefile ============================================================================== --- head/editors/omegaT/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/editors/omegaT/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -39,11 +39,11 @@ DESKTOP_ENTRIES="OmegaT" "Translation me "omegaT" "Office;WordProcessor;Java;" \ false post-build: - @cd ${WRKDIR} && ${MV} 'dist' ${PORTNAME} + @cd ${WRKSRC} && ${MV} 'dist' ${PORTNAME} do-install: @${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} - @cd ${WRKDIR} && ${COPYTREE_BIN} ${PORTNAME} ${STAGEDIR}${JAVASHAREDIR} + @cd ${WRKSRC} && ${COPYTREE_BIN} ${PORTNAME} ${STAGEDIR}${JAVASHAREDIR} ${INSTALL_SCRIPT} ${WRKDIR}/omegat.prefs ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/omegaT.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} Modified: head/emulators/linux_base-c6/Makefile ============================================================================== --- head/emulators/linux_base-c6/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/emulators/linux_base-c6/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -180,17 +180,17 @@ ARCH= i386 pre-extract: @for file in ${PRE_BIN_DISTFILES}; do \ - if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ + if ! (cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ then \ exit 1; \ fi; \ done # now fix up broken permissions . if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == "c6_64" - @${CHMOD} -R u+rwX ${WRKDIR}/lib64 ${WRKDIR}/usr/lib64 + @${CHMOD} -R u+rwX ${WRKSRC}/lib64 ${WRKSRC}/usr/lib64 . endif - @${CHMOD} -R u+rwX ${WRKDIR}/bin ${WRKDIR}/lib ${WRKDIR}/sbin ${WRKDIR}/usr/bin ${WRKDIR}/usr/lib ${WRKDIR}/usr/sbin - @${CHMOD} 400 ${WRKDIR}/etc/*shadow + @${CHMOD} -R u+rwX ${WRKSRC}/bin ${WRKSRC}/lib ${WRKSRC}/sbin ${WRKSRC}/usr/bin ${WRKSRC}/usr/lib ${WRKSRC}/usr/sbin + @${CHMOD} 400 ${WRKSRC}/etc/*shadow do-build: @for D in ${REMOVE_DIRS}; do \ @@ -242,8 +242,8 @@ do-install: # # Do install without using linux rpm system # - @cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; - @cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d \ + @cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; + @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} @${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp Modified: head/emulators/linux_base-f10/Makefile ============================================================================== --- head/emulators/linux_base-f10/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/emulators/linux_base-f10/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -203,8 +203,8 @@ do-install: # # Do install without using linux rpm system # - @cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; - @cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d \ + @cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \; + @cd ${WRKSRC} && ${FIND} * ! -type d \ | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX} @${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp Modified: head/emulators/qmc2/Makefile ============================================================================== --- head/emulators/qmc2/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/emulators/qmc2/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -42,7 +42,7 @@ post-patch: @${CP} ${FILESDIR}/Makefile ${WRKSRC} @(cd ${WRKSRC}/qmc2/inst; ${SED} -e 's|DATADIR|${PREFIX}/share|' \ < qmc2.ini.template > qmc2.ini) - @${REINPLACE_CMD} -e 's/bash/sh/' ${WRKDIR}/qmc2/scripts/sdl-libs.sh + @${REINPLACE_CMD} -e 's/bash/sh/' ${WRKSRC}/qmc2/scripts/sdl-libs.sh do-install: (cd ${WRKSRC}/qmc2 && ${INSTALL_PROGRAM} qmc2-sdlmame \ Modified: head/emulators/simh/Makefile ============================================================================== --- head/emulators/simh/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/emulators/simh/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -39,14 +39,14 @@ post-patch: 's|%%DATADIR%%|${DATADIR}|' ${WRKSRC}/VAX/vax_sysdev.c do-install: - (cd ${WRKDIR}/BIN && ${INSTALL_PROGRAM} ${BIN_FILES} \ + (cd ${WRKSRC}/BIN && ${INSTALL_PROGRAM} ${BIN_FILES} \ ${STAGEDIR}${PREFIX}/bin) # eclipse conflicts with java/eclipse, install it as simh-eclipse - ${INSTALL_PROGRAM} ${WRKDIR}/BIN/eclipse \ + ${INSTALL_PROGRAM} ${WRKSRC}/BIN/eclipse \ ${STAGEDIR}${PREFIX}/bin/simh-eclipse @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/VAX/ka655x.bin ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/VAX/ka655x.bin ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) .include Modified: head/emulators/yape/Makefile ============================================================================== --- head/emulators/yape/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/emulators/yape/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS .include post-extract: - @${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \ + @${FIND} -E ${WRKSRC} -type f -iregex ".*\.(c|cpp|h|txt)" -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' @${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/Makefile Modified: head/games/alephone-data/Makefile ============================================================================== --- head/games/alephone-data/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/alephone-data/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -70,13 +70,13 @@ post-extract: pre-install: .for f in ${AO_PACKS} - @cd ${WRKSRC} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f} + @cd ${WRKDIR} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f} .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR} .for f in ${AO_PACKS} - ${INSTALL_SCRIPT} ${WRKSRC}/alephone-${f} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/alephone-${f} ${STAGEDIR}${PREFIX}/bin ${CP} -R ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} .endfor Modified: head/games/alephone-scenarios/Makefile ============================================================================== --- head/games/alephone-scenarios/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/alephone-scenarios/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -140,7 +140,7 @@ post-extract: pre-install: .for f in ${AO_PACKS} - @cd ${WRKSRC} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f} + @cd ${WRKDIR} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f} .endfor @cd ${WRKSRC} && \ ${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755 Modified: head/games/arkanoidsb/Makefile ============================================================================== --- head/games/arkanoidsb/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/arkanoidsb/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -13,7 +13,6 @@ COMMENT= Arkanoid and space game WRKSRC= ${WRKDIR}/${PORTNAME} USES= tar:bzip2 -NO_WRKSUBDIR= yes NO_BUILD= yes USE_LINUX= yes USE_LINUX_APPS= libogg sdlmixer sdlimage Modified: head/games/bogged/Makefile ============================================================================== --- head/games/bogged/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/bogged/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -15,7 +15,7 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-too EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} NO_WRKSUBDIR= yes NO_BUILD= yes Modified: head/games/crafty-open-enormous/Makefile ============================================================================== --- head/games/crafty-open-enormous/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/crafty-open-enormous/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -25,10 +25,10 @@ do-build: @${ECHO_MSG} '================================================================' @${ECHO_MSG} 'Ignore warnings about illegal moves. These warnings are normal.' @${ECHO_MSG} '================================================================' - (cd ${WRKDIR} && crafty bookpath=. <${FILESDIR}/book-building) + (cd ${WRKSRC} && crafty bookpath=. <${FILESDIR}/book-building) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty - ${INSTALL_DATA} ${WRKDIR}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin + ${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin .include Modified: head/games/crafty-open-large/Makefile ============================================================================== --- head/games/crafty-open-large/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/crafty-open-large/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -20,17 +20,17 @@ NO_WRKSUBDIR= yes CONFLICTS= crafty-open-enormous-* crafty-open-medium-* crafty-open-default-* post-extract: - ${CAT} ${WRKDIR}/Book1.pgn ${WRKDIR}/Book2.pgn ${WRKDIR}/Book3.pgn ${WRKDIR}/Book4.pgn >${WRKDIR}/Book.pgn - ${RM} ${WRKDIR}/Book1.pgn ${WRKDIR}/Book2.pgn ${WRKDIR}/Book3.pgn ${WRKDIR}/Book4.pgn + ${CAT} ${WRKSRC}/Book1.pgn ${WRKSRC}/Book2.pgn ${WRKSRC}/Book3.pgn ${WRKSRC}/Book4.pgn >${WRKSRC}/Book.pgn + ${RM} ${WRKSRC}/Book1.pgn ${WRKSRC}/Book2.pgn ${WRKSRC}/Book3.pgn ${WRKSRC}/Book4.pgn do-build: @${ECHO_MSG} '================================================================' @${ECHO_MSG} 'Ignore warnings about illegal moves. These warnings are normal.' @${ECHO_MSG} '================================================================' - (cd ${WRKDIR} && crafty <${FILESDIR}/book-building) + (cd ${WRKSRC} && crafty <${FILESDIR}/book-building) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty - ${INSTALL_DATA} ${WRKDIR}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin + ${INSTALL_DATA} ${WRKSRC}/book.bin ${STAGEDIR}${PREFIX}/lib/crafty/book.bin .include Modified: head/games/crafty-open-medium/Makefile ============================================================================== --- head/games/crafty-open-medium/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/crafty-open-medium/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -23,11 +23,11 @@ do-build: @${ECHO_MSG} '================================================================' @${ECHO_MSG} 'Ignore warnings about illegal moves. These warnings are normal.' @${ECHO_MSG} '================================================================' - (cd ${WRKDIR} && crafty <${FILESDIR}/book-building) + (cd ${WRKSRC} && crafty <${FILESDIR}/book-building) do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/crafty - ${INSTALL_DATA} ${WRKDIR}/book.bin \ + ${INSTALL_DATA} ${WRKSRC}/book.bin \ ${STAGEDIR}${PREFIX}/lib/crafty/book.bin .include Modified: head/games/doom-data/Makefile ============================================================================== --- head/games/doom-data/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/doom-data/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -39,9 +39,9 @@ STRIFE_DISTFILES= strife0.wad.bz2 .include do-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} .for f in ${DISTFILES} - @${BZIP2_CMD} -dc ${_DISTDIR}/${f} > ${WRKDIR}/${f:S/.bz2$//} + @${BZIP2_CMD} -dc ${_DISTDIR}/${f} > ${WRKSRC}/${f:S/.bz2$//} .endfor do-install: Modified: head/games/doom-hacx/Makefile ============================================================================== --- head/games/doom-hacx/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/doom-hacx/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -26,9 +26,8 @@ PLIST_DIRS= %%DATADIR%% .include do-extract: - @${MKDIR} ${WRKDIR} @${BZIP2_CMD} -dc ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > \ - ${WRKDIR}/${DISTNAME} + ${WRKSRC}/${DISTNAME} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/doom-wolfendoom/Makefile ============================================================================== --- head/games/doom-wolfendoom/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/doom-wolfendoom/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -22,9 +22,9 @@ DATADIR= ${DMDIR}/${PORTNAME} .include do-install: - ${FIND} ${WRKDIR}/${PORTNAME} ! -type d -exec ${CHMOD} 0644 {} \; - ${FIND} ${WRKDIR}/${PORTNAME} -type d -exec ${CHMOD} 0755 {} \; + ${FIND} ${WRKSRC}/${PORTNAME} ! -type d -exec ${CHMOD} 0644 {} + + ${FIND} ${WRKSRC}/${PORTNAME} -type d -exec ${CHMOD} 0755 {} + @${MKDIR} ${STAGEDIR}${DATADIR} - ${TAR} -cf - -C ${WRKDIR}/${PORTNAME} . | ${TAR} -xpvf - -C ${STAGEDIR}${DATADIR} + ${TAR} -cf - -C ${WRKSRC}/${PORTNAME} . | ${TAR} -xpvf - -C ${STAGEDIR}${DATADIR} .include Modified: head/games/legends/Makefile ============================================================================== --- head/games/legends/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/legends/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -32,7 +32,7 @@ PLIST_SUB= MAP_PACK="${MAP_PACK}" OPTIONS_DEFINE= DOCS post-extract: - @cd ${WRKDIR} && ${TAR} xf legends.tar + @cd ${WRKSRC} && ${TAR} xf legends.tar post-patch: @${REINPLACE_CMD} -e 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|; \ Modified: head/games/linux-darwinia-demo/Makefile ============================================================================== --- head/games/linux-darwinia-demo/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-darwinia-demo/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -34,8 +34,7 @@ USE_LINUX_APPS+=dri .endif do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} zxf - do-build: Modified: head/games/linux-doom3/Makefile ============================================================================== --- head/games/linux-doom3/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-doom3/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -37,8 +37,8 @@ PLIST_SUB+= NEW="" .endif do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @${MKDIR} ${WRKSRC} + @cd ${WRKSRC} && ${TAIL} +374 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} zxf - .if empty(PORT_OPTIONS:MNO_CDKEY) Modified: head/games/linux-quake3-demo/Makefile ============================================================================== --- head/games/linux-quake3-demo/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-quake3-demo/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -30,8 +30,7 @@ SUB_FILES= q3demo OPTIONS_DEFINE= DOCS do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +165 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKSRC} && ${TAIL} +165 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} zxf - do-install: Modified: head/games/linux-quake3/Makefile ============================================================================== --- head/games/linux-quake3/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-quake3/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -41,10 +41,9 @@ Q3DATAFILE= linuxq3apoint-1.32b-3.x86.ru Q3PATCHFILE= quake3-${PORTVERSION}.zip do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${Q3DATAFILE} | \ + @cd ${WRKSRC} && ${TAIL} +356 ${_DISTDIR}/${Q3DATAFILE} | \ ${TAR} zxf - - @${UNZIP_CMD} -qo ${_DISTDIR}/${Q3PATCHFILE} -d ${WRKDIR} + @${UNZIP_CMD} -qo ${_DISTDIR}/${Q3PATCHFILE} -d ${WRKSRC} post-extract: .for f in q3ded quake3.x86 quake3-smp.x86 Modified: head/games/linux-quake4-demo/Makefile ============================================================================== --- head/games/linux-quake4-demo/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-quake4-demo/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -23,9 +23,7 @@ Q4DIR= lib/${PKGNAMEPREFIX}${PORTNAME}$ PLIST_SUB= Q4DIR="${Q4DIR}" do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKSRC} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} zxf - do-build: Modified: head/games/linux-quake4/Makefile ============================================================================== --- head/games/linux-quake4/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-quake4/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -40,9 +40,7 @@ PLIST_SUB+= THREADS="@comment " .endif do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKSRC} && ${TAIL} +376 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} zxf - do-build: Modified: head/games/linux-uplink-demo/Makefile ============================================================================== --- head/games/linux-uplink-demo/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/linux-uplink-demo/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -38,8 +38,7 @@ USE_LINUX_APPS+=dri .endif do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ + @cd ${WRKSRC} && ${TAIL} +376 ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ ${TAR} zxf - do-build: Modified: head/games/quake-dpmod/Makefile ============================================================================== --- head/games/quake-dpmod/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/quake-dpmod/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -22,9 +22,9 @@ DATADIR= ${Q1DIR}/${PORTNAME} post-extract: # Remove CVS directories - @${FIND} ${WRKDIR} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf + @${FIND} ${WRKSRC} -type d -name CVS -print0 | ${XARGS} -0 ${RM} -rf # Fix permissions - @${CHMOD} go-w ${WRKDIR}/dpmod/progs.dat + @${CHMOD} go-w ${WRKSRC}/dpmod/progs.dat do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/quake2-data/Makefile ============================================================================== --- head/games/quake2-data/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/quake2-data/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -55,18 +55,18 @@ SUB_FILES= pkg-message .endif do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && uncompress -c ${DISTDIR}/${Q2_SRC} | \ + @${MKDIR} ${WRKSRC} + @cd ${WRKSRC} && uncompress -c ${DISTDIR}/${Q2_SRC} | \ ${TAIL} +434 | ${SH} - @${UNZIP_CMD} -q -d ${WRKDIR} \ + @${UNZIP_CMD} -q -d ${WRKSRC} \ ${DISTDIR}/${Q2_UPDATE} baseq2/* -x *.dll .if ${PORT_OPTIONS:MMANUAL} - @${UNZIP_CMD} -ajq -d ${WRKDIR}/DOCS \ + @${UNZIP_CMD} -ajq -d ${WRKSRC}/DOCS \ ${DISTDIR}/${Q2_DEMO} Install/Data/DOCS/* .endif .if ${PORT_OPTIONS:MSHAREWARE} - @${RM} ${WRKDIR}/baseq2/pak[^0].pak - @${UNZIP_CMD} -jq -d ${WRKDIR}/baseq2 \ + @${RM} ${WRKSRC}/baseq2/pak[^0].pak + @${UNZIP_CMD} -jq -d ${WRKSRC}/baseq2 \ ${DISTDIR}/${Q2_DEMO} Install/Data/baseq2/pak0.pak .endif Modified: head/games/quake2-rogue/Makefile ============================================================================== --- head/games/quake2-rogue/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/quake2-rogue/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,8 +19,7 @@ PLIST_FILES= %%Q2DIR%%/${PORTNAME}/game. PLIST_DIRS= %%Q2DIR%%/${PORTNAME} do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \ + @cd ${WRKSRC} && uncompress -c ${DISTDIR}/${DISTFILES} | \ ${TAIL} +454 | ${SH} post-extract: Modified: head/games/quake2-xatrix/Makefile ============================================================================== --- head/games/quake2-xatrix/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/quake2-xatrix/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,8 +19,8 @@ PLIST_FILES= %%Q2DIR%%/${PORTNAME}/game. PLIST_DIRS= %%Q2DIR%%/${PORTNAME} do-extract: - @${MKDIR} ${WRKDIR} - @cd ${WRKDIR} && uncompress -c ${DISTDIR}/${DISTFILES} | \ + @${MKDIR} ${WRKSRC} + @cd ${WRKSRC} && uncompress -c ${DISTDIR}/${DISTFILES} | \ ${TAIL} +441 | ${SH} post-extract: Modified: head/games/quake3-data/Makefile ============================================================================== --- head/games/quake3-data/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/quake3-data/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -30,10 +30,10 @@ TEAMARENA_DESC= Install Quake III Team .include do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} + @${RM} -rf ${WRKSRC} + @${MKDIR} ${WRKSRC} @${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \ - ${TAR} xzf - -C ${WRKDIR} + ${TAR} xzf - -C ${WRKSRC} do-install: @${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/games/rfksay/Makefile ============================================================================== --- head/games/rfksay/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/rfksay/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -17,8 +17,8 @@ NO_WRKSUBDIR= yes SHEBANG_FILES= rfksay kittensay robotsay do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/kittensay ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/robotsay ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/kittensay ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/robotsay ${STAGEDIR}${PREFIX}/bin .include Modified: head/games/robocode/Makefile ============================================================================== --- head/games/robocode/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/robocode/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -31,7 +31,7 @@ SUB_FILES= ${PORTNAME}-MeleeRumble ${POR ${PORTNAME}-TwinDuel pkg-deinstall pkg-message do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-* \ + cd ${WRKDIR} && ${INSTALL_SCRIPT} ${SUB_FILES:M${PORTNAME}*} \ ${STAGEDIR}${PREFIX}/bin/ .for d in battles compilers javadoc libs license roborumble robots \ Modified: head/games/thudboard/Makefile ============================================================================== --- head/games/thudboard/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/thudboard/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} -e 's|file:.*/docs|file://${DOCSDIR}|' \ - ${WRKDIR}/thud.py + ${WRKSRC}/thud.py do-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} 2>/dev/null @@ -32,10 +32,10 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${DATADIR} @${INSTALL_DATA} ${WRKSRC}/*.pyc ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} - @(cd ${WRKDIR}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + @(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) . for d in koomvalley img @${MKDIR} ${STAGEDIR}${DATADIR}/${d} - @(cd ${WRKDIR}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${d}) + @(cd ${WRKSRC}/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${d}) . endfor .include Modified: head/games/traindirector/Makefile ============================================================================== --- head/games/traindirector/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/traindirector/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -29,6 +29,6 @@ PLIST_FILES= bin/traindir3 MAKEFILE= Makefile.fc9 do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/traindir3 ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/traindir3 ${STAGEDIR}${PREFIX}/bin .include Modified: head/games/xasteroids/Makefile ============================================================================== --- head/games/xasteroids/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/games/xasteroids/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -12,7 +12,7 @@ EXTRACT_SUFX= .sh.Z MAINTAINER= ports@FreeBSD.org COMMENT= X11 based asteroids style arcade game -EXTRACT_CMD= ( cd ${WRKDIR}; zcat | ${SH} -s ) +EXTRACT_CMD= ( cd ${WRKSRC}; zcat | ${SH} -s ) EXTRACT_BEFORE_ARGS= < EXTRACT_AFTER_ARGS= # empty Modified: head/graphics/fujiplay/Makefile ============================================================================== --- head/graphics/fujiplay/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/graphics/fujiplay/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -23,10 +23,10 @@ post-patch: @${REINPLACE_CMD} -e 's|^\(CC[^g]*\)gcc$$|\1${CC}|' ${WRKSRC}/Makefile do-install: - (cd ${WRKDIR}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${STAGEDIR}${PREFIX}/bin) @${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/fujiplay .for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/share/doc/fujiplay + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/doc/fujiplay .endfor .include Modified: head/graphics/geoapi/Makefile ============================================================================== --- head/graphics/geoapi/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/graphics/geoapi/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -23,12 +23,12 @@ OPTIONS_DEFINE= DOCS do-install: .for jar in ${JARFILES} - ${INSTALL_DATA} ${WRKDIR}/${jar}.jar ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/${jar}.jar ${STAGEDIR}${JAVAJARDIR} .endfor do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKDIR}/javadoc \ + cd ${WRKSRC}/javadoc \ && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \ && ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \; Modified: head/graphics/gimp-jagged-border-script/Makefile ============================================================================== --- head/graphics/gimp-jagged-border-script/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/graphics/gimp-jagged-border-script/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -33,6 +33,6 @@ post-extract: do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}/ + ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}/ .include Modified: head/graphics/mapyrus/Makefile ============================================================================== --- head/graphics/mapyrus/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/graphics/mapyrus/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -32,12 +32,12 @@ USE_JAVA= yes do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR} + ${INSTALL_DATA} ${WRKSRC}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS} + ${INSTALL_DATA} ${WRKSRC}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKDIR}/userdoc && \ + cd ${WRKSRC}/userdoc && \ ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} \ "-type f -not -iname copying -and -not -iname *\.tex" Modified: head/graphics/openjump/Makefile ============================================================================== --- head/graphics/openjump/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/graphics/openjump/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -44,7 +44,6 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ USES= zip NO_BUILD= yes -NO_WRKSUBDIR= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS PLUS_REV= 4164 Modified: head/graphics/pstoepsi/Makefile ============================================================================== --- head/graphics/pstoepsi/Makefile Thu Nov 5 12:35:26 2015 (r400847) +++ head/graphics/pstoepsi/Makefile Thu Nov 5 12:36:25 2015 (r400848) @@ -19,17 +19,17 @@ USES= ghostscript:run NO_WRKSUBDIR= yes pre-patch: - ${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKDIR}/pstoepsi.prefix - ${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKDIR} + ${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKSRC}/pstoepsi.prefix + ${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKSRC} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***