diff options
author | jlam <jlam@pkgsrc.org> | 2005-05-21 04:10:17 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-05-21 04:10:17 +0000 |
commit | d1ecb58e0716a9dcd58a608ac1a590ca20166634 (patch) | |
tree | 11ff742379fef639c652a8c2c7c8c1de53e583ee /www | |
parent | a4318791f11b71dc67a3de3b83a7eec52805434d (diff) | |
download | pkgsrc-d1ecb58e0716a9dcd58a608ac1a590ca20166634.tar.gz |
SUBST_FILES.* must be relative to ${WRKSRC}.
Diffstat (limited to 'www')
-rw-r--r-- | www/ap2-fastcgi/Makefile | 4 | ||||
-rw-r--r-- | www/apache2/Makefile | 10 | ||||
-rw-r--r-- | www/opera/Makefile | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/www/ap2-fastcgi/Makefile b/www/ap2-fastcgi/Makefile index d84a146743e..786b9dd33d9 100644 --- a/www/ap2-fastcgi/Makefile +++ b/www/ap2-fastcgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/12/09 22:52:03 seb Exp $ +# $NetBSD: Makefile,v 1.3 2005/05/21 04:10:18 jlam Exp $ .include "../../www/ap-fastcgi/Makefile.common" @@ -11,7 +11,7 @@ MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} SUBST_CLASSES+= ap2 SUBST_STAGE.ap2= pre-build -SUBST_FILES.ap2= ${WRKSRC}/Makefile +SUBST_FILES.ap2= Makefile SUBST_SED.ap2= -e s,/usr/local/apache2,${PREFIX}/share/httpd, post-patch: diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 68196d29221..1efe245961e 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2005/05/21 03:49:52 reed Exp $ +# $NetBSD: Makefile,v 1.75 2005/05/21 04:10:18 jlam Exp $ .include "Makefile.common" @@ -99,10 +99,10 @@ SUBST_SED.apr-lt= -e "s|^\(LIBTOOL =\) [^ ]*|\1 \$$(SHELL) \$$(top_builddir)/lib SUBST_MESSAGE.apr-lt= "Fixing libtool references." SUBST_CLASSES+= confs -SUBST_STAGE.confs= post-install -SUBST_FILES.confs= ${EGDIR}/highperformance-std.conf \ - ${EGDIR}/httpd-std.conf \ - ${EGDIR}/ssl-std.conf +SUBST_STAGE.confs= post-configure +SUBST_FILES.confs= docs/conf/highperformance-std.conf \ + docs/conf/httpd-std.conf \ + docs/conf/ssl-std.conf SUBST_SED.confs= -e "s|${EGDIR}|${PKG_SYSCONFDIR}|g" \ -e "s|${PREFIX}/htdocs|${PREFIX}/share/httpd/htdocs|g" \ -e "s|${PREFIX}/conf|${PKG_SYSCONFDIR}|g" \ diff --git a/www/opera/Makefile b/www/opera/Makefile index 661c6d73148..c061c07ad92 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/05/20 19:48:34 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/05/21 04:10:18 jlam Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} PKGREVISION= # empty @@ -91,8 +91,8 @@ NO_BUILD= YES USE_PKGINSTALL= YES SUBST_CLASSES+= opera -SUBST_STAGE.opera= pre-install -SUBST_FILES.opera= ${WRKSRC}/man/opera.1 +SUBST_STAGE.opera= post-build +SUBST_FILES.opera= man/opera.1 SUBST_SED.opera= -e 's,/usr/,${PREFIX}/,g' .endif @@ -135,7 +135,7 @@ post-install: # regenerate distinfo for all ports supported by this package opera-distinfo: - ( echo '$$NetBSD: Makefile,v 1.35 2005/05/20 19:48:34 jlam Exp $$'; echo ''; \ + ( echo '$$NetBSD: Makefile,v 1.36 2005/05/21 04:10:18 jlam Exp $$'; echo ''; \ _OPERA_OPSYS=NetBSD ${MAKE} distinfo 1>&2; \ ${GREP} opera distinfo; \ _OPERA_OPSYS=FreeBSD ${MAKE} distinfo 1>&2; \ |