Attachment 152255 Details for Bug 194167 – graphics_pixie.diff

[patch] graphics_pixie.diff

graphics_pixie.diff (text/plain), 3.23 KB, created by tkato432 on 2015-01-27 10:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-01-27 10:00:39 UTC

Size: 3.23 KB

patch

obsolete

>diff -urN /usr/ports/graphics/pixie/Makefile graphics/pixie/Makefile
>--- /usr/ports/graphics/pixie/Makefile	2014-10-18 16:49:59.000000000 +0900
>+++ graphics/pixie/Makefile	2015-01-27 18:00:00.000000000 +0900
>@@ -12,14 +12,15 @@
> COMMENT=	Photorealistic renderer with Pixar's RenderMan-like interface
> 
> LICENSE=	LGPL21 # (or later)
>-LICENSE_FILE=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
> 		libtiff.so:${PORTSDIR}/graphics/tiff \
> 		libfltk_gl.so:${PORTSDIR}/x11-toolkits/fltk
> 
>+WRKSRC=		${WRKDIR}/Pixie
>+
>+USES=		bison compiler:c++0x libtool pathfix tar:tgz
> USE_GL=		glu
>-USES=		bison libtool pathfix tar:tgz
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
> 		--libdir=${PREFIX}/lib/pixie \
>@@ -31,21 +32,20 @@
> 		--with-modulesdir=${PREFIX}/lib/pixie/modules \
> 		--with-openexr-prefix=${LOCALBASE} \
> 		--enable-openexr-threads
>-WRKSRC=		${WRKDIR}/Pixie
> INSTALL_TARGET=	install-strip
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
> 
>-PORTDOCS=	*
>-
> CFLAGS+=	-fPIC
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
> BROKEN_sparc64=	Does not compile on sparc64
> 
>+PORTDOCS=	*
>+
> OPTIONS_DEFINE=	DOCS
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if ${OSVERSION} < 1000033
> BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
>@@ -58,9 +58,10 @@
> 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g ; \
> 		 /^install-data-am:/s|install-nobase_docDATA||g' \
> 		 ${WRKSRC}/Makefile.in
>+.for i in src/ri/Makefile.in src/sdr/Makefile.in
> 	@${REINPLACE_CMD} -e '/^includedir/s|=.*$$|= @includedir@|g' \
>-		${WRKSRC}/src/ri/Makefile.in \
>-		${WRKSRC}/src/sdr/Makefile.in
>+		${WRKSRC}/${i}
>+.endfor
> 
> post-install:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>@@ -69,4 +70,4 @@
> 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
> 		'! -name "*Makefile*"')
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/graphics/pixie/files/patch-configure graphics/pixie/files/patch-configure
>--- /usr/ports/graphics/pixie/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/pixie/files/patch-configure	2015-01-27 18:00:00.000000000 +0900
>@@ -0,0 +1,24 @@
>+--- configure.orig
>++++ configure
>+@@ -12199,7 +12199,7 @@
>+ old_striplib=
>+ { $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
>+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
>+-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
>++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
>+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>+   { $as_echo "$as_me:$LINENO: result: yes" >&5
>+@@ -18418,10 +18418,10 @@
>+   if test x$FLTK_CONFIG != xno ; then
>+   	if test x$STATIC_FLTK != xtrue ; then
>+   	    FLTK_CXXFLAGS="`$FLTK_CONFIG --use-gl --cxxflags`"
>+-    	FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldstaticflags`"
>++    	FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldstaticflags | sed 's/ -R.* / /g'`"
>+   	else
>+ 	    FLTK_CXXFLAGS="`$FLTK_CONFIG --use-gl --cxxflags`"
>+-    	FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldflags`"
>++    	FLTK_LDFLAGS="`$FLTK_CONFIG --use-gl --ldflags | sed 's/ -R.* / /g'`"
>+     fi
>+   else
>+     FLTK_CXXFLAGS=""

Actions: View | Diff

Attachments on bug 194167: 148007 | 148429 | 152255