Page MenuHomeFreeBSD
Files F161364731

D2735.id9905.diff
No OneTemporary
Actions

D2735.id9905.diff
View Options

Index: Mk/Uses/lha.mk
===================================================================
--- Mk/Uses/lha.mk
+++ Mk/Uses/lha.mk
@@ -16,7 +16,7 @@
EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha
EXTRACT_CMD?= ${LHA_CMD}
-EXTRACT_BEFORE_ARGS?= xfpw=${WRKDIR}
+EXTRACT_BEFORE_ARGS?= xfpw=${EXTRACT_WRKDIR}
EXTRACT_AFTER_ARGS?=
.endif
Index: Mk/Uses/pathfix.mk
===================================================================
--- Mk/Uses/pathfix.mk
+++ Mk/Uses/pathfix.mk
@@ -17,10 +17,11 @@
.endif
PATHFIX_MAKEFILEIN?= Makefile.in
+PATHFIX_WRKSRC?= ${WRKSRC}
_USES_patch+= 190:pathfix
pathfix:
- @${FIND} ${WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+ @${FIND} ${PATHFIX_WRKSRC} -name "${PATHFIX_MAKEFILEIN}" -type f | ${XARGS} ${REINPLACE_CMD} -e \
's|[(]libdir[)]/locale|(prefix)/share/locale|g ; \
s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \
s|[(]LIBDIR[)]/pkgconfig|(PREFIX)/libdata/pkgconfig|g ; \
Index: Mk/Uses/zip.mk
===================================================================
--- Mk/Uses/zip.mk
+++ Mk/Uses/zip.mk
@@ -13,7 +13,7 @@
EXTRACT_SUFX?= .zip
EXTRACT_BEFORE_ARGS?= -qo
-EXTRACT_AFTER_ARGS?= -d ${WRKDIR}
+EXTRACT_AFTER_ARGS?= -d ${EXTRACT_WRKDIR}
.if empty(zip_ARGS)
EXTRACT_CMD?= ${UNZIP_NATIVE_CMD}
Index: Mk/bsd.linux-rpm.mk
===================================================================
--- Mk/bsd.linux-rpm.mk
+++ Mk/bsd.linux-rpm.mk
@@ -114,6 +114,7 @@
BIN_DISTFILES:= ${DISTFILES}
SRC_DISTFILES?= ${DISTNAME}${SRC_SUFX}:SOURCE
EXTRACT_ONLY?= ${BIN_DISTFILES:C/:[^:]+$//}
+WRKSRC:= ${WRKSRC:S/-${RPMVERSION}$//}
. if defined(PACKAGE_BUILDING)
DISTFILES+= ${SRC_DISTFILES}
@@ -175,7 +176,7 @@
. if !target(linux-rpm-generate-plist)
linux-rpm-generate-plist:
cd ${WRKSRC} && \
- ${FIND} * ! -path "stage/*" ! -type d | ${SORT} > ${PLIST}
+ ${FIND} * ! -type d | ${SORT} > ${PLIST}
. endif
. endif
@@ -189,7 +190,7 @@
. if ${BRANDELF_FILES}
@cd ${WRKSRC} && ${BRANDELF} -t Linux ${BRANDELF_FILES}
. endif
- cd ${WRKSRC} && ${FIND} * ! -path "stage*" -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
- cd ${WRKSRC} && ${FIND} * ! -path "stage/*" ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
+ cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/{}" \;
+ cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${STAGEDIR}${PREFIX}
. endif
.endif
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -521,12 +521,12 @@
# Default: ${WRKDIRPREFIX}${.CURDIR}/work
# WRKSRC - A subdirectory of ${WRKDIR} where the distribution actually
# unpacks to.
-# Default: ${WRKDIR}/${DISTNAME} unless NO_WRKSUBDIR is set,
-# in which case simply ${WRKDIR}
+# Default: ${WRKDIR}/${DISTNAME}
# WRKSRC_SUBDIR - A subdirectory of ${WRKSRC} where the distribution actually
# builds in.
# Default: not set
-# NO_WRKSUBDIR - Assume port unpacks directly into ${WRKDIR}.
+# NO_WRKSUBDIR - Assume port unpacks without a subdirectory, and extract it in
+# ${WRKSRC} instead of ${WRKDIR}.
# PATCHDIR - A directory containing any additional patches you made
# to port this software to FreeBSD.
# Default: ${MASTERDIR}/files
@@ -1577,10 +1577,18 @@
.if !defined(IGNORE_MASTER_SITE_GITHUB) && defined(USE_GITHUB)
WRKSRC?= ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME_EXTRACT}
.endif
+# If the distname is not extracting into a specific subdirectory, have the
+# ports framework force extract into a subdirectory so that metadata files
+# do not get in the way of the build, and vice-versa.
.if defined(NO_WRKSUBDIR)
-WRKSRC?= ${WRKDIR}
+# Some ports have DISTNAME=PORTNAME, and USE_RC_SUBR=PORTNAME, in those case,
+# the rc file will conflict with WRKSRC, as WRKSRC is artificial, make it the
+# most unlikely to conflict as we can.
+WRKSRC?= ${WRKDIR}/${PKGNAME}
+EXTRACT_WRKDIR:= ${WRKSRC}
.else
WRKSRC?= ${WRKDIR}/${DISTNAME}
+EXTRACT_WRKDIR:= ${WRKDIR}
.endif
.if defined(WRKSRC_SUBDIR)
WRKSRC:= ${WRKSRC}/${WRKSRC_SUBDIR}
@@ -3022,7 +3030,7 @@
@${ECHO_MSG} "===> Found saved configuration for ${_OPTIONS_READ}"
.endif
-${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${WRKSRC}:
+${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${EXTRACT_WRKDIR} ${WRKSRC}:
@${MKDIR} ${.TARGET}
# Warn user about deprecated packages. Advisory only.
@@ -3245,7 +3253,7 @@
.if !target(do-extract)
do-extract:
@for file in ${EXTRACT_ONLY}; do \
- if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
+ if ! (cd ${EXTRACT_WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\
then \
exit 1; \
fi; \
@@ -5685,7 +5693,7 @@
${_OPTIONS_fetch} ${_USES_fetch}
_EXTRACT_DEP= fetch
_EXTRACT_SEQ= 010:check-build-conflicts 050:extract-message 100:checksum \
- 150:extract-depends 190:clean-wrkdir 200:${WRKDIR} \
+ 150:extract-depends 190:clean-wrkdir 200:${EXTRACT_WRKDIR} \
300:pre-extract 450:pre-extract-script 500:do-extract \
700:post-extract 850:post-extract-script \
${_OPTIONS_extract} ${_USES_extract}
Index: archivers/paq/Makefile
===================================================================
--- archivers/paq/Makefile
+++ archivers/paq/Makefile
@@ -17,7 +17,7 @@
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
Index: archivers/szip/Makefile
===================================================================
--- archivers/szip/Makefile
+++ archivers/szip/Makefile
@@ -28,8 +28,8 @@
${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>
Index: archivers/undms/Makefile
===================================================================
--- archivers/undms/Makefile
+++ archivers/undms/Makefile
@@ -16,8 +16,8 @@
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
Index: astro/geographiclib/Makefile
===================================================================
--- astro/geographiclib/Makefile
+++ astro/geographiclib/Makefile
@@ -19,8 +19,6 @@
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
Index: audio/chordpack/Makefile
===================================================================
--- audio/chordpack/Makefile
+++ audio/chordpack/Makefile
@@ -19,12 +19,12 @@
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>
Index: audio/cue2toc/Makefile
===================================================================
--- audio/cue2toc/Makefile
+++ audio/cue2toc/Makefile
@@ -19,9 +19,9 @@
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>
Index: benchmarks/raidtest/Makefile
===================================================================
--- benchmarks/raidtest/Makefile
+++ benchmarks/raidtest/Makefile
@@ -17,7 +17,7 @@
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>
Index: benchmarks/stream/Makefile
===================================================================
--- benchmarks/stream/Makefile
+++ benchmarks/stream/Makefile
@@ -17,7 +17,7 @@
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= #
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
PORTDOCS= stream.c
PLIST_FILES= bin/stream_bench
Index: biology/gff2ps/Makefile
===================================================================
--- biology/gff2ps/Makefile
+++ biology/gff2ps/Makefile
@@ -32,11 +32,11 @@
.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 @@
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>
Index: chinese/CJKUnifonts/Makefile
===================================================================
--- chinese/CJKUnifonts/Makefile
+++ chinese/CJKUnifonts/Makefile
@@ -23,8 +23,8 @@
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>
Index: chinese/xpdf/Makefile
===================================================================
--- chinese/xpdf/Makefile
+++ chinese/xpdf/Makefile
@@ -47,7 +47,7 @@
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 && \
Index: comms/cdr_read/Makefile
===================================================================
--- comms/cdr_read/Makefile
+++ comms/cdr_read/Makefile
@@ -18,8 +18,8 @@
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>
Index: converters/unix2dos/Makefile
===================================================================
--- converters/unix2dos/Makefile
+++ converters/unix2dos/Makefile
@@ -14,9 +14,9 @@
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>
Index: devel/apr1/Makefile
===================================================================
--- devel/apr1/Makefile
+++ devel/apr1/Makefile
@@ -50,9 +50,11 @@
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/}
Index: devel/cvs2html/Makefile
===================================================================
--- devel/cvs2html/Makefile
+++ devel/cvs2html/Makefile
@@ -34,6 +34,6 @@
@${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>
Index: devel/cweb/Makefile
===================================================================
--- devel/cweb/Makefile
+++ devel/cweb/Makefile
@@ -34,6 +34,6 @@
${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>
Index: devel/easygit/Makefile
===================================================================
--- devel/easygit/Makefile
+++ devel/easygit/Makefile
@@ -17,18 +17,18 @@
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>
Index: devel/libcii/Makefile
===================================================================
--- devel/libcii/Makefile
+++ devel/libcii/Makefile
@@ -18,7 +18,7 @@
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 @@
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
Index: devel/libdlmalloc/Makefile
===================================================================
--- devel/libdlmalloc/Makefile
+++ devel/libdlmalloc/Makefile
@@ -14,10 +14,10 @@
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>
Index: devel/mingw32-bin-msvcrt/Makefile
===================================================================
--- devel/mingw32-bin-msvcrt/Makefile
+++ devel/mingw32-bin-msvcrt/Makefile
@@ -26,6 +26,6 @@
NO_WRKSUBDIR= yes
post-extract:
- @${CP} ${FILESDIR}/Makefile ${WRKDIR}
+ @${CP} ${FILESDIR}/Makefile ${WRKSRC}
.include <bsd.port.mk>
Index: devel/py-json-py/Makefile
===================================================================
--- devel/py-json-py/Makefile
+++ devel/py-json-py/Makefile
@@ -19,7 +19,7 @@
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-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>
Index: devel/py-urlimport/Makefile
===================================================================
--- devel/py-urlimport/Makefile
+++ devel/py-urlimport/Makefile
@@ -18,8 +18,8 @@
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
Index: devel/ruby-dialogs/Makefile
===================================================================
--- devel/ruby-dialogs/Makefile
+++ devel/ruby-dialogs/Makefile
@@ -21,9 +21,9 @@
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>
Index: devel/sedsed/Makefile
===================================================================
--- devel/sedsed/Makefile
+++ devel/sedsed/Makefile
@@ -13,7 +13,7 @@
PLIST_FILES= bin/sedsed
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: devel/sfio/Makefile
===================================================================
--- devel/sfio/Makefile
+++ devel/sfio/Makefile
@@ -18,17 +18,17 @@
# 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>
Index: dns/dnswalk/Makefile
===================================================================
--- dns/dnswalk/Makefile
+++ dns/dnswalk/Makefile
@@ -22,15 +22,15 @@
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>
Index: dns/ipcheck/Makefile
===================================================================
--- dns/ipcheck/Makefile
+++ dns/ipcheck/Makefile
@@ -25,9 +25,9 @@
@${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>
Index: editors/omegaT/Makefile
===================================================================
--- editors/omegaT/Makefile
+++ editors/omegaT/Makefile
@@ -39,11 +39,11 @@
"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}
Index: emulators/linux_base-c6/Makefile
===================================================================
--- emulators/linux_base-c6/Makefile
+++ emulators/linux_base-c6/Makefile
@@ -180,17 +180,17 @@
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 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
Index: emulators/qmc2/Makefile
===================================================================
--- emulators/qmc2/Makefile
+++ emulators/qmc2/Makefile
@@ -42,7 +42,7 @@
@${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 \
Index: emulators/simh/Makefile
===================================================================
--- emulators/simh/Makefile
+++ emulators/simh/Makefile
@@ -39,14 +39,14 @@
'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>
Index: emulators/yape/Makefile
===================================================================
--- emulators/yape/Makefile
+++ emulators/yape/Makefile
@@ -24,7 +24,7 @@
.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
Index: games/alephone-data/Makefile
===================================================================
--- games/alephone-data/Makefile
+++ games/alephone-data/Makefile
@@ -70,13 +70,13 @@
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
Index: games/alephone-scenarios/Makefile
===================================================================
--- games/alephone-scenarios/Makefile
+++ games/alephone-scenarios/Makefile
@@ -140,7 +140,7 @@
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
Index: games/bogged/Makefile
===================================================================
--- games/bogged/Makefile
+++ games/bogged/Makefile
@@ -15,7 +15,7 @@
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
-EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME}
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: games/crafty-open-enormous/Makefile
===================================================================
--- games/crafty-open-enormous/Makefile
+++ games/crafty-open-enormous/Makefile
@@ -25,10 +25,10 @@
@${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>
Index: games/crafty-open-large/Makefile
===================================================================
--- games/crafty-open-large/Makefile
+++ games/crafty-open-large/Makefile
@@ -20,17 +20,17 @@
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>
Index: games/crafty-open-medium/Makefile
===================================================================
--- games/crafty-open-medium/Makefile
+++ games/crafty-open-medium/Makefile
@@ -23,11 +23,11 @@
@${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>
Index: games/doom-data/Makefile
===================================================================
--- games/doom-data/Makefile
+++ games/doom-data/Makefile
@@ -39,9 +39,9 @@
.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:
Index: games/doom-hacx/Makefile
===================================================================
--- games/doom-hacx/Makefile
+++ games/doom-hacx/Makefile
@@ -26,9 +26,8 @@
.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}
Index: games/doom-wolfendoom/Makefile
===================================================================
--- games/doom-wolfendoom/Makefile
+++ games/doom-wolfendoom/Makefile
@@ -22,9 +22,9 @@
.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>
Index: games/quake-dpmod/Makefile
===================================================================
--- games/quake-dpmod/Makefile
+++ games/quake-dpmod/Makefile
@@ -22,9 +22,9 @@
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}
Index: games/quake2-data/Makefile
===================================================================
--- games/quake2-data/Makefile
+++ games/quake2-data/Makefile
@@ -55,18 +55,18 @@
.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
Index: games/quake2-rogue/Makefile
===================================================================
--- games/quake2-rogue/Makefile
+++ games/quake2-rogue/Makefile
@@ -19,8 +19,7 @@
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:
Index: games/quake2-xatrix/Makefile
===================================================================
--- games/quake2-xatrix/Makefile
+++ games/quake2-xatrix/Makefile
@@ -19,8 +19,8 @@
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:
Index: games/quake3-data/Makefile
===================================================================
--- games/quake3-data/Makefile
+++ games/quake3-data/Makefile
@@ -30,10 +30,10 @@
.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}
Index: games/rfksay/Makefile
===================================================================
--- games/rfksay/Makefile
+++ games/rfksay/Makefile
@@ -17,8 +17,8 @@
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>
Index: games/robocode/Makefile
===================================================================
--- games/robocode/Makefile
+++ games/robocode/Makefile
@@ -31,7 +31,7 @@
${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 \
Index: games/thudboard/Makefile
===================================================================
--- games/thudboard/Makefile
+++ games/thudboard/Makefile
@@ -21,7 +21,7 @@
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 @@
@${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>
Index: games/traindirector/Makefile
===================================================================
--- games/traindirector/Makefile
+++ games/traindirector/Makefile
@@ -29,6 +29,6 @@
MAKEFILE= Makefile.fc9
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/traindir3 ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/traindir3 ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: games/xasteroids/Makefile
===================================================================
--- games/xasteroids/Makefile
+++ games/xasteroids/Makefile
@@ -12,7 +12,7 @@
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
Index: graphics/fujiplay/Makefile
===================================================================
--- graphics/fujiplay/Makefile
+++ graphics/fujiplay/Makefile
@@ -23,10 +23,10 @@
@${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>
Index: graphics/geoapi/Makefile
===================================================================
--- graphics/geoapi/Makefile
+++ graphics/geoapi/Makefile
@@ -23,12 +23,12 @@
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}/\{} \;
Index: graphics/gimp-jagged-border-script/Makefile
===================================================================
--- graphics/gimp-jagged-border-script/Makefile
+++ graphics/gimp-jagged-border-script/Makefile
@@ -33,6 +33,6 @@
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>
Index: graphics/mapyrus/Makefile
===================================================================
--- graphics/mapyrus/Makefile
+++ graphics/mapyrus/Makefile
@@ -32,12 +32,12 @@
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"
Index: graphics/openjump/Makefile
===================================================================
--- graphics/openjump/Makefile
+++ graphics/openjump/Makefile
@@ -44,7 +44,6 @@
JAVA_VERSION= 1.6+
USES= zip
NO_BUILD= yes
-NO_WRKSUBDIR= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
PLUS_REV= 4164
Index: graphics/pstoepsi/Makefile
===================================================================
--- graphics/pstoepsi/Makefile
+++ graphics/pstoepsi/Makefile
@@ -19,17 +19,17 @@
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>
Index: graphics/springgraph/Makefile
===================================================================
--- graphics/springgraph/Makefile
+++ graphics/springgraph/Makefile
@@ -19,7 +19,7 @@
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
Index: irc/irssi-dcc_send_limiter/Makefile
===================================================================
--- irc/irssi-dcc_send_limiter/Makefile
+++ irc/irssi-dcc_send_limiter/Makefile
@@ -29,12 +29,12 @@
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
Index: japanese/VTPSfont/Makefile
===================================================================
--- japanese/VTPSfont/Makefile
+++ japanese/VTPSfont/Makefile
@@ -18,8 +18,8 @@
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
Index: japanese/a2ps/Makefile
===================================================================
--- japanese/a2ps/Makefile
+++ japanese/a2ps/Makefile
@@ -19,7 +19,7 @@
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_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>
Index: japanese/bugzilla44/Makefile
===================================================================
--- japanese/bugzilla44/Makefile
+++ japanese/bugzilla44/Makefile
@@ -22,11 +22,11 @@
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 ; \
Index: japanese/edict-utf-8/Makefile
===================================================================
--- japanese/edict-utf-8/Makefile
+++ japanese/edict-utf-8/Makefile
@@ -34,8 +34,8 @@
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 \
Index: japanese/edict/Makefile
===================================================================
--- japanese/edict/Makefile
+++ japanese/edict/Makefile
@@ -56,7 +56,7 @@
-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 @@
.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
Index: japanese/font-ayu18/Makefile
===================================================================
--- japanese/font-ayu18/Makefile
+++ japanese/font-ayu18/Makefile
@@ -20,6 +20,7 @@
NO_ARCH= yes
NO_WRKSUBDIR= yes
SUB_FILES= Makefile
+MAKEFILE= ${WRKDIR}/Makefile
PORTDOCS= README.txt
OPTIONS_DEFINE= DOCS
Index: japanese/font-ayu20/Makefile
===================================================================
--- japanese/font-ayu20/Makefile
+++ japanese/font-ayu20/Makefile
@@ -24,6 +24,7 @@
PKGINSTALL= ${WRKDIR}/pkg-install
PKGDEINSTALL= ${WRKDIR}/pkg-install
PORTDOCS= README.txt
+MAKEFILE= ${WRKDIR}/Makefile
OPTIONS_DEFINE= DOCS
Index: japanese/font-elisa10/Makefile
===================================================================
--- japanese/font-elisa10/Makefile
+++ japanese/font-elisa10/Makefile
@@ -18,6 +18,7 @@
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 @@
@${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}
Index: japanese/font-elisa8/Makefile
===================================================================
--- japanese/font-elisa8/Makefile
+++ japanese/font-elisa8/Makefile
@@ -19,6 +19,7 @@
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"
Index: japanese/font-jisx0213/Makefile
===================================================================
--- japanese/font-jisx0213/Makefile
+++ japanese/font-jisx0213/Makefile
@@ -26,7 +26,7 @@
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
Index: japanese/font-kaname12/Makefile
===================================================================
--- japanese/font-kaname12/Makefile
+++ japanese/font-kaname12/Makefile
@@ -39,6 +39,6 @@
${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>
Index: japanese/font-kanji18/Makefile
===================================================================
--- japanese/font-kanji18/Makefile
+++ japanese/font-kanji18/Makefile
@@ -24,9 +24,10 @@
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 @@
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}
Index: japanese/font-mona-ttf/Makefile
===================================================================
--- japanese/font-mona-ttf/Makefile
+++ japanese/font-mona-ttf/Makefile
@@ -28,7 +28,7 @@
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:
Index: japanese/gskk/Makefile
===================================================================
--- japanese/gskk/Makefile
+++ japanese/gskk/Makefile
@@ -38,7 +38,7 @@
OPTIONS_DEFINE= DOCS
do-build:
- cd ${WRKDIR} && mkbindic ${PORTNAME}.t
+ cd ${WRKSRC} && mkbindic ${PORTNAME}.t
do-install:
@${MKDIR} ${STAGEDIR}${DICDIR}
Index: japanese/jcode.pl/Makefile
===================================================================
--- japanese/jcode.pl/Makefile
+++ japanese/jcode.pl/Makefile
@@ -20,11 +20,11 @@
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>
Index: japanese/skk-jisyo/Makefile
===================================================================
--- japanese/skk-jisyo/Makefile
+++ japanese/skk-jisyo/Makefile
@@ -25,7 +25,7 @@
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 @@
.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 @@
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 @@
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
Index: japanese/yc.el/Makefile
===================================================================
--- japanese/yc.el/Makefile
+++ japanese/yc.el/Makefile
@@ -29,12 +29,12 @@
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>
Index: japanese/zipcodes/Makefile
===================================================================
--- japanese/zipcodes/Makefile
+++ japanese/zipcodes/Makefile
@@ -20,8 +20,8 @@
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:
Index: java/eclipse-ecj/Makefile
===================================================================
--- java/eclipse-ecj/Makefile
+++ java/eclipse-ecj/Makefile
@@ -16,7 +16,7 @@
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 @@
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>
Index: java/eclipse-pydev/Makefile
===================================================================
--- java/eclipse-pydev/Makefile
+++ java/eclipse-pydev/Makefile
@@ -37,10 +37,10 @@
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
Index: java/javavmwrapper/Makefile
===================================================================
--- java/javavmwrapper/Makefile
+++ java/javavmwrapper/Makefile
@@ -25,7 +25,7 @@
.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 @@
${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
Index: java/jtiger/Makefile
===================================================================
--- java/jtiger/Makefile
+++ java/jtiger/Makefile
@@ -18,14 +18,14 @@
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>
Index: korean/kaistfonts/Makefile
===================================================================
--- korean/kaistfonts/Makefile
+++ korean/kaistfonts/Makefile
@@ -23,9 +23,9 @@
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
Index: korean/ko.TeX-fonts-base/Makefile
===================================================================
--- korean/ko.TeX-fonts-base/Makefile
+++ korean/ko.TeX-fonts-base/Makefile
@@ -33,7 +33,7 @@
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>
Index: korean/ko.TeX-fonts-extra/Makefile
===================================================================
--- korean/ko.TeX-fonts-extra/Makefile
+++ korean/ko.TeX-fonts-extra/Makefile
@@ -31,8 +31,8 @@
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>
Index: korean/ko.TeX/Makefile
===================================================================
--- korean/ko.TeX/Makefile
+++ korean/ko.TeX/Makefile
@@ -39,41 +39,41 @@
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>
Index: lang/cmucl-extra/Makefile
===================================================================
--- lang/cmucl-extra/Makefile
+++ lang/cmucl-extra/Makefile
@@ -23,7 +23,7 @@
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
Index: lang/cmucl/Makefile
===================================================================
--- lang/cmucl/Makefile
+++ lang/cmucl/Makefile
@@ -29,11 +29,11 @@
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>
Index: lang/smlnj/Makefile
===================================================================
--- lang/smlnj/Makefile
+++ lang/smlnj/Makefile
@@ -139,7 +139,7 @@
# 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 @@
.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 @@
${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 @@
.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 @@
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 @@
# 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 @@
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 @@
${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 @@
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 @@
./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 @@
${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 @@
"${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
Index: lang/tcl-manual/Makefile
===================================================================
--- lang/tcl-manual/Makefile
+++ lang/tcl-manual/Makefile
@@ -30,16 +30,16 @@
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>
Index: mail/gml/Makefile
===================================================================
--- mail/gml/Makefile
+++ mail/gml/Makefile
@@ -23,10 +23,10 @@
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}
Index: mail/imaptools/Makefile
===================================================================
--- mail/imaptools/Makefile
+++ mail/imaptools/Makefile
@@ -21,6 +21,6 @@
USE_PERL5= run
do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/*.pl ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: mail/mb2md/Makefile
===================================================================
--- mail/mb2md/Makefile
+++ mail/mb2md/Makefile
@@ -16,7 +16,7 @@
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
-EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME}
NO_WRKSUBDIR= yes
NO_BUILD= yes
Index: mail/msgconvert/Makefile
===================================================================
--- mail/msgconvert/Makefile
+++ mail/msgconvert/Makefile
@@ -29,7 +29,7 @@
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}
Index: mail/py-cyruslib/Makefile
===================================================================
--- mail/py-cyruslib/Makefile
+++ mail/py-cyruslib/Makefile
@@ -21,11 +21,10 @@
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>
Index: mail/rlytest/Makefile
===================================================================
--- mail/rlytest/Makefile
+++ mail/rlytest/Makefile
@@ -12,7 +12,7 @@
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
-EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME}
NO_WRKSUBDIR= yes
Index: mail/x-face-e21/Makefile
===================================================================
--- mail/x-face-e21/Makefile
+++ mail/x-face-e21/Makefile
@@ -28,7 +28,7 @@
${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:
Index: mail/xcite/Makefile
===================================================================
--- mail/xcite/Makefile
+++ mail/xcite/Makefile
@@ -25,7 +25,7 @@
${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:
Index: math/jts/Makefile
===================================================================
--- math/jts/Makefile
+++ math/jts/Makefile
@@ -10,8 +10,8 @@
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-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)
Index: math/lll_spect/Makefile
===================================================================
--- math/lll_spect/Makefile
+++ math/lll_spect/Makefile
@@ -27,18 +27,18 @@
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}
Index: math/physcalc/Makefile
===================================================================
--- math/physcalc/Makefile
+++ math/physcalc/Makefile
@@ -12,7 +12,7 @@
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
Index: math/solitaire/Makefile
===================================================================
--- math/solitaire/Makefile
+++ math/solitaire/Makefile
@@ -21,8 +21,7 @@
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
Index: misc/amfm/Makefile
===================================================================
--- misc/amfm/Makefile
+++ misc/amfm/Makefile
@@ -18,7 +18,7 @@
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= -p
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
do-install:
@${INSTALL} ${WRKSRC}/amfm ${STAGEDIR}${PREFIX}/bin/amfm
Index: misc/astrolog/Makefile
===================================================================
--- misc/astrolog/Makefile
+++ misc/astrolog/Makefile
@@ -46,11 +46,11 @@
.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
Index: misc/colwide/Makefile
===================================================================
--- misc/colwide/Makefile
+++ misc/colwide/Makefile
@@ -22,9 +22,9 @@
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>
Index: misc/figlet-fonts/Makefile
===================================================================
--- misc/figlet-fonts/Makefile
+++ misc/figlet-fonts/Makefile
@@ -20,27 +20,27 @@
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>
Index: misc/kenny/Makefile
===================================================================
--- misc/kenny/Makefile
+++ misc/kenny/Makefile
@@ -21,7 +21,7 @@
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 @@
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>
Index: misc/metalink-editor/Makefile
===================================================================
--- misc/metalink-editor/Makefile
+++ misc/metalink-editor/Makefile
@@ -13,7 +13,7 @@
COMMENT= GUI editor to create and edit metalinks
LICENSE= GPLv2
-LICENSE_FILE= ${WRKDIR}/license.txt
+LICENSE_FILE= ${WRKSRC}/license.txt
OPTIONS_DEFINE= DOCS
Index: misc/umodunpack/Makefile
===================================================================
--- misc/umodunpack/Makefile
+++ misc/umodunpack/Makefile
@@ -21,9 +21,9 @@
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>
Index: net-mgmt/icmpquery/Makefile
===================================================================
--- net-mgmt/icmpquery/Makefile
+++ net-mgmt/icmpquery/Makefile
@@ -16,11 +16,11 @@
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>
Index: net-mgmt/nagios-check_dhcp.pl/Makefile
===================================================================
--- net-mgmt/nagios-check_dhcp.pl/Makefile
+++ net-mgmt/nagios-check_dhcp.pl/Makefile
@@ -27,8 +27,8 @@
@${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
Index: net-mgmt/nagios-check_tftp/Makefile
===================================================================
--- net-mgmt/nagios-check_tftp/Makefile
+++ net-mgmt/nagios-check_tftp/Makefile
@@ -25,12 +25,12 @@
${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>
Index: net-p2p/frost/Makefile
===================================================================
--- net-p2p/frost/Makefile
+++ net-p2p/frost/Makefile
@@ -79,7 +79,7 @@
# 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}
Index: net-p2p/vuze/Makefile
===================================================================
--- net-p2p/vuze/Makefile
+++ net-p2p/vuze/Makefile
@@ -65,7 +65,7 @@
${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
Index: net/dictd-database/Makefile
===================================================================
--- net/dictd-database/Makefile
+++ net/dictd-database/Makefile
@@ -28,10 +28,10 @@
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>
Index: net/linux-f10-nss_ldap/Makefile
===================================================================
--- net/linux-f10-nss_ldap/Makefile
+++ net/linux-f10-nss_ldap/Makefile
@@ -57,24 +57,24 @@
.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
Index: net/lla/Makefile
===================================================================
--- net/lla/Makefile
+++ net/lla/Makefile
@@ -28,6 +28,6 @@
EXTRACT_AFTER_ARGS= ./${PORTNAME}
do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Index: net/netpipes/Makefile
===================================================================
--- net/netpipes/Makefile
+++ net/netpipes/Makefile
@@ -15,6 +15,6 @@
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>
Index: net/radreport/Makefile
===================================================================
--- net/radreport/Makefile
+++ net/radreport/Makefile
@@ -19,10 +19,10 @@
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>
Index: net/tcpshow/Makefile
===================================================================
--- net/tcpshow/Makefile
+++ net/tcpshow/Makefile
@@ -14,9 +14,9 @@
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)
Index: news/nnap/Makefile
===================================================================
--- news/nnap/Makefile
+++ news/nnap/Makefile
@@ -15,8 +15,8 @@
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)
Index: palm/pilot_makedoc/Makefile
===================================================================
--- palm/pilot_makedoc/Makefile
+++ palm/pilot_makedoc/Makefile
@@ -18,11 +18,11 @@
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>
Index: print/adobe-cmaps/Makefile
===================================================================
--- print/adobe-cmaps/Makefile
+++ print/adobe-cmaps/Makefile
@@ -21,11 +21,11 @@
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 - )
Index: print/enscriptfonts/Makefile
===================================================================
--- print/enscriptfonts/Makefile
+++ print/enscriptfonts/Makefile
@@ -22,9 +22,9 @@
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>
Index: print/ghostscript7-commfont/Makefile
===================================================================
--- print/ghostscript7-commfont/Makefile
+++ print/ghostscript7-commfont/Makefile
@@ -34,5 +34,6 @@
GS_RESDIR?= share/ghostscript/Resource
post-extract: apply-slist
+ @cd ${WRKDIR} && ${MV} Makefile template.* ${WRKSRC}
.include <bsd.port.mk>
Index: print/texlive-texmf/Makefile
===================================================================
--- print/texlive-texmf/Makefile
+++ print/texlive-texmf/Makefile
@@ -255,7 +255,7 @@
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 @@
${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
Index: print/txtbdf2ps/Makefile
===================================================================
--- print/txtbdf2ps/Makefile
+++ print/txtbdf2ps/Makefile
@@ -16,7 +16,7 @@
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
Index: russian/p5-XML-Parser-encodings/Makefile
===================================================================
--- russian/p5-XML-Parser-encodings/Makefile
+++ russian/p5-XML-Parser-encodings/Makefile
@@ -32,18 +32,18 @@
.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:
Index: science/checkmol/Makefile
===================================================================
--- science/checkmol/Makefile
+++ science/checkmol/Makefile
@@ -17,7 +17,7 @@
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= #
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
USE_FPC= yes
Index: science/medit/Makefile
===================================================================
--- science/medit/Makefile
+++ science/medit/Makefile
@@ -45,7 +45,7 @@
. 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
Index: science/mol2ps/Makefile
===================================================================
--- science/mol2ps/Makefile
+++ science/mol2ps/Makefile
@@ -19,7 +19,7 @@
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= #
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
USE_FPC= yes
Index: security/chaosreader/Makefile
===================================================================
--- security/chaosreader/Makefile
+++ security/chaosreader/Makefile
@@ -22,11 +22,11 @@
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>
Index: security/ipfilter2dshield/Makefile
===================================================================
--- security/ipfilter2dshield/Makefile
+++ security/ipfilter2dshield/Makefile
@@ -25,8 +25,8 @@
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 @@
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>
Index: security/l0phtcrack/Makefile
===================================================================
--- security/l0phtcrack/Makefile
+++ security/l0phtcrack/Makefile
@@ -24,11 +24,11 @@
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
Index: security/pxytest/Makefile
===================================================================
--- security/pxytest/Makefile
+++ security/pxytest/Makefile
@@ -12,7 +12,7 @@
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
-EXTRACT_AFTER_ARGS= > ${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS= > ${WRKSRC}/${PORTNAME}
NO_WRKSUBDIR= yes
Index: security/py-htpasswd/Makefile
===================================================================
--- security/py-htpasswd/Makefile
+++ security/py-htpasswd/Makefile
@@ -21,6 +21,6 @@
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>
Index: security/sig2dot/Makefile
===================================================================
--- security/sig2dot/Makefile
+++ security/sig2dot/Makefile
@@ -16,7 +16,7 @@
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
Index: security/sshblock/Makefile
===================================================================
--- security/sshblock/Makefile
+++ security/sshblock/Makefile
@@ -21,7 +21,7 @@
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
Index: security/unhide/Makefile
===================================================================
--- security/unhide/Makefile
+++ security/unhide/Makefile
@@ -20,9 +20,9 @@
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>
Index: shells/v7sh/Makefile
===================================================================
--- shells/v7sh/Makefile
+++ shells/v7sh/Makefile
@@ -23,7 +23,7 @@
USES= uidfix
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
NO_WRKSUBDIR= yes
Index: sysutils/3dm/Makefile
===================================================================
--- sysutils/3dm/Makefile
+++ sysutils/3dm/Makefile
@@ -40,7 +40,7 @@
${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)
Index: sysutils/copytape/Makefile
===================================================================
--- sysutils/copytape/Makefile
+++ sysutils/copytape/Makefile
@@ -17,7 +17,7 @@
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
Index: sysutils/pdixtract/Makefile
===================================================================
--- sysutils/pdixtract/Makefile
+++ sysutils/pdixtract/Makefile
@@ -19,9 +19,9 @@
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>
Index: sysutils/pstree/Makefile
===================================================================
--- sysutils/pstree/Makefile
+++ sysutils/pstree/Makefile
@@ -18,10 +18,10 @@
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>
Index: sysutils/sb16config/Makefile
===================================================================
--- sysutils/sb16config/Makefile
+++ sysutils/sb16config/Makefile
@@ -19,7 +19,7 @@
post-extract:
.for _i in ${DISTFILES}
- @${GZCAT} ${DISTDIR}/${_i} >${WRKDIR}/${_i:R}
+ @${GZCAT} ${DISTDIR}/${_i} >${WRKSRC}/${_i:R}
.endfor
.include <bsd.port.mk>
Index: sysutils/setcdboot/Makefile
===================================================================
--- sysutils/setcdboot/Makefile
+++ sysutils/setcdboot/Makefile
@@ -15,8 +15,8 @@
.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)
Index: sysutils/storcli/Makefile
===================================================================
--- sysutils/storcli/Makefile
+++ sysutils/storcli/Makefile
@@ -25,15 +25,15 @@
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/}\
Index: sysutils/vils/Makefile
===================================================================
--- sysutils/vils/Makefile
+++ sysutils/vils/Makefile
@@ -20,7 +20,7 @@
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= -f
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
USES= shebangfix
SHEBANG_FILES= vils
Index: textproc/clit/Makefile
===================================================================
--- textproc/clit/Makefile
+++ textproc/clit/Makefile
@@ -14,7 +14,7 @@
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 @@
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>
Index: textproc/diffsplit/Makefile
===================================================================
--- textproc/diffsplit/Makefile
+++ textproc/diffsplit/Makefile
@@ -19,10 +19,10 @@
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>
Index: textproc/foiltex/Makefile
===================================================================
--- textproc/foiltex/Makefile
+++ textproc/foiltex/Makefile
@@ -29,12 +29,12 @@
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
Index: textproc/jarnal/Makefile
===================================================================
--- textproc/jarnal/Makefile
+++ textproc/jarnal/Makefile
@@ -25,16 +25,16 @@
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>
Index: textproc/ppower4/Makefile
===================================================================
--- textproc/ppower4/Makefile
+++ textproc/ppower4/Makefile
@@ -22,11 +22,11 @@
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}/,,}"
Index: textproc/saxon-devel/Makefile
===================================================================
--- textproc/saxon-devel/Makefile
+++ textproc/saxon-devel/Makefile
@@ -75,14 +75,14 @@
@${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>
Index: vietnamese/vnroff/Makefile
===================================================================
--- vietnamese/vnroff/Makefile
+++ vietnamese/vnroff/Makefile
@@ -15,12 +15,12 @@
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' \
Index: www/bareos-webui/Makefile
===================================================================
--- www/bareos-webui/Makefile
+++ www/bareos-webui/Makefile
@@ -21,7 +21,6 @@
USE_PHP= openssl
NO_BUILD= yes
NO_ARCH= yes
-NO_WRKSUBDIR= yes
BAREOSWEB_HOME?=${WWWDIR}
BAREOSWEBUIDIR= ${BAREOSWEB_HOME:S|${PREFIX}/||}
Index: www/cgi-lib.pl/Makefile
===================================================================
--- www/cgi-lib.pl/Makefile
+++ www/cgi-lib.pl/Makefile
@@ -25,6 +25,6 @@
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>
Index: www/closure-compiler/Makefile
===================================================================
--- www/closure-compiler/Makefile
+++ www/closure-compiler/Makefile
@@ -24,6 +24,6 @@
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>
Index: www/demoroniser/Makefile
===================================================================
--- www/demoroniser/Makefile
+++ www/demoroniser/Makefile
@@ -22,8 +22,8 @@
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>
Index: www/efront/Makefile
===================================================================
--- www/efront/Makefile
+++ www/efront/Makefile
@@ -39,10 +39,10 @@
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}
Index: www/fira-webfont/Makefile
===================================================================
--- www/fira-webfont/Makefile
+++ www/fira-webfont/Makefile
@@ -51,7 +51,7 @@
@${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 @@
.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
Index: www/htmlpp/Makefile
===================================================================
--- www/htmlpp/Makefile
+++ www/htmlpp/Makefile
@@ -22,13 +22,13 @@
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>
Index: www/jawstats/Makefile
===================================================================
--- www/jawstats/Makefile
+++ www/jawstats/Makefile
@@ -17,17 +17,9 @@
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>
Index: www/jawstats/pkg-plist
===================================================================
--- www/jawstats/pkg-plist
+++ 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%%
Index: www/mimetex/Makefile
===================================================================
--- www/mimetex/Makefile
+++ www/mimetex/Makefile
@@ -43,7 +43,7 @@
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:
Index: www/ruby-wgettsv/Makefile
===================================================================
--- www/ruby-wgettsv/Makefile
+++ www/ruby-wgettsv/Makefile
@@ -23,10 +23,10 @@
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>
Index: www/scloader/Makefile
===================================================================
--- www/scloader/Makefile
+++ www/scloader/Makefile
@@ -32,7 +32,7 @@
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
Index: www/skytemplate/Makefile
===================================================================
--- www/skytemplate/Makefile
+++ www/skytemplate/Makefile
@@ -11,11 +11,8 @@
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
Index: x11-fonts/fira/Makefile
===================================================================
--- x11-fonts/fira/Makefile
+++ x11-fonts/fira/Makefile
@@ -54,7 +54,7 @@
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>
Index: x11-fonts/noto/Makefile
===================================================================
--- x11-fonts/noto/Makefile
+++ x11-fonts/noto/Makefile
@@ -21,7 +21,7 @@
NO_WRKSUBDIR= yes
post-extract:
- ${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKDIR}
+ ${CP} ${DISTDIR}/NotoEmoji-Regular.ttf ${WRKSRC}
do-install:
${MKDIR} ${STAGEDIR}${FONTSDIR}
Index: x11-fonts/proggy_fonts/Makefile
===================================================================
--- x11-fonts/proggy_fonts/Makefile
+++ x11-fonts/proggy_fonts/Makefile
@@ -35,7 +35,7 @@
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>
Index: x11-fonts/symbola/Makefile
===================================================================
--- x11-fonts/symbola/Makefile
+++ x11-fonts/symbola/Makefile
@@ -26,9 +26,9 @@
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>
Index: x11-fonts/tmu/Makefile
===================================================================
--- x11-fonts/tmu/Makefile
+++ x11-fonts/tmu/Makefile
@@ -21,7 +21,7 @@
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS= #
-EXTRACT_AFTER_ARGS= ${WRKDIR}
+EXTRACT_AFTER_ARGS= ${WRKSRC}
do-install:
@${MKDIR} ${STAGEDIR}${FONTSDIR}
Index: x11-fonts/wqy/Makefile
===================================================================
--- x11-fonts/wqy/Makefile
+++ x11-fonts/wqy/Makefile
@@ -46,56 +46,56 @@
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>
Index: x11-themes/gnome-icons-aqua-fusion/Makefile
===================================================================
--- x11-themes/gnome-icons-aqua-fusion/Makefile
+++ x11-themes/gnome-icons-aqua-fusion/Makefile
@@ -18,7 +18,7 @@
RESTRICTED= ${REASON}
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/AquaFusion"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-crystal/Makefile
===================================================================
--- x11-themes/gnome-icons-crystal/Makefile
+++ x11-themes/gnome-icons-crystal/Makefile
@@ -19,10 +19,10 @@
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>
Index: x11-themes/gnome-icons-dropline-neu/Makefile
===================================================================
--- x11-themes/gnome-icons-dropline-neu/Makefile
+++ x11-themes/gnome-icons-dropline-neu/Makefile
@@ -10,7 +10,7 @@
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>
Index: x11-themes/gnome-icons-dropline-nou/Makefile
===================================================================
--- x11-themes/gnome-icons-dropline-nou/Makefile
+++ x11-themes/gnome-icons-dropline-nou/Makefile
@@ -10,7 +10,7 @@
COMMENT= Dropline Nou Icons for Gnome
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/Nou"
+NO_WRKSUBDIR= yes
post-extract:
@${RM} ${WRKSRC}/.icon-theme.cache
Index: x11-themes/gnome-icons-gentoo-test/Makefile
===================================================================
--- x11-themes/gnome-icons-gentoo-test/Makefile
+++ x11-themes/gnome-icons-gentoo-test/Makefile
@@ -18,7 +18,7 @@
RESTRICTED= ${REASON}
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/Gentoo-test"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-gion/Makefile
===================================================================
--- x11-themes/gnome-icons-gion/Makefile
+++ x11-themes/gnome-icons-gion/Makefile
@@ -10,7 +10,7 @@
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>
Index: x11-themes/gnome-icons-iris/Makefile
===================================================================
--- x11-themes/gnome-icons-iris/Makefile
+++ x11-themes/gnome-icons-iris/Makefile
@@ -18,7 +18,7 @@
RESTRICTED= ${REASON}
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/Iris"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-noia-full/Makefile
===================================================================
--- x11-themes/gnome-icons-noia-full/Makefile
+++ x11-themes/gnome-icons-noia-full/Makefile
@@ -18,7 +18,7 @@
RESTRICTED= ${REASON}
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/Noia"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-noia-warm/Makefile
===================================================================
--- x11-themes/gnome-icons-noia-warm/Makefile
+++ x11-themes/gnome-icons-noia-warm/Makefile
@@ -18,7 +18,7 @@
RESTRICTED= ${REASON}
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/NoiaWarm"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-refined/Makefile
===================================================================
--- x11-themes/gnome-icons-refined/Makefile
+++ x11-themes/gnome-icons-refined/Makefile
@@ -17,7 +17,7 @@
RESTRICTED= ${REASON}
-WRKSRC= "${WRKDIR}/gnome-rh8"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-slick/Makefile
===================================================================
--- x11-themes/gnome-icons-slick/Makefile
+++ x11-themes/gnome-icons-slick/Makefile
@@ -18,7 +18,7 @@
RESTRICTED= ${REASON}
USES= tar:bzip2
-WRKSRC= "${WRKDIR}/Slick"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-snow-apple/Makefile
===================================================================
--- x11-themes/gnome-icons-snow-apple/Makefile
+++ x11-themes/gnome-icons-snow-apple/Makefile
@@ -17,7 +17,7 @@
RESTRICTED= ${REASON}
-WRKSRC= "${WRKDIR}/Snow-Apple"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-stylish/Makefile
===================================================================
--- x11-themes/gnome-icons-stylish/Makefile
+++ x11-themes/gnome-icons-stylish/Makefile
@@ -17,7 +17,7 @@
RESTRICTED= ${REASON}
-WRKSRC= "${WRKDIR}/${PORTNAME}"
+NO_WRKSUBDIR= yes
.include "${.CURDIR}/../gnome-icons/bsd.gnome-icons.mk"
.include <bsd.port.mk>
Index: x11-themes/gnome-icons-ximian-south/Makefile
===================================================================
--- x11-themes/gnome-icons-ximian-south/Makefile
+++ x11-themes/gnome-icons-ximian-south/Makefile
@@ -16,8 +16,7 @@
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>
Index: x11-themes/gnome-icons/bsd.gnome-icons.mk
===================================================================
--- x11-themes/gnome-icons/bsd.gnome-icons.mk
+++ x11-themes/gnome-icons/bsd.gnome-icons.mk
@@ -14,12 +14,4 @@
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/
Index: x11/xkbctrl/Makefile
===================================================================
--- x11/xkbctrl/Makefile
+++ x11/xkbctrl/Makefile
@@ -18,8 +18,8 @@
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
Index: x11/xnodecor/Makefile
===================================================================
--- x11/xnodecor/Makefile
+++ x11/xnodecor/Makefile
@@ -16,8 +16,8 @@
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>

File Metadata

Mime Type
text/plain
Expires
Sat, Jul 4, 4:31 AM (6 h, 34 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34651791
Default Alt Text
D2735.id9905.diff (129 KB)

Event Timeline