Update to makehuman-1.1.1.

graphics/makehuman/Makefile

@@ -1,42 +1,38 @@
-# $OpenBSD: Makefile,v 1.29 2019/08/29 21:30:20 cwen Exp $
+# $OpenBSD: Makefile,v 1.30 2019/11/10 12:43:08 ajacoutot Exp $
 
 COMMENT=	parametrical modeling of 3D humanoid characters
 
-DISTNAME=	makehuman-0.9.1-rc1a
-PKGNAME=	makehuman-0.9.1rc1
+GH_ACCOUNT=	makehumancommunity
+GH_PROJECT=	makehuman
+GH_TAGNAME=	1.1.1
+
 CATEGORIES=	graphics
-REVISION=	7
 
-# Newer releases available at https://github.com/makehumancommunity/makehuman
 HOMEPAGE=	http://www.makehumancommunity.org/
 
 # GPLv2 / MIT
 PERMIT_PACKAGE=	Yes
 
-WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 X11-xcb Xdamage Xext
-WANTLIB += Xfixes Xi Xmu Xrandr Xrender Xt Xxf86vm animorph c drm expat
-WANTLIB += glapi glut m mhgui png pthread xcb xcb-dri2 xcb-dri3 xcb-glx
-WANTLIB += xcb-present xcb-sync xcb-xfixes xshmfence z
+MODULES=	lang/python
 
-COMPILER =		base-clang ports-gcc
+MODPY_BUILDDEP=	No
 
-# gcp(1), see pre-configure
-BUILD_DEPENDS=	sysutils/coreutils
+NO_BUILD=	Yes
+NO_TEST=	Yes
 
-RUN_DEPENDS=	graphics/aqsis
-LIB_DEPENDS=	graphics/mhgui>=0.2
+RUN_DEPENDS=	devel/desktop-file-utils \
+		graphics/py-opengl \
+		math/py-numpy \
+		x11/py-qt4
 
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-pre-configure:
-	sed -i 's,cp --parents,gcp --parents,g' \
-		${WRKSRC}/{data,pixmaps}/Makefile.in
-
-# remove useless files (ChangeLog, INSTALL...)
-post-install:
-	rm -r ${PREFIX}/doc
+do-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+	${SUBST_CMD} -m 0644 -c -o ${SHAREOWN} -g ${SHAREGRP} \
+		${FILESDIR}/MakeHuman.desktop.in \
+		${PREFIX}/share/applications/MakeHuman.desktop
+	${SUBST_CMD} -m 0555 -c -o ${BINOWN} -g ${BINGRP} \
+		${FILESDIR}/makehuman.in ${PREFIX}/bin/makehuman
+	cp -Rp ${WRKSRC}/makehuman ${PREFIX}/share/
+	chown -r ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/makehuman/makehuman
 
 .include <bsd.port.mk>

graphics/makehuman/distinfo

@@ -1,2 +1,2 @@
-SHA256 (makehuman-0.9.1-rc1a.tar.gz) = koWWZyR23sXOEUfPLrqKNQ6E+kvjW2CCgTuydESH5uA=
-SIZE (makehuman-0.9.1-rc1a.tar.gz) = 29807456
+SHA256 (makehuman-1.1.1.tar.gz) = XszCDkiqHl8uWGVb31KaFWcAosfSl52tz0xlcvX6BJ8=
+SIZE (makehuman-1.1.1.tar.gz) = 45828428

graphics/makehuman/files/MakeHuman.desktop.in

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=MakeHuman
+Comment=MakeHuman is a free, open source tool for creating realistic 3D human characters.
+Exec=${TRUEPREFIX}/bin/makehuman
+Terminal=false
+Type=Application
+Icon=${TRUEPREFIX}/share/makehuman/icons/makehuman.svg
+Categories=Graphics

graphics/makehuman/files/makehuman.in

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd ${TRUEPREFIX}/share/makehuman && \
+	exec ${MODPY_BIN} makehuman.py "$@"

graphics/makehuman/patches/patch-src_Animation_cpp

@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_Animation_cpp,v 1.1 2017/05/07 22:10:12 espie Exp $
-Iterators don't exist outside of the iterated object
-
-Index: src/Animation.cpp
---- src/Animation.cpp.orig
-+++ src/Animation.cpp
-@@ -35,7 +35,6 @@ using namespace Animorph;
- Animation::Animation ()
- : interpNumber(0),
-   frameRate(50),
--  frames_it(NULL),
-   loaded(false),
-   started(false)
- {}

graphics/makehuman/patches/patch-src_ConsoleListener_h

@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_ConsoleListener_h,v 1.1 2017/05/07 22:10:12 espie Exp $
-Fix syntax for namespace/class declaration
-
-Index: src/ConsoleListener.h
---- src/ConsoleListener.h.orig
-+++ src/ConsoleListener.h
-@@ -37,7 +37,9 @@
- #include <mhgui/AbstractListener.h>
- #include <mhgui/Point.h>
- 
--class mhgui::Component;
-+namespace mhgui {
-+    class Component;
-+}
- 
- class ConsoleListener : public AbstractListener
- {

graphics/makehuman/patches/patch-src_FileTools_cpp

@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_FileTools_cpp,v 1.1 2019/08/29 21:30:21 cwen Exp $
-
-Add missing header for ports-gcc
-
-Index: src/FileTools.cpp
---- src/FileTools.cpp.orig
-+++ src/FileTools.cpp
-@@ -38,6 +38,7 @@
- #endif // _FileTools_H_
- 
- #include <fcntl.h>
-+#include <string.h>
- #include <unistd.h>
- #include <sys/stat.h>
- #include <sys/time.h>

graphics/makehuman/patches/patch-src_util_cpp

@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_util_cpp,v 1.1 2017/05/07 22:10:12 espie Exp $
-"" is a const char *
-
-Index: src/util.cpp
---- src/util.cpp.orig
-+++ src/util.cpp
-@@ -255,8 +255,8 @@ static void ResetParameter();
- // string parameters
- 
- typedef struct{
--  char *name;
--  char *proto;
-+  const char *name;
-+  const char *proto;
-   string value;
- }RIB_PARAM_STRING;
- 

graphics/makehuman/patches/patch-src_util_h

@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_util_h,v 1.1 2019/08/29 21:30:21 cwen Exp $
-
-Add missing headers for ports-gcc
-
-Index: src/util.h
---- src/util.h.orig
-+++ src/util.h
-@@ -31,6 +31,7 @@
-   #include <config.h>
- #endif
- 
-+#include <algorithm>
- #include <string>
- #include <vector>
- #include <unistd.h>

graphics/makehuman/pkg/DESCR

@@ -1,18 +1,32 @@
-MakeHuman is an open-source, open graphics library, stand-alone,
-multi-platform, software program, which is completely written in C++
-language.  Its purpose is to provide a versatile, professional and
-extremely specialized application for parametrical modeling of
-three-dimensional humanoid characters.
+MakeHuman is an open source (AGPL3) tool designed to simplify the creation of
+virtual humans using a Graphical User Interface, also commonly referred to as a
+GUI. This is a specialized branch of the more general subject of 3D modelling.
+The MakeHuman Team is focused on this specific branch of the broader subject in
+order to achieve the best possible level of quality and ease of use in that
+area. The ultimate goal is to be able to quickly produce a wide array of
+realistic virtual humans with only a few clicks of the mouse and be able to
+render or export them for use in other projects.
 
-MakeHuman's purpose is to model and pose a 3D humanoid, complete with
-hair, accessories and high quality UV maps.  It will only make an
-acceptably photo realistic, poseable, humanoid character suitable for
-use in a variety of applications and for a variety of purposes ?
-marketing campaigns, advertisements, animations, graphic art, and 3D
-games, just to name a few.
+Humans are created through the manipulation of controls that allow for the
+blending of different human attributes to create unique 3D human characters. The
+controls are intended to provide the user with a simple way to create characters
+that give expression to the widest possible range of human forms. The
+controllable attributes are broken into two groups: macro and detail. The macro
+targets deal with overall human characteristics like gender, age, height, weight
+and ethnicity. The detail targets allow for the character to be further refined
+by focusing on the low level details of such things as the eye's shape or
+finger's length.
 
-Photorealistic images of characters, with a transparent background, will
-be able to be produced via RenderMan compliant rendering applications;
-and then, inserted during post production into complex scenarios made
-with 3D graphics manipulation, animation, or multimedia editing
-programs.
+The MakeHuman project strives to provide a complete tool that allows for the
+management of all things needed to create realistic virtual humans. This
+includes some tools that have not yet been created or are in the early stages of
+development for things like poses, animation cycles, managing facial
+expressions, hair and clothes. With the exception of modelling, most of these
+tools follow a "point and click" approach by using the MakeHuman's Library. Via
+the MakeHuman library, users preview and load poses, animation cycles, facial
+expressions, hair, shoes and clothes onto their character. MakeHuman also offers
+tools for exporting virtual humans to other software (such as the Blender 3D
+modeling suite) where further refinements can be made.
+
+MakeHuman is developed by a community of programmers, artists, academics and
+enthusiasts interested in 3D computer models of human beings.