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 /lang | |
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 'lang')
-rw-r--r-- | lang/erlang/Makefile | 8 | ||||
-rw-r--r-- | lang/erlang14/Makefile | 8 | ||||
-rw-r--r-- | lang/icc/Makefile | 2 | ||||
-rw-r--r-- | lang/icc7/Makefile | 2 | ||||
-rw-r--r-- | lang/ifc/Makefile | 2 | ||||
-rw-r--r-- | lang/ifc7/Makefile | 2 | ||||
-rw-r--r-- | lang/imp-interpreter/Makefile | 2 | ||||
-rw-r--r-- | lang/metaocaml/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5.10/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5.12/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5.14/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5.16/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5.6/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5.8/Makefile | 2 | ||||
-rw-r--r-- | lang/perl5/Makefile | 2 | ||||
-rw-r--r-- | lang/pike72/Makefile | 2 | ||||
-rw-r--r-- | lang/pugs/Makefile | 10 |
17 files changed, 27 insertions, 27 deletions
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile index a504e0f01e14..8863af4f8b03 100644 --- a/lang/erlang/Makefile +++ b/lang/erlang/Makefile @@ -93,10 +93,10 @@ PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} NOMANCOMPRESS= yes -MAN1PREFIX= ${TARGETDIR}/lib/erlang -MAN3PREFIX= ${TARGETDIR}/lib/erlang -MAN4PREFIX= ${TARGETDIR}/lib/erlang -MAN6PREFIX= ${TARGETDIR}/lib/erlang +MAN1PREFIX= ${PREFIX}/lib/erlang +MAN3PREFIX= ${PREFIX}/lib/erlang +MAN4PREFIX= ${PREFIX}/lib/erlang +MAN6PREFIX= ${PREFIX}/lib/erlang pre-configure: # Check if ${JAVAC} exists. diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile index a504e0f01e14..8863af4f8b03 100644 --- a/lang/erlang14/Makefile +++ b/lang/erlang14/Makefile @@ -93,10 +93,10 @@ PLIST_SUB+= ERTS_VSN=${ERTS_VSN} TOOLS_VSN=${TOOLS_VSN} NOMANCOMPRESS= yes -MAN1PREFIX= ${TARGETDIR}/lib/erlang -MAN3PREFIX= ${TARGETDIR}/lib/erlang -MAN4PREFIX= ${TARGETDIR}/lib/erlang -MAN6PREFIX= ${TARGETDIR}/lib/erlang +MAN1PREFIX= ${PREFIX}/lib/erlang +MAN3PREFIX= ${PREFIX}/lib/erlang +MAN4PREFIX= ${PREFIX}/lib/erlang +MAN6PREFIX= ${PREFIX}/lib/erlang pre-configure: # Check if ${JAVAC} exists. diff --git a/lang/icc/Makefile b/lang/icc/Makefile index e1808efd21c9..df123e737017 100644 --- a/lang/icc/Makefile +++ b/lang/icc/Makefile @@ -39,7 +39,7 @@ PATCH_WRKSRC= ${WRKSRC}/opt/${COMPILERDIR} MAN1= icc.1 MLINKS= icc.1 icpc.1 -MANPREFIX= ${TARGETDIR}/${COMPILERDIR} +MANPREFIX= ${PREFIX}/${COMPILERDIR} ICC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile index 1032c82e7db1..20eb41a54707 100644 --- a/lang/icc7/Makefile +++ b/lang/icc7/Makefile @@ -31,7 +31,7 @@ PLIST_SUB= COMPILERDIR=${COMPILERDIR} PATCH_WRKSRC= ${WRKSRC}/opt/intel/${COMPILERDIR} MAN1= icc.1 -MANPREFIX= ${TARGETDIR}/intel/${COMPILERDIR}/ +MANPREFIX= ${PREFIX}/intel/${COMPILERDIR}/ ICC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile index 049ee88a495b..bee8787e9df9 100644 --- a/lang/ifc/Makefile +++ b/lang/ifc/Makefile @@ -35,7 +35,7 @@ PLIST_SUB= COMPILERDIR=${COMPILERDIR} PATCH_WRKSRC= ${WRKSRC}/opt/${COMPILERDIR} MAN1= ifort.1 -MANPREFIX= ${TARGETDIR}/${COMPILERDIR}/ +MANPREFIX= ${PREFIX}/${COMPILERDIR}/ IFC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile index 8bcba1dbe24d..378f7597a6c8 100644 --- a/lang/ifc7/Makefile +++ b/lang/ifc7/Makefile @@ -30,7 +30,7 @@ PLIST_SUB= COMPILERDIR=${COMPILERDIR} PATCH_WRKSRC= ${WRKSRC}/opt/intel/${COMPILERDIR} MAN1= ifc.1 -MANPREFIX= ${TARGETDIR}/intel/${COMPILERDIR}/ +MANPREFIX= ${PREFIX}/intel/${COMPILERDIR}/ IFC_SITE= http://www.intel.com/software/products/compilers/ diff --git a/lang/imp-interpreter/Makefile b/lang/imp-interpreter/Makefile index 4dffb07aba81..340d565e3e09 100644 --- a/lang/imp-interpreter/Makefile +++ b/lang/imp-interpreter/Makefile @@ -32,7 +32,7 @@ PORTDOCS= README .include <bsd.port.pre.mk> do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/main ${TARGETDIR}/bin/IMP + ${INSTALL_PROGRAM} ${WRKSRC}/main ${PREFIX}/bin/IMP post-install: .if !defined(NOPORTDOCS) diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile index 3d68be9cb557..eb91c60647d2 100644 --- a/lang/metaocaml/Makefile +++ b/lang/metaocaml/Makefile @@ -72,7 +72,7 @@ PLISTDIR= ${PREFIX}/lib/metaocaml \ .include <bsd.port.pre.mk> # Have to set this here and can't use ${DATADIR} or MLINKS get screwed up -MANPREFIX= ${TARGETDIR}/share/metaocaml +MANPREFIX= ${PREFIX}/share/metaocaml .if defined(WITH_X11) USE_XLIB= yes diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.10/Makefile +++ b/lang/perl5.10/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.14/Makefile +++ b/lang/perl5.14/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile index fe5fdb148699..8e48d5aec941 100644 --- a/lang/perl5.6/Makefile +++ b/lang/perl5.6/Makefile @@ -97,7 +97,7 @@ PLIST_SUB+= NEED_USE_PERL="" .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile index 46c7d47d3b4e..725f1b4d0b44 100644 --- a/lang/perl5.8/Makefile +++ b/lang/perl5.8/Makefile @@ -119,7 +119,7 @@ PLIST_SUB+= NEED_USE_PERL="@comment " .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index fe5fdb148699..8e48d5aec941 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -97,7 +97,7 @@ PLIST_SUB+= NEED_USE_PERL="" .if defined(WITH_GDBM) MAN3+= GDBM_File.3 .endif -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VER}/perl +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VER}/perl test: @(cd ${WRKSRC}; make test) diff --git a/lang/pike72/Makefile b/lang/pike72/Makefile index c611eb4e5511..66b196ac91be 100644 --- a/lang/pike72/Makefile +++ b/lang/pike72/Makefile @@ -178,7 +178,7 @@ CONFIGURE_ARGS+= --without-libpdf USE_GMAKE= yes MAN1= hilfe.1 pike.1 -MAN1PREFIX= ${TARGETDIR}/pike/${PORTVERSION} +MAN1PREFIX= ${PREFIX}/pike/${PORTVERSION} pre-everything:: .if !defined(WITH_OPTIMIZED_CFLAGS) diff --git a/lang/pugs/Makefile b/lang/pugs/Makefile index 484bcd49b9a3..ee7a36021a76 100644 --- a/lang/pugs/Makefile +++ b/lang/pugs/Makefile @@ -35,7 +35,7 @@ MAN3= Perl6::Pugs.3 \ Inline::Pugs.3 SITE_PERL6_REL= lib/perl6 -PERL6_MANPREFIX= ${TARGETDIR}/${SITE_PERL6_REL}/site_perl/auto/pugs/perl5 +PERL6_MANPREFIX= ${PREFIX}/${SITE_PERL6_REL}/site_perl/auto/pugs/perl5 SITE_PERL6_MAN3= Class::Rebless.3 \ PIL2JS::JSPM.3 \ Pugs::Compiler::Perl6.3 \ @@ -57,8 +57,8 @@ PLIST_SUB= SITE_PERL6_REL=${SITE_PERL6_REL} .include <bsd.port.pre.mk> post-configure: - @${REINPLACE_CMD} -e '/^INSTALLPRIVLIB/s,${PREFIX}/lib,${TARGETDIR}/lib/perl6,;' \ - -e '/^INSTALLARCHLIB/s,${PREFIX}/lib,${TARGETDIR}/lib/perl6/mach,' \ + @${REINPLACE_CMD} -e '/^INSTALLPRIVLIB/s,${PREFIX}/lib,${PREFIX}/lib/perl6,;' \ + -e '/^INSTALLARCHLIB/s,${PREFIX}/lib,${PREFIX}/lib/perl6/mach,' \ ${WRKSRC}/Makefile .if !defined(NOPORTDOCS) @@ -67,9 +67,9 @@ post-install: @${MKDIR} ${EXAMPLESDIR} @${CP} -R ${EXDIR}/ ${EXAMPLESDIR} @${FIND} -s ${EXAMPLESDIR} -type f | \ - ${SED} -e 's|^${TARGETDIR}/||' >> ${TMPPLIST} + ${SED} -e 's|^${PREFIX}/||' >> ${TMPPLIST} @${FIND} -d ${EXAMPLESDIR} -type d | \ - ${SED} -e 's|^${TARGETDIR}/|@dirrm |' >> ${TMPPLIST} + ${SED} -e 's|^${PREFIX}/|@dirrm |' >> ${TMPPLIST} .endif .include <bsd.port.post.mk> |