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. --- parallel/clusterit/Makefile | 4 ++-- parallel/mpi-ch/Makefile | 3 +-- parallel/openpbs/Makefile | 3 +-- parallel/pvm3/Makefile | 5 +++-- parallel/sge/Makefile | 3 +-- 5 files changed, 8 insertions(+), 10 deletions(-) (limited to 'parallel') diff --git a/parallel/clusterit/Makefile b/parallel/clusterit/Makefile index 682cf3c437d..e82edced132 100644 --- a/parallel/clusterit/Makefile +++ b/parallel/clusterit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/24 05:42:37 garbled Exp $ +# $NetBSD: Makefile,v 1.10 2005/06/01 18:03:08 jlam Exp $ DISTNAME= clusterit-2.3 CATEGORIES= parallel @@ -10,6 +10,6 @@ COMMENT= Clustering package for unix HAS_CONFIGURE= YES CONFIGURE_ARGS+= --prefix=${PREFIX} -USE_X11= YES +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 00ae34fa53a..5a3d9a7def6 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/03/07 02:08:37 jschauma Exp $ +# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:08 jlam Exp $ DISTNAME= mpich-1.2.6 CATEGORIES= parallel @@ -17,7 +17,6 @@ BUILD_TARGET= ALL examples INSTALL_TARGET= install-all USE_PERL5= yes HAS_CONFIGURE= yes -USE_X11= yes USE_FORTRAN= yes PKG_SYSCONFSUBDIR= mpi-ch diff --git a/parallel/openpbs/Makefile b/parallel/openpbs/Makefile index 2e9523ab5d8..5228830693f 100644 --- a/parallel/openpbs/Makefile +++ b/parallel/openpbs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:04 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= OpenPBS_2_3_16 @@ -14,7 +14,6 @@ INTERACTIVE_STAGE= fetch HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} -USE_X11= yes REPLACE_INTERPRETER+= tcl _REPLACE.tcl.old= .*/bin/pbs_tclsh diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile index cc6f7447791..d92207870ce 100644 --- a/parallel/pvm3/Makefile +++ b/parallel/pvm3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:04 tv Exp $ +# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:08 jlam Exp $ DISTNAME= pvm3.4.5 PKGNAME= pvm-3.4.5 @@ -19,7 +19,6 @@ PVM_SSH?= ${LOCALBASE}/bin/ssh WRKSRC= ${WRKDIR}/pvm3 USE_LANGUAGES= fortran -USE_X11= yes USE_LIBTOOL= yes PVM_ROOT= ${WRKSRC} @@ -37,6 +36,8 @@ BUILD_TARGET= all install PVM_DIR= ${PREFIX}/pvm3 BUILDLINK_PASSTHRU_RPATHDIRS+= ${PVM_DIR}/lib/${PVM_ARCH} +.include "../../mk/x11.buildlink3.mk" + post-build: ${CP} ${WRKSRC}/examples/${PVM_ARCH}/.libs/* \ ${WRKSRC}/bin/${PVM_ARCH}/.libs diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index d0e1243fbbb..d8987a01d4c 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:27 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:08 jlam Exp $ # DISTNAME= sge-5.3p6 @@ -14,7 +14,6 @@ BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh GNU_CONFIGURE= YES USE_TOOLS+= gmake -USE_X11= YES USE_PERL5= YES CFLAGS+= -D${UPPER_OPSYS} -- cgit v1.2.3