Make the Fortran interface work properly. Install the demos.

While here, build shared libraries using libtool.  Increment version number.

7 files changed, 146 insertions, 4 deletions

diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index b0ee5b23d49..7613d42e23f 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2001/04/14 21:43:43 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/05/03 20:56:32 jtb Exp $
 
-DISTNAME=		g2-0.40
+DISTNAME=		g2-0.40nb1
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://g2.sourceforge.net/pub/g2/
 
@@ -10,6 +10,8 @@ COMMENT=		Powerful, easy to use 2D graphics library
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
+USE_LIBTOOL=		yes
+
 ALL_TARGET=		depend all
 
 USE_PERL5=		#defined
@@ -23,5 +25,11 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}/g2_perl && ${MAKE} 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} demo_f.f g2_test.c penguin.c \
+		simple_PS.c simple_X11.c ${PREFIX}/share/examples/g2
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/g2/distinfo b/graphics/g2/distinfo
index 90fadd158de..328bff6a582 100644
--- a/graphics/g2/distinfo
+++ b/graphics/g2/distinfo
@@ -1,4 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:12 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/03 20:56:32 jtb Exp $
 
 SHA1 (g2-0.40.tar.gz) = 88c03a2c33caf4fe4b51097fe37b4f503d9cd6cf
 Size (g2-0.40.tar.gz) = 103031 bytes
+SHA1 (patch-aa) = 4691247328cb448c3478e189aba679091c77dca9
+SHA1 (patch-ab) = 4dae4efeb6061b3904134a92020b0b5aee3d0405
+SHA1 (patch-ac) = 1a49bfa21f4ce44f7d2fe49c4db68d654eb352e8
+SHA1 (patch-ad) = 1fdd436a96f1f06818f34b154a7b3a3a31e804d4
diff --git a/graphics/g2/patches/patch-aa b/graphics/g2/patches/patch-aa
new file mode 100644
index 00000000000..3a17c10d7e9
--- /dev/null
+++ b/graphics/g2/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2001/05/03 20:56:33 jtb Exp $
+
+--- src/g2_fif.c.orig	Mon Jan 18 10:56:51 1999
++++ src/g2_fif.c
+@@ -25,7 +25,7 @@
+  * g2 Fortran Interface
+  *
+  */
+-#ifdef LINUX
++#if defined (LINUX) || defined (__NetBSD__)
+ #define FIF(funame) funame ## __
+ #else
+ #define FIF(funame) funame ## _
diff --git a/graphics/g2/patches/patch-ab b/graphics/g2/patches/patch-ab
new file mode 100644
index 00000000000..fbd859053b6
--- /dev/null
+++ b/graphics/g2/patches/patch-ab
@@ -0,0 +1,57 @@
+$NetBSD: patch-ab,v 1.1 2001/05/03 20:56:33 jtb Exp $
+
+--- Makefile.in.orig	Thu May  3 19:25:15 2001
++++ Makefile.in
+@@ -58,42 +58,35 @@
+ INS =  $(BASE_INS) $(PS_INS) $(X11_INS) $(GIF_INS)
+ 
+ .c.o:  
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --tag=CC $(CC) $(CFLAGS) -c $< -o $@
+ 
+ 
+-all: libg2.a
++all: libg2.la
+ 	test -d ./include || mkdir ./include
+ 	cp $(INS) ./include/
+ 
+-shared: libg2.so
+-	@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
+-
+-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)
+ 	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
+ 
+-demo:	libg2.a
++demo:	libg2.la
+ 	(cd ./demo ; make)
+ 
+ depend:
diff --git a/graphics/g2/patches/patch-ac b/graphics/g2/patches/patch-ac
new file mode 100644
index 00000000000..fce1b38c700
--- /dev/null
+++ b/graphics/g2/patches/patch-ac
@@ -0,0 +1,33 @@
+$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
new file mode 100644
index 00000000000..6601a9c1657
--- /dev/null
+++ b/graphics/g2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2001/05/03 20:56:33 jtb Exp $
+
+--- g2_perl/Makefile.PL.in.orig	Fri Jan 22 15:29:10 1999
++++ g2_perl/Makefile.PL.in
+@@ -4,7 +4,7 @@
+ WriteMakefile(
+     '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' 
+     'DEFINE'	=> '@DEFS@',                    # e.g., '-DHAVE_SOMETHING' 
+     'INC'	=> '-I./../include',               # e.g., '-I/usr/local/include' 
+ );
diff --git a/graphics/g2/pkg/PLIST b/graphics/g2/pkg/PLIST
index 3ca88572c2d..6e77d7b7a74 100644
--- a/graphics/g2/pkg/PLIST
+++ b/graphics/g2/pkg/PLIST
@@ -1,5 +1,19 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/02/07 22:19:40 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/05/03 20:56:33 jtb Exp $
 include/g2.h
 include/g2_PS.h
 include/g2_X11.h
 lib/libg2.a
+lib/libg2.la
+lib/libg2.so
+lib/libg2.so.0
+lib/libg2.so.0.0
+share/doc/g2/COPYING
+share/doc/g2/README
+share/doc/g2/g2_ref.txt
+share/examples/g2/demo_f.f
+share/examples/g2/g2_test.c
+share/examples/g2/penguin.c
+share/examples/g2/simple_PS.c
+share/examples/g2/simple_X11.c
+@dirrm share/doc/g2
+@dirrm share/examples/g2/