buildlink1 -> buildlink2

6 files changed, 75 insertions, 61 deletions

diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index 018fbc9c213..c87065d2f8e 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2002/06/12 04:35:15 sakamoto Exp $
+# $NetBSD: Makefile,v 1.10 2002/09/21 11:56:47 jlam Exp $
 
 DISTNAME=	xemacs-21.5.5
 CATEGORIES=	editors
@@ -10,73 +10,76 @@ MAINTAINER=	magick@netbsd.org
 HOMEPAGE=	http://www.xemacs.org/
 COMMENT=	*BETA* XEmacs text editor version 21.5.5
 
+USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_BUILDLINK_ONLY=	YES
-HAS_CONFIGURE=	YES
 
 PLIST_SUBST+=	EMACSVER=xemacs-21.5-b5
 MESSAGE_SUBST+=	EMACSVER=xemacs-21.5-b5
 
 .if (${MACHINE_ARCH} == "arm32")
-.include "../../lang/gcc/Makefile.gcc"
+.  include "../../lang/gcc/Makefile.gcc"
 .endif
 
 .include "../../mk/bsd.prefs.mk"
 
-XEMACS_WIDGETS?= lucid
-.if ${XEMACS_WIDGETS} == gtk
-.include "../../x11/gtk/buildlink.mk"
+XEMACS_WIDGETS?=	lucid
+.if ${XEMACS_WIDGETS} == "gtk"
+.  include "../../x11/gtk/buildlink2.mk"
 WITH_WIDGETS=	--with-gtk
-.elif ${XEMACS_WIDGETS} == gnome
-.include "../../x11/gnome-libs/buildlink.mk"
+.elif ${XEMACS_WIDGETS} == "gnome"
+.  include "../../x11/gnome-libs/buildlink2.mk"
 WITH_WIDGETS=	--with-gnome
-.elif ${XEMACS_WIDGETS} == motif
-.include "../../mk/motif.buildlink.mk"
+.elif ${XEMACS_WIDGETS} == "motif"
+.  include "../../mk/motif.buildlink2.mk"
 .else
-USE_XAW=	YES
+.  include "../../mk/xaw.buildlink2.mk"
 WITH_WIDGETS=	--with-widgets=lucid
 .endif
 
-.if defined(XEMACS_ESD) && ${XEMACS_ESD} == YES
-.include "../../audio/esound/buildlink.mk"
+.if defined(XEMACS_ESD) && (${XEMACS_ESD} == "YES")
+.  include "../../audio/esound/buildlink2.mk"
 .endif
 
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
-WITH_LDAP=	--with-ldap=yes
-.include "../../databases/openldap/buildlink.mk"
+.if defined(USE_LDAP) && (${USE_LDAP} == "YES")
+WITH_LDAP=	--with-ldap
+.  include "../../databases/openldap/buildlink2.mk"
 .else
-WITH_LDAP=	--with-ldap=no
+WITH_LDAP=	--without-ldap
 .endif
 
-.if defined(USE_XFACE) && ${USE_XFACE} == YES
-.include "../../mail/faces/buildlink.mk"
-WITH_XFACE=	--with-xface=yes
+.if defined(USE_XFACE) && (${USE_XFACE} == "YES")
+.  include "../../mail/faces/buildlink2.mk"
+WITH_XFACE=	--with-xface
 .else
-WITH_XFACE=	--with-xface=no
+WITH_XFACE=	--without-xface
 .endif
 
-.if defined(EMACS_CANNA) && ${EMACS_CANNA} == YES
-.include "../../inputmethod/canna-lib/buildlink.mk"
-WITH_CANNA=	--with-canna=yes
+.if defined(EMACS_CANNA) && (${EMACS_CANNA} == "YES")
+.  include "../../inputmethod/canna-lib/buildlink2.mk"
+WITH_CANNA=	--with-canna
 .else
-WITH_CANNA=	--with-canna=no
+WITH_CANNA=	--without-canna
 .endif
 
-.include "../../databases/gdbm/buildlink.mk"
-.include "../../graphics/jpeg/buildlink.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../graphics/tiff/buildlink.mk"
-
-CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM} --prefix=${PREFIX} \
-			--with-clash-detection --with-mule=yes \
-			--with-ncurses=no ${WITH_WIDGETS} \
-			${WITH_LDAP} ${WITH_XFACE} \
-			${WITH_CANNA} \
-			--infopath="${PREFIX}/info:${X11BASE}/info:/usr/local/info" \
-			--site-includes=${PREFIX}/include:${WRKDIR} \
-			--site-libraries=${PREFIX}/lib \
-			--error-checking=none \
-			--with-msw=no
+.include "../../databases/gdbm/buildlink2.mk"
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/png/buildlink2.mk"
+.include "../../graphics/tiff/buildlink2.mk"
+
+INFOPATH=	${PREFIX}/info:${X11BASE}/info:/usr/local/info
+
+HAS_CONFIGURE=		YES
+CONFIGURE_ARGS+=	${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--with-clash-detection
+CONFIGURE_ARGS+=	--error-checking=none
+CONFIGURE_ARGS+=	--with-mule=yes
+CONFIGURE_ARGS+=	--without-ncurses
+CONFIGURE_ARGS+=	--without-msw
+CONFIGURE_ARGS+=	${WITH_WIDGETS} ${WITH_LDAP} ${WITH_XFACE} ${WITH_CANNA}
+CONFIGURE_ARGS+=	--infopath="${INFOPATH}"
+CONFIGURE_ARGS+=	--site-includes=${PREFIX}/include:${WRKDIR}
+CONFIGURE_ARGS+=	--site-libraries=${PREFIX}/lib
 
 CFLAGS+=		-Dunix
 MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
@@ -84,5 +87,4 @@ MAKE_ENV+=		INSTALL_MAN="${INSTALL_MAN}"
 post-patch:
 	@${RM} -f ${WRKSRC}/etc/ctags.1.orig
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xjed/Makefile b/editors/xjed/Makefile
index 18733810ac2..e7d3c37a57c 100644
--- a/editors/xjed/Makefile
+++ b/editors/xjed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/07 12:04:34 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 12:02:50 jlam Exp $
 #
 
 DISTNAME=		jed-B0.99-15
@@ -11,7 +11,9 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://space.mit.edu/~davis/jed.html
 COMMENT=		X11-based text editor, extensible through S-Lang functions
 
-GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		# defined
+USE_X11=		# defined
+GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-x
 
 WRKSRC=			${WRKDIR}/jed-B0.99-15
@@ -25,6 +27,5 @@ post-install:
 	${RM} -f ${PREFIX}/share/xjed/doc/jed.1 ${PREFIX}/share/xjed/doc/rgrep.1
 	${RMDIR} ${PREFIX}/share/xjed/bin
 
-.include "../../devel/libslang/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../devel/libslang/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/xjed/distinfo b/editors/xjed/distinfo
index c9e18db1d59..7ec57115965 100644
--- a/editors/xjed/distinfo
+++ b/editors/xjed/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/23 14:26:54 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/09/21 12:02:50 jlam Exp $
 
 SHA1 (jed-B0.99-15.tar.gz) = dfcb1b5ea0330666e919a83a3ebf01b4444d2e07
 Size (jed-B0.99-15.tar.gz) = 833835 bytes
-SHA1 (patch-aa) = da67943003ac6e23763ce35a19bd95b9d3d8fb71
+SHA1 (patch-aa) = 0436416e5a51a8293c00ed964c239222ab48c140
 SHA1 (patch-ab) = 430976979d57e25ec924bfa9870bb8d035828a83
diff --git a/editors/xjed/patches/patch-aa b/editors/xjed/patches/patch-aa
index a746f5b359b..293a689bf75 100644
--- a/editors/xjed/patches/patch-aa
+++ b/editors/xjed/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/23 14:26:54 agc Exp $
+$NetBSD: patch-aa,v 1.2 2002/09/21 12:02:50 jlam Exp $
 
 --- configure.orig	Tue Oct  9 10:15:13 2001
 +++ configure	Tue Oct  9 10:16:30 2001
@@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/23 14:26:54 agc Exp $
  
  echo $ac_n "checking for Terminfo""... $ac_c" 1>&6
  echo "configure:2583: checking for Terminfo" >&5
-@@ -2623,6 +2623,7 @@
- test "x$exec" = "xNONE" && exec="$ac_default_prefix"
- test "x$exec_prefix" = "xNONE" && exec_prefix="$prefix"
- JD_Search_Dirs="$JD_Search_Dirs \
-+		/usr/pkg/include,/usr/pkg/lib
-                 $includedir,$libdir \
-                 /usr/local/include,/usr/local/lib \
- 		/usr/include,/usr/lib \
diff --git a/graphics/compface/Makefile b/graphics/compface/Makefile
index c8e87b34f20..6d33db62c9e 100644
--- a/graphics/compface/Makefile
+++ b/graphics/compface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/19 01:13:52 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2002/09/21 12:03:28 jlam Exp $
 
 DISTNAME=	compface-1.4
 CATEGORIES=	graphics
@@ -8,8 +8,8 @@ MAINTAINER=	oishi@ims.ac.jp
 HOMEPAGE=	http://freshmeat.net/projects/compface/
 COMMENT=	48x48x1 image compression and decompression (X-face utility)
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-CONFIGURE_ARGS+=--prefix=${LOCALBASE}
+USE_BUILDLINK2=		# defined
+GNU_CONFIGURE=		# defined
+USE_GMAKE=		# defined
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/compface/buildlink2.mk b/graphics/compface/buildlink2.mk
new file mode 100644
index 00000000000..78f0ab8e0f9
--- /dev/null
+++ b/graphics/compface/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.1 2002/09/21 12:03:28 jlam Exp $
+
+.if !defined(COMPFACE_BUILDLINK2_MK)
+COMPFACE_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		compface
+BUILDLINK_DEPENDS.compface?=	compface>=1.4
+BUILDLINK_PKGSRCDIR.compface?=	../../graphics/compface
+
+EVAL_PREFIX+=		BUILDLINK_PREFIX.compface=compface
+BUILDLINK_PREFIX.compface_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.compface+=	include/compface.h
+BUILDLINK_FILES.compface+=	lib/libcompface.*
+
+BUILDLINK_TARGETS+=	compface-buildlink
+
+compface-buildlink: _BUILDLINK_USE
+
+.endif	# COMPFACE_BUILDLINK2_MK