7 files changed, 77 insertions, 187 deletions

diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index a220bc50f737..b495ccd5ef37 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -5,37 +5,38 @@
 # $FreeBSD$
 
 PORTNAME=	kannel
-PORTVERSION=	1.0.3
+PORTVERSION=	1.2.1
 CATEGORIES=	www
-MASTER_SITES=	http://www.kannel.3glab.org/download/${PORTVERSION}/
+MASTER_SITES=	http://www.kannel.3glab.org/download/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 DISTNAME=	gateway-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
-USE_AUTOCONF=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}/
-CFLAGS+=	${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--with-malloc=native
-
-do-install:
-.if !defined(NOPORTDOCS)
-	@cd ${WRKSRC} && make install-docs
-.endif
-	@cd ${WRKSRC} && make install
-	${INSTALL_DATA} ${WRKSRC}/gw/wapkannel.conf ${PREFIX}/etc/
-	${INSTALL_DATA} ${WRKSRC}/gw/smskannel.conf ${PREFIX}/etc/
-
-.if !defined(NOPORTDOCS)
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
+CONFIGURE_ARGS=	--with-malloc=native --enable-start-stop-daemon=no
+
+MAN1=		seewbmp.1 wmlsc.1 wmlsdasm.1
+MAN8=		kannel.8 run_kannel_box.8
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-lc_r|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
+
 post-install:
-	@cd ${WRKSRC}/doc && \
-		for a in `/usr/bin/find . -type f | ${SED} -e 's:^\./::g'` ; \
-			do ${ECHO_CMD} share/doc/kannel/$$a >> ${TMPPLIST} ; done
-	@${ECHO_CMD} "@dirrm share/doc/kannel/arch" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm share/doc/kannel/userguide" >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm share/doc/kannel" >> ${TMPPLIST}
-.endif
+.for file in gw/wapkannel.conf gw/smskannel.conf
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc
+.endfor
+.for file in seewbmp wmlsc wmlsdasm
+	@${STRIP_CMD} ${PREFIX}/bin/${file}
+.endfor
+.for file in bearerbox run_kannel_box smsbox wapbox
+	@${STRIP_CMD} ${PREFIX}/sbin/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/www/kannel/distinfo b/www/kannel/distinfo
index da57fbf6895d..11f211a690af 100644
--- a/www/kannel/distinfo
+++ b/www/kannel/distinfo
@@ -1 +1 @@
-MD5 (gateway-1.0.3.tar.gz) = 04f12df08c5960c446562ef5d7f579f5
+MD5 (gateway-1.2.1.tar.gz) = 52e187024cb371bb0c662ede8844be00
diff --git a/www/kannel/files/patch-aa b/www/kannel/files/patch-aa
deleted file mode 100644
index 022ac8fed661..000000000000
--- a/www/kannel/files/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.in.orig	Tue Mar 27 18:23:16 2001
-+++ configure.in	Wed Mar 28 09:23:20 2001
-@@ -15,7 +15,7 @@
- dnl Target installation directory for documentation
- 
- AC_SUBST(docdir)
--docdir='${prefix}/doc/kannel'
-+docdir='${prefix}/share/doc/kannel'
- 
- dnl Checks for programs.
- 
-@@ -25,10 +25,6 @@
- AC_PROG_YACC
- AC_PROG_LEX
- AC_PATH_PROG(PERL, perl)
--
--AC_CHECK_FILE(/sbin/start-stop-daemon, , 
--		STARTSTOPDAEMONSRC="utils/start-stop-daemon.c")
--AC_SUBST(STARTSTOPDAEMONSRC)
- 
- dnl Checks for libraries.
- 
diff --git a/www/kannel/files/patch-ac b/www/kannel/files/patch-ac
deleted file mode 100644
index 59f1e0cc5a18..000000000000
--- a/www/kannel/files/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
---- Makefile.in.orig	Tue Feb 13 14:12:02 2001
-+++ Makefile.in	Tue Feb 13 21:09:12 2001
-@@ -72,7 +72,7 @@
- LIBSRCS=$(LIBOBJS:.o=.c)
- 
- LIBS=@LIBS@
--CFLAGS=-D_REENTRANT=1 -I. @CFLAGS@
-+CFLAGS=-D_REENTRANT=1 -I. @CFLAGS@ -I@prefix@/include
- LDFLAGS=@LDFLAGS@
- 
- MKDEPEND=$(CC) $(CFLAGS) -MM
-@@ -87,7 +87,7 @@
- 
- # Set this to something if you want all installed binaries to have a suffix.
- # Version number is common.
--suffix = -$(VERSION)
-+# suffix = -$(VERSION)
- 
- #
- # You probably don't need to touch anything below this, if you're just
-@@ -104,7 +104,7 @@
- 	wmlscript/wmlsdasm.c \
- 	utils/seewbmp.c \
- 	utils/run_kannel_box.c \
--	$(STARTSTOPDAEMONSRC)
-+
- progobjs = $(progsrcs:.c=.o)
- progs = $(progsrcs:.c=)
- 
-@@ -137,6 +137,8 @@
- docs = $(docsrcs:.xml=.html) $(docsrcs:.xml=.ps)
- DOCSTARGET=@DOCSTARGET@
- 
-+alldocs = doc/ $(shell ls [A-Z]*) 
-+
- figsrcs = $(shell echo doc/*/*.fig)
- figs = $(figsrcs:.fig=.png)  $(figsrcs:.fig=.ps)
- 
-@@ -182,7 +184,9 @@
- check: all
- 	utils/run-checks $(checks)
- 
--install: all
-+install: install-main install-docs
-+
-+install-main: all
- 	$(INSTALL) -d $(bindir)
- 	for prog in $(progs); do \
- 		$(INSTALL) $$prog $(bindir)/`basename $$prog`$(suffix); \
-@@ -190,7 +194,7 @@
- 
- install-docs:
- 	$(INSTALL) -d $(docdir)
--	cp -r $(docs) $(docsrcs) $(figs) $(figsrcs) $(docdir)
-+	cp -r $(alldocs) $(docdir)
- 
- clean:
- 	rm -f core $(progs) $(testprogs) $(checkprogs) $(objs) $(docs) *.a
diff --git a/www/kannel/files/patch-af b/www/kannel/files/patch-af
index d519dd626a4f..1deedc46c86e 100644
--- a/www/kannel/files/patch-af
+++ b/www/kannel/files/patch-af
@@ -1,59 +1,45 @@
-*** gwlib/gwthread-pthread.c.orig	Tue Jul 18 15:08:24 2000
---- gwlib/gwthread-pthread.c	Wed Jul 19 13:23:39 2000
-***************
-*** 58,63 ****
---- 58,68 ----
-  pthread_key_t tsd_key;
-  
-  pthread_mutex_t threadtable_lock;
-+ /*
-+  * Thread creation parameters.
-+  */
-+ static pthread_attr_t	thread_attr;
-+ #define MIN_THREAD_STACK_SIZE	(256 * 1024)
-  
-  static void lock(void) {
-  	int ret;
-***************
-*** 172,177 ****
---- 177,183 ----
-  void gwthread_init(void) {
-  	int ret;
-  	int i;
-+ 	int stack_size;
-  
-  	pthread_mutex_init(&threadtable_lock, NULL);
-  
-***************
-*** 184,189 ****
---- 190,202 ----
-  		threadtable[i] = NULL;
-  	}
-  	active_threads = 0;
-+ /*
-+  * Make sure that thread stack is large enough.
-+  */
-+ 	pthread_attr_init(&thread_attr);
-+ 	pthread_attr_getstacksize(&thread_attr, &stack_size);
-+ 	if (stack_size < MIN_THREAD_STACK_SIZE)
-+ 		pthread_attr_setstacksize(&thread_attr, MIN_THREAD_STACK_SIZE);
-  
-  	create_threadinfo_main();
-  }
-***************
-*** 285,291 ****
-  		return -1;
-  	}
-  
-! 	ret = pthread_create(&id, NULL, &new_thread, p);
-  	if (ret != 0) {
-  		unlock();
-  		error(ret, "Could not create new thread.");
---- 298,304 ----
-  		return -1;
-  	}
-  
-! 	ret = pthread_create(&id, &thread_attr, &new_thread, p);
-  	if (ret != 0) {
-  		unlock();
-  		error(ret, "Could not create new thread.");
+--- 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;
+ 
+ pthread_mutex_t threadtable_lock;
++/*
++ * Thread creation parameters.
++ */
++static pthread_attr_t thread_attr;
++#define MIN_THREAD_STACK_SIZE (256 * 1024)
+ 
+ static void lock(void)
+ {
+@@ -205,6 +210,7 @@
+ {
+     int ret;
+     int i;
++    int stack_size;
+ 
+     pthread_mutex_init(&threadtable_lock, NULL);
+ 
+@@ -217,6 +223,13 @@
+         threadtable[i] = NULL;
+     }
+     active_threads = 0;
++/*
++ * Make sure that thread stack is large enough.
++ */
++    pthread_attr_init(&thread_attr);
++    pthread_attr_getstacksize(&thread_attr, &stack_size);
++    if (stack_size < MIN_THREAD_STACK_SIZE)
++            pthread_attr_setstacksize(&thread_attr, MIN_THREAD_STACK_SIZE);
+ 
+     create_threadinfo_main();
+ }
+@@ -380,7 +393,7 @@
+         return -1;
+     }
+ 
+-    ret = pthread_create(&id, NULL, &new_thread, p);
++    ret = pthread_create(&id, &thread_attr, &new_thread, p);
+     if (ret != 0) {
+         unlock();
+         error(ret, "Could not create new thread.");
diff --git a/www/kannel/files/patch-ag b/www/kannel/files/patch-ag
deleted file mode 100644
index 8d44dbf48944..000000000000
--- a/www/kannel/files/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
---- gw/wml_compiler.c.orig	Sat Mar 30 22:08:15 2002
-+++ gw/wml_compiler.c	Sat Mar 30 22:08:44 2002
-@@ -21,10 +21,10 @@
- #include <string.h>
- #include <math.h>
- 
--#include <xmlmemory.h>
--#include <parser.h>
--#include <tree.h>
--#include <debugXML.h>
-+#include <libxml/xmlmemory.h>
-+#include <libxml/parser.h>
-+#include <libxml/tree.h>
-+#include <libxml/debugXML.h>
- 
- #include "gwlib/gwlib.h"
- #include "wml_compiler.h"
diff --git a/www/kannel/pkg-plist b/www/kannel/pkg-plist
index b0348508fa1f..7d4c3d0e9213 100644
--- a/www/kannel/pkg-plist
+++ b/www/kannel/pkg-plist
@@ -1,9 +1,9 @@
-bin/bearerbox
-bin/smsbox
-bin/wapbox
+bin/seewbmp
 bin/wmlsc
 bin/wmlsdasm
-bin/seewbmp
-bin/run_kannel_box
-etc/wapkannel.conf
 etc/smskannel.conf
+etc/wapkannel.conf
+sbin/bearerbox
+sbin/run_kannel_box
+sbin/smsbox
+sbin/wapbox