Use buildlink2, fix libtool usage and PLIST.

3 files changed, 58 insertions, 54 deletions

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.