diff options
| author | agc <agc@pkgsrc.org> | 1999-01-26 22:03:18 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 1999-01-26 22:03:18 +0000 |
| commit | 9fe0ebf4eb796f516ec8a609f86fa84ebc48d20b (patch) | |
| tree | b7456591245cea8cd00b7864906f23deafc0adc6 | |
| parent | b44cf617ddce90932679e8ec54a93729feff7961 (diff) | |
| download | pkgsrc-9fe0ebf4eb796f516ec8a609f86fa84ebc48d20b.tar.gz | |
Introduce a BUILD_USES_X11 definition, defined in package Makefiles,
and used to denote that a package uses X11 headers and libraries to
build, but does not install itself into X11BASE (xpkgwedge
notwithstanding).
This is used to ignore packages which would otherwise cause build
problems on machines with no X11 installation.
| -rw-r--r-- | mail/faces/Makefile | 4 | ||||
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | x11/tk80/Makefile | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 96f4e26ebdd..2d26222356d 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/07/15 12:17:01 agc Exp $ +# $NetBSD: Makefile,v 1.10 1999/01/26 22:03:20 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/17 18:47:53 max Exp # @@ -12,6 +12,8 @@ MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE WRKSRC= ${WRKDIR}/faces +BUILD_USES_X11= yes + post-configure: @for f in ${WRKSRC}/Makefile ${WRKSRC}/faces.h ${WRKSRC}/x11.c; do \ ${MV} $$f $$f.in; \ diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6f89b8fb32c..3327aa2bcf2 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.204 1999/01/19 23:40:09 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.205 1999/01/26 22:03:18 agc Exp $ # # This file is in the public domain. # @@ -192,7 +192,7 @@ MD5?= md5 .endif MD5_FILE?= ${FILESDIR}/md5 -.if defined(USE_MOTIF) || defined(USE_X11) +.if defined(USE_MOTIF) || defined(USE_X11) || defined(BUILD_USES_X11) LDFLAGS+= -Wl,-R${X11BASE}/lib .endif LDFLAGS+= -Wl,-R${LOCALBASE}/lib @@ -673,7 +673,8 @@ IGNORE= "is not an interactive port" IGNORE= "may not be placed on a CDROM: ${NO_CDROM}" .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) IGNORE= "is restricted: ${RESTRICTED}" -.elif ((defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11)) && \ +.elif ((defined(USE_IMAKE) || defined(USE_MOTIF) || \ + defined(USE_X11) || defined(BUILD_USES_X11)) && \ !exists(${X11BASE})) IGNORE= "uses X11, but ${X11BASE} not found" .elif defined(BROKEN) diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile index 68508fe534c..3b01c743d5c 100644 --- a/x11/tk80/Makefile +++ b/x11/tk80/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 1999/01/26 21:36:06 agc Exp $ +# $NetBSD: Makefile,v 1.22 1999/01/26 22:03:20 agc Exp $ # FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp # @@ -15,6 +15,8 @@ DEPENDS+= tcl-8.0p2:../../lang/tcl80 WRKSRC= ${WRKDIR}/tk8.0/unix GNU_CONFIGURE= yes +BUILD_USES_X11= yes + # let libtool look after shared libraries USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-shared |