From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Apr 7 17:00:27 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 A6F7916A400 for ; Fri, 7 Apr 2006 17:00:27 +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 E4BB643D53 for ; Fri, 7 Apr 2006 17:00:26 +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 k37H0QSN073480 for ; Fri, 7 Apr 2006 17:00:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k37H0Q88073478; Fri, 7 Apr 2006 17:00:26 GMT (envelope-from gnats) Resent-Date: Fri, 7 Apr 2006 17:00:26 GMT Resent-Message-Id: <200604071700.k37H0Q88073478@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 9F29316A40B for ; Fri, 7 Apr 2006 16:57:43 +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 0435C43D48 for ; Fri, 7 Apr 2006 16:57:40 +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 k37Gvdw9040814 for ; Fri, 7 Apr 2006 18:57:39 +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 k37GvaxT040807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Fri, 7 Apr 2006 18:57:36 +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 k37GvaoV015081 for ; Fri, 7 Apr 2006 18:57:36 +0200 (CEST) (envelope-from jpulz@frm2.tum.de) Received: (from jpulz@localhost) by hades.admin.frm2 (8.13.4/8.13.4/Submit) id k37GvaXO015080; Fri, 7 Apr 2006 18:57:36 +0200 (CEST) (envelope-from jpulz) Message-Id: <200604071657.k37GvaXO015080@hades.admin.frm2> Date: Fri, 7 Apr 2006 18:57:36 +0200 (CEST) From: Joerg Pulz To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95483: net/cphone: update and unbreak on FreeBSD >= 5.x 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 17:00:27 -0000 >Number: 95483 >Category: ports >Synopsis: net/cphone: update and unbreak on FreeBSD >= 5.x >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 17:00:26 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/cphone to 0.3.2.cvs.20060407 20060407 is actually the day i checked it out, and does not reflect the last commit date * use DISTVERSION instead of PORTVERSION * as this is an CVS snapshot, host it on our own FTP server * adopt to use the newer net/openh323 * adopt ALL_TARGET, MAKE_ENV and MAKE_ARGS to match devel/pwlib and net/openh323 * unbreak on FreeBSD >= 5.x it comiles and runs fine on my FreeBSD-6.1-PRERELEASE * add post-patch target to remove unavailable/unnecessary includes * removed files/patch-message * take maintainership >How-To-Repeat: >Fix: - apply the patch and remove the now empty files/patch-message from CVS --- net_cphone.diff begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/cphone/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- Makefile 5 Feb 2006 12:35:08 -0000 1.14 +++ Makefile 7 Apr 2006 16:46:35 -0000 @@ -6,39 +6,37 @@ # PORTNAME= cphone -PORTVERSION= 0.3.1 -PORTREVISION= 2 +DISTVERSION= 0.3.2.cvs.20060407 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +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 which uses QT -BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323-112:build \ - qmake:${PORTSDIR}/devel/qmake - -NOCLEANDEPENDS= yes +LIB_DEPENDS= h323_r.1:${PORTSDIR}/net/openh323 +BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake PLIST_FILES= bin/cphone USE_BZIP2= yes USE_BISON= yes USE_QT_VER= 3 USE_GMAKE= yes -ALL_TARGET= optnoshared +ALL_TARGET= optshared MAKE_ENV= QTDIR=${X11BASE} \ - 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} + PWLIBDIR=${LOCALBASE}/share/pwlib \ + OPENH323DIR=${LOCALBASE}/share/openh323 \ + SYSLIBDIR=${LOCALBASE}/lib +MAKE_ARGS= OSTYPE=${OPSYS} MACHTYPE=${ARCH:S/i386/x86/} \ + OSRELEASE=${OSVERSION} CPLUS=${CXX} .include -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" -.endif +post-patch: + @${REINPLACE_CMD} -e '/graphdisplay.h/d' -e '/videodisplay.h/d' \ + -e '/labeldisplay.h/d' ${WRKSRC}/mainwindow.ui \ + ${WRKSRC}/settings.ui ${WRKSRC}/statistics.ui do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/obj_${OPSYS}_${THE_MACHTYPE}_r/cphone ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/obj_r/cphone ${PREFIX}/bin .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/cphone/distinfo,v retrieving revision 1.5 diff -u -r1.5 distinfo --- distinfo 25 Nov 2005 16:48:02 -0000 1.5 +++ distinfo 7 Apr 2006 16:46:35 -0000 @@ -1,3 +1,3 @@ -MD5 (cphone-0.3.1.tar.bz2) = 7574cc0aae961561792bd0b8d17ae933 -SHA256 (cphone-0.3.1.tar.bz2) = 7da3439f107265b91f1042875354fae9bd4b35c20dd394e188c8c1c42b8c26d1 -SIZE (cphone-0.3.1.tar.bz2) = 55721 +MD5 (cphone-0.3.2.cvs.20060407.tar.bz2) = ee78801cc06be34cfbea764b137fe6ed +SHA256 (cphone-0.3.2.cvs.20060407.tar.bz2) = f1356f250d0ea9e337158768e3aaf5515dd0e18fc07f5203f2dcc0f968e3d79e +SIZE (cphone-0.3.2.cvs.20060407.tar.bz2) = 105855 Index: files/patch-message =================================================================== RCS file: files/patch-message diff -N files/patch-message --- files/patch-message 15 Sep 2003 19:56:08 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,39 +0,0 @@ -*** message.cxx.orig Thu Aug 7 01:39:42 2003 ---- message.cxx Tue Sep 9 07:53:11 2003 -*************** ThreadSafeMessage::~ThreadSafeMessage() -*** 52,68 **** - } - - -! void::ThreadSafeMessage::DisplayError(PString thisMessage) - { - DisplayError(QString((const char *)thisMessage)); - } - -! void::ThreadSafeMessage::DisplayWarning(PString thisMessage) - { - DisplayWarning(QString((const char *)thisMessage)); - } - -! void::ThreadSafeMessage::DisplayInformation(PString thisMessage) - { - DisplayInformation(QString((const char *)thisMessage)); - } ---- 52,68 ---- - } - - -! void ThreadSafeMessage::DisplayError(PString thisMessage) - { - DisplayError(QString((const char *)thisMessage)); - } - -! void ThreadSafeMessage::DisplayWarning(PString thisMessage) - { - DisplayWarning(QString((const char *)thisMessage)); - } - -! void ThreadSafeMessage::DisplayInformation(PString thisMessage) - { - DisplayInformation(QString((const char *)thisMessage)); - } --- net_cphone.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: