Rename eel2 to eel, to match upstream name.

6 files changed, 19 insertions, 18 deletions

diff --git a/devel/Makefile b/devel/Makefile
index ea1ac3cce44..f28094bb592 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.892 2007/09/19 21:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.893 2007/09/20 21:21:03 wiz Exp $
 #
 
 COMMENT=	Development utilities
 
-SUBDIR+=	ArX2
+SUBDIR+=	ArX
 SUBDIR+=	ExmanIDE
 SUBDIR+=	GConf2
 SUBDIR+=	GConf2-ui
@@ -133,7 +133,7 @@ SUBDIR+=	doxygen
 SUBDIR+=	doxymacs
 SUBDIR+=	eclipse
 SUBDIR+=	edcommon
-SUBDIR+=	eel2
+SUBDIR+=	eel
 SUBDIR+=	eet
 SUBDIR+=	electricfence
 SUBDIR+=	elf
diff --git a/devel/eel2/DESCR b/devel/eel/DESCR
index 8c85062db09..8c85062db09 100644
--- a/devel/eel2/DESCR
+++ b/devel/eel/DESCR
diff --git a/devel/eel2/Makefile b/devel/eel/Makefile
index 1e3631011e2..10f88caabb0 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2007/09/19 23:13:14 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2007/09/20 21:21:04 wiz Exp $
 
 DISTNAME=	eel-2.18.3
-PKGNAME=	${DISTNAME:S/-/2-/}
 PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eel/2.18/}
@@ -18,6 +17,8 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	eel-2.0.pc.in
 
+CONFLICTS+=		eel2-[0-9]*
+
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.9.1
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.9.4
diff --git a/devel/eel2/PLIST b/devel/eel/PLIST
index 2948e209557..c7466882e55 100644
--- a/devel/eel2/PLIST
+++ b/devel/eel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/04/11 17:41:36 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2007/09/20 21:21:04 wiz Exp $
 include/eel-2/eel/eel-accessibility.h
 include/eel-2/eel/eel-alert-dialog.h
 include/eel-2/eel/eel-art-extensions.h
diff --git a/devel/eel2/buildlink3.mk b/devel/eel/buildlink3.mk
index 911f37d5a4f..9a77872d5b7 100644
--- a/devel/eel2/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,21 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.23 2007/09/19 23:13:14 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.1 2007/09/20 21:21:04 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
-EEL2_BUILDLINK3_MK:=	${EEL2_BUILDLINK3_MK}+
+EEL_BUILDLINK3_MK:=	${EEL_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	eel2
+BUILDLINK_DEPENDS+=	eel
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neel2}
-BUILDLINK_PACKAGES+=	eel2
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eel2
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Neel}
+BUILDLINK_PACKAGES+=	eel
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}eel
 
-.if !empty(EEL2_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.eel2+=	eel2>=2.10.0
-BUILDLINK_ABI_DEPENDS.eel2?=	eel2>=2.18.0.1nb1
-BUILDLINK_PKGSRCDIR.eel2?=	../../devel/eel2
-.endif	# EEL2_BUILDLINK3_MK
+.if !empty(EEL_BUILDLINK3_MK:M+)
+BUILDLINK_API_DEPENDS.eel+=	eel>=2.10.0
+BUILDLINK_ABI_DEPENDS.eel?=	eel>=2.18.0.1nb1
+BUILDLINK_PKGSRCDIR.eel?=	../../devel/eel
+.endif	# EEL_BUILDLINK3_MK
 
 .include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/gail/buildlink3.mk"
diff --git a/devel/eel2/distinfo b/devel/eel/distinfo
index 0e74afe64e0..854ad08bca5 100644
--- a/devel/eel2/distinfo
+++ b/devel/eel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2007/07/06 18:26:14 drochner Exp $
+$NetBSD: distinfo,v 1.8 2007/09/20 21:21:04 wiz Exp $
 
 SHA1 (eel-2.18.3.tar.bz2) = 03b841d6a542a527ecb689a0d550b57e84b33510
 RMD160 (eel-2.18.3.tar.bz2) = d74e6963266f12e053cebf475aabd3cd5b6f90c3