Use buildlink2.

5 files changed, 59 insertions, 66 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 26a8cd9223b..a24dc7e1233 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/02/13 22:38:42 skrll Exp $
+# $NetBSD: Makefile,v 1.16 2002/11/25 20:48:42 jlam Exp $
 #
 
 DISTNAME=	libggi-2.0b2.1
@@ -9,34 +9,28 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.ggi-project.org/
 COMMENT=	General Graphics Interface library is a flexible drawing library
 
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
-DEPENDS+=	libgii-0.6:../libgii
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
+USE_NCURSES=		not sure if this is really needed??
 
-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"
+USE_LIBTOOL=		# defined
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--with-x
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
 post-configure:
-	@if [ -f ${X11BASE}/include/X11/extensions/xf86dga.h ]; then \
-		${CP} ${PKGDIR}/PLIST ${PLIST_SRC}; \
-	else \
-		${GREP} -v lib.ggi.display.xf86dga ${PKGDIR}/PLIST \
-			> ${PLIST_SRC}; \
+	@if [ -f ${X11BASE}/include/X11/extensions/xf86dga.h ]; then	\
+		${CP} ${PKGDIR}/PLIST ${PLIST_SRC};			\
+	else								\
+		${GREP} -v lib.ggi.display.xf86dga ${PKGDIR}/PLIST	\
+			> ${PLIST_SRC};					\
 	fi
 
-post-install:
-	cd ${PREFIX}/man/man3 ; for i in *.3ggi ; do \
-		${MV} $$i `basename $$i .3ggi`.3 ; \
-	done
-	cd ${PREFIX}/man/man7 ; for i in *.7ggi ; do \
-		${MV} $$i `basename $$i .7ggi`.7 ; \
-	done
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../graphics/libgii/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index 383f523f3e9..e2866429ef0 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/01/11 11:47:54 skrll Exp $
+$NetBSD: distinfo,v 1.4 2002/11/25 20:48:42 jlam 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) = d040fdc112f01932224e3d0016a9d9459be74973
 SHA1 (patch-ac) = 144fe4919dbc1d6434cf764db52a5752be06974b
+SHA1 (patch-ad) = e89cc8c86efabee6495c66d031004c6bf36b152b
diff --git a/graphics/libggi/patches/patch-aa b/graphics/libggi/patches/patch-aa
deleted file mode 100644
index 2508a771be8..00000000000
--- a/graphics/libggi/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/04/16 16:54:55 mycroft Exp $
-
---- configure.in.orig	Fri May 14 14:59:24 1999
-+++ configure.in	Sun Apr 16 11:34:01 2000
-@@ -371,6 +365,7 @@
- fi
- 
- if test "x$build_dga_target" != "xno"; then
-+  CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
-   AC_CHECK_HEADER(X11/extensions/xf86dga.h,[
-   internal_xf86dga="yes"
-   AM_CONDITIONAL(INTERNAL_XF86DGA, test "x$internal_xf86dga" = "xyes")
diff --git a/graphics/libggi/patches/patch-ab b/graphics/libggi/patches/patch-ab
deleted file mode 100644
index 3db4de566da..00000000000
--- a/graphics/libggi/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/01/11 11:47:54 skrll Exp $
-
---- configure.orig	Fri Jan 11 11:21:05 2002
-+++ configure
-@@ -5141,19 +5141,20 @@
- fi
- 
- 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*
diff --git a/graphics/libggi/patches/patch-ad b/graphics/libggi/patches/patch-ad
new file mode 100644
index 00000000000..0f8440cad1f
--- /dev/null
+++ b/graphics/libggi/patches/patch-ad
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.1 2002/11/25 20:48:43 jlam Exp $
+
+--- doc/man/Makefile.in.orig	Mon Nov 25 12:45:23 2002
++++ doc/man/Makefile.in
+@@ -130,7 +130,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/ggi$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man3dir)/$$inst"; \
+@@ -145,7 +145,7 @@ uninstall-man3:
+ 	  esac; \
+ 	done; \
+ 	for i in $$list; do \
+-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//;s/ggi$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " rm -f $(DESTDIR)$(man3dir)/$$inst"; \
+@@ -163,7 +163,7 @@ install-man7:
+ 	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/ggi$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man7dir)/$$inst"; \
+@@ -178,7 +178,7 @@ uninstall-man7:
+ 	  esac; \
+ 	done; \
+ 	for i in $$list; do \
+-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  ext=`echo $$i | sed -e 's/^.*\\.//;s/ggi$$//'`; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " rm -f $(DESTDIR)$(man7dir)/$$inst"; \