summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
Diffstat (limited to 'textproc')
-rw-r--r--textproc/catdoc-tk/Makefile3
-rw-r--r--textproc/expat/builtin-imake.mk12
-rw-r--r--textproc/expat/builtin.mk120
-rw-r--r--textproc/gtkspell/Makefile3
-rw-r--r--textproc/libcroco/Makefile3
-rw-r--r--textproc/stardic/Makefile3
6 files changed, 87 insertions, 57 deletions
diff --git a/textproc/catdoc-tk/Makefile b/textproc/catdoc-tk/Makefile
index 62606ff50c8..31c40fda475 100644
--- a/textproc/catdoc-tk/Makefile
+++ b/textproc/catdoc-tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/29 17:27:36 fredb Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 18:03:23 jlam Exp $
#
.include "../../textproc/catdoc/Makefile.common"
@@ -8,7 +8,6 @@ COMMENT+= (Tk interface)
DEPENDS+= catdoc>=0.91.4nb1:../../textproc/catdoc
-USE_X11= yes
CONFIGURE_ARGS+= --enable-wordview
CONFIGURE_ENV+= WISH="${BUILDLINK_PREFIX.tk}/bin/wish"
diff --git a/textproc/expat/builtin-imake.mk b/textproc/expat/builtin-imake.mk
new file mode 100644
index 00000000000..77f5d4aa43d
--- /dev/null
+++ b/textproc/expat/builtin-imake.mk
@@ -0,0 +1,12 @@
+XCOMM $NetBSD: builtin-imake.mk,v 1.1 2005/06/01 18:03:23 jlam Exp $
+
+/*
+ * Check the value of BuildExpatLibrary for the presence of
+ * expat in the X11 distribution.
+ */
+builtin-test:
+#if BuildExpatLibrary
+ @echo yes
+#else
+ @echo no
+#endif
diff --git a/textproc/expat/builtin.mk b/textproc/expat/builtin.mk
index 1b6ea514d5b..595e56266f5 100644
--- a/textproc/expat/builtin.mk
+++ b/textproc/expat/builtin.mk
@@ -1,69 +1,91 @@
-# $NetBSD: builtin.mk,v 1.2 2004/03/29 05:43:35 jlam Exp $
+# $NetBSD: builtin.mk,v 1.3 2005/06/01 18:03:23 jlam Exp $
-_EXPAT_H= ${X11BASE}/include/expat.h
-_X11_TMPL= ${X11BASE}/lib/X11/config/X11.tmpl
+BUILTIN_PKG:= expat
+BUILTIN_FIND_FILES_VAR:= H_EXPAT
+BUILTIN_FIND_FILES.H_EXPAT= ${X11BASE}/include/expat.h
+
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+###
+### Determine if there is a built-in implementation of the package and
+### set IS_BUILTIN.<pkg> appropriately ("yes" or "no").
+###
.if !defined(IS_BUILTIN.expat)
IS_BUILTIN.expat= no
-. if exists(${_X11_TMPL}) && exists(${_EXPAT_H})
+. if exists(${H_EXPAT})
+PKGSRC_USE_TOOLS+= imake # XXX
+IMAKE?= ${X11BASE}/bin/imake # XXX
+. if defined(IMAKE) && exists(${IMAKE})
IS_BUILTIN.expat!= \
- if ${GREP} -q BuildExpatLibrary ${_X11_TMPL}; then \
- ${ECHO} "yes"; \
- else \
- ${ECHO} "no"; \
- fi
-. if !empty(IS_BUILTIN.expat:M[yY][eE][sS])
-#
-# Create an appropriate package name for the built-in expat distributed
-# with the system. This package name can be used to check against
-# BUILDLINK_DEPENDS.<pkg> to see if we need to install the pkgsrc version
-# or if the built-in one is sufficient.
-#
-_EXPAT_MAJOR!= \
- ${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { print $$3 }' \
- ${_EXPAT_H}
-_EXPAT_MINOR!= \
- ${AWK} '/\#define[ ]*XML_MINOR_VERSION/ { print $$3 }' \
- ${_EXPAT_H}
-_EXPAT_MICRO!= \
- ${AWK} '/\#define[ ]*XML_MICRO_VERSION/ { print $$3 }' \
- ${_EXPAT_H}
-_EXPAT_VERSION= ${_EXPAT_MAJOR}.${_EXPAT_MINOR}.${_EXPAT_MICRO}
-BUILTIN_PKG.expat= expat-${_EXPAT_VERSION}
-BUILDLINK_VARS+= BUILTIN_PKG.expat
+ ${IMAKE} -DUseInstalled -I${X11BASE}/lib/X11/config \
+ -f ${BUILDLINK_PKGSRCDIR.expat}/builtin-imake.mk \
+ -s - | \
+ ${MAKE} -f - builtin-test
. endif
. endif
-BUILDLINK_VARS+= IS_BUILTIN.expat
-.endif # IS_BUILTIN.expat
+.endif
+MAKEVARS+= IS_BUILTIN.expat
-.if !defined(USE_BUILTIN.expat)
-USE_BUILTIN.expat?= ${IS_BUILTIN.expat}
+###
+### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
+### a package name to represent the built-in package.
+###
+.if !defined(BUILTIN_PKG.expat) && \
+ !empty(IS_BUILTIN.expat:M[yY][eE][sS]) && \
+ exists(${H_EXPAT})
+BUILTIN_VERSION.expat!= \
+ ${AWK} '/\#define[ ]*XML_MAJOR_VERSION/ { M = $$3 } \
+ /\#define[ ]*XML_MINOR_VERSION/ { m = "."$$3 } \
+ /\#define[ ]*XML_MICRO_VERSION/ { u = "."$$3 } \
+ END { printf "%s%s%s\n", M, m, u }' \
+ ${H_EXPAT}
+BUILTIN_PKG.expat= expat-${BUILTIN_VERSION.expat}
+.endif
+MAKEVARS+= BUILTIN_PKG.expat
-. if defined(BUILTIN_PKG.expat)
+###
+### Determine whether we should use the built-in implementation if it
+### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
+###
+.if !defined(USE_BUILTIN.expat)
+. if ${PREFER.expat} == "pkgsrc"
+USE_BUILTIN.expat= no
+. else
+USE_BUILTIN.expat= ${IS_BUILTIN.expat}
+. if defined(BUILTIN_PKG.expat) && \
+ !empty(IS_BUILTIN.expat:M[yY][eE][sS])
USE_BUILTIN.expat= yes
-. for _depend_ in ${BUILDLINK_DEPENDS.expat}
-. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-USE_BUILTIN.expat!= \
- if ${PKG_ADMIN} pmatch '${_depend_}' ${BUILTIN_PKG.expat}; then \
- ${ECHO} "yes"; \
+. for _dep_ in ${BUILDLINK_DEPENDS.expat}
+. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+USE_BUILTIN.expat!= \
+ if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.expat:Q}; then \
+ ${ECHO} yes; \
else \
- ${ECHO} "no"; \
+ ${ECHO} no; \
fi
-. endif
-. endfor
-. endif
-.endif # USE_BUILTIN.expat
+. endif
+. endfor
+. endif
+. endif # PREFER.expat
+.endif
+MAKEVARS+= USE_BUILTIN.expat
+###
+### The section below only applies if we are not including this file
+### solely to determine whether a built-in implementation exists.
+###
CHECK_BUILTIN.expat?= no
.if !empty(CHECK_BUILTIN.expat:M[nN][oO])
-.if !empty(USE_BUILTIN.expat:M[nN][oO])
+. if !empty(USE_BUILTIN.expat:M[nN][oO])
BUILDLINK_DEPENDS.expat+= expat>=1.95.4
-.endif
+. endif
-.if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
-BUILDLINK_PREFIX.expat= ${X11BASE}
-USE_X11= yes
-.endif
+. if !empty(USE_BUILTIN.expat:M[yY][eE][sS])
+BUILDLINK_PREFIX.expat= ${X11BASE}
+. include "../../mk/x11.buildlink3.mk"
+. include "../../mk/x11.builtin.mk"
+. endif
.endif # CHECK_BUILTIN.expat
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index f77448fba2a..8adb79d63a0 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/26 20:15:04 drochner Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/01 18:03:23 jlam Exp $
DISTNAME= gtkspell-2.0.10
CATEGORIES= textproc devel
@@ -10,7 +10,6 @@ COMMENT= Spell checking GtkTextView widget
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_X11= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= gtkspell-2.0.pc.in
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 8e1d22681c7..4dfd851a0b5 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/06/01 18:03:23 jlam Exp $
#
DISTNAME= libcroco-0.6.0
@@ -13,7 +13,6 @@ COMMENT= Toolkit to parse and manipulate CSS (Cascading Style Sheets)
USE_TOOLS+= gmake
USE_LIBTOOL= yes
-USE_X11= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= libcroco-0.6.pc.in
diff --git a/textproc/stardic/Makefile b/textproc/stardic/Makefile
index aa556798f62..f9a990f4477 100644
--- a/textproc/stardic/Makefile
+++ b/textproc/stardic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:23 jlam Exp $
DISTNAME= dic
PKGNAME= stardic-1.31
@@ -11,7 +11,6 @@ COMMENT= English-Chinese dictionary
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_X11= # defined
MAKEFILE= makefile
USE_LANGUAGES= c c++
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-07 15:49:50 +0000