summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-11-14 11:18:31 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-11-14 11:18:31 +0000
commit2e00e7bcf510d4ae4057a23f19232a59919844a0 (patch)
tree64c6cf8846d8353f4c6e85ba966b95b8b87a6e28
parent0bfc2962b1ac769c666310c8b6cf826a5c43ef9a (diff)
document the new simpler way to do specs
-rw-r--r--share/man/man5/bsd.port.mk.58
-rw-r--r--share/man/man7/packages-specs.736
2 files changed, 22 insertions, 22 deletions
diff --git a/share/man/man5/bsd.port.mk.5 b/share/man/man5/bsd.port.mk.5
index fba41b3b624..1cfb4795692 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.270 2010/11/13 10:43:20 espie Exp $
+.\" $OpenBSD: bsd.port.mk.5,v 1.271 2010/11/14 11:18:30 espie 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: November 13 2010 $
+.Dd $Mdocdate: November 14 2010 $
.Dt BSD.PORT.MK 5
.Os
.Sh NAME
@@ -741,7 +741,7 @@ Set based on corresponding INSTALL_* variables.
.It Ev BUILD_DEPENDS
List of other ports the current port needs to build correctly.
Each item has the form
-.Sq :[pkgspec]:directory[,-subpackage][,flavor ...][:target] .
+.Sq [pkgspec:]directory[,-subpackage][,flavor ...][:target] .
.Sq target
defaults to
.Sq install
@@ -1276,7 +1276,7 @@ to package installation time.
.It Ev LIB_DEPENDS
Libraries this port depends upon.
Each item has the form
-.Sq :[pkgspec]:directory[,-subpackage][,flavor ...] .
+.Sq [pkgspec:]directory[,-subpackage][,flavor ...] .
Similar to
.Ev BUILD_DEPENDS
and
diff --git a/share/man/man7/packages-specs.7 b/share/man/man7/packages-specs.7
index ccc10a38585..c4ee70bcd9e 100644
--- a/share/man/man7/packages-specs.7
+++ b/share/man/man7/packages-specs.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: packages-specs.7,v 1.13 2010/07/11 07:25:10 espie Exp $
+.\" $OpenBSD: packages-specs.7,v 1.14 2010/11/14 11:18:30 espie Exp $
.\"
.\" Copyright (c) 2001 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: July 11 2010 $
+.Dd $Mdocdate: November 14 2010 $
.Dt PACKAGES-SPECS 7
.Os
.Sh NAME
@@ -133,15 +133,10 @@ or
.Ev RUN_DEPENDS .
All those conform to
.Bd -literal -offset indent
-[legacy]:[pkgspec]:directory,[-multi],[flavor...]
+[pkgspec:]directory,[-multi],[flavor...]
.Ed
.Pp
The
-.Ar [legacy]
-part of the dependency corresponds to older semantics that have been
-deprecated.
-.Pp
-The
.Ar directory,[-multi],[flavor...]
part of the dependency is always used to obtain the default dependency for
the given package (the package that will be built and installed if no package
@@ -149,17 +144,15 @@ is found).
The corresponding package name is also used as a package specification,
after removing any version and flavor requirements.
.Pp
-If the
-.Sq pkgspec
-part is left empty, any package with the right stem will do: in effect,
+Without a
+.Sq pkgspec:
+part, any package with the right stem will do: in effect,
the pkgspec used is
.Sq stem-* .
.Pp
An explicit specification such as
-.Qq ghostscript-*
-may be used to ask for any version of package ghostscript,
-or a more specific version number may be required, such as
.Qq png-1.0.7 .
+may be used to ask for a more specific version number.
Version numbers may also include ranges, separated by commas, so for
instance,
.Qq foo->=1.3
@@ -167,12 +160,16 @@ would match any foo with version at least 1.3, and
.Qq foo->=1.3,<=1.5
would match any version of foo between 1.3 and 1.5, inclusive.
.Pp
+As a convenience, the ports tree recognizes a specification that starts
+with STEM, and will replace this with the correct stem, which can be useful
+for embarrassingly long package names.
+.Pp
If the flavor specification is left blank, any flavor will do.
Note that most default package names don't contain flavor specification,
-which means that any flavor will do.
+which means that any flavor will do
For instance, in
.Bd -literal -offset indent
-LIB_DEPENDS=::graphics/aalib
+LIB_DEPENDS = graphics/aalib
.Ed
.Pp
both
@@ -190,7 +187,7 @@ append
.Sq -!f .
In the preceding case, one may use
.Bd -literal -offset indent
-LIB_DEPENDS=:aalib-*-!no_x11:graphics/aalib
+LIB_DEPENDS = aalib-*-!no_x11:graphics/aalib
.Ed
.Pp
to ensure the no_x11 flavor is not picked.
@@ -240,5 +237,8 @@ and so would check on
.Xr packages 7 ,
.Xr ports 7
.Sh HISTORY
-Support for these package specifications first appeared in
+Support for a more complex form of those package specifications first
+appeared in
.Ox 2.9 .
+The current simplified form was introduced in
+.Ox 4.9 .