diff options
author | Thierry Thomas <thierry@FreeBSD.org> | 2006-05-02 20:51:17 +0000 |
---|---|---|
committer | Thierry Thomas <thierry@FreeBSD.org> | 2006-05-02 20:51:17 +0000 |
commit | dc2a4eeb9d7ae454409667d09fb19f2149acb58c (patch) | |
tree | 3b2d3637cf5b33d61239c21f226a40f505870f17 /net | |
parent | - Update to 1.1.1 (diff) |
- 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
* add post-patch target to remove unavailable/unnecessary includes
* removed files/patch-message
* take maintainership
PR: ports/95483
Submitted by: Joerg Pulz <Joerg.Pulz (at) frm2.tum.de>
Notes
Notes:
svn path=/head/; revision=161211
Diffstat (limited to 'net')
-rw-r--r-- | net/cphone/Makefile | 34 | ||||
-rw-r--r-- | net/cphone/distinfo | 6 | ||||
-rw-r--r-- | net/cphone/files/patch-message | 39 |
3 files changed, 19 insertions, 60 deletions
diff --git a/net/cphone/Makefile b/net/cphone/Makefile index 814c42f83780..c15612847de8 100644 --- a/net/cphone/Makefile +++ b/net/cphone/Makefile @@ -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 <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> diff --git a/net/cphone/distinfo b/net/cphone/distinfo index 7ad3c2a35033..d7fa97b97d3a 100644 --- a/net/cphone/distinfo +++ b/net/cphone/distinfo @@ -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 diff --git a/net/cphone/files/patch-message b/net/cphone/files/patch-message deleted file mode 100644 index 3c3e9e4f264c..000000000000 --- a/net/cphone/files/patch-message +++ /dev/null @@ -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)); - } |