From aa296380db9d918beac8daf3323de19f1f5a5274 Mon Sep 17 00:00:00 2001 From: snj Date: Mon, 26 Apr 2004 05:20:57 +0000 Subject: Convert to buildlink3. --- cad/oregano/Makefile | 10 +++++----- comms/gnome-pilot/Makefile | 14 +++++++------- comms/gnome-pilot/buildlink3.mk | 25 +++++++++++++++++++++++++ graphics/gphoto2/Makefile | 20 ++++++++++---------- misc/gnome-pim/Makefile | 8 ++++---- 5 files changed, 51 insertions(+), 26 deletions(-) create mode 100644 comms/gnome-pilot/buildlink3.mk diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile index b6545ede13d..1582c6a96a3 100644 --- a/cad/oregano/Makefile +++ b/cad/oregano/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.25 2004/04/26 05:20:57 snj Exp $ # DISTNAME= oregano-0.20 @@ -10,7 +10,7 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.dtek.chalmers.se/~d4hult/oregano/ COMMENT= Application for schematic capture/simulation of electrical circuits -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_X11= YES @@ -18,8 +18,8 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -.include "../../devel/libglade/buildlink2.mk" -.include "../../print/gnome-print/buildlink2.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../print/gnome-print/buildlink3.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile index dbe4c68410a..704bdd73022 100644 --- a/comms/gnome-pilot/Makefile +++ b/comms/gnome-pilot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/04/14 16:15:21 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/04/26 05:22:25 snj Exp $ # DISTNAME= gnome-pilot-0.1.71 @@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.gnome-panel= gnome-panel<2.0 GNU_CONFIGURE= YES USE_X11BASE= YES -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_LIBINTL= YES @@ -27,9 +27,9 @@ USE_PERL5= build CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} -.include "../../comms/pilot-link-libs/buildlink2.mk" -.include "../../devel/gettext-lib/buildlink2.mk" -.include "../../devel/libglade/buildlink2.mk" -.include "../../textproc/libxml/buildlink2.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../comms/pilot-link-libs/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk new file mode 100644 index 00000000000..d63bad749e4 --- /dev/null +++ b/comms/gnome-pilot/buildlink3.mk @@ -0,0 +1,25 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/04/26 05:22:25 snj Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GNOME_PILOT_BUILDLINK3_MK:= ${GNOME_PILOT_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= gnome-pilot +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ngnome-pilot} +BUILDLINK_PACKAGES+= gnome-pilot + +.if !empty(GNOME_PILOT_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.gnome-pilot?= gnome-pilot>=0.1.71nb6 +BUILDLINK_RECOMMENDED.gnome-pilot?= gnome-pilot>=0.1.71nb8 +BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot +.endif # GNOME_PILOT_BUILDLINK3_MK + +.include "../../comms/pilot-link-libs/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../devel/libglade/buildlink3.mk" +.include "../../textproc/libxml/buildlink3.mk" +.include "../../x11/gnome-core/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 765e3f9bfb2..fe7e7fd6b06 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2004/02/20 16:06:22 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2004/04/26 05:23:01 snj Exp $ # DISTNAME= gphoto2-2.1.4 @@ -12,7 +12,7 @@ COMMENT= Digital camera access command line client CONFLICTS= gphoto-[0-9]* -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES @@ -27,13 +27,13 @@ CONFIGURE_ARGS+= --with-jpeg-prefix=${BUILDLINK_PREFIX.jpeg} # CONFIGURE_ARGS+= --without-readline #USE_GNU_READLINE= rl_completion_matches, rl_completion_append_character -#.include "../../devel/readline/buildlink2.mk" +#.include "../../devel/readline/buildlink3.mk" -.include "../../devel/cdk/buildlink2.mk" -.include "../../devel/libgphoto2/buildlink2.mk" -.include "../../devel/ncurses/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../devel/popt/buildlink2.mk" -.include "../../graphics/aalib/buildlink2.mk" -.include "../../graphics/jpeg/buildlink2.mk" +.include "../../devel/cdk/buildlink3.mk" +.include "../../devel/libgphoto2/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/pkgconfig/buildlink3.mk" +.include "../../devel/popt/buildlink3.mk" +.include "../../graphics/aalib/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile index cea40ea98c2..407f6198855 100644 --- a/misc/gnome-pim/Makefile +++ b/misc/gnome-pim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/04/14 16:15:25 jmmv Exp $ +# $NetBSD: Makefile,v 1.48 2004/04/26 05:22:32 snj Exp $ DISTNAME= gnome-pim-1.4.6 PKGREVISION= 7 @@ -11,7 +11,7 @@ COMMENT= Personal Information Manager for GNOME BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_DIRS+= gnome1-1.5 USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make @@ -24,6 +24,6 @@ CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV+= LOCALEDIR=${PKGLOCALEDIR} CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} -.include "../../comms/gnome-pilot/buildlink2.mk" -.include "../../x11/gnome-core/buildlink2.mk" +.include "../../comms/gnome-pilot/buildlink3.mk" +.include "../../x11/gnome-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3