cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak with the PTLib 2.10.9 willamowius fork.

Browse Source 
While here, fix a typo that was preventing creating DEBUG_PACKAGES.
This commit is contained in:
ajacoutot 2021-11-28 11:41:31 +00:00
parent 51268a00d0
commit 5dd5920764
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/h323plus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.38 2021/02/03 18:56:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.39 2021/11/28 11:41:31 ajacoutot Exp $
COMMENT= H.323 video conferencing library
@ -6,10 +6,11 @@ GH_ACCOUNT= willamowius
GH_PROJECT= h323plus
GH_TAGNAME= v1_27_2
PKGNAME= ${DISTNAME:S/_/./g}
REVISION= 0
CATEGORIES= net devel
SHARED_LIBS= h323 6.3
SHARED_LIBS += h323 6.3
HOMEPAGE= http://www.h323plus.org/
@ -18,8 +19,8 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# MPL (dlopen(3) GPL modules)
PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} SDL c crypto expat lber ldap ldap_r
WANTLIB += m pt sasl2 ssl
WANTLIB += ${COMPILER_LIBCXX} c crypto lber ldap ldap_r m pt sasl2
WANTLIB += ssl
COMPILER= base-clang ports-gcc base-gcc
@ -36,8 +37,8 @@ MODGNU_CONFIG_GUESS_DIRS= \
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= PTLIBDIR=${LOCALBASE}/share/ptlib
# needed by net/gnugk: https://www.gnugk.org/gnugk-manual-14.html
CONFIGURE_ARGS += --enable-h235 # --enable-h46017 --enable-h46026
# https://www.gnugk.org/gnugk-manual-14.html
CONFIGURE_ARGS= --enable-h235 # --enable-h46017 --enable-h46026
# http://www.tandberg.com/collateral/tandberg-ITU-license.pdf
# H.460.23/.24. Contact consulting@h323plus.org for licensing terms.
@ -49,7 +50,7 @@ MAKE_ENV= VERBOSE=1
MAKE_FLAGS= MAJOR_VERSION=${LIBh323_VERSION:R} \
MINOR_VERSION=${LIBh323_VERSION:E}
DEBUG_PAKAGES= ${BUILD_PACKAGES}
DEBUG_PACKAGES= ${BUILD_PACKAGES}
pre-configure:
${SUBST_CMD} ${WRKSRC}/Makefile.in

20
net/h323plus/patches/patch-openh323u_mak_in
View File

@ -1,10 +1,28 @@
$OpenBSD: patch-openh323u_mak_in,v 1.6 2020/01/03 09:01:55 ajacoutot Exp $
$OpenBSD: patch-openh323u_mak_in,v 1.7 2021/11/28 11:41:31 ajacoutot Exp $
h225_2.cxx:8:10: fatal error: 'h225.h' file not found
Do not append the platform_type and suffix to the library name.
Index: openh323u.mak.in
--- openh323u.mak.in.orig
+++ openh323u.mak.in
@@ -102,11 +102,11 @@ LIBDIRS += $(OPENH323DIR)
#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
@@ -133,7 +133,11 @@ OH323_SUFFIX = $(OBJ_SUFFIX)
endif # OH323_SUFFIX
endif # HAS_PTLIB_LIB_MAK