svn commit: r277029 - in projects/stable-10-opts-mk: share/mk usr.bin/grep usr.bin/sort

[Garrett Cooper]

Author: ngie
Date: Sun Jan 11 21:39:28 2015
New Revision: 277029
URL: https://svnweb.freebsd.org/changeset/base/277029

Log:
  MFC r263997,r264159:
  
  r263997 (by imp):
  
    Don't test WITHOUT_FOO in program makefiles, test MK_FOO instead.
  
  r264159 (by imp):
  
    Convert sort to using newer MK_ convention.

Modified:
  projects/stable-10-opts-mk/share/mk/bsd.own.mk
  projects/stable-10-opts-mk/usr.bin/grep/Makefile
  projects/stable-10-opts-mk/usr.bin/sort/Makefile
Directory Properties:
  projects/stable-10-opts-mk/   (props changed)

Modified: projects/stable-10-opts-mk/share/mk/bsd.own.mk
==============================================================================
--- projects/stable-10-opts-mk/share/mk/bsd.own.mk	Sun Jan 11 21:27:46 2015	(r277028)
+++ projects/stable-10-opts-mk/share/mk/bsd.own.mk	Sun Jan 11 21:39:28 2015	(r277029)
@@ -283,6 +283,7 @@ __DEFAULT_YES_OPTIONS = \
     GCOV \
     GDB \
     GNU \
+    GNU_GREP_COMPAT \
     GPIB \
     GPIO \
     GPL_DTC \
@@ -311,6 +312,7 @@ __DEFAULT_YES_OPTIONS = \
     LOCATE \
     LPR \
     LS_COLORS \
+    LZMA_SUPPORT \
     MAIL \
     MAILWRAPPER \
     MAKE \
@@ -377,6 +379,7 @@ __DEFAULT_NO_OPTIONS = \
     OPENSSH_NONE_CIPHER \
     PKGTOOLS \
     SHARED_TOOLCHAIN \
+    SORT_THREADS \
     SVN \
     TESTS \
     USB_GADGET_EXAMPLES

Modified: projects/stable-10-opts-mk/usr.bin/grep/Makefile
==============================================================================
--- projects/stable-10-opts-mk/usr.bin/grep/Makefile	Sun Jan 11 21:27:46 2015	(r277028)
+++ projects/stable-10-opts-mk/usr.bin/grep/Makefile	Sun Jan 11 21:39:28 2015	(r277029)
@@ -43,7 +43,7 @@ MLINKS= grep.1 egrep.1 \
 LDADD=	-lz
 DPADD=	${LIBZ}
 
-.if !defined(WITHOUT_LZMA_SUPPORT)
+.if ${MK_LZMA_SUPPORT} != "no"
 LDADD+=	-llzma
 DPADD+=	${LIBLZMA}
 
@@ -57,7 +57,7 @@ LINKS+=	${BINDIR}/${PROG} ${BINDIR}/xzgr
 CFLAGS+= -DWITHOUT_LZMA
 .endif
 
-.if !defined(WITHOUT_BZIP2_SUPPORT)
+.if ${MK_BZIP2_SUPPORT} != "no"
 LDADD+=	-lbz2
 DPADD+=	${LIBBZ2}
 
@@ -73,13 +73,13 @@ MLINKS+= grep.1 bzgrep.1 \
 CFLAGS+= -DWITHOUT_BZIP2
 .endif
 
-.if !defined(WITHOUT_GNU_COMPAT)
+.if ${MK_GNU_GREP_COMPAT} != "no"
 CFLAGS+= -I${DESTDIR}/usr/include/gnu
 LDADD+=	-lgnuregex
 DPADD+=	${LIBGNUREGEX}
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${MK_NLS} != "no"
 .include "${.CURDIR}/nls/Makefile.inc"
 .else
 CFLAGS+= -DWITHOUT_NLS

Modified: projects/stable-10-opts-mk/usr.bin/sort/Makefile
==============================================================================
--- projects/stable-10-opts-mk/usr.bin/sort/Makefile	Sun Jan 11 21:27:46 2015	(r277028)
+++ projects/stable-10-opts-mk/usr.bin/sort/Makefile	Sun Jan 11 21:39:28 2015	(r277029)
@@ -11,7 +11,7 @@ sort.1: sort.1.in
 
 CLEANFILES+= sort.1
 
-.if defined(WITH_THREADS)
+.if ${MK_SORT_THREADS} != "no"
 CFLAGS+= -DSORT_THREADS
 LDFLAGS+= -lpthread -lmd
 MAN_SUB+= -e 's|%%THREADS%%||g'
@@ -20,7 +20,7 @@ LDFLAGS+= -lmd
 MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
 .endif
 
-.if !defined(WITHOUT_NLS)
+.if ${MK_NLS} != "no"
 NLS+=	hu_HU.ISO8859-2
 NLSSRCFILES= ${NLS:S@$@.msg@}
 MAN_SUB+= -e 's|%%NLS%%||g'