update version to 2.28c

This is a temporary update, because of issues with sound support.
More fixes will be on the way for quicktime, vorbis, ogg, openal, etc...

PR:		ports/58231
Submitted by:	David Yeske <dyeske@yahoo.com>

6 files changed, 27 insertions, 119 deletions

diff --git a/graphics/blender-devel/Makefile b/graphics/blender-devel/Makefile
index dd675393b265..e340adb9d24a 100644
--- a/graphics/blender-devel/Makefile
+++ b/graphics/blender-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	blender
-PORTVERSION=	2.27
+PORTVERSION=	2.28c
 CATEGORIES=	graphics games
 MASTER_SITES=	http://download.blender.org/source/
 PKGNAMESUFFIX=	-devel
@@ -14,25 +14,25 @@ MAINTAINER=	dyeske@yahoo.com
 COMMENT=	3D modeling/rendering/animation/gaming package
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		nspr4.1:${PORTSDIR}/devel/nspr \
-		openal.0:${PORTSDIR}/audio/openal \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
+USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
-PYTHON_VERSION=	python2.2
+USE_SDL=	yes
 USE_MESA=	yes
 
+CONFIGURE_ARGS=	--disable-oggtest --disable-vorbistest --disable-sdltest
+
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include"
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -ffast-math
 .endif
 
-PLUGIN_DIR?=	lib/mozilla/plugins
-PLIST_SUB=	PLUGIN_DIR=${PLUGIN_DIR}
-
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG} "You can enable additional compilation optimizations"
@@ -41,56 +41,27 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|malloc.h|stdlib.h|g' \
-		${WRKSRC}/extern/ode/dist/configurator.c \
-		${WRKSRC}/source/gameengine/SoundSystem/intern/SND_WaveCache.cpp
-	@${REINPLACE_CMD} -E -e \
-		's|-Wall||; \
-		s|g\+\+|${CXX}|; \
-		s|LEVEL_2_C_WARNINGS.+$$||; \
-		s|LEVEL_2_CPP_WARNINGS.+$$||; \
-		s|-FIX_NAN_WARN||' \
-		${WRKSRC}/source/nan_warn.mk
-	@${REINPLACE_CMD} -e \
-		's|gcc|${CC}|; \
-		s|\$$(C_OPT)1|${CFLAGS}|; \
-		s|\$$(C_OPT)\$$(OPT)|${CFLAGS}|' \
-		${WRKSRC}/extern/ode/dist/Makefile
-	@${REINPLACE_CMD} -E -e \
-		's|g\+\+|${CXX}|; \
-		s,(-O2|-DNDEBUG|^DBG_C.+$$),,; \
-		s|-pipe|${CFLAGS}|; \
-		s|gcc|${CC}|' \
-		${WRKSRC}/source/nan_compile.mk
-	@${REINPLACE_CMD} -e \
-		's|-pthread -lc_r|${PTHREAD_LIBS}|' \
-		${WRKSRC}/source/nan_link.mk
-	@${REINPLACE_CMD} -e \
-		's|%%CFLAGS%%|${CFLAGS}|' \
-		${WRKSRC}/intern/python/freeze/freeze.py
+		's|<malloc.h>|<stdlib.h>|' \
+		${WRKSRC}/intern/SoundSystem/intern/SND_WaveCache.cpp
+
 	@${REINPLACE_CMD} -E -e \
-		's|-Wall||g; \
-		s|^CC.+$$|CC=${CC}|; \
-		s|g\+\+|${CXX}|; \
-		s|-L/usr/lib/X11R6||; \
-		s|-L/usr/lib/X11|-lXext|; \
-		s|-ffast-math|-I${X11BASE}/include|' \
-		${WRKSRC}/extern/ode/dist/config/makefile.unix-gcc
-	@${REINPLACE_CMD} -e \
-		's|\$$(NAN_LIBDIR)/\$$(CONFIG_GUESS)|\$$(NAN_LIBDIR)|; \
-		s|\$$(NAN_OBJDIR)/\$$(CONFIG_GUESS)|\$$(NAN_OBJDIR)|' \
-		${WRKSRC}/source/nan_definitions.mk
+		's|^program_transform_name.+$$||; \
+		s| -DFreeBSD||; \
+		s|-lSDL|-lSDL-1.1 -L${X11BASE}/lib|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 	@${REINPLACE_CMD} -e \
-		's,/usr/local,${LOCALBASE},g; \
-		s,/usr/X11R6,${X11BASE},g' \
-		${WRKSRC}/source/*.mk
+		's|-Wall||' \
+		${WRKSRC}/source/blender/python/api2_2x/Makefile.in \
+		${WRKSRC}/source/blender/python/Makefile.in
 
-do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/obj/bin/blender ${PREFIX}/bin
-	@${INSTALL_PROGRAM} ${WRKSRC}/obj/bin/blenderplayer \
-		${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/${PLUGIN_DIR}
-	@${INSTALL_PROGRAM} ${WRKSRC}/obj/npBlender3DPlugin.so \
-		${PREFIX}/${PLUGIN_DIR}
+post-configure:
+	@${FIND} ${WRKSRC} -name "Makefile" | \
+		${XARGS} ${REINPLACE_CMD} -e \
+		's|-lesd||; \
+		s|-lsmpeg||; \
+		s|-lvorbisfile||; \
+		s|-lvorbis||; \
+		s|-logg||'
 
 .include <bsd.port.mk>
diff --git a/graphics/blender-devel/distinfo b/graphics/blender-devel/distinfo
index 40bad0c08c87..e7ab3fdc6467 100644
--- a/graphics/blender-devel/distinfo
+++ b/graphics/blender-devel/distinfo
@@ -1 +1 @@
-MD5 (blender-2.27.tar.bz2) = 2b34e7ad67d02771a3fae0411c6fe845
+MD5 (blender-2.28c.tar.bz2) = b1e00a4d8f63ca2a7598e20c89a0b7fd
diff --git a/graphics/blender-devel/files/patch-extern::ode::dist::ode::src::timer.cpp b/graphics/blender-devel/files/patch-extern::ode::dist::ode::src::timer.cpp
deleted file mode 100644
index 98d20ff9430b..000000000000
--- a/graphics/blender-devel/files/patch-extern::ode::dist::ode::src::timer.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- extern/ode/dist/ode/src/timer.cpp.orig	Tue Oct 14 23:33:02 2003
-+++ extern/ode/dist/ode/src/timer.cpp	Tue Oct 14 23:34:59 2003
-@@ -106,9 +106,9 @@
- 
- static inline void getClockCount (unsigned long cc[2])
- {
--  asm volatile ("
--	rdtsc
--	movl %%eax,(%%esi)
-+  asm volatile ("\
-+	rdtsc \n\
-+	movl %%eax,(%%esi) \n\
- 	movl %%edx,4(%%esi)"
- 	: : "S" (cc) : "%eax","%edx","cc","memory");
- }
-@@ -116,8 +116,8 @@
- 
- static inline void serialize()
- {
--  asm volatile ("
--	mov $0,%%eax
-+  asm volatile (" \
-+	mov $0,%%eax \n\
- 	cpuid"
- 	: : : "%eax","%ebx","%ecx","%edx","cc","memory");
- }
diff --git a/graphics/blender-devel/files/patch-extern_ode_Makefile b/graphics/blender-devel/files/patch-extern_ode_Makefile
deleted file mode 100644
index 1d29ba74c896..000000000000
--- a/graphics/blender-devel/files/patch-extern_ode_Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- extern/ode/Makefile.orig	Thu May 15 01:06:19 2003
-+++ extern/ode/Makefile	Thu May 15 01:07:21 2003
-@@ -41,10 +41,6 @@
- 	# prepare settings for patching, clean in case of interruption
- 	[ ! -f $(TEMPSETTINGS) ] || mv $(TEMPSETTINGS) $(USERSETTINGS) 
- 	cp $(USERSETTINGS) $(TEMPSETTINGS)
--    ifeq ($(OS),freebsd)
--	(grep FreeBSD $(DISTDIR)/Makefile >/dev/null ; \
--	    [ $$? -eq 0 ] || patch < patchfile.FreeBSD )
--    endif
-     ifeq ($(OS),darwin)
- 	cat $(TEMPSETTINGS) | sed s/unix-gcc/osx/ > $(USERSETTINGS)
-     endif
-@@ -102,8 +98,3 @@
-     ifeq ($(OS),$(findstring $(OS), "freebsd linux darwin"))
- 	[ ! -f dist/Makefile ] || $(MAKE) -C dist clean
-     endif
--    ifeq ($(OS),freebsd)
--	(grep FreeBSD $(DISTDIR)/Makefile >/dev/null ; \
--	    [ $$? -ne 0 ] || patch -R < patchfile.FreeBSD )
--    endif
--
diff --git a/graphics/blender-devel/files/patch-intern_python_freeze_freeze.py b/graphics/blender-devel/files/patch-intern_python_freeze_freeze.py
deleted file mode 100644
index 97f4d35a0370..000000000000
--- a/graphics/blender-devel/files/patch-intern_python_freeze_freeze.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- intern/python/freeze/freeze.py.orig	Sat Mar  1 22:57:16 2003
-+++ intern/python/freeze/freeze.py	Sat Mar  1 23:10:45 2003
-@@ -420,7 +420,7 @@
-         outfp.close()
-     infp.close()
- 
--    cflags = defines + includes + ['$(OPT)']
-+    cflags = defines + includes + ['$(OPT)'] + ['%%CFLAGS%%']
-     libs = [os.path.join(binlib, 'libpython$(VERSION).a')]
- 
-     somevars = {}
diff --git a/graphics/blender-devel/pkg-plist b/graphics/blender-devel/pkg-plist
index 2975f00a106d..5e3df6609d5b 100644
--- a/graphics/blender-devel/pkg-plist
+++ b/graphics/blender-devel/pkg-plist
@@ -1,5 +1 @@
 bin/blender
-bin/blenderplayer
-%%PLUGIN_DIR%%/npBlender3DPlugin.so
-@unexec rmdir %D/lib/mozilla/plugins 2>/dev/null || true
-@unexec rmdir %D/lib/mozilla 2>/dev/null || true