summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/tasp-vsipl/Makefile3
-rw-r--r--math/tasp-vsipl/buildlink2.mk24
-rw-r--r--math/tasp-vsipl/buildlink3.mk18
-rw-r--r--x11/xvattr/Makefile6
-rw-r--r--x11/xview-config/Makefile4
-rw-r--r--x11/xview-lib/Makefile4
-rw-r--r--x11/xview-lib/buildlink3.mk18
7 files changed, 45 insertions, 32 deletions
diff --git a/math/tasp-vsipl/Makefile b/math/tasp-vsipl/Makefile
index 5db8088b853..b1e119b8588 100644
--- a/math/tasp-vsipl/Makefile
+++ b/math/tasp-vsipl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:48:13 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/04/13 21:52:36 snj Exp $
DISTNAME= tvcpp0p8
PKGNAME= tasp-vsipl-20030710
@@ -12,6 +12,7 @@ COMMENT= Vector Signal Image Processing Library
WRKSRC= ${WRKDIR}/${DISTNAME}/lib
DIST_SUBDIR= tasp-vsipl
+USE_BUILDLINK3= yes
USE_X11= yes
post-extract:
diff --git a/math/tasp-vsipl/buildlink2.mk b/math/tasp-vsipl/buildlink2.mk
deleted file mode 100644
index 72082d482e5..00000000000
--- a/math/tasp-vsipl/buildlink2.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/07/10 12:43:09 jtb Exp $
-
-.if !defined(TASP_VSIPL_BUILDLINK2_MK)
-TASP_VSIPL_BUILDLINK2_MK= # defined
-
-BUILDLINK_PACKAGES+= tasp-vsipl
-BUILDLINK_DEPENDS.tasp-vsipl?= tasp-vsipl>=20030710
-BUILDLINK_PKGSRCDIR.tasp-vsipl?= ../../math/tasp-vsipl
-BUILDLINK_DEPMETHOD.tasp-vsipl?= build
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.tasp-vsipl=tasp-vsipl
-BUILDLINK_PREFIX.tasp-vsipl_DEFAULT= ${LOCALBASE}
-BUILDLINK_FILES.tasp-vsipl= include/VU.h
-BUILDLINK_FILES.tasp-vsipl+= include/VUX.h
-BUILDLINK_FILES.tasp-vsipl+= include/vsipl.h
-BUILDLINK_FILES.tasp-vsipl+= lib/libVU.*
-BUILDLINK_FILES.tasp-vsipl+= lib/libVUX.*
-BUILDLINK_FILES.tasp-vsipl+= lib/libvsip.*
-
-BUILDLINK_TARGETS+= tasp-vsipl-buildlink
-
-tasp-vsipl-buildlink: _BUILDLINK_USE
-
-.endif # TASP_VSIPL_BUILDLINK2_MK
diff --git a/math/tasp-vsipl/buildlink3.mk b/math/tasp-vsipl/buildlink3.mk
new file mode 100644
index 00000000000..9b33dd18806
--- /dev/null
+++ b/math/tasp-vsipl/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/13 21:52:36 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+TASP_VSIPL_BUILDLINK3_MK:= ${TASP_VSIPL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= tasp-vsipl
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ntasp-vsipl}
+BUILDLINK_PACKAGES+= tasp-vsipl
+
+.if !empty(TASP_VSIPL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tasp-vsipl+= tasp-vsipl>=20030710
+BUILDLINK_PKGSRCDIR.tasp-vsipl?= ../../math/tasp-vsipl
+.endif # TASP_VSIPL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 2ab473a6409..0552af1af54 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:57:04 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/04/13 21:47:22 snj Exp $
DISTNAME= xvattr-1.3
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= veego@NetBSD.org
HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/
COMMENT= Modify Xv attributes
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_X11= # defined
GNU_CONFIGURE= # defined
@@ -19,5 +19,5 @@ GNU_CONFIGURE= # defined
PKG_FAIL_REASON= "${PKGNAME} requires libXv.a"
.endif
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xview-config/Makefile b/x11/xview-config/Makefile
index 9f1a0ac3947..32bfde07936 100644
--- a/x11/xview-config/Makefile
+++ b/x11/xview-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/20 12:28:29 agc Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/13 21:49:58 snj Exp $
# $FreeBSD Id: Makefile,v 1.9 1998/05/04 03:34:50 steve Exp
#
@@ -16,7 +16,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
EXTRACT_ELEMENTS= ${DISTNAME}/config
WRKSRC= ${WRKDIR}/${EXTRACT_ELEMENTS}
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_IMAKE= # defined
post-extract:
diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index 8352bdb9ac5..1007986effb 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/07/17 22:57:06 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/04/13 21:55:23 snj Exp $
# $FreeBSD Id: Makefile,v 1.13 1997/07/17 15:13:03 max Exp
#
@@ -17,7 +17,7 @@ NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
# builds, but binaries in../xview-clients all crash
NOT_FOR_PLATFORM= *-*-alpha
-USE_BUILDLINK2= # defined
+USE_BUILDLINK3= yes
USE_IMAKE= # defined
post-install:
diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk
new file mode 100644
index 00000000000..8ba3e0e80af
--- /dev/null
+++ b/x11/xview-lib/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/13 21:55:23 snj Exp $
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
+XVIEW_LIB_BUILDLINK3_MK:= ${XVIEW_LIB_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+= xview-lib
+.endif
+
+BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxview-lib}
+BUILDLINK_PACKAGES+= xview-lib
+
+.if !empty(XVIEW_LIB_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.xview-lib+= xview-lib>=3.2.1
+BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib
+.endif # XVIEW_LIB_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}