pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Convert to buildlink3.
details: https://anonhg.NetBSD.org/pkgsrc/rev/f4d550884dcc
branches: trunk
changeset: 473806:f4d550884dcc
user: snj <snj%pkgsrc.org@localhost>
date: Sat Apr 24 20:51:46 2004 +0000
description:
Convert to buildlink3.
diffstat:
games/boson/Makefile | 15 ++++++++-------
graphics/lib3ds/Makefile | 7 ++++---
graphics/lib3ds/buildlink3.mk | 20 ++++++++++++++++++++
graphics/lib3ds/distinfo | 4 ++--
graphics/lib3ds/patches/patch-aa | 15 ++++++++-------
5 files changed, 42 insertions(+), 19 deletions(-)
diffs (138 lines):
diff -r 56569b65b17c -r f4d550884dcc games/boson/Makefile
--- a/games/boson/Makefile Sat Apr 24 20:39:20 2004 +0000
+++ b/games/boson/Makefile Sat Apr 24 20:51:46 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/24 20:52:02 snj Exp $
#
DISTNAME= boson-all-0.8
@@ -14,7 +14,7 @@
BUILD_USES_MSGFMT= yes
-USE_BUILDLINK2= yes
+USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_X11= yes
@@ -23,9 +23,10 @@
CONFIGURE_ARGS+= --disable-debug
-.include "../../audio/libvorbis/buildlink2.mk"
-.include "../../devel/SDL/buildlink2.mk"
-.include "../../games/kdegames3/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/lib3ds/buildlink2.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../games/kdegames3/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/lib3ds/buildlink3.mk"
+.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 56569b65b17c -r f4d550884dcc graphics/lib3ds/Makefile
--- a/graphics/lib3ds/Makefile Sat Apr 24 20:39:20 2004 +0000
+++ b/graphics/lib3ds/Makefile Sat Apr 24 20:51:46 2004 +0000
@@ -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 @@
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 -r 56569b65b17c -r f4d550884dcc graphics/lib3ds/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/lib3ds/buildlink3.mk Sat Apr 24 20:51:46 2004 +0000
@@ -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 -r 56569b65b17c -r f4d550884dcc graphics/lib3ds/distinfo
--- a/graphics/lib3ds/distinfo Sat Apr 24 20:39:20 2004 +0000
+++ b/graphics/lib3ds/distinfo Sat Apr 24 20:51:46 2004 +0000
@@ -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 -r 56569b65b17c -r f4d550884dcc graphics/lib3ds/patches/patch-aa
--- a/graphics/lib3ds/patches/patch-aa Sat Apr 24 20:39:20 2004 +0000
+++ b/graphics/lib3ds/patches/patch-aa Sat Apr 24 20:51:46 2004 +0000
@@ -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 @@
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 @@
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:
Home |
Main Index |
Thread Index |
Old Index