diff options
| author | Satoshi Asami <asami@FreeBSD.org> | 2000-11-07 23:28:20 +0000 |
|---|---|---|
| committer | Satoshi Asami <asami@FreeBSD.org> | 2000-11-07 23:28:20 +0000 |
| commit | 7112ba2b404b9dd889c9f4a5a3d433b26f9035bc (patch) | |
| tree | a9ee08af9bd503352ea6981ff0980381216b49bc /cad | |
| parent | Hylafax DISTFILE moved. (diff) | |
Change motif to a normal dependency. REQUIRES_MOTIF is now called
USE_MOTIF and generates a LIB_DEPENDS to x11-toolkits/open-motif. As
before, it implies USE_XPM (and therefore USE_XLIB). Motif-dummy is
removed from PKG_IGNORE_DEPENDS, whose sole resident is now XFree86-3.
Most of the simple ".if defined(HAVE_MOTIF)"s are removed to always
have USE_MOTIF. ftp/moxftp will define USE_MOTIF unless
WANT_ATHENA_VERSION (new variable) is defined. I merged the X cases
in cad/mars, so USE_MOTIF is used iff WITHOUT_X11 is not defined.
I will remove x11-toolkits/Motif-dummy (which has been repo copied to
open-motif) in a few days.
Notes
Notes:
svn path=/head/; revision=34892
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/electric/Makefile | 2 | ||||
| -rw-r--r-- | cad/mars/Makefile | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/cad/electric/Makefile b/cad/electric/Makefile index 246b5d59ffff..490ea60c2ee3 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lioux@FreeBSD.org USE_XLIB= yes -REQUIRES_MOTIF= yes +USE_MOTIF= yes EXTRA_PATCHES= ${WRKDIR}/patch-prefix GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/cad/mars/Makefile b/cad/mars/Makefile index 276cea59f2f6..6bc6359a1341 100644 --- a/cad/mars/Makefile +++ b/cad/mars/Makefile @@ -19,13 +19,11 @@ MAINTAINER= obrien@FreeBSD.org NO_WRKSUBDIR= yes EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -.if defined(HAVE_MOTIF) && !defined(PACKAGE_BUILDING) -MAKEFILE= Makefile.XMotif -.elif defined(WITHOUT_X11) +.if defined(WITHOUT_X11) MAKEFILE= Makefile.NoX .else -USE_XLIB= yes -MAKEFILE= Makefile.SimpleX +USE_MOTIF= yes +MAKEFILE= Makefile.XMotif .endif ALL_TARGET= depend mars MAN1= mars.1 |