ports/109405: [UPDATE] net-im/jabber-jud

Wed Feb 21 20:30:16 UTC 2007

>Number:         109405
>Category:       ports
>Synopsis:       [UPDATE] net-im/jabber-jud
>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:   Wed Feb 21 20:30:15 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 )
Update of jabberd has to be commited first. I request maintainership for this port.

Patch:
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber-jud.patch

.tar.gz of the port:
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber-jud.tar.gz

SVN tree:
http://www.matuska.org/martin/cgi/viewvc.cgi/ports/net-im/jabber-jud

Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/jabber-jud-0.5_1.log

portlint -a:
looks fine.

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-jud.orig/Makefile net-im/jabber-jud/Makefile

--- net-im/jabber-jud.orig/Makefile	Wed Feb 21 17:26:25 2007
+++ net-im/jabber-jud/Makefile	Wed Feb 21 21:20:53 2007
@@ -6,29 +6,48 @@
 
 PORTNAME=	jud
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	http://jud.jabberstudio.org/ \
 		http://freebsd.unixfreunde.de/sources/
 PKGNAMEPREFIX=	jabber-
 DIST_SUBDIR=	jabber
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	martin at matuska.org
 COMMENT=	Jabber User Directory module
 
-BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net-im/jabber
+LIB_DEPENDS=	jabberd.1:${PORTSDIR}/net-im/jabber
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-ansi-c
 
-PLIST_FILES=	lib/jabber/jud.so
 USE_GMAKE=	yes
 
-post-patch:
-	@echo "${PREFIX}" > ${WRKSRC}/.prefix-freebsd
+CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/jabber \
+		-I${LOCALBASE}/include/pth
+
+MAKE_ARGS+=	MCFLAGS="-shared" \
+		LDFLAGS="-L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib/jabber"
+
+SUB_FILES+=	pkg-message README.jabberd14
+DOCSDIR=	${TARGETDIR}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+.if !defined(NOPORTDOCS)
+PKGMESSAGE=	${WRKDIR}/pkg-message
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CFLAGS+=        -fPIC
+.endif
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/jud.so ${PREFIX}/lib/jabber/
+	${INSTALL_PROGRAM} ${WRKSRC}/jud.so ${TARGETDIR}/lib/jabber/
 
 post-install:
-	@cat pkg-message
-
-.include <bsd.port.mk>
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKDIR}/README.jabberd14 ${DOCSDIR}
+	@${CAT} ${PKGMESSAGE}
+.endif
+.include <bsd.port.post.mk>
diff -Nbur net-im/jabber-jud.orig/files/README.jabberd14.in net-im/jabber-jud/files/README.jabberd14.in
--- net-im/jabber-jud.orig/files/README.jabberd14.in	Thu Jan  1 01:00:00 1970
+++ net-im/jabber-jud/files/README.jabberd14.in	Wed Feb 21 17:21:50 2007
@@ -0,0 +1,38 @@
+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
+
+To activate JUD for your Jabber server, add the following to your configuration file
+(around line 921 in the sample configuration file):
+-------------------------------------------------------------------------------
+
+  <!--
+  If you want this service to be accessible from other servers,
+  change 'jud.localhost' to the server's fully qualified domain name!
+  -->
+  <service id="jud">
+    <host>jud.localhost</host>
+    <load><jud>%%TARGETDIR%%/lib/jabber/jud.so</jud></load>
+    <jud xmlns="jabber:config:jud">
+      <vCard>
+        <FN>Local Organization's User Directory</FN>
+        <DESC>This service provides a simple user directory service.</DESC>
+        <URL>http://foo.bar/</URL>
+      </vCard>                    
+    </jud>   
+  </service>
+
+-------------------------------------------------------------------------------
+Add this section to the browse area of the jsm service to advertise it to
+your users (around line 382 of the sample config):
+-------------------------------------------------------------------------------
+
+	<item category="directory" type="user" jid="jud.localhost" name="My Organization's User Directory">
+	  <ns>jabber:iq:search</ns>
+	  <ns>jabber:iq:register</ns>
+	</item>
+
+-------------------------------------------------------------------------------
+Be sure to restart your server after reconfiguring.
diff -Nbur net-im/jabber-jud.orig/files/patch-Makefile net-im/jabber-jud/files/patch-Makefile
--- net-im/jabber-jud.orig/files/patch-Makefile	Thu Jan  1 01:00:00 1970
+++ net-im/jabber-jud/files/patch-Makefile	Wed Feb 21 15:48:01 2007
@@ -0,0 +1,10 @@
+--- Makefile.orig	Wed Feb 21 15:47:45 2007
++++ Makefile	Wed Feb 21 15:47:50 2007
+@@ -1,7 +1,3 @@
+-include ../platform-settings
+-
+-CFLAGS=$(CCFLAGS) -I../jabberd
+-
+ jud_OBJECTS=jud.o jud_reg.o jud_search.o
+ 
+ all: jud
diff -Nbur net-im/jabber-jud.orig/files/patch-aa net-im/jabber-jud/files/patch-aa
--- net-im/jabber-jud.orig/files/patch-aa	Wed Feb 21 17:26:25 2007
+++ net-im/jabber-jud/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,12 +0,0 @@
---- Makefile.orig	Wed Nov 12 10:12:20 2003
-+++ Makefile	Thu Jun 15 21:12:23 2006
-@@ -1,6 +1,7 @@
--include ../platform-settings
-+INCDIR=        ${PREFIX}/include/jabber
-+include ${INCDIR}/platform-settings
- 
--CFLAGS=$(CCFLAGS) -I../jabberd
-+CFLAGS:=$(CFLAGS) -I${INCDIR}
- 
- jud_OBJECTS=jud.o jud_reg.o jud_search.o
- 
diff -Nbur net-im/jabber-jud.orig/files/pkg-message.in net-im/jabber-jud/files/pkg-message.in
--- net-im/jabber-jud.orig/files/pkg-message.in	Thu Jan  1 01:00:00 1970
+++ net-im/jabber-jud/files/pkg-message.in	Wed Feb 21 17:25:09 2007
@@ -0,0 +1,2 @@
+You can find a configuration example in:
+%%DOCSDIR%%/README.jabberd14
diff -Nbur net-im/jabber-jud.orig/pkg-message net-im/jabber-jud/pkg-message
--- net-im/jabber-jud.orig/pkg-message	Wed Feb 21 17:26:25 2007
+++ net-im/jabber-jud/pkg-message	Thu Jan  1 01:00:00 1970
@@ -1,32 +0,0 @@
-To activate JUD for your Jabber server, add the following (around line 36 in
-the sample configuration file) to your configuration file
-(${LOCALBASE}/etc/jabber.xml):
-
-
-  <!--
-  If you want this service to be accessible from other servers,
-  change 'jud.localhost' to the server's fully qualified domain name!
-  Also note that ${LOCALBASE} should be changed to your local base
-  (ex: /usr/local).
-  -->
-  <service id="jud">
-    <host>jud.localhost</host>
-    <load><jud>${LOCALBASE}/lib/jabber/jud.so</jud></load>
-    <jud xmlns="jabber:config:jud">
-      <vCard>
-        <FN>Local Organization's User Directory</FN>
-        <DESC>This service provides a simple user directory service.</DESC>
-        <URL>http://foo.bar/</URL>
-      </vCard>                    
-    </jud>   
-  </service>
-
-Add this section to the browse area of the jsm service to advertise it to
-your users (around line 245 of the sample config):
-
-	<service type="jud" jid="jud.localhost" name="My Organization's User Directory">
-	  <ns>jabber:iq:search</ns>
-	  <ns>jabber:iq:register</ns>
-	</service>
-
-Be sure to restart your server after reconfiguring.
diff -Nbur net-im/jabber-jud.orig/pkg-plist net-im/jabber-jud/pkg-plist
--- net-im/jabber-jud.orig/pkg-plist	Thu Jan  1 01:00:00 1970
+++ net-im/jabber-jud/pkg-plist	Wed Feb 21 17:09:05 2007
@@ -0,0 +1,3 @@
+lib/jabber/jud.so
+%%PORTDOCS%%%%DOCSDIR%%/README.jabberd14
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:

