- Update textproc/iksemel to version 1.3.

Approved by:	sobomax (asterisk maintainer)

12 files changed, 44 insertions, 43 deletions

diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile
index 5608cc9142c4..0ffcf9c3932c 100644
--- a/net-mgmt/zabbix/Makefile
+++ b/net-mgmt/zabbix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
@@ -15,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application and network monitoring solution
 
 LIB_DEPENDS=	netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp \
-		iksemel.3:${PORTSDIR}/textproc/iksemel \
+		iksemel.4:${PORTSDIR}/textproc/iksemel \
 		curl.4:${PORTSDIR}/ftp/curl
 
 OPTIONS=	MYSQL "Use MySQL backend" on \
diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index 5608cc9142c4..0ffcf9c3932c 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zabbix
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
@@ -15,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application and network monitoring solution
 
 LIB_DEPENDS=	netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp \
-		iksemel.3:${PORTSDIR}/textproc/iksemel \
+		iksemel.4:${PORTSDIR}/textproc/iksemel \
 		curl.4:${PORTSDIR}/ftp/curl
 
 OPTIONS=	MYSQL "Use MySQL backend" on \
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 268834e3eb3a..2ac171904231 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+= --without-iksemel
 .else
 PLIST_SUB+=	WITH_JABBER=""
 CONFIGURE_ARGS+= --with-iksemel
-LIB_DEPENDS+=	iksemel.3:${PORTSDIR}/textproc/iksemel
+LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 .endif
 
 .if defined(WITHOUT_SQLITE)
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 268834e3eb3a..2ac171904231 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+= --without-iksemel
 .else
 PLIST_SUB+=	WITH_JABBER=""
 CONFIGURE_ARGS+= --with-iksemel
-LIB_DEPENDS+=	iksemel.3:${PORTSDIR}/textproc/iksemel
+LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 .endif
 
 .if defined(WITHOUT_SQLITE)
diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 268834e3eb3a..2ac171904231 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+= --without-iksemel
 .else
 PLIST_SUB+=	WITH_JABBER=""
 CONFIGURE_ARGS+= --with-iksemel
-LIB_DEPENDS+=	iksemel.3:${PORTSDIR}/textproc/iksemel
+LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 .endif
 
 .if defined(WITHOUT_SQLITE)
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 268834e3eb3a..2ac171904231 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.4.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
@@ -144,7 +144,7 @@ CONFIGURE_ARGS+= --without-iksemel
 .else
 PLIST_SUB+=	WITH_JABBER=""
 CONFIGURE_ARGS+= --with-iksemel
-LIB_DEPENDS+=	iksemel.3:${PORTSDIR}/textproc/iksemel
+LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 .endif
 
 .if defined(WITHOUT_SQLITE)
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index d7e51f95c92d..34603e2e1f68 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	iksemel
-PORTVERSION=	1.2
-PORTREVISION=	3
+PORTVERSION=	1.3
 CATEGORIES=	textproc
-MASTER_SITES=	http://jabberstudio.2nw.net/iksemel/
+MASTER_SITES=	http://iksemel.googlecode.com/files/
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	XML parser library mainly designed for Jabber applications
diff --git a/textproc/iksemel/distinfo b/textproc/iksemel/distinfo
index 5a1c25658edb..7c4931462a19 100644
--- a/textproc/iksemel/distinfo
+++ b/textproc/iksemel/distinfo
@@ -1,3 +1,3 @@
-MD5 (iksemel-1.2.tar.gz) = 82e7c8fdb6211839246b788c040a796b
-SHA256 (iksemel-1.2.tar.gz) = a606e230b22d9d029998b84e5d6311a8ba35a304fe457e254eb5fd19943cd639
-SIZE (iksemel-1.2.tar.gz) = 429405
+MD5 (iksemel-1.3.tar.gz) = 36ab2d9f11980a19217b6f79a19ef8e7
+SHA256 (iksemel-1.3.tar.gz) = ee021861be6bdb9a970ab3d5997dd14ffdbf33ad573691292176031f49aa4f45
+SIZE (iksemel-1.3.tar.gz) = 485208
diff --git a/textproc/iksemel/files/patch-Makefile.in b/textproc/iksemel/files/patch-Makefile.in
index 2bb41e644f36..c86bb7ee86c4 100644
--- a/textproc/iksemel/files/patch-Makefile.in
+++ b/textproc/iksemel/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig   Mon Apr 24 22:21:34 2006
-+++ Makefile.in        Mon Apr 24 22:21:37 2006
-@@ -92,7 +92,7 @@  
-
+--- Makefile.in.orig	2007-08-02 12:49:14.000000000 +0200
++++ Makefile.in	2007-10-01 18:22:45.000000000 +0200
+@@ -187,7 +187,7 @@
+ target_alias = @target_alias@
+ SUBDIRS = include src tools test doc
  EXTRA_DIST = HACKING iksemel.pc.in
-
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = ${prefix}/libdata/pkgconfig
  pkgconfig_DATA = iksemel.pc
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ all: all-recursive
+ 
diff --git a/textproc/iksemel/files/patch-doc-Makefile.in b/textproc/iksemel/files/patch-doc-Makefile.in
index 309c44c6c9ea..dbf5e79089c7 100644
--- a/textproc/iksemel/files/patch-doc-Makefile.in
+++ b/textproc/iksemel/files/patch-doc-Makefile.in
@@ -1,20 +1,20 @@
---- doc/Makefile.in.orig	Fri Aug  6 20:39:05 2004
-+++ doc/Makefile.in	Fri Apr 28 15:25:23 2006
-@@ -93,7 +93,7 @@
- CONFIG_HEADER = ../include/config.h
- CONFIG_CLEAN_FILES = 
- TEXI2DVI = texi2dvi
--INFO_DEPS = iksemel
-+INFO_DEPS = iksemel.info
+--- doc/Makefile.in.orig	2007-08-02 12:49:13.000000000 +0200
++++ doc/Makefile.in	2007-10-01 21:14:31.000000000 +0200
+@@ -46,7 +46,7 @@
+ CONFIG_CLEAN_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-INFO_DEPS = $(srcdir)/iksemel
++INFO_DEPS = $(srcdir)/iksemel.info
+ am__TEXINFO_TEX_DIR = $(srcdir)
  DVIS = iksemel.dvi
- TEXINFOS = iksemel.texi
- DIST_COMMON =  Makefile.am Makefile.in texinfo.tex
-@@ -123,7 +123,7 @@
- .texi.info:
- 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
- 	cd $(srcdir) \
--	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
-+	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'` -o $@
+ PDFS = iksemel.pdf
+@@ -207,7 +207,7 @@
+ distclean-libtool:
+ 	-rm -f libtool
  
- .texi.dvi:
- 	TEXINPUTS=.:$$TEXINPUTS \
+-$(srcdir)/iksemel: iksemel.texi 
++$(srcdir)/iksemel.info: iksemel.texi 
+ 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+ 	am__cwd=`pwd` && cd $(srcdir) && \
+ 	rm -rf $$backupdir && mkdir $$backupdir && \
diff --git a/textproc/iksemel/pkg-descr b/textproc/iksemel/pkg-descr
index 5b60e1ecace6..b2ee4e918b5b 100644
--- a/textproc/iksemel/pkg-descr
+++ b/textproc/iksemel/pkg-descr
@@ -4,4 +4,4 @@ in ANSI C except the network code (which is POSIX compatible), thus
 highly portable. Iksemel is released under GNU Lesser General Public
 License. A copy of the license is included in the COPYING file.
 
-WWW: http://iksemel.jabberstudio.org/
+WWW: http://code.google.com/p/iksemel/
diff --git a/textproc/iksemel/pkg-plist b/textproc/iksemel/pkg-plist
index 95b86755e27e..25e7fb91ab88 100644
--- a/textproc/iksemel/pkg-plist
+++ b/textproc/iksemel/pkg-plist
@@ -5,5 +5,5 @@ include/iksemel.h
 lib/libiksemel.a
 lib/libiksemel.la
 lib/libiksemel.so
-lib/libiksemel.so.3
+lib/libiksemel.so.4
 libdata/pkgconfig/iksemel.pc