Convert to buildlink3.

3 files changed, 37 insertions, 19 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index a8bd46925fa..0c5de596f13 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/04/14 19:30:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.40 2004/05/03 15:58:55 wiz Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -25,26 +25,20 @@ CONFIGURE_ARGS=		--disable-gnumeric
 PLIST_SUBST+=		GNUMERIC="@comment "
 .endif
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
+USE_X11=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
-post-install:
-	${TEST} ${PREFIX} = ${LOCALBASE} || \
-	${LN} -fs ${PREFIX}/share/aclocal/libguppi.m4 \
-		${LOCALBASE}/share/aclocal/libguppi.m4
-
-.include "../../devel/bonobo/buildlink2.mk"
-.include "../../devel/gal/buildlink2.mk"
-.include "../../devel/libglade/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
-.include "../../print/gnome-print/buildlink2.mk"
-.include "../../x11/gnome-libs/buildlink2.mk"
+.include "../../devel/bonobo/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/guppi/PLIST b/math/guppi/PLIST
index 64dfaf4e414..b3f596c1459 100644
--- a/math/guppi/PLIST
+++ b/math/guppi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2003/06/27 19:53:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2004/05/03 15:58:55 wiz Exp $
 ${GNUMERIC}bin/guppi-gnumeric
 include/gnome-1.0/libguppi/gnan.h
 include/gnome-1.0/libguppi/guppi-2d.h
@@ -318,8 +318,6 @@ share/pixmaps/guppi/resize-to-win.png
 share/pixmaps/guppi/scatter.xpm
 share/pixmaps/guppi/stock.xpm
 share/pixmaps/guppi/surface.xpm
-@unexec test %D = ${LOCALBASE} || ${RM} -f ${LOCALBASE}/share/aclocal/libguppi.m4
-@exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/libguppi.m4 ${LOCALBASE}/share/aclocal/libguppi.m4
 @exec ${MKDIR} %D/share/gnome/help/guppi/C/images
 @dirrm share/pixmaps/guppi
 ${GNUMERIC}@dirrm share/guppi/scripts
diff --git a/math/guppi/buildlink3.mk b/math/guppi/buildlink3.mk
new file mode 100644
index 00000000000..ac4bc2e290a
--- /dev/null
+++ b/math/guppi/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:58:55 wiz Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GUPPI_BUILDLINK3_MK:=	${GUPPI_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	guppi
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nguppi}
+BUILDLINK_PACKAGES+=	guppi
+
+.if !empty(GUPPI_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.guppi+=	guppi>=0.40.3nb8
+BUILDLINK_PKGSRCDIR.guppi?=	../../math/guppi
+.endif	# GUPPI_BUILDLINK3_MK
+
+.include "../../devel/bonobo/buildlink3.mk"
+.include "../../devel/gal/buildlink3.mk"
+.include "../../devel/libglade/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/guile14/buildlink3.mk"
+.include "../../print/gnome-print/buildlink3.mk"
+.include "../../x11/gnome-libs/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}