cvs commit: src/share/mk bsd.port.mk

[YONETANI Tomokazu]

On Mon, May 16, 2005 at 08:09:33AM +0100, Stefan Krueger wrote:
> YONETANI Tomokazu wrote:
> > y0netan1    2005/05/16 00:34:46 PDT
> > 
> > DragonFly src repository
> > 
> >   Modified files:
> >     share/mk             bsd.port.mk 
> >   Log:
> >   Deal with "or later" notation of USE_GCC knob.
> >   Inspired-by: FreeBSD ports/Mk/bsd.gcc.mk,1.1
> does this mean that certain ports (x11-wm/boxtools for example) won't
> try to build gcc-3.x?

Yes. Did this change break those ports that depended on USE_GCC=3.3+
to install lang/gcc33?

> another thing, now that we have iconv in libc, can we override USE_ICONV
> somehow?

That seems a bit harder (even assuming the iconv in libc is compatible
with GNU libiconv), because all it does is adding dependency on
converters/libiconv. The following patch overrides the USE_ICONV if
USE_ICONV_IN_LIBC is also defined. Does it work for you?

%%%
Index: bsd.port.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.35
diff -u -r1.35 bsd.port.mk
--- bsd.port.mk	16 May 2005 09:20:56 -0000	1.35
+++ bsd.port.mk	16 May 2005 10:30:33 -0000
@@ -88,6 +88,15 @@
 .  endif
 .endif
 
+.if defined(USE_ICONV) && defined(USE_ICONV_IN_LIBC)
+_ICONV_IN_LIBC!=	/usr/bin/nm /usr/lib/libc.a | \
+			/usr/bin/grep -l iconv || echo ''
+.  if ${_ICONV_IN_LIBC} != ""
+CFLAGS+=	-DLIBICONV_PLUG
+.  undef USE_ICONV
+.  endif
+.endif
+
 # If the port does not exist in /usr/dfports/<portpath> use the original
 # FreeBSD port.  Also process as per normal if BEFOREPORTMK is set so
 # any expected variables are set.
%%%

PS. Does anyone know how to convince mutt not to corrupt letters
with umlauts when it invokes editor?