Fix jabber.el require in [X]Emacs

PR:		ports/100983
Submitted by:	Max N. Boyarov (maintainer)

2 files changed, 95 insertions, 94 deletions

diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index 947a65d21e38..1096ebd4ad83 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	jabber.el
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	net-im elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	emacs-jabber
@@ -19,8 +20,8 @@ NO_BUILD=	yes
 INFO=		jabber.el
 PORTDOCS+=	AUTHORS NEWS README filetransfer.txt
 
-EMACS_LISPDIR=	${PREFIX}/share/emacs/site-lisp/${PORTNAME}
-XEMACS_LISPDIR=	${PREFIX}/lib/xemacs/site-lisp/${PORTNAME}
+EMACS_LISPDIR=	${PREFIX}/share/emacs/site-lisp/emacs-jabber
+XEMACS_LISPDIR=	${PREFIX}/lib/xemacs/site-lisp/emacs-jabber
 
 ## Generate info
 pre-install:
diff --git a/net-im/jabber.el/pkg-plist b/net-im/jabber.el/pkg-plist
index d47fbd042b92..ae971a772ed4 100644
--- a/net-im/jabber.el/pkg-plist
+++ b/net-im/jabber.el/pkg-plist
@@ -1,94 +1,94 @@
-share/emacs/site-lisp/jabber.el/jabber-activity.el
-share/emacs/site-lisp/jabber.el/jabber-ahc-presence.el
-share/emacs/site-lisp/jabber.el/jabber-ahc.el
-share/emacs/site-lisp/jabber.el/jabber-alert.el
-share/emacs/site-lisp/jabber.el/jabber-browse.el
-share/emacs/site-lisp/jabber.el/jabber-chat.el
-share/emacs/site-lisp/jabber.el/jabber-chatbuffer.el
-share/emacs/site-lisp/jabber.el/jabber-conn.el
-share/emacs/site-lisp/jabber.el/jabber-core.el
-share/emacs/site-lisp/jabber.el/jabber-disco.el
-share/emacs/site-lisp/jabber.el/jabber-events.el
-share/emacs/site-lisp/jabber.el/jabber-export.el
-share/emacs/site-lisp/jabber.el/jabber-feature-neg.el
-share/emacs/site-lisp/jabber.el/jabber-festival.el
-share/emacs/site-lisp/jabber.el/jabber-ft-client.el
-share/emacs/site-lisp/jabber.el/jabber-ft-server.el
-share/emacs/site-lisp/jabber.el/jabber-history.el
-share/emacs/site-lisp/jabber.el/jabber-iq.el
-share/emacs/site-lisp/jabber.el/jabber-keepalive.el
-share/emacs/site-lisp/jabber.el/jabber-keymap.el
-share/emacs/site-lisp/jabber.el/jabber-logon.el
-share/emacs/site-lisp/jabber.el/jabber-menu.el
-share/emacs/site-lisp/jabber.el/jabber-modeline.el
-share/emacs/site-lisp/jabber.el/jabber-muc.el
-share/emacs/site-lisp/jabber.el/jabber-presence.el
-share/emacs/site-lisp/jabber.el/jabber-ratpoison.el
-share/emacs/site-lisp/jabber.el/jabber-register.el
-share/emacs/site-lisp/jabber.el/jabber-roster.el
-share/emacs/site-lisp/jabber.el/jabber-sasl.el
-share/emacs/site-lisp/jabber.el/jabber-sawfish.el
-share/emacs/site-lisp/jabber.el/jabber-screen.el
-share/emacs/site-lisp/jabber.el/jabber-search.el
-share/emacs/site-lisp/jabber.el/jabber-si-client.el
-share/emacs/site-lisp/jabber.el/jabber-si-server.el
-share/emacs/site-lisp/jabber.el/jabber-socks5.el
-share/emacs/site-lisp/jabber.el/jabber-util.el
-share/emacs/site-lisp/jabber.el/jabber-vcard.el
-share/emacs/site-lisp/jabber.el/jabber-version.el
-share/emacs/site-lisp/jabber.el/jabber-widget.el
-share/emacs/site-lisp/jabber.el/jabber-xmessage.el
-share/emacs/site-lisp/jabber.el/jabber-xml.el
-share/emacs/site-lisp/jabber.el/jabber.el
-share/emacs/site-lisp/jabber.el/jabber-watch.el
-share/emacs/site-lisp/jabber.el/hex-util.el
-share/emacs/site-lisp/jabber.el/sha1.el
-lib/xemacs/site-lisp/jabber.el/jabber-activity.el
-lib/xemacs/site-lisp/jabber.el/jabber-ahc-presence.el
-lib/xemacs/site-lisp/jabber.el/jabber-ahc.el
-lib/xemacs/site-lisp/jabber.el/jabber-alert.el
-lib/xemacs/site-lisp/jabber.el/jabber-browse.el
-lib/xemacs/site-lisp/jabber.el/jabber-chat.el
-lib/xemacs/site-lisp/jabber.el/jabber-chatbuffer.el
-lib/xemacs/site-lisp/jabber.el/jabber-conn.el
-lib/xemacs/site-lisp/jabber.el/jabber-core.el
-lib/xemacs/site-lisp/jabber.el/jabber-disco.el
-lib/xemacs/site-lisp/jabber.el/jabber-events.el
-lib/xemacs/site-lisp/jabber.el/jabber-export.el
-lib/xemacs/site-lisp/jabber.el/jabber-feature-neg.el
-lib/xemacs/site-lisp/jabber.el/jabber-festival.el
-lib/xemacs/site-lisp/jabber.el/jabber-ft-client.el
-lib/xemacs/site-lisp/jabber.el/jabber-ft-server.el
-lib/xemacs/site-lisp/jabber.el/jabber-history.el
-lib/xemacs/site-lisp/jabber.el/jabber-iq.el
-lib/xemacs/site-lisp/jabber.el/jabber-keepalive.el
-lib/xemacs/site-lisp/jabber.el/jabber-keymap.el
-lib/xemacs/site-lisp/jabber.el/jabber-logon.el
-lib/xemacs/site-lisp/jabber.el/jabber-menu.el
-lib/xemacs/site-lisp/jabber.el/jabber-modeline.el
-lib/xemacs/site-lisp/jabber.el/jabber-muc.el
-lib/xemacs/site-lisp/jabber.el/jabber-presence.el
-lib/xemacs/site-lisp/jabber.el/jabber-ratpoison.el
-lib/xemacs/site-lisp/jabber.el/jabber-register.el
-lib/xemacs/site-lisp/jabber.el/jabber-roster.el
-lib/xemacs/site-lisp/jabber.el/jabber-sasl.el
-lib/xemacs/site-lisp/jabber.el/jabber-sawfish.el
-lib/xemacs/site-lisp/jabber.el/jabber-screen.el
-lib/xemacs/site-lisp/jabber.el/jabber-search.el
-lib/xemacs/site-lisp/jabber.el/jabber-si-client.el
-lib/xemacs/site-lisp/jabber.el/jabber-si-server.el
-lib/xemacs/site-lisp/jabber.el/jabber-socks5.el
-lib/xemacs/site-lisp/jabber.el/jabber-util.el
-lib/xemacs/site-lisp/jabber.el/jabber-vcard.el
-lib/xemacs/site-lisp/jabber.el/jabber-version.el
-lib/xemacs/site-lisp/jabber.el/jabber-widget.el
-lib/xemacs/site-lisp/jabber.el/jabber-xmessage.el
-lib/xemacs/site-lisp/jabber.el/jabber-xml.el
-lib/xemacs/site-lisp/jabber.el/jabber.el
-lib/xemacs/site-lisp/jabber.el/jabber-watch.el
-lib/xemacs/site-lisp/jabber.el/hex-util.el
-lib/xemacs/site-lisp/jabber.el/sha1.el
-@dirrm share/emacs/site-lisp/jabber.el
-@dirrm lib/xemacs/site-lisp/jabber.el
+share/emacs/site-lisp/emacs-jabber/jabber-activity.el
+share/emacs/site-lisp/emacs-jabber/jabber-ahc-presence.el
+share/emacs/site-lisp/emacs-jabber/jabber-ahc.el
+share/emacs/site-lisp/emacs-jabber/jabber-alert.el
+share/emacs/site-lisp/emacs-jabber/jabber-browse.el
+share/emacs/site-lisp/emacs-jabber/jabber-chat.el
+share/emacs/site-lisp/emacs-jabber/jabber-chatbuffer.el
+share/emacs/site-lisp/emacs-jabber/jabber-conn.el
+share/emacs/site-lisp/emacs-jabber/jabber-core.el
+share/emacs/site-lisp/emacs-jabber/jabber-disco.el
+share/emacs/site-lisp/emacs-jabber/jabber-events.el
+share/emacs/site-lisp/emacs-jabber/jabber-export.el
+share/emacs/site-lisp/emacs-jabber/jabber-feature-neg.el
+share/emacs/site-lisp/emacs-jabber/jabber-festival.el
+share/emacs/site-lisp/emacs-jabber/jabber-ft-client.el
+share/emacs/site-lisp/emacs-jabber/jabber-ft-server.el
+share/emacs/site-lisp/emacs-jabber/jabber-history.el
+share/emacs/site-lisp/emacs-jabber/jabber-iq.el
+share/emacs/site-lisp/emacs-jabber/jabber-keepalive.el
+share/emacs/site-lisp/emacs-jabber/jabber-keymap.el
+share/emacs/site-lisp/emacs-jabber/jabber-logon.el
+share/emacs/site-lisp/emacs-jabber/jabber-menu.el
+share/emacs/site-lisp/emacs-jabber/jabber-modeline.el
+share/emacs/site-lisp/emacs-jabber/jabber-muc.el
+share/emacs/site-lisp/emacs-jabber/jabber-presence.el
+share/emacs/site-lisp/emacs-jabber/jabber-ratpoison.el
+share/emacs/site-lisp/emacs-jabber/jabber-register.el
+share/emacs/site-lisp/emacs-jabber/jabber-roster.el
+share/emacs/site-lisp/emacs-jabber/jabber-sasl.el
+share/emacs/site-lisp/emacs-jabber/jabber-sawfish.el
+share/emacs/site-lisp/emacs-jabber/jabber-screen.el
+share/emacs/site-lisp/emacs-jabber/jabber-search.el
+share/emacs/site-lisp/emacs-jabber/jabber-si-client.el
+share/emacs/site-lisp/emacs-jabber/jabber-si-server.el
+share/emacs/site-lisp/emacs-jabber/jabber-socks5.el
+share/emacs/site-lisp/emacs-jabber/jabber-util.el
+share/emacs/site-lisp/emacs-jabber/jabber-vcard.el
+share/emacs/site-lisp/emacs-jabber/jabber-version.el
+share/emacs/site-lisp/emacs-jabber/jabber-widget.el
+share/emacs/site-lisp/emacs-jabber/jabber-xmessage.el
+share/emacs/site-lisp/emacs-jabber/jabber-xml.el
+share/emacs/site-lisp/emacs-jabber/jabber.el
+share/emacs/site-lisp/emacs-jabber/jabber-watch.el
+share/emacs/site-lisp/emacs-jabber/hex-util.el
+share/emacs/site-lisp/emacs-jabber/sha1.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-activity.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-ahc-presence.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-ahc.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-alert.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-browse.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-chat.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-chatbuffer.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-conn.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-core.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-disco.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-events.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-export.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-feature-neg.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-festival.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-ft-client.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-ft-server.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-history.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-iq.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-keepalive.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-keymap.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-logon.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-menu.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-modeline.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-muc.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-presence.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-ratpoison.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-register.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-roster.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-sasl.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-sawfish.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-screen.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-search.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-si-client.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-si-server.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-socks5.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-util.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-vcard.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-version.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-widget.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-xmessage.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-xml.el
+lib/xemacs/site-lisp/emacs-jabber/jabber.el
+lib/xemacs/site-lisp/emacs-jabber/jabber-watch.el
+lib/xemacs/site-lisp/emacs-jabber/hex-util.el
+lib/xemacs/site-lisp/emacs-jabber/sha1.el
+@dirrm share/emacs/site-lisp/emacs-jabber
+@dirrm lib/xemacs/site-lisp/emacs-jabber
 @dirrmtry lib/xemacs/site-lisp
 @dirrmtry lib/xemacs