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
2
3
4
5
6
7
8
..
49
50
51
52
53
54
55

56
57
58
59
60
61
62
# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.57 2012/06/06 13:27:52 sunpoet Exp $
#
# READ BEFORE EDITING:
# - Please keep descriptions sorted alphabetically by variable name.
#

Options_Desc_MAINTAINER=	ports@FreeBSD.org

................................................................................
FREETDS_DESC?=		Enable FreeTDS support
FREETYPE_DESC?=		Enable TrueType font rendering engine
FUSE_DESC?=		Enable Fuse support
GCONF_DESC?=		Enable gconf backend
GDM_DESC?=		Build GDM login manager
GEOS_DESC?=		Enable GEOS support
GEOTIFF_DESC?=		Enable GeoTIFF support

GIF_DESC?=		Enable GIF support
GLADE_DESC?=		Enable Glade interface support
GNOME_DESC?=		Enable GNOME Desktop support
GNOMEVFS2_DESC?=	Enable GnomeVFS2 support
GNUPG_DESC?=		Enable GNU Privacy Guard support
GNUPLOT_DESC?=		Enable plotting using gnuplot
GOGO_DESC?=		Enable gogo mp3 encoder
|







 







>







1
2
3
4
5
6
7
8
..
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
# $FreeBSD: ports/Mk/bsd.options.desc.mk,v 1.58 2012/06/09 15:44:56 miwi Exp $
#
# READ BEFORE EDITING:
# - Please keep descriptions sorted alphabetically by variable name.
#

Options_Desc_MAINTAINER=	ports@FreeBSD.org

................................................................................
FREETDS_DESC?=		Enable FreeTDS support
FREETYPE_DESC?=		Enable TrueType font rendering engine
FUSE_DESC?=		Enable Fuse support
GCONF_DESC?=		Enable gconf backend
GDM_DESC?=		Build GDM login manager
GEOS_DESC?=		Enable GEOS support
GEOTIFF_DESC?=		Enable GeoTIFF support
GEOIP_DESC?=		Enable GeoIP support
GIF_DESC?=		Enable GIF support
GLADE_DESC?=		Enable Glade interface support
GNOME_DESC?=		Enable GNOME Desktop support
GNOMEVFS2_DESC?=	Enable GnomeVFS2 support
GNUPG_DESC?=		Enable GNU Privacy Guard support
GNUPLOT_DESC?=		Enable plotting using gnuplot
GOGO_DESC?=		Enable gogo mp3 encoder

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

3283
3284
3285
3286
3287
3288
3289

3290
3291
3292
3293
3294
3295
3296
3297
....
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055









6056
6057
6058













6059
6060
6061
6062
6063
6064
6065
....
6140
6141
6142
6143
6144
6145
6146

6147
6148
6149
6150
6151
6152
6153
....
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168

################################################################
#
# Do preliminary work to detect if we need to run the config
# target or not.
#
################################################################

.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
	defined(PACKAGE_BUILDING) || defined(BATCH))
_OPTIONS_OK=yes
.endif

################################################################
# The following are used to create easy dummy targets for
# disabling some bit of default target behavior you don't want.
................................................................................
.  undef OPTFOUND
.  undef OPTNOCHECK
.endfor
.undef multi
.undef opt
.endif #pre-check-config

.if !target(check-config)
check-config: pre-check-config
.for multi in ${OPTIONS_WRONG_MULTI}
	@${ECHO_MSG} "====> You must check at least one option in the ${multi} multi"
	@exit 1
.endfor
.for single in ${OPTIONS_WRONG_SINGLE}
	@${ECHO_MSG} "====> You must select one and only one option from the ${single} single"









	@exit 1
.endfor
.endif # check-config














.if !target(pre-config)
pre-config:
_COMPLETE_OPTIONS_LIST:=	${ALL_OPTIONS}
.for opt in ${ALL_OPTIONS}
.  if empty(PORT_OPTIONS:M${opt})
DEFOPTIONS+=	${opt} ""${${opt}_DESC:Q} off
................................................................................
		${ECHO_MSG} "===>  Switching to root credentials to write ${OPTIONSFILE}"; \
		${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \
		${ECHO_MSG} "===>  Returning to user credentials"; \
	else \
		${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \
	fi; \
	${RM} -f $${TMPOPTIONSFILE}

.endif
.endif # config

.if !target(config-recursive)
config-recursive:
	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
................................................................................
		(cd $$dir; ${MAKE} config-conditional); \
	done
.endif # config-recursive

.if !target(config-conditional)
config-conditional: pre-config
.if defined(_COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG)
.  if ${_COMPLETE_OPTIONS_LIST} != "${_FILE_COMPLETE_OPTIONS_LIST}"
	@cd ${.CURDIR} && ${MAKE} config;
.  endif
.endif
.endif # config-conditional

.if !target(showconfig)
.include "${PORTSDIR}/Mk/bsd.options.desc.mk"







>
|







 







|
|


<



>
>
>
>
>
>
>
>
>

|

>
>
>
>
>
>
>
>
>
>
>
>
>







 







>







 







|







3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
....
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052

6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
....
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
....
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191

################################################################
#
# Do preliminary work to detect if we need to run the config
# target or not.
#
################################################################
.if ((!defined(OPTIONS_DEFINE) && !defined(OPTIONS_SINGLE) && !defined(OPTIONS_MULTI)) \
	|| defined(CONFIG_DONE_${UNIQUENAME:U}) || \
	defined(PACKAGE_BUILDING) || defined(BATCH))
_OPTIONS_OK=yes
.endif

################################################################
# The following are used to create easy dummy targets for
# disabling some bit of default target behavior you don't want.
................................................................................
.  undef OPTFOUND
.  undef OPTNOCHECK
.endfor
.undef multi
.undef opt
.endif #pre-check-config

.if !target(_check-config)
_check-config: pre-check-config
.for multi in ${OPTIONS_WRONG_MULTI}
	@${ECHO_MSG} "====> You must check at least one option in the ${multi} multi"

.endfor
.for single in ${OPTIONS_WRONG_SINGLE}
	@${ECHO_MSG} "====> You must select one and only one option from the ${single} single"
.endfor
.if !empty(OPTIONS_WRONG_MULTI) || !empty(OPTIONS_WRONG_SINGLE)
_CHECK_CONFIG_ERROR=	true
.endif
.endif # _check-config

.if !target(check-config)
check-config: _check-config
.if !empty(_CHECK_CONFIG_ERROR)
	@exit 1
.endif
.endif # check-config

.if !target(sanity-config)
sanity-config: _check-config
.if !empty(_CHECK_CONFIG_ERROR)
	@echo -n "Config is invalid. Re-edit? [Y/N] "; \
	read answer; \
	case $$answer in \
	[Nn]|[Nn][Oo]) \
		exit 0; \
	esac; \
	${MAKE} config
.endif
.endif # sanity-config

.if !target(pre-config)
pre-config:
_COMPLETE_OPTIONS_LIST:=	${ALL_OPTIONS}
.for opt in ${ALL_OPTIONS}
.  if empty(PORT_OPTIONS:M${opt})
DEFOPTIONS+=	${opt} ""${${opt}_DESC:Q} off
................................................................................
		${ECHO_MSG} "===>  Switching to root credentials to write ${OPTIONSFILE}"; \
		${SU_CMD} "${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}"; \
		${ECHO_MSG} "===>  Returning to user credentials"; \
	else \
		${CAT} $${TMPOPTIONSFILE} > ${OPTIONSFILE}; \
	fi; \
	${RM} -f $${TMPOPTIONSFILE}
	@${MAKE} sanity-config
.endif
.endif # config

.if !target(config-recursive)
config-recursive:
	@${ECHO_MSG} "===> Setting user-specified options for ${PKGNAME} and dependencies";
	@for dir in ${.CURDIR} $$(${ALL-DEPENDS-LIST}); do \
................................................................................
		(cd $$dir; ${MAKE} config-conditional); \
	done
.endif # config-recursive

.if !target(config-conditional)
config-conditional: pre-config
.if defined(_COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG)
.  if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${_COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O}
	@cd ${.CURDIR} && ${MAKE} config;
.  endif
.endif
.endif # config-conditional

.if !target(showconfig)
.include "${PORTSDIR}/Mk/bsd.options.desc.mk"