Update do version 0.49a.

Changes:

* license change to LGPL
* added new Tijs Michels spline implementation
* small fixes in spline package
* added g2_spline_demo.c
* removed some non ansi parts (e.g. // comments)
* added query pointer for X11 (mouse)
* other small fixes and changes

6 files changed, 51 insertions, 77 deletions

diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 29dd8fba7c4..4b8057852ab 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2002/10/27 23:57:17 seb Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/29 22:02:09 jtb Exp $
 
-DISTNAME=		g2-0.40
-PKGREVISION=		1
+DISTNAME=		g2-0.49a
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://g2.sourceforge.net/pub/g2/
 
@@ -13,9 +12,9 @@ GNU_CONFIGURE=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK2=		yes
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/G2/.packlist
-PERL5_CONFIGURE=	NO
+PERL5_CONFIGURE=	no
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/g2_perl
 BUILD_DIRS=		${WRKSRC} ${WRKSRC}/g2_perl
 
@@ -26,8 +25,9 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} doc/g2_ref.txt COPYING README	\
 		${PREFIX}/share/doc/g2
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/g2
-	cd ${WRKSRC}/demo && ${INSTALL_DATA} demo_f.f g2_test.c penguin.c \
-		simple_PS.c simple_X11.c ${PREFIX}/share/examples/g2
+	cd ${WRKSRC}/demo && ${INSTALL_DATA} *.c *.f *.inc  \
+		${PREFIX}/share/examples/g2
 
+.include "../../graphics/gd/buildlink2.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/g2/PLIST b/graphics/g2/PLIST
index b5a97d134bd..23127a4ac67 100644
--- a/graphics/g2/PLIST
+++ b/graphics/g2/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:50:45 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/04/29 22:02:09 jtb Exp $
 include/g2.h
 include/g2_PS.h
 include/g2_X11.h
+include/g2_gd.h
 lib/libg2.a
 lib/libg2.la
 lib/libg2.so
@@ -11,9 +12,15 @@ share/doc/g2/COPYING
 share/doc/g2/README
 share/doc/g2/g2_ref.txt
 share/examples/g2/demo_f.f
+share/examples/g2/g2_splines_demo.c
 share/examples/g2/g2_test.c
+share/examples/g2/g2_test.f
 share/examples/g2/penguin.c
+share/examples/g2/penguin.inc
+share/examples/g2/pointer.c
+share/examples/g2/simple_GIF.c
 share/examples/g2/simple_PS.c
 share/examples/g2/simple_X11.c
+share/examples/g2/simple_gd.c
 @dirrm share/doc/g2
 @dirrm share/examples/g2/
diff --git a/graphics/g2/distinfo b/graphics/g2/distinfo
index 328bff6a582..7563b8a6b73 100644
--- a/graphics/g2/distinfo
+++ b/graphics/g2/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/05/03 20:56:32 jtb Exp $
+$NetBSD: distinfo,v 1.4 2003/04/29 22:02:09 jtb Exp $
 
-SHA1 (g2-0.40.tar.gz) = 88c03a2c33caf4fe4b51097fe37b4f503d9cd6cf
-Size (g2-0.40.tar.gz) = 103031 bytes
+SHA1 (g2-0.49a.tar.gz) = 561ab3c814aa0bef46d1fe398c8ada86af6cd80d
+Size (g2-0.49a.tar.gz) = 120732 bytes
 SHA1 (patch-aa) = 4691247328cb448c3478e189aba679091c77dca9
-SHA1 (patch-ab) = 4dae4efeb6061b3904134a92020b0b5aee3d0405
-SHA1 (patch-ac) = 1a49bfa21f4ce44f7d2fe49c4db68d654eb352e8
-SHA1 (patch-ad) = 1fdd436a96f1f06818f34b154a7b3a3a31e804d4
+SHA1 (patch-ab) = d06e556606a6c91e22f85c8d7aaf6bbc84b707f6
+SHA1 (patch-ad) = 766b1063f690db1ea0c3587b4dd2319f678d54bf
diff --git a/graphics/g2/patches/patch-ab b/graphics/g2/patches/patch-ab
index fbd859053b6..ee8836607fc 100644
--- a/graphics/g2/patches/patch-ab
+++ b/graphics/g2/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2001/05/03 20:56:33 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/04/29 22:02:10 jtb Exp $
 
---- Makefile.in.orig	Thu May  3 19:25:15 2001
+--- Makefile.in.orig
 +++ Makefile.in
-@@ -58,42 +58,35 @@
- INS =  $(BASE_INS) $(PS_INS) $(X11_INS) $(GIF_INS)
+@@ -68,31 +68,22 @@
  
- .c.o:  
+ INS =  $(BASE_INS) $(PS_INS) $(X11_INS) $(GIF_INS) $(GD_INS)
+ 
+-.c.o:  
 -	$(CC) $(CFLAGS) -c $< -o $@
-+	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) -c $< -o $@
++.c.o:
++	$(LIBTOOL) $(CC) $(CFLAGS) -c $< -o $@
  
  
 -all: libg2.a
@@ -15,43 +17,42 @@ $NetBSD: patch-ab,v 1.1 2001/05/03 20:56:33 jtb Exp $
  	test -d ./include || mkdir ./include
  	cp $(INS) ./include/
  
--shared: libg2.so
+-shared: libg2.@LD_SHARED_EXT@
 -	@echo
-+libg2.la: $(OBJ)
-+	${LIBTOOL} --tag=CC $(CC) -o $@ $(OBJ:.o=.lo) -Wl,-R${X11BASE}/lib \
-+	-L${X11BASE}/lib -lX11 -lm --version-info 0:0 -rpath ${LIBDIR}
- 
+-
+-
 -libg2.a: $(OBJ)
 -	$(AR) $(ARFLAGS) libg2.a $(OBJ)
--	ln -s libg2.a libg2.0.40.a
--
--libg2.so: $(OBJ)
--	$(CC) -shared -o libg2.so $(OBJ) -lc -lm
+-	test ! -n "$(RANLIB)" || $(RANLIB) $@
+-	test ! -f ./libg2.$(G2_VERSION).a || rm ./libg2.$(G2_VERSION).a
+-	ln -s libg2.a libg2.$(G2_VERSION).a
++libg2.la: $(OBJ)
++	$(LIBTOOL) $(CC) -o $@ $(OBJ:.o=.lo) -Wl,-R$(X11BASE)/lib \
++	-L$(X11BASE)/lib -lX11 -lm --version-info 0:0 -rpath $(LIBDIR)
+ 
+-libg2.@LD_SHARED_EXT@: $(OBJ)
+-	@LD_SHARED@ @LD_SHARED_FLAGS@ -o $@ $(OBJ) @LD_SHARED_OPT@
 -
 -install: libg2.a
 +install: libg2.la
  	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
  	test -d $(INCDIR) || mkdir -p $(INCDIR)
 -	$(INSTALL_DATA) libg2.a $(LIBDIR)
-+	${LIBTOOL} $(INSTALL_DATA) libg2.la $(LIBDIR)
++	$(LIBTOOL) $(INSTALL_DATA) libg2.la $(LIBDIR)
  	for IFILE in $(INS); do \
  		$(INSTALL_DATA) $$IFILE  $(INCDIR); \
  	done
- 
- clean:
- 	-(cd ./demo ; make clean)
--	-rm -f $(OBJ)
--	-rm -f libg2.a config.cache config.log Makefile.bak config.status
-+	-rm -f $(OBJ) $(OBJ:.o=.lo)
-+	-rm -fr libg2.* .libs config.cache config.log Makefile.bak config.status
- 	-rm -f ./include/*.h
- 	-$(FIND) . -name "*~" -exec rm -f {} \;
- 	-(cd ./g2_perl ; make clean)
- 	-rm -f ./g2_perl/test.ps ./g2_perl/test.gif
--	-rm -f ./libg2.0.40.a
+@@ -108,7 +99,7 @@
+ 	-rm -f ./libg2.@LD_SHARED_EXT@
+ 	-rm -f libg2.$(G2_VERSION).a
  
 -demo:	libg2.a
 +demo:	libg2.la
  	(cd ./demo ; make)
  
  depend:
+@@ -119,4 +110,3 @@
+ 
+ 
+ # DO NOT DELETE THIS LINE -- make  depend  depends  on it.
+-
diff --git a/graphics/g2/patches/patch-ac b/graphics/g2/patches/patch-ac
deleted file mode 100644
index fce1b38c700..00000000000
--- a/graphics/g2/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2001/05/03 20:56:33 jtb Exp $
-
---- configure.orig	Mon Jan 18 10:56:51 1999
-+++ configure
-@@ -1192,7 +1192,7 @@
- 
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
-@@ -1727,7 +1727,7 @@
- 
-   # Check for libraries that X11R6 Xt/Xaw programs need.
-   ac_save_LDFLAGS="$LDFLAGS"
--  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries"
-   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-   # check for ICE first), but we must link in the order -lSM -lICE or
-   # we get undefined symbols.  So assume we have SM if we have ICE.
-@@ -1778,8 +1778,8 @@
- 
- fi
- 
--CFLAGS="$CFLAGS $X_CFLAGS -I/usr/local/include"
--LDFLAGS="$LDFLAGS $X_LIBS -L/usr/local/lib"
-+CFLAGS="$CFLAGS $X_CFLAGS"
-+LDFLAGS="$LDFLAGS $X_LIBS"
- 
- 
- DO_PS="#"
diff --git a/graphics/g2/patches/patch-ad b/graphics/g2/patches/patch-ad
index 6601a9c1657..c85087b8bba 100644
--- a/graphics/g2/patches/patch-ad
+++ b/graphics/g2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2001/05/03 20:56:33 jtb Exp $
+$NetBSD: patch-ad,v 1.2 2003/04/29 22:02:10 jtb Exp $
 
 --- g2_perl/Makefile.PL.in.orig	Fri Jan 22 15:29:10 1999
 +++ g2_perl/Makefile.PL.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1 2001/05/03 20:56:33 jtb Exp $
      'NAME'	=> 'G2',
      'VERSION_FROM' => 'G2.pm', # finds $VERSION
 -    'LIBS'	=> ['-L./.. -lg2.0.40 @LDFLAGS@'],  # e.g., '-lm' 
-+    'LIBS'	=> ['-L./../.libs -lg2 @LDFLAGS@'],  # e.g., '-lm' 
++    'LIBS'	=> ['"-L./../.libs -lg2" @LDFLAGS@'],  # e.g., '-lm' 
      'DEFINE'	=> '@DEFS@',                    # e.g., '-DHAVE_SOMETHING' 
      'INC'	=> '-I./../include',               # e.g., '-I/usr/local/include' 
  );