Index: head/net/cphone/Makefile
===================================================================
--- head/net/cphone/Makefile	(revision 161210)
+++ head/net/cphone/Makefile	(revision 161211)
@@ -1,44 +1,42 @@
 # New ports collection makefile for:	cphone
 # Date created:		Thu May 24 15:50:00 BST 2000
 # Whom:			Roger Hardiman <roger@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 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
+LIB_DEPENDS=	h323_r.1:${PORTSDIR}/net/openh323
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
-NOCLEANDEPENDS=	yes
-
 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 <bsd.port.pre.mk>
 
-.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 <bsd.port.post.mk>

Property changes on: head/net/cphone/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/net/cphone/distinfo
===================================================================
--- head/net/cphone/distinfo	(revision 161210)
+++ head/net/cphone/distinfo	(revision 161211)
@@ -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

Property changes on: head/net/cphone/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/net/cphone/files/patch-message
===================================================================
--- head/net/cphone/files/patch-message	(revision 161210)
+++ head/net/cphone/files/patch-message	(nonexistent)
@@ -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));
-  }

Property changes on: head/net/cphone/files/patch-message
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property