From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 7 14:50:12 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 F110E16A400 for ; Fri, 7 Apr 2006 14:50:12 +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 0E55943D53 for ; Fri, 7 Apr 2006 14:50:12 +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 k37EoBEI044974 for ; Fri, 7 Apr 2006 14:50:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k37EoBUg044973; Fri, 7 Apr 2006 14:50:11 GMT (envelope-from gnats) Resent-Date: Fri, 7 Apr 2006 14:50:11 GMT Resent-Message-Id: <200604071450.k37EoBUg044973@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 A604916A400 for ; Fri, 7 Apr 2006 14:43:16 +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 1938343D48 for ; Fri, 7 Apr 2006 14:43:15 +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 k37EhFi3037721 for ; Fri, 7 Apr 2006 16:43:15 +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 k37EhC5n037718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 7 Apr 2006 16:43:12 +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 k37EhC9l004947 for ; Fri, 7 Apr 2006 16:43:12 +0200 (CEST) (envelope-from jpulz@frm2.tum.de) Received: (from jpulz@localhost) by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k37EhCRx004946; Fri, 7 Apr 2006 16:43:12 +0200 (CEST) (envelope-from jpulz) Message-Id: <200604071443.k37EhCRx004946@hades.admin.frm2> Date: Fri, 7 Apr 2006 16:43:12 +0200 (CEST) From: Joerg Pulz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95473: net/openmcu: unbreak and update to v2.1.1, 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: Fri, 07 Apr 2006 14:50:13 -0000 >Number: 95473 >Category: ports >Synopsis: net/openmcu: unbreak and update to v2.1.1, 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: Fri Apr 07 14:50:11 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/openmcu to v2.1.1 and unbreak * introduce MASTER_SITE_SOURCEFORGE * depend on the newer net/openh323 port * adopt MAKE_ENV and MAKE_ARGS * install the manpage * provide an example openmcu.ini file * introduce DOCSDIR, EXAMPLESDIR as in net/openam and net/gatekeeper * respect NOPORTDOCS * install wave files and server certificate * rewrite of pkg-plist * remove now useless patch >How-To-Repeat: >Fix: - apply the patch, remove the now empty patch and add the new files/openmcu.ini.sample file to CVS --- net_openmcu.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/openmcu/Makefile,v retrieving revision 1.23 diff -u -r1.23 Makefile --- Makefile 6 Mar 2006 20:44:46 -0000 1.23 +++ Makefile 7 Apr 2006 14:27:25 -0000 @@ -6,36 +6,52 @@ # PORTNAME= openmcu -PORTVERSION= 1.1.7 -PORTREVISION= 2 +PORTVERSION= 2.1.1 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= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= openh323 +DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src +EXTRACT_SUFX= -tar.gz -MAINTAINER= ports@FreeBSD.org +MAINTAINER= Joerg.Pulz@frm2.tum.de COMMENT= OpenMCU hosts a conference call for H323 Video Conferencing users -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build +LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323 -BROKEN= Incomplete dependency list - -WRKSRC= ${WRKDIR}/${PORTNAME} - -NOCLEANDEPENDS= yes +WRKSRC= ${WRKDIR}/${PORTNAME}_v${PORTVERSION:S/./_/g} USE_BISON= 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= openmcu.1 + +PLIST_SUB= PORTNAME=${PORTNAME} +DOCSDIR= ${PREFIX}/share/doc/openh323 +EXAMPLESDIR= ${PREFIX}/share/examples/openh323 + +.include + +pre-install: + @${SED} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g' \ + -e 's|%%PORTNAME%%|${PORTNAME}|g' \ + ${FILESDIR}/openmcu.ini.sample > ${WRKDIR}/openmcu.ini do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/openmcu ${PREFIX}/bin - ${MKDIR} ${PREFIX}/share/doc/openh323/openmcu - ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${PREFIX}/share/doc/openh323/openmcu + ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/openmcu ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1 +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${DOCSDIR}/${PORTNAME} +.endif + ${MKDIR} ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/*.wav ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKDIR}/openmcu.ini ${EXAMPLESDIR}/${PORTNAME} + ${INSTALL_DATA} ${WRKSRC}/server.pem ${EXAMPLESDIR}/${PORTNAME} -.include +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/openmcu/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- distinfo 25 Nov 2005 16:48:16 -0000 1.16 +++ distinfo 7 Apr 2006 14:27:25 -0000 @@ -1,3 +1,3 @@ -MD5 (openmcu_1.1.7.tar.gz) = 041c468256f426e9e5a8cec0cdc769f6 -SHA256 (openmcu_1.1.7.tar.gz) = 13b8bb31c9d45268b175ed9ab334652c78b965f516b228a85a93759e6ed5fed8 -SIZE (openmcu_1.1.7.tar.gz) = 34535 +MD5 (openmcu-v2_1_1-src-tar.gz) = db561a73bc96557b105625f2107b03ef +SHA256 (openmcu-v2_1_1-src-tar.gz) = 67955ce910b3845e1353b7020353bd91ac7c77985f0ed1345bc5a09cac191aad +SIZE (openmcu-v2_1_1-src-tar.gz) = 78701 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/openmcu/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 22 Jan 2006 02:45:51 -0000 1.5 +++ pkg-plist 7 Apr 2006 14:27:25 -0000 @@ -1,4 +1,11 @@ bin/openmcu -share/doc/openh323/openmcu/ReadMe.txt -@dirrmtry share/doc/openh323/openmcu -@dirrmtry share/doc/openh323 +%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav +%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav +%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav +%%EXAMPLESDIR%%/%%PORTNAME%%/openmcu.ini +%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem +@dirrm %%EXAMPLESDIR%%/%%PORTNAME%% +@dirrmtry %%EXAMPLESDIR%% +%%PORTDOCS%%%%DOCSDIR%%/%%PORTNAME%%/ReadMe.txt +%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%PORTNAME%% +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% Index: files/openmcu.ini.sample =================================================================== RCS file: files/openmcu.ini.sample diff -N files/openmcu.ini.sample --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/openmcu.ini.sample 7 Apr 2006 14:27:25 -0000 @@ -0,0 +1,13 @@ +[Parameters] +Password= +Log Level=2 +HTTP Certificate=%%EXAMPLESDIR%%/%%PORTNAME%%/server.pem +HTTP Port=1420 +Gatekeeper Mode=Find gatekeeper +Interface Array Size=0 +Default room=room101 +Connecting WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/connecting.wav +Entering WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/entering.wav +Leaving WAV File=%%EXAMPLESDIR%%/%%PORTNAME%%/leaving.wav +Call log filename=/var/log/%%PORTNAME%%/%%PORTNAME%%_call.log + Index: files/patch-main =================================================================== RCS file: files/patch-main diff -N files/patch-main --- files/patch-main 28 Aug 2003 07:32:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -*** main.cxx.orig Thu Aug 28 08:27:00 2003 ---- main.cxx Thu Aug 28 08:27:11 2003 -*************** -*** 261,267 **** - #include "speexcodec.h" - #ifndef NO_VIDEO - #include "h261codec.h" -! #include "videoio.h" - #endif - #include "main.h" - ---- 261,267 ---- - #include "speexcodec.h" - #ifndef NO_VIDEO - #include "h261codec.h" -! //#include "videoio.h" - #endif - #include "main.h" - --- net_openmcu.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: