--Signature=_Sat__24_Jan_2004_08_25_42_+0100__v0/UwLSNg/Vxe+a
Content-Type: text/plain; charset=US-ASCII
Content-Disposition: inline
Content-Transfer-Encoding: 7bit

On Fri, 23 Jan 2004 20:45:05 +0100
Juan RP <juan@xtraeme.unixbsd.org> wrote:

> 
> Hi,
> 
> I would like to import XFree86 packages into pkgsrc this weekend, is there any
> problem importing them? I've tested it succesfuly in FreeBSD 4.x/5.x,
> NetBSD 1.6/-current and Linux (i386 all).

Ok, I will have to do some changes before importing them, that's it:

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:21:31
@@ -2010,6 +2010,11 @@
 # Possible: not defined, YES
 # Default: not defined

+# USE_PKGSRC_XFREE86=
+# If defined, use the XFree86 packages.
+# Possible: not defined, defined.
+# Default: not defined.
+
 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 07:21:53
@@ -1383,7 +1383,12 @@
 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) && !exists(${X11BASE}) && defined(USE_PKGSRC_XFREE86)
+    @${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)

Comments?

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


--Signature=_Sat__24_Jan_2004_08_25_42_+0100__v0/UwLSNg/Vxe+a
Content-Type: application/pgp-signature

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

iD8DBQFAEh35ypkLYVDran0RAjAFAJ9i5GMEauPdFQXYo0Vs+fuBiq1LCwCgrNtU
LFfhPGp6yuJ9gsiDokan24A=
=vqio
-----END PGP SIGNATURE-----

--Signature=_Sat__24_Jan_2004_08_25_42_+0100__v0/UwLSNg/Vxe+a--