buildlink1 -> buildlink2

3 files changed, 35 insertions, 31 deletions

diff --git a/comms/jpilot-expense/Makefile b/comms/jpilot-expense/Makefile
index 46d78334540..8bb726daba8 100644
--- a/comms/jpilot-expense/Makefile
+++ b/comms/jpilot-expense/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/09/10 16:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/21 07:24:04 jlam Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-expense-0.99
@@ -11,23 +11,24 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://jpilot.org/
 COMMENT=		Expense synchronization plugin for J-Pilot
 
-DEPENDS+=		jpilot>=0.99:../../comms/jpilot
+BUILDLINK_DEPMETHOD.jpilot=	full
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 USE_LIBTOOL=		# defined
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_DIR}"
-CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
+CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
 
 PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
 PLIST_SUBST+=		PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///}
 
 post-extract:
 	${RM} -f ${WRKSRC}/../libtool
-	${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool
+	${LN} -sf ${PKGLIBTOOL} ${WRKSRC}/../libtool
+
+.include "../../comms/jpilot/buildlink2.mk"
+.include "../../comms/pilot-link-libs/buildlink2.mk"
 
-.include "../../comms/jpilot/buildlink.mk"
-.include "../../comms/pilot-link-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index c95f95bfdf3..8083a280fac 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/10 16:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2002/09/21 07:25:02 jlam Exp $
 
 DISTNAME=		jpilot-syncmal_0.60
 PKGNAME=		jpilot-syncmal-0.60
@@ -12,28 +12,30 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://people.atl.mediaone.net/jasonday/code/syncmal/syncmal.html
 COMMENT=		MAL synchronization plugin for J-Pilot
 
-DEPENDS+=		jpilot>=0.99:../../comms/jpilot
+BUILDLINK_DEPMETHOD.jpilot=	full
 
-USE_BUILDLINK_ONLY=	# defined
-GNU_CONFIGURE=		# defined
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 USE_GMAKE=		# defined
+
 USE_LIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
-PLIST_SUBST+=		PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///}
-
-CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_DIR}"
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
 CONFIGURE_ARGS+=	--with-mal-source="${WRKSRC}/../malsync"
-CONFIGURE_ARGS+=	--with-plugin-prefix="${BUILDLINK_DIR}/include/jpilot"
-CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+=	--with-plugin-prefix="${BUILDLINK_PREFIX.jpilot}/include/jpilot"
+CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
 
 CFLAGS+=		-D__unix__=1
 
+PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
+PLIST_SUBST+=		PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///}
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR}
 
-.include "../../comms/jpilot/buildlink.mk"
-.include "../../comms/pilot-link-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../comms/jpilot/buildlink2.mk"
+.include "../../comms/pilot-link-libs/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile
index 26ec0d1e7f3..7d9361845f8 100644
--- a/comms/jpilot-synctime/Makefile
+++ b/comms/jpilot-synctime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/10 16:06:35 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/21 07:25:55 jlam Exp $
 
 DISTNAME=		jpilot-0.99
 PKGNAME=		jpilot-synctime-0.99
@@ -11,23 +11,24 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://jpilot.org/
 COMMENT=		Time synchronization plugin for J-Pilot
 
-DEPENDS+=		jpilot>=0.99:../../comms/jpilot
+BUILDLINK_DEPMETHOD.jpilot=	full
 
-USE_BUILDLINK_ONLY=	# defined
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
 USE_LIBTOOL=		# defined
 
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_DIR}"
-CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_DIR}"
+CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
+CONFIGURE_ARGS+=	--with-pilot-prefix="${BUILDLINK_PREFIX.pilot-link-libs}"
 
 PLUGINSDIR=		${PREFIX}/lib/jpilot/plugins
 PLIST_SUBST+=		PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///}
 
 post-extract:
 	${RM} -f ${WRKSRC}/../libtool
-	${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool
+	${LN} -sf ${PKGLIBTOOL} ${WRKSRC}/../libtool
+
+.include "../../comms/jpilot/buildlink2.mk"
+.include "../../comms/pilot-link-libs/buildlink2.mk"
 
-.include "../../comms/jpilot/buildlink.mk"
-.include "../../comms/pilot-link-libs/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"