Attachment 148004 Details for Bug 194164 – devel_ace.diff

[patch] devel_ace.diff

devel_ace.diff (text/plain), 4.21 KB, created by tkato432 on 2014-10-05 18:31:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-10-05 18:31:05 UTC

Size: 4.21 KB

patch

obsolete

>diff -urN /usr/ports/devel/ace/Makefile devel/ace/Makefile
>--- /usr/ports/devel/ace/Makefile	2014-07-03 00:27:26.000000000 +0900
>+++ devel/ace/Makefile	2014-10-06 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/ace/Makefile 360193 2014-07-02 13:57:32Z arved $
> 
> 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 @@
> 
> 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 @@
> 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 \
>diff -urN /usr/ports/devel/ace/distinfo devel/ace/distinfo
>--- /usr/ports/devel/ace/distinfo	2014-07-03 00:27:26.000000000 +0900
>+++ devel/ace/distinfo	2014-10-06 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/devel/ace/pkg-plist devel/ace/pkg-plist
>--- /usr/ports/devel/ace/pkg-plist	2014-07-03 00:27:26.000000000 +0900
>+++ devel/ace/pkg-plist	2014-10-06 00:00:00.000000000 +0900
>@@ -1453,6 +1453,7 @@
> %%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
>@@ -1550,45 +1551,3 @@
> %%DATADIR%%/include/makeinclude/rules.nolocal.GNU
> %%DATADIR%%/include/makeinclude/rules.nonested.GNU
> %%DATADIR%%/include/makeinclude/wrapper_macros.GNU
>-@dirrm %%DATADIR%%/include/makeinclude
>-@dirrm %%DATADIR%%/include
>-@dirrm %%DATADIR%%/docs/svn
>-@dirrm %%DATADIR%%/docs/bczar
>-@dirrm %%DATADIR%%/docs
>-@dirrm %%DATADIR%%/bin/MakeProjectCreator/templates
>-@dirrm %%DATADIR%%/bin/MakeProjectCreator/modules
>-@dirrm %%DATADIR%%/bin/MakeProjectCreator/docs/templates
>-@dirrm %%DATADIR%%/bin/MakeProjectCreator/docs
>-@dirrm %%DATADIR%%/bin/MakeProjectCreator/config
>-@dirrm %%DATADIR%%/bin/MakeProjectCreator
>-@dirrm %%DATADIR%%/bin/DependencyGenerator
>-@dirrm %%DATADIR%%/bin
>-@dirrm %%DATADIR%%
>-@dirrm include/ace/os_include/sys
>-@dirrm include/ace/os_include/netinet
>-@dirrm include/ace/os_include/net
>-@dirrm include/ace/os_include/arpa
>-@dirrm include/ace/os_include
>-%%X11%%@dirrm include/ace/XtReactor
>-%%TK%%@dirrm include/ace/TkReactor
>-@dirrm include/ace/TMCast
>-@dirrm include/ace/RMCast
>-%%QT4%%@dirrm include/ace/QtReactor
>-%%SSL%%@dirrm include/ace/SSL
>-@dirrm include/ace/Monitor_Control
>-@dirrm include/ace/INet
>-@dirrm include/ace/HTBP
>-%%FLTK%%@dirrm include/ace/FlReactor
>-@dirrm include/ace/ETCL
>-@dirrm include/ace/Compression/rle
>-@dirrm include/ace/Compression
>-@dirrm include/ace
>-@dirrm include/Kokyu
>-@dirrm include/JAWS/server
>-@dirrm include/JAWS
>-@dirrm include/ACEXML/parser/parser
>-@dirrm include/ACEXML/parser
>-@dirrm include/ACEXML/common
>-@dirrm include/ACEXML/apps/svcconf
>-@dirrm include/ACEXML/apps
>-@dirrm include/ACEXML

Actions: View | Diff

Attachments on bug 194164: 148004 | 148995