summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/monotone-server/Makefile4
-rw-r--r--fonts/XFree86-fontsEncodings/Makefile.common4
-rw-r--r--graphics/dia/Makefile.common4
-rw-r--r--mail/sendmail/Makefile4
-rw-r--r--net/mrtg/Makefile6
-rw-r--r--pkgtools/pkg_alternatives/Makefile4
-rw-r--r--security/amavisd-new/Makefile4
-rw-r--r--security/fprot-workstation-bin/Makefile5
-rw-r--r--sysutils/gkrellm-server/Makefile4
-rw-r--r--sysutils/gkrellm/Makefile4
-rw-r--r--www/ap2-fastcgi/Makefile4
-rw-r--r--www/apache2/Makefile10
-rw-r--r--www/opera/Makefile8
13 files changed, 32 insertions, 33 deletions
diff --git a/devel/monotone-server/Makefile b/devel/monotone-server/Makefile
index 8c6888439fc..8985709d66c 100644
--- a/devel/monotone-server/Makefile
+++ b/devel/monotone-server/Makefile
@@ -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 @@ PKG_GROUPS= ${MONOTONE_GROUP}
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 --git a/fonts/XFree86-fontsEncodings/Makefile.common b/fonts/XFree86-fontsEncodings/Makefile.common
index a9b2b4e56dc..b2fc9ef7929 100644
--- a/fonts/XFree86-fontsEncodings/Makefile.common
+++ b/fonts/XFree86-fontsEncodings/Makefile.common
@@ -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 @@ do-configure:
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 --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index e289d5a82ec..4df1cb8d097 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -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 @@ CONFIGURE_ARGS+= --without-python
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 --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index d8c2060377a..bd008c45056 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -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 @@ PLIST_SUBST+= SMRSH_CMDDIR=${SMRSH_CMDDIR}
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 --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index bf953f43f38..71329df1aae 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -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 @@ CONF_FILES= ${EGDIR}/mrtg.conf ${PKG_SYSCONFDIR}/mrtg.conf
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 --git a/pkgtools/pkg_alternatives/Makefile b/pkgtools/pkg_alternatives/Makefile
index c3e9211b033..4bcadcb0841 100644
--- a/pkgtools/pkg_alternatives/Makefile
+++ b/pkgtools/pkg_alternatives/Makefile
@@ -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 @@ CONF_FILES= ${EGDIR}/filter.conf ${PKG_SYSCONFDIR}/filter.conf
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 --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 83dc967aafd..6692c9b7484 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -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 @@ do-build: replace-interpreter
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 --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index 08ee1c917e4..2541f5a2b7e 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -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 @@ DIST_SUBDIR= ${DISTNAME}
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 --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index c4bda3d0ffb..6afd6ae5c4d 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -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 @@ PKG_DEFAULTS_OPTIONS?= # empty
.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 --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 9d5fed4d410..f3e85688c1c 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -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+= MODULES=src LINK_FLAGS=${EXPORT_SYMBOLS_LDFLAGS}
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 --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; \
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 11:19:35 +0000