Attachment 140640 Details for Bug 187294 – file.diff

[patch] file.diff

file.diff (text/plain), 2.15 KB, created by tkato432 on 2014-03-05 18:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-03-05 18:10:01 UTC

Size: 2.15 KB

patch

obsolete

>diff -urN /usr/ports/devel/ace/Makefile devel/ace/Makefile
>--- /usr/ports/devel/ace/Makefile	2014-02-28 02:53:09.000000000 +0900
>+++ devel/ace/Makefile	2014-03-06 00:00:00.000000000 +0900
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/devel/ace/Makefile 346365 2014-02-27 15:20:53Z miwi $
> 
> PORTNAME=	ace
>-PORTVERSION=	6.2.4
>+PORTVERSION=	6.2.5
> CATEGORIES=	devel
> MASTER_SITES=	ftp://download.dre.vanderbilt.edu/previous_versions/ \
> 		http://download.dre.vanderbilt.edu/previous_versions/
>@@ -35,26 +35,21 @@
> FLTK_DESC=		FLTK GUI toolkit
> FLTK_LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
> FLTK_MAKE_ENV=		fl=1
>-
> QT4_USE=		QT4=corelib,gui,moc_build
> QT4_MAKE_ENV=		qt=1 qt4=1 QTDIR="${QT_PREFIX}"
> QT4_CPPFLAGS=		-I${QT_INCDIR}
> QT4_LDFLAGS=		-L${QT_LIBDIR}
>-
> SSL_USE=		OPENSSL=yes
> SSL_MAKE_ENV=		ssl=1
>-
> TK_USES=		tk
> TK_MAKE_ENV=		tk=1
>-
> TRIO_DESC=		Trio portable string functions
> TRIO_BUILD_DEPENDS=	trio>=0:${PORTSDIR}/devel/trio
> TRIO_MAKE_ENV=		trio=1
>-
> X11_USE=		XORG=xt
> X11_MAKE_ENV=		xt=1
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
> BROKEN=		Does not compile on ia64, powerpc, or sparc64
>@@ -66,6 +61,10 @@
> 	@${REINPLACE_CMD} -e \
> 		's|bin/moc)|bin/moc-qt4)|g ; \
> 		 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
> 
> do-configure:
> 	@cd ${WRKSRC}/ace \
>@@ -94,4 +93,4 @@
> 		${LN} -sf $${n}.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/$${n}.6; \
> 	done
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/devel/ace/distinfo devel/ace/distinfo
>--- /usr/ports/devel/ace/distinfo	2014-02-28 02:53:09.000000000 +0900
>+++ devel/ace/distinfo	2014-03-06 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (ACE-6.2.4.tar.bz2) = a06efab5da168d679f014e0d3f54acedbba866514b94f3236c12097fbee2657f
>-SIZE (ACE-6.2.4.tar.bz2) = 8245531
>+SHA256 (ACE-6.2.5.tar.bz2) = 3a0622f38bee67d80fdf4d58547ccbb25263326b8bfb3e01e0cea89be5d0b650
>+SIZE (ACE-6.2.5.tar.bz2) = 8255429

Actions: View | Diff

Attachments on bug 187294: 140640