r307088 broke too much. Rename motif back to open-motif, keeping the 2.3.3 to

2.3.4 update and the LGPL 2.1 bit.

Feature safe:	yes

9 files changed, 2 insertions, 3 deletions

diff --git a/MOVED b/MOVED
index b781eb640f1a..fa79c6d4fe3e 100644
--- a/MOVED
+++ b/MOVED
@@ -3839,4 +3839,3 @@ textproc/xerces-c||2012-11-05|Has expired: No more supported upstream, consider
 x11-wm/wampager||2012-11-05|Has expired: Development ceased
 x11-wm/waimea||2012-11-05|Has expired: Development ceased
 x11-wm/waimea-devel||2012-11-05|Has expired: Development ceased
-x11-toolkits/open-motif|motif|2012-11-06|Openmotif is now named Motif (under LGPL 2.1)
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 10e4f74fb02f..08db1254b9c7 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -129,12 +129,12 @@
     SUBDIR += linux-openmotif
     SUBDIR += linux-pango
     SUBDIR += linux-qt33
-    SUBDIR += motif
     SUBDIR += movingmotif
     SUBDIR += mowitz
     SUBDIR += neXtaw
     SUBDIR += nucleo
     SUBDIR += ocaml-lablgtk2
+    SUBDIR += open-motif
     SUBDIR += otk
     SUBDIR += p5-Alien-wxWidgets
     SUBDIR += p5-Glade2
diff --git a/x11-toolkits/motif/Makefile b/x11-toolkits/open-motif/Makefile
index fd641d48dadd..a13827098ae1 100644
--- a/x11-toolkits/motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	motif
+PORTNAME=	open-motif
 PORTVERSION=	2.3.4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/${PORTNAME}/Motif%202.3.4%20Source%20Code/
diff --git a/x11-toolkits/motif/Makefile.man b/x11-toolkits/open-motif/Makefile.man
index 890d09253d9f..890d09253d9f 100644
--- a/x11-toolkits/motif/Makefile.man
+++ b/x11-toolkits/open-motif/Makefile.man
diff --git a/x11-toolkits/motif/distinfo b/x11-toolkits/open-motif/distinfo
index c3bdd0057a83..c3bdd0057a83 100644
--- a/x11-toolkits/motif/distinfo
+++ b/x11-toolkits/open-motif/distinfo
diff --git a/x11-toolkits/motif/files/patch-clients__uil__UilDefI.h b/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
index 372e8d628a37..372e8d628a37 100644
--- a/x11-toolkits/motif/files/patch-clients__uil__UilDefI.h
+++ b/x11-toolkits/open-motif/files/patch-clients__uil__UilDefI.h
diff --git a/x11-toolkits/motif/files/patch-lib::Xm::ColorS.c b/x11-toolkits/open-motif/files/patch-lib::Xm::ColorS.c
index 2e70cc3035fb..2e70cc3035fb 100644
--- a/x11-toolkits/motif/files/patch-lib::Xm::ColorS.c
+++ b/x11-toolkits/open-motif/files/patch-lib::Xm::ColorS.c
diff --git a/x11-toolkits/motif/pkg-descr b/x11-toolkits/open-motif/pkg-descr
index aecf59c5e5fa..aecf59c5e5fa 100644
--- a/x11-toolkits/motif/pkg-descr
+++ b/x11-toolkits/open-motif/pkg-descr
diff --git a/x11-toolkits/motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
index e424432260cc..e424432260cc 100644
--- a/x11-toolkits/motif/pkg-plist
+++ b/x11-toolkits/open-motif/pkg-plist