diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile index 52f38a0fe746..1c7af4982fe4 100644 --- a/devel/omniORB/Makefile +++ b/devel/omniORB/Makefile @@ -1,88 +1,86 @@ PORTNAME= omniORB DISTVERSION= ${ABI_VER}.${ABI_MAJOR_VER}.${ABI_MINOR_VER} PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${DISTVERSION:S/-2//} MAINTAINER= bofh@FreeBSD.org COMMENT= Robust high performance CORBA ORB for C++ and Python WWW= http://omniorb.sourceforge.net/ LICENSE= GPLv2 -BROKEN_FreeBSD_15= cannot convert 'pthread**' to 'pthread_t' {aka 'pthread*'} - LIB_DEPENDS= libzstd.so:archivers/zstd USES= gmake pkgconfig python shebangfix ssl tar:bzip2 BROKEN_SSL= openssl BROKEN_SSL_REASON_openssl= member access into incomplete type 'DH' (aka 'dh_st') USE_LDCONFIG= yes USE_PYTHON= py3kplist SHEBANG_FILES= src/tool/omniidl/python2/scripts/omniidlrun.py \ src/tool/omniidl/python3/scripts/omniidlrun.py GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} \ --with-omniNames-logdir=/var/log \ --with-omniORB-config=${PREFIX}/etc/omniORB.cfg \ --with-openssl=${OPENSSLBASE} CONFIGURE_ENV+= PYTHON=${PYTHON_CMD} MAKEFILE= GNUmakefile WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:S/-2//} PLIST_SUB+= ABI_MAJOR_VER=${ABI_MAJOR_VER} \ ABI_MINOR_VER=${ABI_MINOR_VER} \ ABI_VER=${ABI_VER} OPTIONS_DEFINE= DOCS STATIC OPTIONS_DEFAULT= STATIC OPTIONS_SUB= yes STATIC_CONFIGURE_OFF= --disable-static ABI_VER= 4 ABI_MAJOR_VER= 3 ABI_MINOR_VER= 1 post-patch: @${REINPLACE_CMD} -e 's#-O2#${CFLAGS}#g' ${WRKSRC}/mk/beforeauto.mk.in @${REINPLACE_CMD} -e 's#$$(INSTALLLIBDIR)/pkgconfig#${STAGEDIR}${PREFIX}/libdata/pkgconfig#g' \ ${WRKSRC}/contrib/pkgconfig/GNUmakefile.in post-install: @${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl')" @${PYTHON_CMD} -c "import compileall; compileall.compile_dir('${STAGEDIR}${PYTHON_SITELIBDIR}/omniidl_be')" ${INSTALL_DATA} ${WRKSRC}/sample.cfg ${STAGEDIR}${PREFIX}/etc/omniORB.cfg.sample @cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} *.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 @cd ${WRKSRC}/man/man8 && ${INSTALL_MAN} *.8 ${STAGEDIR}${MAN8PREFIX}/man/man8 .for i in catior convertior omniMapper omniNames omnicpp nameclt omkdepend \ genior @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i} .endfor .for i in libomniConnectionMgmt4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomniORB4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libCOSDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomnihttpTP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomnihttpCrypto4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomnisslTP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomniDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libCOS4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomniCodeSets4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomniZIOPDynamic4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} \ libomnithread.so.${ABI_VER}.${ABI_MAJOR_VER} \ libomniZIOP4.so.${ABI_MAJOR_VER}.${ABI_MINOR_VER} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${i} .endfor @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/*.so post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @cd ${WRKSRC} && ${INSTALL_DATA} COPYING README.FIRST.txt README.unix.txt \ ReleaseNotes.txt ${STAGEDIR}${DOCSDIR} @${TAR} cCf ${WRKSRC}/doc - . | ${TAR} xUCf ${STAGEDIR}${DOCSDIR} - .include diff --git a/devel/omniORB/files/patch-configure b/devel/omniORB/files/patch-configure index 08fd2b8ae603..c554d8b439a3 100644 --- a/devel/omniORB/files/patch-configure +++ b/devel/omniORB/files/patch-configure @@ -1,28 +1,35 @@ ---- configure.orig 2021-04-11 12:58:05 UTC +--- configure.orig 2023-08-28 16:47:18 UTC +++ configure -@@ -7670,12 +7670,19 @@ case "$host" in +@@ -8544,12 +8544,20 @@ case "$host" in *-*-irix*) plat_name="IRIX"; plat_def="__irix__"; os_v="6";; *-*-aix*) plat_name="AIX"; plat_def="__aix__"; os_v="4";; *-*-darwin*) plat_name="Darwin"; plat_def="__darwin__"; os_v="1";; - *-*-freebsd3*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="3";; - *-*-freebsd4*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="4";; - *-*-freebsd5*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="5";; - *-*-freebsd6*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="6";; - *-*-freebsd7*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="7";; - *-*-freebsd8*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="8";; + *-*-dragonfly*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="9";; + *-*-freebsd3.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="3";; + *-*-freebsd4.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="4";; + *-*-freebsd5.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="5";; + *-*-freebsd6.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="6";; + *-*-freebsd7.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="7";; + *-*-freebsd8.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="8";; + *-*-freebsd9.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="9";; + *-*-freebsd10.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="10";; + *-*-freebsd11.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="11";; + *-*-freebsd12.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="12";; + *-*-freebsd13.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="13";; + *-*-freebsd14.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="14";; ++ *-*-freebsd15.*) plat_name="FreeBSD"; plat_def="__freebsd__"; os_v="15";; *-*-kfreebsd*) plat_name="kFreeBSD"; plat_def="__FreeBSD_kernel__"; os_v="6";; *-*-netbsd*) plat_name="NetBSD"; plat_def="__netbsd__"; os_v="1";; *-*-openbsd*) plat_name="OpenBSD"; plat_def="__openbsd__"; os_v="3";; +@@ -9999,5 +10007,3 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi +- +-