diff options
| author | mat <mat@FreeBSD.org> | 2015-11-05 20:36:25 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-11-05 20:36:25 +0800 |
| commit | 344522393988339d341fda0818f0281645323f90 (patch) | |
| tree | 9cbf2a263e7841be76898ae832e7bfb273d3fd08 | |
| parent | a8ea83538e74965157afe830f9873190be5ac78a (diff) | |
| download | freebsd-ports-gnome-344522393988339d341fda0818f0281645323f90.tar.gz freebsd-ports-gnome-344522393988339d341fda0818f0281645323f90.tar.zst freebsd-ports-gnome-344522393988339d341fda0818f0281645323f90.zip | |
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
206 files changed, 532 insertions, 577 deletions
diff --git a/archivers/paq/Makefile b/archivers/paq/Makefile index 63cbbf5006cb..4bfe799bbf4c 100644 --- a/archivers/paq/Makefile +++ b/archivers/paq/Makefile @@ -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 diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile index 32adce3e71ad..2d9502946f24 100644 --- a/archivers/szip/Makefile +++ b/archivers/szip/Makefile @@ -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 <bsd.port.mk> diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile index 2304423b2d2c..df8fafcbe8ef 100644 --- a/archivers/undms/Makefile +++ b/archivers/undms/Makefile @@ -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 diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile index 0f43d0601801..8809098681f4 100644 --- a/astro/geographiclib/Makefile +++ b/astro/geographiclib/Makefile @@ -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 diff --git a/audio/chordpack/Makefile b/audio/chordpack/Makefile index f9f3eae0344b..a76240495cf0 100644 --- a/audio/chordpack/Makefile +++ b/audio/chordpack/Makefile @@ -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 <bsd.port.mk> diff --git a/audio/cue2toc/Makefile b/audio/cue2toc/Makefile index 2cd62192f1cc..46cff2e05dfc 100644 --- a/audio/cue2toc/Makefile +++ b/audio/cue2toc/Makefile @@ -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 <bsd.port.mk> diff --git a/benchmarks/raidtest/Makefile b/benchmarks/raidtest/Makefile index 00e2b8350f57..0928246a0411 100644 --- a/benchmarks/raidtest/Makefile +++ b/benchmarks/raidtest/Makefile @@ -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 <bsd.port.mk> diff --git a/benchmarks/stream/Makefile b/benchmarks/stream/Makefile index 206100fd6a39..11dbd8a54e3b 100644 --- a/benchmarks/stream/Makefile +++ b/benchmarks/stream/Makefile @@ -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 diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile index f591aa5ae66f..11e06ce17ee4 100644 --- a/biology/gff2ps/Makefile +++ b/biology/gff2ps/Makefile @@ -32,11 +32,11 @@ DOCS_DISTFILES= ${GFF2PS_MAN}.gz:doc .include <bsd.port.options.mk> 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 <bsd.port.mk> diff --git a/chinese/CJKUnifonts/Makefile b/chinese/CJKUnifonts/Makefile index 8df4a4d0f515..70178124fc74 100644 --- a/chinese/CJKUnifonts/Makefile +++ b/chinese/CJKUnifonts/Makefile @@ -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 <bsd.port.mk> diff --git a/chinese/xpdf/Makefile b/chinese/xpdf/Makefile index 4d8788ea54c5..161bb338db79 100644 --- a/chinese/xpdf/Makefile +++ b/chinese/xpdf/Makefile @@ -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 && \ diff --git a/comms/cdr_read/Makefile b/comms/cdr_read/Makefile index dce6f19529ac..e14c8f255984 100644 --- a/comms/cdr_read/Makefile +++ b/comms/cdr_read/Makefile @@ -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 <bsd.port.mk> diff --git a/converters/unix2dos/Makefile b/converters/unix2dos/Makefile index 6e16876d793c..cdef45baf53b 100644 --- a/converters/unix2dos/Makefile +++ b/converters/unix2dos/Makefile @@ -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 <bsd.port.mk> diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 1ef7a235cd20..5a077871c848 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -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/} diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile index fb77dc51549a..dcf644f5a1df 100644 --- a/devel/cvs2html/Makefile +++ b/devel/cvs2html/Makefile @@ -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 <bsd.port.post.mk> diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile index 8b9ab51b2650..ab2629f9a517 100644 --- a/devel/cweb/Makefile +++ b/devel/cweb/Makefile @@ -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 <bsd.port.mk> diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile index 2579b242efb7..af311a6a7d62 100644 --- a/devel/easygit/Makefile +++ b/devel/easygit/Makefile @@ -17,18 +17,18 @@ DISTREVISION= 0 # bump this if distfile is changed inplace 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 <bsd.port.mk> diff --git a/devel/libcii/Makefile b/devel/libcii/Makefile index af2e877dc1ed..fe430d97bb4a 100644 --- a/devel/libcii/Makefile +++ b/devel/libcii/Makefile @@ -18,7 +18,7 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DMAXALIGN=8 -Iinclude" \ 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 diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile index 8d87040e46ce..a8a49d16beef 100644 --- a/devel/libdlmalloc/Makefile +++ b/devel/libdlmalloc/Makefile @@ -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 <bsd.port.mk> diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile index 5b6b2fe782c5..e89a371bc35a 100644 --- a/devel/mingw32-bin-msvcrt/Makefile +++ b/devel/mingw32-bin-msvcrt/Makefile @@ -26,6 +26,6 @@ NO_MTREE= yes NO_WRKSUBDIR= yes post-extract: - @${CP} ${FILESDIR}/Makefile ${WRKDIR} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} .include <bsd.port.mk> diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile index 03bb1af7e7a7..bde22e42699c 100644 --- a/devel/py-json-py/Makefile +++ b/devel/py-json-py/Makefile @@ -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 <bsd.port.mk> diff --git a/devel/py-urlimport/Makefile b/devel/py-urlimport/Makefile index 85d2465b344f..0f15034518ef 100644 --- a/devel/py-urlimport/Makefile +++ b/devel/py-urlimport/Makefile @@ -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 diff --git a/devel/ruby-dialogs/Makefile b/devel/ruby-dialogs/Makefile index edff0d1fdb61..576a13a7bd1a 100644 --- a/devel/ruby-dialogs/Makefile +++ b/devel/ruby-dialogs/Makefile @@ -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 <bsd.port.mk> diff --git a/devel/sedsed/Makefile b/devel/sedsed/Makefile index 8fedbef6423a..b6514fcc4efc 100644 --- a/devel/sedsed/Makefile +++ b/devel/sedsed/Makefile @@ -13,7 +13,7 @@ COMMENT= Python script that masters SED scripts PLIST_FILES= bin/sedsed EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile index 403c4145671d..e6040d3889a9 100644 --- a/devel/sfio/Makefile +++ b/devel/sfio/Makefile @@ -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 <bsd.port.mk> diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile index b4eb6a68e3f6..a42016e5638b 100644 --- a/dns/dnswalk/Makefile +++ b/dns/dnswalk/Makefile @@ -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 <bsd.port.mk> diff --git a/dns/ipcheck/Makefile b/dns/ipcheck/Makefile index 84f78f01e7dc..79c5fe523f09 100644 --- a/dns/ipcheck/Makefile +++ b/dns/ipcheck/Makefile @@ -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 <bsd.port.mk> diff --git a/editors/omegaT/Makefile b/editors/omegaT/Makefile index f6a90097988e..30f9e13976f6 100644 --- a/editors/omegaT/Makefile +++ b/editors/omegaT/Makefile @@ -39,11 +39,11 @@ DESKTOP_ENTRIES="OmegaT" "Translation memory application" \ "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} diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 0a17ecf56699..8acfc812a1c0 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -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 diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 22454de93b55..6545128a3117 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -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 diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile index e31d68523c4f..c0eb703f0fea 100644 --- a/emulators/qmc2/Makefile +++ b/emulators/qmc2/Makefile @@ -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 \ diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile index dab48f079f88..df78e0c08311 100644 --- a/emulators/simh/Makefile +++ b/emulators/simh/Makefile @@ -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 <bsd.port.mk> diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile index c38ce0291730..2be966b04666 100644 --- a/emulators/yape/Makefile +++ b/emulators/yape/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS .include <bsd.port.pre.mk> 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 diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile index 30eaa6826b69..bebd23e4d07c 100644 --- a/games/alephone-data/Makefile +++ b/games/alephone-data/Makefile @@ -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 diff --git a/games/alephone-scenarios/Makefile b/games/alephone-scenarios/Makefile index 993240016d31..e738e1a357cb 100644 --- a/games/alephone-scenarios/Makefile +++ b/games/alephone-scenarios/Makefile @@ -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 diff --git a/games/arkanoidsb/Makefile b/games/arkanoidsb/Makefile index 315e05064b7e..5287bc0b2ef1 100644 --- a/games/arkanoidsb/Makefile +++ b/games/arkanoidsb/Makefile @@ -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 diff --git a/games/bogged/Makefile b/games/bogged/Makefile index 328fb5348e09..c8e557fe0575 100644 --- a/games/bogged/Makefile +++ b/games/bogged/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84 EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/games/crafty-open-enormous/Makefile b/games/crafty-open-enormous/Makefile index e9e3c65cd4fd..b9e635ba70dd 100644 --- a/games/crafty-open-enormous/Makefile +++ b/games/crafty-open-enormous/Makefile @@ -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 <bsd.port.mk> diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile index 190939664a82..9d5ba8195819 100644 --- a/games/crafty-open-large/Makefile +++ b/games/crafty-open-large/Makefile @@ -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 <bsd.port.mk> diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile index 65d5909c63f7..e4c0dd263fac 100644 --- a/games/crafty-open-medium/Makefile +++ b/games/crafty-open-medium/Makefile @@ -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 <bsd.port.mk> diff --git a/games/doom-data/Makefile b/games/doom-data/Makefile index 8022fa1762f0..c8eebccc058c 100644 --- a/games/doom-data/Makefile +++ b/games/doom-data/Makefile @@ -39,9 +39,9 @@ STRIFE_DISTFILES= strife0.wad.bz2 .include <bsd.port.options.mk> 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: diff --git a/games/doom-hacx/Makefile b/games/doom-hacx/Makefile index 9dc24c5bef95..99f199698fbd 100644 --- a/games/doom-hacx/Makefile +++ b/games/doom-hacx/Makefile @@ -26,9 +26,8 @@ PLIST_DIRS= %%DATADIR%% .include <bsd.port.pre.mk> do-extract: - @${MKDIR} ${WRKDIR} @${BZIP2_CMD} -dc ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > \ - ${WRKDIR}/${DISTNAME} + ${WRKSRC}/${DISTNAME} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/games/doom-wolfendoom/Makefile b/games/doom-wolfendoom/Makefile index d7042e38539b..d56ec97e3a22 100644 --- a/games/doom-wolfendoom/Makefile +++ b/games/doom-wolfendoom/Makefile @@ -22,9 +22,9 @@ DATADIR= ${DMDIR}/${PORTNAME} .include <bsd.port.pre.mk> 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 <bsd.port.post.mk> diff --git a/games/legends/Makefile b/games/legends/Makefile index 9c25caa0f8f5..b0ac7c2cf29c 100644 --- a/games/legends/Makefile +++ b/games/legends/Makefile @@ -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|; \ diff --git a/games/linux-darwinia-demo/Makefile b/games/linux-darwinia-demo/Makefile index e3e57bf88b7d..92482928bfce 100644 --- a/games/linux-darwinia-demo/Makefile +++ b/games/linux-darwinia-demo/Makefile @@ -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: diff --git a/games/linux-doom3/Makefile b/games/linux-doom3/Makefile index 4f538f87c4c2..a463e9db1251 100644 --- a/games/linux-doom3/Makefile +++ b/games/linux-doom3/Makefile @@ -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) diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile index 64091054c5bc..bfa45bd269cc 100644 --- a/games/linux-quake3-demo/Makefile +++ b/games/linux-quake3-demo/Makefile @@ -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: diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile index a60eb0f28405..3e9e3b5a825f 100644 --- a/games/linux-quake3/Makefile +++ b/games/linux-quake3/Makefile @@ -41,10 +41,9 @@ Q3DATAFILE= linuxq3apoint-1.32b-3.x86.run 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 diff --git a/games/linux-quake4-demo/Makefile b/games/linux-quake4-demo/Makefile index 78185c8b537a..6236828b5873 100644 --- a/games/linux-quake4-demo/Makefile +++ b/games/linux-quake4-demo/Makefile @@ -23,9 +23,7 @@ Q4DIR= lib/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} 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: diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile index 1d6e65129944..776baeb2a1b7 100644 --- a/games/linux-quake4/Makefile +++ b/games/linux-quake4/Makefile @@ -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: diff --git a/games/linux-uplink-demo/Makefile b/games/linux-uplink-demo/Makefile index b8de12080ef9..1f552565b974 100644 --- a/games/linux-uplink-demo/Makefile +++ b/games/linux-uplink-demo/Makefile @@ -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: diff --git a/games/quake-dpmod/Makefile b/games/quake-dpmod/Makefile index 74f9e6368b80..e33797dc466f 100644 --- a/games/quake-dpmod/Makefile +++ b/games/quake-dpmod/Makefile @@ -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} diff --git a/games/quake2-data/Makefile b/games/quake2-data/Makefile index 907a12852171..6375dea94868 100644 --- a/games/quake2-data/Makefile +++ b/games/quake2-data/Makefile @@ -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 diff --git a/games/quake2-rogue/Makefile b/games/quake2-rogue/Makefile index 52476622005f..c1930458ef59 100644 --- a/games/quake2-rogue/Makefile +++ b/games/quake2-rogue/Makefile @@ -19,8 +19,7 @@ PLIST_FILES= %%Q2DIR%%/${PORTNAME}/game.so 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: diff --git a/games/quake2-xatrix/Makefile b/games/quake2-xatrix/Makefile index b10ff66b5d5b..bf15f0bfe225 100644 --- a/games/quake2-xatrix/Makefile +++ b/games/quake2-xatrix/Makefile @@ -19,8 +19,8 @@ PLIST_FILES= %%Q2DIR%%/${PORTNAME}/game.so 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: diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile index 708e80ef22e5..bb3bb05dc5cd 100644 --- a/games/quake3-data/Makefile +++ b/games/quake3-data/Makefile @@ -30,10 +30,10 @@ TEAMARENA_DESC= Install Quake III Team Arena data files .include <bsd.port.options.mk> 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} diff --git a/games/rfksay/Makefile b/games/rfksay/Makefile index bf6d6a0e304f..8c40a19e6b2f 100644 --- a/games/rfksay/Makefile +++ b/games/rfksay/Makefile @@ -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 <bsd.port.mk> diff --git a/games/robocode/Makefile b/games/robocode/Makefile index a1e2fb3fd252..de1d810452c8 100644 --- a/games/robocode/Makefile +++ b/games/robocode/Makefile @@ -31,7 +31,7 @@ SUB_FILES= ${PORTNAME}-MeleeRumble ${PORTNAME}-RoboRumble \ ${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 \ diff --git a/games/thudboard/Makefile b/games/thudboard/Makefile index 00403401f036..396003113454 100644 --- a/games/thudboard/Makefile +++ b/games/thudboard/Makefile @@ -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 <bsd.port.mk> diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile index 926f5f64cb9c..b036783d8eb4 100644 --- a/games/traindirector/Makefile +++ b/games/traindirector/Makefile @@ -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 <bsd.port.mk> diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile index 5e9441bc518a..7b1485f81eef 100644 --- a/games/xasteroids/Makefile +++ b/games/xasteroids/Makefile @@ -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 diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile index 5cbb488c59f7..592def15286a 100644 --- a/graphics/fujiplay/Makefile +++ b/graphics/fujiplay/Makefile @@ -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 <bsd.port.mk> diff --git a/graphics/geoapi/Makefile b/graphics/geoapi/Makefile index 7b8978409486..47bdf602a557 100644 --- a/graphics/geoapi/Makefile +++ b/graphics/geoapi/Makefile @@ -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}/\{} \; diff --git a/graphics/gimp-jagged-border-script/Makefile b/graphics/gimp-jagged-border-script/Makefile index 0cee437e8100..5c7869d26bc8 100644 --- a/graphics/gimp-jagged-border-script/Makefile +++ b/graphics/gimp-jagged-border-script/Makefile @@ -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 <bsd.port.mk> diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile index c21ac4e01ad6..6ba0e20d8366 100644 --- a/graphics/mapyrus/Makefile +++ b/graphics/mapyrus/Makefile @@ -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" diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile index d05fb4224334..db053b3f67d3 100644 --- a/graphics/openjump/Makefile +++ b/graphics/openjump/Makefile @@ -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 diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile index a8d0be3e928a..179dc2e3ec44 100644 --- a/graphics/pstoepsi/Makefile +++ b/graphics/pstoepsi/Makefile @@ -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} do-build: - ${SED} -e "s+%%PREFIX%%+${PREFIX}+g" ${WRKDIR}/pstoepsi.prefix > \ - ${WRKDIR}/pstoepsi - ${GZIP_CMD} ${WRKDIR}/README.this-site + ${SED} -e "s+%%PREFIX%%+${PREFIX}+g" ${WRKSRC}/pstoepsi.prefix > \ + ${WRKSRC}/pstoepsi + ${GZIP_CMD} ${WRKSRC}/README.this-site do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/pstoepsi ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/pstoepsi ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/README.this-site.gz ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.this-site.gz ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile index 58c9269a241e..d4f80d9e87c2 100644 --- a/graphics/springgraph/Makefile +++ b/graphics/springgraph/Makefile @@ -19,7 +19,7 @@ CONFLICTS_INSTALL=signing-party-[0-9]* PLIST_FILES= bin/springgraph EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} NO_WRKSUBDIR= yes NO_BUILD= yes USES= shebangfix perl5 diff --git a/irc/irssi-dcc_send_limiter/Makefile b/irc/irssi-dcc_send_limiter/Makefile index d4188912a2d4..1582b81f11e2 100644 --- a/irc/irssi-dcc_send_limiter/Makefile +++ b/irc/irssi-dcc_send_limiter/Makefile @@ -29,12 +29,12 @@ PLIST_FILES= lib/irssi/modules/lib/${DISTNAME}.so CFLAGS+= -shared -fPIC -I${LOCALBASE}/include/irssi -I${LOCALBASE}/include/irssi/src -I${LOCALBASE}/include/irssi/src/core -I${LOCALBASE}/include/irssi/src/irc/core -I${LOCALBASE}/include/irssi/src/irc/dcc `pkg-config --cflags glib-2.0` do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR} + @${RM} -rf ${WRKSRC} + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} do-build: - ${CC} ${CFLAGS} -o ${WRKDIR}/${DISTNAME}.so ${WRKDIR}/${DISTFILES} + ${CC} ${CFLAGS} -o ${WRKSRC}/${DISTNAME}.so ${WRKSRC}/${DISTFILES} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/irssi/modules/lib diff --git a/japanese/VTPSfont/Makefile b/japanese/VTPSfont/Makefile index c92f55fe3ce2..d9efd8a6c9b9 100644 --- a/japanese/VTPSfont/Makefile +++ b/japanese/VTPSfont/Makefile @@ -18,8 +18,8 @@ NO_WRKSUBDIR= yes NO_BUILD= yes do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} + @${RM} -rf ${WRKSRC} + @${MKDIR} ${WRKSRC} @for file in ${DISTFILES}; do \ ${CP} ${DISTDIR}/${DIST_SUBDIR}/$${file} ${WRKSRC}; \ done diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile index e53bfa84802e..7f5d2ef493ec 100644 --- a/japanese/a2ps/Makefile +++ b/japanese/a2ps/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= paperconf:${PORTSDIR}/print/libpaper USES= perl5 shebangfix USE_PERL5= run -SHEBANG_FILES= ${WRKDIR}/a2ps-j +SHEBANG_FILES= ${WRKSRC}/a2ps-j perl_OLD_CMD= /usr/local/bin/perl PLIST_FILES= bin/a2ps-j EXTRACT_CMD= ${INSTALL_SCRIPT} @@ -29,9 +29,9 @@ NO_WRKSUBDIR= yes NO_BUILD= yes post-patch: - ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKDIR}/a2ps-j + ${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/a2ps-j do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/a2ps-j ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/a2ps-j ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/japanese/bugzilla44/Makefile b/japanese/bugzilla44/Makefile index 23b975c08bd3..322ac82f2c83 100644 --- a/japanese/bugzilla44/Makefile +++ b/japanese/bugzilla44/Makefile @@ -22,11 +22,11 @@ LANGDIR= ${WWWDIR}/template/ja do-install: @-${MKDIR} ${STAGEDIR}${LANGDIR}/default - (cd ${WRKDIR}/default && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default) + (cd ${WRKSRC}/default && ${COPYTREE_SHARE} . ${STAGEDIR}${LANGDIR}/default) # Maintainer plist: patch - @( cd ${WRKDIR}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new ) + @( cd ${WRKSRC}/ && ${FIND} default -type f | ${AWK} '{print "%%WWWDIR%%/template/ja/"$$1}' | ${SORT} > ${PLIST}.new ) @if ${DIFF} -u ${PLIST} ${PLIST}.new ; then \ ${ECHO_MSG} no pkg-plist changes; \ ${RM} ${PLIST}.new ; \ diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile index a5d78fd4acf9..b5b6d15a8bef 100644 --- a/japanese/edict-utf-8/Makefile +++ b/japanese/edict-utf-8/Makefile @@ -34,8 +34,8 @@ PLIST_SUB= OWNER="${SHAREOWN}" GROUP="${SHAREGRP}" MODE="${SHAREMODE}" NO_WRKSUBDIR= yes do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} + @${RM} -rf ${WRKSRC} + @${MKDIR} ${WRKSRC} @for file in ${DICTFILES}; do \ ${ECHO} "Extracting $$file"; \ case $$file in \ diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile index 0c55e21c7d4b..9a4010d8fc6c 100644 --- a/japanese/edict/Makefile +++ b/japanese/edict/Makefile @@ -56,7 +56,7 @@ post-patch: -e '/argv/s/unsigned//' do-install: - (cd ${WRKDIR} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin) + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${BINFILES} ${STAGEDIR}${PREFIX}/bin) @${MKDIR} ${STAGEDIR}${DATADIR} ${CP} ${_DISTDIR}/edicth ${STAGEDIR}${DATADIR} .for f in edict enamdict compdic j_places kanjidic kanjd212 geodic @@ -74,7 +74,7 @@ do-install: .endfor ${RM} -f ${STAGEDIR}${PREFIX}/bin/xjdic ${LN} -s ${PREFIX}/bin/xjdic_sa ${STAGEDIR}${PREFIX}/bin/xjdic - (cd ${WRKDIR} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \ + (cd ${WRKSRC} && ${INSTALL_DATA} radicals.tm radkfile kanjstroke \ romkana.cnv vconj ${STAGEDIR}${DATADIR}) # # Only 9 dictionaries can be enabled diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile index 78be5980f06e..91781fc895fd 100644 --- a/japanese/font-ayu18/Makefile +++ b/japanese/font-ayu18/Makefile @@ -20,6 +20,7 @@ FONTNAME= misc NO_ARCH= yes NO_WRKSUBDIR= yes SUB_FILES= Makefile +MAKEFILE= ${WRKDIR}/Makefile PORTDOCS= README.txt OPTIONS_DEFINE= DOCS diff --git a/japanese/font-ayu20/Makefile b/japanese/font-ayu20/Makefile index 6b4dfd0b9a6d..6f308c15568b 100644 --- a/japanese/font-ayu20/Makefile +++ b/japanese/font-ayu20/Makefile @@ -24,6 +24,7 @@ SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias" PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install PORTDOCS= README.txt +MAKEFILE= ${WRKDIR}/Makefile OPTIONS_DEFINE= DOCS diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile index 31dc56e89b3c..9a1692e78385 100644 --- a/japanese/font-elisa10/Makefile +++ b/japanese/font-elisa10/Makefile @@ -18,6 +18,7 @@ FONTNAME= misc NO_ARCH= yes NO_WRKSUBDIR= yes SUB_FILES= Makefile pkg-install +MAKEFILE= ${WRKDIR}/Makefile SUB_LIST= BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \ GZIP_CMD="${GZIP_CMD}" \ FONTSALIAS="${DATADIR}/fonts.alias" @@ -36,7 +37,7 @@ post-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} cd ${STAGEDIR}${FONTSDIR} && \ ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . - ${INSTALL_DATA} ${WRKDIR}/fonts.alias ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${DATADIR} post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/japanese/font-elisa8/Makefile b/japanese/font-elisa8/Makefile index b035f39b2ea6..d5cf267aa916 100644 --- a/japanese/font-elisa8/Makefile +++ b/japanese/font-elisa8/Makefile @@ -19,6 +19,7 @@ FONTNAME= misc NO_ARCH= yes NO_WRKSUBDIR= yes SUB_FILES= Makefile pkg-install +MAKEFILE= ${WRKDIR}/Makefile SUB_LIST= BDFTOPCF_CMD="${LOCALBASE}/bin/bdftopcf" \ GZIP_CMD="${GZIP_CMD}" \ FONTSALIAS="${DATADIR}/fonts.alias" diff --git a/japanese/font-jisx0213/Makefile b/japanese/font-jisx0213/Makefile index a1701cb74395..0caa5384744b 100644 --- a/japanese/font-jisx0213/Makefile +++ b/japanese/font-jisx0213/Makefile @@ -26,7 +26,7 @@ NO_ARCH= yes NO_WRKSUBDIR= yes EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= > ${WRKDIR}/$${file%.gz} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/$${file%.gz} MAKE_ENV= FONTSDIR=${FONTSDIR} MAKEFILE= ${FILESDIR}/Makefile diff --git a/japanese/font-kaname12/Makefile b/japanese/font-kaname12/Makefile index 6602b8da826d..d28346fc44bb 100644 --- a/japanese/font-kaname12/Makefile +++ b/japanese/font-kaname12/Makefile @@ -39,6 +39,6 @@ post-install: ${LN} -s ../../../${DATADIR_REL}/*.pcf.gz . post-install-DOCS-on: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install-doc + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install-doc .include <bsd.port.mk> diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile index 2ec3dd80673b..97960374f79b 100644 --- a/japanese/font-kanji18/Makefile +++ b/japanese/font-kanji18/Makefile @@ -24,9 +24,10 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= | ${SED} '/bin\/sh/,/exit 0/!d' \ - | (cd ${WRKDIR} && ${SH}) + | (cd ${WRKSRC} && ${SH}) PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-install +MAKEFILE= ${WRKDIR}/Makefile SUB_FILES= Makefile pkg-install SUB_LIST= FONTSALIAS="${DATADIR}/fonts.alias.${PKGNAMESUFFIX}" \ SRCS="${SRCS}" @@ -40,7 +41,7 @@ OPTIONS_DEFINE= DOCS post-extract: cd ${WRKSRC} && ${CAT} ${DISTNAME}.?? | uudecode - ${GUNZIP_CMD} ${WRKDIR}/*.Z + ${GUNZIP_CMD} ${WRKSRC}/*.Z ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${README_FILE} \ | ${SED} '/bin\/sh/,/exit 0/d' \ > ${WRKSRC}/README.${DISTNAME} diff --git a/japanese/font-mona-ttf/Makefile b/japanese/font-mona-ttf/Makefile index 1f9459e004aa..782b9124ff0a 100644 --- a/japanese/font-mona-ttf/Makefile +++ b/japanese/font-mona-ttf/Makefile @@ -28,7 +28,7 @@ PLIST_FILES= %%DATADIR%%/fonts.dir \ do-install: @${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/mona.ttf ${FILESDIR}/fonts.dir \ + ${INSTALL_DATA} ${WRKSRC}/mona.ttf ${FILESDIR}/fonts.dir \ ${STAGEDIR}${DATADIR} post-install: diff --git a/japanese/gskk/Makefile b/japanese/gskk/Makefile index 3b21f1bd2a5e..9fe1d62f3f49 100644 --- a/japanese/gskk/Makefile +++ b/japanese/gskk/Makefile @@ -38,7 +38,7 @@ INSTALL_DIC= ${INSTALL} ${COPY} -m 664 OPTIONS_DEFINE= DOCS do-build: - cd ${WRKDIR} && mkbindic ${PORTNAME}.t + cd ${WRKSRC} && mkbindic ${PORTNAME}.t do-install: @${MKDIR} ${STAGEDIR}${DICDIR} diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile index ca84da635c38..a981665d7cfe 100644 --- a/japanese/jcode.pl/Makefile +++ b/japanese/jcode.pl/Makefile @@ -20,11 +20,11 @@ NO_WRKSUBDIR= yes NO_BUILD= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # none -EXTRACT_AFTER_ARGS= ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= ${WRKSRC}/${PORTNAME} PLIST_FILES= ${SITE_PERL_REL}/${PORTNAME} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} .include <bsd.port.mk> diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile index 7d7f1a730d15..3fae0a2613ce 100644 --- a/japanese/skk-jisyo/Makefile +++ b/japanese/skk-jisyo/Makefile @@ -25,7 +25,7 @@ USES= tar:bzip2 NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} PLIST_SUB+= SKKDIR=${SKKDIR} .for type in ${SKK_JISYO_TYPE} DISTFILES+= SKK-JISYO.${type}.${PORTVERSION}.bz2 @@ -40,7 +40,7 @@ NO_BUILD= yes .endif post-extract: - @(cd ${WRKDIR}; ${BZIP2_CMD} -d *.bz2) + @(cd ${WRKSRC}; ${BZIP2_CMD} -d *.bz2) .if defined(WITH_SKKJISYO_DELCOMMENTS) # Strip comments in transtation candidates list. @@ -50,7 +50,7 @@ post-extract: do-patch: .for type in ${SKK_JISYO_TYPE} ${REINPLACE_CMD} -e '/^[^;]/s,;[^/]*/,/,g' -e '/^>/d' \ - ${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION} + ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION} .endfor .endif @@ -68,9 +68,9 @@ do-build: END { \ print ""; \ }' \ - < ${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION} | \ + < ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION} | \ ${LOCALBASE}/bin/cdb -c -t - \ - ${WRKDIR}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX} + ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION}${CDBSUFFIX} .endfor .endif diff --git a/japanese/yc.el/Makefile b/japanese/yc.el/Makefile index 7ea2d5065f1b..b972677d3888 100644 --- a/japanese/yc.el/Makefile +++ b/japanese/yc.el/Makefile @@ -29,12 +29,12 @@ ICANNA_DESC= Enable icanna support ICANNA_RUN_DEPENDS= icanna:${PORTSDIR}/japanese/icanna do-build: - @cd ${WRKDIR} && \ + @cd ${WRKSRC} && \ ${EMACS_CMD} -batch -f batch-byte-compile yc.el do-install: @${MKDIR} ${STAGEDIR}${YC_LISPDIR} - @cd ${WRKDIR} && \ + @cd ${WRKSRC} && \ ${INSTALL_SCRIPT} yc.el yc.elc ${STAGEDIR}${YC_LISPDIR} .include <bsd.port.mk> diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile index 66c1a11fd25c..228a2769e8e7 100644 --- a/japanese/zipcodes/Makefile +++ b/japanese/zipcodes/Makefile @@ -20,8 +20,8 @@ PORTVERSION_K?= ${PORTVERSION} PORTVERSION_J?= ${PORTVERSION} post-extract: - @${CP} ${FILESDIR}/Makefile ${WRKDIR} - cd ${WRKDIR}; ${MV} KEN_ALL.CSV ken_all.csv; ${MV} JIGYOSYO.CSV jigyosyo.csv + @${CP} ${FILESDIR}/Makefile ${WRKSRC} + cd ${WRKSRC}; ${MV} KEN_ALL.CSV ken_all.csv; ${MV} JIGYOSYO.CSV jigyosyo.csv # for maintenance. fetch1: diff --git a/java/eclipse-ecj/Makefile b/java/eclipse-ecj/Makefile index f8816dc3ff6d..886cf167dff1 100644 --- a/java/eclipse-ecj/Makefile +++ b/java/eclipse-ecj/Makefile @@ -16,7 +16,7 @@ LICENSE= EPL EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= xf -EXTRACT_AFTER_ARGS= -C ${WRKDIR} +EXTRACT_AFTER_ARGS= -C ${WRKSRC} USE_ANT= yes USE_JAVA= yes @@ -31,7 +31,7 @@ PLIST_FILES= bin/${PORTNAME}.sh \ do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} - ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar ${INSTALL_SCRIPT} ${WRKDIR}/ecj.sh ${STAGEDIR}/${PREFIX}/bin .include <bsd.port.mk> diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile index 61cc0f423edb..3809ff0719d5 100644 --- a/java/eclipse-pydev/Makefile +++ b/java/eclipse-pydev/Makefile @@ -37,10 +37,10 @@ RUN_DEPENDS+= jython:${PORTSDIR}/lang/jython pre-install: @${ECHO_MSG} "===> Creating bundles.info" - @PLUGINS=$$(ls -1 ${WRKDIR}/plugins); \ + @PLUGINS=$$(ls -1 ${WRKSRC}/plugins); \ for d in $${PLUGINS}; do \ (${ECHO_CMD} "$${d},../../${PLUGINDIR}/$${d}/,4,false" | \ - ${SED} -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${WRKDIR}/plugins/bundles.info; \ + ${SED} -e 's/_\([0-9]\)/,\1/1' -e '/templates/d') >> ${WRKSRC}/plugins/bundles.info; \ done @# ignore javashell.py file, because there is a syntax error @# see http://goo.gl/E4epH diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index bc7ae8a05c01..32ffaffedc40 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -25,7 +25,7 @@ do-configure: .for _script in ${SCRIPTS} ${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \ -e 's|%%JAVALIBDIR%%|${JAVALIBDIR}|;' \ - ${SRC}/${_script}.sh >${WRKDIR}/${_script}.sh + ${SRC}/${_script}.sh >${WRKSRC}/${_script}.sh .endfor ${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \ ${FILESDIR}/pkg-install.in > ${PKGINSTALL} @@ -33,20 +33,20 @@ do-configure: ${SED} -e 's|%%PREFIX%%|${PREFIX}|;' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|;' \ -e 's|%%PORTSDIR%%|${PORTSDIR}|;' \ - ${SRC}/${_man} > ${WRKDIR}/${_man} + ${SRC}/${_man} > ${WRKSRC}/${_man} .endfor do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/classpath.sh ${STAGEDIR}${PREFIX}/bin/classpath - ${INSTALL_SCRIPT} ${WRKDIR}/javavmwrapper.sh ${STAGEDIR}${PREFIX}/bin/javavm + ${INSTALL_SCRIPT} ${WRKSRC}/classpath.sh ${STAGEDIR}${PREFIX}/bin/classpath + ${INSTALL_SCRIPT} ${WRKSRC}/javavmwrapper.sh ${STAGEDIR}${PREFIX}/bin/javavm ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/checkvms ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/manvm ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/registervm ${LN} -sf javavm ${STAGEDIR}${PREFIX}/bin/unregistervm - ${INSTALL_MAN} ${WRKDIR}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/registervm.1 \ + ${INSTALL_MAN} ${WRKSRC}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/registervm.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1/unregistervm.1 - ${INSTALL_MAN} ${WRKDIR}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 + ${INSTALL_MAN} ${WRKSRC}/*.5 ${STAGEDIR}${MAN5PREFIX}/man/man5 ${INSTALL_DATA} ${FILESDIR}/javavm_opts.conf.dist \ ${STAGEDIR}${PREFIX}/etc/javavm_opts.conf.dist diff --git a/java/jtiger/Makefile b/java/jtiger/Makefile index 07f97e655219..835898519207 100644 --- a/java/jtiger/Makefile +++ b/java/jtiger/Makefile @@ -18,14 +18,14 @@ SRCFILES= src test-src OPTIONS_DEFINE= DOCS EXAMPLES do-install: - ${INSTALL_DATA} ${WRKDIR}/jtiger.jar ${STAGEDIR}${JAVAJARDIR}/jtiger.jar + ${INSTALL_DATA} ${WRKSRC}/jtiger.jar ${STAGEDIR}${JAVAJARDIR}/jtiger.jar ${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKDIR} && ${COPYTREE_SHARE} "${SRCFILES}" ${STAGEDIR}${DATADIR} + cd ${WRKSRC} && ${COPYTREE_SHARE} "${SRCFILES}" ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - cd ${WRKDIR}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/changes.html ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/cpl-v10.html ${STAGEDIR}${DOCSDIR} - cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/changes.html ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/cpl-v10.html ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile index a76dc3391e2f..7eea0391916d 100644 --- a/korean/kaistfonts/Makefile +++ b/korean/kaistfonts/Makefile @@ -23,9 +23,9 @@ NO_WRKSUBDIR= yes MAKE_ENV= DISTDIR=${DISTDIR} DISTFILES="${DISTFILES}" FONTSDIR="${FONTSDIR}" do-extract: - @${RM} -fr ${WRKDIR} && \ - ${MKDIR} ${WRKDIR} && \ - cd ${WRKDIR} && \ + @${RM} -fr ${WRKSRC} && \ + ${MKDIR} ${WRKSRC} && \ + cd ${WRKSRC} && \ for file in ${DISTFILES}; do \ ${GUNZIP_CMD} -c < ${_DISTDIR}/$$file > `${ECHO_CMD} $$file | ${SED} -e 's/\.Z//' -e 's/\.gz//'`; \ done diff --git a/korean/ko.TeX-fonts-base/Makefile b/korean/ko.TeX-fonts-base/Makefile index 8d1c6ba77ce7..74946d18d88a 100644 --- a/korean/ko.TeX-fonts-base/Makefile +++ b/korean/ko.TeX-fonts-base/Makefile @@ -33,7 +33,7 @@ OPTIONS_DEFINE= DOCS do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS}) - (cd ${WRKDIR}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX}) + (cd ${WRKSRC}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS}) + (cd ${WRKSRC}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX}) .include <bsd.port.mk> diff --git a/korean/ko.TeX-fonts-extra/Makefile b/korean/ko.TeX-fonts-extra/Makefile index fea8d433dd20..1d7666c6aa0a 100644 --- a/korean/ko.TeX-fonts-extra/Makefile +++ b/korean/ko.TeX-fonts-extra/Makefile @@ -31,8 +31,8 @@ OPTIONS_DEFINE= DOCS do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) - (cd ${WRKDIR}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS}) - (cd ${WRKDIR}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX}) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_FONTS}) + (cd ${WRKSRC}/tex && ${COPYTREE_SHARE} . ${STAGEDIR}${TEXMF_TEX}) .include <bsd.port.mk> diff --git a/korean/ko.TeX/Makefile b/korean/ko.TeX/Makefile index c997241e3a24..acfb398c389e 100644 --- a/korean/ko.TeX/Makefile +++ b/korean/ko.TeX/Makefile @@ -39,41 +39,41 @@ DOCS= ChangLog INSTALL LICENSE VERSION manifest.txt news-0.1.0.txt \ OPTIONS_DEFINE= DOCS do-build: - @${MKDIR} ${WRKDIR}/build - @${CC} ${CFLAGS} -o ${WRKDIR}/build/hbibtex \ - ${WRKDIR}/util/hbibtex.c - @${CC} ${CFLAGS} -o ${WRKDIR}/build/hmakeindex \ - ${WRKDIR}/util/hmakeindex.c + @${MKDIR} ${WRKSRC}/build + @${CC} ${CFLAGS} -o ${WRKSRC}/build/hbibtex \ + ${WRKSRC}/util/hbibtex.c + @${CC} ${CFLAGS} -o ${WRKSRC}/build/hmakeindex \ + ${WRKSRC}/util/hmakeindex.c - @${RM} -rf ${WRKDIR}/latex/euc/unfonts - @${RM} -rf ${WRKDIR}/latex/utf/unfonts + @${RM} -rf ${WRKSRC}/latex/euc/unfonts + @${RM} -rf ${WRKSRC}/latex/utf/unfonts do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${KOTEX_DOC} - (cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_DOC}) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_DOC}) @${MKDIR} ${STAGEDIR}${KOTEX_BIBTEX} - (cd ${WRKDIR}/bibtex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_BIBTEX}) + (cd ${WRKSRC}/bibtex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_BIBTEX}) @${MKDIR} ${STAGEDIR}${KOTEX_LATEX} - (cd ${WRKDIR}/latex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_LATEX}) + (cd ${WRKSRC}/latex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_LATEX}) @${MKDIR} ${STAGEDIR}${KOTEX_MKIDX} - (cd ${WRKDIR}/makeindex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_MKIDX}) + (cd ${WRKSRC}/makeindex && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_MKIDX}) @${MKDIR} ${STAGEDIR}${KOTEX_PLAIN} - (cd ${WRKDIR}/plain && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_PLAIN}) + (cd ${WRKSRC}/plain && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_PLAIN}) @${MKDIR} ${STAGEDIR}${KOTEX_SFD} - (cd ${WRKDIR}/sfd && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_SFD}) + (cd ${WRKSRC}/sfd && ${COPYTREE_SHARE} . ${STAGEDIR}${KOTEX_SFD}) @${MKDIR} ${STAGEDIR}${KOTEX_UTIL} - @${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${STAGEDIR}${KOTEX_UTIL} - @${INSTALL_PROGRAM} ${WRKDIR}/build/* ${STAGEDIR}${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/util/*.pl ${STAGEDIR}${KOTEX_UTIL} + @${INSTALL_PROGRAM} ${WRKSRC}/build/* ${STAGEDIR}${PREFIX}/bin - @${CHMOD} a+x ${WRKDIR}/util/*.pl - @${INSTALL_SCRIPT} ${WRKDIR}/util/*.pl ${STAGEDIR}${PREFIX}/bin + @${CHMOD} a+x ${WRKSRC}/util/*.pl + @${INSTALL_SCRIPT} ${WRKSRC}/util/*.pl ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/lang/cmucl-extra/Makefile b/lang/cmucl-extra/Makefile index cad6790b83a0..81d3d41353c4 100644 --- a/lang/cmucl-extra/Makefile +++ b/lang/cmucl-extra/Makefile @@ -23,7 +23,7 @@ NO_WRKSUBDIR= yes NO_BUILD= yes do-install: - (cd ${WRKDIR} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}) + (cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}) ${CHMOD} u+w ${STAGEDIR}${PREFIX}/lib/cmucl/lib/motifd ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/cmucl/lib/motifd ${CHMOD} u-w ${STAGEDIR}${PREFIX}/lib/cmucl/lib/motifd diff --git a/lang/cmucl/Makefile b/lang/cmucl/Makefile index 9aa3fdc61970..d1e4fb29e97f 100644 --- a/lang/cmucl/Makefile +++ b/lang/cmucl/Makefile @@ -29,11 +29,11 @@ PLIST_SUB= VER=${PORTVERSION} OPTIONS_DEFINE= DOCS do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/lisp ${STAGEDIR}${PREFIX}/bin - (cd ${WRKDIR} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}) - ${INSTALL_MAN} ${WRKDIR}/man/man1/cmucl.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/man/man1/lisp.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/lisp ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}) + ${INSTALL_MAN} ${WRKSRC}/man/man1/cmucl.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/man1/lisp.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/doc/cmucl/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/cmucl/* ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/lang/linux-j/Makefile b/lang/linux-j/Makefile index 2a3a09c77561..9c7e233f9884 100644 --- a/lang/linux-j/Makefile +++ b/lang/linux-j/Makefile @@ -31,8 +31,8 @@ SUB_FILES= j-jconsole.sh jw.sh SUB_LIST= PORTVERSION=${PORTVERSION:S/b//g} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/j-jconsole.sh ${STAGEDIR}${PREFIX}/bin/j-jconsole - ${INSTALL_SCRIPT} ${WRKSRC}/jw.sh ${STAGEDIR}${PREFIX}/bin/jw + ${INSTALL_SCRIPT} ${WRKDIR}/j-jconsole.sh ${STAGEDIR}${PREFIX}/bin/j-jconsole + ${INSTALL_SCRIPT} ${WRKDIR}/jw.sh ${STAGEDIR}${PREFIX}/bin/jw ${INSTALL_MAN} ${WRKSRC}/j${PORTVERSION:S/b//g}/system/extras/help/man/jconsole.1 ${STAGEDIR}${PREFIX}/man/man1/${MAN1} @${MKDIR} ${STAGEDIR}${PREFIX}/lib/j cd ${WRKSRC}/j${PORTVERSION:S/b//g} && \ diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile index 12932ce4576f..a87154c0ef49 100644 --- a/lang/smlnj/Makefile +++ b/lang/smlnj/Makefile @@ -139,7 +139,7 @@ pre-fetch: # make symlinks to the dist files post-extract: - cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/* . + cd ${WRKSRC} && ${LN} -sf ${_DISTDIR}/* . # Configuring is done by uncommenting the appropriate #request # lines of config/targets. Dependency details are handled by @@ -152,7 +152,7 @@ do-configure: .for t in ${MLTARGETS} ${ECHO_CMD} '/^#request[ ]+${t}$$/s/^#//' >> "${WRKDIR}/.tmp.sed" .endfor - ${SED} -i .default -E -f "${WRKDIR}/.tmp.sed" "${WRKDIR}/config/targets" + ${SED} -i .default -E -f "${WRKDIR}/.tmp.sed" "${WRKSRC}/config/targets" .endif # Recompilation requires ml-lex and ml-yacc. All requested targets # will be built later using the recompiled core system after @@ -162,7 +162,7 @@ do-configure: ${ECHO_CMD} "request ml-lex" && \ ${ECHO_CMD} "request ml-lex-mllex-tool" && \ ${ECHO_CMD} "request src-smlnj" ) \ - > "${WRKDIR}/config/targets.customized" + > "${WRKSRC}/config/targets.customized" .endif # The build target patches, builds, and installs the system within WRKDIR. @@ -203,7 +203,7 @@ MLSOURCEPATCHES_CMD= ${TRUE} .endif do-build: - cd ${WRKDIR} && unset PWD && \ + cd ${WRKSRC} && unset PWD && \ FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \ MLNORUNTIMECLEAN=yes \ MLRUNTIMEPATCHES=`${MLRUNTIMEPATCHES_CMD}` \ @@ -213,26 +213,26 @@ do-build: CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \ ./config/install.sh .if defined(ML_RECOMPILE) - -${RM} ${WRKDIR}/config/targets.customized + -${RM} ${WRKSRC}/config/targets.customized @${ECHO} '(* Recompiling the core system: *)' - cd ${WRKDIR}/${RECOMPILEDIR} && ( \ + cd ${WRKSRC}/${RECOMPILEDIR} && ( \ ${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \ ${ECHO_CMD} ${CMB_COMMAND} ; \ ${ECHO_CMD} 'CMB.make ();' ) | \ ../../bin/sml @${ECHO} '(* Building the recompiled heap: *)' - cd ${WRKDIR}/${RECOMPILEDIR} && \ + cd ${WRKSRC}/${RECOMPILEDIR} && \ ./makeml @${ECHO} '(* Removing old libs and heaps: *)' - cd ${WRKDIR}/${RECOMPILEDIR} && \ + cd ${WRKSRC}/${RECOMPILEDIR} && \ ${RM} -rf ../../lib && ${MKDIR} ../../lib && \ ${FIND} ../../bin/.heap -name '*.${MLARCH}-bsd' \ \! -name 'sml.${MLARCH}-bsd' -delete -print @${ECHO} '(* Installing the recompiled libs and heap: *)' - cd ${WRKDIR}/${RECOMPILEDIR} && \ + cd ${WRKSRC}/${RECOMPILEDIR} && \ ./installml @${ECHO} '(* Building requested targets: *)' - cd ${WRKDIR} && unset PWD && \ + cd ${WRKSRC} && unset PWD && \ FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \ MLNORUNTIMECLEAN=yes RECOMPILEDIR="${RECOMPILEDIR}" \ CFLAGS='${CFLAGS}' AS='${AS}' EXTRA_DEFS='${EXTRA_DEFS}' \ @@ -243,14 +243,14 @@ do-build: # then we have to remove them at several points during the # installation process. This is no longer necessary with FreeBSD 10 # as it uses libarchive 3.x (via bsdtar), but earlier versions -# don't ignore such resource files and hence WRKDIR and STAGEDIR +# don't ignore such resource files and hence WRKSRC and STAGEDIR # are full of them. Once FreeBSD 9 will be out of service, all # lines in this Makefile can be removed which contain a pattern # for the prefix "._" of the resource files. Background information: # <https://github.com/libarchive/libarchive/wiki/TarExtendedAttributes#Apple_tar> post-build: - ${FIND} ${WRKDIR} -type f -name '\._*' -delete + ${FIND} ${WRKSRC} -type f -name '\._*' -delete # Nowadays PLIST has to be computed before installation. We do it in # "pre-install" because source extraction happens during "build". @@ -273,7 +273,7 @@ MLPATCHPATHREGEX= -E -e 's%(^|[^_])_([^_]|$$)%\1/\2%g' \ pre-install: .if defined(ML_EVERYTHING) @${ECHO} -n '(* Computing package list ...' - @${TAR} -tzf ${WRKDIR}/runtime.tgz | \ + @${TAR} -tzf ${WRKSRC}/runtime.tgz | \ ${GREP} -E -v '(^|/)\._.*' | \ ${SED} -E -n -e 's%^(.*[^/])$$%${MLROOTRELATIVE}/base/\1%p' \ > ${MLRUNTIMEPLIST} @@ -288,7 +288,7 @@ pre-install: ${SED} ${MLPATCHPATHREGEX} | \ ${SED} -E -e 's%^(do|extra)-patch-(base/.*)%${MLROOTRELATIVE}/\2.orig%' \ >> ${MLRUNTIMEPLIST} - @cd "${WRKDIR}" && ( \ + @cd "${WRKSRC}" && ( \ ( ${FIND} -s -d ${MLSRCDIRS} \! -type d | \ ${AWK} '{ print "${MLROOTRELATIVE}/" $$0 }' ) ; \ ( ${FIND} -s -d ${MLSRCDIRS} -type d -empty | \ @@ -333,7 +333,7 @@ MLSRCEXCLUDES+= --exclude "${excl}" do-install: ${MKDIR} "${STAGEDIR}${MLROOT}" .if ! defined(ML_RECOMPILE) - cd ${WRKDIR} && unset PWD && \ + cd ${WRKSRC} && unset PWD && \ FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \ STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \ INSTALLDIR="${STAGEDIR}${MLROOT}" \ @@ -341,16 +341,16 @@ do-install: ./config/install.sh .else @${ECHO} '(* Rebuilding the recompiled libs: *)' - cd ${WRKDIR}/${RECOMPILEDIR} && ( \ + cd ${WRKSRC}/${RECOMPILEDIR} && ( \ ${ECHO_CMD} 'CM.autoload "$$smlnj/cmb.cm";' ; \ ${ECHO_CMD} ${CMB_COMMAND} ; \ ${ECHO_CMD} 'CMB.make ();' ) | \ ../../bin/sml @${ECHO} '(* Rebuilding the recompiled heap: *)' - cd ${WRKDIR}/${RECOMPILEDIR} && \ + cd ${WRKSRC}/${RECOMPILEDIR} && \ ./makeml @${ECHO} '(* Installing into ${MLROOT}: *)' - cd ${WRKDIR} && unset PWD && \ + cd ${WRKSRC} && unset PWD && \ FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \ STAGEDIR="${STAGEDIR}" MLLIB="${MLLIB}" \ INSTALLDIR="${STAGEDIR}${MLROOT}" RECOMPILEDIR="${RECOMPILEDIR}" \ @@ -361,8 +361,8 @@ do-install: ${FIND} ${STAGEDIR} -type f -name '\._*' -delete @${ECHO} '(* Installing man pages. *)' .for mansect in 1 2 3 4 5 6 7 8 9 - @[ ! -d ${WRKDIR}/doc/man/man${mansect} ] || \ - { cd ${WRKDIR}/doc/man/man${mansect} && ls *.${mansect} | \ + @[ ! -d ${WRKSRC}/doc/man/man${mansect} ] || \ + { cd ${WRKSRC}/doc/man/man${mansect} && ls *.${mansect} | \ ${XARGS} -J % \ ${INSTALL_MAN} % ${STAGEDIR}${MANPREFIX}/man/man${mansect} ; } .endfor @@ -373,9 +373,9 @@ do-install: "${STAGEDIR}${MLBIN}/.run/run.$${ARCH}-$${OPSYS}.so" ) .if defined(ML_EVERYTHING) @${ECHO} '(* Cleaning base/runtime: *)' - cd ${WRKDIR}/base/runtime/objs && ${MAKE_CMD} clean + cd ${WRKSRC}/base/runtime/objs && ${MAKE_CMD} clean @${ECHO} -n '(* Installing sources into ${STAGEDIR}${MLROOT} ...' - @cd ${WRKDIR} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCDIRS} | \ + @cd ${WRKSRC} && ${TAR} -cf - ${MLSRCEXCLUDES} ${MLSRCDIRS} | \ ${TAR} -xf - -C "${STAGEDIR}${MLROOT}" @${ECHO} ' done. *)' .endif diff --git a/lang/tcl-manual/Makefile b/lang/tcl-manual/Makefile index 71c393a23f25..755624a2c9d8 100644 --- a/lang/tcl-manual/Makefile +++ b/lang/tcl-manual/Makefile @@ -30,16 +30,16 @@ post-patch: s|/usr/local/bin/wish|${PREFIX}/bin/wish${v:R}|g' \ ${WRKSRC}/tcl${v}/html/UserCmd/wish.htm @${REINPLACE_CMD} -e 's|tcl\.h|tcl${v:R}/tcl.h|g' \ - ${WRKDIR}/tcl${v}/html/TclLib/* + ${WRKSRC}/tcl${v}/html/TclLib/* @${REINPLACE_CMD} -e 's|tk\.h|tk${v:R}/tk.h|g' \ - ${WRKDIR}/tcl${v}/html/TkLib/* + ${WRKSRC}/tcl${v}/html/TkLib/* @${FIND} ${WRKSRC} -name "*.bak" -delete .endfor do-install: .for v in ${VERSIONS} ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/tcl${v:R:S/.//} - ${CP} -R ${WRKDIR}/tcl${v}/html/* ${STAGEDIR}${PREFIX}/share/doc/tcl${v:R:S/.//} + ${CP} -R ${WRKSRC}/tcl${v}/html/* ${STAGEDIR}${PREFIX}/share/doc/tcl${v:R:S/.//} .endfor .include <bsd.port.mk> diff --git a/mail/gml/Makefile b/mail/gml/Makefile index 6ff0f8f09e63..2710cca1c0a1 100644 --- a/mail/gml/Makefile +++ b/mail/gml/Makefile @@ -23,10 +23,10 @@ OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e 's|.exe||g' \ - -e 's|"c:\\mail\\Inbox.*"|/home/user/Inbox|g' ${WRKDIR}/* + -e 's|"c:\\mail\\Inbox.*"|/home/user/Inbox|g' ${WRKSRC}/* do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.py \ + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} diff --git a/mail/imaptools/Makefile b/mail/imaptools/Makefile index 853c0073a512..522707f05c3f 100644 --- a/mail/imaptools/Makefile +++ b/mail/imaptools/Makefile @@ -21,6 +21,6 @@ SHEBANG_FILES= *.pl USE_PERL5= run do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/*.pl ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile index 62e8df5a2655..2fe44f11e7d9 100644 --- a/mail/mb2md/Makefile +++ b/mail/mb2md/Makefile @@ -16,7 +16,7 @@ RUN_DEPENDS= p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/mail/msgconvert/Makefile b/mail/msgconvert/Makefile index 86c2e5f7078d..0721fe33d13b 100644 --- a/mail/msgconvert/Makefile +++ b/mail/msgconvert/Makefile @@ -29,7 +29,7 @@ PLIST_FILES= bin/msgconvert.pl bin/msgconvert SHEBANG_FILES= ${PORTNAME}.pl do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.pl \ + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.pl ${LN} -s ${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME} diff --git a/mail/py-cyruslib/Makefile b/mail/py-cyruslib/Makefile index d3187ecc6eb5..a2645feab80b 100644 --- a/mail/py-cyruslib/Makefile +++ b/mail/py-cyruslib/Makefile @@ -21,11 +21,10 @@ BINMODE= 644 PLIST_FILES= %%PYTHON_SITELIBDIR%%/${DISTNAME} do-extract: - ${MKDIR} ${WRKDIR} - ${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}/${DISTNAME} + ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME} do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ + ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ .include <bsd.port.mk> diff --git a/mail/rlytest/Makefile b/mail/rlytest/Makefile index 647b48ed5a05..5e715947db5d 100644 --- a/mail/rlytest/Makefile +++ b/mail/rlytest/Makefile @@ -12,7 +12,7 @@ COMMENT= Test remote system for unsecured mail relay EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} NO_WRKSUBDIR= yes diff --git a/mail/x-face-e21/Makefile b/mail/x-face-e21/Makefile index 15b1d7459d9b..449de652e6a7 100644 --- a/mail/x-face-e21/Makefile +++ b/mail/x-face-e21/Makefile @@ -28,7 +28,7 @@ PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \ ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c do-build: - @cd ${WRKDIR} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ + @cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile ${DISTNAME} do-install: diff --git a/mail/xcite/Makefile b/mail/xcite/Makefile index a9eec3ef9e64..2810cbd92c30 100644 --- a/mail/xcite/Makefile +++ b/mail/xcite/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME} \ ${EMACS_VERSION_SITE_LISPDIR}/${DISTNAME}c do-build: - @cd ${WRKDIR} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ + @cd ${WRKSRC} && ${EMACS_CMD} -batch -q -no-site-file -no-init-file \ -f batch-byte-compile ${DISTNAME} do-install: diff --git a/math/jts/Makefile b/math/jts/Makefile index 62d1218a4b8d..08d5013a18cf 100644 --- a/math/jts/Makefile +++ b/math/jts/Makefile @@ -10,8 +10,8 @@ MAINTAINER= ports@FreeBSD.org COMMENT= JTS Topology Suite RUN_DEPENDS= ${JAVALIBDIR}/jdom.jar:${PORTSDIR}/java/jdom \ - ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ - ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j + ${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit \ + ${JAVALIBDIR}/xml-apis.jar:${PORTSDIR}/textproc/xerces-j USES= zip NO_BUILD= yes @@ -32,7 +32,7 @@ do-install: do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - @cd ${WRKDIR}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .if defined(MAINTAINER_MODE) diff --git a/math/lll_spect/Makefile b/math/lll_spect/Makefile index 961ca8e593a8..b215a0d9cab6 100644 --- a/math/lll_spect/Makefile +++ b/math/lll_spect/Makefile @@ -27,18 +27,18 @@ OPTIONS_DEFINE= EXAMPLES post-extract: .for _file in lll_spect lll_search - @${CP} ${_DISTDIR}/${_file}.C ${WRKDIR} + @${CP} ${_DISTDIR}/${_file}.C ${WRKSRC} .endfor do-build: .for _file in lll_spect lll_search - ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o ${WRKDIR}/${_file}.o ${WRKDIR}/${_file}.C - ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${WRKDIR}/${_file} ${WRKDIR}/${_file}.o -lntl -lgmp -lm + ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o ${WRKSRC}/${_file}.o ${WRKSRC}/${_file}.C + ${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${WRKSRC}/${_file} ${WRKSRC}/${_file}.o -lntl -lgmp -lm .endfor do-install: .for _file in lll_spect lll_search - ${INSTALL_PROGRAM} ${WRKDIR}/${_file} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${_file} ${STAGEDIR}${PREFIX}/bin .endfor ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${_DISTDIR}/examples.txt ${STAGEDIR}${EXAMPLESDIR} diff --git a/math/physcalc/Makefile b/math/physcalc/Makefile index 8c67a6cd3a29..deb2a40f85ab 100644 --- a/math/physcalc/Makefile +++ b/math/physcalc/Makefile @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Flexible calculator that behaves much like units(1) EXTRACT_BEFORE_ARGS= -aq -EXTRACT_AFTER_ARGS= -x physcalc -d ${WRKDIR} +EXTRACT_AFTER_ARGS= -x physcalc -d ${WRKSRC} NO_WRKSUBDIR= yes USES= zip:infozip diff --git a/math/solitaire/Makefile b/math/solitaire/Makefile index c819c7a2d146..408e0c7a35e2 100644 --- a/math/solitaire/Makefile +++ b/math/solitaire/Makefile @@ -21,8 +21,7 @@ STRIP= OPTIONS_DEFINE= DOCS do-extract: - @${MKDIR} ${WRKDIR} - @${CP} -r ${DISTDIR}/sol.pl ${DISTDIR}/sol-test.txt ${WRKDIR} + @${CP} ${DISTDIR}/sol.pl ${DISTDIR}/sol-test.txt ${WRKSRC} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sol.pl ${STAGEDIR}${PREFIX}/bin/solitaire diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile index 13ce7330b6dc..7d68bbbd08eb 100644 --- a/misc/amfm/Makefile +++ b/misc/amfm/Makefile @@ -18,7 +18,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -p -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} do-install: @${INSTALL} ${WRKSRC}/amfm ${STAGEDIR}${PREFIX}/bin/amfm diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 75e5d16dab58..f47932dbc437 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -46,11 +46,11 @@ MAKE_ARGS= -DX11 .endif post-extract: - ${RM} ${WRKDIR}/swe[a-z]* + ${RM} ${WRKSRC}/swe[a-z]* do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/astrolog - cd ${WRKDIR} && \ + cd ${WRKSRC} && \ ${INSTALL_DATA} fixstars.ast *.se1 ${STAGEDIR}${PREFIX}/lib/astrolog cd ${WRKSRC}; \ ${INSTALL_DATA} astrolog.dat ${STAGEDIR}${PREFIX}/lib/astrolog/astrolog.dat-dist diff --git a/misc/colwide/Makefile b/misc/colwide/Makefile index aaec53f46729..255bd76fc7dd 100644 --- a/misc/colwide/Makefile +++ b/misc/colwide/Makefile @@ -22,9 +22,9 @@ SHEBANG_FILES= colwide PLIST_FILES= bin/${PORTNAME} do-extract: - ${CP} ${DISTDIR}/colwide-${PORTVERSION} ${WRKDIR}/colwide + ${CP} ${DISTDIR}/colwide-${PORTVERSION} ${WRKSRC}/colwide do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/colwide ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/colwide ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile index 36a6fe99e1a9..0933f11a275b 100644 --- a/misc/figlet-fonts/Makefile +++ b/misc/figlet-fonts/Makefile @@ -20,27 +20,27 @@ DATADIR= ${PREFIX}/share/figlet PLIST_SUB= DATADIR=${DATADIR:S|^${PREFIX}/||} post-extract: - @cd ${WRKDIR}/contributed && \ - ${TAR} xf Obanner-canon.tgz -C ${WRKDIR}/contributed/ && \ - ${MV} ./Obanner-canon/* ${WRKDIR}/contributed/ && \ + @cd ${WRKSRC}/contributed && \ + ${TAR} xf Obanner-canon.tgz -C ${WRKSRC}/contributed/ && \ + ${MV} ./Obanner-canon/* ${WRKSRC}/contributed/ && \ ${RMDIR} ./Obanner-canon && \ ${RM} -f Obanner-canon.tgz && \ - ${TAR} xf Obanner.tgz -C ${WRKDIR}/contributed/ && \ - ${MV} ./Obanner/* ${WRKDIR}/contributed/ && \ + ${TAR} xf Obanner.tgz -C ${WRKSRC}/contributed/ && \ + ${MV} ./Obanner/* ${WRKSRC}/contributed/ && \ ${RMDIR} ./Obanner && \ ${RM} -f Obanner.tgz && \ - ${MV} ./C64-fonts/* ${WRKDIR}/contributed/ && \ + ${MV} ./C64-fonts/* ${WRKSRC}/contributed/ && \ ${RMDIR} ./C64-fonts && \ - ${MV} ./bdffonts/* ${WRKDIR}/contributed/ && \ + ${MV} ./bdffonts/* ${WRKSRC}/contributed/ && \ ${RMDIR} ./bdffonts - @cd ${WRKDIR}/international && \ - ${TAR} xf cjkfonts.tar.gz -C ${WRKDIR}/international/ && \ + @cd ${WRKSRC}/international && \ + ${TAR} xf cjkfonts.tar.gz -C ${WRKSRC}/international/ && \ ${RM} -f cjkfonts.tar.gz - @${RM} -f ${WRKDIR}/contributed/banner.flf + @${RM} -f ${WRKSRC}/contributed/banner.flf do-install: .for f in contributed international - @cd ${WRKDIR}/${f} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + @cd ${WRKSRC}/${f} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} .endfor .include <bsd.port.mk> diff --git a/misc/kenny/Makefile b/misc/kenny/Makefile index 48d326121eee..32fd136ef934 100644 --- a/misc/kenny/Makefile +++ b/misc/kenny/Makefile @@ -21,7 +21,7 @@ USES= perl5 USE_PERL5= extract build run EXTRACT_CMD= ${GZCAT} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} NO_ARCH= yes NO_BUILD= yes NO_WRKSUBDIR= yes @@ -33,10 +33,10 @@ POD2MAN?= ${LOCALBASE}/bin/pod2man post-extract: @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${PORTNAME} - @${POD2MAN} ${WRKDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}.1 + @${POD2MAN} ${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.1 do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .include <bsd.port.mk> diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile index f98b9420693c..c7c98d4332fe 100644 --- a/misc/metalink-editor/Makefile +++ b/misc/metalink-editor/Makefile @@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GUI editor to create and edit metalinks LICENSE= GPLv2 -LICENSE_FILE= ${WRKDIR}/license.txt +LICENSE_FILE= ${WRKSRC}/license.txt OPTIONS_DEFINE= DOCS diff --git a/misc/umodunpack/Makefile b/misc/umodunpack/Makefile index 7dc633cda45a..387569c82a4e 100644 --- a/misc/umodunpack/Makefile +++ b/misc/umodunpack/Makefile @@ -21,9 +21,9 @@ NO_BUILD= yes PLIST_FILES= bin/${DISTNAME} post-extract: - ${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR} + ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${DISTNAME} + ${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/${DISTNAME} .include <bsd.port.mk> diff --git a/multimedia/linux-tsmuxer/Makefile b/multimedia/linux-tsmuxer/Makefile index 435810988fa8..1411a4141a90 100644 --- a/multimedia/linux-tsmuxer/Makefile +++ b/multimedia/linux-tsmuxer/Makefile @@ -17,7 +17,7 @@ NO_BUILD= yes PLIST_FILES= bin/tsMuxeR bin/tsMuxerGUI do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/tsMuxeR ${WRKDIR}/tsMuxerGUI \ + ${INSTALL_PROGRAM} ${WRKSRC}/tsMuxeR ${WRKSRC}/tsMuxerGUI \ ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/net-mgmt/icmpquery/Makefile b/net-mgmt/icmpquery/Makefile index 250676dc37f4..956d03292b6c 100644 --- a/net-mgmt/icmpquery/Makefile +++ b/net-mgmt/icmpquery/Makefile @@ -16,11 +16,11 @@ NO_WRKSUBDIR= YES ALL_TARGET= icmpquery do-extract: - @${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR} - @${CP} ${FILESDIR}/Makefile ${WRKDIR} + @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} do-install: - @${INSTALL_PROGRAM} ${WRKDIR}/icmpquery ${STAGEDIR}${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/icmpquery ${STAGEDIR}${PREFIX}/bin @${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/icmpquery .include <bsd.port.mk> diff --git a/net-mgmt/nagios-check_dhcp.pl/Makefile b/net-mgmt/nagios-check_dhcp.pl/Makefile index 614f80876ed1..1fb710830b52 100644 --- a/net-mgmt/nagios-check_dhcp.pl/Makefile +++ b/net-mgmt/nagios-check_dhcp.pl/Makefile @@ -27,8 +27,8 @@ post-patch: @${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," ${WRKSRC}/${PORTNAME} do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/${PORTNAME} ${WRKDIR}/ + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC}/ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios diff --git a/net-mgmt/nagios-check_tftp/Makefile b/net-mgmt/nagios-check_tftp/Makefile index 1cb2d8690d37..a78daca49dc8 100644 --- a/net-mgmt/nagios-check_tftp/Makefile +++ b/net-mgmt/nagios-check_tftp/Makefile @@ -25,12 +25,12 @@ post-patch: ${WRKSRC}/check_tftp do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/${PORTNAME} ${WRKDIR} + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \ + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/libexec/nagios .include <bsd.port.mk> diff --git a/net-p2p/frost/Makefile b/net-p2p/frost/Makefile index 1523deddfcf8..78ee48af456b 100644 --- a/net-p2p/frost/Makefile +++ b/net-p2p/frost/Makefile @@ -79,7 +79,7 @@ do-install: # jars @${MKDIR} ${STAGEDIR}${PREFIX}/${JAR_DIR} .for jar in ${JAR_FILES} - @${INSTALL_DATA} ${WRKDIR}/${jar} ${STAGEDIR}${PREFIX}/${JAR_DIR} + @${INSTALL_DATA} ${WRKSRC}/${jar} ${STAGEDIR}${PREFIX}/${JAR_DIR} .endfor # default boards @${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/net-p2p/vuze/Makefile b/net-p2p/vuze/Makefile index 6b494e7e6a02..4315d3cf931c 100644 --- a/net-p2p/vuze/Makefile +++ b/net-p2p/vuze/Makefile @@ -65,7 +65,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .for s in 16 32 64 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps - ${INSTALL_DATA} ${WRKDIR}/org/gudy/azureus2/ui/icons/a${s}.png \ + ${INSTALL_DATA} ${WRKSRC}/org/gudy/azureus2/ui/icons/a${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/${PORTNAME}.png .endfor diff --git a/net/dictd-database/Makefile b/net/dictd-database/Makefile index d399d0b8d1b0..4864f2725e94 100644 --- a/net/dictd-database/Makefile +++ b/net/dictd-database/Makefile @@ -28,10 +28,10 @@ NO_WRKSUBDIR= yes do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/dict - @${INSTALL_DATA} ${WRKDIR}/*.index ${STAGEDIR}${PREFIX}/lib/dict - @${INSTALL_DATA} ${WRKDIR}/*.dict.dz ${STAGEDIR}${PREFIX}/lib/dict - @cd ${WRKDIR}/world02-2003-02-15/ && dictzip -k world02.dict - @${INSTALL_DATA} ${WRKDIR}/world02-2003-02-15/*.index ${STAGEDIR}${PREFIX}/lib/dict - @${INSTALL_DATA} ${WRKDIR}/world02-2003-02-15/*.dict.dz ${STAGEDIR}${PREFIX}/lib/dict + @${INSTALL_DATA} ${WRKSRC}/*.index ${STAGEDIR}${PREFIX}/lib/dict + @${INSTALL_DATA} ${WRKSRC}/*.dict.dz ${STAGEDIR}${PREFIX}/lib/dict + @cd ${WRKSRC}/world02-2003-02-15/ && dictzip -k world02.dict + @${INSTALL_DATA} ${WRKSRC}/world02-2003-02-15/*.index ${STAGEDIR}${PREFIX}/lib/dict + @${INSTALL_DATA} ${WRKSRC}/world02-2003-02-15/*.dict.dz ${STAGEDIR}${PREFIX}/lib/dict .include <bsd.port.mk> diff --git a/net/linux-f10-nss_ldap/Makefile b/net/linux-f10-nss_ldap/Makefile index 156503d5dd3b..1472e323182c 100644 --- a/net/linux-f10-nss_ldap/Makefile +++ b/net/linux-f10-nss_ldap/Makefile @@ -57,24 +57,24 @@ pre-fetch: .endif post-extract: - @if [ -f ${WRKDIR}/etc/ldap.conf ]; then \ - ${MV} ${WRKDIR}/etc/ldap.conf ${WRKDIR}/etc/ldap.conf.dist; \ + @if [ -f ${WRKSRC}/etc/ldap.conf ]; then \ + ${MV} ${WRKSRC}/etc/ldap.conf ${WRKSRC}/etc/ldap.conf.dist; \ fi .if !${PORT_OPTIONS:MPAM} - @if [ -f ${WRKDIR}/lib/security/pam_ldap.so ]; then \ - ${RM} -rf ${WRKDIR}/lib/; \ + @if [ -f ${WRKSRC}/lib/security/pam_ldap.so ]; then \ + ${RM} -rf ${WRKSRC}/lib/; \ fi - @if [ -f ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/COPYING.pam_ldap ]; then \ - ${RM} ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/*.pam*; \ - ${RM} -rf ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d; \ + @if [ -f ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/COPYING.pam_ldap ]; then \ + ${RM} ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/*.pam*; \ + ${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d; \ fi - @if [ -f ${WRKDIR}/usr/share/man/man5/pam_ldap.5.gz ]; then \ - ${RM} ${WRKDIR}/usr/share/man/man5/pam_ldap.5.gz; \ + @if [ -f ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz ]; then \ + ${RM} ${WRKSRC}/usr/share/man/man5/pam_ldap.5.gz; \ fi .else .if !${PORT_OPTIONS:MDOCS} - @if [ -d ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d ]; then \ - ${RM} -rf ${WRKDIR}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d/; \ + @if [ -d ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d ]; then \ + ${RM} -rf ${WRKSRC}/usr/share/doc/${PORTNAME}-${NSS_LDAP_VERSION}/pam.d/; \ fi .endif .endif diff --git a/net/lla/Makefile b/net/lla/Makefile index 09148c91a5ee..9a1eaefe2d54 100644 --- a/net/lla/Makefile +++ b/net/lla/Makefile @@ -28,6 +28,6 @@ EXTRACT_BEFORE_ARGS= # empty EXTRACT_AFTER_ARGS= ./${PORTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile index 92a250050953..a7778d3feb1e 100644 --- a/net/netpipes/Makefile +++ b/net/netpipes/Makefile @@ -15,6 +15,6 @@ CONFLICTS= timelimit-[0-9]* NO_WRKSUBDIR= yes do-install: - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKDIR} STAGEDIR=${STAGEDIR} install + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} STAGEDIR=${STAGEDIR} install .include <bsd.port.mk> diff --git a/net/radreport/Makefile b/net/radreport/Makefile index cf2e05a8abbe..40bafe110b40 100644 --- a/net/radreport/Makefile +++ b/net/radreport/Makefile @@ -19,10 +19,10 @@ SHEBANG_FILES= radreport PLIST_FILES= bin/radreport do-extract: - @${MKDIR} ${WRKDIR} - @for i in ${DISTFILES}; do ${CP} ${DISTDIR}/$$i ${WRKDIR}; done + @${MKDIR} ${WRKSRC} + @for i in ${DISTFILES}; do ${CP} ${DISTDIR}/$$i ${WRKSRC}; done do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/radreport ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/radreport ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/net/spideroak/Makefile b/net/spideroak/Makefile index 7388ffc04893..15e24747d361 100644 --- a/net/spideroak/Makefile +++ b/net/spideroak/Makefile @@ -29,10 +29,6 @@ OPTIONS_SUB= yes PLIST_SUB= DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,} \ BINMODE=${BINMODE} -REINPLACE_ARGS= -e 's,%%PREFIX%%,${PREFIX},1' \ - -e 's,%%DATADIR%%,${DATADIR},1' \ - -i.bak - SUB_LIST= LINUXBASE=${LINUXBASE} SUB_FILES= pkg-message @@ -43,26 +39,28 @@ USES= desktop-file-utils python:2 tar:tgz .include <bsd.port.options.mk> post-patch: - ${REINPLACE_CMD} ${WRKDIR}/usr/share/applications/SpiderOakONE.desktop \ - ${WRKDIR}/usr/bin/SpiderOakONE + ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},1' \ + -e 's,%%DATADIR%%,${DATADIR},1' \ + ${WRKSRC}/usr/share/applications/SpiderOakONE.desktop \ + ${WRKSRC}/usr/bin/SpiderOakONE do-install: - @(cd ${WRKDIR}/etc && \ + @(cd ${WRKSRC}/etc && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc/) @${MKDIR} ${STAGEDIR}${DATADIR} - @(cd ${WRKDIR}/opt/SpiderOakONE/lib && \ + @(cd ${WRKSRC}/opt/SpiderOakONE/lib && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-not -name SpiderOak") - ${INSTALL_PROGRAM} ${WRKDIR}/opt/SpiderOakONE/lib/SpiderOakONE ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/usr/bin/SpiderOakONE ${STAGEDIR}${PREFIX}/bin/SpiderOakONE + ${INSTALL_PROGRAM} ${WRKSRC}/opt/SpiderOakONE/lib/SpiderOakONE ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/usr/bin/SpiderOakONE ${STAGEDIR}${PREFIX}/bin/SpiderOakONE ${LN} -sf SpiderOakONE ${STAGEDIR}${PREFIX}/bin/spideroak ${LOCALBASE}/bin/desktop-file-install \ --mode=${SHAREMODE} --dir=${STAGEDIR}${DESKTOPDIR} \ - ${WRKDIR}/usr/share/applications/SpiderOakONE.desktop + ${WRKSRC}/usr/share/applications/SpiderOakONE.desktop @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/usr/share/doc/SpiderOakONE/Getting\ Started\ Guide.pdf ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/usr/share/doc/SpiderOakONE/Getting\ Started\ Guide.pdf ${STAGEDIR}${DOCSDIR} .if ${PORT_OPTIONS:MMANPAGES} - ${INSTALL_MAN} ${WRKDIR}/usr/share/man/man1/SpiderOakONE.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/usr/share/man/man1/SpiderOakONE.1.gz ${STAGEDIR}${MANPREFIX}/man/man1/ .endif - ${INSTALL_DATA} ${WRKDIR}/usr/share/pixmaps/*.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/*.png ${STAGEDIR}${PREFIX}/share/pixmaps/ .include <bsd.port.mk> diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile index 6ee0ad784229..6bd0a23e0af4 100644 --- a/net/tcpshow/Makefile +++ b/net/tcpshow/Makefile @@ -14,9 +14,9 @@ COMMENT= Decode tcpdump(1) output NO_WRKSUBDIR= yes do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/tcpshow.c ${WRKDIR} - @${CP} ${DISTDIR}/tcpshow.1 ${WRKDIR} + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/tcpshow.c ${WRKSRC} + @${CP} ${DISTDIR}/tcpshow.1 ${WRKSRC} do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} -o tcpshow tcpshow.c) diff --git a/news/c-nocem/Makefile b/news/c-nocem/Makefile index 129096840a8b..43ba679b5d5f 100644 --- a/news/c-nocem/Makefile +++ b/news/c-nocem/Makefile @@ -27,7 +27,7 @@ PLIST_FILES= %%NEWSBIN%%/fastcancel %%NEWSBIN%%/c-nocem CNEWS_PORT?= news/cnews #CNEWSWRK?= ${WRKDIRPREFIX}${PORTSDIR}/${CNEWS_PORT}/work # ${.CURDIR}/../.. can be diffrent from ${PORTSDIR} -CNEWSWRK?= ${WRKDIRPREFIX}${.CURDIR}/../../${CNEWS_PORT}/work +CNEWSWRK!= ${MAKE} -C ${.CURDIR}/../../${CNEWS_PORT} -V WRKSRC NEWSBIN?= ${PREFIX}/libexec/cnews post-patch: diff --git a/news/nnap/Makefile b/news/nnap/Makefile index 6ea5f6544a06..12e8aa89b646 100644 --- a/news/nnap/Makefile +++ b/news/nnap/Makefile @@ -15,8 +15,8 @@ NO_WRKSUBDIR= yes PLIST_FILES= sbin/nnap do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR} + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} -o ${PORTNAME} ${DISTNAME}.c) diff --git a/palm/pilot_makedoc/Makefile b/palm/pilot_makedoc/Makefile index 3f01b90e1514..a5b461fce386 100644 --- a/palm/pilot_makedoc/Makefile +++ b/palm/pilot_makedoc/Makefile @@ -18,11 +18,11 @@ PLIST_FILES= bin/pilot_makedoc ALL_TARGET= pilot_makedoc do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR} - @${CP} ${FILESDIR}/Makefile ${WRKDIR} + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/pilot_makedoc ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/pilot_makedoc ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile index 4420a2ca94fb..3ba92c0f7269 100644 --- a/print/adobe-cmaps/Makefile +++ b/print/adobe-cmaps/Makefile @@ -21,11 +21,11 @@ INSTDIRS= ac15 ag15 ai0 aj16 aj20 ak12 rksj-cmaps FONTSDIR= ${PREFIX}/share/fonts/${PORTNAME} post-extract: - ${RM} -f ${WRKDIR}/ag15/.nfsFA55 + ${RM} -f ${WRKSRC}/ag15/.nfsFA55 do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${WRKDIR} && \ + cd ${WRKSRC} && \ ${TAR} cf - ${INSTDIRS} | \ (cd ${STAGEDIR}${FONTSDIR} && ${TAR} xf - ) diff --git a/print/enscriptfonts/Makefile b/print/enscriptfonts/Makefile index cb4e8d6a73ff..dd6e0e149b43 100644 --- a/print/enscriptfonts/Makefile +++ b/print/enscriptfonts/Makefile @@ -22,9 +22,9 @@ SUB_FILES+= pkg-message do-install: @${MKDIR} -p ${STAGEDIR}${PREFIX}/share/enscript/xenscript - @${CP} -p ${WRKDIR}/README ${STAGEDIR}${PREFIX}/share/enscript/xenscript - @${CP} -p ${WRKDIR}/font.map ${STAGEDIR}${PREFIX}/share/enscript/xenscript - @${CP} -p ${WRKDIR}/*.afm ${STAGEDIR}${PREFIX}/share/enscript/xenscript - @${CP} -p ${WRKDIR}/*.readme ${STAGEDIR}${PREFIX}/share/enscript/xenscript + @${CP} -p ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/enscript/xenscript + @${CP} -p ${WRKSRC}/font.map ${STAGEDIR}${PREFIX}/share/enscript/xenscript + @${CP} -p ${WRKSRC}/*.afm ${STAGEDIR}${PREFIX}/share/enscript/xenscript + @${CP} -p ${WRKSRC}/*.readme ${STAGEDIR}${PREFIX}/share/enscript/xenscript .include <bsd.port.mk> diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile index ce891fe229ef..3847c1cfbf76 100644 --- a/print/ghostscript7-commfont/Makefile +++ b/print/ghostscript7-commfont/Makefile @@ -34,5 +34,6 @@ CMAPDIR?= ${LOCALBASE}/share/fonts/adobe-cmaps GS_RESDIR?= share/ghostscript/Resource post-extract: apply-slist + @cd ${WRKDIR} && ${MV} Makefile template.* ${WRKSRC} .include <bsd.port.mk> diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile index afa7b8d833b3..f75fa0f5976d 100644 --- a/print/texlive-texmf/Makefile +++ b/print/texlive-texmf/Makefile @@ -255,7 +255,7 @@ EXCLUDE_FILES= \*/doc/man \ EXTRACT_AFTER_ARGS=| ${TAR} xf - ${EXCLUDE_FILES:S,^,--exclude ${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}/,} post-extract: - cd ${WRKDIR}/latex-base-20150101.2 && \ + cd ${WRKSRC}/latex-base-20150101.2 && \ ${SETENV} TEXMF=. ${LOCALBASE}/bin/tex -ini unpack.ins && \ ${RM} README *.log *.aux *.pdf *.dtx *.ins *.txt *.ist *.fdd *.err @@ -264,7 +264,7 @@ do-install: ${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/tex/latex/base - cd ${WRKDIR}/latex-base-20150101.2 && ${PAX} -rw . \ + cd ${WRKSRC}/latex-base-20150101.2 && ${PAX} -rw . \ ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/tex/latex/base ${REINPLACE_CMD} -i '' 's/\\def\\magyar@sugg@ie@low#1#2#3/\\def\\magyar@sugg@ie@low\\protect #1#2#3/' ${STAGEDIR}${PREFIX}/share/texmf-dist/tex/generic/babel-hungarian/magyar.ldf ${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFDISTDIR}/doc diff --git a/print/txtbdf2ps/Makefile b/print/txtbdf2ps/Makefile index 6bf6582776bf..79f2dfd12434 100644 --- a/print/txtbdf2ps/Makefile +++ b/print/txtbdf2ps/Makefile @@ -16,7 +16,7 @@ PLIST_FILES= bin/txtbdf2ps USES= perl5 shebangfix EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} SHEBANG_FILES= ${DISTNAME}.txt NO_WRKSUBDIR= yes NO_ARCH= yes diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile index b29bc73aaf21..d84aed2b8c2e 100644 --- a/russian/p5-XML-Parser-encodings/Makefile +++ b/russian/p5-XML-Parser-encodings/Makefile @@ -32,18 +32,18 @@ post-extract: .endfor do-configure: - @${CP} ${WRKSRC}/iconv/cp866.txt ${WRKDIR} - @${CP} ${WRKSRC}/iconv-extra/windows-1251.txt ${WRKDIR}/cp1251.txt - @${CP} ${WRKSRC}/iconv-extra/mac-cyrillic.txt ${WRKDIR} - @${PERL} -pi -e 's/\r/\n/gm;' ${WRKDIR}/mac-cyrillic.txt + @${CP} ${WRKSRC}/iconv/cp866.txt ${WRKSRC} + @${CP} ${WRKSRC}/iconv-extra/windows-1251.txt ${WRKSRC}/cp1251.txt + @${CP} ${WRKSRC}/iconv-extra/mac-cyrillic.txt ${WRKSRC} + @${PERL} -pi -e 's/\r/\n/gm;' ${WRKSRC}/mac-cyrillic.txt do-build: .for ENC in ${RUSSIANENC} - @${LOCALBASE}/bin/make_encmap ${ENC} ${WRKDIR}/${ENC}.txt | \ + @${LOCALBASE}/bin/make_encmap ${ENC} ${WRKSRC}/${ENC}.txt | \ ${PERL} -pi -e "s/(?<=^<encmap name='${ENC}')()(?=>)/ expat='yes'/;" \ - >${WRKDIR}/${ENC}.xml + >${WRKSRC}/${ENC}.xml @${LOCALBASE}/bin/compile_encoding \ - -o ${WRKDIR}/${ENC}.enc ${WRKDIR}/${ENC}.xml + -o ${WRKSRC}/${ENC}.enc ${WRKSRC}/${ENC}.xml .endfor do-install: diff --git a/science/checkmol/Makefile b/science/checkmol/Makefile index 8c6feff86a66..af0bdabeec53 100644 --- a/science/checkmol/Makefile +++ b/science/checkmol/Makefile @@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} USE_FPC= yes diff --git a/science/medit/Makefile b/science/medit/Makefile index 9aeb51767f32..f2363ae3ec07 100644 --- a/science/medit/Makefile +++ b/science/medit/Makefile @@ -46,7 +46,7 @@ PLIST_FILES+= ${MESHES:S|^|%%EXAMPLESDIR%%/|} . endif post-extract: - cd ${WRKDIR} && \ + cd ${WRKSRC} && \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${LIBTARBALL} ${EXTRACT_AFTER_ARGS} --exclude ${MAKEFILE} ${CP} ${FILESDIR}/gttime.c ${WRKSRC}/sources/ .for l in lplib2.c lplib2.h diff --git a/science/mol2ps/Makefile b/science/mol2ps/Makefile index 166a4457ec57..559f53a213f8 100644 --- a/science/mol2ps/Makefile +++ b/science/mol2ps/Makefile @@ -19,7 +19,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} USE_FPC= yes diff --git a/security/chaosreader/Makefile b/security/chaosreader/Makefile index 3c7e1d893e8c..ac3531d298a8 100644 --- a/security/chaosreader/Makefile +++ b/security/chaosreader/Makefile @@ -22,11 +22,11 @@ PLIST_FILES= bin/${PORTNAME} bin/sshkeydata SHEBANG_FILES= chaosreader sshkeydata post-extract: - @${CP} ${DISTDIR}/${PORTNAME}${PORTVERSION} ${WRKDIR}/${PORTNAME} - @${CP} ${DISTDIR}/sshkeydata0.20 ${WRKDIR}/sshkeydata + @${CP} ${DISTDIR}/${PORTNAME}${PORTVERSION} ${WRKSRC}/${PORTNAME} + @${CP} ${DISTDIR}/sshkeydata0.20 ${WRKSRC}/sshkeydata do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/sshkeydata ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/sshkeydata ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/security/ipfilter2dshield/Makefile b/security/ipfilter2dshield/Makefile index 1471e6aeaadf..33ce177469bf 100644 --- a/security/ipfilter2dshield/Makefile +++ b/security/ipfilter2dshield/Makefile @@ -25,8 +25,8 @@ NO_ARCH= yes NO_WRKSUBDIR= yes do-extract: - @${MKDIR} ${WRKDIR} - ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${DISTNAME} + @${MKDIR} ${WRKSRC} + ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${DISTNAME} pre-install: @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" \ @@ -35,8 +35,8 @@ pre-install: do-install: @${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME} \ + ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} \ ${STAGEDIR}${ETCDIR}/${DISTNAME}.sample - ${INSTALL} -m 760 ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL} -m 760 ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/sbin .include <bsd.port.mk> diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile index b113417458f0..d286e030f49c 100644 --- a/security/l0phtcrack/Makefile +++ b/security/l0phtcrack/Makefile @@ -24,11 +24,11 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS post-extract: - ${RM} ${WRKDIR}/*exe - ${REINPLACE_CMD} -i '' -e 's|ommited|omitted|' ${WRKDIR}/util.c + ${RM} ${WRKSRC}/*exe + ${REINPLACE_CMD} -i '' -e 's|ommited|omitted|' ${WRKSRC}/util.c do-build: - cd ${WRKDIR} && ${CC} ${CFLAGS} -DMPU8086 *.c -o lc_CLI + cd ${WRKSRC} && ${CC} ${CFLAGS} -DMPU8086 *.c -o lc_CLI do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lc_CLI ${STAGEDIR}${PREFIX}/bin diff --git a/security/pxytest/Makefile b/security/pxytest/Makefile index 3f70aac19364..8a9233f2b76b 100644 --- a/security/pxytest/Makefile +++ b/security/pxytest/Makefile @@ -12,7 +12,7 @@ COMMENT= Test remote system for unsecured mail proxies EXTRACT_CMD= ${GZIP_CMD} EXTRACT_BEFORE_ARGS= -dc -EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME} +EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME} NO_WRKSUBDIR= yes diff --git a/security/py-htpasswd/Makefile b/security/py-htpasswd/Makefile index 7f4d0403d63d..73b48c70fddb 100644 --- a/security/py-htpasswd/Makefile +++ b/security/py-htpasswd/Makefile @@ -21,6 +21,6 @@ NO_WRKSUBDIR= yes SHEBANG_FILES= ${PORTNAME}.py do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/security/sig2dot/Makefile b/security/sig2dot/Makefile index 452f99a5a966..5dd94b77cb8d 100644 --- a/security/sig2dot/Makefile +++ b/security/sig2dot/Makefile @@ -16,7 +16,7 @@ CONFLICTS_INSTALL=signing-party-[0-9]* PLIST_FILES= bin/sig2dot EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} NO_WRKSUBDIR= yes NO_BUILD= yes USES= shebangfix perl5 diff --git a/security/sshblock/Makefile b/security/sshblock/Makefile index 6aa04abf027e..e1f985dfd6ff 100644 --- a/security/sshblock/Makefile +++ b/security/sshblock/Makefile @@ -21,7 +21,7 @@ USE_RC_SUBR= sshblock SUB_LIST= PERL=${PERL} EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} SUB_FILES+= pkg-message SHEBANG_FILES= ${WRKSRC}/sshblock-${PORTVERSION}.pl diff --git a/security/unhide/Makefile b/security/unhide/Makefile index 52c451353388..f4072da6bc6d 100644 --- a/security/unhide/Makefile +++ b/security/unhide/Makefile @@ -20,9 +20,9 @@ PLIST_FILES= man/man8/unhide.8.gz \ sbin/unhide-tcp post-patch: - @${REINPLACE_CMD} -e 's/-eLf/-axH/g' -e 's/$$2/$$1/g' ${WRKDIR}/unhide-posix.c - @${REINPLACE_CMD} -e 's/linux\/limits/limits/g' ${WRKDIR}/unhide-output.c + @${REINPLACE_CMD} -e 's/-eLf/-axH/g' -e 's/$$2/$$1/g' ${WRKSRC}/unhide-posix.c + @${REINPLACE_CMD} -e 's/linux\/limits/limits/g' ${WRKSRC}/unhide-output.c @${REINPLACE_CMD} -e 's/-tan/-p tcp -an/g' -e 's/-uan/-p udp -an/g' \ - -e 's/use_ss = 1/use_ss = 0/g' ${WRKDIR}/unhide-tcp.c + -e 's/use_ss = 1/use_ss = 0/g' ${WRKSRC}/unhide-tcp.c .include <bsd.port.mk> diff --git a/shells/v7sh/Makefile b/shells/v7sh/Makefile index f9d1c3bb25df..8d71892b2bd3 100644 --- a/shells/v7sh/Makefile +++ b/shells/v7sh/Makefile @@ -23,7 +23,7 @@ COMMENT= Implementation of the UNIX 7th Edition shell USES= uidfix EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} NO_WRKSUBDIR= yes diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile index ba809ef8927d..8d8d6f252006 100644 --- a/sysutils/3dm/Makefile +++ b/sysutils/3dm/Makefile @@ -40,7 +40,7 @@ do-install: ${STAGEDIR}${PREFIX}/sbin/3dm2 ${INSTALL_DATA} ${WRKSRC}/tdm_msg_en ${STAGEDIR}${MSGDIR} ${INSTALL_DATA} ${WRKSRC}/tw_msg_en ${STAGEDIR}${MSGDIR} - ${INSTALL_DATA} ${WRKSRC}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}2 + ${INSTALL_DATA} ${WRKDIR}/3dm2.conf.sample ${STAGEDIR}${ETCDIR}2 # 3ware uses a hardcoded config dir location that doesn't match hier(9) diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile index da002727a139..4b9638510ee7 100644 --- a/sysutils/copytape/Makefile +++ b/sysutils/copytape/Makefile @@ -17,7 +17,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= zcat EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= | gunshar -d ${WRKDIR} +EXTRACT_AFTER_ARGS= | gunshar -d ${WRKSRC} CFLAGS+= -Wno-return-type # XXX upstream puts CFLAGS in CC diff --git a/sysutils/pdixtract/Makefile b/sysutils/pdixtract/Makefile index 024b0805c21e..31873c8b3333 100644 --- a/sysutils/pdixtract/Makefile +++ b/sysutils/pdixtract/Makefile @@ -19,9 +19,9 @@ USES= zip PLIST_FILES= bin/pdixtract do-build: - cd ${WRKDIR}; ${CC} ${CFLAGS} pdixtract.c -o pdixtract + cd ${WRKSRC}; ${CC} ${CFLAGS} pdixtract.c -o pdixtract do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/pdixtract ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/pdixtract ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile index cc261d9f1357..702e7116a565 100644 --- a/sysutils/pstree/Makefile +++ b/sysutils/pstree/Makefile @@ -18,10 +18,10 @@ CONFLICTS= psmisc-[0-9]* PLIST_FILES= bin/pstree man/man1/pstree.1.gz do-build: - cd ${WRKDIR} && ${CC} ${CFLAGS} -o pstree pstree.c + cd ${WRKSRC} && ${CC} ${CFLAGS} -o pstree pstree.c do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/pstree ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKDIR}/pstree.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/pstree ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/pstree.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/ .include <bsd.port.mk> diff --git a/sysutils/sb16config/Makefile b/sysutils/sb16config/Makefile index 24a975f81f3d..ad8b48593255 100644 --- a/sysutils/sb16config/Makefile +++ b/sysutils/sb16config/Makefile @@ -19,7 +19,7 @@ PLIST_FILES= bin/sb16config \ post-extract: .for _i in ${DISTFILES} - @${GZCAT} ${DISTDIR}/${_i} >${WRKDIR}/${_i:R} + @${GZCAT} ${DISTDIR}/${_i} >${WRKSRC}/${_i:R} .endfor .include <bsd.port.mk> diff --git a/sysutils/setcdboot/Makefile b/sysutils/setcdboot/Makefile index abb2320635b0..fc019cbc5973 100644 --- a/sysutils/setcdboot/Makefile +++ b/sysutils/setcdboot/Makefile @@ -15,8 +15,8 @@ PLIST_FILES= bin/setcdboot .include <bsd.port.pre.mk> do-extract: - ${MKDIR} ${WRKDIR} - ${CP} ${FILESDIR}/setcdboot.c ${WRKDIR} + ${MKDIR} ${WRKSRC} + ${CP} ${FILESDIR}/setcdboot.c ${WRKSRC} do-build: (cd ${WRKSRC} && ${CC} ${CFLAGS} -o setcdboot setcdboot.c) diff --git a/sysutils/storcli/Makefile b/sysutils/storcli/Makefile index f976855bfcf8..a1f91e4ea9f2 100644 --- a/sysutils/storcli/Makefile +++ b/sysutils/storcli/Makefile @@ -25,15 +25,15 @@ NO_WRKSUBDIR= yes PLIST_FILES= sbin/storcli PKGMESSAGE= ${WRKDIR}/pkg-message -BINSRC= ${WRKDIR}/storcli_all_os/FreeBSD +BINSRC= ${WRKSRC}/storcli_all_os/FreeBSD FETCH_AFTER_ARGS=-v post-extract: - @${TAR} xf ${WRKDIR}/storcli_all_os.zip -C${WRKSRC} + @${TAR} xf ${WRKSRC}/storcli_all_os.zip -C${WRKSRC} @${TAR} xf ${BINSRC}/storcli${ARCH:S/i386//:S/amd64/64/}.tar -C${WRKSRC} @${REINPLACE_CMD} 's#\(StorCli\).*StorCli64#\1#'\ ${BINSRC}/FreeBSD_readme.txt - @${FMT} 75 79 ${BINSRC}/FreeBSD_readme.txt > ${WRKDIR}/pkg-message + @${FMT} 75 79 ${BINSRC}/FreeBSD_readme.txt > ${WRKSRC}/pkg-message do-install: ${INSTALL_SCRIPT} ${WRKSRC}/storcli${ARCH:S/i386//:S/amd64/64/}\ diff --git a/sysutils/vils/Makefile b/sysutils/vils/Makefile index fc56fa6b357a..329057cc7194 100644 --- a/sysutils/vils/Makefile +++ b/sysutils/vils/Makefile @@ -20,7 +20,7 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -f -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} USES= shebangfix SHEBANG_FILES= vils diff --git a/textproc/clit/Makefile b/textproc/clit/Makefile index 0bac6efdb9f9..3f093de53a87 100644 --- a/textproc/clit/Makefile +++ b/textproc/clit/Makefile @@ -14,7 +14,7 @@ EXTRACT_ONLY= clit${MAJ_VER}${MIN_VER}src.zip MAINTAINER= itetcu@FreeBSD.org COMMENT= Microsoft Lit to HTML and Open eBooks converter -PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER} +PATCH_WRKSRC= ${WRKSRC}/${PORTNAME}${MAJ_VER}${MIN_VER} NO_WRKSUBDIR= yes MAJ_VER= 1 @@ -25,18 +25,18 @@ PLIST_FILES= bin/clit USES= dos2unix gmake zip post-extract: - cd ${WRKDIR} && ${BZIP2_CMD} -dc "${DISTDIR}/ltm-0.33.tar.bz2" | \ + cd ${WRKSRC} && ${BZIP2_CMD} -dc "${DISTDIR}/ltm-0.33.tar.bz2" | \ ${TAR} -xf - do-build: - cd ${WRKDIR}/libtommath-0.33 && \ + cd ${WRKSRC}/libtommath-0.33 && \ ${SETENV} ${MAKE_ENV} ${MAKE} -f makefile libtommath.a - cd ${WRKDIR}/lib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all - cd ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER} && \ + cd ${WRKSRC}/lib && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all + cd ${WRKSRC}/${PORTNAME}${MAJ_VER}${MIN_VER} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all do-install: - @${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER}/clit \ + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${MAJ_VER}${MIN_VER}/clit \ ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/textproc/diffsplit/Makefile b/textproc/diffsplit/Makefile index f2ecd683cecf..d244ad435372 100644 --- a/textproc/diffsplit/Makefile +++ b/textproc/diffsplit/Makefile @@ -19,10 +19,10 @@ USES= shebangfix perl5 SHEBANG_FILES= diffsplit do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${DISTDIR}/${DIST_SUBDIR}/diffsplit ${WRKDIR} + @${MKDIR} ${WRKSRC} + @${CP} ${DISTDIR}/${DIST_SUBDIR}/diffsplit ${WRKSRC} do-install: - @${INSTALL_SCRIPT} ${WRKDIR}/diffsplit ${STAGEDIR}${PREFIX}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/diffsplit ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile index 96a3a3e9b1c7..a8412feebc90 100644 --- a/textproc/foiltex/Makefile +++ b/textproc/foiltex/Makefile @@ -29,12 +29,12 @@ PORTEXAMPLES= sampfoil.tex PLIST_FILES= ${FOIL_FILES:S,^,${FOIL_DIR}/,} do-extract: - ${MKDIR} ${WRKDIR} - ${CP} ${DISTDIR}/foiltex.ins ${WRKDIR}/foiltex.ins - ${CP} ${DISTDIR}/foiltex.dtx ${WRKDIR}/foiltex.dtx + ${MKDIR} ${WRKSRC} + ${CP} ${DISTDIR}/foiltex.ins ${WRKSRC}/foiltex.ins + ${CP} ${DISTDIR}/foiltex.dtx ${WRKSRC}/foiltex.dtx do-build: - @cd ${WRKDIR} && ${LATEX_CMD} foiltex.ins && \ + @cd ${WRKSRC} && ${LATEX_CMD} foiltex.ins && \ ${LATEX_CMD} foiltex.dtx && \ ${LATEX_CMD} foiltex.dtx && \ ${LATEX_CMD} foiltex.dtx diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile index 40b09e956274..0698969f3381 100644 --- a/textproc/jarnal/Makefile +++ b/textproc/jarnal/Makefile @@ -25,16 +25,16 @@ SCRIPTS= jarnal.sh jarnalannotate.sh jarnal-open-file.sh LIBFILES= lbouncy_license.html lib-ver.txt jarnal-readme.txt pre-configure: - ${MV} ${WRKDIR}/lib/readme.txt ${WRKDIR}/lib/jarnal-readme.txt + ${MV} ${WRKSRC}/lib/readme.txt ${WRKSRC}/lib/jarnal-readme.txt ${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|' \ - -e 's|%%DATADIR%%|${DATADIR}|' ${SCRIPTS:S|^|${WRKDIR}/|} + -e 's|%%DATADIR%%|${DATADIR}|' ${SCRIPTS:S|^|${WRKSRC}/|} do-install: ${MKDIR} ${STAGEDIR}${JAVAJARDIR}/lib ${STAGEDIR}${DATADIR}/templates - ${INSTALL_DATA} ${PORTNAME:S|^|${WRKDIR}/|:S|$|.jar|} ${STAGEDIR}${JAVAJARDIR} - ${INSTALL_DATA} ${WRKDIR}/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/lib/ - ${INSTALL_DATA} ${LIBFILES:S|^|${WRKDIR}/lib/|} ${STAGEDIR}${JAVAJARDIR}/lib/ - ${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKDIR}/|} ${STAGEDIR}${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKDIR}/templates/* ${STAGEDIR}${DATADIR}/templates/ + ${INSTALL_DATA} ${PORTNAME:S|^|${WRKSRC}/|:S|$|.jar|} ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/lib/ + ${INSTALL_DATA} ${LIBFILES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${JAVAJARDIR}/lib/ + ${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/templates/* ${STAGEDIR}${DATADIR}/templates/ .include <bsd.port.mk> diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile index dc1bc8c9c378..c793af476c29 100644 --- a/textproc/ppower4/Makefile +++ b/textproc/ppower4/Makefile @@ -22,11 +22,11 @@ NO_WRKSUBDIR= yes JAR_DIR= ${JAVASHAREDIR}/${PORTNAME} STY_DIR= ${PREFIX}/share/texmf/tex/latex/${PORTNAME} -STY_FILES= ${WRKDIR}/pause.sty ${WRKDIR}/background.sty \ - ${WRKDIR}/pp4link.sty ${WRKDIR}/mpmulti.sty -EXAMPLE_FILES= ${WRKDIR}/leveldemo.tex +STY_FILES= ${WRKSRC}/pause.sty ${WRKSRC}/background.sty \ + ${WRKSRC}/pp4link.sty ${WRKSRC}/mpmulti.sty +EXAMPLE_FILES= ${WRKSRC}/leveldemo.tex .for i in 1 2 3 4 5 6 7 -EXAMPLE_FILES+= ${WRKDIR}/example.${i} +EXAMPLE_FILES+= ${WRKSRC}/example.${i} .endfor PLIST_SUB= STY_DIR="${STY_DIR:S,^${PREFIX}/,,}" \ JAR_DIR="${JAR_DIR:S,^${PREFIX}/,,}" diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile index d1a79e8499ee..ce300c35e73c 100644 --- a/textproc/saxon-devel/Makefile +++ b/textproc/saxon-devel/Makefile @@ -75,14 +75,14 @@ do-install: @${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..." .for scriptfile in saxon saxon-xquery @${ECHO_MSG} -n " ${scriptfile}" - ${INSTALL_SCRIPT} ${WRKSRC}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile} + ${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile} .endfor @${ECHO_MSG} " [ DONE ]" .if ${PORT_OPTIONS:MDOCS} post-install: ${FIND} -s ${WRKSRC}/samples -not -type d | \ - ${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST} + ${SED} -ne 's|^${WRKSRC}/samples|${EXAMPLESDIR:S,${PREFIX}/,,}|p' >> ${TMPPLIST} .endif .include <bsd.port.mk> diff --git a/vietnamese/vnroff/Makefile b/vietnamese/vnroff/Makefile index 6c6cb9799eed..8c9fc0e585da 100644 --- a/vietnamese/vnroff/Makefile +++ b/vietnamese/vnroff/Makefile @@ -15,12 +15,12 @@ PLIST_FILES= bin/vnroff man/man1/vnroff.1.gz NO_WRKSUBDIR= yes do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} - @(cd ${WRKDIR} && ${GZCAT} ${DISTDIR}/vnroff.c.Z \ + @${RM} -rf ${WRKSRC} + @${MKDIR} ${WRKSRC} + @(cd ${WRKSRC} && ${GZCAT} ${DISTDIR}/vnroff.c.Z \ | ${SED} -e '1,/-cut here-/d' \ > vnroff.c) - @(cd ${WRKDIR} && ${GZCAT} ${DISTDIR}/vnroff.1.Z \ + @(cd ${WRKSRC} && ${GZCAT} ${DISTDIR}/vnroff.1.Z \ | ${SED} -e '1,/Status:/d' \ | ${SED} -e '1,1d' \ | ${TR} -d '\01' \ diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile index 87c01f4dc060..746857b030ae 100644 --- a/www/bareos-webui/Makefile +++ b/www/bareos-webui/Makefile @@ -21,7 +21,6 @@ USES= tar:tgz USE_PHP= openssl NO_BUILD= yes NO_ARCH= yes -NO_WRKSUBDIR= yes BAREOSWEB_HOME?=${WWWDIR} BAREOSWEBUIDIR= ${BAREOSWEB_HOME:S|${PREFIX}/||} diff --git a/www/cgi-lib.pl/Makefile b/www/cgi-lib.pl/Makefile index dccfd95be5ce..b34ef0e929f7 100644 --- a/www/cgi-lib.pl/Makefile +++ b/www/cgi-lib.pl/Makefile @@ -25,6 +25,6 @@ INSTALL_DIR= ${PREFIX}/${INSTALL_BASE} do-install: -${MKDIR} ${STAGEDIR}${INSTALL_DIR} - ${INSTALL_DATA} ${WRKDIR}/cgi-lib.pl ${STAGEDIR}${INSTALL_DIR} + ${INSTALL_DATA} ${WRKSRC}/cgi-lib.pl ${STAGEDIR}${INSTALL_DIR} .include <bsd.port.mk> diff --git a/www/closure-compiler/Makefile b/www/closure-compiler/Makefile index c3c9403c7157..df4e7327daf6 100644 --- a/www/closure-compiler/Makefile +++ b/www/closure-compiler/Makefile @@ -24,6 +24,6 @@ PLIST_FILES= bin/closure-compiler \ do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/compiler.jar ${STAGEDIR}${DATADIR}/ - ${INSTALL_SCRIPT} ${WRKSRC}/closure-compiler ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKDIR}/closure-compiler ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> diff --git a/www/demoroniser/Makefile b/www/demoroniser/Makefile index 5832c0a73111..83cf50fbde2d 100644 --- a/www/demoroniser/Makefile +++ b/www/demoroniser/Makefile @@ -22,8 +22,8 @@ NO_WRKSUBDIR= yes PLIST_FILES= bin/demoroniser man/man1/demoroniser.1.gz do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/demoroniser.pl \ + ${INSTALL_SCRIPT} ${WRKSRC}/demoroniser.pl \ ${STAGEDIR}${PREFIX}/bin/demoroniser - ${INSTALL_MAN} ${WRKDIR}/demoroniser.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/demoroniser.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/www/efront/Makefile b/www/efront/Makefile index ef1dc4fad87f..390bebabb58f 100644 --- a/www/efront/Makefile +++ b/www/efront/Makefile @@ -39,10 +39,10 @@ SUB_FILES= pkg-message do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} .for i in ${EFRONT_FILES} - @cd ${WRKDIR} && ${CP} ${i} ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${CP} ${i} ${STAGEDIR}${WWWDIR} .endfor .for i in ${EFRONT_DIRS} - @cd ${WRKDIR} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} .endfor @${CHMOD} -R 755 ${STAGEDIR}${WWWDIR} diff --git a/www/fira-webfont/Makefile b/www/fira-webfont/Makefile index 68c50ba73039..24bca13d3f3d 100644 --- a/www/fira-webfont/Makefile +++ b/www/fira-webfont/Makefile @@ -51,7 +51,7 @@ do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} .for b in index.html ${PORTNAME:S|$|.css|} ${INSTALL_DATA} \ - ${WRKDIR}/${DISTNAME}Boilerplate${PORTVERSION:S|.||}/${b} \ + ${WRKSRC}/${DISTNAME}Boilerplate${PORTVERSION:S|.||}/${b} \ ${STAGEDIR}${WWWDIR} .endfor .for w in eot ttf woff woff2 @@ -69,7 +69,7 @@ do-install: .if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} . for e in ${EXAMPLES_DISTFILES:R:C|:[^:]+$||} - (cd ${WRKDIR}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) . endfor .endif diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile index 080a4f111766..66ec4cc9aab9 100644 --- a/www/htmlpp/Makefile +++ b/www/htmlpp/Makefile @@ -22,13 +22,13 @@ NO_ARCH= yes do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL} - ${INSTALL_SCRIPT} ${WRKDIR}/htmlpp ${STAGEDIR}${PREFIX}/bin/htmlpp - ${INSTALL_DATA} ${WRKDIR}/htmlpp.d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/htmlpp.d - (cd ${WRKDIR}; for FILE in *.pl; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/$${FILE}; done) - (cd ${WRKDIR}; for FILE in *.def; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/bin/$${FILE}; done) - ${INSTALL_DATA} ${WRKDIR}/guru_opt.fmt ${STAGEDIR}${PREFIX}/bin/guru.fmt - (cd ${WRKDIR}; ${MKDIR} ${STAGEDIR}${DOCSDIR}; for FILE in *.htm; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) - (cd ${WRKDIR}; for FILE in *.gif; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) - (cd ${WRKDIR}; for FILE in *.txt; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) + ${INSTALL_SCRIPT} ${WRKSRC}/htmlpp ${STAGEDIR}${PREFIX}/bin/htmlpp + ${INSTALL_DATA} ${WRKSRC}/htmlpp.d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/htmlpp.d + (cd ${WRKSRC}; for FILE in *.pl; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/$${FILE}; done) + (cd ${WRKSRC}; for FILE in *.def; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/bin/$${FILE}; done) + ${INSTALL_DATA} ${WRKSRC}/guru_opt.fmt ${STAGEDIR}${PREFIX}/bin/guru.fmt + (cd ${WRKSRC}; ${MKDIR} ${STAGEDIR}${DOCSDIR}; for FILE in *.htm; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) + (cd ${WRKSRC}; for FILE in *.gif; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) + (cd ${WRKSRC}; for FILE in *.txt; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done) .include <bsd.port.mk> diff --git a/www/jawstats/Makefile b/www/jawstats/Makefile index 39592295caca..3249262bf2d8 100644 --- a/www/jawstats/Makefile +++ b/www/jawstats/Makefile @@ -17,17 +17,9 @@ USE_PHP= yes WANT_PHP_WEB= yes DEFAULT_PHP_VER= 5 SUB_FILES= pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message do-install: @${MKDIR} ${STAGEDIR}/${WWWDIR} - @cd ${WRKSRC}; ${FIND} . ! -path '*stage*' -print |\ - ${CPIO} --quiet -pdum -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR} - @${RM} -f ${STAGEDIR}${WWWDIR}/.PLIST.mktmp \ - ${STAGEDIR}${WWWDIR}/.build_done.jawstats._usr_local \ - ${STAGEDIR}${WWWDIR}/.configure_done.jawstats._usr_local \ - ${STAGEDIR}${WWWDIR}/.extract_done.jawstats._usr_local \ - ${STAGEDIR}${WWWDIR}/.patch_done.jawstats._usr_local - + @cd ${WRKSRC}; ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR} .include <bsd.port.mk> diff --git a/www/jawstats/pkg-plist b/www/jawstats/pkg-plist index d71f99e87f20..31a58d6db0a9 100644 --- a/www/jawstats/pkg-plist +++ b/www/jawstats/pkg-plist @@ -13,7 +13,6 @@ %%WWWDIR%%/languages/pl.js %%WWWDIR%%/languages/sv.js %%WWWDIR%%/languages/translations.php -%%WWWDIR%%/pkg-message %%WWWDIR%%/readme.txt %%WWWDIR%%/swf/bar_graph.swf %%WWWDIR%%/swf/line_graph.swf @@ -367,16 +366,3 @@ %%WWWDIR%%/xml_pages.php %%WWWDIR%%/xml_stats.php %%WWWDIR%%/xml_update.php -@dirrm %%WWWDIR%%/themes/default/searchengines -@dirrm %%WWWDIR%%/themes/default/paging -@dirrm %%WWWDIR%%/themes/default/os -@dirrm %%WWWDIR%%/themes/default/images -@dirrm %%WWWDIR%%/themes/default/flags -@dirrm %%WWWDIR%%/themes/default/changemonth -@dirrm %%WWWDIR%%/themes/default/browsers -@dirrm %%WWWDIR%%/themes/default -@dirrm %%WWWDIR%%/themes -@dirrm %%WWWDIR%%/swf -@dirrm %%WWWDIR%%/languages -@dirrm %%WWWDIR%%/js -@dirrm %%WWWDIR%% diff --git a/www/linux-c6-flashplugin11/Makefile b/www/linux-c6-flashplugin11/Makefile index de07c4993c84..b0bd9b074fe1 100644 --- a/www/linux-c6-flashplugin11/Makefile +++ b/www/linux-c6-flashplugin11/Makefile @@ -61,17 +61,17 @@ INSTALLS_ICONS= yes .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKDIR}/usr/share/applications/flash-player-properties.desktop + @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' -e '/^NotShowIn=KDE/d' ${WRKSRC}/usr/share/applications/flash-player-properties.desktop do-install: ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR} - ${INSTALL_LIB} ${WRKDIR}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR} + ${INSTALL_LIB} ${WRKSRC}/libflashplayer.so ${STAGEDIR}${WEBPLUGIN_DIR} .if ! ${PORT_OPTIONS:MALSA} ${MKDIR} ${STAGEDIR}${LINUXBASE}/usr/lib - ${INSTALL_LIB} ${WRKDIR}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib + ${INSTALL_LIB} ${WRKSRC}/libflashsupport.so ${STAGEDIR}${LINUXBASE}/usr/lib .endif - ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKDIR}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR} - (cd ${WRKDIR}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons) + ${INSTALL_PROGRAM} ${WRKSRC}/usr/bin/flash-player-properties ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/usr/share/applications/flash-player-properties.desktop ${STAGEDIR}${DESKTOPDIR} + (cd ${WRKSRC}/usr/share/icons && ${COPYTREE_SHARE} hicolor ${STAGEDIR}${PREFIX}/share/icons) .include <bsd.port.mk> diff --git a/www/mimetex/Makefile b/www/mimetex/Makefile index cce55a88463a..776006c92128 100644 --- a/www/mimetex/Makefile +++ b/www/mimetex/Makefile @@ -43,7 +43,7 @@ IMAGES_TYPE= -DGIF USER_OPTIONS?= do-build: - cd ${WRKDIR};\ + cd ${WRKSRC};\ ${CC} ${CFLAGS} ${STATIC_MIMETEX} ${IMAGES_TYPE} ${USER_OPTIONS} mimetex.c gifsave.c -lm -o mimetex.cgi do-install: diff --git a/www/ruby-wgettsv/Makefile b/www/ruby-wgettsv/Makefile index fc9462eb4ba2..fdf8517c6b10 100644 --- a/www/ruby-wgettsv/Makefile +++ b/www/ruby-wgettsv/Makefile @@ -23,10 +23,10 @@ SHEBANG_FILES= wgettsv PLIST_FILES= bin/wgettsv do-extract: - @${MKDIR} ${WRKDIR} - ${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}/${DISTNAME} + @${MKDIR} ${WRKSRC} + ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME} do-install: - ${INSTALL_DATA} -m0755 ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} -m0755 ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/www/scloader/Makefile b/www/scloader/Makefile index 4c226438099c..306f238cec09 100644 --- a/www/scloader/Makefile +++ b/www/scloader/Makefile @@ -32,7 +32,7 @@ PORTEXAMPLES= loader.cnf do-configure: ${SED} -e "s|%%JAVA%%|${LOCALBASE}/bin/java|" \ -e "s|%%JAVAJARDIR%%|${JAVAJARDIR}|" \ - ${FILESDIR}/${PORTNAME}.sh > ${WRKDIR}/${PORTNAME} + ${FILESDIR}/${PORTNAME}.sh > ${WRKSRC}/${PORTNAME} do-install: ${INSTALL} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/www/skytemplate/Makefile b/www/skytemplate/Makefile index 36b1de21384d..d97a410d539e 100644 --- a/www/skytemplate/Makefile +++ b/www/skytemplate/Makefile @@ -11,11 +11,8 @@ DISTNAME= SkyTemplate.v${PORTVERSION:S/.//g} MAINTAINER= munggo@gmail.com COMMENT= Yet another PHP compiling template engine -WRKSRC= ${WRKDIR}/${DISTNAME} - USE_PHP= yes WANT_PHP_WEB= yes -NO_WRKSUBDIR= yes NO_BUILD= yes SUB_FILES= pkg-message diff --git a/x11-fonts/fira/Makefile b/x11-fonts/fira/Makefile index cd3561d6201a..80b38603c8c3 100644 --- a/x11-fonts/fira/Makefile +++ b/x11-fonts/fira/Makefile @@ -54,7 +54,7 @@ do-install-DOCS-on: do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for e in ${EXAMPLES_DISTFILES:R:C|:[^:]+$||} - (cd ${WRKDIR}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) + (cd ${WRKSRC}/${e} && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) .endfor .include <bsd.port.mk> diff --git a/x11-fonts/noto/Makefile b/x11-fonts/noto/Makefile index 28b53e136f7e..2a7d49bfad9a 100644 --- a/x11-fonts/noto/Makefile +++ b/x11-fonts/noto/Makefile @@ -21,7 +21,7 @@ NO_BUILD= yes NO_WRKSUBDIR= yes post-extract: - ${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKDIR} + ${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKSRC} do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile index d28476374000..1d340fb1640c 100644 --- a/x11-fonts/proggy_fonts/Makefile +++ b/x11-fonts/proggy_fonts/Makefile @@ -35,7 +35,7 @@ NO_BUILD= yes do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${CP} ${ALREADY_UNZIP} ${WRKDIR} - ${INSTALL_DATA} ${WRKDIR}/*.pcf* ${STAGEDIR}${FONTSDIR} + ${CP} ${ALREADY_UNZIP} ${WRKSRC} + ${INSTALL_DATA} ${WRKSRC}/*.pcf* ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/symbola/Makefile b/x11-fonts/symbola/Makefile index 9c5ffa851393..7b503fd3a671 100644 --- a/x11-fonts/symbola/Makefile +++ b/x11-fonts/symbola/Makefile @@ -26,9 +26,9 @@ PORTDOCS= * do-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.htm ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.docx ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.htm ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.docx ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.ttf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> diff --git a/x11-fonts/tmu/Makefile b/x11-fonts/tmu/Makefile index 891d1633c8d8..bdca31bcb4b2 100644 --- a/x11-fonts/tmu/Makefile +++ b/x11-fonts/tmu/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= ${FONTSDIR}/tmu.ttf EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= # -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile index 8986af5affa6..54afa2a5b1aa 100644 --- a/x11-fonts/wqy/Makefile +++ b/x11-fonts/wqy/Makefile @@ -46,56 +46,56 @@ PORTDOCS= AUTHORS.bitmap ChangeLog.bitmap README.bitmap COPYING.bitmap \ LICENSE_Apache2.txt LICENSE_GPLv3.txt do-build: - ${PERL} ${WRKDIR}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKDIR}/wqy-unibit/wqy-unibit.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf - bdftopcf ${WRKDIR}/wqy-unibit/wqy-unibit_cjk.bdf > ${WRKDIR}/wqy-unibit/wqy-unibit.pcf - ${CP} ${WRKDIR}/wqy-bitmapsong/AUTHORS ${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap - ${CP} ${WRKDIR}/wqy-bitmapsong/ChangeLog ${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap - ${CP} ${WRKDIR}/wqy-bitmapsong/README ${WRKDIR}/wqy-bitmapsong/README.bitmap - ${CP} ${WRKDIR}/wqy-bitmapsong/COPYING ${WRKDIR}/wqy-bitmapsong/COPYING.bitmap - ${CP} ${WRKDIR}/wqy-zenhei/AUTHORS ${WRKDIR}/wqy-zenhei/AUTHORS.zenhei - ${CP} ${WRKDIR}/wqy-zenhei/ChangeLog ${WRKDIR}/wqy-zenhei/ChangeLog.zenhei - ${CP} ${WRKDIR}/wqy-zenhei/README ${WRKDIR}/wqy-zenhei/README.zenhei - ${CP} ${WRKDIR}/wqy-microhei-lite/AUTHORS.txt ${WRKDIR}/wqy-microhei-lite/AUTHORS.microheilite - ${CP} ${WRKDIR}/wqy-microhei-lite/ChangeLog.txt ${WRKDIR}/wqy-microhei-lite/ChangeLog.microheilite - ${CP} ${WRKDIR}/wqy-microhei-lite/README.txt ${WRKDIR}/wqy-microhei-lite/README.microheilite - ${CP} ${WRKDIR}/wqy-microhei/AUTHORS.txt ${WRKDIR}/wqy-microhei/AUTHORS.microhei - ${CP} ${WRKDIR}/wqy-microhei/ChangeLog.txt ${WRKDIR}/wqy-microhei/ChangeLog.microhei - ${CP} ${WRKDIR}/wqy-microhei/README.txt ${WRKDIR}/wqy-microhei/README.microhei + ${PERL} ${WRKSRC}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKSRC}/wqy-unibit/wqy-unibit.bdf > ${WRKSRC}/wqy-unibit/wqy-unibit_cjk.bdf + bdftopcf ${WRKSRC}/wqy-unibit/wqy-unibit_cjk.bdf > ${WRKSRC}/wqy-unibit/wqy-unibit.pcf + ${CP} ${WRKSRC}/wqy-bitmapsong/AUTHORS ${WRKSRC}/wqy-bitmapsong/AUTHORS.bitmap + ${CP} ${WRKSRC}/wqy-bitmapsong/ChangeLog ${WRKSRC}/wqy-bitmapsong/ChangeLog.bitmap + ${CP} ${WRKSRC}/wqy-bitmapsong/README ${WRKSRC}/wqy-bitmapsong/README.bitmap + ${CP} ${WRKSRC}/wqy-bitmapsong/COPYING ${WRKSRC}/wqy-bitmapsong/COPYING.bitmap + ${CP} ${WRKSRC}/wqy-zenhei/AUTHORS ${WRKSRC}/wqy-zenhei/AUTHORS.zenhei + ${CP} ${WRKSRC}/wqy-zenhei/ChangeLog ${WRKSRC}/wqy-zenhei/ChangeLog.zenhei + ${CP} ${WRKSRC}/wqy-zenhei/README ${WRKSRC}/wqy-zenhei/README.zenhei + ${CP} ${WRKSRC}/wqy-microhei-lite/AUTHORS.txt ${WRKSRC}/wqy-microhei-lite/AUTHORS.microheilite + ${CP} ${WRKSRC}/wqy-microhei-lite/ChangeLog.txt ${WRKSRC}/wqy-microhei-lite/ChangeLog.microheilite + ${CP} ${WRKSRC}/wqy-microhei-lite/README.txt ${WRKSRC}/wqy-microhei-lite/README.microheilite + ${CP} ${WRKSRC}/wqy-microhei/AUTHORS.txt ${WRKSRC}/wqy-microhei/AUTHORS.microhei + ${CP} ${WRKSRC}/wqy-microhei/ChangeLog.txt ${WRKSRC}/wqy-microhei/ChangeLog.microhei + ${CP} ${WRKSRC}/wqy-microhei/README.txt ${WRKSRC}/wqy-microhei/README.microhei do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} ${STAGEDIR}${PREFIX}/${CONFDDIR} ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} # WQY Bitmap Song - ${INSTALL_DATA} ${WRKDIR}/wqy-bitmapsong/*.pcf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-bitmapsong/*.pcf ${STAGEDIR}${FONTSDIR} # WQY Bitmap Song - ${INSTALL_DATA} ${WRKDIR}/wqy-unibit/wqy-unibit.pcf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-unibit/wqy-unibit.pcf ${STAGEDIR}${FONTSDIR} # WQY TrueType Zenhei - ${INSTALL_DATA} ${WRKDIR}/wqy-zenhei/wqy-zenhei.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-zenhei/wqy-zenhei.ttc ${STAGEDIR}${FONTSDIR} # WQY TrueType MicroHei Lite - ${INSTALL_DATA} ${WRKDIR}/wqy-microhei-lite/wqy-microhei-lite.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-microhei-lite/wqy-microhei-lite.ttc ${STAGEDIR}${FONTSDIR} # WQY TrueType MicroHei - ${INSTALL_DATA} ${WRKDIR}/wqy-microhei/wqy-microhei.ttc ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/wqy-microhei/wqy-microhei.ttc ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} ${LN} -sf ${PREFIX}/${CONFAVAILDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFDDIR}/85-wqy.conf ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ - ${WRKDIR}/wqy-bitmapsong/AUTHORS.bitmap \ - ${WRKDIR}/wqy-bitmapsong/ChangeLog.bitmap \ - ${WRKDIR}/wqy-bitmapsong/README.bitmap \ - ${WRKDIR}/wqy-bitmapsong/COPYING.bitmap \ - ${WRKDIR}/wqy-bitmapsong/LOGO.png \ - ${WRKDIR}/wqy-zenhei/AUTHORS.zenhei \ - ${WRKDIR}/wqy-zenhei/ChangeLog.zenhei \ - ${WRKDIR}/wqy-zenhei/README.zenhei \ - ${WRKDIR}/wqy-microhei-lite/AUTHORS.microheilite \ - ${WRKDIR}/wqy-microhei-lite/ChangeLog.microheilite \ - ${WRKDIR}/wqy-microhei-lite/README.microheilite \ - ${WRKDIR}/wqy-microhei/AUTHORS.microhei \ - ${WRKDIR}/wqy-microhei/ChangeLog.microhei \ - ${WRKDIR}/wqy-microhei/README.microhei \ - ${WRKDIR}/wqy-microhei/LICENSE_Apache2.txt \ - ${WRKDIR}/wqy-microhei/LICENSE_GPLv3.txt \ + ${WRKSRC}/wqy-bitmapsong/AUTHORS.bitmap \ + ${WRKSRC}/wqy-bitmapsong/ChangeLog.bitmap \ + ${WRKSRC}/wqy-bitmapsong/README.bitmap \ + ${WRKSRC}/wqy-bitmapsong/COPYING.bitmap \ + ${WRKSRC}/wqy-bitmapsong/LOGO.png \ + ${WRKSRC}/wqy-zenhei/AUTHORS.zenhei \ + ${WRKSRC}/wqy-zenhei/ChangeLog.zenhei \ + ${WRKSRC}/wqy-zenhei/README.zenhei \ + ${WRKSRC}/wqy-microhei-lite/AUTHORS.microheilite \ + ${WRKSRC}/wqy-microhei-lite/ChangeLog.microheilite \ + ${WRKSRC}/wqy-microhei-lite/README.microheilite \ + ${WRKSRC}/wqy-microhei/AUTHORS.microhei \ + ${WRKSRC}/wqy-microhei/ChangeLog.microhei \ + ${WRKSRC}/wqy-microhei/README.microhei \ + ${WRKSRC}/wqy-microhei/LICENSE_Apache2.txt \ + ${WRKSRC}/wqy-microhei/LICENSE_GPLv3.txt \ ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-aqua-fusion/Makefile b/x11-themes/gnome-icons-aqua-fusion/Makefile index fb1974fbd67d..01c7df2d77b9 100644 --- a/x11-themes/gnome-icons-aqua-fusion/Makefile +++ b/x11-themes/gnome-icons-aqua-fusion/Makefile @@ -18,7 +18,7 @@ COMMENT= AquaFusion Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= "${WRKDIR}/AquaFusion" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-crystal/Makefile b/x11-themes/gnome-icons-crystal/Makefile index d816c25dd97a..61aba255e525 100644 --- a/x11-themes/gnome-icons-crystal/Makefile +++ b/x11-themes/gnome-icons-crystal/Makefile @@ -19,10 +19,10 @@ COMMENT= Crystal SVG Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= ${WRKDIR}/CfG-Crystal-SVG-${PORTVERSION} +NO_WRKSUBDIR= yes post-patch: - @${REINPLACE_CMD} 's|\(^Directories=.*\),,|\1,|' ${WRKSRC}/index.theme + @${REINPLACE_CMD} 's|\(^Directories=.*\),,|\1,|' ${WRKSRC}/CfG-Crystal-SVG-${PORTVERSION}/index.theme .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-dropline-neu/Makefile b/x11-themes/gnome-icons-dropline-neu/Makefile index e6af48d21776..463717f44c24 100644 --- a/x11-themes/gnome-icons-dropline-neu/Makefile +++ b/x11-themes/gnome-icons-dropline-neu/Makefile @@ -10,7 +10,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Dropline Neu Icons for Gnome USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Neu" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-dropline-nou/Makefile b/x11-themes/gnome-icons-dropline-nou/Makefile index 014aac1526b1..1981991f07ed 100644 --- a/x11-themes/gnome-icons-dropline-nou/Makefile +++ b/x11-themes/gnome-icons-dropline-nou/Makefile @@ -10,7 +10,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Dropline Nou Icons for Gnome USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Nou" +NO_WRKSUBDIR= yes post-extract: @${RM} ${WRKSRC}/.icon-theme.cache diff --git a/x11-themes/gnome-icons-elementary/Makefile b/x11-themes/gnome-icons-elementary/Makefile index 05c26fb58ed7..dede197a394f 100644 --- a/x11-themes/gnome-icons-elementary/Makefile +++ b/x11-themes/gnome-icons-elementary/Makefile @@ -20,7 +20,7 @@ INSTALLS_ICONS= yes do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/elementary/ \ - "! -name 'plist' ! -name '*.bak' ! -name '${LICENSE}' ! -path 'stage/*' " + "! -name '*.bak' ! -name '${LICENSE}'" ${FIND} ${STAGEDIR}${PREFIX}/share/icons/elementary/ -depth 2 \ -type d -empty | \ ${XARGS} ${RMDIR} diff --git a/x11-themes/gnome-icons-gentoo-test/Makefile b/x11-themes/gnome-icons-gentoo-test/Makefile index 6438628ee00d..39c07991bea9 100644 --- a/x11-themes/gnome-icons-gentoo-test/Makefile +++ b/x11-themes/gnome-icons-gentoo-test/Makefile @@ -18,7 +18,7 @@ COMMENT= Gentoo-Test Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Gentoo-test" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-gion/Makefile b/x11-themes/gnome-icons-gion/Makefile index 98ae7e7680f9..e3ee92461940 100644 --- a/x11-themes/gnome-icons-gion/Makefile +++ b/x11-themes/gnome-icons-gion/Makefile @@ -10,7 +10,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Gion Icons for Gnome USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Gion" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-iris/Makefile b/x11-themes/gnome-icons-iris/Makefile index 8b2834d13431..9881f21593c0 100644 --- a/x11-themes/gnome-icons-iris/Makefile +++ b/x11-themes/gnome-icons-iris/Makefile @@ -18,7 +18,7 @@ COMMENT= Iris SVG Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Iris" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-noia-full/Makefile b/x11-themes/gnome-icons-noia-full/Makefile index 85c1d3822262..722d03a6b4a0 100644 --- a/x11-themes/gnome-icons-noia-full/Makefile +++ b/x11-themes/gnome-icons-noia-full/Makefile @@ -18,7 +18,7 @@ COMMENT= Noia Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Noia" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-noia-warm/Makefile b/x11-themes/gnome-icons-noia-warm/Makefile index ab8d53c93c07..e5fe1f477c1d 100644 --- a/x11-themes/gnome-icons-noia-warm/Makefile +++ b/x11-themes/gnome-icons-noia-warm/Makefile @@ -18,7 +18,7 @@ COMMENT= NoiaWarm Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= "${WRKDIR}/NoiaWarm" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-refined/Makefile b/x11-themes/gnome-icons-refined/Makefile index 100a4809967e..05e023eb8814 100644 --- a/x11-themes/gnome-icons-refined/Makefile +++ b/x11-themes/gnome-icons-refined/Makefile @@ -17,7 +17,7 @@ COMMENT= Refined Icons for Gnome RESTRICTED= ${REASON} -WRKSRC= "${WRKDIR}/gnome-rh8" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-slick/Makefile b/x11-themes/gnome-icons-slick/Makefile index 7a5778630bf7..e9b0ad34d1d6 100644 --- a/x11-themes/gnome-icons-slick/Makefile +++ b/x11-themes/gnome-icons-slick/Makefile @@ -18,7 +18,7 @@ COMMENT= Slick Icons for Gnome RESTRICTED= ${REASON} USES= tar:bzip2 -WRKSRC= "${WRKDIR}/Slick" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-snow-apple/Makefile b/x11-themes/gnome-icons-snow-apple/Makefile index 120a3ed0fadc..5af03a12a6bd 100644 --- a/x11-themes/gnome-icons-snow-apple/Makefile +++ b/x11-themes/gnome-icons-snow-apple/Makefile @@ -17,7 +17,7 @@ COMMENT= Snow-Apple Icons for Gnome RESTRICTED= ${REASON} -WRKSRC= "${WRKDIR}/Snow-Apple" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-stylish/Makefile b/x11-themes/gnome-icons-stylish/Makefile index b820c540d2a6..7ee9bf6a47ca 100644 --- a/x11-themes/gnome-icons-stylish/Makefile +++ b/x11-themes/gnome-icons-stylish/Makefile @@ -17,7 +17,7 @@ COMMENT= Stylish Icons for Gnome RESTRICTED= ${REASON} -WRKSRC= "${WRKDIR}/${PORTNAME}" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons-ximian-south/Makefile b/x11-themes/gnome-icons-ximian-south/Makefile index ea0a4ac7df0c..b0e6694dfb17 100644 --- a/x11-themes/gnome-icons-ximian-south/Makefile +++ b/x11-themes/gnome-icons-ximian-south/Makefile @@ -16,8 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Ximian-South Icons for Gnome RESTRICTED= ${REASON} - -WRKSRC= "${WRKDIR}/${PORTNAME}" +NO_WRKSUBDIR= yes .include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk" .include <bsd.port.mk> diff --git a/x11-themes/gnome-icons/bsd.gnome-icons.mk b/x11-themes/gnome-icons/bsd.gnome-icons.mk index e91c95823a96..2de5212c2c12 100644 --- a/x11-themes/gnome-icons/bsd.gnome-icons.mk +++ b/x11-themes/gnome-icons/bsd.gnome-icons.mk @@ -14,12 +14,4 @@ INSTALLS_ICONS= yes do-install: icon-do-install icon-do-install: - cd ${WRKDIR} && ${FIND} * -type d ! -empty \ - ! -path 'stage*' \ - -exec ${MKDIR} -m 0755 \ - ${STAGEDIR}${PREFIX}/share/icons/"{}" \; - cd ${WRKDIR} && ${FIND} * ! -type d ! -name 'plist' ! -name '*.bak' \ - ! -name '${LICENSE}' \ - ! -path 'stage/*' \ - -exec ${INSTALL_DATA} ${WRKDIR}/"{}" \ - ${STAGEDIR}${PREFIX}/share/icons/"{}" \; + cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/icons/ diff --git a/x11/xkbctrl/Makefile b/x11/xkbctrl/Makefile index 00bb39166cce..c89407c94f5a 100644 --- a/x11/xkbctrl/Makefile +++ b/x11/xkbctrl/Makefile @@ -18,8 +18,8 @@ USE_XORG= x11 xkbfile NO_WRKSUBDIR= yes do-extract: - @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} + @${RM} -rf ${WRKSRC} + @${MKDIR} ${WRKSRC} @for _file in ${DISTFILES}; do \ ${CP} ${DISTDIR}/${DIST_SUBDIR}/$${_file} ${WRKSRC}; \ done diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile index d387317d2310..1c1571a50fca 100644 --- a/x11/xnodecor/Makefile +++ b/x11/xnodecor/Makefile @@ -16,8 +16,8 @@ USE_XORG= x11 PLIST_FILES= bin/xnodecor do-extract: - @${MKDIR} ${WRKDIR} - @${CP} ${FILESDIR}/Makefile ${WRKDIR} - @${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR} + @${MKDIR} ${WRKSRC} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} + @${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC} .include <bsd.port.mk> |