diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apr1/Makefile | 4 | ||||
| -rw-r--r-- | devel/cvs2html/Makefile | 2 | ||||
| -rw-r--r-- | devel/cweb/Makefile | 2 | ||||
| -rw-r--r-- | devel/easygit/Makefile | 6 | ||||
| -rw-r--r-- | devel/libcii/Makefile | 4 | ||||
| -rw-r--r-- | devel/libdlmalloc/Makefile | 6 | ||||
| -rw-r--r-- | devel/mingw32-bin-msvcrt/Makefile | 2 | ||||
| -rw-r--r-- | devel/py-json-py/Makefile | 4 | ||||
| -rw-r--r-- | devel/py-urlimport/Makefile | 4 | ||||
| -rw-r--r-- | devel/ruby-dialogs/Makefile | 4 | ||||
| -rw-r--r-- | devel/sedsed/Makefile | 2 | ||||
| -rw-r--r-- | devel/sfio/Makefile | 14 |
12 files changed, 28 insertions, 26 deletions
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index 1ef7a235cd20..5a077871c848 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -50,9 +50,11 @@ PGSQL_USES= pgsql SQLITE_USE= SQLITE=yes SSL_USE= OPENSSL=yes -NO_WRKSUBDIR= yes APR_WRKDIR= ${WRKDIR}/apr-${APR_VERSION} APU_WRKDIR= ${WRKDIR}/apr-util-${APU_VERSION} +WRKSRC= ${APR_WRKDIR} +PATCH_WRKSRC= ${WRKDIR} +PATHFIX_WRKSRC= ${WRKDIR} SHLIB_APR_MAJOR=${APR_VERSION:C/^1/0/} SHLIB_APU_MAJOR=${APU_VERSION:C/^1/0/} diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile index fb77dc51549a..dcf644f5a1df 100644 --- a/devel/cvs2html/Makefile +++ b/devel/cvs2html/Makefile @@ -34,6 +34,6 @@ do-extract: @${CP} ${DISTDIR}/${PORTNAME} ${WRKSRC} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.post.mk> diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile index 8b9ab51b2650..ab2629f9a517 100644 --- a/devel/cweb/Makefile +++ b/devel/cweb/Makefile @@ -34,6 +34,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cwebmac.tex \ ${STAGEDIR}${PREFIX}/share/texmf/tex/generic/misc @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/cwebman.tex ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/cwebman.tex ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff --git a/devel/easygit/Makefile b/devel/easygit/Makefile index 2579b242efb7..af311a6a7d62 100644 --- a/devel/easygit/Makefile +++ b/devel/easygit/Makefile @@ -17,18 +17,18 @@ DISTREVISION= 0 # bump this if distfile is changed inplace DIST_SUBDIR= eg/${PORTVERSION}_${DISTREVISION} USES= perl5 shebangfix -SHEBANG_FILES= ${WRKDIR}/eg +SHEBANG_FILES= ${WRKSRC}/eg USE_PERL5= run NO_WRKSUBDIR= yes NO_BUILD= yes PLIST_FILES= bin/eg bin/easygit do-extract: - @${CP} ${_DISTDIR}/${DISTNAME} ${WRKDIR} + @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKDIR}/eg ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/eg ${STAGEDIR}${PREFIX}/bin/ cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ./eg ${STAGEDIR}${PREFIX}/bin/easygit .include <bsd.port.mk> diff --git a/devel/libcii/Makefile b/devel/libcii/Makefile index af2e877dc1ed..fe430d97bb4a 100644 --- a/devel/libcii/Makefile +++ b/devel/libcii/Makefile @@ -18,7 +18,7 @@ MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} -DMAXALIGN=8 -Iinclude" \ LD="${CC}" LDFLAGS="" EXTRAS="" BUILDDIR=${PKGNAME} PLIST_SUB= CIIMAJOR="${CIIMAJOR}" -CIIBUILD= ${WRKDIR}/${PKGNAME} +CIIBUILD= ${WRKSRC}/${PKGNAME} CIIMAJOR= 1 CIIDEST= ${PREFIX}/lib/cii @@ -48,7 +48,7 @@ post-patch: pre-build: @${MKDIR} ${CIIBUILD} @${MKDIR} ${CIIBUILD}/include - @${CP} ${WRKDIR}/include/*.h ${CIIBUILD}/include + @${CP} ${WRKSRC}/include/*.h ${CIIBUILD}/include # ${PREFIX}/lib/cii/${CIIMAJOR}/ # ${PREFIX}/lib/cii/${CIIMAJOR}/include diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile index 8d87040e46ce..a8a49d16beef 100644 --- a/devel/libdlmalloc/Makefile +++ b/devel/libdlmalloc/Makefile @@ -14,10 +14,10 @@ NO_WRKSUBDIR= yes USE_LDCONFIG= yes do-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} .for f in ${DISTFILES} - ${CP} -p ${DISTDIR}/${f} ${WRKDIR} + ${CP} -p ${DISTDIR}/${f} ${WRKSRC} .endfor - ${CP} -p ${FILESDIR}/Makefile ${WRKDIR} + ${CP} -p ${FILESDIR}/Makefile ${WRKSRC} .include <bsd.port.mk> diff --git a/devel/mingw32-bin-msvcrt/Makefile b/devel/mingw32-bin-msvcrt/Makefile index 5b6b2fe782c5..e89a371bc35a 100644 --- a/devel/mingw32-bin-msvcrt/Makefile +++ b/devel/mingw32-bin-msvcrt/Makefile @@ -26,6 +26,6 @@ NO_MTREE= yes NO_WRKSUBDIR= yes post-extract: - @${CP} ${FILESDIR}/Makefile ${WRKDIR} + @${CP} ${FILESDIR}/Makefile ${WRKSRC} .include <bsd.port.mk> diff --git a/devel/py-json-py/Makefile b/devel/py-json-py/Makefile index 03bb1af7e7a7..bde22e42699c 100644 --- a/devel/py-json-py/Makefile +++ b/devel/py-json-py/Makefile @@ -19,7 +19,7 @@ USES= python zip do-build: # compile python files - cd ${WRKDIR}; \ + cd ${WRKSRC}; \ FILES=$$(${FIND} . -name "*.py" ); \ for FILE in $${FILES}; do \ ${ECHO} import `basename $${FILE} .py` | ${PYTHON_CMD}; \ @@ -27,7 +27,7 @@ do-build: do-install: ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} - @cd ${WRKDIR}; \ + @cd ${WRKSRC}; \ ${FIND} . \( -name "*.py" -or -name "*.pyc" \) -exec ${INSTALL_SCRIPT} \{\} ${STAGEDIR}${PYTHON_SITELIBDIR} \; .include <bsd.port.mk> diff --git a/devel/py-urlimport/Makefile b/devel/py-urlimport/Makefile index 85d2465b344f..0f15034518ef 100644 --- a/devel/py-urlimport/Makefile +++ b/devel/py-urlimport/Makefile @@ -18,8 +18,8 @@ USES= python USE_PYTHON= distutils autoplist do-extract: - ${MKDIR} ${WRKDIR} - ${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}/${PORTNAME}.py + ${MKDIR} ${WRKSRC} + ${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}/${PORTNAME}.py ${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|g' ${FILESDIR}/setup.py \ > ${WRKSRC}/setup.py diff --git a/devel/ruby-dialogs/Makefile b/devel/ruby-dialogs/Makefile index edff0d1fdb61..576a13a7bd1a 100644 --- a/devel/ruby-dialogs/Makefile +++ b/devel/ruby-dialogs/Makefile @@ -21,9 +21,9 @@ OPTIONS_DEFINE= DOCS do-install: ${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR} - ${INSTALL_DATA} ${WRKDIR}/dialogs.rb ${STAGEDIR}${RUBY_SITELIBDIR}/ + ${INSTALL_DATA} ${WRKSRC}/dialogs.rb ${STAGEDIR}${RUBY_SITELIBDIR}/ ${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR} - ${INSTALL_DATA} ${WRKDIR}/dialogs.html ${STAGEDIR}${RUBY_MODDOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/dialogs.html ${STAGEDIR}${RUBY_MODDOCDIR}/ .include <bsd.port.mk> diff --git a/devel/sedsed/Makefile b/devel/sedsed/Makefile index 8fedbef6423a..b6514fcc4efc 100644 --- a/devel/sedsed/Makefile +++ b/devel/sedsed/Makefile @@ -13,7 +13,7 @@ COMMENT= Python script that masters SED scripts PLIST_FILES= bin/sedsed EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= -EXTRACT_AFTER_ARGS= ${WRKDIR} +EXTRACT_AFTER_ARGS= ${WRKSRC} NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile index 403c4145671d..e6040d3889a9 100644 --- a/devel/sfio/Makefile +++ b/devel/sfio/Makefile @@ -18,17 +18,17 @@ NO_WRKSUBDIR= yes # Remove a test that's too clever for its own good post-extract: - @${MV} ${WRKDIR}/src/lib/sfio/Sfio_t/tmmap2read.c \ - ${WRKDIR}/src/lib/sfio/Sfio_t/.tmmap2read.c + @${MV} ${WRKSRC}/src/lib/sfio/Sfio_t/tmmap2read.c \ + ${WRKSRC}/src/lib/sfio/Sfio_t/.tmmap2read.c do-build: - @cd ${WRKDIR}/src/lib/sfio && ${MAKE} all -f makefile + @cd ${WRKSRC}/src/lib/sfio && ${MAKE} all -f makefile do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/sfio - ${INSTALL_DATA} ${WRKDIR}/include/* ${STAGEDIR}${PREFIX}/include/sfio - (cd ${WRKDIR}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib) - ${INSTALL_MAN} ${WRKDIR}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3 + ${INSTALL_DATA} ${WRKSRC}/include/* ${STAGEDIR}${PREFIX}/include/sfio + (cd ${WRKSRC}/lib && ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib) + ${INSTALL_MAN} ${WRKSRC}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3 .include <bsd.port.mk> |