From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 19 17:10:08 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B7F7616A4CE for ; Sun, 19 Dec 2004 17:10:08 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 73BC243D53 for ; Sun, 19 Dec 2004 17:10:08 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iBJHA8lJ092149 for ; Sun, 19 Dec 2004 17:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iBJHA82s092148; Sun, 19 Dec 2004 17:10:08 GMT (envelope-from gnats) Resent-Date: Sun, 19 Dec 2004 17:10:08 GMT Resent-Message-Id: <200412191710.iBJHA82s092148@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6E85316A4CE for ; Sun, 19 Dec 2004 17:01:52 +0000 (GMT) Received: from hfep08.dion.ne.jp (hfep08.dion.ne.jp [203.181.105.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id F22F743D1F for ; Sun, 19 Dec 2004 17:01:50 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.243.89]) by hfep08.dion.ne.jp with SMTP id <20041219170145522.MZJV@hfep08.dion.ne.jp> for ; Mon, 20 Dec 2004 02:01:45 +0900 Message-Id: <20041220020020.0495ca6a.tkato432@yahoo.com> Date: Mon, 20 Dec 2004 02:00:20 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75271: Update port: www/kannel to 1.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Dec 2004 17:10:09 -0000 >Number: 75271 >Category: ports >Synopsis: Update port: www/kannel to 1.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 19 17:10:08 GMT 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.10-RELEASE-p5 i386 >Organization: >Environment: >Description: - Update to version 1.4.0 >How-To-Repeat: >Fix: diff -urN /usr/ports/www/kannel/Makefile www/kannel/Makefile --- /usr/ports/www/kannel/Makefile Fri Feb 27 19:05:43 2004 +++ www/kannel/Makefile Mon Dec 20 00:55:29 2004 @@ -5,8 +5,7 @@ # $FreeBSD: ports/www/kannel/Makefile,v 1.18 2004/02/23 23:08:55 kris Exp $ 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 @@ 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 .if ${ARCH} == "alpha" @@ -33,14 +36,15 @@ .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 -urN /usr/ports/www/kannel/distinfo www/kannel/distinfo --- /usr/ports/www/kannel/distinfo Fri Jan 30 14:54:56 2004 +++ www/kannel/distinfo Sun Dec 19 07:29:38 2004 @@ -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 -urN /usr/ports/www/kannel/files/patch-af www/kannel/files/patch-af --- /usr/ports/www/kannel/files/patch-af Tue Feb 4 20:51:52 2003 +++ www/kannel/files/patch-af Mon Dec 20 00:54:58 2004 @@ -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 -urN /usr/ports/www/kannel/pkg-plist www/kannel/pkg-plist --- /usr/ports/www/kannel/pkg-plist Tue Feb 4 20:51:52 2003 +++ www/kannel/pkg-plist Sun Dec 19 08:14:51 2004 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: