[pkgsrc/trunk]: pkgsrc SUBST_FILES.* must be relative to ${WRKSRC}.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc SUBST_FILES.* must be relative to ${WRKSRC}.
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 01:49:34 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5fe9ffb657f0
branches:  trunk
changeset: 494221:5fe9ffb657f0
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat May 21 04:10:17 2005 +0000

description:
SUBST_FILES.* must be relative to ${WRKSRC}.

diffstat:

 devel/monotone-server/Makefile               |   4 ++--
 fonts/XFree86-fontsEncodings/Makefile.common |   4 ++--
 graphics/dia/Makefile.common                 |   4 ++--
 mail/sendmail/Makefile                       |   4 ++--
 net/mrtg/Makefile                            |   6 +++---
 pkgtools/pkg_alternatives/Makefile           |   4 ++--
 security/amavisd-new/Makefile                |   4 ++--
 security/fprot-workstation-bin/Makefile      |   5 ++---
 sysutils/gkrellm-server/Makefile             |   4 ++--
 sysutils/gkrellm/Makefile                    |   4 ++--
 www/ap2-fastcgi/Makefile                     |   4 ++--
 www/apache2/Makefile                         |  10 +++++-----
 www/opera/Makefile                           |   8 ++++----
 13 files changed, 32 insertions(+), 33 deletions(-)

diffs (254 lines):

diff -r 6551653ac05d -r 5fe9ffb657f0 devel/monotone-server/Makefile
--- a/devel/monotone-server/Makefile    Sat May 21 03:49:52 2005 +0000
+++ b/devel/monotone-server/Makefile    Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/04 12:18:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/21 04:10:17 jlam Exp $
 #
 
 DISTNAME=      monotone-server-0.19
@@ -38,7 +38,7 @@
 SUBST_CLASSES+=                vars
 SUBST_STAGE.vars=      do-configure
 SUBST_MESSAGE.vars=    "Configuring sources."
-SUBST_FILES.vars=      ${WRKSRC}/*
+SUBST_FILES.vars=      *
 SUBST_SED.vars=                -e 's|@MONOTONE@|${PREFIX}/bin/monotone|g'
 SUBST_SED.vars+=       -e 's|@MONOTONE_GROUP@|${MONOTONE_GROUP}|g'
 SUBST_SED.vars+=       -e 's|@MONOTONE_USER@|${MONOTONE_USER}|g'
diff -r 6551653ac05d -r 5fe9ffb657f0 fonts/XFree86-fontsEncodings/Makefile.common
--- a/fonts/XFree86-fontsEncodings/Makefile.common      Sat May 21 03:49:52 2005 +0000
+++ b/fonts/XFree86-fontsEncodings/Makefile.common      Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/05/21 04:10:17 jlam Exp $
 #
 # Makefile fragment used by XFree86-fonts* packages.
 
@@ -44,7 +44,7 @@
 
 SUBST_CLASSES+=                large
 SUBST_STAGE.large=     pre-build
-SUBST_FILES.large=     ${WRKDIR}/xc/fonts/encodings/large/Makefile
+SUBST_FILES.large=     large/Makefile
 SUBST_SED.large=       -e 's,/usr/X11R6,${X11ROOT},g'
 SUBST_MESSAGE.large=   "Fixing large Makefile."
 
diff -r 6551653ac05d -r 5fe9ffb657f0 graphics/dia/Makefile.common
--- a/graphics/dia/Makefile.common      Sat May 21 03:49:52 2005 +0000
+++ b/graphics/dia/Makefile.common      Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/05/21 04:10:17 jlam Exp $
 #
 
 DISTNAME=      dia-0.94
@@ -24,7 +24,7 @@
 SUBST_CLASSES+=                intl
 SUBST_MESSAGE.intl=    "Fixing path to installed files."
 SUBST_STAGE.intl=      pre-configure
-SUBST_FILES.intl=      ${WRKSRC}/lib/intl.c
+SUBST_FILES.intl=      lib/intl.c
 SUBST_SED.intl=                -e 's,%%PREFIX%%,${PREFIX},g'
 
 .if empty(PKGNAME:Mdia-[0-9]*)
diff -r 6551653ac05d -r 5fe9ffb657f0 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Sat May 21 03:49:52 2005 +0000
+++ b/mail/sendmail/Makefile    Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/04/01 18:42:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.76 2005/05/21 04:10:17 jlam Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -15,7 +15,7 @@
 
 SUBST_CLASSES=         paths
 SUBST_STAGE.paths=     pre-build
-SUBST_FILES.paths=     ${WRKDIR}/mailer.conf include/sm/conf.h smrsh/smrsh.8
+SUBST_FILES.paths=     ../mailer.conf include/sm/conf.h smrsh/smrsh.8
 SUBST_SED.paths=       -e "s|@@PREFIX@@|${PREFIX}|g" \
                        -e "s|@@SMRSH_CMDDIR@@|${SMRSH_CMDDIR}|g"
 SUBST_MESSAGE.paths=   Fixing paths.
diff -r 6551653ac05d -r 5fe9ffb657f0 net/mrtg/Makefile
--- a/net/mrtg/Makefile Sat May 21 03:49:52 2005 +0000
+++ b/net/mrtg/Makefile Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/04/11 21:46:50 tv Exp $
+# $NetBSD: Makefile,v 1.60 2005/05/21 04:10:18 jlam Exp $
 
 DISTNAME=      mrtg-2.11.1
 PKGREVISION=   1
@@ -54,8 +54,8 @@
 
 SUBST_CLASSES+=                files
 SUBST_STAGE.files=     post-patch
-SUBST_FILES.files=     ${WRKDIR}/mrtg.conf.example ${WRKDIR}/netstat2mrtg \
-                       ${WRKDIR}/sys2mrtg ${WRKDIR}/envstat2mrtg       
+SUBST_FILES.files=     ../mrtg.conf.example ../netstat2mrtg            \
+                       ../sys2mrtg ../envstat2mrtg     
 SUBST_SED.files=       -e "s|@PREFIX@|${PREFIX}|g"
 SUBST_MESSAGE.files=   "Fixing default configuration files."
 
diff -r 6551653ac05d -r 5fe9ffb657f0 pkgtools/pkg_alternatives/Makefile
--- a/pkgtools/pkg_alternatives/Makefile        Sat May 21 03:49:52 2005 +0000
+++ b/pkgtools/pkg_alternatives/Makefile        Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:05 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/21 04:10:18 jlam Exp $
 #
 
 DISTNAME=      pkg_alternatives-1.3
@@ -34,7 +34,7 @@
 SUBST_CLASSES+=                vars
 SUBST_STAGE.vars=      do-configure
 SUBST_MESSAGE.vars=    "Configuring sources."
-SUBST_FILES.vars=      ${WRKSRC}/*
+SUBST_FILES.vars=      *
 SUBST_SED.vars=                -e 's|@CONFDIR@|${PKG_SYSCONFDIR}|g'
 SUBST_SED.vars+=       -e 's|@DATADIR@|${DATADIR}|g'
 SUBST_SED.vars+=       -e 's|@DBDIR@|${DBDIR}|g'
diff -r 6551653ac05d -r 5fe9ffb657f0 security/amavisd-new/Makefile
--- a/security/amavisd-new/Makefile     Sat May 21 03:49:52 2005 +0000
+++ b/security/amavisd-new/Makefile     Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/21 04:10:18 jlam Exp $
 
 DISTNAME=      amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=       amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -95,7 +95,7 @@
 
 SUBST_CLASSES+=                amavisd
 SUBST_STAGE.amavisd=   pre-build
-SUBST_FILES.amavisd=   ${WRKSRC}/amavisd ${WRKSRC}/amavisd.conf
+SUBST_FILES.amavisd=   amavisd amavisd.conf
 SUBST_SED.amavisd=     \
        -e "s|/etc/amavisd.conf|${PKG_SYSCONFDIR}/amavisd.conf|"        \
        -e "s|@AMAVIS_DIR@|${AMAVIS_DIR}|g"                             \
diff -r 6551653ac05d -r 5fe9ffb657f0 security/fprot-workstation-bin/Makefile
--- a/security/fprot-workstation-bin/Makefile   Sat May 21 03:49:52 2005 +0000
+++ b/security/fprot-workstation-bin/Makefile   Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/21 04:10:18 jlam Exp $
 #
 
 DISTNAME=              #defined
@@ -60,8 +60,7 @@
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   "Configuring default paths."
 SUBST_STAGE.paths=     post-patch
-SUBST_FILES.paths+=    ${WRKSRC}/tools/check-updates.pl \
-                       ${WRKSRC}/f-prot.sh
+SUBST_FILES.paths+=    tools/check-updates.pl f-prot.sh
 SUBST_SED.paths=       -e "s,/usr/local/f-prot,${FPDIR},g" \
                        -e "s,/usr/bin/perl,${PREFIX}/bin/perl,g"
 
diff -r 6551653ac05d -r 5fe9ffb657f0 sysutils/gkrellm-server/Makefile
--- a/sysutils/gkrellm-server/Makefile  Sat May 21 03:49:52 2005 +0000
+++ b/sysutils/gkrellm-server/Makefile  Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/21 04:10:18 jlam Exp $
 .include "../../sysutils/gkrellm/Makefile.common"
 
 PKGREVISION=           # empty1
@@ -29,7 +29,7 @@
 .include "../../mk/bsd.options.mk"
 
 SUBST_STAGE.gkprefix=  post-patch
-SUBST_FILES.gkprefix=  ${WRKSRC}/server/gkrellmd.h
+SUBST_FILES.gkprefix=  server/gkrellmd.h
 SUBST_SED.gkprefix=    -e '/GKRELLMD_SYS_ETC/{s!/etc!${PREFIX}&!;}'
 SUBST_CLASSES+=                gkprefix
 
diff -r 6551653ac05d -r 5fe9ffb657f0 sysutils/gkrellm/Makefile
--- a/sysutils/gkrellm/Makefile Sat May 21 03:49:52 2005 +0000
+++ b/sysutils/gkrellm/Makefile Sat May 21 04:10:17 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/21 04:10:18 jlam Exp $
 .include "Makefile.common"
 
 PKGREVISION=           # empty1
@@ -25,7 +25,7 @@
 MAKE_ENV+=             BINOWNER=${BINOWN} BINGROUP=${BINGRP}
 
 SUBST_STAGE.gkprefix=  post-patch
-SUBST_FILES.gkprefix=  ${WRKSRC}/src/gkrellm.h
+SUBST_FILES.gkprefix=  src/gkrellm.h
 SUBST_SED.gkprefix=    -e '/SYSTEM_/{s!/usr!${PREFIX}!;}'
 SUBST_CLASSES+=                gkprefix
 
diff -r 6551653ac05d -r 5fe9ffb657f0 www/ap2-fastcgi/Makefile
--- a/www/ap2-fastcgi/Makefile  Sat May 21 03:49:52 2005 +0000
+++ b/www/ap2-fastcgi/Makefile  Sat May 21 04:10:17 2005 +0000
@@ -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 @@
 
 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 -r 6551653ac05d -r 5fe9ffb657f0 www/apache2/Makefile
--- a/www/apache2/Makefile      Sat May 21 03:49:52 2005 +0000
+++ b/www/apache2/Makefile      Sat May 21 04:10:17 2005 +0000
@@ -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_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 -r 6551653ac05d -r 5fe9ffb657f0 www/opera/Makefile
--- a/www/opera/Makefile        Sat May 21 03:49:52 2005 +0000
+++ b/www/opera/Makefile        Sat May 21 04:10:17 2005 +0000
@@ -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 @@
 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 @@
 
 # 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; \
Prev by Date: [pkgsrc/trunk]: pkgsrc/security/cyrus-sasl2 Make this compile with gcc4.
Next by Date: [pkgsrc/trunk]: pkgsrc/www/navigator Use tar instead of gtar; remove gtar fro...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/security/cyrus-sasl2 Make this compile with gcc4.
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/navigator Use tar instead of gtar; remove gtar fro...
Indexes:
Home | Main Index | Thread Index | Old Index