Re: UPDATE: graphics/freeglut

*ping*

On Tue Feb 28, 2017 at 10:05:47PM +0100, Rafael Sadowski wrote:
> Hi All!
>
> I've updated freeglut to the latest release. Tested all dependencies of
> freeglut:
>
> - Build and runtime test okay:
>
> games/crack-attack
> games/glsfcave
> games/hedgewars
>
> - Only build test okay:
>
> devel/bullet
> games/flightgear
> games/vegastrike
> graphics/DevIL
> graphics/asymptote
> graphics/gle
> graphics/glpng
> graphics/hs-GLUT
> graphics/mhgui
> graphics/py-opengl
> math/eigen3
> print/gl2ps
>
> - Failed:
>
> lang/parrot
>
> The old parrot port needs a simple patch, please see at the end of the
> mail. Maybe someone has a better idea!?
>
> I would be glad to see it soon in the tree.
>
> Best regards,
>
> Rafael Sadowski
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/graphics/freeglut/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 Makefile
> --- Makefile 11 Mar 2016 20:28:26 -0000 1.17
> +++ Makefile 27 Feb 2017 20:02:41 -0000
> @@ -1,28 +1,25 @@
> # $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:26 naddy Exp $
>
> -# no libGL (toolchain issue)
> -NOT_FOR_ARCHS= m88k
> -
> COMMENT = open source alternative to glut
> -DISTNAME = freeglut-2.8.0
> -REVISION = 4
> -SHARED_LIBS = glut 5.0
> +
> +DISTNAME = freeglut-3.0.0
> +
> +SHARED_LIBS += glut 6.0 # 3.10
> +
> CATEGORIES = graphics
> +
> HOMEPAGE = http://freeglut.sourceforge.net/
> +
> MAINTAINER = Tobias Ulmer <tobiasu@tmux.org>
>
> # X11
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB += GL X11 X11-xcb Xdamage Xext Xfixes Xi Xrandr
> -WANTLIB += Xrender Xxf86vm drm expat glapi m expat pthread
> -WANTLIB += usbhid xcb xcb-dri2 xcb-glx
> +WANTLIB += GL ICE SM X11 Xext Xi Xrandr Xxf86vm m
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=freeglut/}
>
> -CONFIGURE_STYLE = gnu
> -CONFIGURE_ARGS += --enable-warnings=no
> -CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib"
> +MODULES = devel/cmake
>
> NO_TEST = Yes
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/graphics/freeglut/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 11 Sep 2012 10:07:06 -0000 1.3
> +++ distinfo 27 Feb 2017 20:02:41 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (freeglut-2.8.0.tar.gz) = GXKT/4hqvmE7yetKdi2RYbDJ5ks+jmE+18XjU5dPugU=
> -SIZE (freeglut-2.8.0.tar.gz) = 979459
> +SHA256 (freeglut-3.0.0.tar.gz) = KkO+hRWwHqgrz6F9Ka4NQL0Sg0LwkwzR83Xx/5mfdqI=
> +SIZE (freeglut-3.0.0.tar.gz) = 419095
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in 11 Sep 2012 10:07:07 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-Makefile_in,v 1.1 2012/09/11 10:07:07 sthen Exp $
> ---- Makefile.in.orig Thu Aug 30 08:08:49 2012
> -+++ Makefile.in Thu Aug 30 08:09:12 2012
> -@@ -230,7 +230,7 @@ target_alias = @target_alias@
> - top_build_prefix = @top_build_prefix@
> - top_builddir = @top_builddir@
> - top_srcdir = @top_srcdir@
> --SUBDIRS = src include progs doc
> -+SUBDIRS = src include #progs doc
> - AUTOMAKE_OPTIONS = gnu
> - EXTRA_DIST = \
> - FrequentlyAskedQuestions \
> Index: patches/patch-include_GL_freeglut_ext_h
> ===================================================================
> RCS file: patches/patch-include_GL_freeglut_ext_h
> diff -N patches/patch-include_GL_freeglut_ext_h
> --- patches/patch-include_GL_freeglut_ext_h 11 Sep 2012 10:07:07 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-include_GL_freeglut_ext_h,v 1.2 2012/09/11 10:07:07 sthen Exp $
> ---- include/GL/freeglut_ext.h.orig Sun Sep 4 21:38:32 2011
> -+++ include/GL/freeglut_ext.h Thu Aug 30 07:10:04 2012
> -@@ -170,7 +170,7 @@ FGAPI void FGAPIENTRY glutSolidCylinder( GLdouble r
> - /*
> - * Extension functions, see freeglut_ext.c
> - */
> --typedef void (*GLUTproc)();
> -+typedef void (*GLUTproc)(void);
> - FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName );
> -
> - /*
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/graphics/freeglut/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- pkg/PLIST 16 Mar 2015 18:07:46 -0000 1.2
> +++ pkg/PLIST 27 Feb 2017 20:02:41 -0000
> @@ -7,5 +7,5 @@ include/GL/freeglut_ext.h
> include/GL/freeglut_std.h
> include/GL/glut.h
> lib/libglut.a
> -lib/libglut.la
> @lib lib/libglut.so.${LIBglut_VERSION}
> +lib/pkgconfig/freeglut.pc
>
>
> parrot patch:
>
> Index: patches/patch-config_auto_warnings_pm
> ===================================================================
> RCS file: patches/patch-config_auto_warnings_pm
> diff -N patches/patch-config_auto_warnings_pm
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-config_auto_warnings_pm 28 Feb 2017 20:51:02 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +build with freeglut 3.0.0
> +--- config/auto/warnings.pm.orig Tue Feb 28 21:43:43 2017
> ++++ config/auto/warnings.pm Tue Feb 28 21:43:50 2017
> +@@ -166,7 +166,6 @@ sub _init {
> + -Werror=missing-prototypes
> + -Werror=nested-externs
> + -Werror=old-style-definition
> +- -Werror=strict-prototypes
> + );
> +
> + $gcc->{'basic'} = [ @gcc_or_gpp_basic, @gcc_basic ];