View | Details | Raw Unified | Return to bug 194164 | Differences between
and this patch

Collapse All | Expand All

(-)devel/ace/Makefile (-10 / +11 lines)
Lines 2-8 Link Here
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 \
(-)devel/ace/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
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
(-)devel/ace/pkg-plist (-42 / +1 lines)
Lines 1453-1458 Link Here
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
Lines 1550-1594 Link Here
1550
%%DATADIR%%/include/makeinclude/rules.nolocal.GNU
1551
%%DATADIR%%/include/makeinclude/rules.nolocal.GNU
1551
%%DATADIR%%/include/makeinclude/rules.nonested.GNU
1552
%%DATADIR%%/include/makeinclude/rules.nonested.GNU
1552
%%DATADIR%%/include/makeinclude/wrapper_macros.GNU
1553
%%DATADIR%%/include/makeinclude/wrapper_macros.GNU
1553
@dirrm %%DATADIR%%/include/makeinclude
1554
@dirrm %%DATADIR%%/include
1555
@dirrm %%DATADIR%%/docs/svn
1556
@dirrm %%DATADIR%%/docs/bczar
1557
@dirrm %%DATADIR%%/docs
1558
@dirrm %%DATADIR%%/bin/MakeProjectCreator/templates
1559
@dirrm %%DATADIR%%/bin/MakeProjectCreator/modules
1560
@dirrm %%DATADIR%%/bin/MakeProjectCreator/docs/templates
1561
@dirrm %%DATADIR%%/bin/MakeProjectCreator/docs
1562
@dirrm %%DATADIR%%/bin/MakeProjectCreator/config
1563
@dirrm %%DATADIR%%/bin/MakeProjectCreator
1564
@dirrm %%DATADIR%%/bin/DependencyGenerator
1565
@dirrm %%DATADIR%%/bin
1566
@dirrm %%DATADIR%%
1567
@dirrm include/ace/os_include/sys
1568
@dirrm include/ace/os_include/netinet
1569
@dirrm include/ace/os_include/net
1570
@dirrm include/ace/os_include/arpa
1571
@dirrm include/ace/os_include
1572
%%X11%%@dirrm include/ace/XtReactor
1573
%%TK%%@dirrm include/ace/TkReactor
1574
@dirrm include/ace/TMCast
1575
@dirrm include/ace/RMCast
1576
%%QT4%%@dirrm include/ace/QtReactor
1577
%%SSL%%@dirrm include/ace/SSL
1578
@dirrm include/ace/Monitor_Control
1579
@dirrm include/ace/INet
1580
@dirrm include/ace/HTBP
1581
%%FLTK%%@dirrm include/ace/FlReactor
1582
@dirrm include/ace/ETCL
1583
@dirrm include/ace/Compression/rle
1584
@dirrm include/ace/Compression
1585
@dirrm include/ace
1586
@dirrm include/Kokyu
1587
@dirrm include/JAWS/server
1588
@dirrm include/JAWS
1589
@dirrm include/ACEXML/parser/parser
1590
@dirrm include/ACEXML/parser
1591
@dirrm include/ACEXML/common
1592
@dirrm include/ACEXML/apps/svcconf
1593
@dirrm include/ACEXML/apps
1594
@dirrm include/ACEXML

Return to bug 194164