Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 May 2018 11:18:44 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r471130 - in head/net/h323plus: . files
Message-ID:  <201805301118.w4UBIiJ6092232@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Wed May 30 11:18:44 2018
New Revision: 471130
URL: https://svnweb.freebsd.org/changeset/ports/471130

Log:
  net/h323plus: Update to 1.26.8
  
  - Use DISTVERSION{,PREFIX} instead of setting DISTNAME manually
  
  PR:		227247
  Submitted by:	koue@chaosophia.net (maintainer, based on)

Modified:
  head/net/h323plus/Makefile
  head/net/h323plus/distinfo
  head/net/h323plus/files/patch-openh323u.mak.in
  head/net/h323plus/pkg-plist

Modified: head/net/h323plus/Makefile
==============================================================================
--- head/net/h323plus/Makefile	Wed May 30 10:27:44 2018	(r471129)
+++ head/net/h323plus/Makefile	Wed May 30 11:18:44 2018	(r471130)
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	h323plus
-PORTVERSION=	1.26.5
-PORTREVISION=	2
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1_26_8
 CATEGORIES=	net multimedia
 MASTER_SITES=	http://www.h323plus.org/source/download/
-DISTNAME=	${PORTNAME}-v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	koue@chaosophia.net
 COMMENT=	H323 Video Conferencing library
@@ -15,20 +14,17 @@ LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpt.so:devel/ptlib
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USES=		gmake ssl
+USE_LDCONFIG=	yes
 
-CONFLICTS=	openh323-[0-9]*
-
-USES=		gmake
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+# ptlib-config --libs returns bogus dependencies on expat and SDL-1.2
+LDFLAGS+=	-Wl,--as-needed
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
-CFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 MAKE_JOBS_UNSAFE=yes
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libh323.so.1.26.5
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libh323.so
 
 .include <bsd.port.mk>

Modified: head/net/h323plus/distinfo
==============================================================================
--- head/net/h323plus/distinfo	Wed May 30 10:27:44 2018	(r471129)
+++ head/net/h323plus/distinfo	Wed May 30 11:18:44 2018	(r471130)
@@ -1,2 +1,3 @@
-SHA256 (h323plus-v1_26_5.tar.gz) = 73a5d8bcdbed94a05e4f43a81ef5b41fa5443fe1986ff876d9bebb7656f8ec32
-SIZE (h323plus-v1_26_5.tar.gz) = 4249565
+TIMESTAMP = 1522245456
+SHA256 (h323plus-v1_26_8.tar.gz) = 6f4b969e19d1264e7e41ef4f7aff22826174e8fdec55f7c8b05f814179bde62d
+SIZE (h323plus-v1_26_8.tar.gz) = 4399744

Modified: head/net/h323plus/files/patch-openh323u.mak.in
==============================================================================
--- head/net/h323plus/files/patch-openh323u.mak.in	Wed May 30 10:27:44 2018	(r471129)
+++ head/net/h323plus/files/patch-openh323u.mak.in	Wed May 30 11:18:44 2018	(r471130)
@@ -1,6 +1,6 @@
---- openh323u.mak.in.orig	2013-12-13 00:52:13.000000000 +0200
-+++ openh323u.mak.in	2014-08-22 12:13:27.000000000 +0300
-@@ -96,7 +96,7 @@ endif # NOTRACE
+--- openh323u.mak.in.orig	2013-12-12 22:52:13 UTC
++++ openh323u.mak.in
+@@ -96,16 +96,16 @@ endif # NOTRACE
  include $(PTLIBDIR)/make/ptlib.mak
  endif # LIBRARY_MAKEFILE
  
@@ -9,6 +9,19 @@
  
  #OH323_SUPPRESS_H235	= 1
  
+ OH323_SRCDIR = $(OPENH323DIR)/src
+-ifdef PREFIX
+-OH323_INCDIR = $(PREFIX)/include/openh323
+-else
++#ifdef PREFIX
++#OH323_INCDIR = $(PREFIX)/include/openh323
++#else
+ OH323_INCDIR = $(OPENH323DIR)/include
+-endif # PREFIX
++#endif # PREFIX
+ 
+ ifndef OH323_LIBDIR
+ OH323_LIBDIR = $(OPENH323DIR)/lib
 @@ -132,7 +132,7 @@ OH323_SUFFIX = $(OBJ_SUFFIX)
  endif # OH323_SUFFIX
  endif # HAS_PTLIB_LIB_MAK

Modified: head/net/h323plus/pkg-plist
==============================================================================
--- head/net/h323plus/pkg-plist	Wed May 30 10:27:44 2018	(r471129)
+++ head/net/h323plus/pkg-plist	Wed May 30 11:18:44 2018	(r471130)
@@ -40,6 +40,7 @@ include/openh323/h460/h46026.h
 include/openh323/h460/h46026mgr.h
 include/openh323/h460/h4604.h
 include/openh323/h460/h4609.h
+include/openh323/h460/h460_oid1.h
 include/openh323/h460/h460_oid3.h
 include/openh323/h460/h460_oid6.h
 include/openh323/h460/h460_oid9.h
@@ -111,7 +112,7 @@ include/openh323/t38proto.h
 include/openh323/transports.h
 include/openh323/x224.h
 include/openh323/x880.h
-lib/libh323.so.1.26.5
+lib/libh323.so.1.26.8
 lib/libh323.so.1.26
 lib/libh323.so.1
 lib/libh323.so



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