- Move x11-toolkits/eel2 -> x11-toolkits/eel

10 files changed, 4 insertions, 5 deletions

diff --git a/MOVED b/MOVED
index 9ce7c16735c7..eb4719b774bf 100644
--- a/MOVED
+++ b/MOVED
@@ -991,7 +991,6 @@ x11-toolkits/libgnomeprintui20||2004-03-23|removed obsolete port
 textproc/whitespace.el||2004-03-24|removed obsolete port
 editors/openoffice-1.1-sl-SL|editors/openoffice-1.1-sl_SI|2004-03-25|correct ISO code
 www/webcpp|textproc/webcpp|2004-03-25|moved to textproc category
-x11-toolkits/eel||2004-03-25|removed obsolete port
 editors/xemacs21|editors/xemacs|2004-03-27|removed old version of xemacs 21.x
 mail/mew-xemacs21|mail/mew|2004-03-28|removed old version of xemacs 21.x
 mail/mew2-xemacs21|mail/mew2|2004-03-28|removed old version of xemacs 21.x
@@ -1379,3 +1378,4 @@ www/turck-mmcache|www/eaccelerator|2005-01-19|project changed name
 sysutils/task|sysutils/sleuthkit|2005-01-19|broken, unmaintained, better alternative exists
 graphics/gthumb2|graphics/gthumb|2005-01-23|moved to non-versioned directory
 devel/bugbuddy2|devel/bugbuddy|2005-01-24|moved to non-versioned directory
+x11-toolkits/eel2|x11-toolkits/eel|2005-01-25|moved to non-versioned directory
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index cf3c3c3f198a..7475b95fc9e0 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -362,7 +362,7 @@ librsvg2_LIB_DEPENDS=	rsvg-2.10:${PORTSDIR}/graphics/librsvg2
 librsvg2_DETECT=	${X11BASE}/libdata/pkgconfig/librsvg-2.0.pc
 librsvg2_USE_GNOME_IMPL=libartlgpl2 libgsf gnomevfs2
 
-eel2_LIB_DEPENDS=	eel-2.10:${PORTSDIR}/x11-toolkits/eel2
+eel2_LIB_DEPENDS=	eel-2.10:${PORTSDIR}/x11-toolkits/eel
 eel2_DETECT=		${X11BASE}/libdata/pkgconfig/eel-2.0.pc
 eel2_USE_GNOME_IMPL=	gnomevfs2 libgnomeui gail
 
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index e2a284166c71..e8fe39fe142e 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -12,7 +12,7 @@
     SUBDIR += blt
     SUBDIR += bwidget
     SUBDIR += easygtk
-    SUBDIR += eel2
+    SUBDIR += eel
     SUBDIR += efltk
     SUBDIR += erlgtk
     SUBDIR += fl_editor
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel/Makefile
index c7bf6b51cb1c..c6650ed0abba 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	eel2
+PORTNAME=	eel
 PORTVERSION=	2.8.2
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.8
-DISTNAME=	eel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel/distinfo
index 43f56ccf9a21..43f56ccf9a21 100644
--- a/x11-toolkits/eel2/distinfo
+++ b/x11-toolkits/eel/distinfo
diff --git a/x11-toolkits/eel2/files/patch-Makefile.in b/x11-toolkits/eel/files/patch-Makefile.in
index c3cb2f239196..c3cb2f239196 100644
--- a/x11-toolkits/eel2/files/patch-Makefile.in
+++ b/x11-toolkits/eel/files/patch-Makefile.in
diff --git a/x11-toolkits/eel2/files/patch-eel::eel-vfs-extensions.c b/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c
index a71c0f102a7b..a71c0f102a7b 100644
--- a/x11-toolkits/eel2/files/patch-eel::eel-vfs-extensions.c
+++ b/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c
diff --git a/x11-toolkits/eel2/files/patch-eel_eel-open-with-dialog.c b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
index 9512a2703290..9512a2703290 100644
--- a/x11-toolkits/eel2/files/patch-eel_eel-open-with-dialog.c
+++ b/x11-toolkits/eel/files/patch-eel_eel-open-with-dialog.c
diff --git a/x11-toolkits/eel2/pkg-descr b/x11-toolkits/eel/pkg-descr
index 4b91eb9d0da3..4b91eb9d0da3 100644
--- a/x11-toolkits/eel2/pkg-descr
+++ b/x11-toolkits/eel/pkg-descr
diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel/pkg-plist
index 6af5ffaa2fa3..6af5ffaa2fa3 100644
--- a/x11-toolkits/eel2/pkg-plist
+++ b/x11-toolkits/eel/pkg-plist