Attachment 75207 Details for Bug 108682 – jabber.el.diff

[patch] jabber.el.diff

jabber.el.diff (text/plain), 11.84 KB, created by Max N. Boyarov on 2007-02-02 10:00:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max N. Boyarov

Created: 2007-02-02 10:00:35 UTC

Size: 11.84 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/net-im/jabber.el/Makefile,v
>retrieving revision 1.2
>diff -u -p -r1.2 Makefile
>--- Makefile	28 Jul 2006 18:34:44 -0000	1.2
>+++ Makefile	1 Feb 2007 19:54:38 -0000
>@@ -5,8 +5,7 @@
> # $FreeBSD: ports/net-im/jabber.el/Makefile,v 1.2 2006/07/28 18:34:44 itetcu Exp $
> 
> PORTNAME=	jabber.el
>-PORTVERSION=	0.7
>-PORTREVISION=	1
>+PORTVERSION=	0.7.1
> CATEGORIES=	net-im elisp
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	emacs-jabber
>@@ -18,28 +17,33 @@ COMMENT=	A minimal jabber client for [X]
> NO_BUILD=	yes
> 
> INFO=		jabber.el
>-PORTDOCS+=	AUTHORS NEWS README filetransfer.txt
>+PORTDOCS+=	AUTHORS NEWS README
> 
>-EMACS_LISPDIR=	${PREFIX}/share/emacs/site-lisp/emacs-jabber
>-XEMACS_LISPDIR=	${PREFIX}/lib/xemacs/site-lisp/emacs-jabber
>+EMACS_LISPDIR=	share/emacs/site-lisp/emacs-jabber
>+XEMACS_LISPDIR=	lib/xemacs/site-lisp/emacs-jabber
>+
>+PLIST_SUB+=	EMACS_LISPDIR=${EMACS_LISPDIR}	\
>+		XEMACS_LISPDIR=${XEMACS_LISPDIR}
> 
> ## Generate info
> pre-install:
>-	${REINPLACE_CMD} -e 's/^@setfilename jabber.info/@setfilename jabber.el.info/' 	\
>-			-e 's/\* jabber\.el: (jabber)\./* jabber.el: (jabber.el)./'	\
>-		${WRKSRC}/jabber.texi
>-	( cd ${WRKSRC}; makeinfo --no-split jabber.texi; )
>+	( cd ${WRKSRC} && ${CP} -f jabber.info jabber.el.info )
>+	${REINPLACE_CMD} -e 's/^File: jabber.info/File: jabber.el.info/'	\
>+			-e 's/^* jabber.el: (jabber)/* jabber.el: (jabber.el)/'	\
>+			${WRKSRC}/jabber.el.info
> 
> do-install:
>-	${MKDIR} ${EMACS_LISPDIR}
>-	${MKDIR} ${XEMACS_LISPDIR}
>+	${MKDIR} ${PREFIX}/${EMACS_LISPDIR}
>+	${MKDIR} ${PREFIX}/${XEMACS_LISPDIR}
> 	cd ${WRKSRC}; \
>-	for el in `ls -1 *.el`; do					\
>-		${INSTALL_DATA} $$el ${EMACS_LISPDIR}/;			\
>-		${LN} -sf ${EMACS_LISPDIR}/$$el ${XEMACS_LISPDIR}/;	\
>+	for el in `ls -1 *.el`; do							\
>+		${INSTALL_DATA} $$el ${PREFIX}/${EMACS_LISPDIR}/;			\
>+		${LN} -sf ${PREFIX}/${EMACS_LISPDIR}/$$el ${PREFIX}/${XEMACS_LISPDIR}/;	\
> 	done;
> 
> 	${INSTALL_DATA} ${WRKSRC}/${INFO}.info ${PREFIX}/${INFO_PATH}/
>+	${MKDIR} ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/xmppuri.sh ${EXAMPLESDIR}/
> 
> .if !defined(NOPORTDOCS)
> 	${MKDIR} ${DOCSDIR}
>Index: distinfo
>===================================================================
>RCS file: /home/ncvs/ports/net-im/jabber.el/distinfo,v
>retrieving revision 1.1
>diff -u -p -r1.1 distinfo
>--- distinfo	26 May 2006 20:08:06 -0000	1.1
>+++ distinfo	1 Feb 2007 19:54:38 -0000
>@@ -1,3 +1,3 @@
>-MD5 (emacs-jabber-0.7.tar.gz) = 60c38494c82c3082e902034abf0b5336
>-SHA256 (emacs-jabber-0.7.tar.gz) = ab1052173cdba5b483c7433a22e9ff2b1c2588e7238b01678f9529e9a1f313cb
>-SIZE (emacs-jabber-0.7.tar.gz) = 107598
>+MD5 (emacs-jabber-0.7.1.tar.gz) = 864120b8bffd2ae2a8460fa32eb786fc
>+SHA256 (emacs-jabber-0.7.1.tar.gz) = e0f4595efc0a3fa03f6eb3222d868a6c65affbbeffce554030454d1aba7e6295
>+SIZE (emacs-jabber-0.7.1.tar.gz) = 205903
>Index: pkg-plist
>===================================================================
>RCS file: /home/ncvs/ports/net-im/jabber.el/pkg-plist,v
>retrieving revision 1.2
>diff -u -p -r1.2 pkg-plist
>--- pkg-plist	28 Jul 2006 18:34:44 -0000	1.2
>+++ pkg-plist	1 Feb 2007 19:54:38 -0000
>@@ -1,94 +1,114 @@
>-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
>+%%EMACS_LISPDIR%%/fsm.el
>+%%EMACS_LISPDIR%%/jabber-activity.el
>+%%EMACS_LISPDIR%%/jabber-ahc-presence.el
>+%%EMACS_LISPDIR%%/jabber-ahc.el
>+%%EMACS_LISPDIR%%/jabber-alert.el
>+%%EMACS_LISPDIR%%/jabber-autoaway.el
>+%%EMACS_LISPDIR%%/jabber-avatar.el
>+%%EMACS_LISPDIR%%/jabber-browse.el
>+%%EMACS_LISPDIR%%/jabber-chat.el
>+%%EMACS_LISPDIR%%/jabber-chatbuffer.el
>+%%EMACS_LISPDIR%%/jabber-compose.el
>+%%EMACS_LISPDIR%%/jabber-conn.el
>+%%EMACS_LISPDIR%%/jabber-core.el
>+%%EMACS_LISPDIR%%/jabber-disco.el
>+%%EMACS_LISPDIR%%/jabber-events.el
>+%%EMACS_LISPDIR%%/jabber-export.el
>+%%EMACS_LISPDIR%%/jabber-feature-neg.el
>+%%EMACS_LISPDIR%%/jabber-festival.el
>+%%EMACS_LISPDIR%%/jabber-ft-client.el
>+%%EMACS_LISPDIR%%/jabber-ft-common.el
>+%%EMACS_LISPDIR%%/jabber-ft-server.el
>+%%EMACS_LISPDIR%%/jabber-history.el
>+%%EMACS_LISPDIR%%/jabber-iq.el
>+%%EMACS_LISPDIR%%/jabber-keepalive.el
>+%%EMACS_LISPDIR%%/jabber-keymap.el
>+%%EMACS_LISPDIR%%/jabber-logon.el
>+%%EMACS_LISPDIR%%/jabber-menu.el
>+%%EMACS_LISPDIR%%/jabber-modeline.el
>+%%EMACS_LISPDIR%%/jabber-muc.el
>+%%EMACS_LISPDIR%%/jabber-newdisco.el
>+%%EMACS_LISPDIR%%/jabber-presence.el
>+%%EMACS_LISPDIR%%/jabber-private.el
>+%%EMACS_LISPDIR%%/jabber-ratpoison.el
>+%%EMACS_LISPDIR%%/jabber-register.el
>+%%EMACS_LISPDIR%%/jabber-roster.el
>+%%EMACS_LISPDIR%%/jabber-sasl.el
>+%%EMACS_LISPDIR%%/jabber-sawfish.el
>+%%EMACS_LISPDIR%%/jabber-screen.el
>+%%EMACS_LISPDIR%%/jabber-search.el
>+%%EMACS_LISPDIR%%/jabber-si-client.el
>+%%EMACS_LISPDIR%%/jabber-si-common.el
>+%%EMACS_LISPDIR%%/jabber-si-server.el
>+%%EMACS_LISPDIR%%/jabber-socks5.el
>+%%EMACS_LISPDIR%%/jabber-time.el
>+%%EMACS_LISPDIR%%/jabber-util.el
>+%%EMACS_LISPDIR%%/jabber-vcard-avatars.el
>+%%EMACS_LISPDIR%%/jabber-vcard.el
>+%%EMACS_LISPDIR%%/jabber-version.el
>+%%EMACS_LISPDIR%%/jabber-watch.el
>+%%EMACS_LISPDIR%%/jabber-widget.el
>+%%EMACS_LISPDIR%%/jabber-xmessage.el
>+%%EMACS_LISPDIR%%/jabber-xml.el
>+%%EMACS_LISPDIR%%/jabber.el
>+%%EMACS_LISPDIR%%/srv.el
>+%%XEMACS_LISPDIR%%/fsm.el
>+%%XEMACS_LISPDIR%%/jabber-activity.el
>+%%XEMACS_LISPDIR%%/jabber-ahc-presence.el
>+%%XEMACS_LISPDIR%%/jabber-ahc.el
>+%%XEMACS_LISPDIR%%/jabber-alert.el
>+%%XEMACS_LISPDIR%%/jabber-autoaway.el
>+%%XEMACS_LISPDIR%%/jabber-avatar.el
>+%%XEMACS_LISPDIR%%/jabber-browse.el
>+%%XEMACS_LISPDIR%%/jabber-chat.el
>+%%XEMACS_LISPDIR%%/jabber-chatbuffer.el
>+%%XEMACS_LISPDIR%%/jabber-compose.el
>+%%XEMACS_LISPDIR%%/jabber-conn.el
>+%%XEMACS_LISPDIR%%/jabber-core.el
>+%%XEMACS_LISPDIR%%/jabber-disco.el
>+%%XEMACS_LISPDIR%%/jabber-events.el
>+%%XEMACS_LISPDIR%%/jabber-export.el
>+%%XEMACS_LISPDIR%%/jabber-feature-neg.el
>+%%XEMACS_LISPDIR%%/jabber-festival.el
>+%%XEMACS_LISPDIR%%/jabber-ft-client.el
>+%%XEMACS_LISPDIR%%/jabber-ft-common.el
>+%%XEMACS_LISPDIR%%/jabber-ft-server.el
>+%%XEMACS_LISPDIR%%/jabber-history.el
>+%%XEMACS_LISPDIR%%/jabber-iq.el
>+%%XEMACS_LISPDIR%%/jabber-keepalive.el
>+%%XEMACS_LISPDIR%%/jabber-keymap.el
>+%%XEMACS_LISPDIR%%/jabber-logon.el
>+%%XEMACS_LISPDIR%%/jabber-menu.el
>+%%XEMACS_LISPDIR%%/jabber-modeline.el
>+%%XEMACS_LISPDIR%%/jabber-muc.el
>+%%XEMACS_LISPDIR%%/jabber-newdisco.el
>+%%XEMACS_LISPDIR%%/jabber-presence.el
>+%%XEMACS_LISPDIR%%/jabber-private.el
>+%%XEMACS_LISPDIR%%/jabber-ratpoison.el
>+%%XEMACS_LISPDIR%%/jabber-register.el
>+%%XEMACS_LISPDIR%%/jabber-roster.el
>+%%XEMACS_LISPDIR%%/jabber-sasl.el
>+%%XEMACS_LISPDIR%%/jabber-sawfish.el
>+%%XEMACS_LISPDIR%%/jabber-screen.el
>+%%XEMACS_LISPDIR%%/jabber-search.el
>+%%XEMACS_LISPDIR%%/jabber-si-client.el
>+%%XEMACS_LISPDIR%%/jabber-si-common.el
>+%%XEMACS_LISPDIR%%/jabber-si-server.el
>+%%XEMACS_LISPDIR%%/jabber-socks5.el
>+%%XEMACS_LISPDIR%%/jabber-time.el
>+%%XEMACS_LISPDIR%%/jabber-util.el
>+%%XEMACS_LISPDIR%%/jabber-vcard-avatars.el
>+%%XEMACS_LISPDIR%%/jabber-vcard.el
>+%%XEMACS_LISPDIR%%/jabber-version.el
>+%%XEMACS_LISPDIR%%/jabber-watch.el
>+%%XEMACS_LISPDIR%%/jabber-widget.el
>+%%XEMACS_LISPDIR%%/jabber-xmessage.el
>+%%XEMACS_LISPDIR%%/jabber-xml.el
>+%%XEMACS_LISPDIR%%/jabber.el
>+%%XEMACS_LISPDIR%%/srv.el
>+%%EXAMPLESDIR%%/xmppuri.sh
>+@dirrm %%EXAMPLESDIR%%
>+@dirrm %%EMACS_LISPDIR%%
>+@dirrm %%XEMACS_LISPDIR%%
> @dirrmtry lib/xemacs/site-lisp
> @dirrmtry lib/xemacs

Actions: View | Diff

Attachments on bug 108682: 75207