summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2003-11-18 16:29:50 +0000
committercube <cube@pkgsrc.org>2003-11-18 16:29:50 +0000
commit367bfc567f02b94433ea3bc1f68197e639a326c5 (patch)
treeae86d8bd396dd275b3cb70942c2732267a1a740c
parent2054da7292c5371ba8454db74a8305d14235deb9 (diff)
downloadpkgsrc-367bfc567f02b94433ea3bc1f68197e639a326c5.tar.gz
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
-rw-r--r--devel/elib/Makefile6
-rw-r--r--devel/emacs20-elib/Makefile3
-rw-r--r--devel/pcl-cvs/Makefile5
3 files changed, 9 insertions, 5 deletions
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index a3e2cf6ef69..48a645bb5fd 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -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
COMMENT= Library of utility functions for Emacs
+CONFLICTS+= emacs20-elib-[0-9]*
+
.include "../../mk/emacs.mk"
BUILD_ENV+= EMACS=${EMACS_FLAVOR}
diff --git a/devel/emacs20-elib/Makefile b/devel/emacs20-elib/Makefile
index e2fe90ba3be..26e61eac026 100644
--- a/devel/emacs20-elib/Makefile
+++ b/devel/emacs20-elib/Makefile
@@ -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 --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index c72a612b21e..0373c0a4831 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org
#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