pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Match the template builtin.mk file in bsd.builtin.mk, ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7455e3905633
branches: trunk
changeset: 471556:7455e3905633
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Mar 29 05:43:28 2004 +0000
description:
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.
diffstat:
archivers/bzip2/builtin.mk | 11 +++--------
converters/libiconv/builtin.mk | 18 +++++++++---------
devel/binutils/builtin.mk | 12 ++++++------
devel/gettext-lib/builtin.mk | 22 +++++++++++++---------
devel/libgetopt/builtin.mk | 14 +++++++-------
devel/ncurses/builtin.mk | 20 ++++++++++----------
devel/readline/builtin.mk | 22 +++++++++++-----------
devel/zlib/builtin.mk | 18 +++++++++---------
fonts/Xft2/builtin.mk | 23 +++++++++++++++--------
fonts/fontconfig/builtin.mk | 24 +++++++++++++++++-------
graphics/MesaLib/builtin.mk | 18 +++++++++---------
graphics/freetype2/builtin.mk | 18 +++++++++---------
graphics/glu/builtin.mk | 18 +++++++++++-------
graphics/xpm/Makefile | 3 +--
graphics/xpm/builtin.mk | 13 ++++---------
net/libpcap/builtin.mk | 9 ++-------
pkgtools/x11-links/xfree.mk | 21 ++++++++++++---------
security/PAM/builtin.mk | 9 ++-------
security/heimdal/builtin.mk | 14 +++++++-------
security/tcp_wrappers/builtin.mk | 9 ++-------
textproc/expat/builtin.mk | 18 +++++++++---------
x11/Xrandr-mixedcase/builtin.mk | 23 +++++++++++++++--------
x11/Xrender/builtin.mk | 22 +++++++++++++---------
x11/randrext/builtin.mk | 18 +++++++++---------
x11/render/builtin.mk | 18 +++++++++---------
x11/xcursor/builtin.mk | 21 ++++++++++++++-------
26 files changed, 228 insertions(+), 208 deletions(-)
diffs (truncated from 1085 to 300 lines):
diff -r 672b2fef29b6 -r 7455e3905633 archivers/bzip2/builtin.mk
--- a/archivers/bzip2/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/archivers/bzip2/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -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:28 jlam Exp $
.if !defined(IS_BUILTIN.bzip2)
IS_BUILTIN.bzip2= no
@@ -10,13 +10,8 @@
${ECHO} "no"; \
fi
. endif
-MAKEFLAGS+= IS_BUILTIN.bzip2=${IS_BUILTIN.bzip2}
-.endif
-
-CHECK_BUILTIN.bzip2?= no
-.if !empty(CHECK_BUILTIN.bzip2:M[yY][eE][sS])
-USE_BUILTIN.bzip2= yes
-.endif
+BUILDLINK_VARS+= IS_BUILTIN.bzip2
+.endif # IS_BUILTIN.bzip2
.if !defined(USE_BUILTIN.bzip2)
USE_BUILTIN.bzip2?= ${IS_BUILTIN.bzip2}
diff -r 672b2fef29b6 -r 7455e3905633 converters/libiconv/builtin.mk
--- a/converters/libiconv/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/converters/libiconv/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -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:28 jlam Exp $
.if !defined(_LIBICONV_FOUND)
_LIBICONV_FOUND!= \
@@ -7,7 +7,7 @@
else \
${ECHO} "yes"; \
fi
-MAKEFLAGS+= _LIBICONV_FOUND=${_LIBICONV_FOUND}
+BUILDLINK_VARS+= _LIBICONV_FOUND
.endif
_ICONV_H= /usr/include/iconv.h
@@ -17,12 +17,7 @@
. if exists(${_ICONV_H})
IS_BUILTIN.iconv= yes
. endif
-.endif
-
-CHECK_BUILTIN.iconv?= no
-.if !empty(CHECK_BUILTIN.iconv:M[yY][eE][sS])
-USE_BUILTIN.iconv= yes
-.endif
+.endif # IS_BUILTIN.iconv
.if !defined(USE_BUILTIN.iconv)
USE_BUILTIN.iconv?= ${IS_BUILTIN.iconv}
@@ -43,6 +38,9 @@
. endif
.endif # USE_BUILTIN.iconv
+CHECK_BUILTIN.iconv?= no
+.if !empty(CHECK_BUILTIN.iconv:M[nN][oO])
+
.if !empty(USE_BUILTIN.iconv:M[nN][oO])
_LIBICONV= -liconv
.else
@@ -66,7 +64,7 @@
${ECHO} "native"; \
fi
. endif
-MAKEFLAGS+= ICONV_TYPE=${ICONV_TYPE}
+BUILDLINK_VARS+= ICONV_TYPE
.endif
.if defined(GNU_CONFIGURE)
@@ -76,3 +74,5 @@
CONFIGURE_ARGS+= --without-libiconv-prefix
. endif
.endif
+
+.endif # CHECK_BUILTIN.iconv
diff -r 672b2fef29b6 -r 7455e3905633 devel/binutils/builtin.mk
--- a/devel/binutils/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/devel/binutils/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -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 @@
. 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 @@
NM= ${BUILDLINK_PREFIX.binutils}/bin/nm
RANLIB= ${BUILDLINK_PREFIX.binutils}/bin/ranlib
.endif
+
+.endif # CHECK_BUILTIN.binutils
diff -r 672b2fef29b6 -r 7455e3905633 devel/gettext-lib/builtin.mk
--- a/devel/gettext-lib/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/devel/gettext-lib/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -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 @@
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 @@
# 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 @@
. 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+= --without-libintl-prefix
. endif
.endif
+
+.endif # CHECK_BUILTIN.gettext
diff -r 672b2fef29b6 -r 7455e3905633 devel/libgetopt/builtin.mk
--- a/devel/libgetopt/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/devel/libgetopt/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -1,18 +1,16 @@
-# $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
+.endif # IS_BUILTIN.getopt
+
+USE_BUILTIN.getopt?= ${IS_BUILTIN.getopt}
CHECK_BUILTIN.getopt?= no
-.if !empty(CHECK_BUILTIN.getopt:M[yY][eE][sS])
-USE_BUILTIN.getopt= yes
-.endif
-
-USE_BUILTIN.getopt?= ${IS_BUILTIN.getopt}
+.if !empty(CHECK_BUILTIN.getopt:M[nN][oO])
.if !empty(USE_BUILTIN.getopt:M[nN][oO])
LIBGETOPT= -lgetopt
@@ -24,3 +22,5 @@
CONFIGURE_ENV+= LIBGETOPT="${LIBGETOPT}"
MAKE_ENV+= LIBGETOPT="${LIBGETOPT}"
+
+.endif # CHECK_BUILTIN.getopt
diff -r 672b2fef29b6 -r 7455e3905633 devel/ncurses/builtin.mk
--- a/devel/ncurses/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/devel/ncurses/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -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 @@
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_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 @@
. 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_DIR}/include/curses.h; \
fi
.endif
+
+.endif # CHECK_BUILTIN.ncurses
diff -r 672b2fef29b6 -r 7455e3905633 devel/readline/builtin.mk
--- a/devel/readline/builtin.mk Mon Mar 29 05:42:58 2004 +0000
+++ b/devel/readline/builtin.mk Mon Mar 29 05:43:28 2004 +0000
@@ -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 @@
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 @@
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_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])
Home |
Main Index |
Thread Index |
Old Index