ports/60210: x11-toolkits/freeglut: upgrading to 2.2.0.
Thierry Thomas
thierry at pompo.net
Sat Dec 13 17:00:36 UTC 2003
>Number: 60210
>Category: ports
>Synopsis: x11-toolkits/freeglut: upgrading to 2.2.0.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 13 09:00:32 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 5.1-RELEASE-p10 i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD ws90bj.pompo.net 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Tue Oct 14 23:06:50 CEST 2003 root at ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-031014 i386
>Description:
Upgrade freeglut to its latest version.
>How-To-Repeat:
N/A.
>Fix:
Please apply the following patch:
--- freeglut.diff begins here ---
diff -urN x11-toolkits/freeglut.orig/Makefile x11-toolkits/freeglut/Makefile
--- x11-toolkits/freeglut.orig/Makefile Sun Nov 16 14:53:15 2003
+++ x11-toolkits/freeglut/Makefile Sat Dec 13 16:18:30 2003
@@ -6,7 +6,7 @@
#
PORTNAME= freeglut
-PORTVERSION= 2.0.1
+PORTVERSION= 2.2.0
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,7 +20,9 @@
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
USE_XLIB= yes
-CONFIGURE_ARGS= --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
+CONFIGURE_ARGS= --x-includes=${X11BASE}/include \
+ --x-libraries=${X11BASE}/lib \
+ --enable-replace-glut
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
ACLOCAL="${ACLOCAL}" \
AUTOCONF="${AUTOCONF}" \
@@ -33,17 +35,21 @@
DOCS= download.html freeglut.html freeglut_logo.png \
freeglut_user_interface.html index.html ogl_sm.png \
progress.html structure.html
-BINS= Fractals Fractals_random Lorenz One
+BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes
post-patch:
@${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" \
-e "s|/usr/local|${LOCALBASE}|g" \
${WRKSRC}/aclocal.m4
.for fract in /fractals.c _random/fractals_random.c
- @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \
+ @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|g" \
${WRKSRC}/progs/demos/Fractals${fract}
.endfor
+post-build:
+ @${MV} ${WRKSRC}/progs/demos/CallbackMaker/.libs/CallbackMaker \
+ ${WRKSRC}/progs/demos/CallbackMaker/.libs/callbackmaker
+
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@@ -54,8 +60,8 @@
@${MKDIR} ${EXAMPLESDIR}
@${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat \
${EXAMPLESDIR}
-.for FILE in ${BINS}
- @${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${FILE}/.libs/${FILE:L} \
+.for prog in ${BINS}
+ @${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} \
${EXAMPLESDIR}
.endfor
@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
diff -urN x11-toolkits/freeglut.orig/distinfo x11-toolkits/freeglut/distinfo
--- x11-toolkits/freeglut.orig/distinfo Sun Nov 16 14:53:15 2003
+++ x11-toolkits/freeglut/distinfo Sat Dec 13 10:13:03 2003
@@ -1 +1 @@
-MD5 (freeglut-2.0.1.tar.gz) = da82607f76eb218539ee2265080b10ec
+MD5 (freeglut-2.2.0.tar.gz) = 9439b8745f443131c2dad00bc93dc0ef
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::CallbackMaker::CallbackMaker.c x11-toolkits/freeglut/files/patch-progs::demos::CallbackMaker::CallbackMaker.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::CallbackMaker::CallbackMaker.c Thu Jan 1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-progs::demos::CallbackMaker::CallbackMaker.c Sat Dec 13 14:45:50 2003
@@ -0,0 +1,11 @@
+--- progs/demos/CallbackMaker/CallbackMaker.c.orig Mon Nov 10 17:01:05 2003
++++ progs/demos/CallbackMaker/CallbackMaker.c Sat Dec 13 14:43:35 2003
+@@ -4,7 +4,7 @@
+ */
+
+
+-#include <GL/freeglut.h>
++#include "../../../include/GL/freeglut.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::Fractals_random::fractals_random.c x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::Fractals_random::fractals_random.c Sat Oct 4 11:46:21 2003
+++ x11-toolkits/freeglut/files/patch-progs::demos::Fractals_random::fractals_random.c Sat Dec 13 14:47:55 2003
@@ -1,20 +1,20 @@
---- progs/demos/Fractals_random/fractals_random.c.orig Tue Sep 23 07:17:13 2003
-+++ progs/demos/Fractals_random/fractals_random.c Sat Oct 4 02:43:15 2003
+--- progs/demos/Fractals_random/fractals_random.c.orig Thu Dec 11 02:32:08 2003
++++ progs/demos/Fractals_random/fractals_random.c Sat Dec 13 10:17:10 2003
@@ -20,7 +20,7 @@
- * Escape - quit
- */
-
--#include <GL/freeglut.h>
-+#include <../../../include/GL/freeglut.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-@@ -253,7 +253,7 @@
- if ( argc > 1 )
- readConfigFile ( argv[1] ) ;
- else
-- readConfigFile ( "fractals.dat" ) ;
-+ readConfigFile ( "/usr/local/share/examples/freeglut/fractals.dat" ) ;
-
- glutInit(&argc, argv);
- glutInitWindowSize(500, 250);
+ * Escape - quit
+ */
+
+-#include <GL/freeglut.h>
++#include "../../../include/GL/freeglut.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+@@ -346,7 +346,7 @@
+ if ( argc > 1 )
+ readConfigFile ( argv[1] ) ;
+ else
+- readConfigFile ( "fractals.dat" ) ;
++ readConfigFile ( "/usr/local/share/examples/freeglut/fractals.dat" ) ;
+
+ fractal_window = glutCreateWindow( window_title );
+
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::Lorenz::lorenz.c x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::Lorenz::lorenz.c Sat Oct 4 11:46:21 2003
+++ x11-toolkits/freeglut/files/patch-progs::demos::Lorenz::lorenz.c Sat Dec 13 10:19:58 2003
@@ -1,11 +1,11 @@
---- progs/demos/Lorenz/lorenz.c.orig Thu Jul 10 13:46:34 2003
-+++ progs/demos/Lorenz/lorenz.c Mon Sep 22 21:52:40 2003
+--- progs/demos/Lorenz/lorenz.c.orig Thu Dec 11 02:32:08 2003
++++ progs/demos/Lorenz/lorenz.c Sat Dec 13 10:19:26 2003
@@ -32,7 +32,7 @@
#include <string.h>
#include <math.h>
#include <time.h>
-#include <GL/freeglut.h>
+#include "../../../include/GL/freeglut.h"
-
-
- /************************************** Defined Constants ***************************************/
+ #ifdef WIN32
+ #include <crtdbg.h> // DUMP MEMORY LEAKS
+ #endif
diff -urN x11-toolkits/freeglut.orig/files/patch-progs::demos::shapes::shapes.c x11-toolkits/freeglut/files/patch-progs::demos::shapes::shapes.c
--- x11-toolkits/freeglut.orig/files/patch-progs::demos::shapes::shapes.c Thu Jan 1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-progs::demos::shapes::shapes.c Sat Dec 13 14:52:20 2003
@@ -0,0 +1,11 @@
+--- progs/demos/shapes/shapes.c.orig Sun Dec 7 11:12:22 2003
++++ progs/demos/shapes/shapes.c Sat Dec 13 14:51:38 2003
+@@ -12,7 +12,7 @@
+ * using the + and - keys.
+ */
+
+-#include <GL/freeglut.h>
++#include "../../../include/GL/freeglut.h"
+
+ #include <stdlib.h>
+
diff -urN x11-toolkits/freeglut.orig/files/patch-src::Makefile.am x11-toolkits/freeglut/files/patch-src::Makefile.am
--- x11-toolkits/freeglut.orig/files/patch-src::Makefile.am Thu Jan 1 01:00:00 1970
+++ x11-toolkits/freeglut/files/patch-src::Makefile.am Sat Dec 13 14:20:56 2003
@@ -0,0 +1,31 @@
+--- src/Makefile.am.orig Thu Dec 11 02:32:09 2003
++++ src/Makefile.am Sat Dec 13 14:20:21 2003
+@@ -3,13 +3,13 @@
+ #
+ # The library we want to build
+ #
+-lib_LTLIBRARIES = lib at LIBRARY@.la
++lib_LTLIBRARIES = libglut.la
+
+ noinst_HEADERS = freeglut_internal.h
+ #
+ # Those source files build the freeglut library
+ #
+-lib at LIBRARY@_la_SOURCES = freeglut_callbacks.c \
++libglut_la_SOURCES = freeglut_callbacks.c \
+ freeglut_cursor.c \
+ freeglut_display.c \
+ freeglut_ext.c \
+@@ -35,9 +35,9 @@
+ #
+ # Additional linker flags
+ #
+-lib at LIBRARY@_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
+-lib at LIBRARY@_la_LDFLAGS = -version-info 11:0:8
+-lib at LIBRARY@_la_CFLAGS = $(X_CFLAGS)
++libglut_la_LIBADD = $(LIBM) $(X_LIBS) -lGL -lGLU -lXext -lX11 $(LIBXXF86VM)
++libglut_la_LDFLAGS = -version-info 11:0:8
++libglut_la_CFLAGS = $(X_CFLAGS)
+
+ #
+ # End of file
diff -urN x11-toolkits/freeglut.orig/pkg-message x11-toolkits/freeglut/pkg-message
--- x11-toolkits/freeglut.orig/pkg-message Thu Jan 1 01:00:00 1970
+++ x11-toolkits/freeglut/pkg-message Sat Dec 13 16:45:26 2003
@@ -0,0 +1,10 @@
+******************************************************************
+freeglut requires a DRI / OpenGL enabled-graphic card;
+You may try to run the sample programs to check your installation.
+
+Notice: freeglut is now a GLUT replacement.
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+It has been installed into /usr/local/lib/
+and the original GLUT is installed under /usr/X11R6/lib/
+******************************************************************
diff -urN x11-toolkits/freeglut.orig/pkg-plist x11-toolkits/freeglut/pkg-plist
--- x11-toolkits/freeglut.orig/pkg-plist Sun Oct 5 23:02:14 2003
+++ x11-toolkits/freeglut/pkg-plist Sat Dec 13 17:05:35 2003
@@ -1,14 +1,17 @@
include/GL/freeglut.h
include/GL/freeglut_ext.h
+include/GL/freeglut_std.h
include/GL/glut.h
lib/libglut.a
lib/libglut.so
lib/libglut.so.11
+%%PORTDOCS%%%%EXAMPLESDIR%%/callbackmaker
%%PORTDOCS%%%%EXAMPLESDIR%%/fractals
%%PORTDOCS%%%%EXAMPLESDIR%%/fractals_random
%%PORTDOCS%%%%EXAMPLESDIR%%/fractals.dat
%%PORTDOCS%%%%EXAMPLESDIR%%/lorenz
%%PORTDOCS%%%%EXAMPLESDIR%%/one
+%%PORTDOCS%%%%EXAMPLESDIR%%/shapes
%%PORTDOCS%%%%DOCSDIR%%/download.html
%%PORTDOCS%%%%DOCSDIR%%/freeglut.html
%%PORTDOCS%%%%DOCSDIR%%/freeglut_logo.png
--- freeglut.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list