Index: UPDATING =================================================================== RCS file: /home/pcvs/ports/UPDATING,v retrieving revision 1.1242 diff -a -u -r1.1242 UPDATING --- UPDATING 26 May 2012 22:40:11 -0000 1.1242 +++ UPDATING 29 May 2012 21:29:53 -0000 @@ -4,6 +4,17 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +201205xx: + AFFECTS: users of libglut. + AUTHOR: x11@FreeBSD.org + + The mesa supplied graphics/libglut library was replaced by graphics/freeglut. + The libglut library shipped with Mesa isn't developed anymore, while the + freeglut one has some extra features and bugfixes. Please follow the + instructions below to upgrade. + + portmaster -o graphics/freeglut graphics/libglut + portmaster -r freeglut 20120527: AFFECTS: users of x11-toolkits/qt4-gui Index: Mk/bsd.port.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v retrieving revision 1.717 diff -a -u -r1.717 bsd.port.mk --- Mk/bsd.port.mk 29 May 2012 16:55:02 -0000 1.717 +++ Mk/bsd.port.mk 29 May 2012 21:29:54 -0000 @@ -1930,7 +1930,7 @@ _GL_glew_LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew _GL_glu_LIB_DEPENDS= GLU.1:${PORTSDIR}/graphics/libGLU _GL_glw_LIB_DEPENDS= GLw.1:${PORTSDIR}/graphics/libGLw -_GL_glut_LIB_DEPENDS= glut.3:${PORTSDIR}/graphics/libglut +_GL_glut_LIB_DEPENDS= glut.12:${PORTSDIR}/graphics/freeglut _GL_linux_RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri .if defined(USE_GL) Index: graphics/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/Makefile,v retrieving revision 1.1480 diff -a -u -r1.1480 Makefile --- graphics/Makefile 22 Jan 2012 09:46:53 -0000 1.1480 +++ graphics/Makefile 29 May 2012 21:29:54 -0000 @@ -454,7 +454,6 @@ SUBDIR += libggimisc SUBDIR += libggiwmh SUBDIR += libgltext - SUBDIR += libglut SUBDIR += libgnomecanvas SUBDIR += libgnomecanvas-reference SUBDIR += libgnomecanvasmm Index: graphics/libGL/bsd.mesalib.mk =================================================================== RCS file: /home/pcvs/ports/graphics/libGL/bsd.mesalib.mk,v retrieving revision 1.19 diff -a -u -r1.19 bsd.mesalib.mk --- graphics/libGL/bsd.mesalib.mk 21 Apr 2012 17:03:16 -0000 1.19 +++ graphics/libGL/bsd.mesalib.mk 29 May 2012 21:29:54 -0000 @@ -12,7 +12,6 @@ # - graphics/libGL # - graphics/libGLU # - graphics/libGLw -# - graphics/libglut # - graphics/dri # # $FreeBSD: ports/graphics/libGL/bsd.mesalib.mk,v 1.19 2012/04/21 17:03:16 miwi Exp $ @@ -50,7 +49,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \ - --disable-egl + --disable-egl --disable-glut .if defined(WITH_NEW_XORG) EXTRA_PATCHES+= ${PATCHDIR}/extra-mach64_context.h \ @@ -74,14 +73,8 @@ COMPONENT= ${PORTNAME:L:C/^lib//:C/mesa-//} -.if ${COMPONENT:Mglut} == "" -. if ${COMPONENT:Mglu} == "" -CONFIGURE_ARGS+= --disable-glu --disable-glut -. else -CONFIGURE_ARGS+= --disable-glut -. endif -.else -DISTFILES+= MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut +.if ${COMPONENT:Mglu} == "" +CONFIGURE_ARGS+= --disable-glu .endif .if ${COMPONENT:Mglw} == "" Index: graphics/libglut/Makefile =================================================================== RCS file: graphics/libglut/Makefile diff -N graphics/libglut/Makefile --- graphics/libglut/Makefile 21 Apr 2012 17:03:18 -0000 1.27 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -# New ports collection makefile for: libglut -# Date created: Tue Feb 7 12:02:49 1995 -# Whom: anholt -# -# $FreeBSD: ports/graphics/libglut/Makefile,v 1.27 2012/04/21 17:03:18 miwi Exp $ -# - -PORTNAME= libglut -PORTVERSION= ${MESAVERSION} -CATEGORIES= graphics - -MAINTAINER= x11@FreeBSD.org -COMMENT= OpenGL utility toolkit - -USE_GL= glu -USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto - -do-install: - cd ${WRKSRC}/src/glut/glx; ${GMAKE} install - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${WRKSRC}/include/GL/glutf90.h \ - ${PREFIX}/include/GL - -.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk" -.include Index: graphics/libglut/distinfo =================================================================== RCS file: graphics/libglut/distinfo diff -N graphics/libglut/distinfo --- graphics/libglut/distinfo 21 Apr 2012 17:03:18 -0000 1.22 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44 -SIZE (MesaLib-7.6.1.tar.bz2) = 4886995 -SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d -SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756 -SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 -SIZE (MesaLib-7.11.2.tar.bz2) = 6257280 -SHA256 (MesaGLUT-7.11.2.tar.bz2) = 46b9fd1c261cbbd090a71ae1db328c37d2ff5118b83c38b8ebc8f150484e94f7 -SIZE (MesaGLUT-7.11.2.tar.bz2) = 201575 Index: graphics/libglut/pkg-descr =================================================================== RCS file: graphics/libglut/pkg-descr diff -N graphics/libglut/pkg-descr --- graphics/libglut/pkg-descr 24 Oct 2003 04:38:19 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,5 +0,0 @@ -libglut is a library provided with Mesa which provides an interface for creating -windows containing OpenGL contexts on a wide variety of platforms and handling -user interaction. - -WWW: http://www.mesa3d.org/ Index: graphics/libglut/pkg-plist =================================================================== RCS file: graphics/libglut/pkg-plist diff -N graphics/libglut/pkg-plist --- graphics/libglut/pkg-plist 2 Feb 2009 08:45:45 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,6 +0,0 @@ -include/GL/glut.h -include/GL/glutf90.h -lib/libglut.so -lib/libglut.so.3 -libdata/pkgconfig/glut.pc -@dirrmtry include/GL