diff options
author | gabor <gabor@FreeBSD.org> | 2007-08-04 19:41:30 +0800 |
---|---|---|
committer | gabor <gabor@FreeBSD.org> | 2007-08-04 19:41:30 +0800 |
commit | 1f31ff34b514d77244257a9a94391d3aae8edab0 (patch) | |
tree | a676504f8edaca31196a243aa7393f33f26078fa /www | |
parent | fb4c30cf2c9bc123dc0c05a0e070f2c48e83be57 (diff) | |
download | freebsd-ports-graphics-1f31ff34b514d77244257a9a94391d3aae8edab0.tar.gz freebsd-ports-graphics-1f31ff34b514d77244257a9a94391d3aae8edab0.tar.zst freebsd-ports-graphics-1f31ff34b514d77244257a9a94391d3aae8edab0.zip |
- 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)
Diffstat (limited to 'www')
34 files changed, 73 insertions, 73 deletions
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile index faaf2078974..9ba71c6f290 100644 --- a/www/aolserver/Makefile +++ b/www/aolserver/Makefile @@ -23,7 +23,7 @@ AOLSERVERBASE?= ${PORTNAME} AOLSERVERUSER?= nobody AOLSERVERGROUP?= nogroup -MANPREFIX= ${TARGETDIR}/${AOLSERVERBASE} +MANPREFIX= ${PREFIX}/${AOLSERVERBASE} USE_GMAKE= yes HAS_CONFIGURE= yes diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile index 2d2650afe04..7d1f72585b4 100644 --- a/www/apache13-modperl/Makefile +++ b/www/apache13-modperl/Makefile @@ -39,7 +39,7 @@ DEFAULT_PATH= /bin:/usr/bin:${PREFIX}/bin RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} # Perl man pages go into section 3 -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} .include <bsd.port.pre.mk> diff --git a/www/apache20/Makefile b/www/apache20/Makefile index fba6ddb7fee..7c21ddfd187 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes +MAKE_ENV+= EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, threadpool diff --git a/www/apache21/Makefile b/www/apache21/Makefile index eb795d85277..40227bf9c69 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} -MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes +MAKE_ENV+= EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, threadpool, event diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 6f959f91f82..d1e617163c5 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ENV= CC="${CC}" CPPFLAGS="${CPPFLAGS}" \ PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} -MAKE_ENV+= DESTDIR=${DESTDIR} EXPR_COMPAT=yes +MAKE_ENV+= EXPR_COMPAT=yes WITH_MPM?= prefork # or worker, perchild, event, itk diff --git a/www/b2evolution/Makefile b/www/b2evolution/Makefile index 49d7f89c5b3..2b6d285ba6d 100644 --- a/www/b2evolution/Makefile +++ b/www/b2evolution/Makefile @@ -42,14 +42,14 @@ pre-install: && ${ECHO_CMD} @dirrm ${B2EVO_DIR} >> ${PLIST} do-install: - ${MKDIR} ${TARGETDIR}/${B2EVO_DIR} - @${CHMOD} 755 ${TARGETDIR}/${B2EVO_DIR} - @${CP} -R ${WRKSRC}/ ${TARGETDIR}/${B2EVO_DIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${B2EVO_DIR} - @${CHMOD} 665 ${TARGETDIR}/${B2EVO_DIR}/blogs/conf/_config.php + ${MKDIR} ${PREFIX}/${B2EVO_DIR} + @${CHMOD} 755 ${PREFIX}/${B2EVO_DIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${B2EVO_DIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${B2EVO_DIR} + @${CHMOD} 665 ${PREFIX}/${B2EVO_DIR}/blogs/conf/_config.php post-install: - @${SED} -e 's|%%TARGETDIR%%|${TARGETDIR}|' \ + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ -e 's|%%B2EVO_DIR%%|${B2EVO_DIR}|; s|%%B2EVO_URL%%|${B2EVO_URL}|' \ ${PKGMESSAGE} diff --git a/www/b2evolution/pkg-message b/www/b2evolution/pkg-message index dae6c6d547e..3d89792294d 100644 --- a/www/b2evolution/pkg-message +++ b/www/b2evolution/pkg-message @@ -19,7 +19,7 @@ you may need to perform the following steps. [1;32m# # Directives to allow use of b2evolution # - Alias /%%B2EVO_URL%% "%%TARGETDIR%%/%%B2EVO_DIR%%/"[m + Alias /%%B2EVO_URL%% "%%PREFIX%%/%%B2EVO_DIR%%/"[m 4.Open b2evo installation page in your web browser and login with b2evouser/b2evopassword diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile index 3c8821da2c4..40ab063b29c 100644 --- a/www/libapreq2/Makefile +++ b/www/libapreq2/Makefile @@ -33,7 +33,7 @@ RUN_DEPENDS+= ${P5_APREQ_DEPENDS} USE_PERL5= yes CONFIGURE_ARGS+= --enable-perl-glue --with-perl=${PERL5} -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= APR::Request.3 \ APR::Request::Apache2.3 \ APR::Request::CGI.3 \ diff --git a/www/lifetype/Makefile b/www/lifetype/Makefile index cdba78fe79c..8305f8ddd3f 100644 --- a/www/lifetype/Makefile +++ b/www/lifetype/Makefile @@ -72,9 +72,9 @@ pre-install: && ${ECHO_CMD} @dirrm ${PLOGDIR} >> ${PLIST} do-install: - @${MKDIR} ${TARGETDIR}/${PLOGDIR} - @${CP} -R ${WRKSRC}/ ${TARGETDIR}/${PLOGDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${PLOGDIR} + @${MKDIR} ${PREFIX}/${PLOGDIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${PLOGDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PLOGDIR} post-install: @${SED} -e 's|%%PLOGURL%%|${PLOGURL}|' pkg-message > ${PKGMESSAGE} diff --git a/www/lilurl/Makefile b/www/lilurl/Makefile index 47d3152e796..625a4a852b8 100644 --- a/www/lilurl/Makefile +++ b/www/lilurl/Makefile @@ -37,12 +37,12 @@ pre-install: && ${ECHO_CMD} @dirrm ${LILURL_DIR} >> ${PLIST} do-install: - ${MKDIR} ${TARGETDIR}/${LILURL_DIR} - @${CP} -R ${WRKSRC}/ ${TARGETDIR}/${LILURL_DIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${LILURL_DIR} + ${MKDIR} ${PREFIX}/${LILURL_DIR} + @${CP} -R ${WRKSRC}/ ${PREFIX}/${LILURL_DIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${LILURL_DIR} post-install: - @${SED} -e 's,%%TARGETDIR%%,${TARGETDIR},; s,%%LILURL_DIR%%,${LILURL_DIR},g' \ + @${SED} -e 's,%%PREFIX%%,${PREFIX},; s,%%LILURL_DIR%%,${LILURL_DIR},g' \ ${PKGMESSAGE} .include <bsd.port.post.mk> diff --git a/www/lilurl/files/pkg-message.in b/www/lilurl/files/pkg-message.in index f55728eb858..9da019a2de4 100644 --- a/www/lilurl/files/pkg-message.in +++ b/www/lilurl/files/pkg-message.in @@ -10,12 +10,12 @@ you may have to follow this steps to make it work correctly: # echo "GRANT ALL ON lilurl.* TO lilurluser@localhost IDENTIFIED BY 'lilurluser'; FLUSH PRIVILEGES;" | mysql 3. Import the default lilurl database: -# mysql lilurl < %%TARGETDIR%%/%%LILURL_DIR%%/lilurl.sql +# mysql lilurl < %%PREFIX%%/%%LILURL_DIR%%/lilurl.sql -4. Copy %%TARGETDIR%%/%%LILURL_DIR%%/includes/conf.php.sample to %%TARGETDIR%%/%%LILURL_DIR%%/includes/conf.php - Edit %%TARGETDIR%%/%%LILURL_DIR%%/includes/conf.php +4. Copy %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php.sample to %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php + Edit %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php 5. Add alias in apache config for the lilurl dir: -Alias /lilurl "%%TARGETDIR%%/%%LILURL_DIR%%/" +Alias /lilurl "%%PREFIX%%/%%LILURL_DIR%%/" ======================================================================= diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile index ca915520c8e..1b7e27da200 100644 --- a/www/mini_httpd/Makefile +++ b/www/mini_httpd/Makefile @@ -24,14 +24,14 @@ post-build: -${MV} ${WRKSRC}/htpasswd.1 ${WRKSRC}/htpasswd.8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${TARGETDIR}/sbin/ - ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${TARGETDIR}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper ${TARGETDIR}/sbin/ - ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${TARGETDIR}/etc/rc.d/ + ${INSTALL_PROGRAM} ${WRKSRC}/mini_httpd ${PREFIX}/sbin/ + ${INSTALL_PROGRAM} ${WRKSRC}/htpasswd ${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd_wrapper ${PREFIX}/sbin/ + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/mini_httpd.sh ${PREFIX}/etc/rc.d/ @for file in ${MAN8}; \ do \ - ${INSTALL_MAN} ${WRKSRC}/$$file ${TARGETDIR}/man/man8/; \ + ${INSTALL_MAN} ${WRKSRC}/$$file ${PREFIX}/man/man8/; \ done - ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${TARGETDIR}/etc/mini_httpd.cnf.sample + ${INSTALL_DATA} ${WRKSRC}/mini_httpd.cnf ${PREFIX}/etc/mini_httpd.cnf.sample .include <bsd.port.mk> diff --git a/www/mod_security2/Makefile b/www/mod_security2/Makefile index d27d995ed7e..5bee2002447 100644 --- a/www/mod_security2/Makefile +++ b/www/mod_security2/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKSRCTOP}/apache2 SRC_FILE= *.c PORTDOCS= * DOCS= CHANGES LICENSE README.TXT modsecurity.conf-minimal doc rules -DOCSDIR= ${TARGETDIR}/share/doc/${MODULENAME} +DOCSDIR= ${PREFIX}/share/doc/${MODULENAME} SUB_FILES+= mod_security2.conf SUB_LIST+= APACHEETCDIR="${APACHEETCDIR}" diff --git a/www/mod_security21/Makefile b/www/mod_security21/Makefile index d27d995ed7e..5bee2002447 100644 --- a/www/mod_security21/Makefile +++ b/www/mod_security21/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKSRCTOP}/apache2 SRC_FILE= *.c PORTDOCS= * DOCS= CHANGES LICENSE README.TXT modsecurity.conf-minimal doc rules -DOCSDIR= ${TARGETDIR}/share/doc/${MODULENAME} +DOCSDIR= ${PREFIX}/share/doc/${MODULENAME} SUB_FILES+= mod_security2.conf SUB_LIST+= APACHEETCDIR="${APACHEETCDIR}" diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 293f61a7408..cfd52d5ca87 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -16,7 +16,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= Robust and small WWW server -NGINX_VARDIR?= ${DESTDIR}/var +NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log NGINX_RUNDIR?= ${NGINX_VARDIR}/run NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 83ecadfae54..ad7b6242065 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= osa MAINTAINER= osa@FreeBSD.org COMMENT= Robust and small WWW server -NGINX_VARDIR?= ${DESTDIR}/var +NGINX_VARDIR?= /var NGINX_LOGDIR?= ${NGINX_VARDIR}/log NGINX_RUNDIR?= ${NGINX_VARDIR}/run NGINX_TMPDIR?= ${NGINX_VARDIR}/tmp/nginx diff --git a/www/openacs-dotlrn/Makefile b/www/openacs-dotlrn/Makefile index 0d0de1ec114..8b19d4d917f 100644 --- a/www/openacs-dotlrn/Makefile +++ b/www/openacs-dotlrn/Makefile @@ -18,7 +18,7 @@ OPENACS_USER?= dotlrn OPENACS_DB?= dotlrn OPENACS_GROUP?= www -OPENACSBASE= ${TARGETDIR}/dotlrn +OPENACSBASE= ${PREFIX}/dotlrn OPENACSNAME= .LRN BASE_INSTALL= bin content-repository-content-files log packages tcl www install.xml diff --git a/www/openacs/Makefile b/www/openacs/Makefile index dc44c0a1f65..25bd6b5d28b 100644 --- a/www/openacs/Makefile +++ b/www/openacs/Makefile @@ -31,7 +31,7 @@ OPENACS_USER?= ${PORTNAME} OPENACS_DB?= ${PORTNAME} OPENACS_GROUP?= www PGUSER?= pgsql -OPENACSBASE?= ${TARGETDIR}/openacs +OPENACSBASE?= ${PREFIX}/openacs OPENACSNAME?= OpenACS SU?= /usr/bin/su PGREP?= /usr/bin/pgrep @@ -80,12 +80,12 @@ pre-install: @ ${FIND} ${WRKSRC} ! -type d ! -path '${WRKSRC}/etc*' \ ! -path '${WRKSRC}/readme.txt' ! -path '${WRKSRC}/license.txt' \ ! -path '${WRKSRC}/ChangeLog' | \ - ${SED} 's|${WRKSRC}|${OPENACSBASE:S/${TARGETDIR}\///}|' > ${PLIST} - @ ${ECHO} ${OPENACSBASE:S/${TARGETDIR}\///}/etc/${PORTNAME}-config.tcl >> ${PLIST} - @ ${ECHO} @dirrm ${OPENACSBASE:S/${TARGETDIR}\///}/etc >> ${PLIST} + ${SED} 's|${WRKSRC}|${OPENACSBASE:S/${PREFIX}\///}|' > ${PLIST} + @ ${ECHO} ${OPENACSBASE:S/${PREFIX}\///}/etc/${PORTNAME}-config.tcl >> ${PLIST} + @ ${ECHO} @dirrm ${OPENACSBASE:S/${PREFIX}\///}/etc >> ${PLIST} @ ${FIND} ${WRKSRC} -type d ! -path '${WRKSRC}/etc*' | \ ${SORT} -r | \ - ${SED} 's|${WRKSRC}|@dirrmtry ${OPENACSBASE:S/${TARGETDIR}\///}|' >> ${PLIST} + ${SED} 's|${WRKSRC}|@dirrmtry ${OPENACSBASE:S/${PREFIX}\///}|' >> ${PLIST} .if defined(WITH_EXAMPLES) @ ${FIND} ${WRKSRC}/etc ! -type d | \ ${SED} 's|${WRKSRC}/etc|%%EXAMPLESDIR%%|' >> ${PLIST} diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile index 35eb6d99001..da121c76f62 100644 --- a/www/p5-Template-Toolkit/Makefile +++ b/www/p5-Template-Toolkit/Makefile @@ -56,7 +56,7 @@ CONFIGURE_ENV= | .include "Makefile.man" post-patch: - ${PERL} -pi -e 's,/usr/local/tt2,${TARGETDIR}/share/tt2,g' \ + ${PERL} -pi -e 's,/usr/local/tt2,${PREFIX}/share/tt2,g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} .include <bsd.port.post.mk> diff --git a/www/polipo/Makefile b/www/polipo/Makefile index e3616867e54..8b7a1eebeab 100644 --- a/www/polipo/Makefile +++ b/www/polipo/Makefile @@ -53,22 +53,22 @@ pre-install: apply-slist @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${DESTDIR}${PREFIX}/bin/ - ${MKDIR} ${DESTDIR}${PREFIX}/etc/periodic/daily/ - ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${DESTDIR}${PREFIX}/etc/periodic/daily/ - ${INSTALL_MAN} ${WRKSRC}/polipo.man ${DESTDIR}${PREFIX}/man/man1/polipo.1 - ${MKDIR} ${DESTDIR}${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/config.sample ${DESTDIR}${PCONFIGDIR} - ${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${DESTDIR}${PCONFIGDIR} - ${CHGRP} -R ${PGRP} ${DESTDIR}${PCONFIGDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/polipo ${PREFIX}/bin/ + ${MKDIR} ${PREFIX}/etc/periodic/daily/ + ${INSTALL_SCRIPT} ${WRKDIR}/400.polipo ${PREFIX}/etc/periodic/daily/ + ${INSTALL_MAN} ${WRKSRC}/polipo.man ${PREFIX}/man/man1/polipo.1 + ${MKDIR} ${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/config.sample ${PCONFIGDIR} + ${INSTALL_DATA} ${WRKSRC}/forbidden.sample ${PCONFIGDIR} + ${CHGRP} -R ${PGRP} ${PCONFIGDIR} .if !defined(NO_PTEXINFO) - ${INSTALL_DATA} ${WRKSRC}/polipo.info ${DESTDIR}${PREFIX}/info/ + ${INSTALL_DATA} ${WRKSRC}/polipo.info ${PREFIX}/info/ .endif .if !defined(NOPORTDOCS) - ${MKDIR} ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/html/* ${DESTDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/localindex.html ${DESTDIR}${DATADIR}/www/index.html - ${CHGRP} -R ${PGRP} ${DESTDIR}${DATADIR} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/html/* ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/localindex.html ${DATADIR}/www/index.html + ${CHGRP} -R ${PGRP} ${DATADIR} .endif post-install: diff --git a/www/punbb/Makefile b/www/punbb/Makefile index f2554815938..c9e3e05e792 100644 --- a/www/punbb/Makefile +++ b/www/punbb/Makefile @@ -23,7 +23,7 @@ COMMENT= A fast and lightweight PHP-powered discussion board BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip NO_BUILD= yes -PUNBBDIR?= ${TARGETDIR}/www/punbb +PUNBBDIR?= ${PREFIX}/www/punbb USE_PHP= yes USE_ZIP= yes diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile index 4ba6c354999..961916ad461 100644 --- a/www/py-funkload/Makefile +++ b/www/py-funkload/Makefile @@ -25,8 +25,8 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-d USE_PYTHON= 2.4+ USE_PYDISTUTILS= easy_install -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile index ba77cee7987..8a7f6c8fa91 100644 --- a/www/py-pylons/Makefile +++ b/www/py-pylons/Makefile @@ -41,7 +41,7 @@ PLIST_SUB= EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \ EASY_INSTALL_CMD?= easy_install-${PYTHON_VER} -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} post-install: ${FIND} ${PYTHON_SITELIBDIR}/${PYPYLONS_EGG} \ diff --git a/www/py-pysearch/Makefile b/www/py-pysearch/Makefile index ba84f91401f..0a17a4db418 100644 --- a/www/py-pysearch/Makefile +++ b/www/py-pysearch/Makefile @@ -19,8 +19,8 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pYsearch -DOCSDIR= ${TARGETDIR}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} post-install: .if !defined(NOPORTDOCS) diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile index f2b4f7d6715..062d586f290 100644 --- a/www/py-turbogears/Makefile +++ b/www/py-turbogears/Makefile @@ -69,7 +69,7 @@ PYTURBOGEARS_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg # www/py-cheerypy # When it happens, we shall remove the respective entry from TGDEPEGGS, # REG_TGDEPEGGS, distinfo, and add the dependent port to RUN_DEPENDS -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r ENVINFO= py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg TGDEPEGGS= CherryPy-2.2.1-py2.4.egg cElementTree-1.0.5-20051216.tar.gz \ diff --git a/www/py-turbogears2/Makefile b/www/py-turbogears2/Makefile index f2b4f7d6715..062d586f290 100644 --- a/www/py-turbogears2/Makefile +++ b/www/py-turbogears2/Makefile @@ -69,7 +69,7 @@ PYTURBOGEARS_EGG= ${PORTNAME}-${PORTVERSION}-py${PYTHON_VER}.egg # www/py-cheerypy # When it happens, we shall remove the respective entry from TGDEPEGGS, # REG_TGDEPEGGS, distinfo, and add the dependent port to RUN_DEPENDS -OSRELEASE!= ${DESTDIR}/usr/bin/uname -r +OSRELEASE!= /usr/bin/uname -r ENVINFO= py${PYTHON_VER}-${OPSYS:L}-${OSRELEASE}-${ARCH}.egg TGDEPEGGS= CherryPy-2.2.1-py2.4.egg cElementTree-1.0.5-20051216.tar.gz \ diff --git a/www/py-webunit/Makefile b/www/py-webunit/Makefile index 395719f5805..bc9caaede41 100644 --- a/www/py-webunit/Makefile +++ b/www/py-webunit/Makefile @@ -18,7 +18,7 @@ COMMENT= Unit test your websites with code that acts like a web browser USE_PYTHON= yes USE_PYDISTUTILS= yes -EXAMPLESDIR= ${TARGETDIR}/share/examples/py-${PORTNAME} +EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} .if !defined(NOPORTEXAMPLES) post-install: diff --git a/www/rt2/Makefile b/www/rt2/Makefile index 0472f3193f4..52c787be6b2 100644 --- a/www/rt2/Makefile +++ b/www/rt2/Makefile @@ -83,7 +83,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-serv RUN_DEPENDS+= ${BUILD_DEPENDS} -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAKE_ENV= MAN3PREFIX=${MAN3PREFIX} .if defined(INSTALL_NEW) diff --git a/www/serendipity-devel/Makefile b/www/serendipity-devel/Makefile index d2de5052d11..eb92db7dc0f 100644 --- a/www/serendipity-devel/Makefile +++ b/www/serendipity-devel/Makefile @@ -52,10 +52,10 @@ RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick .endif do-install: - @-${MKDIR} ${TARGETDIR}/${SERENDIPITY} - @${CHMOD} 755 ${TARGETDIR}/${SERENDIPITY} - @(cd ${WRKSRC} && ${CP} -R * ${TARGETDIR}/${SERENDIPITY}/ ) - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TARGETDIR}/${SERENDIPITY} + @-${MKDIR} ${PREFIX}/${SERENDIPITY} + @${CHMOD} 755 ${PREFIX}/${SERENDIPITY} + @(cd ${WRKSRC} && ${CP} -R * ${PREFIX}/${SERENDIPITY}/ ) + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${SERENDIPITY} post-install: @${CAT} ${PKGMESSAGE} diff --git a/www/slash/Makefile b/www/slash/Makefile index 11345077573..38743933bc9 100644 --- a/www/slash/Makefile +++ b/www/slash/Makefile @@ -28,7 +28,7 @@ DOCS= README INSTALL CONFLICTS= metalist -MAN3PREFIX= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION} MAN3= FZ.3 Slash.3 Slash::Apache.3 Slash::Apache::Banlist.3 \ Slash::Apache::Log.3 Slash::Apache::User.3 \ Slash::Custom::Bulkmail.3 Slash::DB.3 Slash::DB::MySQL.3 \ diff --git a/www/snownews/Makefile b/www/snownews/Makefile index 62cfcc7b660..bd7459149f4 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -44,7 +44,7 @@ PLIST_SUB+= OPML="@comment " RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML PLIST_SUB+= OPML="" # opml2snow only have "" manpage -_MANPAGES+= ${TARGETDIR}/man/man1/opml2snow.1 +_MANPAGES+= ${PREFIX}/man/man1/opml2snow.1 .endif MAN1= snownews.1 diff --git a/www/visitors/Makefile b/www/visitors/Makefile index 9808aab4c62..76c342ae827 100644 --- a/www/visitors/Makefile +++ b/www/visitors/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= bin/visitors PORTDOCS= doc.html do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/visitors ${TARGETDIR}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/visitors ${PREFIX}/bin .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} diff --git a/www/youtube_dl/Makefile b/www/youtube_dl/Makefile index 81efc919913..4124b671246 100644 --- a/www/youtube_dl/Makefile +++ b/www/youtube_dl/Makefile @@ -39,6 +39,6 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' ${WRKSRC}/youtube-dl do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl ${TARGETDIR}/bin/youtube-dl + @${INSTALL_SCRIPT} ${WRKSRC}/youtube-dl ${PREFIX}/bin/youtube-dl .include <bsd.port.post.mk> diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile index a953ba558b3..3b3614ad081 100644 --- a/www/ziproxy/Makefile +++ b/www/ziproxy/Makefile @@ -69,7 +69,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/var/ziproxy/error/${FILE} ${DATADIR}/error/${FILE} .endfor - @${INSTALL_SCRIPT} ${WRKSRC}/src/tools/ziproxy_genhtml_stats.sh ${TARGETDIR}/bin + @${INSTALL_SCRIPT} ${WRKSRC}/src/tools/ziproxy_genhtml_stats.sh ${PREFIX}/bin @${CAT} ${PKGMESSAGE} |