From m.boyarov@bsd.by  Fri Jul 28 14:26:37 2006
Return-Path: <m.boyarov@bsd.by>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1CBB216A4E0;
	Fri, 28 Jul 2006 14:26:37 +0000 (UTC)
	(envelope-from m.boyarov@bsd.by)
Received: from mx1.cybernet.by (mx1.cybernet.by [195.222.70.246])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5D7CD43D5C;
	Fri, 28 Jul 2006 14:26:34 +0000 (GMT)
	(envelope-from m.boyarov@bsd.by)
Received: from mx1.cybernet.by (mx1.cybernet.by [127.0.0.4])
	by mx1.cybernet.by (Postfix) with ESMTP id A92613C10A8;
	Fri, 28 Jul 2006 17:24:33 +0300 (EEST)
Received: by mx1.cybernet.by (Postfix, from userid 58)
	id 818313C10A7; Fri, 28 Jul 2006 17:24:33 +0300 (EEST)
Received: from deimos (unknown [217.21.35.33])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.cybernet.by (Postfix) with ESMTP id A39343C0FF8;
	Fri, 28 Jul 2006 17:24:24 +0300 (EEST)
Received: by deimos (Pustifikus, from userid 1024)
	id 3181B17275; Fri, 28 Jul 2006 16:26:14 +0300 (EEST)
Message-Id: <20060728132614.3181B17275@deimos>
Date: Fri, 28 Jul 2006 16:26:14 +0300 (EEST)
From: Max N. Boyarov <m.boyarov@bsd.by>
Reply-To: Max N. Boyarov <m.boyarov@bsd.by>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Andrey Slusar <anray@freebsd.org>
Subject: [patch] net-im/jabber.el: fix emacs require
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         100983
>Category:       ports
>Synopsis:       [patch] net-im/jabber.el: fix emacs require
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 28 14:30:14 GMT 2006
>Closed-Date:    Fri Jul 28 18:34:53 GMT 2006
>Last-Modified:  Fri Jul 28 18:34:53 GMT 2006
>Originator:     Max N. Boyarov
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD deimos.bsd.by 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root@opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386


	
>Description:
	Fix jabber.el require in [X]Emacs

>How-To-Repeat:
	
>Fix:

	

--- jabber.el.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net-im/jabber.el/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	26 May 2006 20:08:06 -0000	1.1
+++ Makefile	28 Jul 2006 13:08:18 -0000
@@ -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 @@
 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:
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net-im/jabber.el/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	26 May 2006 20:08:06 -0000	1.1
+++ pkg-plist	28 Jul 2006 13:09:47 -0000
@@ -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
--- jabber.el.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Fri Jul 28 18:22:37 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100983 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Fri Jul 28 18:34:51 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=100983 
>Unformatted:
