Attachment #148995 for bug #194164

Lines 2-8 Link Here

(-)devel/ace/Makefile (-10 / +11 lines)
2	# $FreeBSD: head/devel/ace/Makefile 360193 2014-07-02 13:57:32Z arved $	2	# $FreeBSD: head/devel/ace/Makefile 360193 2014-07-02 13:57:32Z arved $
3		3
4	PORTNAME= ace	4	PORTNAME= ace
5	PORTVERSION= 6.2.7	5	PORTVERSION= 6.2.8
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \	7	MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \
8	http://download.dre.vanderbilt.edu/previous_versions/	8	http://download.dre.vanderbilt.edu/previous_versions/
Lines 27-32 Link Here
27		27
28	CONFLICTS= ace+tao-5*	28	CONFLICTS= ace+tao-5*
29		29
		30	BROKEN_ia64= Does not compile on ${ARCH}
		31	BROKEN_powerpc= Does not compile on ${ARCH}
		32	BROKEN_sparc64= Does not compile on ${ARCH}
		33
30	OPTIONS_DEFINE= FLTK QT4 SSL TK TRIO X11	34	OPTIONS_DEFINE= FLTK QT4 SSL TK TRIO X11
31	OPTIONS_DEFAULT= SSL	35	OPTIONS_DEFAULT= SSL
32	OPTIONS_SUB= yes	36	OPTIONS_SUB= yes
Lines 48-69 Link Here
48	X11_USE= XORG=xt	52	X11_USE= XORG=xt
49	X11_MAKE_ENV= xt=1	53	X11_MAKE_ENV= xt=1
50		54
51	.include <bsd.port.options.mk>
52
53	.if ${ARCH} == "ia64" \|\| ${ARCH} == "powerpc" \|\| ${ARCH} == "sparc64"
54	BROKEN= Does not compile on ia64, powerpc, or sparc64
55	.endif
56
57	post-patch:	55	post-patch:
58	@${REINPLACE_CMD} -e \	56	@${REINPLACE_CMD} -e \
59	's\|/$$libdir/pkgconfig\|/libdata/pkgconfig\|g' ${WRKSRC}/bin/ace_install_pkgconfig.pl	57	's\|/$$libdir/pkgconfig\|/libdata/pkgconfig\|g' \
		58	${WRKSRC}/bin/ace_install_pkgconfig.pl
60	@${REINPLACE_CMD} -e \	59	@${REINPLACE_CMD} -e \
61	's\|bin/moc)\|bin/moc-qt4)\|g ; \	60	's\|bin/moc)\|bin/moc-qt4)\|g ; \
62	s\|bin/moc,\|bin/moc-qt4,\|g' ${WRKSRC}/ace/QtReactor/GNUmakefile.ACE_Qt4Reactor_moc	61	s\|bin/moc,\|bin/moc-qt4,\|g' \
		62	${WRKSRC}/ace/QtReactor/GNUmakefile.ACE_Qt4Reactor_moc
63	@${REINPLACE_CMD} -i "" -e \	63	@${REINPLACE_CMD} -i "" -e \
64	'/^C[CX]/s\|$[[:space:]]$=\|\1?=\| ; \	64	'/^C[CX]/s\|$[[:space:]]$=\|\1?=\| ; \
65	s\|/usr/local\|${LOCALBASE}\| ; \	65	s\|/usr/local\|${LOCALBASE}\| ; \
66	s\|/usr/X11R6\|${LOCALBASE}\|' ${WRKSRC}/include/makeinclude/platform_freebsd.GNU	66	s\|/usr/X11R6\|${LOCALBASE}\|' \
		67	${WRKSRC}/include/makeinclude/platform_freebsd.GNU
67		68
68	do-configure:	69	do-configure:
69	@cd ${WRKSRC}/ace \	70	@cd ${WRKSRC}/ace \

Lines 1-2 Link Here

(-)devel/ace/distinfo (-2 / +2 lines)
1	SHA256 (ACE-6.2.7.tar.bz2) = 651f360061bb5e9fe53090fcac48ff9d311ba5427f8fbbbfee12d871a9e25215	1	SHA256 (ACE-6.2.8.tar.bz2) = 63fb09e91009cb1d8c2d9b29c774ff2ad1bcb3799a7b8382e06f6a645954482d
2	SIZE (ACE-6.2.7.tar.bz2) = 8323688	2	SIZE (ACE-6.2.8.tar.bz2) = 8342833




--- ace/SSL/SSL_Context.cpp.orig
+++ ace/SSL/SSL_Context.cpp
@@ -274,7 +274,7 @@
     case ACE_SSL_Context::TLSv1:
       method = ::TLSv1_method ();
       break;
-#ifdef TLS1_1_VERSION
+#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION)
     case ACE_SSL_Context::TLSv1_1_client:
       method = ::TLSv1_1_client_method ();
       break;
@@ -285,7 +285,7 @@
       method = ::TLSv1_1_method ();
       break;
 #endif
-#ifdef TLS1_2_VERSION
+#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION)
     case ACE_SSL_Context::TLSv1_2_client:
       method = ::TLSv1_2_client_method ();
       break;

Lines 1453-1458 Link Here

(-)devel/ace/pkg-plist (+1 lines)
1453	%%DATADIR%%/bin/MakeProjectCreator/templates/gnudll.mpt	1453	%%DATADIR%%/bin/MakeProjectCreator/templates/gnudll.mpt
1454	%%DATADIR%%/bin/MakeProjectCreator/templates/gnuexe.mpt	1454	%%DATADIR%%/bin/MakeProjectCreator/templates/gnuexe.mpt
1455	%%DATADIR%%/bin/MakeProjectCreator/templates/vxtest.mpd	1455	%%DATADIR%%/bin/MakeProjectCreator/templates/vxtest.mpd
		1456	%%DATADIR%%/bin/ace_install_pkgconfig.pl
1456	%%DATADIR%%/bin/add_rel_link.sh	1457	%%DATADIR%%/bin/add_rel_link.sh
1457	%%DATADIR%%/bin/depgen.pl	1458	%%DATADIR%%/bin/depgen.pl
1458	%%DATADIR%%/bin/mpc.pl	1459	%%DATADIR%%/bin/mpc.pl

Return to bug 194164

Line 0 Link Here

(-)devel/ace/files/patch-ace__SSL__SSL_Context.cpp (+20 lines)
	1	--- ace/SSL/SSL_Context.cpp.orig
	2	+++ ace/SSL/SSL_Context.cpp
	3	@@ -274,7 +274,7 @@
	4	case ACE_SSL_Context::TLSv1:
	5	method = ::TLSv1_method ();
	6	break;
	7	-#ifdef TLS1_1_VERSION
	8	+#if defined(TLS1_1_VERSION) && (TLS_MAX_VERSION >= TLS1_1_VERSION)
	9	case ACE_SSL_Context::TLSv1_1_client:
	10	method = ::TLSv1_1_client_method ();
	11	break;
	12	@@ -285,7 +285,7 @@
	13	method = ::TLSv1_1_method ();
	14	break;
	15	#endif
	16	-#ifdef TLS1_2_VERSION
	17	+#if defined(TLS1_2_VERSION) && (TLS_MAX_VERSION >= TLS1_2_VERSION)
	18	case ACE_SSL_Context::TLSv1_2_client:
	19	method = ::TLSv1_2_client_method ();
	20	break;