diff options
| -rw-r--r-- | audio/snd/Makefile | 4 | ||||
| -rw-r--r-- | audio/xmcd/Makefile | 4 | ||||
| -rw-r--r-- | audio/xmmix/Makefile | 4 | ||||
| -rw-r--r-- | devel/ddd/Makefile | 4 | ||||
| -rw-r--r-- | editors/nedit/Makefile | 4 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 12 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 4 |
7 files changed, 13 insertions, 23 deletions
diff --git a/audio/snd/Makefile b/audio/snd/Makefile index fb3d2943267..e3663f7c1e3 100644 --- a/audio/snd/Makefile +++ b/audio/snd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 1998/05/19 11:33:10 agc Exp $ +# $NetBSD: Makefile,v 1.11 1998/06/09 13:36:48 agc Exp $ # DISTNAME= snd @@ -12,7 +12,7 @@ MAINTAINER= hubertf@netbsd.org DEPENDS+= xpm-3.4j:../../graphics/xpm USE_X11= yes -REQUIRES_MOTIF= yes +USE_MOTIF= yes MAKEFILE= makefile.netbsd ALL_TARGET= snd diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile index 98d46291e3f..fdd5b202838 100644 --- a/audio/xmcd/Makefile +++ b/audio/xmcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 1998/06/02 21:50:06 tron Exp $ +# $NetBSD: Makefile,v 1.9 1998/06/09 13:36:48 agc Exp $ # FreeBSD Id: Makefile,v 1.8 1997/09/08 13:20:10 tg Exp # @@ -8,7 +8,7 @@ MASTER_SITES= http://mercury.hypersurf.com/~amb/download/xmcd/src/ MAINTAINER= hubertf@netbsd.org -REQUIRES_MOTIF= yes +USE_MOTIF= yes USE_IMAKE= yes IS_INTERACTIVE= yes # asks a lot of questions diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile index be445f565f4..7df6c9baee4 100644 --- a/audio/xmmix/Makefile +++ b/audio/xmmix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:15 agc Exp $ +# $NetBSD: Makefile,v 1.10 1998/06/09 13:36:49 agc Exp $ # FreeBSD ID: Makefile,v 1.5 1997/09/08 13:37:47 tg Exp # @@ -9,7 +9,7 @@ MASTER_SITES= http://mercury.hypersurf.com/~amb/download/xmmix-1.2/src/ MAINTAINER= augustss@cs.chalmers.se USE_IMAKE= yes -REQUIRES_MOTIF= yes +USE_MOTIF= yes CAT1= xmmix.0 diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index c0f55019016..3332eb2e1da 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 1998/06/05 10:59:57 frueauf Exp $ +# $NetBSD: Makefile,v 1.5 1998/06/09 13:36:49 agc Exp $ # Id: Makefile,v 1.5 1998/02/19 09:43:16 obrien Exp # @@ -14,7 +14,7 @@ MAINTAINER= obrien@NUXI.com GNU_CONFIGURE= yes USE_GMAKE= yes -REQUIRES_MOTIF= yes +USE_MOTIF= yes MAN1= ddd.1 .include "../../mk/bsd.prefs.mk" diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile index 5259ec2088e..3bb59b64b4d 100644 --- a/editors/nedit/Makefile +++ b/editors/nedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/06/02 23:46:41 tron Exp $ +# $NetBSD: Makefile,v 1.3 1998/06/09 13:36:49 agc Exp $ DISTNAME= nedit_source PKGNAME= nedit-5.0.2 @@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.fnal.gov/pub/nedit/v5_0_2/ MAINTAINER= tron@netbsd.org -REQUIRES_MOTIF= yes +USE_MOTIF= yes USE_X11= yes NO_WRKSUBDIR= yes 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)) diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index eca41bebc77..d827cc35b87 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/05/24 23:28:29 fvdl Exp $ +# $NetBSD: Makefile,v 1.10 1998/06/09 13:36:49 agc Exp $ # DISTNAME= unix-19980429 @@ -13,7 +13,7 @@ MAINTAINER= fvdl@netbsd.org USE_X11= yes USE_GMAKE= yes USE_PERL5= yes -REQUIRES_MOTIF= yes +USE_MOTIF= yes WRKSRC= ${WRKDIR}/19980429/mozilla |