Updated g2 to 0.50.

Changes since 0.49:
0.50
====
- removed GIF code
- improved fortran port

4 files changed, 28 insertions, 29 deletions

diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 6f7af4dc33a..f575734d462 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2006/04/17 13:46:31 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2006/10/04 22:22:37 rillig Exp $
 
-DISTNAME=		g2-0.49a
-PKGREVISION=		7
+DISTNAME=		g2-0.50
 CATEGORIES=		graphics
 MASTER_SITES=		http://g2.sourceforge.net/pub/
 
@@ -10,20 +9,22 @@ HOMEPAGE=		http://g2.sourceforge.net/
 COMMENT=		Powerful, easy to use 2D graphics library
 
 GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
 PERL5_PACKLIST=		auto/G2/.packlist
 PERL5_CONFIGURE=	no
 PERL5_CONFIGURE_DIRS=	${WRKSRC}/g2_perl
-BUILD_DIRS=		${WRKSRC} ${WRKSRC}/g2_perl
+BUILD_DIRS=		. g2_perl
+TEST_TARGET=		# none
+
+INSTALLATION_DIRS=	share/doc/g2 share/examples/g2
 
 post-configure: perl5-configure
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/g2
 	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} *.c *.f *.inc  \
 		${PREFIX}/share/examples/g2
 
diff --git a/graphics/g2/PLIST b/graphics/g2/PLIST
index 1ec14209103..6123a2fae58 100644
--- a/graphics/g2/PLIST
+++ b/graphics/g2/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2005/09/26 14:59:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/10/04 22:22:37 rillig Exp $
 include/g2.h
-include/g2_GIF.h
 include/g2_PS.h
 include/g2_X11.h
 include/g2_gd.h
@@ -15,9 +14,9 @@ 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
+share/examples/g2/simple_win32.c
 @dirrm share/doc/g2
 @dirrm share/examples/g2/
diff --git a/graphics/g2/distinfo b/graphics/g2/distinfo
index 6cc179fb2fa..ef1cfa85318 100644
--- a/graphics/g2/distinfo
+++ b/graphics/g2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 08:45:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/10/04 22:22:37 rillig Exp $
 
-SHA1 (g2-0.49a.tar.gz) = 561ab3c814aa0bef46d1fe398c8ada86af6cd80d
-RMD160 (g2-0.49a.tar.gz) = e4fdc6dde5651b41e52cd9fe5121b46084dba68e
-Size (g2-0.49a.tar.gz) = 120732 bytes
+SHA1 (g2-0.50.tar.gz) = 41153f697e3b3e270319b8c99f575f2fccff39cc
+RMD160 (g2-0.50.tar.gz) = c9a379b845da7da3d108c4f60446476d60d67091
+Size (g2-0.50.tar.gz) = 132308 bytes
 SHA1 (patch-aa) = 4691247328cb448c3478e189aba679091c77dca9
-SHA1 (patch-ab) = d06e556606a6c91e22f85c8d7aaf6bbc84b707f6
+SHA1 (patch-ab) = 627f3ec9b3cd81c431328c6b368f39588c6e8b7c
 SHA1 (patch-ad) = 766b1063f690db1ea0c3587b4dd2319f678d54bf
diff --git a/graphics/g2/patches/patch-ab b/graphics/g2/patches/patch-ab
index ee8836607fc..54144a40f7e 100644
--- a/graphics/g2/patches/patch-ab
+++ b/graphics/g2/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2003/04/29 22:02:10 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2006/10/04 22:22:37 rillig Exp $
 
---- Makefile.in.orig
-+++ Makefile.in
-@@ -68,31 +68,22 @@
+--- Makefile.in.orig	2004-03-01 00:47:46.000000000 +0100
++++ Makefile.in	2006-10-05 00:19:32.000000000 +0200
+@@ -66,30 +66,22 @@ OBJ = $(SRC:.c=.o)
+ INS =  $(BASE_INS) $(PS_INS) $(X11_INS) $(WIN32_INS) $(GD_INS)
  
- INS =  $(BASE_INS) $(PS_INS) $(X11_INS) $(GIF_INS) $(GD_INS)
- 
--.c.o:  
+ .c.o:  
 -	$(CC) $(CFLAGS) -c $< -o $@
-+.c.o:
-+	$(LIBTOOL) $(CC) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< -o $@
  
  
 -all: libg2.a
@@ -27,8 +25,9 @@ $NetBSD: patch-ab,v 1.2 2003/04/29 22:02:10 jtb Exp $
 -	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)
++	$(LIBTOOL) --mode=link $(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@
@@ -38,20 +37,20 @@ $NetBSD: patch-ab,v 1.2 2003/04/29 22:02:10 jtb Exp $
  	test -d $(LIBDIR) || mkdir -p $(LIBDIR)
  	test -d $(INCDIR) || mkdir -p $(INCDIR)
 -	$(INSTALL_DATA) libg2.a $(LIBDIR)
-+	$(LIBTOOL) $(INSTALL_DATA) libg2.la $(LIBDIR)
++	$(LIBTOOL) --mode=install $(INSTALL_DATA) libg2.la $(LIBDIR)
  	for IFILE in $(INS); do \
  		$(INSTALL_DATA) $$IFILE  $(INCDIR); \
  	done
-@@ -108,7 +99,7 @@
- 	-rm -f ./libg2.@LD_SHARED_EXT@
+@@ -106,7 +98,7 @@ clean:
  	-rm -f libg2.$(G2_VERSION).a
+ 	-rm -f a.out
  
 -demo:	libg2.a
 +demo:	libg2.la
  	(cd ./demo ; make)
  
  depend:
-@@ -119,4 +110,3 @@
+@@ -117,4 +109,3 @@ depend:
  
  
  # DO NOT DELETE THIS LINE -- make  depend  depends  on it.