From nobody@FreeBSD.org  Fri May 26 00:59:05 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D92B916B7E3
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 May 2006 00:53:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E04343DAB
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 May 2006 00:53:39 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k4Q0rdYP023245
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 May 2006 00:53:39 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id k4Q0rdIr023244;
	Fri, 26 May 2006 00:53:39 GMT
	(envelope-from nobody)
Message-Id: <200605260053.k4Q0rdIr023244@www.freebsd.org>
Date: Fri, 26 May 2006 00:53:39 GMT
From: Eric Kjeldergaard <kjelderg@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Port update net/kiax
X-Send-Pr-Version: www-2.3

>Number:         97940
>Category:       ports
>Synopsis:       Port update net/kiax
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 26 01:00:35 GMT 2006
>Closed-Date:    Wed Aug 02 13:02:58 GMT 2006
>Last-Modified:  Wed Aug 02 13:02:58 GMT 2006
>Originator:     Eric Kjeldergaard
>Release:        6.1
>Organization:
>Environment:
>Description:

>How-To-Repeat:

>Fix:
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	.
#	./Makefile
#	./distinfo
#	./pkg-descr
#	./pkg-plist
#	./files
#	./files/patch-lib_libiax2_src_iax.c
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo x - ./Makefile
sed 's/^X//' >./Makefile << 'END-of-./Makefile'
X# New ports collection makefile for:   kiax
X# Date created:        Sat Jun 25 16:31:30 UTC 2005
X# Whom:                Eric Kjeldergaard <kjelderg@gmail.com>
X#
X# $FreeBSD$
X#
X
XPORTNAME=	kiax
XPORTVERSION=	0.8.5
XCATEGORIES=	net
XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR=	${PORTNAME}
XDISTNAME=	kiax-0.8.5-src
X
XMAINTAINER=	kjelderg@gmail.com
XCOMMENT=	An Asterisk (IAX) client written in QT for KDE
X
XBUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake \
X	lrelease:${PORTSDIR}/x11-toolkits/qt33
X
XUSE_GMAKE=	yes
X#USE_BZIP2=	yes
XGNU_CONFIGURE=	yes
XUSE_PERL5_BUILD=	yes
XUSE_QT_VER=	3
X
XCONFIGURE_ENV+=	QTDIR=${X11BASE} \
X      QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
X		EXPR_COMPAT=yes
XMAKE_ARGS+=	QTDIR=${X11BASE} \
X      QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
X
X.include <bsd.port.pre.mk>
X
X.if ${OSVERSION} < 500000
XBROKEN=		does not compile
X.endif
X
X.include <bsd.port.post.mk>
END-of-./Makefile
echo x - ./distinfo
sed 's/^X//' >./distinfo << 'END-of-./distinfo'
XSIZE (kiax-0.8.5-src.tar.gz) = 1479222
XMD5 (kiax-0.8.5-src.tar.gz) = 6bc7a9a94be7a3e998113311ce4e5847
XSHA256 (kiax-0.8.5-src.tar.gz) = b24177ecd352517a5e5a4d193944be2344a103130311ac0197c556802560521f
END-of-./distinfo
echo x - ./pkg-descr
sed 's/^X//' >./pkg-descr << 'END-of-./pkg-descr'
XThis is a port of kiax.  kiax is an asterisk (IAX) client written for the 
XK desktop environment.  From the website:
X
XWhat is Kiax? - Kiax is an IAX client application (a so called Softphone) 
Xwhich allows PC users to make ordinary VoIP calls to Asterisk servers, the 
Xsame way as they do it with their hardware telephone. It aims to provide a 
Xsimple and user-friendly graphical interface and desktop integration for 
Xcalling, contact list, call register management and easy configuration. 
XThat is - a simple to use IAX Client.
X
XWWW:	http://kiax.sourceforge.net/
X
X- Eric Kjeldergaard
Xkjelderg@gmail.com
END-of-./pkg-descr
echo x - ./pkg-plist
sed 's/^X//' >./pkg-plist << 'END-of-./pkg-plist'
Xbin/kiax
X%%DATADIR%%/i18n/kiax_bg.qm
X%%DATADIR%%/i18n/kiax_de.qm
X%%DATADIR%%/i18n/kiax_en.qm
X%%DATADIR%%/i18n/kiax_fr.qm
X%%DATADIR%%/i18n/kiax_mk.qm
X%%DATADIR%%/i18n/kiax_pl.qm
X%%DATADIR%%/i18n/kiax_pt.qm
X%%DATADIR%%/icons/contact.png
X%%DATADIR%%/icons/dial.png
X%%DATADIR%%/icons/failed.png
X%%DATADIR%%/icons/hangup.png
X%%DATADIR%%/icons/hold.png
X%%DATADIR%%/icons/incoming.png
X%%DATADIR%%/icons/missed.png
X%%DATADIR%%/icons/outgoing.png
X%%DATADIR%%/icons/resume.png
X@dirrm %%DATADIR%%/icons
X@dirrm %%DATADIR%%/i18n
X@dirrm %%DATADIR%%
END-of-./pkg-plist
echo c - ./files
mkdir -p ./files > /dev/null 2>&1
echo x - ./files/patch-lib_libiax2_src_iax.c
sed 's/^X//' >./files/patch-lib_libiax2_src_iax.c << 'END-of-./files/patch-lib_libiax2_src_iax.c'
X--- lib/libiax2/src/iax.c.orig	Thu May 25 18:42:18 2006
X+++ lib/libiax2/src/iax.c	Thu May 25 18:44:26 2006
X@@ -59,14 +59,12 @@ void gettimeofday(struct timeval *tv, vo
X #include <arpa/inet.h>
X #include <time.h>
X 
X-#ifndef MACOSX
X+#if !defined(MACOSX) && !defined(__FreeBSD__)
X #include <malloc.h>
X #ifndef SOLARIS
X-#if !defined(__NetBSD__) && !defined(__FreeBSD__)
X #include <error.h>
X #endif
X #endif
X-#endif
X  
X  #endif
X 
X@@ -97,7 +95,7 @@ void gettimeofday(struct timeval *tv, vo
X #ifdef SOLARIS
X #define IAX_SOCKOPTS MSG_DONTWAIT
X #else
X-#ifdef __NetBSD__
X+#if defined(__NetBSD__) || defined(__FreeBSD__)
X #define IAX_SOCKOPTS MSG_DONTWAIT
X #else  /* Linux and others */
X #define IAX_SOCKOPTS MSG_DONTWAIT | MSG_NOSIGNAL
END-of-./files/patch-lib_libiax2_src_iax.c
exit


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: lawrance 
State-Changed-When: Fri May 26 01:24:02 UTC 2006 
State-Changed-Why:  
Could you please resumbit the change as a unified diff between 
the old port and the new one?  For example: 

diff -urN port.orig port 


http://www.freebsd.org/cgi/query-pr.cgi?pr=97940 

From: Eric Kjeldergaard <kjelderg@gmail.com>
To: bug-followup@freebsd.org,
 kjelderg@gmail.com
Cc:  
Subject: Re: ports/97940: Port update net/kiax
Date: Thu, 25 May 2006 21:18:43 -0500

 --nextPart3595839.rKvVyrLOAc
 Content-Type: multipart/mixed;
   boundary="Boundary-01=_MWmdEykhjeKFDGD"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline
 
 --Boundary-01=_MWmdEykhjeKFDGD
 Content-Type: text/plain;
   charset="utf-8"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: inline
 
 unidiff version.
 =2D-=20
 The signature is a location used to give a personalised feel to each E-mail=
 =20
 without having to personalise each E-mail.
 
 --Boundary-01=_MWmdEykhjeKFDGD
 Content-Type: text/x-diff;
   charset="utf-8";
   name="kiax.diff"
 Content-Transfer-Encoding: quoted-printable
 Content-Disposition: attachment;
 	filename="kiax.diff"
 
 diff -urN kiax.orig/Makefile kiax/Makefile
 =2D-- kiax.orig/Makefile	Mon Apr  3 19:52:54 2006
 +++ kiax/Makefile	Thu May 25 21:16:00 2006
 @@ -2,14 +2,15 @@
  # Date created:        Sat Jun 25 16:31:30 UTC 2005
  # Whom:                Eric Kjeldergaard <kjelderg@gmail.com>
  #
 =2D# $FreeBSD: ports/net/kiax/Makefile,v 1.3 2006/04/01 10:27:14 lawrance E=
 xp $
 +# $FreeBSD$
  #
 =20
  PORTNAME=3D	kiax
 =2DPORTVERSION=3D	0.8.4
 +PORTVERSION=3D	0.8.5
  CATEGORIES=3D	net
  MASTER_SITES=3D	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=3D	${PORTNAME}
 +DISTNAME=3D	kiax-0.8.5-src
 =20
  MAINTAINER=3D	kjelderg@gmail.com
  COMMENT=3D	An Asterisk (IAX) client written in QT for KDE
 @@ -18,7 +19,7 @@
  	lrelease:${PORTSDIR}/x11-toolkits/qt33
 =20
  USE_GMAKE=3D	yes
 =2DUSE_BZIP2=3D	yes
 +#USE_BZIP2=3D	yes
  GNU_CONFIGURE=3D	yes
  USE_PERL5_BUILD=3D	yes
  USE_QT_VER=3D	3
 @@ -33,11 +34,6 @@
 =20
  .if ${OSVERSION} < 500000
  BROKEN=3D		does not compile
 =2D.endif
 =2D
 =2Dpost-patch:
 =2D.if ${OSVERSION} < 500000
 =2D	${REINPLACE_CMD} 's/stdint\.h/inttypes.h/' ${WRKSRC}/lib/spandsp/plc.h
  .endif
 =20
  .include <bsd.port.post.mk>
 diff -urN kiax.orig/distinfo kiax/distinfo
 =2D-- kiax.orig/distinfo	Sun Jan 22 15:23:09 2006
 +++ kiax/distinfo	Thu May 25 21:16:00 2006
 @@ -1,3 +1,3 @@
 =2DMD5 (kiax-0.8.4.tar.bz2) =3D 508f65e79f23155e50e6ca5684697221
 =2DSHA256 (kiax-0.8.4.tar.bz2) =3D 57cbcbf3e7f7b229302f02fda4d97aef16cfbc40=
 c89ef90fec8a42ae83d0a564
 =2DSIZE (kiax-0.8.4.tar.bz2) =3D 606213
 +SIZE (kiax-0.8.5-src.tar.gz) =3D 1479222
 +MD5 (kiax-0.8.5-src.tar.gz) =3D 6bc7a9a94be7a3e998113311ce4e5847
 +SHA256 (kiax-0.8.5-src.tar.gz) =3D b24177ecd352517a5e5a4d193944be2344a1031=
 30311ac0197c556802560521f
 diff -urN kiax.orig/files/patch-lib_libiax2_src_iax.c kiax/files/patch-lib_=
 libiax2_src_iax.c
 =2D-- kiax.orig/files/patch-lib_libiax2_src_iax.c	Sun Nov 13 07:39:01 2005
 +++ kiax/files/patch-lib_libiax2_src_iax.c	Thu May 25 21:16:00 2006
 @@ -1,31 +1,27 @@
 =2D--- lib/libiax2/src/iax.c.orig	Sun Nov 13 13:59:36 2005
 =2D+++ lib/libiax2/src/iax.c	Sun Nov 13 14:21:46 2005
 =2D@@ -53,11 +53,13 @@
 +--- lib/libiax2/src/iax.c.orig	Thu May 25 18:42:18 2006
 ++++ lib/libiax2/src/iax.c	Thu May 25 18:44:26 2006
 +@@ -59,14 +59,12 @@ void gettimeofday(struct timeval *tv, vo
 + #include <arpa/inet.h>
   #include <time.h>
  =20
 =2D #ifndef MACOSX
 =2D+#ifndef __FreeBSD__
 +-#ifndef MACOSX
 ++#if !defined(MACOSX) && !defined(__FreeBSD__)
   #include <malloc.h>
   #ifndef SOLARIS
 +-#if !defined(__NetBSD__) && !defined(__FreeBSD__)
   #include <error.h>
   #endif
   #endif
 =2D+#endif
 +-#endif
 + =20
 +  #endif
  =20
 =2D #endif
 =2D=20
 =2D@@ -85,10 +87,14 @@
 =2D #ifdef MACOSX
 +@@ -97,7 +95,7 @@ void gettimeofday(struct timeval *tv, vo
 + #ifdef SOLARIS
   #define IAX_SOCKOPTS MSG_DONTWAIT
   #else
 =2D+#ifdef __FreeBSD__
 =2D+#define IAX_SOCKOPTS MSG_DONTWAIT
 =2D+#else
 =2D #ifdef SOLARIS
 +-#ifdef __NetBSD__
 ++#if defined(__NetBSD__) || defined(__FreeBSD__)
   #define IAX_SOCKOPTS MSG_DONTWAIT
   #else  /* Linux and others */
   #define IAX_SOCKOPTS MSG_DONTWAIT | MSG_NOSIGNAL
 =2D+#endif
 =2D #endif
 =2D #endif
 =2D #endif
 diff -urN kiax.orig/files/patch-lib_libiax2_src_md5.c kiax/files/patch-lib_=
 libiax2_src_md5.c
 =2D-- kiax.orig/files/patch-lib_libiax2_src_md5.c	Sat Nov 12 08:25:14 2005
 +++ kiax/files/patch-lib_libiax2_src_md5.c	Wed Dec 31 18:00:00 1969
 @@ -1,11 +0,0 @@
 =2D--- lib/libiax2/src/md5.c.orig	Sat Nov 12 17:34:12 2005
 =2D+++ lib/libiax2/src/md5.c	Sat Nov 12 17:35:18 2005
 =2D@@ -1,7 +1,7 @@
 =2D /* MD5 checksum routines used for authentication.  Not covered by GPL, =
 but
 =2D    in the public domain as per the copyright below */
 =2D=20
 =2D-#ifdef FREEBSD
 =2D+#ifdef __FreeBSD__
 =2D # include <machine/endian.h>
 =2D #elif defined(LINUX) =20
 =2D # include <endian.h>
 diff -urN kiax.orig/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c kia=
 x/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c
 =2D-- kiax.orig/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c	Sat Nov=
  12 08:25:14 2005
 +++ kiax/files/patch-lib_portmixer_px_unix_oss_px_unix_oss.c	Wed Dec 31 18:=
 00:00 1969
 @@ -1,14 +0,0 @@
 =2D--- lib/portmixer/px_unix_oss/px_unix_oss.c.orig	Sat Nov 12 17:36:03 2005
 =2D+++ lib/portmixer/px_unix_oss/px_unix_oss.c	Sat Nov 12 17:38:29 2005
 =2D@@ -38,7 +38,11 @@
 =2D #ifdef __linux__
 =2D #include <linux/soundcard.h>
 =2D #else
 =2D+#ifdef __FreeBSD__
 =2D+#include <sys/soundcard.h>
 =2D+#else
 =2D #include <machine/soundcard.h> /* JH20010905 */
 =2D+#endif
 =2D #endif
 =2D=20
 =2D #include <stdio.h>
 
 --Boundary-01=_MWmdEykhjeKFDGD--
 
 --nextPart3595839.rKvVyrLOAc
 Content-Type: application/pgp-signature
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (FreeBSD)
 
 iD8DBQBEdmWQSMnO3Fce5JgRAjC3AJ9lTrPpnnC9AW9PVU2dVFl+mo1KcwCgmWQO
 qHqFsXh3NCyQ+kFFDyZ748s=
 =2RSQ
 -----END PGP SIGNATURE-----
 
 --nextPart3595839.rKvVyrLOAc--
State-Changed-From-To: feedback->open 
State-Changed-By: lawrance 
State-Changed-When: Fri May 26 06:14:06 UTC 2006 
State-Changed-Why:  
Patch received. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=97940 
State-Changed-From-To: open->feedback 
State-Changed-By: mich 
State-Changed-When: Wed May 31 12:58:11 UTC 2006 
State-Changed-Why:  
I'll grab this one. 

There is a problem with your plist, the port does not  
deinstall properly. (/usr/local/share/kiax/icons and  
/usr/local/share/kiax/i18n) 


Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: mich 
Responsible-Changed-When: Wed May 31 12:58:11 UTC 2006 
Responsible-Changed-Why:  
I'll grab this one. 

There is a problem with your plist, the port does not  
deinstall properly. (/usr/local/share/kiax/icons and  
/usr/local/share/kiax/i18n) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97940 
State-Changed-From-To: feedback->closed 
State-Changed-By: mich 
State-Changed-When: Wed Aug 2 13:02:12 UTC 2006 
State-Changed-Why:  
Committed (I've fixed thye plist issue), thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=97940 
>Unformatted:
