Subject: Re: mrtg without x11
To: netbsd-users@NetBSD.org <netbsd-users@NetBSD.org>
From: Christian Biere <christianbiere@gmx.de>
List: netbsd-users
Date: 01/27/2004 01:43:15
--ABTtc+pdwF7KHXCz
Content-Type: multipart/mixed; boundary="IiVenqGWf+H9Y6IX"
Content-Disposition: inline


--IiVenqGWf+H9Y6IX
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Antoine Jacoutot wrote:
> Selon Christian Biere <christianbiere@gmx.de>:
> > Does mrtg need freetype2? It seems to build fine without. I've just
> > deinstalled graphics/xpm and rebuild graphics/gd. It didn't try to
> > build graphics/xpm.
=20
> Well, xpm is a direct or indirect dependency of mrtg, that's a fact on my=
 box.
> I also tried to build rrdtools, but it also need X... this is strange...

Did you use my patches? I've attached another patch which removes the
the dependency on x11-links if USE_X11 is set to NO.

--=20
Christian

--IiVenqGWf+H9Y6IX
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="mk.udif"
Content-Transfer-Encoding: quoted-printable

Index: mk/buildlink2/bsd.buildlink2.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/mk/buildlink2/bsd.buildlink2.mk,v
retrieving revision 1.104
diff -u -r1.104 bsd.buildlink2.mk
--- mk/buildlink2/bsd.buildlink2.mk	2003/12/19 19:22:28	1.104
+++ mk/buildlink2/bsd.buildlink2.mk	2004/01/27 00:41:33
@@ -87,7 +87,7 @@
 .  endif
 .endfor
=20
-.if defined(USE_X11)
+.if defined(USE_X11) && !empty(USE_X11:M[Yy][Ee][Ss])
 USE_X11_LINKS?=3D		YES
 .  if empty(USE_X11_LINKS:M[nN][oO])
 BUILD_DEPENDS+=3D		x11-links>=3D0.19:../../pkgtools/x11-links
@@ -98,6 +98,8 @@
 .if ${_USE_RPATH} =3D=3D "yes"
 _BLNK_LDFLAGS+=3D		-Wl,${_OPSYS_RPATH_NAME}${X11BASE}/lib
 .endif
+.else
+USE_X11_LINKS?=3D		NO
 .endif
=20
 CONFIGURE_ENV+=3D		BUILDLINK_CPPFLAGS=3D"${_BLNK_CPPFLAGS}"
Index: mk/buildlink3/bsd.buildlink3.mk
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.47
diff -u -r1.47 bsd.buildlink3.mk
--- mk/buildlink3/bsd.buildlink3.mk	2004/01/11 06:50:58	1.47
+++ mk/buildlink3/bsd.buildlink3.mk	2004/01/27 00:41:33
@@ -65,7 +65,7 @@
 BUILDLINK_DEPENDS?=3D	# empty
=20
 X11_LINKS_SUBDIR=3D		share/x11-links
-.if defined(USE_X11)
+.if defined(USE_X11) && !empty(USE_X11:M[Yy][Ee][Ss])
 USE_X11_LINKS?=3D			YES
 .  if !empty(USE_X11_LINKS:M[yY][eE][sS])
 BUILDLINK_DEPENDS+=3D		x11-links
@@ -79,6 +79,7 @@
 _BLNK_X11_LINKS_DIR=3D	${BUILDLINK_PREFIX.x11-links}/${X11_LINKS_SUBDIR}
 .else
 _BLNK_X11_LINKS_PACKAGE=3D	# empty
+USE_X11_LINKS?=3D			NO
 .endif
=20
 # _BLNK_DEPENDS contains all of the unique elements of BUILDLINK_DEPENDS.

--IiVenqGWf+H9Y6IX--

--ABTtc+pdwF7KHXCz
Content-Type: application/pgp-signature
Content-Disposition: inline

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

iD8DBQFAFbQj0KQix3oyIMcRAjYAAJsHr4YE0fNzgodtsLpTMz9l8ZF/fgCfSl2e
IekT9DeeXAMyM5F2TmqOGOk=
=EgYZ
-----END PGP SIGNATURE-----

--ABTtc+pdwF7KHXCz--