From 95fd1f6ec9ce583a46e4351179d93b744a17d1ad Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 1 Jun 2005 18:02:37 +0000 Subject: Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc. Several changes are involved since they are all interrelated. These changes affect about 1000 files. The first major change is rewriting bsd.builtin.mk as well as all of the builtin.mk files to follow the new example in bsd.builtin.mk. The loop to include all of the builtin.mk files needed by the package is moved from bsd.builtin.mk and into bsd.buildlink3.mk. bsd.builtin.mk is now included by each of the individual builtin.mk files and provides some common logic for all of the builtin.mk files. Currently, this includes the computation for whether the native or pkgsrc version of the package is preferred. This causes USE_BUILTIN.* to be correctly set when one builtin.mk file includes another. The second major change is teach the builtin.mk files to consider files under ${LOCALBASE} to be from pkgsrc-controlled packages. Most of the builtin.mk files test for the presence of built-in software by checking for the existence of certain files, e.g. , and we now assume that if that file is under ${LOCALBASE}, then it must be from pkgsrc. This modification is a nod toward LOCALBASE=/usr. The exceptions to this new check are the X11 distribution packages, which are handled specially as noted below. The third major change is providing builtin.mk and version.mk files for each of the X11 distribution packages in pkgsrc. The builtin.mk file can detect whether the native X11 distribution is the same as the one provided by pkgsrc, and the version.mk file computes the version of the X11 distribution package, whether it's built-in or not. The fourth major change is that the buildlink3.mk files for X11 packages that install parts which are part of X11 distribution packages, e.g. Xpm, Xcursor, etc., now use imake to query the X11 distribution for whether the software is already provided by the X11 distribution. This is more accurate than grepping for a symbol name in the imake config files. Using imake required sprinkling various builtin-imake.mk helper files into pkgsrc directories. These files are used as input to imake since imake can't use stdin for that purpose. The fifth major change is in how packages note that they use X11. Instead of setting USE_X11, package Makefiles should now include x11.buildlink3.mk instead. This causes the X11 package buildlink3 and builtin logic to be executed at the correct place for buildlink3.mk and builtin.mk files that previously set USE_X11, and fixes packages that relied on buildlink3.mk files to implicitly note that X11 is needed. Package buildlink3.mk should also include x11.buildlink3.mk when linking against the package libraries requires also linking against the X11 libraries. Where it was obvious, redundant inclusions of x11.buildlink3.mk have been removed. --- databases/gq/Makefile | 3 +-- databases/libgda/Makefile.common | 4 ++-- databases/libgnomedb/Makefile | 3 +-- databases/mergeant/Makefile | 3 +-- databases/quicklist/Makefile | 3 +-- databases/sqsh-x11/Makefile | 4 ++-- databases/tk-postgresql73/Makefile | 3 +-- databases/unixodbc-DataManager/Makefile | 4 +--- databases/unixodbc-ODBCConfig/Makefile | 4 +--- databases/xmysql/Makefile | 3 +-- databases/xmysqladmin/Makefile | 3 +-- databases/xsqlmenu/Makefile | 3 +-- 12 files changed, 14 insertions(+), 26 deletions(-) (limited to 'databases') diff --git a/databases/gq/Makefile b/databases/gq/Makefile index 18057e17ae9..f340adebd92 100644 --- a/databases/gq/Makefile +++ b/databases/gq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:11 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= gq-1.0beta1 @@ -11,7 +11,6 @@ HOMEPAGE= http://biot.com/gq/ COMMENT= GTK-based LDAP client USE_DIRS+= gnome2-1.5 -USE_X11= yes GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index 746e3963c50..4187bec6c60 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.29 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile.common,v 1.30 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= libgda-1.2.1 @@ -13,7 +13,6 @@ COMMENT= GNU database access library DISTINFO_FILE= ${.CURDIR}/../../databases/libgda/distinfo PATCHDIR= ${.CURDIR}/../../databases/libgda/patches -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES USE_PKGINSTALL= YES @@ -49,3 +48,4 @@ SUBST_SED.libs+= -e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.li .include "../../devel/pkgconfig/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 800f1e9ae83..53ad094b577 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= libgnomedb-1.2.1 @@ -12,7 +12,6 @@ COMMENT= GNOME2 database library BUILD_USES_MSGFMT= yes -USE_X11= YES USE_TOOLS+= gmake USE_LIBTOOL= YES USE_DIRS+= gnome2-1.5 diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 3659c0980cb..05d50670976 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= mergeant-0.52 @@ -12,7 +12,6 @@ COMMENT= GNOME2 GNOME-DB database front-end USE_PERL5= build USE_DIRS+= gnome2-1.5 -USE_X11= YES USE_TOOLS+= gmake USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES diff --git a/databases/quicklist/Makefile b/databases/quicklist/Makefile index 67136da648c..91aa5435e5e 100644 --- a/databases/quicklist/Makefile +++ b/databases/quicklist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:15 tv Exp $ +# $NetBSD: Makefile,v 1.17 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= quicklist-0.8.6 @@ -13,7 +13,6 @@ COMMENT= Simple database like AppleWorks & MS Works BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes -USE_X11= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/databases/sqsh-x11/Makefile b/databases/sqsh-x11/Makefile index 3f8deb738cf..f5467005c45 100644 --- a/databases/sqsh-x11/Makefile +++ b/databases/sqsh-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/03/29 12:51:54 grant Exp $ +# $NetBSD: Makefile,v 1.3 2005/06/01 18:02:42 jlam Exp $ PKGNAME= sqsh-x11-2.1 COMMENT= SQL shell for Sybase and MS-SQL servers (X11 support) @@ -6,7 +6,6 @@ COMMENT= SQL shell for Sybase and MS-SQL servers (X11 support) CONFLICTS+= sqsh-[0-9]* CONFLICTS+= sqsh-motif-[0-9]* -USE_X11= YES CONFIGURE_ARGS+= --with-x PATCHDIR= ${.CURDIR}/../../databases/sqsh/patches @@ -14,4 +13,5 @@ DISTINFO_FILE= ${.CURDIR}/../../databases/sqsh/distinfo PLIST_SRC= ${.CURDIR}/../../databases/sqsh/PLIST DESCR_SRC= ${.CURDIR}/../../databases/sqsh/DESCR +.include "../../mk/x11.buildlink3.mk" .include "../../databases/sqsh/Makefile.common" diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile index de48212c3f2..467626166c0 100644 --- a/databases/tk-postgresql73/Makefile +++ b/databases/tk-postgresql73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/05/16 01:15:30 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:42 jlam Exp $ PKGNAME= tk-postgresql73-${BASE_VERS} PKGREVISION= 1 @@ -7,7 +7,6 @@ COMMENT= Tk interface to PostgreSQL .include "../postgresql73/Makefile.common" -USE_X11= yes PKGSRC_USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile index fd8a5fe3891..73c355fe2ba 100644 --- a/databases/unixodbc-DataManager/Makefile +++ b/databases/unixodbc-DataManager/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.11 2005/04/17 01:44:29 kristerw Exp $ +# $NetBSD: Makefile,v 1.12 2005/06/01 18:02:42 jlam Exp $ PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS} PKGREVISION= 4 COMMENT= GUI tool for unixODBC data source management -USE_X11= YES - .include "../../databases/unixodbc/Makefile.common" CONFIGURE_ARGS+= --enable-gui diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile index d187c344372..8c9fc9ba519 100644 --- a/databases/unixodbc-ODBCConfig/Makefile +++ b/databases/unixodbc-ODBCConfig/Makefile @@ -1,11 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:42 jlam Exp $ PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS} PKGREVISION= 4 COMMENT= GUI tool for unixODBC driver configuration -USE_X11= YES - .include "../../databases/unixodbc/Makefile.common" CONFIGURE_ARGS+= --enable-gui diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 03fd928604c..13b458f1fc3 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= xmysql-1.10 @@ -12,7 +12,6 @@ COMMENT= Graphical front end to the MySQL database engine BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 -USE_X11= YES MAKE_ENV+= X11PREFIX=${X11PREFIX} BUILD_TARGET= xmysql diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 39a0d389c74..6442cdaa030 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= xmysqladmin-1.0 @@ -16,7 +16,6 @@ COMMENT= Graphical front end for administering MySQL databases BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 -USE_X11= YES MAKE_ENV+= X11PREFIX=${X11PREFIX} BUILD_TARGET= xmysqladmin diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile index 6ee19bf3ddf..ecfb8d76255 100644 --- a/databases/xsqlmenu/Makefile +++ b/databases/xsqlmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:47 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:42 jlam Exp $ # DISTNAME= xsqlmenu-2.10 @@ -10,7 +10,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.jlab.org/~saw/xsqlmenu/ COMMENT= X based GUI for MySQL -USE_X11= yes USE_TOOLS+= gmake MAKE_ENV+= MAKE=${MAKE_PROGRAM} -- cgit v1.2.3