SCRIPTDIR and SCRIPTS_ENV are obsolete now.

1 files changed, 18 insertions, 5 deletions

diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 407c65e1ece..43713a0e6df 100644
--- a/share/man/man5/bsd.port.mk.5
+++ b/share/man/man5/bsd.port.mk.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bsd.port.mk.5,v 1.178 2006/11/02 16:54:16 jmc Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.179 2006/11/03 17:14:12 espie Exp $
 .\"
 .\" Copyright (c) 2000 Marc Espie
 .\"
@@ -176,7 +176,7 @@ Short hand for make clean=depends.
 Configure the port.
 Might be a void operation.
 Unless overridden, configure creates the ${WRKBUILD}
-directory (see SEPARATE_BUILD), runs ${SCRIPTDIR}/configure if it exists,
+directory (see SEPARATE_BUILD), 
 and runs whatever configuration methods are recorded in
 .Ev CONFIGURE_STYLE .
 .It Ar depends
@@ -1476,9 +1476,6 @@ The corresponding packages will be built at
 stage, and
 .Xr pkg_add 1
 will take care of installing them.
-.It Ev SCRIPTDIR
-Location for scripts related to the current port (default: scripts.${ARCH}
-or scripts).
 .It Ev SEPARATE_BUILD
 Many GNU configure ports can be built in a directory distinct from the
 place they were unpacked.
@@ -2073,6 +2070,17 @@ instead.
 old pipeline for creating packing-lists at the ports level.
 Necessary functionality has been integrated directly into
 .Xr pkg_create 1 .
+.It Ev SCRIPTDIR
+Old location for scripts related to the current port.
+There is no reason for the semantic distinction, use
+.Ev FILESDIR
+for those.
+.It Ev SCRIPTS_ENV
+Used to contain the Environment for invoking various scripts.
+.Ev CONFIGURE_ENV
+and
+.Ev MAKE_ENV
+are enough.
 .It Ev USE_AUTOCONF
 Use
 .Ev CONFIGURE_STYLE
@@ -2101,6 +2109,11 @@ to match other BSD, and save directories.
 .It Pa ${SCRIPTDIR}/{pre,do,post}-*
 Identical functionality can be obtained through a {pre,do,post}-* target,
 invoking the script manually if necessary.
+.It Pa ${SCRIPTDIR}/configure
+No longer invoked automatically. Just inline the instructions in
+.Ar do-configure 
+in the Makefile, or put the script in ${FILESDIR} and
+invoke it.
 .It Pa ${PKGDIR}/COMMENT
 Use COMMENT variable instead.
 .It Pa ${PKGDIR}/PLIST.noshared