Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Dec 2016 09:00:53 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428706 - in head/net/ohphone: . files
Message-ID:  <201612170900.uBH90rYA080957@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sat Dec 17 09:00:53 2016
New Revision: 428706
URL: https://svnweb.freebsd.org/changeset/ports/428706

Log:
  - Add LICENSE
  - Switch to options helpers
  - Regenerate patches

Modified:
  head/net/ohphone/Makefile
  head/net/ohphone/files/patch-main.cxx
  head/net/ohphone/files/patch-xlibvid.cxx

Modified: head/net/ohphone/Makefile
==============================================================================
--- head/net/ohphone/Makefile	Sat Dec 17 06:52:40 2016	(r428705)
+++ head/net/ohphone/Makefile	Sat Dec 17 09:00:53 2016	(r428706)
@@ -10,6 +10,8 @@ MASTER_SITES=	ftp://ftp.frm2.tum.de/pub/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	H323 Video Conferencing Program, compatible with NetMeeting
 
+LICENSE=	MPL
+
 LIB_DEPENDS=	libh323_r.so:net/openh323
 
 USES=		bison gmake
@@ -35,9 +37,13 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/obj_r/ohphone ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ohphone.1 ${STAGEDIR}${PREFIX}/man/man1
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/${PORTNAME}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/ReadMe.txt ${STAGEDIR}${DOCSDIR}/${PORTNAME}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/check_listen.awk ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/regtest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/stresstest ${STAGEDIR}${EXAMPLESDIR}/${PORTNAME}

Modified: head/net/ohphone/files/patch-main.cxx
==============================================================================
--- head/net/ohphone/files/patch-main.cxx	Sat Dec 17 06:52:40 2016	(r428705)
+++ head/net/ohphone/files/patch-main.cxx	Sat Dec 17 09:00:53 2016	(r428706)
@@ -1,5 +1,5 @@
---- ./main.cxx.orig	2006-04-07 02:21:49.000000000 +0800
-+++ ./main.cxx	2008-03-03 23:07:51.000000000 +0800
+--- main.cxx.orig	2006-04-06 18:21:49 UTC
++++ main.cxx
 @@ -184,6 +184,8 @@
   */
  
@@ -18,7 +18,7 @@
  #include <ptclib/vsdl.h>
  #endif
  
-@@ -554,7 +556,7 @@
+@@ -554,7 +556,7 @@ void OhPhone::Main()
              "                          :      svga256  256 colour VGA (Linux only)\n"
              "                          :      svga     full colour VGA (Linux only)\n"
  #endif
@@ -27,7 +27,7 @@
              "                          :      sdl      Use Simple DirectMedia Library\n"
  #endif
  #ifdef HAS_X11
-@@ -855,7 +857,7 @@
+@@ -855,7 +857,7 @@ BOOL MyH323EndPoint::Initialise(PConfigA
          && !(videoReceiveDevice *= "svga")
          && !(videoReceiveDevice *= "svga256")
  #endif
@@ -36,7 +36,7 @@
          && !(videoReceiveDevice *= "sdl")
  #endif
  #ifdef HAS_X11
-@@ -2065,7 +2067,7 @@
+@@ -2065,7 +2067,7 @@ BOOL MyH323EndPoint::OpenVideoChannel(H3
    if ((!isEncoding) || videoLocal)
      PAssert(!videoReceiveDevice.IsEmpty(), "video display created without device type");
  

Modified: head/net/ohphone/files/patch-xlibvid.cxx
==============================================================================
--- head/net/ohphone/files/patch-xlibvid.cxx	Sat Dec 17 06:52:40 2016	(r428705)
+++ head/net/ohphone/files/patch-xlibvid.cxx	Sat Dec 17 09:00:53 2016	(r428706)
@@ -1,5 +1,5 @@
---- ./xlibvid.cxx.orig	2008-03-03 23:09:06.000000000 +0800
-+++ ./xlibvid.cxx	2008-03-03 23:09:16.000000000 +0800
+--- xlibvid.cxx.orig	2006-04-06 18:21:49 UTC
++++ xlibvid.cxx
 @@ -88,6 +88,7 @@
  #include <sys/time.h>
  #include <unistd.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612170900.uBH90rYA080957>