From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Apr 6 19:20:31 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 F34C516A400 for ; Thu, 6 Apr 2006 19:20:30 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 445CD43D53 for ; Thu, 6 Apr 2006 19:20:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k36JKJdh038970 for ; Thu, 6 Apr 2006 19:20:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k36JKJYY038969; Thu, 6 Apr 2006 19:20:19 GMT (envelope-from gnats) Resent-Date: Thu, 6 Apr 2006 19:20:19 GMT Resent-Message-Id: <200604061920.k36JKJYY038969@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, Joerg Pulz Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9199916A403 for ; Thu, 6 Apr 2006 19:19:38 +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 F096543E30 for ; Thu, 6 Apr 2006 19:19:21 +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 k36JJKNH013367 for ; Thu, 6 Apr 2006 21:19:20 +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 k36JJAwQ013358 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Thu, 6 Apr 2006 21:19:10 +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 k36JJAQ0094195 for ; Thu, 6 Apr 2006 21:19:10 +0200 (CEST) (envelope-from jpulz@frm2.tum.de) Received: (from jpulz@localhost) by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k36JJAWi094194; Thu, 6 Apr 2006 21:19:10 +0200 (CEST) (envelope-from jpulz) Message-Id: <200604061919.k36JJAWi094194@hades.admin.frm2> Date: Thu, 6 Apr 2006 21:19:10 +0200 (CEST) From: Joerg Pulz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95424: update and unbreak net/ohphone, take maintainership X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Joerg Pulz List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Apr 2006 19:20:31 -0000 >Number: 95424 >Category: ports >Synopsis: update and unbreak net/ohphone, take maintainership >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Apr 06 19:20:19 GMT 2006 >Closed-Date: >Last-Modified: >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: - update net/ohphone to v1.4.5 and unbreak - make use of devel/pwlib and net/openh323 - use DOCSDIR and EXAMPLESDIR in the way i do it with net/gatekeeper - introduce pkg-plist - host the distfile on our FTP server - take maintainership >How-To-Repeat: >Fix: - apply the patch - remove the now empty file net/ohphone/files/patch-main --- net_ohphone.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/ohphone/Makefile,v retrieving revision 1.26 diff -u -r1.26 Makefile --- Makefile 6 Mar 2006 20:43:50 -0000 1.26 +++ Makefile 6 Apr 2006 18:33:14 -0000 @@ -6,38 +6,43 @@ # PORTNAME= ohphone -PORTVERSION= 1.4.1 -PORTREVISION= 2 +PORTVERSION= 1.4.5 CATEGORIES= net -MASTER_SITES= http://www.openh323.org/bin/ \ - http://www.de.openh323.org/bin/ \ - http://www.ru.openh323.org/bin/ -DISTNAME= ${PORTNAME}_${PORTVERSION} +MASTER_SITES= ftp://ftp.frm2.tum..de/pub/jpulz/FreeBSD/distfiles -MAINTAINER= ports@FreeBSD.org +MAINTAINER= Joerg.Pulz@frm2.tum.de COMMENT= H323 Video Conferencing Program, compatible with NetMeeting -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build - -BROKEN= Incomplete dependency list - -WRKSRC= ${WRKDIR}/${PORTNAME} - -NOCLEANDEPENDS= yes +LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323 USE_BISON= yes USE_XLIB= yes USE_GMAKE= yes -ALL_TARGET= optnoshared -MAKE_ENV= PWLIBDIR=${WRKDIRPREFIX}${.CURDIR}/../../devel/pwlib152/work/pwlib \ - OPENH323DIR=${WRKDIRPREFIX}${.CURDIR}/../openh323-112/work/openh323 -THE_MACHTYPE= ${ARCH:S/i386/x86/} -MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${THE_MACHTYPE} OSRELEASE=${OSVERSION} CPLUS=${CXX} +ALL_TARGET= optshared +MAKE_ENV= PWLIBDIR=${LOCALBASE}/share/pwlib \ + OPENH323DIR=${LOCALBASE}/share/openh323 \ + SYSLIBDIR=${LOCALBASE}/lib +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \ + OSRELEASE=${OSVERSION} CPLUS=${CXX} + MAN1= ohphone.1 -PLIST_FILES= bin/ohphone + +PLIST_SUB= PORTNAME=${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/openh323 +EXAMPLESDIR= ${PREFIX}/share/examples/openh323 + +.include do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/ohphone ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${PREFIX}/man/man1 +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME} +.endif + ${MKDIR} ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/regtest ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/stresstest ${EXAMPLESDIR}/${PORTNAME} -.include +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/ohphone/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- distinfo 25 Nov 2005 16:48:15 -0000 1.16 +++ distinfo 6 Apr 2006 18:33:14 -0000 @@ -1,3 +1,3 @@ -MD5 (ohphone_1.4.1.tar.gz) = f5b975db51589e2ed741367e20f75ed0 -SHA256 (ohphone_1.4.1.tar.gz) = 277987557f821b54126867a19312fe83444fe15fc035e83ddd6879ce87176355 -SIZE (ohphone_1.4.1.tar.gz) = 77085 +MD5 (ohphone-1.4.5.tar.gz) = 87328457be0a44d8805a4d4e10057092 +SHA256 (ohphone-1.4.5.tar.gz) = 62e3038341d940700d186f68fff9a4b38c891d7afc6562e5afa9c31789b96d3d +SIZE (ohphone-1.4.5.tar.gz) = 75743 Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-plist 6 Apr 2006 18:33:14 -0000 @@ -0,0 +1,9 @@ +bin/ohphone +%%EXAMPLESDIR%%/%%PORTNAME%%/check_listen.awk +%%EXAMPLESDIR%%/%%PORTNAME%%/regtest +%%EXAMPLESDIR%%/%%PORTNAME%%/stresstest +@dirrm %%EXAMPLESDIR%%/%%PORTNAME%% +@dirrmtry %%EXAMPLESDIR%% +%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% Index: files/patch-main =================================================================== RCS file: files/patch-main diff -N files/patch-main --- files/patch-main 28 Aug 2003 07:14:38 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,69 +0,0 @@ -*** main.cxx.orig Mon Aug 4 05:07:54 2003 ---- main.cxx Sat Aug 23 09:17:04 2003 -*************** -*** 501,507 **** - #include - #include "h261codec.h" - #include "h263codec.h" -! #include "ffh263codec.h" - #include "h323pdu.h" - #include "g726codec.h" - //#include "h323t120.h" ---- 501,507 ---- - #include - #include "h261codec.h" - #include "h263codec.h" -! //#include "ffh263codec.h" - #include "h323pdu.h" - #include "g726codec.h" - //#include "h323t120.h" -*************** BOOL MyH323EndPoint::Initialise(PConfigA -*** 1519,1530 **** - } \ - } \ - -! #if H323_AVCODEC -! ADD_VIDEO_CAPAB (H323_FFH263Capability); -! #endif -! #if H323_VICH263 -! ADD_VIDEO_CAPAB (H323_H263Capability); -! #endif - - if (!videoReceiveDevice.IsEmpty()) { - if (videoSize == 1) { ---- 1519,1530 ---- - } \ - } \ - -! //#if H323_AVCODEC -! // ADD_VIDEO_CAPAB (H323_FFH263Capability); -! //#endif -! //#if H323_VICH263 -! // ADD_VIDEO_CAPAB (H323_H263Capability); -! //#endif - - if (!videoReceiveDevice.IsEmpty()) { - if (videoSize == 1) { -*************** void MyH323EndPoint::TestVideoGrabber(PC -*** 3609,3618 **** - - if (cap->IsDescendant(H323_H261Capability::Class())) - frame.SetPayloadType(RTP_DataFrame::H261); -! #if H323_AVCODEC -! else if (cap->IsDescendant(H323_FFH263Capability::Class())) -! frame.SetPayloadType(RTP_DataFrame::DynamicBase); -! #endif - frameCount = 0; - skipCount = 0; - PINDEX bitsEncoded = 0; ---- 3609,3618 ---- - - if (cap->IsDescendant(H323_H261Capability::Class())) - frame.SetPayloadType(RTP_DataFrame::H261); -! //#if H323_AVCODEC -! // else if (cap->IsDescendant(H323_FFH263Capability::Class())) -! // frame.SetPayloadType(RTP_DataFrame::DynamicBase); -! //#endif - frameCount = 0; - skipCount = 0; - PINDEX bitsEncoded = 0; --- net_ohphone.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: