Convert textproc/iksemel to "USES=libtool pathfix" and bump dependent ports

8 files changed, 15 insertions, 32 deletions

diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index ef05d7385f79..d6c33f00685d 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	climm
 PORTVERSION=	0.7.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.climm.org/source/ \
 		http://http.bg.climm.org/source/
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index eac868b39ae4..b4eaee1e6595 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zabbix2
 PORTVERSION=	2.0.10
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
index 2508b4ac7fe1..b1f302f7acfa 100644
--- a/net-mgmt/zabbix22-server/Makefile
+++ b/net-mgmt/zabbix22-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zabbix22
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 3b924c41365b..567a3aa89003 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.8.28.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
 PKGNAMESUFFIX=	18
 
 MAINTAINER=	flo@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
+COMMENT=	Open Source PBX and telephony toolkit
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index f1118df67b00..b25c7ebd8e5d 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -2,14 +2,14 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	11.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
 PKGNAMESUFFIX=	11
 
 MAINTAINER=	flo@FreeBSD.org
-COMMENT=	An Open Source PBX and telephony toolkit
+COMMENT=	Open Source PBX and telephony toolkit
 
 LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex \
 		libnewt.so:${PORTSDIR}/devel/newt \
diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile
index e79f2e3383bf..35f8fe0d8c22 100644
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@@ -3,30 +3,28 @@
 
 PORTNAME=	iksemel
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	rhaamo@gruik.at
 COMMENT=	XML parser library mainly designed for Jabber applications
 
-LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
 
-USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtool
-ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
-AUTOMAKE_ARGS=	--add-missing
+USES=		libtool makeinfo pathfix pkgconfig
+PATHFIX_MAKEFILEIN=	Makefile.am
+USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
+AUTOMAKE_ARGS=	--add-missing --copy --force
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
-USES=		makeinfo pkgconfig
 
 INFO=	iksemel
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@setfilename iksemel|@setfilename iksemel.info|' \
 	    ${WRKSRC}/doc/iksemel.texi
-	@${REINPLACE_CMD} -e 's|pkgconfigdir=$$(libdir)/pkgconfig|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \
-	    ${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/textproc/iksemel/files/patch-ltmain.sh b/textproc/iksemel/files/patch-ltmain.sh
deleted file mode 100644
index f5e16f33bc97..000000000000
--- a/textproc/iksemel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig	Fri Apr 28 11:54:06 2006
-+++ ltmain.sh	Fri Apr 28 11:54:14 2006
-@@ -5550,10 +5550,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false ; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/textproc/iksemel/pkg-plist b/textproc/iksemel/pkg-plist
index 25e7fb91ab88..45449fcb6f74 100644
--- a/textproc/iksemel/pkg-plist
+++ b/textproc/iksemel/pkg-plist
@@ -3,7 +3,7 @@ bin/iksperf
 bin/iksroster
 include/iksemel.h
 lib/libiksemel.a
-lib/libiksemel.la
 lib/libiksemel.so
-lib/libiksemel.so.4
+lib/libiksemel.so.3
+lib/libiksemel.so.3.1.1
 libdata/pkgconfig/iksemel.pc