mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

- Update to version 6.2.8

Browse Source 
- Remove uneeded bsd.port.options.mk inclusion by using BROKEN_* vars

PR:		194164
Submitted by:	tkato432@yahoo.com
This commit is contained in:
Pawel Pekala 2014-11-03 20:55:46 +00:00
parent a97f5a8805
commit f42c5c6388
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=372122
4 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
devel/ace/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ace
PORTVERSION= 6.2.7
PORTVERSION= 6.2.8
CATEGORIES= devel
MASTER_SITES= ftp://download.dre.vanderbilt.edu/previous_versions/ \
http://download.dre.vanderbilt.edu/previous_versions/
@ -27,6 +27,10 @@ PLIST_SUB= VERSION="${PORTVERSION}"
CONFLICTS= ace+tao-5*
BROKEN_ia64= Does not compile on ${ARCH}
BROKEN_powerpc= Does not compile on ${ARCH}
BROKEN_sparc64= Does not compile on ${ARCH}
OPTIONS_DEFINE= FLTK QT4 SSL TK TRIO X11
OPTIONS_DEFAULT= SSL
OPTIONS_SUB= yes
@ -48,22 +52,19 @@ TRIO_MAKE_ENV= trio=1
X11_USE= XORG=xt
X11_MAKE_ENV= xt=1
.include <bsd.port.options.mk>
.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
BROKEN= Does not compile on ia64, powerpc, or sparc64
.endif
post-patch:
@${REINPLACE_CMD} -e \
's|/$$libdir/pkgconfig|/libdata/pkgconfig|g' ${WRKSRC}/bin/ace_install_pkgconfig.pl
'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
s|bin/moc,|bin/moc-qt4,|g' \
${WRKSRC}/ace/QtReactor/GNUmakefile.ACE_Qt4Reactor_moc
@${REINPLACE_CMD} -i "" -e \
'/^C[CX]/s|\([[:space:]]\)=|\1?=| ; \
s|/usr/local|${LOCALBASE}| ; \
s|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/include/makeinclude/platform_freebsd.GNU
s|/usr/X11R6|${LOCALBASE}|' \
${WRKSRC}/include/makeinclude/platform_freebsd.GNU
do-configure:
@cd ${WRKSRC}/ace \

4
devel/ace/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ACE-6.2.7.tar.bz2) = 651f360061bb5e9fe53090fcac48ff9d311ba5427f8fbbbfee12d871a9e25215
SIZE (ACE-6.2.7.tar.bz2) = 8323688
SHA256 (ACE-6.2.8.tar.bz2) = 63fb09e91009cb1d8c2d9b29c774ff2ad1bcb3799a7b8382e06f6a645954482d
SIZE (ACE-6.2.8.tar.bz2) = 8342833

20
devel/ace/files/patch-ace__SSL__SSL_Context.cpp Normal file
View File

@ -0,0 +1,20 @@
--- 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;

1
devel/ace/pkg-plist
View File

@ -1453,6 +1453,7 @@ libdata/pkgconfig/Kokyu.pc
%%DATADIR%%/bin/MakeProjectCreator/templates/gnudll.mpt
%%DATADIR%%/bin/MakeProjectCreator/templates/gnuexe.mpt
%%DATADIR%%/bin/MakeProjectCreator/templates/vxtest.mpd
%%DATADIR%%/bin/ace_install_pkgconfig.pl
%%DATADIR%%/bin/add_rel_link.sh
%%DATADIR%%/bin/depgen.pl
%%DATADIR%%/bin/mpc.pl