Match the template builtin.mk file in bsd.builtin.mk, and make the two

packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.

6 files changed, 56 insertions, 52 deletions

diff --git a/devel/binutils/builtin.mk b/devel/binutils/builtin.mk
index e3869b1fe13..54ea70ea6a3 100644
--- a/devel/binutils/builtin.mk
+++ b/devel/binutils/builtin.mk
@@ -1,13 +1,8 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:29 jlam Exp $
 
 # XXX Assume that the base OS provides a built-in binutils.
 IS_BUILTIN.binutils?=	yes
 
-CHECK_BUILTIN.binutils?=	no
-.if !empty(CHECK_BUILTIN.binutils:M[yY][eE][sS])
-USE_BUILTIN.binutils=	yes
-.endif
-
 .if !defined(USE_BUILTIN.binutils)
 USE_BUILTIN.binutils?=	${IS_BUILTIN.binutils}
 PREFER.binutils?=	pkgsrc
@@ -35,6 +30,9 @@ USE_BUILTIN.binutils=	no
 .  endfor
 .endif	# USE_BUILTIN.binutils
 
+CHECK_BUILTIN.binutils?=	no
+.if !empty(CHECK_BUILTIN.binutils:M[nN][oO])
+
 .if !empty(USE_BUILTIN.binutils:M[nN][oO])
 AR=	${BUILDLINK_PREFIX.binutils}/bin/ar
 AS=	${BUILDLINK_PREFIX.binutils}/bin/as
@@ -42,3 +40,5 @@ LD=	${BUILDLINK_PREFIX.binutils}/bin/ld
 NM=	${BUILDLINK_PREFIX.binutils}/bin/nm
 RANLIB=	${BUILDLINK_PREFIX.binutils}/bin/ranlib
 .endif
+
+.endif	# CHECK_BUILTIN.binutils
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 722b706b355..3576d21ce69 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.3 2004/03/22 20:57:38 jlam Exp $
+# $NetBSD: builtin.mk,v 1.4 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(_BLNK_LIBINTL_FOUND)
 _BLNK_LIBINTL_FOUND!=	\
@@ -7,7 +7,7 @@ _BLNK_LIBINTL_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBINTL_FOUND=${_BLNK_LIBINTL_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBINTL_FOUND
 .endif
 
 _LIBINTL_H=	/usr/include/libintl.h
@@ -26,16 +26,15 @@ IS_BUILTIN.gettext!=	\
 # XXX Consider the native libintl to be gettext-lib-0.10.35nb1.
 # XXX
 BUILTIN_PKG.gettext=	gettext-lib-0.10.35nb1
-MAKEFLAGS+=		BUILTIN_PKG.gettext=${BUILTIN_PKG.gettext}
+BUILDLINK_VARS+=	BUILTIN_PKG.gettext
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.gettext=${IS_BUILTIN.gettext}
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.gettext
+.endif	# IS_BUILTIN.gettext
 
-CHECK_BUILTIN.gettext?=	no
-.if !empty(CHECK_BUILTIN.gettext:M[yY][eE][sS])
-USE_BUILTIN.gettext=	yes
-.endif
+#.if defined(USE_BUILTIN.iconv) && !empty(USE_BUILTIN.iconv:M[nN][oO])
+#USE_BUILTIN.gettext=	no
+#.endif
 
 .if !defined(USE_BUILTIN.gettext)
 USE_BUILTIN.gettext?=	${IS_BUILTIN.gettext}
@@ -83,6 +82,9 @@ USE_BUILTIN.gettext=	no
 .  endif
 .endif	# USE_BUILTIN.gettext
 
+CHECK_BUILTIN.gettext?=	no
+.if !empty(CHECK_BUILTIN.gettext:M[nN][oO])
+
 .if !empty(USE_BUILTIN.gettext:M[nN][oO])
 _BLNK_LIBINTL=		-lintl
 _GETTEXT_ICONV_DEPENDS=	gettext-lib>=0.11.5nb1
@@ -147,3 +149,5 @@ CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 CONFIGURE_ARGS+=	--without-libintl-prefix
 .  endif
 .endif
+
+.endif	# CHECK_BUILTIN.gettext
diff --git a/devel/libgetopt/builtin.mk b/devel/libgetopt/builtin.mk
index 74615cdb8be..7c43be9e1c5 100644
--- a/devel/libgetopt/builtin.mk
+++ b/devel/libgetopt/builtin.mk
@@ -1,19 +1,17 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(IS_BUILTIN.getopt)
 IS_BUILTIN.getopt=	no
 .  if exists(/usr/include/getopt.h)
 IS_BUILTIN.getopt=	yes
 .  endif
-.endif
-
-CHECK_BUILTIN.getopt?=	no
-.if !empty(CHECK_BUILTIN.getopt:M[yY][eE][sS])
-USE_BUILTIN.getopt=	yes
-.endif
+.endif	# IS_BUILTIN.getopt
 
 USE_BUILTIN.getopt?=	${IS_BUILTIN.getopt}
 
+CHECK_BUILTIN.getopt?=	no
+.if !empty(CHECK_BUILTIN.getopt:M[nN][oO])
+
 .if !empty(USE_BUILTIN.getopt:M[nN][oO])
 LIBGETOPT=	-lgetopt
 .else
@@ -24,3 +22,5 @@ BUILDLINK_LDADD.getopt?=	${LIBGETOPT}
 
 CONFIGURE_ENV+=		LIBGETOPT="${LIBGETOPT}"
 MAKE_ENV+=		LIBGETOPT="${LIBGETOPT}"
+
+.endif	# CHECK_BUILTIN.getopt
diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 0911871ec22..c7607797fd1 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/20 19:28:46 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(_BLNK_LIBNCURSES_FOUND)
 _BLNK_LIBNCURSES_FOUND!=	\
@@ -7,7 +7,7 @@ _BLNK_LIBNCURSES_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBNCURSES_FOUND=${_BLNK_LIBNCURSES_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBNCURSES_FOUND
 .endif
 
 _NCURSES_H=	/usr/include/curses.h
@@ -38,16 +38,11 @@ _NCURSES_VERSION!=							\
 		}							\
 	' ${_NCURSES_H}
 BUILTIN_PKG.ncurses=	ncurses-${_NCURSES_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.ncurses=${BUILTIN_PKG.ncurses}
+BUILDLINK_VARS+=	BUILTIN_PKG.ncurses
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.ncurses=${IS_BUILTIN.ncurses}
-.endif
-
-CHECK_BUILTIN.ncurses?=	no
-.if !empty(CHECK_BUILTIN.ncurses:M[yY][eE][sS])
-USE_BUILTIN.ncurses=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.ncurses
+.endif	# IS_BUILTIN.ncurses
 
 .if !defined(USE_BUILTIN.ncurses)
 USE_BUILTIN.ncurses?=	${IS_BUILTIN.ncurses}
@@ -100,6 +95,9 @@ USE_BUILTIN.ncurses=	no
 .  endif
 .endif	# USE_BUILTIN.ncurses
 
+CHECK_BUILTIN.ncurses?=	no
+.if !empty(CHECK_BUILTIN.ncurses:M[nN][oO])
+
 .if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
 .  if !empty(_BLNK_LIBNCURSES_FOUND:M[nN][oO])
 BUILDLINK_TRANSFORM.ncurses+=	-e "s|/curses\.h|/ncurses.h|g"
@@ -135,3 +133,5 @@ buildlink-ncurses-curses-h:
 			${BUILDLINK_DIR}/include/curses.h;		\
 	fi
 .endif
+
+.endif	# CHECK_BUILTIN.ncurses
diff --git a/devel/readline/builtin.mk b/devel/readline/builtin.mk
index ac9a400c342..72d401b8294 100644
--- a/devel/readline/builtin.mk
+++ b/devel/readline/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/13 18:39:16 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2004/03/29 05:43:30 jlam Exp $
 
 .if !defined(_BLNK_LIBREADLINE_FOUND)
 _BLNK_LIBREADLINE_FOUND!=	\
@@ -7,7 +7,7 @@ _BLNK_LIBREADLINE_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBREADLINE_FOUND=${_BLNK_LIBREADLINE_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBREADLINE_FOUND
 .endif
 
 .if !defined(_BLNK_LIBEDIT_FOUND)
@@ -17,7 +17,7 @@ _BLNK_LIBEDIT_FOUND!=	\
 	else								\
 		${ECHO} "yes";						\
 	fi
-MAKEFLAGS+=	_BLNK_LIBEDIT_FOUND=${_BLNK_LIBEDIT_FOUND}
+BUILDLINK_VARS+=	_BLNK_LIBEDIT_FOUND
 .endif
 
 _READLINE_H=		/usr/include/readline.h
@@ -54,16 +54,11 @@ _READLINE_MINOR!=							\
 		${_READLINE_HEADER}
 _READLINE_VERSION=	${_READLINE_MAJOR}.${_READLINE_MINOR}
 BUILTIN_PKG.readline=	readline-${_READLINE_VERSION}
-MAKEFLAGS+=		BUILTIN_PKG.readline=${BUILTIN_PKG.readline}
+BUILDLINK_VARS+=	BUILTIN_PKG.readline
 .    endif
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.readline=${IS_BUILTIN.readline}
-.endif
-
-CHECK_BUILTIN.readline?=	no
-.if !empty(CHECK_BUILTIN.readline:M[yY][eE][sS])
-USE_BUILTIN.readline=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.readline
+.endif	# IS_BUILTIN.readline
 
 .if !defined(USE_BUILTIN.readline)
 USE_BUILTIN.readline?=	${IS_BUILTIN.readline}
@@ -107,6 +102,9 @@ USE_BUILTIN.readline=	no
 .  endif
 .endif	# USE_BUILTIN.readline
 
+CHECK_BUILTIN.readline?=	no
+.if !empty(CHECK_BUILTIN.readline:M[nN][oO])
+
 .if !empty(USE_BUILTIN.readline:M[yY][eE][sS])
 .  if !empty(_BLNK_LIBREADLINE_FOUND:M[nN][oO]) && \
       !empty(_BLNK_LIBEDIT_FOUND:M[yY][eE][sS])
@@ -114,3 +112,5 @@ BUILDLINK_TRANSFORM+=		l:history:edit
 BUILDLINK_TRANSFORM+=		l:readline:edit:termcap
 .  endif
 .endif
+
+.endif	# CHECK_BUILTIN.readline
diff --git a/devel/zlib/builtin.mk b/devel/zlib/builtin.mk
index 7df7fe471b4..ca90ebdcd28 100644
--- a/devel/zlib/builtin.mk
+++ b/devel/zlib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2004/03/10 17:57:14 jlam Exp $
+# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:30 jlam Exp $
 
 _ZLIB_H=	/usr/include/zlib.h
 
@@ -40,15 +40,10 @@ BUILTIN_PKG.zlib=	zlib-1.1.4nb1
 .        endif
 .      endfor
 .    endif
-MAKEFLAGS+=	BUILTIN_PKG.zlib=${BUILTIN_PKG.zlib}
+BUILDLINK_VARS+=	BUILTIN_PKG.zlib
 .  endif
-MAKEFLAGS+=	IS_BUILTIN.zlib=${IS_BUILTIN.zlib}
-.endif
-
-CHECK_BUILTIN.zlib?=	no
-.if !empty(CHECK_BUILTIN.zlib:M[yY][eE][sS])
-USE_BUILTIN.zlib=	yes
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.zlib
+.endif	# IS_BUILTIN.zlib
 
 .if !defined(USE_BUILTIN.zlib)
 USE_BUILTIN.zlib?=	${IS_BUILTIN.zlib}
@@ -76,6 +71,11 @@ USE_BUILTIN.zlib=	no
 .  endif
 .endif	# USE_BUILTIN.zlib
 
+CHECK_BUILTIN.zlib?=	no
+.if !empty(CHECK_BUILTIN.zlib:M[nN][oO])
+
 .if !empty(USE_BUILTIN.zlib:M[nN][oO])
 BUILDLINK_DEPENDS.zlib+=	zlib>=1.2.1
 .endif
+
+.endif	# CHECK_BUILTIN.zlib