Use buildlink2, fix libtool usage and PLIST.

6 files changed, 135 insertions, 117 deletions

diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index b70e271b52d..3b1f453baef 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/11/25 20:16:26 jlam Exp $
 #
 
 DISTNAME=	libgii-0.6
@@ -9,13 +9,14 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ggi-project.org/
 COMMENT=	General Input Interface - API for all possible input sources
 
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=--enable-mutexes=int \
-		--with-x
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 
-post-install:
-	cd ${PREFIX}/man/man3 ; for i in *.3gii ; do \
-		${MV} $$i `basename $$i .3gii`.3 ; \
-	done
+USE_LIBTOOL=		# defined
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--enable-mutexes=int
+CONFIGURE_ARGS+=	--with-x
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgii/PLIST b/graphics/libgii/PLIST
index 7b4b166fb9c..b5ac7ff44f0 100644
--- a/graphics/libgii/PLIST
+++ b/graphics/libgii/PLIST
@@ -1,65 +1,77 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:52 zuntum Exp $
-man/man3/giiSetEventMask.3
-man/man3/giiRemoveEventMask.3
-man/man3/giiPanic.3
-man/man3/giiOpen.3
-man/man3/giiJoinInputs.3
-man/man3/giiInit.3
-man/man3/giiGetEventMask.3
-man/man3/giiExit.3
-man/man3/giiEventSend.3
-man/man3/giiEventRead.3
-man/man3/giiEventPoll.3
-man/man3/giiClose.3
-man/man3/giiAddEventMask.3
-man/man1/mhub.1
-lib/libgii.la
-lib/libgii.so
-lib/libgii.so.0
-lib/libgii.so.0.6
-lib/libgg.la
-lib/libgg.so
-lib/libgg.so.0
-lib/libgg.so.0.6
-lib/ggi/filter/save.la
-lib/ggi/filter/save.so
+@comment $NetBSD: PLIST,v 1.2 2002/11/25 20:16:26 jlam Exp $
+bin/mhub
+bin/xsendbut
+etc/ggi/libgii.conf
+include/ggi/errors.h
+include/ggi/events.h
+include/ggi/gg.h
+include/ggi/gii-unix.h
+include/ggi/gii.h
+include/ggi/input/lin_kbd.h
+include/ggi/input/xwin.h
+include/ggi/internal/gii-dl.h
+include/ggi/internal/gii.h
+include/ggi/internal/gii_debug.h
+include/ggi/keyboard.h
+include/ggi/system.h
+lib/ggi/filter/mouse.a
 lib/ggi/filter/mouse.la
 lib/ggi/filter/mouse.so
-@dirrm lib/ggi/filter
-lib/ggi/input/spaceorb.la
-lib/ggi/input/spaceorb.so
+lib/ggi/filter/save.a
+lib/ggi/filter/save.la
+lib/ggi/filter/save.so
+lib/ggi/input/file.a
+lib/ggi/input/file.la
+lib/ggi/input/file.so
+lib/ggi/input/linux_mouse.a
 lib/ggi/input/linux_mouse.la
 lib/ggi/input/linux_mouse.so
+lib/ggi/input/mouse.a
 lib/ggi/input/mouse.la
 lib/ggi/input/mouse.so
-lib/ggi/input/xwin.la
-lib/ggi/input/xwin.so
-lib/ggi/input/x.la
-lib/ggi/input/x.so
-lib/ggi/input/stdin.la
-lib/ggi/input/stdin.so
-lib/ggi/input/file.la
-lib/ggi/input/file.so
+lib/ggi/input/null.a
 lib/ggi/input/null.la
 lib/ggi/input/null.so
+lib/ggi/input/spaceorb.a
+lib/ggi/input/spaceorb.la
+lib/ggi/input/spaceorb.so
+lib/ggi/input/stdin.a
+lib/ggi/input/stdin.la
+lib/ggi/input/stdin.so
+lib/ggi/input/x.a
+lib/ggi/input/x.la
+lib/ggi/input/x.so
+lib/ggi/input/xwin.a
+lib/ggi/input/xwin.la
+lib/ggi/input/xwin.so
+lib/libgg.a
+lib/libgg.la
+lib/libgg.so
+lib/libgg.so.0
+lib/libgg.so.0.6
+lib/libgii.a
+lib/libgii.la
+lib/libgii.so
+lib/libgii.so.0
+lib/libgii.so.0.6
+man/man1/mhub.1
+man/man3/giiAddEventMask.3
+man/man3/giiClose.3
+man/man3/giiEventPoll.3
+man/man3/giiEventRead.3
+man/man3/giiEventSend.3
+man/man3/giiExit.3
+man/man3/giiGetEventMask.3
+man/man3/giiInit.3
+man/man3/giiJoinInputs.3
+man/man3/giiOpen.3
+man/man3/giiPanic.3
+man/man3/giiRemoveEventMask.3
+man/man3/giiSetEventMask.3
 @dirrm lib/ggi/input
+@dirrm lib/ggi/filter
 @dirrm lib/ggi
-include/ggi/gii-unix.h
-include/ggi/gii.h
-include/ggi/keyboard.h
-include/ggi/events.h
-include/ggi/system.h
-include/ggi/gg.h
-include/ggi/errors.h
-include/ggi/input/xwin.h
-include/ggi/input/lin_kbd.h
-@dirrm include/ggi/input
-include/ggi/internal/gii_debug.h
-include/ggi/internal/gii-dl.h
-include/ggi/internal/gii.h
 @dirrm include/ggi/internal
+@dirrm include/ggi/input
 @dirrm include/ggi
-etc/ggi/libgii.conf
 @dirrm etc/ggi
-bin/xsendbut
-bin/mhub
diff --git a/graphics/libgii/distinfo b/graphics/libgii/distinfo
index de545842529..7a39bddfcae 100644
--- a/graphics/libgii/distinfo
+++ b/graphics/libgii/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:18 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/11/25 20:16:26 jlam Exp $
 
 SHA1 (libgii-0.6.tar.gz) = d83d7b045343b1f745e6557208532c959e9e825f
 Size (libgii-0.6.tar.gz) = 258201 bytes
-SHA1 (patch-aa) = cdc76a63fcbe09053a3363f90d2ef7692be349ce
-SHA1 (patch-ab) = fb15762cb4f5eb9a2b47f58defb44c0ddefd4473
+SHA1 (patch-aa) = 3bdfe5323abf3e1ac952879df7f7381b3bef0c6c
+SHA1 (patch-ab) = a3052dbb66ffcd6815709cbcaf6eda3d2b138c77
+SHA1 (patch-ac) = 3c1787495d633f04e7a430de074f36ce19cfb390
diff --git a/graphics/libgii/patches/patch-aa b/graphics/libgii/patches/patch-aa
index 6ae3faeef34..a4afd5f4209 100644
--- a/graphics/libgii/patches/patch-aa
+++ b/graphics/libgii/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.1 2000/06/27 01:55:16 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/11/25 20:16:27 jlam Exp $
 
---- configure.BAK	Tue Jun 27 03:49:28 2000
-+++ configure	Tue Jun 27 03:50:08 2000
-@@ -3392,7 +3392,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
+--- doc/man/Makefile.in.orig	Sun May 16 13:51:42 1999
++++ doc/man/Makefile.in
+@@ -129,7 +129,7 @@ install-man3:
+ 	for i in $$list; do \
+ 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ 	  else file=$$i; fi; \
+-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//;s/gii$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
+@@ -144,7 +144,7 @@ uninstall-man3:
+ 	  esac; \
+ 	done; \
+ 	for i in $$list; do \
+-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//;s/gii$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
diff --git a/graphics/libgii/patches/patch-ab b/graphics/libgii/patches/patch-ab
index a7050fd564f..b286a224e2c 100644
--- a/graphics/libgii/patches/patch-ab
+++ b/graphics/libgii/patches/patch-ab
@@ -1,46 +1,20 @@
-$NetBSD: patch-ab,v 1.1 2000/10/01 13:40:26 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/11/25 20:16:27 jlam Exp $
 
---- ltmain.sh.orig	Sun Oct  1 15:28:43 2000
-+++ ltmain.sh
-@@ -794,6 +794,7 @@
-     old_convenience=
-     deplibs=
-     linkopts=
-+    wllinkopts=
-     lib_search_path=`pwd`
+--- input/xwin/Makefile.am.orig	Wed Mar 31 16:03:12 1999
++++ input/xwin/Makefile.am
+@@ -10,12 +10,10 @@ xwin_la_LDFLAGS = ${extra_libraries} -mo
  
-     avoid_version=no
-@@ -1105,6 +1106,25 @@
- 	continue
- 	;;
+ inputlibdir = ${libdir}/ggi/input
  
-+      -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
+-xev.c:	../x/xev.c
++xev.c:	../x/xev.c ../x/xev.h
+ 	rm -f xev.c
+ 	ln -s ../x/xev.c .
+-
+-xev.lo:
+-	rm -f xev.lo
+-	ln -s ../x/xev.lo .
++	rm -f xev.h
++	ln -s ../x/xev.h .
  
- 	# Prepare the list of exported symbols
+ EXTRA_DIST = EXPSYMS
diff --git a/graphics/libgii/patches/patch-ac b/graphics/libgii/patches/patch-ac
new file mode 100644
index 00000000000..d96cabf92ca
--- /dev/null
+++ b/graphics/libgii/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2002/11/25 20:16:27 jlam Exp $
+
+--- input/xwin/Makefile.in.orig	Sun May 16 13:50:59 1999
++++ input/xwin/Makefile.in
+@@ -334,13 +334,11 @@ mostlyclean-generic distclean-generic cl
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
+ 
+-xev.c:	../x/xev.c
++xev.c:	../x/xev.c ../x/xev.h
+ 	rm -f xev.c
+ 	ln -s ../x/xev.c .
+-
+-xev.lo:
+-	rm -f xev.lo
+-	ln -s ../x/xev.lo .
++	rm -f xev.h
++	ln -s ../x/xev.h .
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.