Check-in [69d70f5c25]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Sync with latest from ports tree
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:69d70f5c2504c69cae22909a4d397e5c4e49a1d1
User & Date: bapt 2012-06-09 18:03:06
Context
2012-06-09
18:14
MAN* (un)compression no more need to list them in Makefile still perhaps need something for MLINKS check-in: b3881786c8 user: bapt tags: trunk
18:03
Sync with latest from ports tree check-in: 69d70f5c25 user: bapt tags: trunk
15:04
Only run post-install when staging check-in: 7148a3f233 user: bdrewery tags: trunk
Changes

Changes to ports/Mk/bsd.options.desc.mk.

     1         -# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.57 2012/06/06 13:27:52 sunpoet Exp $
            1  +# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.58 2012/06/09 15:44:56 miwi Exp $
     2      2   #
     3      3   # READ BEFORE EDITING:
     4      4   # - Please keep descriptions sorted alphabetically by variable name.
     5      5   #
     6      6   
     7      7   Options_Desc_MAINTAINER=	ports@FreeBSD.org
     8      8   
................................................................................
    49     49   FREETDS_DESC?=		Enable FreeTDS support
    50     50   FREETYPE_DESC?=		Enable TrueType font rendering engine
    51     51   FUSE_DESC?=		Enable Fuse support
    52     52   GCONF_DESC?=		Enable gconf backend
    53     53   GDM_DESC?=		Build GDM login manager
    54     54   GEOS_DESC?=		Enable GEOS support
    55     55   GEOTIFF_DESC?=		Enable GeoTIFF support
           56  +GEOIP_DESC?=		Enable GeoIP support
    56     57   GIF_DESC?=		Enable GIF support
    57     58   GLADE_DESC?=		Enable Glade interface support
    58     59   GNOME_DESC?=		Enable GNOME Desktop support
    59     60   GNOMEVFS2_DESC?=	Enable GnomeVFS2 support
    60     61   GNUPG_DESC?=		Enable GNU Privacy Guard support
    61     62   GNUPLOT_DESC?=		Enable plotting using gnuplot
    62     63   GOGO_DESC?=		Enable gogo mp3 encoder

Changes to ports/Mk/bsd.port.mk.

  3283   3283   
  3284   3284   ################################################################
  3285   3285   #
  3286   3286   # Do preliminary work to detect if we need to run the config
  3287   3287   # target or not.
  3288   3288   #
  3289   3289   ################################################################
  3290         -.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
         3290  +.if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
         3291  +	|| defined(CONFIG_DONE_${UNIQUENAME:U}) || \
  3291   3292   	defined(PACKAGE_BUILDING) || defined(BATCH))
  3292   3293   _OPTIONS_OK=yes
  3293   3294   .endif
  3294   3295   
  3295   3296   ################################################################
  3296   3297   # The following are used to create easy dummy targets for
  3297   3298   # disabling some bit of default target behavior you don't want.
................................................................................
  6041   6042   .  undef OPTFOUND
  6042   6043   .  undef OPTNOCHECK
  6043   6044   .endfor
  6044   6045   .undef multi
  6045   6046   .undef opt
  6046   6047   .endif #pre-check-config
  6047   6048   
  6048         -.if !target(check-config)
  6049         -check-config: pre-check-config
         6049  +.if !target(_check-config)
         6050  +_check-config: pre-check-config
  6050   6051   .for multi in ${OPTIONS_WRONG_MULTI}
  6051   6052   	@${ECHO_MSG} "====> You must check at least one option in the ${multi} multi"
  6052         -	@exit 1
  6053   6053   .endfor
  6054   6054   .for single in ${OPTIONS_WRONG_SINGLE}
  6055   6055   	@${ECHO_MSG} "====> You must select one and only one option from the ${single} single"
  6056         -	@exit 1
  6057   6056   .endfor
         6057  +.if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE)
         6058  +_CHECK_CONFIG_ERROR=	true
         6059  +.endif
         6060  +.endif # _check-config
         6061  +
         6062  +.if !target(check-config)
         6063  +check-config: _check-config
         6064  +.if !empty(_CHECK_CONFIG_ERROR)
         6065  +	@exit 1
         6066  +.endif
  6058   6067   .endif # check-config
         6068  +
         6069  +.if !target(sanity-config)
         6070  +sanity-config: _check-config
         6071  +.if !empty(_CHECK_CONFIG_ERROR)
         6072  +	@echo -n "Config is invalid. Re-edit? [Y/N] "; \
         6073  +	read answer; \
         6074  +	case $$answer in \
         6075  +	[Nn]|[Nn][Oo]) \
         6076  +		exit 0; \
         6077  +	esac; \
         6078  +	${MAKE} config
         6079  +.endif
         6080  +.endif # sanity-config
  6059   6081   
  6060   6082   .if !target(pre-config)
  6061   6083   pre-config:
  6062   6084   _COMPLETE_OPTIONS_LIST:=	${ALL_OPTIONS}
  6063   6085   .for opt in ${ALL_OPTIONS}
  6064   6086   .  if empty(PORT_OPTIONS:M${opt})
  6065   6087   DEFOPTIONS+=	${opt} ""${${opt}_DESC:Q} off
................................................................................
  6140   6162   		${ECHO_MSG} "===>  Switching to root credentials to write ${OPTIONSFILE}"; \
  6141   6163   		${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \
  6142   6164   		${ECHO_MSG} "===>  Returning to user credentials"; \
  6143   6165   	else \
  6144   6166   		${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \
  6145   6167   	fi; \
  6146   6168   	${RM} -f $${TMPOPTIONSFILE}
         6169  +	@${MAKE} sanity-config
  6147   6170   .endif
  6148   6171   .endif # config
  6149   6172   
  6150   6173   .if !target(config-recursive)
  6151   6174   config-recursive:
  6152   6175   	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
  6153   6176   	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
................................................................................
  6154   6177   		(cd $$dir; ${MAKE} config-conditional); \
  6155   6178   	done
  6156   6179   .endif # config-recursive
  6157   6180   
  6158   6181   .if !target(config-conditional)
  6159   6182   config-conditional: pre-config
  6160   6183   .if defined(_COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG)
  6161         -.  if ${_COMPLETE_OPTIONS_LIST} != "${_FILE_COMPLETE_OPTIONS_LIST}"
         6184  +.  if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${_COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O}
  6162   6185   	@cd ${.CURDIR} && ${MAKE} config;
  6163   6186   .  endif
  6164   6187   .endif
  6165   6188   .endif # config-conditional
  6166   6189   
  6167   6190   .if !target(showconfig)
  6168   6191   .include "${PORTSDIR}/Mk/bsd.options.desc.mk"