4 files changed, 68 insertions, 20 deletions

diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 061153d564f7..a541524ecd85 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kannel
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.kannel.3glab.org/download/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
@@ -15,17 +14,21 @@ DISTNAME=	gateway-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WAP / SMS Gateway
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
+USE_GNOME=	libxml2
+USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-CONFIGURE_ARGS=	--with-malloc=native --enable-start-stop-daemon=no
+CONFIGURE_ARGS=	--with-cflags="${CPPFLAGS}" --with-libs="${LDFLAGS}" \
+		--enable-pcre=yes --enable-docs=no --with-malloc=native \
+		--enable-start-stop-daemon=no
 
-MAN1=		seewbmp.1 wmlsc.1 wmlsdasm.1
+MAN1=		mtbatch.1 seewbmp.1 wmlsc.1 wmlsdasm.1
 MAN8=		kannel.8 run_kannel_box.8
 
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "alpha"
@@ -33,14 +36,15 @@ BROKEN=		"Does not compile on alpha"
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|-lc_r|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-pthread||g ; \
+		 s|-lc_r||g ; \
+		 s|-lkse||g' ${WRKSRC}/configure
 
 post-install:
 .for file in gw/wapkannel.conf gw/smskannel.conf
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc
 .endfor
-.for file in seewbmp wmlsc wmlsdasm
+.for file in mtbatch seewbmp wmlsc wmlsdasm
 	@${STRIP_CMD} ${PREFIX}/bin/${file}
 .endfor
 .for file in bearerbox run_kannel_box smsbox wapbox
diff --git a/www/kannel/distinfo b/www/kannel/distinfo
index 918b3ca0c1ce..a8c96328c554 100644
--- a/www/kannel/distinfo
+++ b/www/kannel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gateway-1.2.1.tar.gz) = 52e187024cb371bb0c662ede8844be00
-SIZE (gateway-1.2.1.tar.gz) = 2134160
+MD5 (gateway-1.4.0.tar.gz) = b6fbb1599b377c44c35a5338746c42d3
+SIZE (gateway-1.4.0.tar.gz) = 2465341
diff --git a/www/kannel/files/patch-af b/www/kannel/files/patch-af
index 1deedc46c86e..f4a5ab082c65 100644
--- a/www/kannel/files/patch-af
+++ b/www/kannel/files/patch-af
@@ -1,9 +1,9 @@
---- gwlib/gwthread-pthread.c.orig	Wed Sep  4 18:11:06 2002
-+++ gwlib/gwthread-pthread.c	Sun Jan 19 03:05:30 2003
-@@ -68,6 +68,11 @@
- pthread_key_t tsd_key;
+--- gwlib/gwthread-pthread.c.orig	Thu Aug 12 19:53:30 2004
++++ gwlib/gwthread-pthread.c	Mon Dec 20 00:53:57 2004
+@@ -125,6 +125,11 @@
+ static pthread_key_t tsd_key;
  
- pthread_mutex_t threadtable_lock;
+ static pthread_mutex_t threadtable_lock;
 +/*
 + * Thread creation parameters.
 + */
@@ -12,7 +12,7 @@
  
  static void lock(void)
  {
-@@ -205,6 +210,7 @@
+@@ -263,6 +268,7 @@
  {
      int ret;
      int i;
@@ -20,7 +20,7 @@
  
      pthread_mutex_init(&threadtable_lock, NULL);
  
-@@ -217,6 +223,13 @@
+@@ -275,6 +281,13 @@
          threadtable[i] = NULL;
      }
      active_threads = 0;
@@ -34,7 +34,7 @@
  
      create_threadinfo_main();
  }
-@@ -380,7 +393,7 @@
+@@ -443,7 +456,7 @@
          return -1;
      }
  
diff --git a/www/kannel/pkg-plist b/www/kannel/pkg-plist
index 7d4c3d0e9213..d48f8a788921 100644
--- a/www/kannel/pkg-plist
+++ b/www/kannel/pkg-plist
@@ -1,9 +1,53 @@
+bin/gw-config
+bin/mtbatch
 bin/seewbmp
 bin/wmlsc
 bin/wmlsdasm
 etc/smskannel.conf
 etc/wapkannel.conf
+include/kannel/gw-config.h
+include/kannel/gwlib/accesslog.h
+include/kannel/gwlib/cfg.h
+include/kannel/gwlib/charset.h
+include/kannel/gwlib/conn.h
+include/kannel/gwlib/counter.h
+include/kannel/gwlib/date.h
+include/kannel/gwlib/dbpool.h
+include/kannel/gwlib/dbpool_p.h
+include/kannel/gwlib/dict.h
+include/kannel/gwlib/fdset.h
+include/kannel/gwlib/gw-getopt.h
+include/kannel/gwlib/gw-prioqueue.h
+include/kannel/gwlib/gw-rwlock.h
+include/kannel/gwlib/gw_uuid.h
+include/kannel/gwlib/gw_uuid_types.h
+include/kannel/gwlib/gwassert.h
+include/kannel/gwlib/gwlib.h
+include/kannel/gwlib/gwmem.h
+include/kannel/gwlib/gwpoll.h
+include/kannel/gwlib/gwthread.h
+include/kannel/gwlib/http.h
+include/kannel/gwlib/list.h
+include/kannel/gwlib/log.h
+include/kannel/gwlib/md5.h
+include/kannel/gwlib/mime.h
+include/kannel/gwlib/octstr.h
+include/kannel/gwlib/parse.h
+include/kannel/gwlib/pcre.h
+include/kannel/gwlib/pki.h
+include/kannel/gwlib/protected.h
+include/kannel/gwlib/regex.h
+include/kannel/gwlib/semaphore.h
+include/kannel/gwlib/socket.h
+include/kannel/gwlib/ssl.h
+include/kannel/gwlib/thread.h
+include/kannel/gwlib/utils.h
+include/kannel/gwlib/xmlrpc.h
+lib/kannel/libgwlib.a
 sbin/bearerbox
 sbin/run_kannel_box
 sbin/smsbox
 sbin/wapbox
+@dirrm lib/kannel
+@dirrm include/kannel/gwlib
+@dirrm include/kannel