sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 02:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to version 6.0.8

Browse source 
PR:		164153
Submitted by:	Ports Fury
This commit is contained in:
Martin Wilke 2012-02-07 04:29:35 +00:00
parent 5615d9d59a
commit d8c541b638
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=290549
13 changed files with 825 additions and 336 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
devel/ace/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= ace
PORTVERSION= 5.5.2
PORTREVISION= 3
PORTVERSION= 6.0.8
CATEGORIES= devel
MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \
http://download.dre.vanderbilt.edu/previous_versions/
@ -16,61 +15,115 @@ DISTNAME= ACE-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= The Adaptive Communication Environment for C++
OPTIONS= OPENSSL "Build with OpenSSL support " on \
TRIO "Build with trio support" off \
X11 "Build with X11 support" off \
FLTK "Build with FLTK support" off \
TK "Build with Tcl/Tk support" off \
QT "Build with Qt support" off \
CONFLICTS= ace+tao-5*
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--program-transform-name s,^,ace-,
USE_GNOME= pkgconfig
NOT_FOR_ARCHS= sparc64
WRKSRC= ${WRKDIR}/ACE_wrappers
BUILD_WRKSRC= ${WRKSRC}/objdir
INSTALL_WRKSRC= ${BUILD_WRKSRC}
NOT_FOR_ARCHS= sparc64
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_PERL5_BUILD=yes
USE_GMAKE= yes
MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \
CROSS-COMPILE=1
MAKEFILE= GNUmakefile
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
MAN1= ace-gperf.1
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
PLIST_SUB= VERSION="${PORTVERSION}"
.include <bsd.port.options.mk>
.if !defined(WITHOUT_OPENSSL)
USE_OPENSSL= yes
MAKE_ENV+= ssl=1
PLIST_SUB+= OPENSSL=""
.else
PLIST_SUB+= OPENSSL="@comment "
.endif
.if defined(WITH_TRIO)
BUILD_DEPENDS+= trio>=0:${PORTSDIR}/devel/trio
MAKE_ENV+= trio=1
.endif
.if defined(WITH_X11)
USE_XORG= xt
MAKE_ENV+= xt=1
PLIST_SUB+= X11=""
.else
PLIST_SUB+= X11="@comment "
.endif
.if defined(WITH_FLTK)
LIB_DEPENDS+= fltk:${PORTSDIR}/x11-toolkits/fltk
MAKE_ENV+= fl=1
PLIST_SUB+= FLTK=""
.else
PLIST_SUB+= FLTK="@comment "
.endif
.if defined(WITH_TK)
USE_TK_BUILD= yes
USE_TK= yes
MAKE_ENV+= tk=1
PLIST_SUB+= TK=""
.else
PLIST_SUB+= TK="@comment "
.endif
.if defined(WITH_QT)
USE_QT_VER= 4
QT_COMPONENTS= corelib gui moc_build
MAKE_ENV+= qt=1 qt4=1 QTDIR="${QT_PREFIX}"
CPPFLAGS+= -I${QT_INCDIR}
LDFLAGS+= -L${QT_LIBDIR}
PLIST_SUB+= QT=""
.else
PLIST_SUB+= QT="@comment "
.endif
.include <bsd.port.pre.mk>
EXTRA_PATCHES+= ${FILESDIR}/extra-ace-OS_NS_netdb.inl
.if ${OSVERSION} < 800000
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-ace-OS_NS_Thread.h
.endif
post-extract:
@${MKDIR} ${BUILD_WRKSRC}
post-patch:
@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|g'
.if (${OSVERSION} < 800000) || ${OSVERSION} >= 800024
@${REINPLACE_CMD} -e 's|cpu_set_t|cpuset_t|g' ${WRKSRC}/ace/OS_NS_Thread.cpp \
${WRKSRC}/ace/OS_NS_Thread.h
.endif
@${REINPLACE_CMD} -e \
's|/$$libdir/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/bin/ace_install_pkgconfig.pl
@${REINPLACE_CMD} -e \
's|bin/moc)|bin/moc-qt4)|g ; \
s|bin/moc,|bin/moc-qt4,|'g ${WRKSRC}/ace/QtReactor/GNUmakefile.ACE_Qt4Reactor_moc
do-configure:
@(cd ${BUILD_WRKSRC} && \
if ! ${SETENV} CC="${CC}" CXX="${CXX}" \
CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \
INSTALL_DATA="${INSTALL_DATA}" \
INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
${CONFIGURE_ENV} ../${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
${ECHO_CMD} "===> Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
(${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
${FALSE}; \
fi)
@cd ${WRKSRC}/ace \
&& ${ECHO_CMD} "#include <ace/config-${OPSYS:L}.h>" >> config.h
@cd ${WRKSRC}/include/makeinclude \
&& ${ECHO_CMD} "include \$$(ACE_ROOT)/include/makeinclude/platform_${OPSYS:L}.GNU" >> platform_macros.GNU \
&& ${ECHO_CMD} "CC= ${CC}" >> platform_macros.GNU \
&& ${ECHO_CMD} "CXX= ${CXX}" >> platform_macros.GNU \
&& ${ECHO_CMD} "CPPFLAGS= ${CPPFLAGS}" >> platform_macros.GNU \
&& ${ECHO_CMD} "LDFLAGS= ${LDFLAGS}" >> platform_macros.GNU \
&& ${ECHO_CMD} "DCFLAGS=" >> platform_macros.GNU \
&& ${ECHO_CMD} "OCFLAGS= ${CFLAGS}" >> platform_macros.GNU \
&& ${ECHO_CMD} "INSTALL_PREFIX= ${PREFIX}" >> platform_macros.GNU
post-install:
@for f in `${GREP} "${PORTVERSION}.*\.so$$" ${PLIST}`; do \
n=`echo $${f}|sed -e 's/-${PORTVERSION}//'`; \
${LN} -fs ${PREFIX}/$$f ${PREFIX}/$${n}.5; \
@for f in `${LS} -d \
${PREFIX}/lib/libACE*.so.${PORTVERSION} \
${PREFIX}/lib/libJAWS.so.${PORTVERSION} \
${PREFIX}/lib/libKokyu.so.${PORTVERSION} \
| ${XARGS} ${BASENAME}`; do \
n=`echo $${f}|sed -e 's/.so.${PORTVERSION}/.so/'`; \
${LN} -sf $${n}.${PORTVERSION} ${PREFIX}/lib/$${n}.6; \
done
.include <bsd.port.post.mk>

4
devel/ace/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (ACE-5.5.2.tar.bz2) = 80e1e17477ddaf48ebeaf439ca2571bed0c46abd85c04e678aebc3ce99a567b1
SIZE (ACE-5.5.2.tar.bz2) = 7495797
SHA256 (ACE-6.0.8.tar.bz2) = 2f7bae738b62f0162965fecb0f49b7fdf61de987c1d08d238b328e1d0d1ab683
SIZE (ACE-6.0.8.tar.bz2) = 7903887

47
devel/ace/files/extra-ace-OS_NS_netdb.inl
View file

@ -1,47 +0,0 @@
--- ace/OS_NS_netdb.inl.orig Sun Apr 23 23:34:14 2006
+++ ace/OS_NS_netdb.inl Sun Apr 23 23:39:33 2006
@@ -101,7 +101,7 @@
*h_errnop = h_errno;
return (struct hostent *) 0;
}
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || defined (__FreeBSD__)
// GNU C library has a different signature
ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@@ -211,7 +211,7 @@
*h_errnop = h_errno;
return (struct hostent *) 0;
}
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || defined (__FreeBSD__)
// GNU C library has a different signature
ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@@ -360,7 +360,7 @@
return result;
else
return 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || defined (__FreeBSD__)
// GNU C library has a different signature
if (::getprotobyname_r (name,
result,
@@ -427,7 +427,7 @@
return result;
else
return 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (__FreeBSD__)
// GNU C library has a different signature
if (::getprotobynumber_r (proto,
result,
@@ -499,7 +499,7 @@
return result;
else
return (struct servent *) 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || defined (__FreeBSD__)
// GNU C library has a different signature
ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));

11
devel/ace/files/extra-patch-ace-OS_NS_Thread.h
View file

@ -1,11 +0,0 @@
--- ace/OS_NS_Thread.h.orig 2006-05-30 17:15:25.000000000 +0400
+++ ace/OS_NS_Thread.h 2009-04-10 17:59:13.000000000 +0400
@@ -38,6 +38,8 @@
# include "ace/ACE_export.h"
# include "ace/Object_Manager_Base.h"
+# include <sys/cpuset.h>
+
# if defined (ACE_EXPORT_MACRO)
# undef ACE_EXPORT_MACRO
# endif

26
devel/ace/files/patch-ace-Makefile.in
View file

@ -1,26 +0,0 @@
--- ace/Makefile.in.orig Mon Oct 15 22:02:49 2007
+++ ace/Makefile.in Mon Oct 15 23:57:10 2007
@@ -402,6 +402,7 @@
@BUILD_ACE_FOR_TAO_FALSE@ Null_Mutex.h \
@BUILD_ACE_FOR_TAO_FALSE@ Null_Semaphore.h \
@BUILD_ACE_FOR_TAO_FALSE@ OS.h \
+@BUILD_ACE_FOR_TAO_FALSE@ OS.inl \
@BUILD_ACE_FOR_TAO_FALSE@ OS_Dirent.h \
@BUILD_ACE_FOR_TAO_FALSE@ OS_Errno.h \
@BUILD_ACE_FOR_TAO_FALSE@ OS_Errno.inl \
@@ -485,6 +486,7 @@
@BUILD_ACE_FOR_TAO_FALSE@ Object_Manager.h \
@BUILD_ACE_FOR_TAO_FALSE@ Object_Manager.inl \
@BUILD_ACE_FOR_TAO_FALSE@ Object_Manager_Base.h \
+@BUILD_ACE_FOR_TAO_FALSE@ Obstack.h \
@BUILD_ACE_FOR_TAO_FALSE@ Obstack_T.cpp \
@BUILD_ACE_FOR_TAO_FALSE@ Obstack_T.h \
@BUILD_ACE_FOR_TAO_FALSE@ Obstack_T.inl \
@@ -662,6 +664,7 @@
@BUILD_ACE_FOR_TAO_FALSE@ Svc_Conf_Tokens.h \
@BUILD_ACE_FOR_TAO_FALSE@ Svc_Handler.cpp \
@BUILD_ACE_FOR_TAO_FALSE@ Svc_Handler.h \
+@BUILD_ACE_FOR_TAO_FALSE@ Swap.cpp \
@BUILD_ACE_FOR_TAO_FALSE@ Swap.h \
@BUILD_ACE_FOR_TAO_FALSE@ Swap.inl \
@BUILD_ACE_FOR_TAO_FALSE@ Synch.h \

22
devel/ace/files/patch-ace-os_include-os_pthread.h
View file

@ -1,14 +1,14 @@
--- ace/os_include/os_pthread.h.orig Tue May 30 16:15:53 2006
+++ ace/os_include/os_pthread.h Sun Jan 28 13:50:01 2007
@@ -339,7 +339,11 @@
# undef THR_DAEMON
--- ace/os_include/os_pthread.h.orig 2010-11-27 02:39:33.000000000 +0900
+++ ace/os_include/os_pthread.h 2011-11-27 05:58:00.000000000 +0900
@@ -283,7 +283,11 @@
# undef THR_DAEMON
# define THR_BOUND 0x00000001
+# if defined (__FreeBSD__)
+# define THR_NEW_LWP 0x00000000
# define THR_BOUND 0x00000001
+# if defined(__FreeBSD__)
+# define THR_NEW_LWP 0x00000000
+# else
# define THR_NEW_LWP 0x00000002
# define THR_NEW_LWP 0x00000002
+# endif
# define THR_DETACHED 0x00000040
# define THR_SUSPENDED 0x00000080
# define THR_DAEMON 0x00000100
# define THR_DAEMON 0x00000010
# define THR_DETACHED 0x00000040
# define THR_SUSPENDED 0x00000080

14
devel/ace/files/patch-ace-ssl-ssl_context.cpp
View file

@ -1,14 +0,0 @@
--- ace/SSL/SSL_Context.cpp.orig 2012-01-10 18:04:45.000000000 +0100
+++ ace/SSL/SSL_Context.cpp 2012-01-10 18:17:42.000000000 +0100
@@ -231,7 +231,11 @@
if (this->context_ != 0)
return -1;
+#if OPENSSL_VERSION_NUMBER < 0x1000000f
SSL_METHOD *method = 0;
+#else
+ const SSL_METHOD *method = 0;
+#endif
switch (mode)
{

15
devel/ace/files/patch-ace__OS_NS_Thread.h Normal file
View file

@ -0,0 +1,15 @@
--- ace/OS_NS_Thread.h.orig 2011-04-07 20:48:50.000000000 +0900
+++ ace/OS_NS_Thread.h 2011-11-27 05:38:21.000000000 +0900
@@ -38,6 +38,12 @@
# include "ace/ACE_export.h"
# include "ace/Object_Manager_Base.h"
+# include <sys/param.h>
+#if (defined(__FreeBSD__) && ((__FreeBSD_version >= 700110 && __FreeBSD_version < 800000) || __FreeBSD_version >= 800024))
+# include <sys/cpuset.h>
+# define cpu_set_t cpuset_t
+#endif
+
# if defined (ACE_EXPORT_MACRO)
# undef ACE_EXPORT_MACRO
# endif

56
devel/ace/files/patch-ace__OS_NS_netdb.inl Normal file
View file

@ -0,0 +1,56 @@
--- ace/OS_NS_netdb.inl.orig 2011-03-21 21:54:52.000000000 +0900
+++ ace/OS_NS_netdb.inl 2011-11-27 07:46:06.000000000 +0900
@@ -6,6 +6,8 @@
#include "ace/OS_NS_string.h"
#include "ace/OS_NS_errno.h"
+#include <sys/param.h>
+
#if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
# define ACE_NETDBCALL_RETURN(OP,TYPE,FAILVALUE,TARGET,SIZE) \
@@ -119,7 +121,7 @@
*h_errnop = h_errno;
return (struct hostent *) 0;
}
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature
ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@@ -304,7 +306,7 @@
*h_errnop = h_errno;
return (struct hostent *) 0;
}
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature
ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
@@ -517,7 +519,7 @@
else
return 0;
//FUZZ: enable check_for_lack_ACE_OS
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature
//FUZZ: disable check_for_lack_ACE_OS
if (::getprotobyname_r (name,
@@ -598,7 +600,7 @@
//FUZZ: enable check_for_lack_ACE_OS
else
return 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature
//FUZZ: disable check_for_lack_ACE_OS
if (::getprotobynumber_r (proto,
@@ -684,7 +686,7 @@
//FUZZ: enable check_for_lack_ACE_OS
else
return (struct servent *) 0;
-# elif defined (__GLIBC__)
+# elif defined (__GLIBC__) || (defined(__FreeBSD__) && __FreeBSD_version >= 700015)
// GNU C library has a different signature
ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));

16
devel/ace/files/patch-ace__OS_NS_signal.h Normal file
View file

@ -0,0 +1,16 @@
--- ace/OS_NS_signal.h.orig 2011-03-04 23:59:09.000000000 +0900
+++ ace/OS_NS_signal.h 2011-11-27 07:50:01.000000000 +0900
@@ -33,10 +33,10 @@
#endif
#define ACE_EXPORT_MACRO ACE_Export
-#if defined (__Lynx__) || defined (__OpenBSD__)
-// LynxOS and OpenBSD define pthread_sigmask() in pthread.h
+#if defined (__Lynx__) || defined (__OpenBSD__) || defined (__FreeBSD__)
+// LynxOS, OpenBSD and FreeBSD define pthread_sigmask() in pthread.h
# include "ace/os_include/os_pthread.h"
-#endif /* __Lynx__ || OpenBSD */
+#endif /* __Lynx__ || OpenBSD || FreeBSD */
/*
* We inline and undef some functions that may be implemented

10
devel/ace/files/patch-configure
View file

@ -1,10 +0,0 @@
--- configure.orig Sun Jan 28 13:32:29 2007
+++ configure Sun Jan 28 13:44:58 2007
@@ -10434,6 +10434,7 @@
esac
;;
*freebsd*)
+ ace_cv_new_throws_bad_alloc_exception=no
;;
*hpux*)
# In case anything here or in the config depends on OS

25
devel/ace/files/patch-tests
View file

@ -1,25 +0,0 @@
--- tests/Proactor_Test.cpp.orig 2006-04-20 00:41:47.000000000 -0700
+++ tests/Proactor_Test.cpp 2008-12-01 11:00:05.000000000 -0800
@@ -253,7 +253,7 @@
break;
# endif /* sun */
-# if !defined(__Lynx__)
+# if !defined(__Lynx__) && !defined (__FreeBSD__)
case CB:
ACE_NEW_RETURN (proactor_impl,
ACE_POSIX_CB_Proactor (max_op),
--- tests/Proactor_Test_IPV6.cpp.orig 2006-04-20 00:41:47.000000000 -0700
+++ tests/Proactor_Test_IPV6.cpp 2008-12-01 17:40:59.000000000 -0800
@@ -253,7 +253,7 @@
break;
# endif /* sun */
-# if !defined(__Lynx__)
+# if !defined(__Lynx__) && !defined(__FreeBSD__)
case CB:
ACE_NEW_RETURN (proactor_impl,
ACE_POSIX_CB_Proactor (max_op),

776
devel/ace/pkg-plist
View file

File diff suppressed because it is too large Load diff