diff options
| author | tron <tron@pkgsrc.org> | 1999-08-30 22:48:05 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1999-08-30 22:48:05 +0000 |
| commit | 8fd422e2976bc23acd02d94b8fb700d95196c636 (patch) | |
| tree | 69dfed4ab350a4c79784cf945ef08d68bdedc1d0 /Packages.txt | |
| parent | 795b7e73318ebef631b46d76e21c54cd9fc71334 (diff) | |
| download | pkgsrc-8fd422e2976bc23acd02d94b8fb700d95196c636.tar.gz | |
Update section 9.13 to mention auto conflicts between package with the
same name and a different version string. Fixes PR pkg/8293 by
Geoff C. Wing.
Diffstat (limited to 'Packages.txt')
| -rw-r--r-- | Packages.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Packages.txt b/Packages.txt index 88fc7369a3c..4c1f1d7d50b 100644 --- a/Packages.txt +++ b/Packages.txt @@ -1,4 +1,4 @@ -# $NetBSD: Packages.txt,v 1.62 1999/08/29 22:27:11 rh Exp $ +# $NetBSD: Packages.txt,v 1.63 1999/08/30 22:48:05 tron Exp $ ########################################################################### ========================== @@ -1316,18 +1316,18 @@ files like another package in our pkgsrc tree. In this case you can set CONFLICTS to a space seperated list of packages (including version string) your package conflicts with. -For example pkgsrc/devel/cvs and pkgsrc/devel/cvs-current install both -the same files, thus you set in pkgsrc/devel/cvs/Makefile: +For example pkgsrc/x11/Xaw3d and pkgsrc/x11/Xaw-Xpm install provide the +same shared library, thus you set in pkgsrc/x11/Xaw3d/Makefile: -CONFLICTS= cvs-1.9.26 cvs-1.9.27 cvs-1.9.28 +CONFLICTS= Xaw-Xpm-* -and in pkgsrc/devel/cvs-current/Makefile: +and in pkgsrc/x11/Xaw-Xpm/Makefile: -CONFLICTS= cvs-1.9 cvs-1.9.26 cvs-1.9.27 - -assuming that cvs is version 1.9 and cvs-current is cvs-1.9.28, and we had -already cvs-1.9.26 and cvs-1.9.27 in our pkgsrc tree. +CONFLICTS= Xaw3d-* +Packages will automatically conflict with other packages with the name prefix +and a different version string. "Xaw3d-1.5" e.g. will automatically conflict +with the older version "Xaw3d-1.3". 9.14 Software which has a WWW Home Page ======================================= |