summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--share/man/man5/bsd.port.mk.522
-rw-r--r--share/man/man5/port-modules.56
2 files changed, 5 insertions, 23 deletions
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index 30de81ef0a7..d22c4035995 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.506 2019/03/10 21:31:49 jmc Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.507 2019/04/03 02:18:03 naddy Exp $
.\"
.\" Copyright (c) 2000-2008 Marc Espie
.\"
@@ -24,7 +24,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 10 2019 $
+.Dd $Mdocdate: April 3 2019 $
.Dt BSD.PORT.MK 5
.Os
.Sh NAME
@@ -951,12 +951,6 @@ Several versions of automake may coexist peacefully.
.Ev AUTOMAKE_VERSION
must be set before trying to run automake.
Defaults to 1.4.
-Note that even if
-.Ev CONFIGURE_STYLE
-includes automake,
-automake should still be run manually during the right
-.Cm configure
-stage.
.It Ev AUTOUPDATE
Location of the autoupdate binary.
Defaults to autoupdate.
@@ -1453,18 +1447,6 @@ if autoconf needs to be rerun first,
but set
.Sq no-autoheader
to prevent autoheader from running.
-Add
-.Sq automake
-if automake may need to be rerun.
-Otherwise, automake will be explicitly disabled.
-Note that automake is never run automatically.
-In order to use it,
-.Ev CONFIGURE_STYLE
-should include
-.Sq automake
-and there should be a
-.Cm {pre,do}-configure
-target running automake.
.Pp
If
.Sq imake ,
diff --git a/share/man/man5/port-modules.5 b/share/man/man5/port-modules.5
index 9fe9617163c..1ead031d549 100644
--- a/share/man/man5/port-modules.5
+++ b/share/man/man5/port-modules.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: port-modules.5,v 1.236 2019/03/28 08:02:33 ajacoutot Exp $
+.\" $OpenBSD: port-modules.5,v 1.237 2019/04/03 02:18:03 naddy Exp $
.\"
.\" Copyright (c) 2008 Marc Espie
.\"
@@ -24,7 +24,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: March 28 2019 $
+.Dd $Mdocdate: April 3 2019 $
.Dt PORT-MODULES 5
.Os
.Sh NAME
@@ -200,7 +200,7 @@ will do nothing.
.Pp
Some
.Ev CONFIGURE_STYLE
-values, namely perl, gnu, imake, automake, autoconf, and autoupdate
+values, namely perl, gnu, imake, autoconf, and autoupdate
will automatically import the correct module.
User-defined modules must both add to
.Ev CONFIGURE_STYLE