[pkgsrc/trunk]: pkgsrc/devel o Register conflict between elib and emacs20-eli...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5b5f74c827d
branches:  trunk
changeset: 463578:f5b5f74c827d
user:      cube <cube%pkgsrc.org@localhost>
date:      Tue Nov 18 16:29:50 2003 +0000

description:
o Register conflict between elib and emacs20-elib in elib's Makefile
o Make it so PKGREVISION bumps of elib don't affect emacs20-elib
o Bump PKGREVISION of elib and pcl-cvs

diffstat:

 devel/elib/Makefile         |  6 ++++--
 devel/emacs20-elib/Makefile |  3 ++-
 devel/pcl-cvs/Makefile      |  5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 318c1a833c8f -r f5b5f74c827d devel/elib/Makefile
--- a/devel/elib/Makefile       Tue Nov 18 16:28:13 2003 +0000
+++ b/devel/elib/Makefile       Tue Nov 18 16:29:50 2003 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.9 2003/08/09 10:44:39 seb Exp $
+# $NetBSD: Makefile,v 1.10 2003/11/18 16:29:50 cube Exp $
 #
 
 DISTNAME=      elib-1.0
-PKGREVISION=   1
+PKGREVISION?=  2
 CATEGORIES=    devel
 MASTER_SITES=  http://jde.sunsite.dk/
 
 MAINTAINER=    cjones%NetBSD.org@localhost
 COMMENT=       Library of utility functions for Emacs
 
+CONFLICTS+=    emacs20-elib-[0-9]*
+
 .include "../../mk/emacs.mk"
 
 BUILD_ENV+=    EMACS=${EMACS_FLAVOR}
diff -r 318c1a833c8f -r f5b5f74c827d devel/emacs20-elib/Makefile
--- a/devel/emacs20-elib/Makefile       Tue Nov 18 16:28:13 2003 +0000
+++ b/devel/emacs20-elib/Makefile       Tue Nov 18 16:29:50 2003 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/11/18 16:22:34 cube Exp $
+# $NetBSD: Makefile,v 1.2 2003/11/18 16:29:50 cube Exp $
 
 PKGNAME=       emacs20-${DISTNAME}
+PKGREVISION=   # defined
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/elib/distinfo
 PATCHDIR=      ${.CURDIR}/../../devel/elib/patches
diff -r 318c1a833c8f -r f5b5f74c827d devel/pcl-cvs/Makefile
--- a/devel/pcl-cvs/Makefile    Tue Nov 18 16:28:13 2003 +0000
+++ b/devel/pcl-cvs/Makefile    Tue Nov 18 16:29:50 2003 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2003/08/09 10:44:48 seb Exp $
+# $NetBSD: Makefile,v 1.9 2003/11/18 16:29:50 cube Exp $
 #
 
 DISTNAME=      pcl-cvs-2.9.9
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/
 
@@ -9,7 +10,7 @@
 #HOMEPAGE=
 COMMENT=       Front-end to CVS for emacs
 
-DEPENDS+=      ${PKGNAME_PREFIX}elib>=1.0:../../devel/elib
+DEPENDS+=      emacs20-elib>=1.0:../../devel/emacs20-elib
 
 CONFLICTS=     emacs-21.*
 CONFLICTS+=    emacs21