Zap glut, it has been replaced by freeglut.
ok sthen@ jasper@ (suggested a few days ago by freeglut maintainer Tobias Ulmer)
This commit is contained in:
parent
c06abedde8
commit
58f240f01a
@ -1,43 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2009/04/09 12:45:42 jasper Exp $
|
||||
|
||||
COMMENT= OpenGL Utility Toolkit
|
||||
|
||||
DISTNAME= glut-3.7
|
||||
PKGNAME= ${DISTNAME}p4
|
||||
SHARED_LIBS= glsmap 3.7 \
|
||||
glut 3.7 \
|
||||
mui 3.7
|
||||
CATEGORIES= graphics devel
|
||||
MASTER_SITES= ${HOMEPAGE}
|
||||
|
||||
HOMEPAGE= http://www.opengl.org/resources/libraries/glut/
|
||||
|
||||
PERMIT_PACKAGE_CDROM= incomplete license
|
||||
PERMIT_PACKAGE_FTP= incomplete license
|
||||
PERMIT_DISTFILES_CDROM= incomplete license
|
||||
PERMIT_DISTFILES_FTP= incomplete license
|
||||
|
||||
CONFIGURE_STYLE= imake
|
||||
USE_X11= Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
MAKE_FLAGS= SOGLSMAPREV=${LIBglsmap_VERSION} \
|
||||
SOGLUTREV=${LIBglut_VERSION} \
|
||||
SOMUIREV=${LIBmui_VERSION}
|
||||
|
||||
post-extract:
|
||||
@perl -i -p -e 's/3GLUT/3/;' ${WRKSRC}/man/glut/*.man
|
||||
@perl -i -p -e 's/\r//;' ${WRKSRC}/man/glut/*.man \
|
||||
${WRKSRC}/lib/glut/strokegen.y
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/include/GL
|
||||
.for incl in glut glsmap
|
||||
${INSTALL_DATA} ${WRKSRC}/include/GL/${incl}.h ${PREFIX}/include/GL
|
||||
.endfor
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/include/mui
|
||||
.for incl in browser displaylist gizmo hslider mui textlist uicolor vslider
|
||||
${INSTALL_DATA} ${WRKSRC}/include/mui/${incl}.h ${PREFIX}/include/mui
|
||||
.endfor
|
||||
|
||||
.include <bsd.port.mk>
|
@ -1,5 +0,0 @@
|
||||
MD5 (glut-3.7.tar.gz) = 3JMmZuKhyKCxSKTDLREe8w==
|
||||
RMD160 (glut-3.7.tar.gz) = IhcdewNYWFIu95oA3MZkyFjKhqM=
|
||||
SHA1 (glut-3.7.tar.gz) = TYhZGZLBVUcAHDDVtthA9nJyClo=
|
||||
SHA256 (glut-3.7.tar.gz) = fcS4kKQmib9O99U68Ph8FZdXShu6E5qbw8gmAsbKCc8=
|
||||
SIZE (glut-3.7.tar.gz) = 3151216
|
@ -1,85 +0,0 @@
|
||||
$OpenBSD: patch-Glut_cf,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- Glut.cf.orig Fri Aug 7 20:13:14 1998
|
||||
+++ Glut.cf Wed Jun 20 12:11:37 2001
|
||||
@@ -23,13 +23,13 @@ GLU = -L$(OGLHOME)/lib -lGLU
|
||||
/* XXX Is this right, Template?? */
|
||||
INVENTOR = -L$(OGLHOME)/lib -lInventor
|
||||
GLUT_DEPLIBS = $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
MUI_DEPLIBS = $(DEPMUI) $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-MUI_LIBS = $(MUI) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+MUI_LIBS = $(MUI) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLE_DEPLIBS = $(DEPGLE) $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLE_LIBS = $(GLE) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLE_LIBS = $(GLE) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLSMAP_DEPLIBS = $(DEPGLSMAP) $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLSMAP_LIBS = $(GLSMAP) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLSMAP_LIBS = $(GLSMAP) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
|
||||
#else /* Everybody but Sun... */
|
||||
#ifdef AlphaArchitecture
|
||||
@@ -60,13 +60,13 @@ INVENTOR = -lInventor
|
||||
DEPGLUTLIB = $(TOP)/lib/glut/libglut.a
|
||||
GLUTLIB = $(TOP)/lib/glut/libglut.a
|
||||
|
||||
-GLUT_LIBS = $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLUT_LIBS = $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLUT_DEPLIBS = $(DEPGLUTLIB) $(DEPGLULIB) $(DEPGLLIB) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-MUI_LIBS = $(MUI) $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+MUI_LIBS = $(MUI) $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
MUI_DEPLIBS = $(DEPMUI) $(DEPGLUTLIB) $(DEPGLULIB) $(DEPGLLIB) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLE_LIBS = $(GLE) $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLE_LIBS = $(GLE) $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLE_DEPLIBS = $(DEPGLE) $(DEPGLUTLIB) $(DEPGLULIB) $(DEPGLLIB) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLSMAP_LIBS = $(GLSMAP) $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLSMAP_LIBS = $(GLSMAP) $(GLUTLIB) $(GLULIB) $(GLLIB) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLSMAP_DEPLIBS = $(DEPGLSMAP) $(DEPGLUTLIB) $(DEPGLULIB) $(DEPGLLIB) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
|
||||
#else /* Everybody but Sun or DEC Alpha... */
|
||||
@@ -87,32 +87,32 @@ EXTRA_INCLUDES = -I$(TOP)/include
|
||||
#endif
|
||||
|
||||
GLUT_DEPLIBS = $(DEPGLUT) $(DEPXMULIB) $(DEPXLIB)
|
||||
-GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XLIB) MathLibrary
|
||||
+GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XLIB) MathLibrary -lc_r
|
||||
OPENGL = -lGL
|
||||
GLU = -lGLU
|
||||
INVENTOR = -lInventor
|
||||
GLUT_DEPLIBS = $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLUT_LIBS = $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
MUI_DEPLIBS = $(DEPMUI) $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-MUI_LIBS = $(MUI) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+MUI_LIBS = $(MUI) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLE_DEPLIBS = $(DEPGLE) $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLE_LIBS = $(GLE) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLE_LIBS = $(GLE) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
GLSMAP_DEPLIBS = $(DEPGLSMAP) $(DEPGLUT) $(DEPXMULIB) $(DEPXILIB) $(DEPXLIB)
|
||||
-GLSMAP_LIBS = $(GLSMAP) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary
|
||||
+GLSMAP_LIBS = $(GLSMAP) $(GLUT) $(GLU) $(OPENGL) $(XMULIB) $(XILIB) $(XLIB) MathLibrary -lc_r
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef AlphaArchitecture
|
||||
-DEPGLUT = $(TOP)/lib/glut/libglut.a
|
||||
-GLUT = $(TOP)/lib/glut/libglut.a
|
||||
+DEPGLUT = $(TOP)/lib/glut/libglut.so
|
||||
+GLUT = $(TOP)/lib/glut/libglut.so
|
||||
#endif
|
||||
-DEPMUI = $(TOP)/lib/mui/libmui.a
|
||||
-MUI = $(TOP)/lib/mui/libmui.a
|
||||
-DEPGLE = $(TOP)/lib/gle/libgle.a
|
||||
-GLE = $(TOP)/lib/gle/libgle.a
|
||||
-DEPGLSMAP = $(TOP)/lib/glsmap/libglsmap.a
|
||||
-GLSMAP = $(TOP)/lib/glsmap/libglsmap.a
|
||||
+DEPMUI = $(TOP)/lib/mui/libmui.so
|
||||
+MUI = $(TOP)/lib/mui/libmui.so
|
||||
+DEPGLE = $(TOP)/lib/gle/libgle.so
|
||||
+GLE = $(TOP)/lib/gle/libgle.so
|
||||
+DEPGLSMAP = $(TOP)/lib/glsmap/libglsmap.so
|
||||
+GLSMAP = $(TOP)/lib/glsmap/libglsmap.so
|
||||
|
||||
CXXEXTRA_INCLUDES = -I/usr/include/CC $(EXTRA_INCLUDES)
|
||||
GLUT_INVENTOR_DEPLIBS = $(GLUT_DEPLIBS)
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/06/20 18:55:25 lebel Exp $
|
||||
--- Imakefile.orig Fri Aug 7 20:20:28 1998
|
||||
+++ Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -1,7 +1,7 @@
|
||||
#define IHaveSubdirs
|
||||
#define PassCDebugFlags
|
||||
|
||||
-SUBDIRS = lib test progs
|
||||
+SUBDIRS = lib man
|
||||
|
||||
MakeSubdirs($(SUBDIRS))
|
||||
DependSubdirs($(SUBDIRS))
|
@ -1,12 +0,0 @@
|
||||
--- include/GL/glut.h.orig Sun Nov 9 02:16:28 2008
|
||||
+++ include/GL/glut.h Sun Nov 9 02:17:23 2008
|
||||
@@ -60,7 +60,9 @@ typedef unsigned short wchar_t;
|
||||
|
||||
/* define APIENTRY and CALLBACK to null string if we aren't on Win32 */
|
||||
#if !defined(_WIN32)
|
||||
+#ifndef APIENTRY
|
||||
#define APIENTRY
|
||||
+#endif
|
||||
#define GLUT_APIENTRY_DEFINED
|
||||
#define CALLBACK
|
||||
#endif
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-lib_Imakefile,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- lib/Imakefile.orig Fri Aug 7 20:20:30 1998
|
||||
+++ lib/Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -7,7 +7,7 @@
|
||||
/* NOTE: The fglut directory is GLUT FORTRAN bindings which are */
|
||||
/* specific to IRIX 5.x. See ../README.fortran */
|
||||
|
||||
-SUBDIRS = glut mui gle glsmap
|
||||
+SUBDIRS = glut mui glsmap
|
||||
|
||||
MakeSubdirs($(SUBDIRS))
|
||||
DependSubdirs($(SUBDIRS))
|
@ -1,38 +0,0 @@
|
||||
$OpenBSD: patch-lib_glsmap_Imakefile,v 1.6 2007/04/02 19:57:48 martynas Exp $
|
||||
--- lib/glsmap/Imakefile.orig Sat Aug 8 02:20:50 1998
|
||||
+++ lib/glsmap/Imakefile Mon Apr 2 11:35:05 2007
|
||||
@@ -2,11 +2,11 @@
|
||||
/* Copyright (c) Mark J. Kilgard, 1998. */
|
||||
|
||||
#define DoNormalLib YES
|
||||
+#define DoSharedLib YES
|
||||
+#define DoExtraLib YES
|
||||
+#define LibName glsmap
|
||||
+#define SoRev SOGLSMAPREV
|
||||
|
||||
-#include <Library.tmpl>
|
||||
-
|
||||
-#include "../../Glut.cf"
|
||||
-
|
||||
SRCS = smap_buildsmap.c smap_context.c smap_create.c smap_destroy.c \
|
||||
smap_drawmesh.c smap_flag.c smap_get.c smap_getfunc.c smap_gettexdim.c \
|
||||
smap_gettexobj.c smap_getvec.c smap_makemesh.c smap_nearfar.c \
|
||||
@@ -19,6 +19,10 @@ OBJS = smap_buildsmap.o smap_context.o smap_create.o s
|
||||
smap_origin.o smap_render.o smap_rvec2st.o smap_set.o smap_setfunc.o \
|
||||
smap_setvec.o smap_texdim.o smap_texobj.o
|
||||
|
||||
+#include <Library.tmpl>
|
||||
+
|
||||
+#include "../../Glut.cf"
|
||||
+
|
||||
#ifdef LibraryObjectRule
|
||||
LibraryObjectRule()
|
||||
#else
|
||||
@@ -26,7 +30,5 @@ LibraryObjectRule()
|
||||
will probably do essentially what LibraryObjectRule does. */
|
||||
NormalLibraryObjectRule()
|
||||
#endif
|
||||
-
|
||||
-NormalLibraryTarget(glsmap,$(OBJS))
|
||||
|
||||
DependTarget()
|
@ -1,39 +0,0 @@
|
||||
$OpenBSD: patch-lib_glut_Imakefile,v 1.5 2005/12/26 21:08:52 steven Exp $
|
||||
--- lib/glut/Imakefile.orig Sat Aug 8 02:20:51 1998
|
||||
+++ lib/glut/Imakefile Mon Dec 26 22:03:44 2005
|
||||
@@ -2,11 +2,11 @@
|
||||
/* Copyright (c) Mark J. Kilgard, 1994. */
|
||||
|
||||
#define DoNormalLib YES
|
||||
+#define DoSharedLib YES
|
||||
+#define DoExtraLib YES
|
||||
+#define LibName glut
|
||||
+#define SoRev SOGLUTREV
|
||||
|
||||
-#include <Library.tmpl>
|
||||
-
|
||||
-#include "../../Glut.cf"
|
||||
-
|
||||
HDRS = \
|
||||
glutint.h \
|
||||
glutstroke.h \
|
||||
@@ -108,6 +108,10 @@ OBJS = \
|
||||
glut_winmisc.o \
|
||||
layerutil.o
|
||||
|
||||
+#include <Library.tmpl>
|
||||
+
|
||||
+#include "../../Glut.cf"
|
||||
+
|
||||
#ifdef LibraryObjectRule
|
||||
LibraryObjectRule()
|
||||
#else
|
||||
@@ -115,8 +119,6 @@ LibraryObjectRule()
|
||||
will probably do essentially what LibraryObjectRule does. */
|
||||
NormalLibraryObjectRule()
|
||||
#endif
|
||||
-
|
||||
-NormalLibraryTarget(glut,$(OBJS))
|
||||
|
||||
/* I've gotten too many complaints from people (mostly Linux users)
|
||||
trying to build GLUT that have problems using lex and yacc to
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-lib_glut_glut_vidresize_c,v 1.1 2007/04/02 19:57:48 martynas Exp $
|
||||
--- lib/glut/glut_vidresize.c.orig Sat Aug 8 02:15:11 1998
|
||||
+++ lib/glut/glut_vidresize.c Mon Apr 2 11:51:49 2007
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
#if !defined(_WIN32)
|
||||
#include <GL/glx.h>
|
||||
+#undef GLX_SGIX_video_resize
|
||||
#endif
|
||||
|
||||
#ifdef __sgi
|
||||
@@ -20,7 +21,7 @@
|
||||
/* Grumble. The IRIX 6.3 and early IRIX 6.4 OpenGL headers
|
||||
support the video resize extension, but failed to define
|
||||
GLX_SGIX_video_resize. */
|
||||
-#ifdef GLX_SYNC_FRAME_SGIX
|
||||
+#if defined(GLX_SYNC_FRAME_SGIX) && !defined(__OpenBSD__)
|
||||
#define GLX_SGIX_video_resize 1
|
||||
#endif
|
||||
|
@ -1,20 +0,0 @@
|
||||
$OpenBSD: patch-lib_glut_strokegen_y,v 1.2 2005/11/20 18:03:25 naddy Exp $
|
||||
--- lib/glut/strokegen.y.orig Sun Nov 20 18:53:41 2005
|
||||
+++ lib/glut/strokegen.y Sun Nov 20 18:52:58 2005
|
||||
@@ -243,14 +243,14 @@ main(argc, argv)
|
||||
if (*++argv != NULL)
|
||||
{
|
||||
--argc;
|
||||
- (void) strcpy(symname, *argv);
|
||||
+ (void) strlcpy(symname, *argv, sizeof(symname));
|
||||
}
|
||||
break;
|
||||
case 'o':
|
||||
if (*++argv != NULL)
|
||||
{
|
||||
--argc;
|
||||
- (void) strcpy(fname, *argv);
|
||||
+ (void) strlcpy(fname, *argv, sizeof(fname));
|
||||
}
|
||||
break;
|
||||
default: /* ignore other options */
|
@ -1,37 +0,0 @@
|
||||
$OpenBSD: patch-lib_mui_Imakefile,v 1.5 2005/12/26 21:08:52 steven Exp $
|
||||
--- lib/mui/Imakefile.orig Sat Aug 8 02:20:51 1998
|
||||
+++ lib/mui/Imakefile Mon Dec 26 22:04:27 2005
|
||||
@@ -2,17 +2,21 @@
|
||||
/* Copyright (c) Mark J. Kilgard, 1994. */
|
||||
|
||||
#define DoNormalLib YES
|
||||
+#define DoSharedLib YES
|
||||
+#define DoExtraLib YES
|
||||
+#define LibName mui
|
||||
+#define SoRev SOMUIREV
|
||||
|
||||
-#include <Library.tmpl>
|
||||
-
|
||||
-#include "../../Glut.cf"
|
||||
-
|
||||
SRCS = button.c displaylist.c gizmo.c glutmui.c \
|
||||
hslider.c miscui.c mui.c pulldown.c textlist.c uicolor.c vslider.c
|
||||
|
||||
OBJS = button.o displaylist.o gizmo.o glutmui.o \
|
||||
hslider.o miscui.o mui.o pulldown.o textlist.o uicolor.o vslider.o
|
||||
|
||||
+#include <Library.tmpl>
|
||||
+
|
||||
+#include "../../Glut.cf"
|
||||
+
|
||||
#ifdef LibraryObjectRule
|
||||
LibraryObjectRule()
|
||||
#else
|
||||
@@ -20,7 +24,5 @@ LibraryObjectRule()
|
||||
will probably do essentially what LibraryObjectRule does. */
|
||||
NormalLibraryObjectRule()
|
||||
#endif
|
||||
-
|
||||
-NormalLibraryTarget(mui,$(OBJS))
|
||||
|
||||
DependTarget()
|
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-lib_mui_browseparse_c,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- lib/mui/browseparse.c.orig Fri Aug 7 20:15:06 1998
|
||||
+++ lib/mui/browseparse.c Wed Jun 20 12:11:38 2001
|
||||
@@ -58,15 +58,15 @@ void parsebrowsefile(FILE *f)
|
||||
while (0 != fgets(buffer, 299, f))
|
||||
switch(buffer[0]) {
|
||||
case 'D':
|
||||
- strcpy(currentdirectoryname, &buffer[2]);
|
||||
+ strlcpy(currentdirectoryname, &buffer[2], sizeof(currentdirectoryname));
|
||||
nukecr(currentdirectoryname);
|
||||
break;
|
||||
case 'F':
|
||||
- strcpy(currentfilename, &buffer[2]);
|
||||
+ strlcpy(currentfilename, &buffer[2], sizeof(currentfilename));
|
||||
nukecr(currentfilename);
|
||||
break;
|
||||
case 'P':
|
||||
- strcpy(browseprompt, &buffer[2]);
|
||||
+ strlcpy(browseprompt, &buffer[2], sizeof(browseprompt));
|
||||
nukecr(browseprompt);
|
||||
break;
|
||||
case 'X':
|
||||
@@ -86,9 +86,9 @@ void setcurrentfilename(char *s)
|
||||
sptr = &s[len-1];
|
||||
while (sptr != s) {
|
||||
if (*sptr == '/') {
|
||||
- strcpy(currentfilename, sptr+1);
|
||||
+ strlcpy(currentfilename, sptr+1, sizeof(currentfilename));
|
||||
*sptr = 0;
|
||||
- strcpy(currentdirectoryname, s);
|
||||
+ strlcpy(currentdirectoryname, s, sizeof(currentdirectoryname));
|
||||
return;
|
||||
}
|
||||
sptr--;
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-lib_mui_browser_c,v 1.2 2007/04/02 19:57:48 martynas Exp $
|
||||
--- lib/mui/browser.c.orig Sat Aug 8 02:15:28 1998
|
||||
+++ lib/mui/browser.c Mon Apr 2 11:35:06 2007
|
||||
@@ -176,7 +176,7 @@ void handletextbox(muiObject *obj, enum muiReturnValue
|
||||
strncpy(directory, s, slash-s);
|
||||
directory[slash-s] = 0;
|
||||
} else {
|
||||
- strcat(directory, "/");
|
||||
+ strlcat(directory, "/", sizeof(directory));
|
||||
strncat(directory, s, slash-s);
|
||||
}
|
||||
}
|
||||
@@ -233,7 +233,7 @@ void maketestui(void)
|
||||
muiSetCallback(tl, handlefileselection);
|
||||
|
||||
cd(directory);
|
||||
- strcpy(originaldir, directory);
|
||||
+ strlcpy(originaldir, directory, sizeof(originaldir));
|
||||
}
|
||||
|
||||
void main(int argc, char **argv)
|
||||
@@ -243,7 +243,7 @@ void main(int argc, char **argv)
|
||||
f = fopen(BROWSEFILE, "r");
|
||||
parsebrowsefile(f);
|
||||
fclose(f);
|
||||
- strcpy(directory, currentdirectoryname);
|
||||
+ strlcpy(directory, currentdirectoryname, sizeof(directory));
|
||||
maketestui();
|
||||
glutInit(&argc, argv);
|
||||
if (argc > 1) mui_singlebuffered = 1;
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-man_Imakefile,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- man/Imakefile.orig Fri Aug 7 20:20:31 1998
|
||||
+++ man/Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -1,7 +1,7 @@
|
||||
#define IHaveSubdirs
|
||||
#define PassCDebugFlags
|
||||
|
||||
-SUBDIRS = glut gle
|
||||
+SUBDIRS = glut
|
||||
|
||||
MakeSubdirs($(SUBDIRS))
|
||||
DependSubdirs($(SUBDIRS))
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-man_glut_Imakefile,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
--- man/glut/Imakefile.orig Fri Aug 7 20:20:31 1998
|
||||
+++ man/glut/Imakefile Wed Jun 20 12:11:38 2001
|
||||
@@ -15,9 +15,9 @@ MANSUFFIX = $(LIBMANSUFFIX)glut
|
||||
MANPACKAGE = /GLUT
|
||||
#endif
|
||||
|
||||
-all:
|
||||
- @echo 'The default rule in GLUT API man page Makefile is a no-op.'
|
||||
- @echo 'Try "make install.man" to build and install man pages.'
|
||||
+all::
|
||||
+# @echo 'The default rule in GLUT API man page Makefile is a no-op.'
|
||||
+# @echo 'Try "make install.man" to build and install man pages.'
|
||||
|
||||
InstallManPageLong(glutAddMenuEntry,$(MANDIR),glutAddMenuEntry)
|
||||
InstallManPageLong(glutAddSubMenu,$(MANDIR),glutAddSubMenu)
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-man_glut_glutStrokeWidth_man,v 1.1 2004/04/18 11:54:09 sturm Exp $
|
||||
--- man/glut/glutStrokeWidth.man.orig 2004-04-18 13:42:49.000000000 +0200
|
||||
+++ man/glut/glutStrokeWidth.man 2004-04-18 13:44:03.000000000 +0200
|
||||
@@ -3,8 +3,7 @@
|
||||
.\"
|
||||
.TH glutStrokeWidth 3 "3.7" "GLUT" "GLUT"
|
||||
.SH NAME
|
||||
-glutStrokeWidth returns the width of a stroke character,
|
||||
-glutStrokeLength returns the length of a stroke font string.
|
||||
+glutStrokeWidth, glutStrokeLength \- returns the width/length of a stroke character/string.
|
||||
.SH SYNTAX
|
||||
.nf
|
||||
.LP
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-man_glut_glutWarpPointer_man,v 1.1 2002/12/08 20:21:04 pvalchev Exp $
|
||||
--- man/glut/glutWarpPointer.man.orig Sun Dec 8 15:05:45 2002
|
||||
+++ man/glut/glutWarpPointer.man Sun Dec 8 15:06:32 2002
|
||||
@@ -3,7 +3,7 @@
|
||||
.\"
|
||||
.TH glutWarpPointer 3 "3.7" "GLUT" "GLUT"
|
||||
.SH NAME
|
||||
-glutWarpPointer warps the pointer's location.
|
||||
+glutWarpPointer - warps the pointer's location.
|
||||
.SH SYNTAX
|
||||
.nf
|
||||
.LP
|
@ -1,8 +0,0 @@
|
||||
The OpenGL Utility Toolkit, a window system independent toolkit for
|
||||
writing OpenGL programs. It implements a simple windowing application
|
||||
programming interface (API) for OpenGL. GLUT is designed for
|
||||
constructing small to medium sized OpenGL programs. While GLUT is
|
||||
well-suited to learning OpenGL and developing simple OpenGL
|
||||
applications, GLUT is not a full-featured toolkit so large applications
|
||||
requiring sophisticated user interfaces are better off using native
|
||||
window system toolkits like Motif.
|
@ -1,4 +0,0 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 21:08:52 steven Exp $
|
||||
@lib lib/libglsmap.so.${LIBglsmap_VERSION}
|
||||
@lib lib/libglut.so.${LIBglut_VERSION}
|
||||
@lib lib/libmui.so.${LIBmui_VERSION}
|
@ -1,124 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.3 2009/04/09 12:45:42 jasper Exp $
|
||||
@conflict freeglut-*
|
||||
include/GL/
|
||||
include/GL/glsmap.h
|
||||
include/GL/glut.h
|
||||
include/mui/
|
||||
include/mui/browser.h
|
||||
include/mui/displaylist.h
|
||||
include/mui/gizmo.h
|
||||
include/mui/hslider.h
|
||||
include/mui/mui.h
|
||||
include/mui/textlist.h
|
||||
include/mui/uicolor.h
|
||||
include/mui/vslider.h
|
||||
lib/libglsmap.a
|
||||
lib/libglut.a
|
||||
lib/libmui.a
|
||||
@man man/cat3/glut.0
|
||||
@man man/cat3/glutAddMenuEntry.0
|
||||
@man man/cat3/glutAddSubMenu.0
|
||||
@man man/cat3/glutAttachMenu.0
|
||||
@man man/cat3/glutBitmapCharacter.0
|
||||
@man man/cat3/glutBitmapLength.0
|
||||
@man man/cat3/glutBitmapWidth.0
|
||||
@man man/cat3/glutButtonBoxFunc.0
|
||||
@man man/cat3/glutChangeToMenuEntry.0
|
||||
@man man/cat3/glutChangeToSubMenu.0
|
||||
@man man/cat3/glutCopyColormap.0
|
||||
@man man/cat3/glutCreateMenu.0
|
||||
@man man/cat3/glutCreateSubWindow.0
|
||||
@man man/cat3/glutCreateWindow.0
|
||||
@man man/cat3/glutDestroyMenu.0
|
||||
@man man/cat3/glutDestroyWindow.0
|
||||
@man man/cat3/glutDetachMenu.0
|
||||
@man man/cat3/glutDeviceGet.0
|
||||
@man man/cat3/glutDialsFunc.0
|
||||
@man man/cat3/glutDisplayFunc.0
|
||||
@man man/cat3/glutEnterGameMode.0
|
||||
@man man/cat3/glutEntryFunc.0
|
||||
@man man/cat3/glutEstablishOverlay.0
|
||||
@man man/cat3/glutExtensionSupported.0
|
||||
@man man/cat3/glutForceJoystickFunc.0
|
||||
@man man/cat3/glutFullScreen.0
|
||||
@man man/cat3/glutGameModeGet.0
|
||||
@man man/cat3/glutGameModeString.0
|
||||
@man man/cat3/glutGet.0
|
||||
@man man/cat3/glutGetColor.0
|
||||
@man man/cat3/glutGetMenu.0
|
||||
@man man/cat3/glutGetModifiers.0
|
||||
@man man/cat3/glutGetWindow.0
|
||||
@man man/cat3/glutHideOverlay.0
|
||||
@man man/cat3/glutHideWindow.0
|
||||
@man man/cat3/glutIconifyWindow.0
|
||||
@man man/cat3/glutIdleFunc.0
|
||||
@man man/cat3/glutIgnoreKeyRepeat.0
|
||||
@man man/cat3/glutInit.0
|
||||
@man man/cat3/glutInitDisplayMode.0
|
||||
@man man/cat3/glutInitDisplayString.0
|
||||
@man man/cat3/glutInitWindowPosition.0
|
||||
@man man/cat3/glutJoystickFunc.0
|
||||
@man man/cat3/glutKeyboardFunc.0
|
||||
@man man/cat3/glutKeyboardUpFunc.0
|
||||
@man man/cat3/glutLayerGet.0
|
||||
@man man/cat3/glutLeaveGameMode.0
|
||||
@man man/cat3/glutMainLoop.0
|
||||
@man man/cat3/glutMenuStatusFunc.0
|
||||
@man man/cat3/glutMotionFunc.0
|
||||
@man man/cat3/glutMouseFunc.0
|
||||
@man man/cat3/glutOverlayDisplayFunc.0
|
||||
@man man/cat3/glutPassiveMotionFunc.0
|
||||
@man man/cat3/glutPopWindow.0
|
||||
@man man/cat3/glutPositionWindow.0
|
||||
@man man/cat3/glutPostOverlayRedisplay.0
|
||||
@man man/cat3/glutPostRedisplay.0
|
||||
@man man/cat3/glutPushWindow.0
|
||||
@man man/cat3/glutRemoveMenuItem.0
|
||||
@man man/cat3/glutRemoveOverlay.0
|
||||
@man man/cat3/glutReportErrors.0
|
||||
@man man/cat3/glutReshapeFunc.0
|
||||
@man man/cat3/glutReshapeWindow.0
|
||||
@man man/cat3/glutSetColor.0
|
||||
@man man/cat3/glutSetCursor.0
|
||||
@man man/cat3/glutSetIconTitle.0
|
||||
@man man/cat3/glutSetKeyRepeat.0
|
||||
@man man/cat3/glutSetMenu.0
|
||||
@man man/cat3/glutSetWindow.0
|
||||
@man man/cat3/glutSetWindowTitle.0
|
||||
@man man/cat3/glutShowOverlay.0
|
||||
@man man/cat3/glutShowWindow.0
|
||||
@man man/cat3/glutSolidCone.0
|
||||
@man man/cat3/glutSolidCube.0
|
||||
@man man/cat3/glutSolidDodecahedron.0
|
||||
@man man/cat3/glutSolidIcosahedron.0
|
||||
@man man/cat3/glutSolidOctahedron.0
|
||||
@man man/cat3/glutSolidSphere.0
|
||||
@man man/cat3/glutSolidTeapot.0
|
||||
@man man/cat3/glutSolidTetrahedron.0
|
||||
@man man/cat3/glutSolidTorus.0
|
||||
@man man/cat3/glutSpaceballButtonFunc.0
|
||||
@man man/cat3/glutSpaceballMotionFunc.0
|
||||
@man man/cat3/glutSpaceballRotateFunc.0
|
||||
@man man/cat3/glutSpecialFunc.0
|
||||
@man man/cat3/glutSpecialUpFunc.0
|
||||
@man man/cat3/glutStrokeCharacter.0
|
||||
@man man/cat3/glutStrokeLength.0
|
||||
@man man/cat3/glutStrokeWidth.0
|
||||
@man man/cat3/glutSwapBuffers.0
|
||||
@man man/cat3/glutTabletButtonFunc.0
|
||||
@man man/cat3/glutTabletMotionFunc.0
|
||||
@man man/cat3/glutTimerFunc.0
|
||||
@man man/cat3/glutUseLayer.0
|
||||
@man man/cat3/glutVisibilityFunc.0
|
||||
@man man/cat3/glutWarpPointer.0
|
||||
@man man/cat3/glutWireCone.0
|
||||
@man man/cat3/glutWireCube.0
|
||||
@man man/cat3/glutWireDodecahedron.0
|
||||
@man man/cat3/glutWireIcosahedron.0
|
||||
@man man/cat3/glutWireOctahedron.0
|
||||
@man man/cat3/glutWireSphere.0
|
||||
@man man/cat3/glutWireTeapot.0
|
||||
@man man/cat3/glutWireTetrahedron.0
|
||||
@man man/cat3/glutWireTorus.0
|
||||
@man man/cat3/intro.0
|
||||
%%SHARED%%
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: SECURITY,v 1.1.1.1 2001/06/20 18:55:24 lebel Exp $
|
||||
|
||||
GLUT uses strcpy, strcmp, strcat, and sprintf
|
||||
in a few functions. The included patches correct
|
||||
the usage.
|
||||
|
||||
Files affected are:
|
||||
${WRKSRC}/lib/glut/strokegen.y
|
||||
${WRKSRC}/lib/glut/strokelex.l
|
||||
${WRKSRC}/lib/mui/browseparse.c
|
||||
${WRKSRC}/lib/mui/browser.c
|
Loading…
Reference in New Issue
Block a user