ports/109566: [UPDATE] net-im/jabber-yahoo
Martin Matuska
martin at matuska.org
Mon Feb 26 14:30:06 UTC 2007
>Number: 109566
>Category: ports
>Synopsis: [UPDATE] net-im/jabber-yahoo
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 26 14:30:05 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.2-RELEASE
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE
>Description:
This update fixes compatibility with jabber-1.6.0 ( ports/109259 , latest followup )
and adds documentation.
Update of jabberd has to be commited first.
Patch:
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber-yahoo.patch
.tar.gz of the port:
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber-yahoo.tar.gz
SVN tree:
http://www.matuska.org/martin/cgi/viewvc.cgi/ports/net-im/jabber-yahoo
Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/jabber-yahoo-2.3.2_2.log
portlint -a:
WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors.
0 fatal errors and 1 warning found.
Link to jabber-patch 1.4.4->1.6.0 ( ports/109259 ):
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber.patch
>How-To-Repeat:
>Fix:
diff -Nbur net-im/jabber-yahoo.orig/Makefile net-im/jabber-yahoo/Makefile
--- net-im/jabber-yahoo.orig/Makefile Wed Feb 21 17:26:20 2007
+++ net-im/jabber-yahoo/Makefile Wed Feb 21 21:31:16 2007
@@ -6,7 +6,7 @@
PORTNAME= yahoo
PORTVERSION= 2.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://files.jabberstudio.org/yahoo-transport-2/
PKGNAMEPREFIX= jabber-
@@ -16,17 +16,53 @@
MAINTAINER= garga at FreeBSD.org
COMMENT= Jabber Yahoo Transport module
-BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net-im/jabber
+LIB_DEPENDS= jabberd.1:${PORTSDIR}/net-im/jabber
USE_GNOME= glib12
USE_GMAKE= yes
USE_ICONV= yes
WRKSRC= ${WRKDIR}/yahoo-transport-${PORTVERSION}
-PLIST_FILES= lib/jabber/yahoo-transport.so etc/yahoo-jabber.xml.sample
+
+DOCSDIR= ${TARGETDIR}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+SUB_FILES+= README.jabberd14 pkg-message
+
+DOCS= CHANGES INSTALL LICENSE README jabber.xml yahoo-jabber.xml yahoo-jcr.xml
+
+.if !defined(NOPORTDOCS)
+PKG_MESSAGE= ${WRKDIR}/pkg-message
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if exists(${GLIB_CONFIG})
+GLIB_CFLAGS!= ${GLIB_CONFIG} --cflags
+GLIB_LIBS!= ${GLIB_CONFIG} --libs
+.endif
+
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/jabber \
+ -I${LOCALBASE}/include/pth ${GLIB_CFLAGS}
+
+MAKE_ARGS+= MCFLAGS="-shared" \
+ LDFLAGS="-L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib/jabber" \
+ LIBS="${GLIB_LIBS}"
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CFLAGS+= -fPIC
+.endif
do-install:
- ${INSTALL_DATA} ${WRKSRC}/yahoo-transport.so ${PREFIX}/lib/jabber/
- ${INSTALL_DATA} ${WRKSRC}/yahoo-jabber.xml ${PREFIX}/etc/yahoo-jabber.xml.sample
+ ${INSTALL_PROGRAM} ${WRKSRC}/yahoo-transport.so ${PREFIX}/lib/jabber/
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for FILE in ${DOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
+.endfor
+ @${INSTALL_DATA} ${WRKDIR}/README.jabberd14 ${DOCSDIR}
+ @${CAT} ${PKGMESSAGE}
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nbur net-im/jabber-yahoo.orig/files/README.jabberd14.in net-im/jabber-yahoo/files/README.jabberd14.in
--- net-im/jabber-yahoo.orig/files/README.jabberd14.in Thu Jan 1 01:00:00 1970
+++ net-im/jabber-yahoo/files/README.jabberd14.in Wed Feb 21 17:22:27 2007
@@ -0,0 +1,62 @@
+The sample configuration file for jabberd14 may be located in:
+%%TARGETDIR%%/etc/jabber.xml.sample
+
+Please make all necessary changes to your configuration file which may be:
+%%TARGETDIR%%/etc/jabber.xml
+
+NOTE: if you want this service to be accessible from other servers,
+ change any 'yahoo.localhost' listed below to a fully qualified domain name!
+ Please make sure that your directives are _NOT_ in an XML comment: there
+ are many multi-line comments.
+
+To activate the YAHOO transport for your Jabber server,
+add the following to your configuration file and adjust to your settings
+(around line 921 in the sample configuration file):
+-------------------------------------------------------------------------------
+
+ <service id="yahoo.localhost">
+ <load><yahoo_transport>%%TARGETDIR%%/jabber/yahoo-transport.so</yahoo_transport></load>
+ <config xmlns="jabber:config:yahoo">
+
+ <!-- This is the name that will appear when the transport is browsed or
+ discovered. REQUIRED -->
+ <vCard>
+ <NAME>Yahoo! IM Gateway</NAME>
+ </vCard>
+
+ <!-- This is the text that is presented to the user when they register with
+ transport REQUIRED -->
+ <instructions>Enter your YAHOO! Messenger Username and Password to registe r with the gateway.</instructions>
+
+ <!-- The Yahoo IM server REQUIRED ... should not have to be changed -->
+ <server>scs.yahoo.com</server>
+
+ <!-- The Yahoo IM server's port REQUIRED ... should not have to be changed -->
+ <port>5050</port>
+
+ <!-- The character map. This provides character set translation from UTF-8
+ to the indicated character map. See the man page for 'iconv' for available
+ character maps on your platform. CP1252 is the standard Windows character
+ set -->
+ <charmap>CP1252</charmap>
+
+ <!-- When this element exists, the transport will send new mail notifications as
+ well as a count of unread messages when the user initially logs in -->
+ <newmail/>
+ </config>
+ </service>
+
+-------------------------------------------------------------------------------
+Add this section to the browse area of the jsm to advertise it to
+your users (around line 382 of the sample config):
+-------------------------------------------------------------------------------
+
+ <item category="gateway" type="yahoo" jid="yahoo.localhost" name="Yahoo! Transport">
+ <ns>jabber:iq:gateway</ns>
+ <ns>jabber:iq:register</ns>
+ <ns>jabber:iq:version</ns>
+ <ns>jabber:iq:time</ns>
+ </item>
+
+-------------------------------------------------------------------------------
+Be sure to restart your server after reconfiguring.
diff -Nbur net-im/jabber-yahoo.orig/files/patch-Makefile net-im/jabber-yahoo/files/patch-Makefile
--- net-im/jabber-yahoo.orig/files/patch-Makefile Wed Feb 21 17:26:20 2007
+++ net-im/jabber-yahoo/files/patch-Makefile Wed Feb 21 16:09:53 2007
@@ -1,16 +1,14 @@
---- Makefile.orig Mon Sep 29 02:40:44 2003
-+++ Makefile Sat Jan 3 20:23:13 2004
-@@ -1,10 +1,10 @@
+--- Makefile.orig Fri Jun 25 18:33:56 2004
++++ Makefile Wed Feb 21 15:09:38 2007
+@@ -1,11 +1,6 @@
- # $Id: Makefile,v 1.5 2003/09/29 00:40:44 pcurtis Exp $
+ # $Id: Makefile,v 1.7 2004/06/25 18:33:56 pcurtis Exp $
-include ../platform-settings
-+include ${PREFIX}/include/jabber/platform-settings
-
+-
-CFLAGS:=$(CFLAGS) -I../jabberd `glib-config --cflags`
-LIBS:=$(LIBS) `glib-config --libs glib`
-+CFLAGS:=$(CFLAGS) -I${PREFIX}/include -I${PREFIX}/include/jabber `glib12-config --cflags`
-+LIBS:=$(LIBS) `glib12-config --libs glib` -liconv
-
+-
YAHOO_OBJECTS=yahoo-transport.o yahoo-session.o yahoo-phandler.o yahoo.o \
crypt.o gaim-sha.o yahoo-presence.o yahoo-server.o md5.o yahoo-message.o \
+ yahoo-stats.o yahoo-composing.o yahoo-mail.o yahoo-auth.o
diff -Nbur net-im/jabber-yahoo.orig/files/pkg-message.in net-im/jabber-yahoo/files/pkg-message.in
--- net-im/jabber-yahoo.orig/files/pkg-message.in Thu Jan 1 01:00:00 1970
+++ net-im/jabber-yahoo/files/pkg-message.in Wed Feb 21 17:24:52 2007
@@ -0,0 +1,2 @@
+You can find a configuration example in:
+%%DOCSDIR%%/README.jabberd14
diff -Nbur net-im/jabber-yahoo.orig/pkg-plist net-im/jabber-yahoo/pkg-plist
--- net-im/jabber-yahoo.orig/pkg-plist Thu Jan 1 01:00:00 1970
+++ net-im/jabber-yahoo/pkg-plist Wed Feb 21 17:04:45 2007
@@ -0,0 +1,10 @@
+lib/jabber/yahoo-transport.so
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.jabberd14
+%%PORTDOCS%%%%DOCSDIR%%/jabber.xml
+%%PORTDOCS%%%%DOCSDIR%%/yahoo-jabber.xml
+%%PORTDOCS%%%%DOCSDIR%%/yahoo-jcr.xml
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list