Convert to buildlink3.

4 files changed, 34 insertions, 12 deletions

diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 6f78857e49c..545fe945e1f 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:41:26 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/04/24 20:51:46 snj Exp $
 #
 
 DISTNAME=	lib3ds-1.2.0
@@ -10,11 +10,12 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://lib3ds.sourceforge.net/
 COMMENT=	3D Studio File Format Library
 
-USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
+USE_BUILDLINK3=	YES
+USE_X11=	YES
 
 LDFLAGS+=	-lm
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/Mesa/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/lib3ds/buildlink3.mk b/graphics/lib3ds/buildlink3.mk
new file mode 100644
index 00000000000..b218e7457d0
--- /dev/null
+++ b/graphics/lib3ds/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/24 20:51:46 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIB3DS_BUILDLINK3_MK:=	${LIB3DS_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	lib3ds
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlib3ds}
+BUILDLINK_PACKAGES+=	lib3ds
+
+.if !empty(LIB3DS_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.lib3ds+=	lib3ds>=1.2.0nb2
+BUILDLINK_PKGSRCDIR.lib3ds?=	../../graphics/lib3ds
+.endif	# LIB3DS_BUILDLINK3_MK
+
+.include "../../graphics/Mesa/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/lib3ds/distinfo b/graphics/lib3ds/distinfo
index 22eb64cdfc2..2d9515ee467 100644
--- a/graphics/lib3ds/distinfo
+++ b/graphics/lib3ds/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/05/24 09:32:34 salo Exp $
+$NetBSD: distinfo,v 1.3 2004/04/24 20:51:46 snj Exp $
 
 SHA1 (lib3ds-1.2.0.tar.gz) = 49614218c4c11572887beefaa34d23f72ef70a2c
 Size (lib3ds-1.2.0.tar.gz) = 136806 bytes
-SHA1 (patch-aa) = 0f542d83bbb82e6b89c26288759b24d0dd14cffc
+SHA1 (patch-aa) = a3bd4a1d0d1982211d783531112ace00d1aef377
 SHA1 (patch-ab) = 37229292682ea9bc35cddb2a1f089e46e8490139
 SHA1 (patch-ac) = ea31fbc277bb980d6d04ca867948f275be919793
diff --git a/graphics/lib3ds/patches/patch-aa b/graphics/lib3ds/patches/patch-aa
index f040b22c2c1..7c787822f9a 100644
--- a/graphics/lib3ds/patches/patch-aa
+++ b/graphics/lib3ds/patches/patch-aa
@@ -1,15 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2003/05/24 09:32:34 salo Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/24 20:51:47 snj Exp $
 
---- examples/Makefile.in.orig	2002-01-14 15:24:34.000000000 +0100
-+++ examples/Makefile.in	2003-05-24 10:54:12.000000000 +0200
-@@ -88,26 +88,25 @@
+--- examples/Makefile.in.orig	2002-01-14 06:24:34.000000000 -0800
++++ examples/Makefile.in	2004-04-24 13:04:41.000000000 -0700
+@@ -88,26 +88,25 @@ INCLUDES = \
  @GLUT_CHECK_TRUE@PLAYER = @GLUT_CHECK_TRUE@player
  @GLUT_CHECK_FALSE@PLAYER = 
  
 -noinst_PROGRAMS = \
 +PROGRAMS = \
    3ds2rib \
-   $(PLAYER)
+-  $(PLAYER)
++  player
  
  
  LDADD = \
@@ -21,7 +22,7 @@ $NetBSD: patch-aa,v 1.1 2003/05/24 09:32:34 salo Exp $
  player_SOURCES = player.c
  player_LDADD = \
 -  $(top_builddir)/lib3ds/lib3ds.a \
-+  -L$(top_builddir)/lib3ds -l3ds \
++  -L$(top_builddir)/lib3ds -l3ds -lGL -lGLU -lX11 -lXi -lXmu -lglut \
    @GLUT_LIBS@ \
    @DMALLOC_LIBS@ -lm
  
@@ -32,7 +33,7 @@ $NetBSD: patch-aa,v 1.1 2003/05/24 09:32:34 salo Exp $
  
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
-@@ -239,6 +238,8 @@
+@@ -239,6 +238,8 @@ check: check-am
  installcheck-am:
  installcheck: installcheck-am
  install-exec-am: