From Joerg.Pulz@frm2.tum.de  Thu Apr 13 14:24:27 2006
Return-Path: <Joerg.Pulz@frm2.tum.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EFDAC16A418;
	Thu, 13 Apr 2006 14:24:26 +0000 (UTC)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from mailhost.frm2.tum.de (mailhost.frm2.tum.de [129.187.179.12])
	by mx1.FreeBSD.org (Postfix) with ESMTP id ABC6443D8B;
	Thu, 13 Apr 2006 14:24:11 +0000 (GMT)
	(envelope-from Joerg.Pulz@frm2.tum.de)
Received: from localhost (mailhost.frm2.tum.de [129.187.179.12])
	by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k3DEO6N1066977;
	Thu, 13 Apr 2006 16:24:06 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (hades.admin.frm2 [172.25.1.10])
	by mailhost.frm2.tum.de (8.13.4/8.13.4) with ESMTP id k3DEO2gn066974
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT);
	Thu, 13 Apr 2006 16:24:02 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: from hades.admin.frm2 (localhost [127.0.0.1])
	by hades.admin.frm2 (8.13.4/8.13.4) with ESMTP id k3DEO2Eg095323;
	Thu, 13 Apr 2006 16:24:02 +0200 (CEST)
	(envelope-from jpulz@frm2.tum.de)
Received: (from jpulz@localhost)
	by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k3DEO2lB095322;
	Thu, 13 Apr 2006 16:24:02 +0200 (CEST)
	(envelope-from jpulz)
Message-Id: <200604131424.k3DEO2lB095322@hades.admin.frm2>
Date: Thu, 13 Apr 2006 16:24:02 +0200 (CEST)
From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
Reply-To: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Maintainer <sobomax@freebsd.org>
Subject: net/asterisk: switch to devel/pwlib and net/openh323
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95694
>Category:       ports
>Synopsis:       net/asterisk: switch to devel/pwlib and net/openh323
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    sobomax
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 13 14:30:11 GMT 2006
>Closed-Date:    Wed Apr 26 16:33:49 GMT 2006
>Last-Modified:  Wed Apr 26 16:33:49 GMT 2006
>Originator:     Joerg Pulz
>Release:        FreeBSD 6.1-PRERELEASE i386
>Organization:
TU-Munich / ZWE FRM-II
>Environment:
System: FreeBSD hades.admin.frm2 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #11: Wed Feb 22 19:01:44 CET 2006 root@hades.admin.frm2:/usr/obj/usr/src/sys/HADES i386


	
>Description:
	- net/asterisk still depends on the old devel/pwlib152 and
	  net/openh323-112 ports
	- this small patch changes the dependency to net/openh323 which implies
	  devel/pwlib
	- one Makefile gets modified by REINPLACE_CMD to fix the wrong library
	  names
		libpt_FreeBSD_x86_r_s -> libpt_r
		libh323_FreeBSD_x86_r_s -> libh323_r

	This brings us one step closer to the removal of the old devel/pwlib152
	and net/openh323-112 ports
>How-To-Repeat:
	
>Fix:

	- apply the patch

--- net_asterisk.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/asterisk/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile	15 Mar 2006 08:09:24 -0000	1.50
+++ Makefile	13 Apr 2006 12:54:26 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/ \
@@ -41,8 +41,8 @@
 MAKE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		MKDIR="${MKDIR}" \
-		PWLIBDIR=${PWLIBDIR} \
-		OPENH323DIR=${OPENH323DIR} \
+		PWLIBDIR=${LOCALBASE}/share/pwlib \
+		OPENH323DIR=${LOCALBASE}/share/openh323 \
 		OSVERSION=${OSVERSION} \
 		CXX="${CXX}"
 
@@ -50,9 +50,6 @@
 
 .include <bsd.port.pre.mk>
 
-PWLIBDIR!=	cd ${PORTSDIR}/devel/pwlib152; make -V WRKSRC
-OPENH323DIR!=	cd ${PORTSDIR}/net/openh323-112; make -V WRKSRC
-
 .if ${ARCH} != "i386"
 WITHOUT_H323=	1
 WITHOUT_ZAPTEL=	1
@@ -61,8 +58,7 @@
 .if defined(WITHOUT_H323)
 PLIST_SUB+=	WITH_H323="@comment "
 .else
-BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/devel/pwlib152:build \
-		${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build
+LIB_DEPENDS+=	h323_r.1:${PORTSDIR}/net/openh323
 PLIST_SUB+=	WITH_H323=""
 MAKE_ENV+=	WITH_H323=1
 .endif
@@ -106,5 +102,6 @@
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+	${REINPLACE_CMD} -e 's|FreeBSD_x86_r_s|r|g' ${WRKSRC}/channels/Makefile
 
 .include <bsd.port.post.mk>
--- net_asterisk.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sobomax 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Apr 13 14:32:10 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95694 
State-Changed-From-To: open->closed 
State-Changed-By: fjoe 
State-Changed-When: Wed Apr 26 16:33:24 UTC 2006 
State-Changed-Why:  
Should be fixed in net/ports/asterisk update to 1.2.7.1. 

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