--Signature=_Sat__24_Jan_2004_09_05_43_+0100_ujv7oxz1qlxSGE.V
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

On Sat, 24 Jan 2004 18:42:11 +1100
grant beattie <grant@NetBSD.org> wrote:

> should USE_PKGSRC_XFREE86 default to "YES" if !exists(${X11BASE}) ?
> that might make sense, and users can set it to "NO" if they know they
> don't ever want to build any X packages.

I prefer disable USE_PKGSRC_XFREE86 if it's not enabled, because if you want
to build via xsrc in NetBSD, you will have to modify it.

Second round:

Index: bsd.pkg.defaults.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.defaults.mk,v
retrieving revision 1.208
diff -b -u -r1.208 bsd.pkg.defaults.mk
--- bsd.pkg.defaults.mk	2004/01/22 10:19:58	1.208
+++ bsd.pkg.defaults.mk	2004/01/24 07:59:57
@@ -2010,6 +2010,11 @@
 # Possible: not defined, YES
 # Default: not defined
 
+USE_PKGSRC_XFREE86?=	NO
+# Used in the XFree86 packages to install them automatically.
+# Possible: YES, or NO.
+# Default: NO.
+
 USERPPP_GROUP?=	network
 # Used in the userppp package to specify the default group.
 # Possible: any group name
Index: bsd.pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.1354
diff -b -u -r1.1354 bsd.pkg.mk
--- bsd.pkg.mk	2004/01/23 17:55:17	1.1354
+++ bsd.pkg.mk	2004/01/24 08:00:24
@@ -1383,7 +1383,15 @@
 PKG_FAIL_REASON+= "${PKGNAME} may not be built, because it utilizes strong
cryptography" .    endif
 .  endif
-.  if defined(USE_X11) && !exists(${X11BASE})
+.  if defined(USE_X11) && !empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss])
+DEPENDS+=   XFree86-libs>=4.3.0:../../x11/XFree86-libs
+.  endif
+.  if defined(USE_X11) && !exists(${X11BASE}) &&
empty(USE_PKGSRC_XFREE86:M[Yy][Ee][Ss])
+    @${MKDIR} ${X11BASE}
+    @${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${X11BASE}
+    @${CHMOD} ${PKGDIRMODE} ${X11BASE}
+DEPENDS+=   XFree86-libs>=4.3.0:../../x11/XFree86-libs
+.  elif defined(USE_X11) && !exists(${X11BASE})
 PKG_FAIL_REASON+= "${PKGNAME} uses X11, but ${X11BASE} not found"
 .  endif
 .  if defined(BROKEN)

Is it ok to commit? if so, I will import XFree86 right now.

-- 
Juan RP <juan@xtraeme.unixbsd.org>


--Signature=_Sat__24_Jan_2004_09_05_43_+0100_ujv7oxz1qlxSGE.V
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (NetBSD)

iD8DBQFAEidXypkLYVDran0RAhhyAKDFGZLQwllUwg/RAu0rDuBZah+cRwCePu5z
cqxl3oK8gAF+JMN16Ulw/hI=
=FykX
-----END PGP SIGNATURE-----

--Signature=_Sat__24_Jan_2004_09_05_43_+0100_ujv7oxz1qlxSGE.V--