4 files changed, 15 insertions, 23 deletions

diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 48d1fc2..2d62d56 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -19,7 +19,7 @@ EXTRACT_SUFX=		.tar.xz
 
 DEBUG_PACKAGES =        ${BUILD_PACKAGES}
 
-FLAVORS=                athena no_x11
+FLAVORS=                athena motif no_x11
 FLAVOR?=                athena
 
 GCCARCH=                ${MACHINE_ARCH}-unknown-openbsd
@@ -52,9 +52,7 @@ CONFIGURE_ARGS+=	--without-x
 LIB_DEPENDS+=           graphics/jpeg \
                         graphics/png \
                         devel/gmp
-. if ${FLAVOR} == "athena"
 CONFIGURE_ARGS+=        --with-x \
-                        --with-x-toolkit=athena \
                         --with-xpm \
                         --with-jpeg \
                         --with-png \
@@ -62,10 +60,20 @@ CONFIGURE_ARGS+=	--with-x \
                         --without-harfbuzz \
                         --without-otf \
                         --without-m17n-flt
-LIB_DEPENDS+=           x11/Xaw3d
-WANTLIB += ICE SM X11 X11-xcb Xaw3d Xext Xfixes Xinerama Xmu
+
+
+WANTLIB += ICE SM X11 X11-xcb Xext Xfixes Xinerama Xmu
 WANTLIB += Xpm Xrandr Xrender Xt xcb fontconfig freetype
 WANTLIB += jpeg png gmp
+
+. if ${FLAVOR} == "athena"
+CONFIGURE_ARGS+=        --with-x-toolkit=athena
+LIB_DEPENDS+=           x11/Xaw3d
+WANTLIB += Xaw3d
+. elif ${FLAVOR} == "motif"
+CONFIGURE_ARGS+=        --with-x-toolkit=motif
+LIB_DEPENDS+=           x11/motif
+WANTLIB += Xm
 . else
 ERRORS+=                "Fatal: Conflicting flavor: ${FLAVOR}"
 . endif
diff --git a/editors/emacs/pkg/PFRAG.motif b/editors/emacs/pkg/PFRAG.motif
new file mode 100644
index 0000000..26ff4d2
--- /dev/null
+++ b/editors/emacs/pkg/PFRAG.motif
@@ -0,0 +1,2 @@
+@pkgpath editors/emacs22,-main,
+@pkgpath editors/emacs23,-main,motif
diff --git a/editors/emacs/pkg/PFRAG.no-no_x11 b/editors/emacs/pkg/PFRAG.no-no_x11
deleted file mode 100644
index 54337e4..0000000
--- a/editors/emacs/pkg/PFRAG.no-no_x11
+++ /dev/null
@@ -1,16 +0,0 @@
-@pkgpath editors/emacs21,-main
-share/applications/emacs-mail.desktop
-share/applications/emacs.desktop
-share/applications/emacsclient-mail.desktop
-share/applications/emacsclient.desktop
-share/icons/hicolor/128x128/apps/emacs.png
-share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/scalable/apps/emacs.ico
-share/icons/hicolor/scalable/apps/emacs.svg
-share/icons/hicolor/scalable/mimetypes/emacs-document.svg
-share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
-@tag update-desktop-database
-@tag gtk-update-icon-cache %D/share/icons/hicolor
diff --git a/editors/emacs/pkg/PLIST b/editors/emacs/pkg/PLIST
index 72875cc..54a0fb2 100644
--- a/editors/emacs/pkg/PLIST
+++ b/editors/emacs/pkg/PLIST
@@ -4196,5 +4196,3 @@ share/icons/hicolor/scalable/mimetypes/emacs-document.svg
 share/icons/hicolor/scalable/mimetypes/emacs-document23.svg
 share/metainfo/
 share/metainfo/emacs.metainfo.xml
-@tag gtk-update-icon-cache %D/share/icons/hicolor
-@tag update-desktop-database