diff options
| author | agc <agc@pkgsrc.org> | 1998-06-09 13:36:48 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1998-06-09 13:36:48 +0000 |
| commit | 30f402725f1c5c717c768828ac82cab084afba9a (patch) | |
| tree | 32dcdb09fce3e1ff5268fd734e737484cd69aba2 /mk | |
| parent | 61d4925ca740977e9a664813ca0bff76cb9430ba (diff) | |
| download | pkgsrc-30f402725f1c5c717c768828ac82cab084afba9a.tar.gz | |
Rationalise Motif/Lesstif handling.
Get rid of HAVE_MOTIF, MOTIF_STATIC, REQUIRES_MOTIF and MOTIF_ONLY.
Standardise on USE_MOTIF, which uses the pkgsrc dependency checks to
use Motif, if it's available, or Lesstif, if not.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 22f996edeba..8db1c8848dc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.97 1998/06/05 23:27:48 frueauf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.98 1998/06/09 13:36:48 agc Exp $ # # This file is in the public domain. # @@ -345,13 +345,7 @@ PKG_SUFX?= .tgz PKG_DBDIR?= /var/db/pkg # shared/dynamic motif libs -.if defined(HAVE_MOTIF) -.if defined(MOTIF_STATIC) -MOTIFLIB?= ${X11BASE}/lib/libXm.a -.else MOTIFLIB?= -L${X11BASE}/lib -lXm -.endif -.endif AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename @@ -618,10 +612,6 @@ _CATPAGES+= ${CATN:S%^%${CATNPREFIX}/man/${lang}/catn/%} IGNORE= "is an interactive port" .elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE)) IGNORE= "is not an interactive port" -.elif (defined(REQUIRES_MOTIF) && !defined(HAVE_MOTIF)) -IGNORE= "requires Motif" -.elif (defined(MOTIF_ONLY) && !defined(REQUIRES_MOTIF)) -IGNORE= "does not require Motif" .elif (defined(NO_CDROM) && defined(FOR_CDROM)) IGNORE= "may not be placed on a CDROM: ${NO_CDROM}" .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) |