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/21326d4e1040
branches: trunk
changeset: 474762:21326d4e1040
user: snj <snj%pkgsrc.org@localhost>
date: Wed May 05 03:36:22 2004 +0000
description:
Convert to buildlink3.
diffstat:
devel/SDL/buildlink2.mk | 30 ----------------
graphics/3DKit/Makefile | 10 ++--
graphics/3DKit/Makefile.common | 4 +-
graphics/GLXKit/Makefile | 6 +-
graphics/GLXKit/buildlink2.mk | 29 ----------------
graphics/GLXKit/buildlink3.mk | 21 +++++++++++
graphics/GeometryKit/Makefile | 6 +-
graphics/GeometryKit/buildlink2.mk | 58 --------------------------------
graphics/GeometryKit/buildlink3.mk | 21 +++++++++++
graphics/GlutKit/Makefile | 10 ++--
graphics/GlutKit/buildlink2.mk | 30 ----------------
graphics/GlutKit/buildlink3.mk | 23 ++++++++++++
graphics/RenderKit/Makefile | 8 ++--
graphics/RenderKit/buildlink2.mk | 68 --------------------------------------
graphics/RenderKit/buildlink3.mk | 22 ++++++++++++
graphics/SDLKit/Makefile | 10 ++--
graphics/SDLKit/buildlink2.mk | 30 ----------------
graphics/SDLKit/buildlink3.mk | 22 ++++++++++++
18 files changed, 136 insertions(+), 272 deletions(-)
diffs (truncated from 538 to 300 lines):
diff -r 9b826d7a00d8 -r 21326d4e1040 devel/SDL/buildlink2.mk
--- a/devel/SDL/buildlink2.mk Wed May 05 03:32:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/03/23 04:37:38 snj Exp $
-
-.if !defined(SDL_BUILDLINK2_MK)
-SDL_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= SDL
-BUILDLINK_DEPENDS.SDL?= SDL>=1.2.5nb5
-BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.SDL=SDL
-BUILDLINK_PREFIX.SDL_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.SDL= include/SDL/*
-BUILDLINK_FILES.SDL+= lib/libSDL.*
-BUILDLINK_FILES.SDL+= lib/libSDLmain.*
-
-USE_X11= YES
-
-.include "../../mk/bsd.prefs.mk"
-
-PTHREAD_OPTS+= require
-
-.include "../../graphics/Mesa/buildlink2.mk"
-.include "../../graphics/aalib-x11/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
-
-BUILDLINK_TARGETS+= SDL-buildlink
-
-SDL-buildlink: _BUILDLINK_USE
-
-.endif # SDL_BUILDLINK2_MK
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/3DKit/Makefile
--- a/graphics/3DKit/Makefile Wed May 05 03:32:05 2004 +0000
+++ b/graphics/3DKit/Makefile Wed May 05 03:36:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/05/05 03:36:22 snj Exp $
#
.include "../../graphics/3DKit/Makefile.common"
@@ -17,8 +17,8 @@
${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \
${PREFIX}/share/doc/3DKit
-.include "../../graphics/GlutKit/buildlink2.mk"
-.include "../../graphics/GLXKit/buildlink2.mk"
-.include "../../graphics/SDLKit/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/GlutKit/buildlink3.mk"
+.include "../../graphics/GLXKit/buildlink3.mk"
+.include "../../graphics/SDLKit/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/3DKit/Makefile.common
--- a/graphics/3DKit/Makefile.common Wed May 05 03:32:05 2004 +0000
+++ b/graphics/3DKit/Makefile.common Wed May 05 03:36:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/01/24 15:46:42 grant Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/05/05 03:36:22 snj Exp $
#
DISTNAME= 3DKit-0.3.1r2
@@ -14,7 +14,7 @@
DESCR_SRC?= ${.CURDIR}/../../graphics/3DKit/DESCR
NO_CONFIGURE= YES
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
USE_X11= YES
MAKEFILE= GNUmakefile
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GLXKit/Makefile
--- a/graphics/GLXKit/Makefile Wed May 05 03:32:05 2004 +0000
+++ b/graphics/GLXKit/Makefile Wed May 05 03:36:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/05 03:36:22 snj Exp $
#
.include "../../graphics/3DKit/Makefile.common"
@@ -11,6 +11,6 @@
DISTINFO_FILE= ${.CURDIR}/distinfo
WRKSRC= ${WRKDIR}/${DISTNAME}/GLXKit
-.include "../../graphics/RenderKit/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/RenderKit/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GLXKit/buildlink2.mk
--- a/graphics/GLXKit/buildlink2.mk Wed May 05 03:32:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GLXKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GLXKIT_BUILDLINK2_MK)
-GLXKIT_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= GLXKit
-BUILDLINK_DEPENDS.GLXKit?= GLXKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GLXKit?= GLXKit>=0.3.1r2nb5
-BUILDLINK_PKGSRCDIR.GLXKit?= ../../graphics/GLXKit
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.GLXKit=GLXKit
-BUILDLINK_PREFIX.GLXKit_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.GLXKit+= share/GNUstep/Local/Headers/GLXKit/G3DGLXCamera.h
-BUILDLINK_FILES.GLXKit+= share/GNUstep/Local/Headers/GLXKit/G3DGLXKit.h
-BUILDLINK_FILES.GLXKit+= share/GNUstep/Local/Headers/GLXKit/G3DXEventHandler.h
-BUILDLINK_FILES.GLXKit+= share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGLXKit.*
-
-.include "../../graphics/RenderKit/buildlink2.mk"
-
-BUILDLINK_TARGETS+= GLXKit-buildlink
-
-GLXKit-buildlink: _BUILDLINK_USE
-
-.endif # GLXKIT_BUILDLINK2_MK
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GLXKit/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/GLXKit/buildlink3.mk Wed May 05 03:36:22 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:23 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+GLXKIT_BUILDLINK3_MK:= ${GLXKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= GLXKit
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGLXKit}
+BUILDLINK_PACKAGES+= GLXKit
+
+.if !empty(GLXKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GLXKit+= GLXKit>=0.3.1r2nb3
+BUILDLINK_RECOMMENDED.GLXKit?= GLXKit>=0.3.1r2nb5
+BUILDLINK_PKGSRCDIR.GLXKit?= ../../graphics/GLXKit
+.endif # GLXKIT_BUILDLINK3_MK
+
+.include "../../graphics/RenderKit/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GeometryKit/Makefile
--- a/graphics/GeometryKit/Makefile Wed May 05 03:32:05 2004 +0000
+++ b/graphics/GeometryKit/Makefile Wed May 05 03:36:22 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/05/05 03:36:23 snj Exp $
#
.include "../../graphics/3DKit/Makefile.common"
@@ -10,6 +10,6 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/3DKit/GeometryKit
-.include "../../x11/gnustep-back/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../x11/gnustep-back/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GeometryKit/buildlink2.mk
--- a/graphics/GeometryKit/buildlink2.mk Wed May 05 03:32:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GeometryKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GEOMETRYKIT_BUILDLINK2_MK)
-GEOMETRYKIT_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= GeometryKit
-BUILDLINK_DEPENDS.GeometryKit?= GeometryKit>=0.3.1r2nb3
-BUILDLINK_RECOMMENDED.GeometryKit?= GeometryKit>=0.3.1r2nb5
-BUILDLINK_PKGSRCDIR.GeometryKit?= ../../graphics/GeometryKit
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.GeometryKit=GeometryKit
-BUILDLINK_PREFIX.GeometryKit_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DBezier.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DBox.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DDefs.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DFunctions.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DIntersecting.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DLine.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DMatrix.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DMatrix3d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DMatrix3f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DMatrix4d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DMatrix4f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DMatrixFunc.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DPlane.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DQuatFunc.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DQuaternion.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DSphere.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTrigonometry.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTuple2d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTuple2f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTuple3d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTuple3f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTuple4d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DTuple4f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector2d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector2f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector3d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector3f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector4d.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVector4f.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/G3DVectorFunc.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Headers/GeometryKit/GeometryKit.h
-BUILDLINK_FILES.GeometryKit+= share/GNUstep/Local/Libraries/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}${APPEND_ELF}/gnu-gnu-gnu/libGeometryKit.*
-
-.include "../../x11/gnustep-back/buildlink2.mk"
-
-BUILDLINK_TARGETS+= GeometryKit-buildlink
-
-GeometryKit-buildlink: _BUILDLINK_USE
-
-.endif # GEOMETRYKIT_BUILDLINK2_MK
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GeometryKit/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/GeometryKit/buildlink3.mk Wed May 05 03:36:22 2004 +0000
@@ -0,0 +1,21 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/05 03:36:24 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+GEOMETRYKIT_BUILDLINK3_MK:= ${GEOMETRYKIT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= GeometryKit
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:NGeometryKit}
+BUILDLINK_PACKAGES+= GeometryKit
+
+.if !empty(GEOMETRYKIT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.GeometryKit+= GeometryKit>=0.3.1r2nb3
+BUILDLINK_RECOMMENDED.GeometryKit?= GeometryKit>=0.3.1r2nb5
+BUILDLINK_PKGSRCDIR.GeometryKit?= ../../graphics/GeometryKit
+.endif # GEOMETRYKIT_BUILDLINK3_MK
+
+.include "../../x11/gnustep-back/buildlink3.mk"
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GlutKit/Makefile
--- a/graphics/GlutKit/Makefile Wed May 05 03:32:05 2004 +0000
+++ b/graphics/GlutKit/Makefile Wed May 05 03:36:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:40 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/05 03:36:24 snj Exp $
#
.include "../../graphics/3DKit/Makefile.common"
@@ -12,8 +12,8 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/GlutKit
-.include "../../graphics/RenderKit/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../graphics/RenderKit/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 9b826d7a00d8 -r 21326d4e1040 graphics/GlutKit/buildlink2.mk
--- a/graphics/GlutKit/buildlink2.mk Wed May 05 03:32:05 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.5 2004/03/26 02:27:40 wiz Exp $
-#
-# This Makefile fragment is included by packages that use GlutKit.
-#
-# This file was created automatically using createbuildlink 2.1.
-#
-
-.if !defined(GLUTKIT_BUILDLINK2_MK)
-GLUTKIT_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= GlutKit
-BUILDLINK_DEPENDS.GlutKit?= GlutKit>=0.3.1r2nb4
-BUILDLINK_RECOMMENDED.GlutKit?= GlutKit>=0.3.1r2nb6
-BUILDLINK_PKGSRCDIR.GlutKit?= ../../graphics/GlutKit
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.GlutKit=GlutKit
-BUILDLINK_PREFIX.GlutKit_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.GlutKit+= share/GNUstep/Local/Headers/GlutKit/G3DGlutCamera.h
-BUILDLINK_FILES.GlutKit+= share/GNUstep/Local/Headers/GlutKit/G3DGlutKit.h
Home |
Main Index |
Thread Index |
Old Index