View | Details | Raw Unified | Return to bug 212075 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/ninja.mk (+5 lines)
Lines 7-12 Link Here
7 
#
 7 
#
8 
# User defined variables:
 8 
# User defined variables:
9 
# NINJA_VERBOSE		- Enable verbose output.
 9 
# NINJA_VERBOSE		- Enable verbose output.
10 
#			Default: not set, unless BATCH or PACKAGE_BUILDING is defined.
10 
#
 11 
#
11 
# MAINTAINER: portmgr@FreeBSD.org
 12 
# MAINTAINER: portmgr@FreeBSD.org
12 

          13
          

        

  

    
      
            Lines 17-22
          
      
      
        Link Here
      
    
  

        

          17
          
IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments

          18
          
IGNORE=	Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments

        

        

          18
          
.endif

          19
          
.endif

        

        

          19
          

          20
          

        

            

              
              
              21
              
.if defined(BATCH) || defined(PACKAGE_BUILDING)

            

            

              22
              
NINJA_VERBOSE=	yes

            

            

              23
              
.endif

            

            

              24
              

            

        

          20
          
.if defined(NINJA_VERBOSE)

          25
          
.if defined(NINJA_VERBOSE)

        

        

          21
          
MAKE_ARGS+=	-v

          26
          
MAKE_ARGS+=	-v

        

        

          22
          
.endif

          27
          
.endif

        



(-)Mk/bsd.port.mk
      (+11 lines)




  

    
      
            Lines 789-794
          
      
      
        Link Here
      
    
  

        

          789
          
# CONFIGURE_LOG	- The name of configure log file. It will be printed to

          789
          
# CONFIGURE_LOG	- The name of configure log file. It will be printed to

        

        

          790
          
#				  the screen if configure fails.

          790
          
#				  the screen if configure fails.

        

        

          791
          
#				  Default: config.log

          791
          
#				  Default: config.log

        

            

              
              
              792
              
# CONFIGURE_VERBOSE

            

            

              793
              
#				- Enable configure verbose build output.

            

            

              794
              
#				  Default: not set, unless BATCH or PACKAGE_BUILDING is defined.

            

            

              795
              
#				  Feature depends from "--disable-silent-rules" configure option

            

            

              796
              
#				  support.

            

        

          792
          
# CONFIGURE_FAIL_MESSAGE

          797
          
# CONFIGURE_FAIL_MESSAGE

        

        

          793
          
#				- A message displayed to users when configure

          798
          
#				- A message displayed to users when configure

        

        

          794
          
#				  fails (note: this assumes the do-configure

          799
          
#				  fails (note: this assumes the do-configure

        

  

    
      
            Lines 2488-2493
          
      
      
        Link Here
      
    
  

        

          2488
          
GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}

          2493
          
GNU_CONFIGURE_MANPREFIX?=	${MANPREFIX}

        

        

          2489
          
CONFIG_SITE?=		${PORTSDIR}/Templates/config.site

          2494
          
CONFIG_SITE?=		${PORTSDIR}/Templates/config.site

        

        

          2490
          
CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}

          2495
          
CONFIGURE_ARGS+=	--prefix=${GNU_CONFIGURE_PREFIX} $${_LATE_CONFIGURE_ARGS}

        

            

              
              
              2496
              
.if defined(BATCH) || defined(PACKAGE_BUILDING)

            

            

              2497
              
CONFIGURE_VERBOSE=	yes

            

            

              2498
              
.endif

            

        

          2491
          
.if defined(X_BUILD_FOR)

          2499
          
.if defined(X_BUILD_FOR)

        

        

          2492
          
CONFIGURE_ARGS+=	--host=${X_BUILD_FOR}

          2500
          
CONFIGURE_ARGS+=	--host=${X_BUILD_FOR}

        

        

          2493
          
.endif

          2501
          
.endif

        

  

    
      
            Lines 2503-2508
          
      
      
        Link Here
      
    
  

        

          2503
          
	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \

          2511
          
	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--mandir'`" ]; then \

        

        

          2504
          
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \

          2512
          
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --mandir=${GNU_CONFIGURE_MANPREFIX}/man" ; \

        

        

          2505
          
	fi ; \

          2513
          
	fi ; \

        

            

              
              
              2514
              
	if [ -n "${CONFIGURE_VERBOSE}" ] && [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--disable-silent-rules'`" ]; then \

            

            

              2515
              
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --disable-silent-rules" ; \

            

            

              2516
              
	fi ; \

            

        

          2506
          
	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \

          2517
          
	if [ ! -z "`${CONFIGURE_CMD} --help 2>&1 | ${GREP} -- '--infodir'`" ]; then \

        

        

          2507
          
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \

          2518
          
	    _LATE_CONFIGURE_ARGS="$${_LATE_CONFIGURE_ARGS} --infodir=${GNU_CONFIGURE_PREFIX}/${INFO_PATH}/${INFO_SUBDIR}" ; \

        

        

          2508
          
	fi ; \

          2519
          
	fi ; \

        






  

  Return to bug 212075