diff options
| author | agc <agc@pkgsrc.org> | 1999-08-25 13:37:34 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-08-25 13:37:34 +0000 |
| commit | 86aced3a9d904e13488ad6ea62c1d4320f9f6bb9 (patch) | |
| tree | 4e6397ac799b96e60809f2cb1c097771c079275a /mk | |
| parent | 7d907c661a12f906c64159810469ac7e488e11ea (diff) | |
| download | pkgsrc-86aced3a9d904e13488ad6ea62c1d4320f9f6bb9.tar.gz | |
Introduce a USE_XAW definition, which is used in package Makefiles, to
denote that the package uses libXaw.
Introduce an XAW_TYPE definition, which is defined in /etc/mk.conf by
the user, to denote the type of libXaw to use. Possible values are:
standard, 3d and xpm.
Define USE_XAW in relevant Makefiles.
Set default XAW_TYPE in Makefiles which previously did a DEPENDS+= Xaw3d...
This means that package builds should not fail because of conflicting
Xaw packages being installed on machines.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 | ||||
| -rw-r--r-- | mk/mk.conf.example | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 733f0e0255b..e76459dad05 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.323 1999/08/24 19:03:08 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.324 1999/08/25 13:37:34 agc Exp $ # # This file is in the public domain. # @@ -124,6 +124,15 @@ CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" .endif +.if defined(USE_XAW) +XAW_TYPE?= standard +.if ${XAW_TYPE} == "xpm" +DEPENDS+= Xaw-Xpm-1.1:${PKGSRCDIR}/x11/Xaw-Xpm +.elif ${XAW_TYPE} == "3d" +DEPENDS+= Xaw3d-1.5:${PKGSRCDIR}/x11/Xaw3d +.endif +.endif + # Don't change these!!! These names are built into the _TARGET_USE macro, # there is no way to refer to them cleanly from within the macro AFAIK. EXTRACT_COOKIE= ${WRKDIR}/.extract_done diff --git a/mk/mk.conf.example b/mk/mk.conf.example index b2830c7164a..91f028475be 100644 --- a/mk/mk.conf.example +++ b/mk/mk.conf.example @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf.example,v 1.69 1999/08/25 10:04:46 agc Exp $ +# $NetBSD: mk.conf.example,v 1.70 1999/08/25 13:37:34 agc Exp $ # # Sample /etc/mk.conf file, which can be used to set specific values @@ -375,6 +375,11 @@ PAPERSIZE= A4 # Default paper size for packages. # Possible: see http://wm.themes.org/ # Default: FreeBSD-theme +#XAW_TYPE=standard # Used in various packages to specify that + # libXaw is used. + # Possible: standard, 3d, xpm + # Default: standard + #ZIP_ENCRYPTION= # Add encryption code to zip, zip1, and unzip # Possible: defined, not defined # Default: not defined |