From melifaro@ipfw.ru  Wed Sep 29 12:56:14 2010
Return-Path: <melifaro@ipfw.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 62017106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 29 Sep 2010 12:56:14 +0000 (UTC)
	(envelope-from melifaro@ipfw.ru)
Received: from no.spam.no.ddos.ru (no.spam.no.ddos.ru [IPv6:2a02:978:2:1000::3])
	by mx1.freebsd.org (Postfix) with ESMTP id AF1448FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 29 Sep 2010 12:56:13 +0000 (UTC)
Received: from ws.su29.net (ws.ipv6.ipfw.ru [IPv6:2a02:978:2::5])
	by no.spam.no.ddos.ru (Postfix) with ESMTPA id 44B3A3053BD;
	Wed, 29 Sep 2010 16:56:34 +0400 (MSD)
Message-Id: <4CA3373C.6070703@ipfw.ru>
Date: Wed, 29 Sep 2010 16:55:24 +0400
From: "Alexander V. Chernikov" <melifaro@ipfw.ru>
To: Dmitry Marakasov <amdmi3@amdmi3.ru>
Cc: FreeBSD-gnats-submit@freebsd.org
In-Reply-To: <20100929120153.362F4B829@hades.panopticon>
Subject: Re: [PATCH] devel/ptlib: fix build in presence of alsa-lib
References: <20100929120153.362F4B829@hades.panopticon>

>Number:         151068
>Category:       ports
>Synopsis:       Re: [PATCH] devel/ptlib: fix build in presence of alsa-lib
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 29 13:00:10 UTC 2010
>Closed-Date:    Fri Oct 01 20:32:17 UTC 2010
>Last-Modified:  Fri Oct 01 20:32:17 UTC 2010
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 This is a multi-part message in MIME format.
 --------------040601090309040808010306
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 Dmitry Marakasov wrote:
 >> Submitter-Id:	current-users
 >> Originator:	Dmitry Marakasov
 >> Organization:	
 >> Confidential:	no 
 >> Synopsis:	[PATCH] devel/ptlib: fix build in presence of alsa-lib
 >> Severity:	non-critical
 >> Priority:	low
 >> Category:	ports 
 >> Class:		change-request
 >> Release:	FreeBSD 8.1-RELEASE i386
 >> Environment:
 > System: FreeBSD hades.panopticon 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Fri Jul 30 02:50:28 MSD 2010
 >> Description:
 > ptlib doesn't build in presence of audio/alsa-lib:
 
 * update to 2.6.7
 * fix build with alsa-lib installed
 
 > 
 > http://people.freebsd.org/~amdmi3/ptlib-2.6.5_2.log
 > 
 > Port maintainer (melifaro@ipfw.ru) is cc'd.
 
 
 --------------040601090309040808010306
 Content-Type: text/plain;
  name="ptlib267.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="ptlib267.diff"
 
 diff -urN /usr/ports/devel/ptlib26/Makefile ptlib26/Makefile
 --- /usr/ports/devel/ptlib26/Makefile	2010-05-15 14:30:58.000000000 +0400
 +++ ptlib26/Makefile	2010-09-29 16:53:51.000000000 +0400
 @@ -6,20 +6,22 @@
  #
  
  PORTNAME=	ptlib
 -PORTVERSION=	2.6.5
 -PORTREVISION=	2
 +PORTVERSION=	2.6.7
  CATEGORIES=	devel
 -MASTER_SITES=	${MASTER_SITE_GNOME}
 -MASTER_SITE_SUBDIR=	sources/ptlib/2.6
 +MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 +MASTER_SITE_SUBDIR=	opalvoip/v3.6%20Lalande/Final
  DISTNAME=	ptlib-${PORTVERSION}
  
  MAINTAINER=	melifaro@ipfw.ru
  COMMENT=	A cross platform C++ library, used by OPAL
  
 +LICENSE=MPL
 +
  LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
  
 -CONFLICTS=	pwlib-1.* ptlib-2.4.*
 +CONFLICTS=	pwlib-1.* ptlib-2.4.* ptlib-2.8.*
  
 +USE_BZIP2=	yes
  USE_BISON=	build
  USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 @@ -30,8 +32,10 @@
  
  CFLAGS+=	-I${LOCALBASE}/include
  CONFIGURE_ARGS+=	--enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}"
 +CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
  
  OPTIONS=	ODBC		"Use ODBC" On \
 +		ALSA		"Use ALSA (experimental)" Off \
  		V4L		"Use Video4Linux" Off \
  		BSDVIDEO	"Enable BSD video support" On \
  		SDL		"Use SDL" On \
 @@ -57,6 +61,15 @@
  CONFIGURE_ARGS+=	--disable-odbc
  .endif
  
 +.if defined(WITH_ALSA)
 +CONFIGURE_ARGS+=	--enable-alsa
 +PLIST_SUB+=	ALSA=""
 +LIB_DEPENDS+=		asound.2:${PORTSDIR}/audio/alsa-lib
 +.else
 +CONFIGURE_ARGS+=	--disable-alsa
 +PLIST_SUB+=	ALSA="@comment "
 +.endif
 +
  .if defined(WITH_BSDVIDEO)
  CONFIGURE_ARGS+=--enable-bsdvideo
  PLIST_SUB+=	BSDVIDEO=""
 @@ -130,6 +143,7 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in
 +	@${REINPLACE_CMD} -e 's|-lasound|-lasound -L${LOCALBASE}/lib|' ${WRKSRC}/plugins/sound_alsa/Makefile
  .if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
  	@${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx
  .endif
 diff -urN /usr/ports/devel/ptlib26/distinfo ptlib26/distinfo
 --- /usr/ports/devel/ptlib26/distinfo	2010-05-15 14:30:58.000000000 +0400
 +++ ptlib26/distinfo	2010-05-30 11:02:11.000000000 +0400
 @@ -1,3 +1,3 @@
 -MD5 (ptlib-2.6.5.tar.gz) = a7381ea6bbd35ee15e21eb1be107d6d5
 -SHA256 (ptlib-2.6.5.tar.gz) = ae8ecf50a39d204910408934f2ab6965310e350c8c3ef4309dca985c761d05fb
 -SIZE (ptlib-2.6.5.tar.gz) = 4861936
 +MD5 (ptlib-2.6.7.tar.bz2) = 37279b5cf4aa64890eb9f38b4500ec6f
 +SHA256 (ptlib-2.6.7.tar.bz2) = 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f
 +SIZE (ptlib-2.6.7.tar.bz2) = 3275152
 diff -urN /usr/ports/devel/ptlib26/pkg-plist ptlib26/pkg-plist
 --- /usr/ports/devel/ptlib26/pkg-plist	2010-05-15 14:30:58.000000000 +0400
 +++ ptlib26/pkg-plist	2010-05-30 11:52:16.000000000 +0400
 @@ -157,9 +157,10 @@
  include/ptlib/videoio.h
  include/ptlib/videoio1394dc.h
  lib/libpt-%%PVERSION_MAJOR%%.so
 +lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%%
  lib/libpt.so
  lib/libpt_s.a
 -lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%%
 +%%ALSA%%lib/ptlib-%%PORTVERSION%%/devices/sound/alsa_pwplugin.so
  lib/ptlib-%%PORTVERSION%%/devices/sound/oss_pwplugin.so
  %%BSDVIDEO%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/bsdvideo_pwplugin.so
  %%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l_pwplugin.so
 
 --------------040601090309040808010306--
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Fri Oct 1 20:31:22 UTC 2010 
State-Changed-Why:  
Misfiled followup to ports/151067; content migrated. 


Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Oct 1 20:31:22 UTC 2010 
Responsible-Changed-Why:  

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