Skip site navigation (1)Skip section navigation (2)
Date:      Wed,  3 Dec 2003 21:14:18 +0100 (CET)
From:      "Sebastian Yepes F.ESN" <esn@x123.info>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/59927: [Port Update]:: graphics/blender-devel 2.28c -> 2.31 (Close PR=59379)
Message-ID:  <20031203201418.427B71703B@mx.x123.info>
Resent-Message-ID: <200312032020.hB3KKEY0061174@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         59927
>Category:       ports
>Synopsis:       [Port Update]:: graphics/blender-devel 2.28c -> 2.31 (Close PR=59379)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 03 12:20:13 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sebastian Yepes F. [ESN]
>Release:        FreeBSD 5.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD agosto 5.1-RELEASE FreeBSD 5.1-RELEASE #0: Thu Jun 5 02:55:42 GMT 2003 root@wv1u.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Update port graphics/blender-devel 2.28c -> 2.31

	Close My Priv. PR = 59379
>How-To-Repeat:
	
>Fix:



diff -urN blender-devel.old/Makefile blender-devel/Makefile
--- blender-devel.old/Makefile	Wed Dec  3 21:04:32 2003
+++ blender-devel/Makefile	Wed Dec  3 21:06:22 2003
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/graphics/blender-devel/Makefile,v 1.6 2003/10/19 02:55:02 edwin Exp $
 
 PORTNAME=	blender
-PORTVERSION=	2.28c
+PORTVERSION=	2.31
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/
 PKGNAMESUFFIX=	-devel
@@ -13,6 +13,7 @@
 MAINTAINER=	dyeske@yahoo.com
 COMMENT=	3D modeling/rendering/animation/gaming package
 
+BUILD_DEPENDS=	${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
@@ -25,43 +26,52 @@
 USE_SDL=	yes
 USE_MESA=	yes
 
-CONFIGURE_ARGS=	--disable-oggtest --disable-vorbistest --disable-sdltest
+CONFIGURE_ARGS=	--disable-sdltest
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include -L/usr/X11R6/lib" \
+		LIBS="-L${X11BASE}/lib -lGLU -L${LOCALBASE}/lib -lpng"
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
 .endif
+.if defined(WITH_OGG)
+LIB_DEPENDS+=		ogg.4:${PORTSDIR}/audio/libogg
+CONFIGURE_ARGS+=	--with-ogg=${LOCALBASE}
+.endif
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=		vorbis.2:${PORTSDIR}/audio/libvorbis
+CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE}
+.endif
 
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG} "You can enable additional compilation optimizations"
-	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
+	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS=YES"
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITH_OGG)
+	@${ECHO_MSG} "Add Support for the OGG lib"
+	@${ECHO_MSG} "by defining WITH_OGG=YES"
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITH_VORBIS)
+	@${ECHO_MSG} "Add Support fir the Vorbis lib"
+	@${ECHO_MSG} "by defining WITH_VORBIS=YES"
+	@${ECHO_MSG} ""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|<malloc.h>|<stdlib.h>|' \
-		${WRKSRC}/intern/SoundSystem/intern/SND_WaveCache.cpp
-
-	@${REINPLACE_CMD} -E -e \
-		's|^program_transform_name.+$$||; \
-		s| -DFreeBSD||; \
-		s|-lSDL|-lSDL-1.1 -L${X11BASE}/lib|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-
-	@${REINPLACE_CMD} -e \
-		's|-Wall||' \
-		${WRKSRC}/source/blender/python/api2_2x/Makefile.in \
-		${WRKSRC}/source/blender/python/Makefile.in
+pre-configure:
+	${RM} ${WRKSRC}/config.[gs]*
+	${RM} ${WRKSRC}/compile
+	${LN} -s ${LOCALBASE}/share/automake/config.guess ${WRKSRC}/config.guess
+	${LN} -s ${LOCALBASE}/share/automake/config.sub ${WRKSRC}/config.sub
+	${LN} -s ${LOCALBASE}/share/automake/compile ${WRKSRC}/compile
+	
 
 post-configure:
 	@${FIND} ${WRKSRC} -name "Makefile" | \
 		${XARGS} ${REINPLACE_CMD} -e \
-		's|-lesd||; \
-		s|-lsmpeg||; \
-		s|-lvorbisfile||; \
-		s|-lvorbis||; \
-		s|-logg||'
+		's|-lesd||; s|-lsmpeg||'
 
 .include <bsd.port.mk>
diff -urN blender-devel.old/distinfo blender-devel/distinfo
--- blender-devel.old/distinfo	Wed Dec  3 21:04:32 2003
+++ blender-devel/distinfo	Wed Dec  3 21:06:24 2003
@@ -1 +1 @@
-MD5 (blender-2.28c.tar.bz2) = b1e00a4d8f63ca2a7598e20c89a0b7fd
+MD5 (blender-2.31.tar.bz2) = 179dea9a56c520582bf56c9a9c4d3bf9
diff -urN blender-devel.old/files/patch-source_creator_creator.c blender-devel/files/patch-source_creator_creator.c
--- blender-devel.old/files/patch-source_creator_creator.c	Wed Dec  3 21:04:32 2003
+++ blender-devel/files/patch-source_creator_creator.c	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- source/creator/creator.c.orig	Fri Feb 14 22:11:48 2003
-+++ source/creator/creator.c	Fri Feb 14 23:17:26 2003
-@@ -91,6 +91,7 @@
- #ifdef __FreeBSD__
-   #ifndef __OpenBSD__
-     #include <floatingpoint.h>
-+    #include <sys/types.h>
-     #include <sys/rtprio.h>
-   #endif
- #endif
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031203201418.427B71703B>