From 03cfb709ccfc818e8e803d8d28082bc0f6b3a20a Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 22 Jan 2004 14:13:09 +0000 Subject: Changes 3.0.5: - Added documentation and examples Changes 3.0.6: - Ship some files that were missing in 3.0.5 Changes 3.0.7: - Fixes a configure bug, where libglut was not detected Changes 3.1.0: - Added support for alpha blending - Fix minor memory leak --- graphics/gle/Makefile | 24 ++++++------ graphics/gle/PLIST | 90 +++++++++++++++++++++++++++++++++++++++++-- graphics/gle/distinfo | 11 +++--- graphics/gle/patches/patch-aa | 13 ------- graphics/gle/patches/patch-ab | 14 +++---- graphics/gle/patches/patch-ac | 13 ------- 6 files changed, 112 insertions(+), 53 deletions(-) delete mode 100644 graphics/gle/patches/patch-aa delete mode 100644 graphics/gle/patches/patch-ac (limited to 'graphics/gle') diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index fd41e3e806f..0c5ab9eda1f 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -1,22 +1,24 @@ -# $NetBSD: Makefile,v 1.9 2003/07/17 21:40:57 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/01/22 14:13:09 adam Exp $ # -DISTNAME= gle-3.0.3 -CATEGORIES= graphics -MASTER_SITES= http://www.linas.org/gle/pub/ \ - http://metalab.unc.edu/pub/Linux/libs/X/ \ - ftp://tsx-11.mit.edu/pub/linux/sources/libs/ +DISTNAME= gle-3.1.0 +CATEGORIES= graphics +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gle/} \ + http://www.linas.org/gle/pub/ \ + http://metalab.unc.edu/pub/Linux/libs/X/ \ + ftp://tsx-11.mit.edu/pub/linux/sources/libs/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.linas.org/gle/ -COMMENT= GL subroutines for drawing tubing and extrusions +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.linas.org/gle/ +COMMENT= GL subroutines for drawing tubing and extrusions USE_BUILDLINK2= YES -USE_X11BASE= YES +USE_GMAKE= YES +USE_X11= YES GNU_CONFIGURE= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gle/PLIST b/graphics/gle/PLIST index dde94bcc507..9edc1923488 100644 --- a/graphics/gle/PLIST +++ b/graphics/gle/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:10 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/01/22 14:13:09 adam Exp $ include/GL/gle.h lib/libgle.a lib/libgle.la lib/libgle.so -lib/libgle.so.3 -lib/libgle.so.3.2 +lib/libgle.so.4 +lib/libgle.so.4.0 man/man3/gle.3 man/man3/gleExtrusion.3 man/man3/gleHelicoid.3 @@ -19,3 +19,87 @@ man/man3/gleSuperExtrusion.3 man/man3/gleTextureMode.3 man/man3/gleToroid.3 man/man3/gleTwistExtrusion.3 +share/doc/gle/AUTHORS +share/doc/gle/COPYING +share/doc/gle/COPYING.artistic +share/doc/gle/COPYING.src +share/doc/gle/README +share/doc/gle/gle-3.0.lsm +share/doc/gle/html/README +share/doc/gle/html/angle.gif +share/doc/gle/html/angle.orig.gif +share/doc/gle/html/basic.gif +share/doc/gle/html/basic.orig.gif +share/doc/gle/html/blurb.html +share/doc/gle/html/build.html +share/doc/gle/html/candle.gif +share/doc/gle/html/candle.orig.gif +share/doc/gle/html/cone.gif +share/doc/gle/html/cone.orig.gif +share/doc/gle/html/cut.gif +share/doc/gle/html/cut.orig.gif +share/doc/gle/html/edge.gif +share/doc/gle/html/edge.orig.gif +share/doc/gle/html/edgenorm.gif +share/doc/gle/html/edgenorm.orig.gif +share/doc/gle/html/edgesweep.gif +share/doc/gle/html/edgesweep.orig.gif +share/doc/gle/html/endcap.gif +share/doc/gle/html/endcap.orig.gif +share/doc/gle/html/facenorm.gif +share/doc/gle/html/facenorm.orig.gif +share/doc/gle/html/facesweep.gif +share/doc/gle/html/facesweep.orig.gif +share/doc/gle/html/facet.gif +share/doc/gle/html/facet.orig.gif +share/doc/gle/html/gle.jpg +share/doc/gle/html/helix.gif +share/doc/gle/html/helix1.gif +share/doc/gle/html/helix2.gif +share/doc/gle/html/helix3.gif +share/doc/gle/html/helix3.orig.gif +share/doc/gle/html/helix4.gif +share/doc/gle/html/helix5.gif +share/doc/gle/html/helix5.orig.gif +share/doc/gle/html/helix6.gif +share/doc/gle/html/helix6.orig.gif +share/doc/gle/html/helixtex.gif +share/doc/gle/html/index.html +share/doc/gle/html/join.html +share/doc/gle/html/offround.gif +share/doc/gle/html/offround.orig.gif +share/doc/gle/html/ogla.gif +share/doc/gle/html/ogla_sm.gif +share/doc/gle/html/opencontour.gif +share/doc/gle/html/opencontour.orig.gif +share/doc/gle/html/raw.gif +share/doc/gle/html/raw.orig.gif +share/doc/gle/html/round.gif +share/doc/gle/html/round.orig.gif +share/doc/gle/html/screw0.gif +share/doc/gle/html/screw0.orig.gif +share/doc/gle/html/screw1.gif +share/doc/gle/html/screw1.orig.gif +share/doc/gle/html/screw2.gif +share/doc/gle/html/screw2.orig.gif +share/doc/gle/html/screwn.gif +share/doc/gle/html/screwn.orig.gif +share/doc/gle/html/shear.gif +share/doc/gle/html/shear.orig.gif +share/doc/gle/html/texas.gif +share/doc/gle/html/texas.orig.gif +share/doc/gle/html/texscr.gif +share/doc/gle/html/texscr2.gif +share/doc/gle/html/texture.html +share/doc/gle/html/textwi.gif +share/doc/gle/html/textwi2.gif +share/doc/gle/html/tube.html +share/doc/gle/html/twist1.gif +share/doc/gle/html/twist1.orig.gif +share/doc/gle/html/twist2.gif +share/doc/gle/html/twist2.orig.gif +share/doc/gle/html/twist3.gif +share/doc/gle/html/twist3.orig.gif +share/doc/gle/html/vrml.html +@dirrm share/doc/gle/html +@dirrm share/doc/gle diff --git a/graphics/gle/distinfo b/graphics/gle/distinfo index 76be02718e8..cfb71d42657 100644 --- a/graphics/gle/distinfo +++ b/graphics/gle/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/10/26 18:06:47 bouyer Exp $ +$NetBSD: distinfo,v 1.6 2004/01/22 14:13:09 adam Exp $ -SHA1 (gle-3.0.3.tar.gz) = bd469b571bc4128fe9eac75703d7f96b31a506ac -Size (gle-3.0.3.tar.gz) = 702445 bytes -SHA1 (patch-aa) = 5ed3695ec317819ddc25d33508bc2d8b865ca54c -SHA1 (patch-ab) = b583b4ffcc389548f07f83b7e88d6c665aaca3ef -SHA1 (patch-ac) = 1cf307bc45274c72c2d8c9f860af8041c6dca34a +SHA1 (gle-3.1.0.tar.gz) = ed6d7332df85357430b249854d4f2753f1228074 +Size (gle-3.1.0.tar.gz) = 806861 bytes +SHA1 (patch-aa) = 27606906d948c17fb1b40ebe23f8b5f08f3399b4 +SHA1 (patch-ab) = 499d1aed0ec9e9fb40cbde712d1b019cdb7c0fb2 diff --git a/graphics/gle/patches/patch-aa b/graphics/gle/patches/patch-aa deleted file mode 100644 index f47e4cf48a1..00000000000 --- a/graphics/gle/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/10/26 18:06:47 bouyer Exp $ - ---- examples/Makefile.in.orig Wed Apr 25 15:57:44 2001 -+++ examples/Makefile.in -@@ -100,7 +100,7 @@ - INCLUDES = @X_CFLAGS@ -I${top_srcdir} -I${top_srcdir}/src - - --LDADD = @X_LIBS@ -L../src/.libs -+LDADD = @X_LIBS@ -L../src -L../src/.libs @X_EXTRA_LIBS@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/graphics/gle/patches/patch-ab b/graphics/gle/patches/patch-ab index 93d87307abc..dfcabec9321 100644 --- a/graphics/gle/patches/patch-ab +++ b/graphics/gle/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:00:32 rh Exp $ +$NetBSD: patch-ab,v 1.2 2004/01/22 14:13:09 adam Exp $ ---- man/Makefile.in.orig Wed May 9 17:11:27 2001 +--- man/Makefile.in.orig 2003-03-18 06:12:45.000000000 +0000 +++ man/Makefile.in -@@ -70,15 +70,15 @@ - RANLIB = @RANLIB@ +@@ -74,15 +74,15 @@ RANLIB = @RANLIB@ + STRIP = @STRIP@ VERSION = @VERSION@ -man_MANS = gle.3gle gleExtrusion.3gle gleHelicoid.3gle gleLathe.3gle glePolyCone.3gle glePolyCylinder.3gle gleScrew.3gle gleSetJoinStyle.3gle gleSetNumSides.3gle gleSpiral.3gle gleSuperExtrusion.3gle gleTextureMode.3gle gleToroid.3gle gleTwistExtrusion.3gle @@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:00:32 rh Exp $ -man_RAW = $(man_MANS:.3gle=.man) +man_RAW = $(man_MANS:.3=.man) - EXTRA_DIST = $(man_RAW) Makefile.sgi + EXTRA_DIST = .cvsignore $(man_RAW) Makefile.sgi -SUFFIXES = .man .3gle @@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:00:32 rh Exp $ CLEANFILES = $(man_MANS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -102,7 +102,7 @@ +@@ -106,7 +106,7 @@ TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -30,7 +30,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/14 17:00:32 rh Exp $ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile -@@ -233,11 +233,11 @@ +@@ -237,11 +237,11 @@ maintainer-clean-generic clean mostlycle # for the ordinary install, just copy the raw files .... diff --git a/graphics/gle/patches/patch-ac b/graphics/gle/patches/patch-ac deleted file mode 100644 index a7646ae8d45..00000000000 --- a/graphics/gle/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/03/24 22:27:42 rh Exp $ - ---- configure.orig Thu Apr 26 05:27:41 2001 -+++ configure -@@ -3202,7 +3202,7 @@ - # cc @X_LIBS@ (-lfoo...) @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ - # (Perhaps X_LIBS should have been called X_LDFLAGS.) - --X_LIBS="$X_LIBS -lgle -lXi -lXext -lXmu -lXt -lX11" -+X_LIBS="-lgle $X_LIBS -lXi -lXext -lXmu -lXt -lX11" - - trap '' 1 2 15 - cat > confcache <<\EOF -- cgit v1.2.3