Various tidy ups:

	o Use pkgsrc libtool not internal one - we caught up with the
	  internal one ages ago.

	o Remove BUILD_DEPENDS on autoconf - the configure{,.in} hacks
	  will probably disappear if someone buildlinkifies this pkg.

	o Sort PLIST

4 files changed, 243 insertions, 233 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 4de16a6425c..e8e12b9623e 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/08/27 14:35:09 tron Exp $
+# $NetBSD: Makefile,v 1.14 2002/01/11 11:47:54 skrll Exp $
 #
 
 DISTNAME=	libggi-2.0b2.1
@@ -13,23 +13,18 @@ BUILD_DEPENDS+=	autoconf>=2.13:../../devel/autoconf
 DEPENDS+=	ncurses>=4.2:../../devel/ncurses
 DEPENDS+=	libgii-0.6:../libgii
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--disable-debug \
-		--with-x \
-		--with-extra-includes=${LOCALBASE}/include \
-		--with-extra-libs="${X11BASE}/lib -Wl,-R${X11BASE}/lib"
+USE_LIBTOOL=		YES
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	\
+	--disable-debug \
+	--with-x \
+	--with-extra-includes=${LOCALBASE}/include \
+	--with-extra-libs="${X11BASE}/lib -Wl,-R${X11BASE}/lib"
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
-pre-configure:
-	cd ${WRKSRC}; autoconf
-
 post-configure:
-	cd ${WRKSRC}; \
-	[ -f configure.BAK ] || ${CP} configure configure.BAK; \
-	${SED} \
-		-e '/lib/s@-L\([a-zA-Z$/_]*\)@-Wl,-R\1 -L\1@g' \
-		<configure.BAK >configure
 	@if [ -f ${X11BASE}/include/X11/extensions/xf86dga.h ]; then \
 		${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
 	else \
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index 3f46bc03444..244a282ce04 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,190 +1,223 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:50 zuntum Exp $
-man/man7/libggi.7
-man/man6/cube3d.6
-man/man3/ggiResourceMustAcquire.3
-man/man3/ggiResourceRelease.3
-man/man3/ggiResourceAcquire.3
-man/man3/ggiFlushRegion.3
-man/man3/ggiSetColorfulPalette.3
-man/man3/ggiUnpackPixels.3
-man/man3/ggiUnmapPixel.3
-man/man3/ggiSetWriteFrame.3
-man/man3/ggiSetTextMode.3
-man/man3/ggiSetSimpleMode.3
-man/man3/ggiSetReadFrame.3
-man/man3/ggiSetPalette.3
-man/man3/ggiSetOrigin.3
-man/man3/ggiSetMode.3
-man/man3/ggiSetGraphMode.3
-man/man3/ggiSetGammaMap.3
-man/man3/ggiSetGamma.3
-man/man3/ggiSetGCForeground.3
-man/man3/ggiSetGCClipping.3
-man/man3/ggiSetGCBackground.3
-man/man3/ggiSetFlags.3
-man/man3/ggiSetDisplayFrame.3
-man/man3/ggiSPrintMode.3
-man/man3/ggiRemoveFlags.3
-man/man3/ggiPuts.3
-man/man3/ggiPutc.3
-man/man3/ggiPutVLine.3
-man/man3/ggiPutPixel.3
-man/man3/ggiPutHLine.3
-man/man3/ggiPutBox.3
-man/man3/ggiPrintMode.3
-man/man3/ggiParseMode.3
-man/man3/ggiPanic.3
-man/man3/ggiPackColors.3
-man/man3/ggiOpen.3
-man/man3/ggiMapColor.3
-man/man3/ggiInit.3
-man/man3/ggiGetWriteFrame.3
-man/man3/ggiGetVLine.3
-man/man3/ggiGetReadFrame.3
-man/man3/ggiGetPixelFormat.3
-man/man3/ggiGetPixel.3
-man/man3/ggiGetPalette.3
-man/man3/ggiGetOrigin.3
-man/man3/ggiGetMode.3
-man/man3/ggiGetHLine.3
-man/man3/ggiGetGammaMap.3
-man/man3/ggiGetGamma.3
-man/man3/ggiGetGCForeground.3
-man/man3/ggiGetGCClipping.3
-man/man3/ggiGetGCBackground.3
-man/man3/ggiGetFlags.3
-man/man3/ggiGetDisplayFrame.3
-man/man3/ggiGetBox.3
-man/man3/ggiFlush.3
-man/man3/ggiFillscreen.3
-man/man3/ggiFPrintMode.3
-man/man3/ggiExit.3
-man/man3/ggiDrawVLine.3
-man/man3/ggiDrawPixel.3
-man/man3/ggiDrawLine.3
-man/man3/ggiDrawHLine.3
-man/man3/ggiDrawBox.3
-man/man3/ggiDBGetNumBuffers.3
-man/man3/ggiDBGetBuffer.3
-man/man3/ggiCrossBlit.3
-man/man3/ggiCopyBox.3
-man/man3/ggiClose.3
-man/man3/ggiCheckTextMode.3
-man/man3/ggiCheckSimpleMode.3
-man/man3/ggiCheckMode.3
-man/man3/ggiCheckGraphMode.3
-man/man3/ggiAddFlags.3
-lib/libggimisc.la
-lib/libggimisc.so
-lib/libggimisc.so.2
-lib/libggimisc.so.2.0
-lib/libggi.la
-lib/libggi.so
-lib/libggi.so.2
-lib/libggi.so.2.0
-lib/ggi/default/iplanar_2p.la
-lib/ggi/default/iplanar_2p.so
+@comment $NetBSD: PLIST,v 1.2 2002/01/11 11:47:54 skrll Exp $
+bin/cube3d
+bin/monitest
+etc/ggi/libggi.conf
+etc/ggi/libggimisc.conf
+include/ggi/display/aa.h
+include/ggi/display/fbdev.h
+include/ggi/display/file.h
+include/ggi/display/glide.h
+include/ggi/display/linvtsw.h
+include/ggi/display/mansync.h
+include/ggi/display/memory.h
+include/ggi/display/modelist.h
+include/ggi/display/monotext.h
+include/ggi/display/multi.h
+include/ggi/display/palemu.h
+include/ggi/display/sub.h
+include/ggi/display/svgalib.h
+include/ggi/display/tele.h
+include/ggi/display/tile.h
+include/ggi/display/trueemu.h
+include/ggi/display/vcsa.h
+include/ggi/display/x.h
+include/ggi/display/xcommon.h
+include/ggi/display/xf86dga.h
+include/ggi/display/xlib.h
+include/ggi/ggi-unix.h
+include/ggi/ggi.h
+include/ggi/ggi_ext.h
+include/ggi/internal/debug.h
+include/ggi/internal/dltypes.h
+include/ggi/internal/ggi-dl.h
+include/ggi/internal/ggidlinit.h
+include/ggi/internal/ggilibinit.h
+include/ggi/internal/internal.h
+include/ggi/internal/misc_int.h
+include/ggi/internal/plat.h
+include/ggi/internal/structs.h
+include/ggi/misc.h
+include/ggi/types.h
+lib/ggi/default/color.a
+lib/ggi/default/color.la
+lib/ggi/default/color.so
+lib/ggi/default/ilbm.a
 lib/ggi/default/ilbm.la
 lib/ggi/default/ilbm.so
-lib/ggi/default/planar.la
-lib/ggi/default/planar.so
-lib/ggi/default/linear_32.la
-lib/ggi/default/linear_32.so
-lib/ggi/default/linear_24.la
-lib/ggi/default/linear_24.so
+lib/ggi/default/iplanar_2p.a
+lib/ggi/default/iplanar_2p.la
+lib/ggi/default/iplanar_2p.so
+lib/ggi/default/linear_1.a
+lib/ggi/default/linear_1.la
+lib/ggi/default/linear_1.so
+lib/ggi/default/linear_16.a
 lib/ggi/default/linear_16.la
 lib/ggi/default/linear_16.so
-lib/ggi/default/linear_8.la
-lib/ggi/default/linear_8.so
-lib/ggi/default/linear_4.la
-lib/ggi/default/linear_4.so
-lib/ggi/default/linear_2.la
-lib/ggi/default/linear_2.so
+lib/ggi/default/linear_1_r.a
 lib/ggi/default/linear_1_r.la
 lib/ggi/default/linear_1_r.so
-lib/ggi/default/linear_1.la
-lib/ggi/default/linear_1.so
-lib/ggi/default/text_32.la
-lib/ggi/default/text_32.so
-lib/ggi/default/text_16.la
-lib/ggi/default/text_16.so
-lib/ggi/default/color.la
-lib/ggi/default/color.so
+lib/ggi/default/linear_2.a
+lib/ggi/default/linear_2.la
+lib/ggi/default/linear_2.so
+lib/ggi/default/linear_24.a
+lib/ggi/default/linear_24.la
+lib/ggi/default/linear_24.so
+lib/ggi/default/linear_32.a
+lib/ggi/default/linear_32.la
+lib/ggi/default/linear_32.so
+lib/ggi/default/linear_4.a
+lib/ggi/default/linear_4.la
+lib/ggi/default/linear_4.so
+lib/ggi/default/linear_8.a
+lib/ggi/default/linear_8.la
+lib/ggi/default/linear_8.so
+lib/ggi/default/planar.a
+lib/ggi/default/planar.la
+lib/ggi/default/planar.so
+lib/ggi/default/stubs.a
 lib/ggi/default/stubs.la
 lib/ggi/default/stubs.so
-@comment in libgii: @dirrm lib/ggi/default
-lib/ggi/display/xf86dga.la
-lib/ggi/display/xf86dga.so
+lib/ggi/default/text_16.a
+lib/ggi/default/text_16.la
+lib/ggi/default/text_16.so
+lib/ggi/default/text_32.a
+lib/ggi/default/text_32.la
+lib/ggi/default/text_32.so
+lib/ggi/display/X-misc.a
 lib/ggi/display/X-misc.la
 lib/ggi/display/X-misc.so
-lib/ggi/display/trueemu.la
-lib/ggi/display/trueemu.so
-lib/ggi/display/tile.la
-lib/ggi/display/tile.so
-lib/ggi/display/terminfo.la
-lib/ggi/display/terminfo.so
-lib/ggi/display/tele.la
-lib/ggi/display/tele.so
-lib/ggi/display/sub.la
-lib/ggi/display/sub.so
-lib/ggi/display/palemu.la
-lib/ggi/display/palemu.so
-lib/ggi/display/multi.la
-lib/ggi/display/multi.so
-lib/ggi/display/monotext.la
-lib/ggi/display/monotext.so
-lib/ggi/display/memory.la
-lib/ggi/display/memory.so
-lib/ggi/display/file.la
-lib/ggi/display/file.so
-lib/ggi/display/Xlib.la
-lib/ggi/display/Xlib.so
+lib/ggi/display/X.a
 lib/ggi/display/X.la
 lib/ggi/display/X.so
+lib/ggi/display/Xlib.a
+lib/ggi/display/Xlib.la
+lib/ggi/display/Xlib.so
+lib/ggi/display/file.a
+lib/ggi/display/file.la
+lib/ggi/display/file.so
+lib/ggi/display/mansync.a
 lib/ggi/display/mansync.la
 lib/ggi/display/mansync.so
+lib/ggi/display/memory.a
+lib/ggi/display/memory.la
+lib/ggi/display/memory.so
+lib/ggi/display/monotext.a
+lib/ggi/display/monotext.la
+lib/ggi/display/monotext.so
+lib/ggi/display/multi.a
+lib/ggi/display/multi.la
+lib/ggi/display/multi.so
+lib/ggi/display/palemu.a
+lib/ggi/display/palemu.la
+lib/ggi/display/palemu.so
+lib/ggi/display/sub.a
+lib/ggi/display/sub.la
+lib/ggi/display/sub.so
+lib/ggi/display/tele.a
+lib/ggi/display/tele.la
+lib/ggi/display/tele.so
+lib/ggi/display/terminfo.a
+lib/ggi/display/terminfo.la
+lib/ggi/display/terminfo.so
+lib/ggi/display/tile.a
+lib/ggi/display/tile.la
+lib/ggi/display/tile.so
+lib/ggi/display/trueemu.a
+lib/ggi/display/trueemu.la
+lib/ggi/display/trueemu.so
+lib/ggi/display/xf86dga.a
+lib/ggi/display/xf86dga.la
+lib/ggi/display/xf86dga.so
+lib/libggi.a
+lib/libggi.la
+lib/libggi.so
+lib/libggi.so.2
+lib/libggi.so.2.0
+lib/libggimisc.a
+lib/libggimisc.la
+lib/libggimisc.so
+lib/libggimisc.so.2
+lib/libggimisc.so.2.0
+man/man3/ggiAddFlags.3
+man/man3/ggiCheckGraphMode.3
+man/man3/ggiCheckMode.3
+man/man3/ggiCheckSimpleMode.3
+man/man3/ggiCheckTextMode.3
+man/man3/ggiClose.3
+man/man3/ggiCopyBox.3
+man/man3/ggiCrossBlit.3
+man/man3/ggiDBGetBuffer.3
+man/man3/ggiDBGetNumBuffers.3
+man/man3/ggiDrawBox.3
+man/man3/ggiDrawHLine.3
+man/man3/ggiDrawLine.3
+man/man3/ggiDrawPixel.3
+man/man3/ggiDrawVLine.3
+man/man3/ggiExit.3
+man/man3/ggiFPrintMode.3
+man/man3/ggiFillscreen.3
+man/man3/ggiFlush.3
+man/man3/ggiFlushRegion.3
+man/man3/ggiGetBox.3
+man/man3/ggiGetDisplayFrame.3
+man/man3/ggiGetFlags.3
+man/man3/ggiGetGCBackground.3
+man/man3/ggiGetGCClipping.3
+man/man3/ggiGetGCForeground.3
+man/man3/ggiGetGamma.3
+man/man3/ggiGetGammaMap.3
+man/man3/ggiGetHLine.3
+man/man3/ggiGetMode.3
+man/man3/ggiGetOrigin.3
+man/man3/ggiGetPalette.3
+man/man3/ggiGetPixel.3
+man/man3/ggiGetPixelFormat.3
+man/man3/ggiGetReadFrame.3
+man/man3/ggiGetVLine.3
+man/man3/ggiGetWriteFrame.3
+man/man3/ggiInit.3
+man/man3/ggiMapColor.3
+man/man3/ggiOpen.3
+man/man3/ggiPackColors.3
+man/man3/ggiPanic.3
+man/man3/ggiParseMode.3
+man/man3/ggiPrintMode.3
+man/man3/ggiPutBox.3
+man/man3/ggiPutHLine.3
+man/man3/ggiPutPixel.3
+man/man3/ggiPutVLine.3
+man/man3/ggiPutc.3
+man/man3/ggiPuts.3
+man/man3/ggiRemoveFlags.3
+man/man3/ggiResourceAcquire.3
+man/man3/ggiResourceMustAcquire.3
+man/man3/ggiResourceRelease.3
+man/man3/ggiSPrintMode.3
+man/man3/ggiSetColorfulPalette.3
+man/man3/ggiSetDisplayFrame.3
+man/man3/ggiSetFlags.3
+man/man3/ggiSetGCBackground.3
+man/man3/ggiSetGCClipping.3
+man/man3/ggiSetGCForeground.3
+man/man3/ggiSetGamma.3
+man/man3/ggiSetGammaMap.3
+man/man3/ggiSetGraphMode.3
+man/man3/ggiSetMode.3
+man/man3/ggiSetOrigin.3
+man/man3/ggiSetPalette.3
+man/man3/ggiSetReadFrame.3
+man/man3/ggiSetSimpleMode.3
+man/man3/ggiSetTextMode.3
+man/man3/ggiSetWriteFrame.3
+man/man3/ggiUnmapPixel.3
+man/man3/ggiUnpackPixels.3
+man/man6/cube3d.6
+man/man7/libggi.7
 @dirrm lib/ggi/display
-@dirrm lib/ggi
-include/ggi/misc.h
-include/ggi/ggi-unix.h
-include/ggi/ggi_ext.h
-include/ggi/ggi.h
-include/ggi/types.h
-include/ggi/display/xcommon.h
-include/ggi/display/xlib.h
-include/ggi/display/xf86dga.h
-include/ggi/display/x.h
-include/ggi/display/vcsa.h
-include/ggi/display/trueemu.h
-include/ggi/display/tile.h
-include/ggi/display/tele.h
-include/ggi/display/svgalib.h
-include/ggi/display/sub.h
-include/ggi/display/palemu.h
-include/ggi/display/multi.h
-include/ggi/display/monotext.h
-include/ggi/display/modelist.h
-include/ggi/display/memory.h
-include/ggi/display/mansync.h
-include/ggi/display/linvtsw.h
-include/ggi/display/glide.h
-include/ggi/display/file.h
-include/ggi/display/fbdev.h
-include/ggi/display/aa.h
-@dirrm include/ggi/display
-include/ggi/internal/misc_int.h
-include/ggi/internal/plat.h
-include/ggi/internal/internal.h
-include/ggi/internal/structs.h
-include/ggi/internal/ggilibinit.h
-include/ggi/internal/ggidlinit.h
-include/ggi/internal/ggi-dl.h
-include/ggi/internal/dltypes.h
-include/ggi/internal/debug.h
-@comment in libgii: @dirrm include/ggi/internal
+@dirrm lib/ggi/default
+@comment in libgii: @dirrm lib/ggi
+@dirrm include/ggi/internal
+@comment in libgii: @dirrm include/ggi/display
 @comment in libgii: @dirrm include/ggi
-etc/ggi/libggi.conf
-etc/ggi/libggimisc.conf
 @comment in libgii: @dirrm etc/ggi
-bin/monitest
-bin/cube3d
+
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index 5fe7e9d6ec9..383f523f3e9 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/01/11 11:47:54 skrll Exp $
 
 SHA1 (libggi-2.0b2.1.tar.gz) = 698de63108a58fa1fc08942266118dc2fccf482c
 Size (libggi-2.0b2.1.tar.gz) = 658294 bytes
 SHA1 (patch-aa) = 472fcd0dcb83e46264286c6446e5e2c25b568f14
-SHA1 (patch-ab) = 5378303367a66ee6501478564b8161f8f2a53fcd
+SHA1 (patch-ab) = d040fdc112f01932224e3d0016a9d9459be74973
 SHA1 (patch-ac) = 144fe4919dbc1d6434cf764db52a5752be06974b
diff --git a/graphics/libggi/patches/patch-ab b/graphics/libggi/patches/patch-ab
index 3fa85c1931f..3db4de566da 100644
--- a/graphics/libggi/patches/patch-ab
+++ b/graphics/libggi/patches/patch-ab
@@ -1,46 +1,28 @@
-$NetBSD: patch-ab,v 1.1 2000/10/01 14:03:27 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/11 11:47:54 skrll Exp $
 
---- ltmain.sh.orig	Thu Apr  1 03:11:12 1999
-+++ ltmain.sh
-@@ -794,6 +794,7 @@
-     old_convenience=
-     deplibs=
-     linkopts=
-+    wllinkopts=
-     lib_search_path=`pwd`
+--- configure.orig	Fri Jan 11 11:21:05 2002
++++ configure
+@@ -5141,19 +5141,20 @@
+ fi
  
-     avoid_version=no
-@@ -1105,6 +1106,25 @@
- 	continue
- 	;;
- 
-+      -Wl,*)
-+	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-+	arg=
-+	IFS="${IFS=     }"; save_ifs="$IFS"; IFS=','
-+	for flag in $args; do
-+	  IFS="$save_ifs"
-+	  case "$flag" in
-+	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	    flag="\"$flag\""
-+	    ;;
-+	  esac
-+	  arg="$arg $wl$flag"
-+	  linkopts="$linkopts $flag"
-+	  wllinkopts="$wllinkopts $wl$flag"
-+	done
-+	IFS="$save_ifs"
-+	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	;;
-+
-       # Some other compiler flag.
-       -* | +*)
- 	# Unknown arguments in both finalize_command and compile_command need
-@@ -2244,6 +2264,7 @@
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linkopts="$linkopts $flag"
-+	  wllinkopts="$linkopts $wl$flag"
- 	fi
- 
- 	# Prepare the list of exported symbols
+ if test "x$build_dga_target" != "xno"; then
++  CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+   ac_safe=`echo "X11/extensions/xf86dga.h" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for X11/extensions/xf86dga.h""... $ac_c" 1>&6
+-echo "configure:5147: checking for X11/extensions/xf86dga.h" >&5
++echo "configure:5148: checking for X11/extensions/xf86dga.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5152 "configure"
++#line 5153 "configure"
+ #include "confdefs.h"
+ #include <X11/extensions/xf86dga.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:5158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*