major GLUT improvement

3 files changed, 97 insertions, 56 deletions

diff --git a/media-libs/glut/files/glutscript.sh b/media-libs/glut/files/glutscript.sh
new file mode 100755
index 000000000000..a004c2ebf123
--- /dev/null
+++ b/media-libs/glut/files/glutscript.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+SRCS="glut_8x13	
+glut_9x15 
+glut_bitmap 
+glut_bwidth 
+glut_cindex 
+glut_cmap 
+glut_cursor 
+glut_dials
+glut_dstr
+glut_event
+glut_ext
+glut_fullscrn
+glut_gamemode
+glut_get
+glut_glxext
+glut_hel10
+glut_hel12
+glut_hel18
+glut_init
+glut_input
+glut_joy
+glut_key
+glut_keyctrl
+glut_keyup
+glut_menu
+glut_menu2
+glut_modifier
+glut_mroman
+glut_overlay
+glut_roman
+glut_shapes
+glut_space
+glut_stroke
+glut_swap
+glut_swidth
+glut_tablet
+glut_teapot
+glut_tr10
+glut_tr24
+glut_util
+glut_win
+glut_winmisc
+layerutil
+glut_mesa
+glut_warp
+glut_vidresize"
+
+for x in $SRCS
+do
+	echo "Compiling ${x}.c"
+	gcc -c ${CFLAGS} -ansi -fPIC   -I../../include -I../.. -I/usr/X11R6/include  -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE  -DFUNCPROTO=15 -DNARROWPROTO ${x}.c   
+done
+
+objs=""
+for x in $SRCS
+do
+	objs="${objs} ${x}.o"
+done
+echo "Linking GLUT library"
+gcc -shared -Wl,-soname,libglut.so.3 -L/usr/X11R6/lib -lXi -lXext -lXmu -lXt -lX11 -o libglut.so.3.7 ${objs}      
diff --git a/media-libs/glut/glut-3.7-r1.ebuild b/media-libs/glut/glut-3.7-r1.ebuild
new file mode 100644
index 000000000000..954e843b0af6
--- /dev/null
+++ b/media-libs/glut/glut-3.7-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r1.ebuild,v 1.1 2001/01/20 19:07:38 drobbins Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="GLUT API for Linux"
+SRC_URI="http://reality.sgi.com/opengl/glut3/${A}"
+HOMEPAGE="http://reality.sgi.com/opengl/glut3/glut3.html"
+
+DEPEND=">=sys-libs/glibc-2.1.3 >=x11-base/xfree-4.0.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib/glut
+	cp ${FILESDIR}/glutscript.sh .
+}
+
+src_compile() {
+    cd ${S}/lib/glut
+   	try ./glutscript.sh 
+}
+
+src_install () {
+
+    cd ${S}
+    insinto /usr/X11R6/include/GL
+    doins include/GL/*.h
+    into /usr/X11R6
+    dolib lib/glut/libglut.so.3.7
+    preplib /usr/X11R6
+    prepallstrip
+}
+
+
diff --git a/media-libs/glut/glut-3.7.ebuild b/media-libs/glut/glut-3.7.ebuild
deleted file mode 100644
index 424c43667298..000000000000
--- a/media-libs/glut/glut-3.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.ebuild,v 1.4 2001/01/05 03:21:55 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GLUT API for Linux"
-SRC_URI="http://reality.sgi.com/opengl/glut3/${A}"
-HOMEPAGE="http://reality.sgi.com/opengl/glut3/glut3.html"
-
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=x11-base/xfree-4.0.1
-	>=media-libs/mesa-3.4"
-
-src_unpack() {
-   unpack ${A}
-   cd ${WORKDIR}
-   mkdir lib
-   cd lib
-   ln -s /usr/X11R6/lib/libGL.so.1 libMesaGL.so
-   ln -s /usr/X11R6/lib/libGLU.so.1 libMesaGLU.so
-}
-
-src_compile() {
-
-    cd ${S}
-    cp linux/Glut.cf .
-    cp mkmkfiles.imake mkmkfiles.imake.orig
-    sed -e "s:/bin/csh:/bin/tcsh:" mkmkfiles.imake.orig > mkmkfiles.imake
-    cp Imakefile Imakefile.orig
-    sed -e "s:^SUBDIRS.*:SUBDIRS = lib:" Imakefile.orig > Imakefile
-    unset LS_COLORS
-    try ./mkmkfiles.imake
-    cp linux/Makefile lib/glut
-    cd ${S}/lib/glut
-    try make
-    ln -s libglut.so.3.7 libglut.so.3
-    ln -s libglut.so.3.7 libglut.so
-    cd ${S}
-
-    try make
-}
-
-src_install () {
-
-    cd ${S}
-    insinto /usr/X11R6/include/GL
-    doins include/GL/*.h
-    into /usr/X11R6
-    dolib lib/glut/libglut.so.3.7
-    preplib /usr/X11R6
-    prepallstrip
-}
-
-