diff options
author | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-08-04 11:41:30 +0000 |
---|---|---|
committer | Gabor Kovesdan <gabor@FreeBSD.org> | 2007-08-04 11:41:30 +0000 |
commit | 42542fb07642b8336e808272918f3ae46aa67e0b (patch) | |
tree | 98ff235c33c6493aa26457284f122652c38935f7 /devel | |
parent | - Extract command variable definitions from bsd.port.mk, they are now stored in (diff) |
- Remove the DESTDIR modifications from individual ports as we have a new,
fully chrooted DESTDIR, which does not need such any more.
Sponsored by: Google Summer of Code 2007
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=197075
Diffstat (limited to 'devel')
38 files changed, 113 insertions, 113 deletions
diff --git a/devel/afay/Makefile b/devel/afay/Makefile index 5790cadbe92f..b4e594425fa2 100644 --- a/devel/afay/Makefile +++ b/devel/afay/Makefile @@ -27,32 +27,32 @@ do-build: @cd ${WRKSRC}/afay/ayacc/src/gnat_unix && ${SH} ./README do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/afay/aflex/src/aflex ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/afay/ayacc/src/ayacc ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man ${DESTDIR}${PREFIX}/man/man1/aflex.1 - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage ${DESTDIR}${PREFIX}/man/man1/ayacc.1 + ${INSTALL_PROGRAM} ${WRKSRC}/afay/aflex/src/aflex ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/afay/ayacc/src/ayacc ${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.man ${PREFIX}/man/man1/aflex.1 + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/old_docs/ayacc.manpage ${PREFIX}/man/man1/ayacc.1 .if !defined(NOPORTDOCS) ${MKDIR} ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME ${DESTDIR}${DOCSDIR}/READ_ME.aflex - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.html ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex_user_man.* ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/READ_ME ${DESTDIR}${DOCSDIR}/READ_ME.ayacc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc.html ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc_user_man.tex ${DESTDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/READ_ME ${DOCSDIR}/READ_ME.aflex + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/aflex_user_man.* ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/READ_ME ${DOCSDIR}/READ_ME.ayacc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc.html ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/doc/ayacc_user_man.tex ${DOCSDIR} .endif - ${MKDIR} ${DESTDIR}${EXAMPLESDIR} - ${MKDIR} ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${MKDIR} ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/example.l ${DESTDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/test95.l ${DESTDIR}${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/ada_parser/COMPILE ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/READ.ME ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada.y ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada_lex.l ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/driver.a ${DESTDIR}${EXAMPLESDIR}/ada_parser - ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/calc/COMPILE ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/READ.ME ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/calc* ${DESTDIR}${EXAMPLESDIR}/calc - ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/driver.a ${DESTDIR}${EXAMPLESDIR}/calc + ${MKDIR} ${EXAMPLESDIR} + ${MKDIR} ${EXAMPLESDIR}/ada_parser + ${MKDIR} ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/example.l ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/afay/aflex/doc/test95.l ${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/ada_parser/COMPILE ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/READ.ME ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada.y ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/ada_lex.l ${EXAMPLESDIR}/ada_parser + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/ada_parser/driver.a ${EXAMPLESDIR}/ada_parser + ${INSTALL_SCRIPT} ${WRKSRC}/afay/ayacc/examples/calc/COMPILE ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/READ.ME ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/calc* ${EXAMPLESDIR}/calc + ${INSTALL_DATA} ${WRKSRC}/afay/ayacc/examples/calc/driver.a ${EXAMPLESDIR}/calc .include <bsd.port.mk> diff --git a/devel/cbind/Makefile b/devel/cbind/Makefile index 552ad8c9d76c..9a60bfa4d1be 100644 --- a/devel/cbind/Makefile +++ b/devel/cbind/Makefile @@ -27,9 +27,9 @@ do-install: @${INSTALL_PROGRAM} ${WRKSRC}/cbpp ${PREFIX}/bin @${INSTALL_DATA} ${WRKSRC}/cbind.1 ${PREFIX}/man/man1 .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/DOCS ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCSDIR} + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/DOCS ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/devel/git/Makefile b/devel/git/Makefile index a5958047c03f..5924480d710f 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -156,7 +156,7 @@ MAN1= git-add.1 \ git-whatchanged.1 \ git-write-tree.1 \ gitk.1 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= Git.3 MAN5= gitattributes.5 gitignore.5 MAN7= git.7 diff --git a/devel/ncurses-devel/Makefile b/devel/ncurses-devel/Makefile index cd508ce05a45..d5dda703b885 100644 --- a/devel/ncurses-devel/Makefile +++ b/devel/ncurses-devel/Makefile @@ -38,10 +38,10 @@ PATCHDATE= ${i} GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --datadir=${TARGETDIR}/share/misc --disable-overwrite \ +CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ --enable-termcap --enable-bsdpad --enable-getcap \ --enable-colorfgbg --disable-home-terminfo \ - --includedir=${TARGETDIR}/include/ncurses \ + --includedir=${PREFIX}/include/ncurses \ --with-shared \ --without-curses-h --with-termlib --program-prefix= \ --enable-rpath --disable-root-environ \ @@ -67,8 +67,8 @@ BUILD_WRKSRC= ${NOWIDEC_WRKSRC} INSTALL_WRKSRC= ${NOWIDEC_WRKSRC} PLIST_SUB+= PORTVERSION=${RELEASE} \ - WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} \ - NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} + WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \ + NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,} PORTDOCS= * PORTEXAMPLES= * diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 9bfb283903a5..2da7fce6bf0d 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -22,10 +22,10 @@ RELEASE= 5.6 GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure -CONFIGURE_ARGS= --datadir=${TARGETDIR}/share/misc --disable-overwrite \ +CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ --enable-termcap --enable-bsdpad --enable-getcap \ --enable-colorfgbg --disable-home-terminfo \ - --includedir=${TARGETDIR}/include/ncurses \ + --includedir=${PREFIX}/include/ncurses \ --with-shared \ --without-curses-h --with-termlib --program-prefix= \ --enable-rpath --disable-root-environ \ @@ -51,8 +51,8 @@ BUILD_WRKSRC= ${NOWIDEC_WRKSRC} INSTALL_WRKSRC= ${NOWIDEC_WRKSRC} PLIST_SUB+= PORTVERSION=${RELEASE} \ - WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} \ - NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${TARGETDIR}/,,} + WIDEC_EXAMPLESDIR=${WIDEC_EXAMPLESDIR:S,${PREFIX}/,,} \ + NOWIDEC_EXAMPLESDIR=${NOWIDEC_EXAMPLESDIR:S,${PREFIX}/,,} PORTDOCS= * diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile index a1a55ca81290..194df680a6a0 100644 --- a/devel/ocaml-cfg/Makefile +++ b/devel/ocaml-cfg/Makefile @@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_WASH= yes DOCS= README -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -36,20 +36,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile index 00e6b754d018..95ddb92c5497 100644 --- a/devel/ocaml-lacaml/Makefile +++ b/devel/ocaml-lacaml/Makefile @@ -30,8 +30,8 @@ CFLAGS+= -fPIC MAKE_ENV+= OCAMLMKLIB_FLAGS="-L${LOCALBASE}/lib" DOCS= README TODO -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -53,20 +53,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile index 8ba3bd1b51ac..6c759c78f898 100644 --- a/devel/ocaml-pomap/Makefile +++ b/devel/ocaml-pomap/Makefile @@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_WASH= yes DOCS= README -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -36,20 +36,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile index 9c86eed97499..0fce2caad6f7 100644 --- a/devel/ocaml-res/Makefile +++ b/devel/ocaml-res/Makefile @@ -23,8 +23,8 @@ USE_OCAML_FINDLIB=yes USE_OCAML_WASH= yes DOCS= README -DOCSDIR= ${TARGETDIR}/share/doc/ocaml/${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/ocaml/${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> @@ -36,20 +36,20 @@ post-extract: post-install: @${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \ - ${SED} "s,^${TARGETDIR}/,," >> ${TMPPLIST} + ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) @${FIND} ${EXAMPLESDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${EXAMPLESDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ ! -type d | \ - ${SED} 's,^${TARGETDIR}/,,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST} @${FIND} ${DOCSDIR}/ -type d | ${SORT} -r | \ - ${SED} 's,^${TARGETDIR}/,@dirrm ,' >> ${TMPPLIST} + ${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} # XXX: temporary workaround for non-standard PREFIX @${ECHO_CMD} "@unexec rmdir %D/share/doc/ocaml 2>/dev/null || true" \ >> ${TMPPLIST} diff --git a/devel/p5-Dir-Project/Makefile b/devel/p5-Dir-Project/Makefile index 846a71cd562e..8e474d944f30 100644 --- a/devel/p5-Dir-Project/Makefile +++ b/devel/p5-Dir-Project/Makefile @@ -16,7 +16,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Project Environment determination PERL_CONFIGURE= yes -CONFIGURE_ENV+= DIRPROJECT_PREFIX=${TARGETDIR} +CONFIGURE_ENV+= DIRPROJECT_PREFIX=${PREFIX} MAN1= project_bin.1 project_dir.1 MAN3= Dir::Project.3 diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile index 97063f403138..2d46d8f02493 100644 --- a/devel/p5-Glib2/Makefile +++ b/devel/p5-Glib2/Makefile @@ -30,6 +30,6 @@ IGNORE= requires perl 5.8.0 or later. Install lang/perl5.8 then try again post-install: @cd ${WRKSRC}/blib/man3 && ${FIND} * -name "*.3" | ${SED} \ - 's,^,${MAN3PREFIX:S,^${TARGETDIR}/,,}/man/man3/,' >> ${TMPPLIST} + 's,^,${MAN3PREFIX:S,^${PREFIX}/,,}/man/man3/,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 3cac952fe441..fbad99527a64 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -54,7 +54,7 @@ USE_PERL5= yes INSTALLS_SHLIB= yes INSTALL_TARGET= pure_install -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SDL.3 \ SDL::App.3 \ SDL::Cdrom.3 \ diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 868fe9e424d1..a47de355bdb7 100644 --- a/devel/pcre/Makefile +++ b/devel/pcre/Makefile @@ -45,11 +45,11 @@ MAN3= pcre.3 pcre_compile.3 pcre_compile2.3 pcre_config.3 \ pcreperform.3 pcreposix.3 pcresample.3 pcrestack.3 post-install: - @${STRIP_CMD} ${DESTDIR}${PREFIX}/bin/pcregrep ${DESTDIR}${PREFIX}/bin/pcretest + @${STRIP_CMD} ${PREFIX}/bin/pcregrep ${PREFIX}/bin/pcretest .if !defined(NOPORTDOCS) - @${MKDIR} ${DESTDIR}${DOCSDIR} ${DESTDIR}${DOCSDIR}/html - @cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS LICENCE doc/*.txt ${DESTDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DESTDIR}${DOCSDIR}/html + @${MKDIR} ${DOCSDIR} ${DOCSDIR}/html + @cd ${WRKSRC}; ${INSTALL_DATA} ChangeLog NEWS LICENCE doc/*.txt ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html .endif .include <bsd.port.mk> diff --git a/devel/plan9port/Makefile b/devel/plan9port/Makefile index 2a22853f4ab3..ce9589496339 100644 --- a/devel/plan9port/Makefile +++ b/devel/plan9port/Makefile @@ -24,7 +24,7 @@ SUB_FILES= pkg-message REINPLACE_ARGS= -i "" ONLY_FOR_ARCHS= i386 -PLAN9= ${TARGETDIR}/plan9 +PLAN9= ${PREFIX}/plan9 MANPREFIX= ${PLAN9} MAN1= 9term.1 acmeevent.1 ascii.1 acme.1 9p.1 basename.1 cal.1 \ @@ -109,14 +109,14 @@ post-build: ${FIND} plan9 -type f \ -a ! -path "plan9/man/man[0-9]/*.[0-9]*"; \ for D in ${EMPTY_DIRS}; do \ - ${ECHO_CMD} "@exec ${MKDIR} ${TARGETDIR}/$${D}"; \ + ${ECHO_CMD} "@exec ${MKDIR} ${PREFIX}/$${D}"; \ done; \ ${FIND} plan9 -type d | ${SORT} -r \ | ${SED} -e 's|^|@dirrm |'; \ ) > ${PLIST} do-install: - ${CP} -rp ${WRKSRC} ${TARGETDIR} + ${CP} -rp ${WRKSRC} ${PREFIX} post-install: cd ${PLAN9} && \ diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile index 49cacd104871..1ecbb8823274 100644 --- a/devel/py-cheetah/Makefile +++ b/devel/py-cheetah/Makefile @@ -37,6 +37,6 @@ PYCHEETAH_EGG= Cheetah-${CHEETAHVER}-py${PYTHON_VERSION:S/^python//}-${OSINFOS}. .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile index e7c9fc4cfe10..6a8555533ace 100644 --- a/devel/py-gdata/Makefile +++ b/devel/py-gdata/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= gdata.py -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .if !defined(NOPORTEXAMPLES) post-install: diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile index 33e25370a071..07b840238191 100644 --- a/devel/py-lxml/Makefile +++ b/devel/py-lxml/Makefile @@ -54,6 +54,6 @@ post-install: .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-notifier/Makefile b/devel/py-notifier/Makefile index c7db4076e8c3..59f537dad12d 100644 --- a/devel/py-notifier/Makefile +++ b/devel/py-notifier/Makefile @@ -19,7 +19,7 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pynotifier -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} WRKSRC= ${WRKDIR}/py${PORTNAME}-${PORTVERSION} diff --git a/devel/py-pp/Makefile b/devel/py-pp/Makefile index 2d599e65401d..33b03d04ba64 100644 --- a/devel/py-pp/Makefile +++ b/devel/py-pp/Makefile @@ -21,6 +21,6 @@ post-patch: ${REINPLACE_CMD} -e 's,^#!/usr/bin/python,#!${PYTHON_CMD},' ${WRKSRC}/ppserver.py post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/ppserver.py ${TARGETDIR}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/ppserver.py ${PREFIX}/bin/ .include <bsd.port.mk> diff --git a/devel/py-protocols-devel/Makefile b/devel/py-protocols-devel/Makefile index 06e2672cf93c..24f0c521a82f 100644 --- a/devel/py-protocols-devel/Makefile +++ b/devel/py-protocols-devel/Makefile @@ -39,6 +39,6 @@ PYPROTOCOLS_VER?= 1.0a0 .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-pycallgraph/Makefile b/devel/py-pycallgraph/Makefile index 0e7d8262a299..8ed144a0f537 100644 --- a/devel/py-pycallgraph/Makefile +++ b/devel/py-pycallgraph/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz USE_PYTHON= yes USE_PYDISTUTILS= yes -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .if !defined(NOPORTEXANPLES) post-install: diff --git a/devel/py-qt4-qct/Makefile b/devel/py-qt4-qct/Makefile index 230e17d06063..36a7f6f607af 100644 --- a/devel/py-qt4-qct/Makefile +++ b/devel/py-qt4-qct/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4 USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes -DOCSDIR= ${TARGETDIR}/share/doc/py-qt4-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-qt4-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile index 502be1bcc257..1fa79bed9704 100644 --- a/devel/py-ruledispatch/Makefile +++ b/devel/py-ruledispatch/Makefile @@ -45,7 +45,7 @@ post-extract: .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r PYPROTOCOLS_EGG!= ${MAKE} -f ${PORTSDIR}/devel/py-protocols-devel/Makefile -V PYPROTOCOLS_EGG .include <bsd.port.post.mk> diff --git a/devel/py-simplejson/Makefile b/devel/py-simplejson/Makefile index 6a364c894ffa..373caae5f56f 100644 --- a/devel/py-simplejson/Makefile +++ b/devel/py-simplejson/Makefile @@ -27,7 +27,7 @@ OSINFOS= ${OPSYS:L}-${OSRELEASE}-${ARCH} PLIST_SUB+= PYSIMPLEJSON_EGG=${PYSIMPLEJSON_EGG} .if !defined(NOPORTDOCS) -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} PORTDOCS= * .endif diff --git a/devel/py-simpy/Makefile b/devel/py-simpy/Makefile index f800e5fe8378..60cb9fef3ae5 100644 --- a/devel/py-simpy/Makefile +++ b/devel/py-simpy/Makefile @@ -25,9 +25,9 @@ OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options .if !defined(NOPORTDOCS) PORTDOCS= * -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} .endif -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .include <bsd.port.pre.mk> diff --git a/devel/py-zope.interface/Makefile b/devel/py-zope.interface/Makefile index 87f153e4defb..6b4c240d2b90 100644 --- a/devel/py-zope.interface/Makefile +++ b/devel/py-zope.interface/Makefile @@ -39,6 +39,6 @@ PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/py-zopeInterface/Makefile b/devel/py-zopeInterface/Makefile index 87f153e4defb..6b4c240d2b90 100644 --- a/devel/py-zopeInterface/Makefile +++ b/devel/py-zopeInterface/Makefile @@ -39,6 +39,6 @@ PLIST_SUB+= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ .include <bsd.port.pre.mk> -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r .include <bsd.port.post.mk> diff --git a/devel/pycount/Makefile b/devel/pycount/Makefile index 84f20ae806da..9189bd982f31 100644 --- a/devel/pycount/Makefile +++ b/devel/pycount/Makefile @@ -29,6 +29,6 @@ do-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKDIR} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${TARGETDIR}/bin/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> diff --git a/devel/pythontidy/Makefile b/devel/pythontidy/Makefile index 921d9efe0b2e..bb855caf9015 100644 --- a/devel/pythontidy/Makefile +++ b/devel/pythontidy/Makefile @@ -30,6 +30,6 @@ do-patch: ${REINPLACE_CMD} -e s,/usr/bin/python,${PYTHON_CMD}, ${WRKDIR}/${DISTFILES} do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${TARGETDIR}/bin/pythontidy + ${INSTALL_SCRIPT} ${WRKDIR}/${DISTFILES} ${PREFIX}/bin/pythontidy .include <bsd.port.mk> diff --git a/devel/qct/Makefile b/devel/qct/Makefile index 230e17d06063..36a7f6f607af 100644 --- a/devel/qct/Makefile +++ b/devel/qct/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4 USE_PYTHON= 2.4+ USE_PYDISTUTILS=yes -DOCSDIR= ${TARGETDIR}/share/doc/py-qt4-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-qt4-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/devel/robodoc/Makefile b/devel/robodoc/Makefile index 64fc1df17b00..21a3c154d1eb 100644 --- a/devel/robodoc/Makefile +++ b/devel/robodoc/Makefile @@ -20,8 +20,8 @@ MAKEFILE= makefile MAN1= robodoc.1 robohdrs.1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Source/robodoc ${TARGETDIR}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/Source/robohdrs ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Source/robodoc ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/Source/robohdrs ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/Docs/robodoc.1 ${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/Docs/robohdrs.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) diff --git a/devel/ruby-jttui/Makefile b/devel/ruby-jttui/Makefile index 51137f14404d..60b9c44b01ca 100644 --- a/devel/ruby-jttui/Makefile +++ b/devel/ruby-jttui/Makefile @@ -26,12 +26,12 @@ INSTALL_TARGET= site-install .include <bsd.port.pre.mk> post-install: .if !defined(NOPORTDOCS) - ${MKDIR} ${DESTDIR}${RUBY_MODDOCDIR} + ${MKDIR} ${RUBY_MODDOCDIR} cd ${WRKSRC}/doc; \ - ${FIND} . | ${CPIO} -pdmv ${DESTDIR}${RUBY_MODDOCDIR} - ${CHMOD} -R ugo+rX,ugo-w ${DESTDIR}${RUBY_MODDOCDIR} - ${MKDIR} ${DESTDIR}${RUBY_MODEXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${RUBY_MODEXAMPLESDIR} - ${CHMOD} ugo+x ${DESTDIR}${RUBY_MODEXAMPLESDIR}/example-*.rb + ${FIND} . | ${CPIO} -pdmv ${RUBY_MODDOCDIR} + ${CHMOD} -R ugo+rX,ugo-w ${RUBY_MODDOCDIR} + ${MKDIR} ${RUBY_MODEXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/examples/* ${RUBY_MODEXAMPLESDIR} + ${CHMOD} ugo+x ${RUBY_MODEXAMPLESDIR}/example-*.rb .endif # !defined(NOPORTDOCS) .include <bsd.port.post.mk> diff --git a/devel/simian/Makefile b/devel/simian/Makefile index e7d3110e6813..102056d75751 100644 --- a/devel/simian/Makefile +++ b/devel/simian/Makefile @@ -82,19 +82,19 @@ pre-fetch: .endif do-install: - @${MKDIR} ${TARGETDIR}/share/xsl/${PORTNAME} - ${CP} ${WRKSRC}/simian.xsl ${TARGETDIR}/share/xsl/${PORTNAME} - @${MKDIR} ${TARGETDIR}/simian - @${MKDIR} ${TARGETDIR}/simian/bin + @${MKDIR} ${PREFIX}/share/xsl/${PORTNAME} + ${CP} ${WRKSRC}/simian.xsl ${PREFIX}/share/xsl/${PORTNAME} + @${MKDIR} ${PREFIX}/simian + @${MKDIR} ${PREFIX}/simian/bin .if !defined(WITHOUT_JAVA) - ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${TARGETDIR}/simian/bin + ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.jar ${PREFIX}/simian/bin .endif .if defined(WITH_MONO) - ${CP} ${WRKSRC}/bin/*.dll ${TARGETDIR}/simian/bin - ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${TARGETDIR}/simian/bin + ${CP} ${WRKSRC}/bin/*.dll ${PREFIX}/simian/bin + ${CP} ${WRKSRC}/bin/simian-${PORTVERSION}.exe ${PREFIX}/simian/bin .endif - ${CP} ${WRKSRC}/simian ${TARGETDIR}/bin/simian - ${CHMOD} a+x ${TARGETDIR}/bin/simian + ${CP} ${WRKSRC}/simian ${PREFIX}/bin/simian + ${CHMOD} a+x ${PREFIX}/bin/simian .if !defined(NOPORTDOCS) cd ${WRKSRC} \ && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/\{} \; \ diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion-devel/Makefile +++ b/devel/subversion-devel/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion-freebsd/Makefile +++ b/devel/subversion-freebsd/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile index 28bc24490608..5f4220d8c7b9 100644 --- a/devel/subversion16/Makefile +++ b/devel/subversion16/Makefile @@ -98,7 +98,7 @@ IGNORE= subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your per SWIG_BINDINGS+= yes USE_PERL5= yes PLIST_SUB+= WITH_PERL="" -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= SVN::Base.3 \ SVN::Client.3 \ SVN::Core.3 \ diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile index 358b94d5ff79..defe273b478a 100644 --- a/devel/tclthread/Makefile +++ b/devel/tclthread/Makefile @@ -19,7 +19,7 @@ COMMENT= Thread extension for Tcl USE_TCL= 84+ USE_TCL_THREADS= yes -DOCSDIR= ${TARGETDIR}/share/doc/${PKGNAMEPREFIX}${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/thread${PORTVERSION} |