View | Details | Raw Unified | Return to bug 100556
Collapse All | Expand All

(-)bsd.port.mk (-58 / +58 lines)
Lines 1001-1007 Link Here
1001
1001
1002
.if defined(_PREMKINCLUDED)
1002
.if defined(_PREMKINCLUDED)
1003
check-makefile::
1003
check-makefile::
1004
	@${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice"
1004
	@${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.pre].mk twice"
1005
	@${FALSE}
1005
	@${FALSE}
1006
.endif
1006
.endif
1007
1007
Lines 1228-1236 Link Here
1228
# check for old, crufty, makefile types, part 1:
1228
# check for old, crufty, makefile types, part 1:
1229
.if !defined(PORTNAME) || !( defined(PORTVERSION) || defined (DISTVERSION) ) || defined(PKGNAME)
1229
.if !defined(PORTNAME) || !( defined(PORTVERSION) || defined (DISTVERSION) ) || defined(PKGNAME)
1230
check-makefile::
1230
check-makefile::
1231
	@${ECHO_CMD} "Makefile error: you need to define PORTNAME and PORTVERSION instead of PKGNAME."
1231
	@${ECHO_MSG} "Makefile error: you need to define PORTNAME and PORTVERSION instead of PKGNAME."
1232
	@${ECHO_CMD} "(This port is too old for your bsd.port.mk, please update it to match"
1232
	@${ECHO_MSG} "(This port is too old for your bsd.port.mk, please update it to match"
1233
	@${ECHO_CMD} " your bsd.port.mk.)"
1233
	@${ECHO_MSG} " your bsd.port.mk.)"
1234
	@${FALSE}
1234
	@${FALSE}
1235
.endif
1235
.endif
1236
1236
Lines 1293-1299 Link Here
1293
.if (!defined(PKGDIR) && exists(${MASTERDIR}/pkg/DESCR)) || \
1293
.if (!defined(PKGDIR) && exists(${MASTERDIR}/pkg/DESCR)) || \
1294
	(!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5))
1294
	(!defined(MD5_FILE) && exists(${MASTERDIR}/files/md5))
1295
check-makefile::
1295
check-makefile::
1296
	@${ECHO_CMD} "Makefile error: your port uses an old layout.  Please update it to match this bsd.port.mk.  If you have updated your ports collection via cvsup and are still getting this error, see Q12 and Q13 in the cvsup FAQ on http://www.polstra.com for further information."
1296
	@${ECHO_MSG} "Makefile error: your port uses an old layout.  Please update it to match this bsd.port.mk.  If you have updated your ports collection via cvsup and are still getting this error, see Q12 and Q13 in the cvsup FAQ on http://www.polstra.com for further information."
1297
	@${FALSE}
1297
	@${FALSE}
1298
.endif
1298
.endif
1299
PATCHDIR?=		${MASTERDIR}/files
1299
PATCHDIR?=		${MASTERDIR}/files
Lines 1478-1484 Link Here
1478
1478
1479
.if defined(_POSTMKINCLUDED)
1479
.if defined(_POSTMKINCLUDED)
1480
check-makefile::
1480
check-makefile::
1481
	@${ECHO_CMD} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice"
1481
	@${ECHO_MSG} "${PKGNAME}: Makefile error: you cannot include bsd.port[.post].mk twice"
1482
	@${FALSE}
1482
	@${FALSE}
1483
.endif
1483
.endif
1484
1484
Lines 1529-1535 Link Here
1529
.if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \
1529
.if ${MANCOMPRESSED} != yes && ${MANCOMPRESSED} != no && \
1530
	${MANCOMPRESSED} != maybe
1530
	${MANCOMPRESSED} != maybe
1531
check-makevars::
1531
check-makevars::
1532
	@${ECHO_CMD} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"".
1532
	@${ECHO_MSG} "${PKGNAME}: Makefile error: value of MANCOMPRESSED (is \"${MANCOMPRESSED}\") can only be \"yes\", \"no\" or \"maybe\"".
1533
	@${FALSE}
1533
	@${FALSE}
1534
.endif
1534
.endif
1535
.endif
1535
.endif
Lines 2232-2247 Link Here
2232
# The final simpler patch will come afterwards
2232
# The final simpler patch will come afterwards
2233
.if !defined(COMMENT)
2233
.if !defined(COMMENT)
2234
check-makevars::
2234
check-makevars::
2235
		@${ECHO_CMD} 'Makefile error: there is no COMMENT variable defined'
2235
		@${ECHO_MSG} 'Makefile error: there is no COMMENT variable defined'
2236
		@${ECHO_CMD} 'for this port. Please, rectify this.'
2236
		@${ECHO_MSG} 'for this port. Please, rectify this.'
2237
		@${FALSE}
2237
		@${FALSE}
2238
.else
2238
.else
2239
.if exists(${COMMENTFILE})
2239
.if exists(${COMMENTFILE})
2240
check-makevars::
2240
check-makevars::
2241
		@${ECHO_CMD} 'Makefile error: There is a COMMENTFILE in this port.'
2241
		@${ECHO_MSG} 'Makefile error: There is a COMMENTFILE in this port.'
2242
		@${ECHO_CMD} 'COMMENTFILEs have been deprecated in'
2242
		@${ECHO_MSG} 'COMMENTFILEs have been deprecated in'
2243
		@${ECHO_CMD} 'favor of COMMENT variables.'
2243
		@${ECHO_MSG} 'favor of COMMENT variables.'
2244
		@${ECHO_CMD} 'Please, rectify this.'
2244
		@${ECHO_MSG} 'Please, rectify this.'
2245
		@${FALSE}
2245
		@${FALSE}
2246
.endif
2246
.endif
2247
.endif
2247
.endif
Lines 2266-2273 Link Here
2266
_G_TEMP=	${_group}
2266
_G_TEMP=	${_group}
2267
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2267
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2268
check-makevars::
2268
check-makevars::
2269
				@${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be"
2269
				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
2270
				@${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITES"
2270
				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"
2271
				@${FALSE}
2271
				@${FALSE}
2272
.			endif
2272
.			endif
2273
_MASTER_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
2273
_MASTER_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
Lines 2283-2290 Link Here
2283
_G_TEMP=	${_group}
2283
_G_TEMP=	${_group}
2284
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2284
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2285
check-makevars::
2285
check-makevars::
2286
				@${ECHO_CMD} "The words all, ALL and default are reserved and cannot be"
2286
				@${ECHO_MSG} "The words all, ALL and default are reserved and cannot be"
2287
				@${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITES"
2287
				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
2288
				@${FALSE}
2288
				@${FALSE}
2289
.			endif
2289
.			endif
2290
_PATCH_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
2290
_PATCH_SITES_${_group}+=	${_S:C@^(.*/):[^/:]+$@\1@}
Lines 2305-2312 Link Here
2305
_G_TEMP=	${_group}
2305
_G_TEMP=	${_group}
2306
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2306
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2307
check-makevars::
2307
check-makevars::
2308
				@${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be"
2308
				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
2309
				@${ECHO_CMD} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
2309
				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
2310
				@${FALSE}
2310
				@${FALSE}
2311
.			endif
2311
.			endif
2312
.			if defined(_MASTER_SITES_${_group})
2312
.			if defined(_MASTER_SITES_${_group})
Lines 2326-2333 Link Here
2326
_G_TEMP=	${_group}
2326
_G_TEMP=	${_group}
2327
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2327
.			if ${_G_TEMP} == all || ${_G_TEMP} == ALL || ${_G_TEMP} == default
2328
check-makevars::
2328
check-makevars::
2329
				@${ECHO_CMD} "Makefile error: the words all, ALL and default are reserved and cannot be"
2329
				@${ECHO_MSG} "Makefile error: the words all, ALL and default are reserved and cannot be"
2330
				@${ECHO_CMD} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
2330
				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
2331
				@${FALSE}
2331
				@${FALSE}
2332
.			endif
2332
.			endif
2333
.			if defined(_PATCH_SITES_${_group})
2333
.			if defined(_PATCH_SITES_${_group})
Lines 2659-2665 Link Here
2659
2659
2660
.if !defined(CATEGORIES)
2660
.if !defined(CATEGORIES)
2661
check-categories:
2661
check-categories:
2662
	@${ECHO_CMD} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
2662
	@${ECHO_MSG} "${PKGNAME}: Makefile error: CATEGORIES is mandatory."
2663
	@${FALSE}
2663
	@${FALSE}
2664
.else
2664
.else
2665
2665
Lines 2683-2689 Link Here
2683
	@if ${ECHO_CMD} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \
2683
	@if ${ECHO_CMD} ${VALID_CATEGORIES} | ${GREP} -wq ${cat}; then \
2684
		${TRUE}; \
2684
		${TRUE}; \
2685
	else \
2685
	else \
2686
		${ECHO_CMD} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \
2686
		${ECHO_MSG} "${PKGNAME}: Makefile error: category ${cat} not in list of valid categories."; \
2687
		${FALSE}; \
2687
		${FALSE}; \
2688
	fi
2688
	fi
2689
.endfor
2689
.endfor
Lines 2781-2787 Link Here
2781
  }' | ${SED} -e 's \([^/ ][^ ]*\.\(.\)[^. ]*\) $${MAN\2PREFIX}/$$$$$$$${__lang}/man\2/\1${MANEXT}g' -e 's/ //g' -e 's/MANlPREFIX/MANLPREFIX/g' -e 's/MANnPREFIX/MANNPREFIX/g'
2781
  }' | ${SED} -e 's \([^/ ][^ ]*\.\(.\)[^. ]*\) $${MAN\2PREFIX}/$$$$$$$${__lang}/man\2/\1${MANEXT}g' -e 's/ //g' -e 's/MANlPREFIX/MANLPREFIX/g' -e 's/MANnPREFIX/MANNPREFIX/g'
2782
.if ${__pmlinks:Mbroken} == "broken"
2782
.if ${__pmlinks:Mbroken} == "broken"
2783
check-makevars::
2783
check-makevars::
2784
	@${ECHO_CMD} "${PKGNAME}: Makefile error: unable to parse MLINKS."
2784
	@${ECHO_MSG} "${PKGNAME}: Makefile error: unable to parse MLINKS."
2785
	@${FALSE}
2785
	@${FALSE}
2786
.endif
2786
.endif
2787
_MLINKS=	${_MLINKS_PREPEND}
2787
_MLINKS=	${_MLINKS_PREPEND}
Lines 3444-3450 Link Here
3444
	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
3444
	    INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
3445
	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
3445
	    INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
3446
	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
3446
	    ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}; then \
3447
			 ${ECHO_CMD} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
3447
			 ${ECHO_MSG} "===>  Script \"${CONFIGURE_SCRIPT}\" failed unexpectedly."; \
3448
			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
3448
			 (${ECHO_CMD} ${CONFIGURE_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
3449
			 ${FALSE}; \
3449
			 ${FALSE}; \
3450
		fi)
3450
		fi)
Lines 3645-3659 Link Here
3645
		fi; \
3645
		fi; \
3646
		if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
3646
		if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \
3647
				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
3647
				if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \
3648
						${ECHO_CMD} "===>   ${PKGNAME} is already installed"; \
3648
						${ECHO_MSG} "===>   ${PKGNAME} is already installed"; \
3649
				else \
3649
				else \
3650
						${ECHO_CMD} "===>   An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
3650
						${ECHO_MSG} "===>   An older version of ${PKGORIGIN} is already installed ($${found_package})"; \
3651
				fi; \
3651
				fi; \
3652
				${ECHO_CMD} "      You may wish to \`\`make deinstall'' and install this port again"; \
3652
				${ECHO_MSG} "      You may wish to \`\`make deinstall'' and install this port again"; \
3653
				${ECHO_CMD} "      by \`\`make reinstall'' to upgrade it properly."; \
3653
				${ECHO_MSG} "      by \`\`make reinstall'' to upgrade it properly."; \
3654
				${ECHO_CMD} "      If you really wish to overwrite the old port of ${PKGORIGIN}"; \
3654
				${ECHO_MSG} "      If you really wish to overwrite the old port of ${PKGORIGIN}"; \
3655
				${ECHO_CMD} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
3655
				${ECHO_MSG} "      without deleting it first, set the variable \"FORCE_PKG_REGISTER\""; \
3656
				${ECHO_CMD} "      in your environment or the \"make install\" command line."; \
3656
				${ECHO_MSG} "      in your environment or the \"make install\" command line."; \
3657
				exit 1; \
3657
				exit 1; \
3658
		fi
3658
		fi
3659
.else
3659
.else
Lines 3684-3691 Link Here
3684
.if !defined(NO_MTREE)
3684
.if !defined(NO_MTREE)
3685
	@if [ `${ID} -u` = 0 ]; then \
3685
	@if [ `${ID} -u` = 0 ]; then \
3686
		if [ ! -f ${MTREE_FILE} ]; then \
3686
		if [ ! -f ${MTREE_FILE} ]; then \
3687
			${ECHO_CMD} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
3687
			${ECHO_MSG} "Error: mtree file \"${MTREE_FILE}\" is missing."; \
3688
			${ECHO_CMD} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
3688
			${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \
3689
			exit 1; \
3689
			exit 1; \
3690
		else \
3690
		else \
3691
			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
3691
			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
Lines 3826-3832 Link Here
3826
					> ${WRKDIR}/.PLIST.stupid; \
3826
					> ${WRKDIR}/.PLIST.stupid; \
3827
				if [ -n "`${EGREP} ' (accept|recvfrom)$$' ${WRKDIR}/.PLIST.objdump`" ] ; then \
3827
				if [ -n "`${EGREP} ' (accept|recvfrom)$$' ${WRKDIR}/.PLIST.objdump`" ] ; then \
3828
					if [ -s ${WRKDIR}/.PLIST.stupid ]; then \
3828
					if [ -s ${WRKDIR}/.PLIST.stupid ]; then \
3829
						${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \
3829
						${ECHO_MSG} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \
3830
						${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.network; \
3830
						${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.network; \
3831
						${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.network; \
3831
						${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.network; \
3832
					else \
3832
					else \
Lines 3836-3842 Link Here
3836
			fi; \
3836
			fi; \
3837
			if [ -n "`${FIND} ${PREFIX}/$$i -prune \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) 2>/dev/null`" ]; then \
3837
			if [ -n "`${FIND} ${PREFIX}/$$i -prune \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) 2>/dev/null`" ]; then \
3838
				if [ -s ${WRKDIR}/.PLIST.stupid ]; then \
3838
				if [ -s ${WRKDIR}/.PLIST.stupid ]; then \
3839
					${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \
3839
					${ECHO_MSG} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \
3840
					${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.setuid; \
3840
					${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.setuid; \
3841
					${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.setuid; \
3841
					${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.setuid; \
3842
				else \
3842
				else \
Lines 4059-4067 Link Here
4059
pretty-print-www-site:
4059
pretty-print-www-site:
4060
	@www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
4060
	@www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \
4061
	if [ -n "$${www_site}" ]; then \
4061
	if [ -n "$${www_site}" ]; then \
4062
		${ECHO_CMD} -n " and/or visit the "; \
4062
		${ECHO_MSG} -n " and/or visit the "; \
4063
		${ECHO_CMD} -n "<a href=\"$${www_site}\">web site</a>"; \
4063
		${ECHO_MSG} -n "<a href=\"$${www_site}\">web site</a>"; \
4064
		${ECHO_CMD} " for futher informations"; \
4064
		${ECHO_MSG} " for futher informations"; \
4065
	fi
4065
	fi
4066
.endif
4066
.endif
4067
4067
Lines 4258-4264 Link Here
4258
				esac; \
4258
				esac; \
4259
				${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
4259
				${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
4260
			done; \
4260
			done; \
4261
			${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \
4261
			${ECHO_MSG} "${ECHO_CMD} $${file} not fetched" ; \
4262
		fi \
4262
		fi \
4263
	done)
4263
	done)
4264
.if defined(PATCHFILES)
4264
.if defined(PATCHFILES)
Lines 4290-4296 Link Here
4290
				esac; \
4290
				esac; \
4291
				${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
4291
				${ECHO_CMD} -n ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} "${FETCH_AFTER_ARGS}" '|| ' ; \
4292
			done; \
4292
			done; \
4293
			${ECHO_CMD} "${ECHO_CMD} $${file} not fetched" ; \
4293
			${ECHO_MSG} "${ECHO_CMD} $${file} not fetched" ; \
4294
		fi \
4294
		fi \
4295
	 done)
4295
	 done)
4296
.endif
4296
.endif
Lines 4318-4325 Link Here
4318
	for alg in ${CHECKSUM_ALGORITHMS:U}; do \
4318
	for alg in ${CHECKSUM_ALGORITHMS:U}; do \
4319
		eval alg_executable=\$$$$alg; \
4319
		eval alg_executable=\$$$$alg; \
4320
		if [ -z "$$alg_executable" ]; then \
4320
		if [ -z "$$alg_executable" ]; then \
4321
			${ECHO_CMD} "Checksum algorithm $$alg: Couldn't find the executable."; \
4321
			${ECHO_MSG} "Checksum algorithm $$alg: Couldn't find the executable."; \
4322
			${ECHO_CMD} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \
4322
			${ECHO_MSG} "Set $$alg=/path/to/$$alg in /etc/make.conf and try again."; \
4323
			exit 1; \
4323
			exit 1; \
4324
		fi; \
4324
		fi; \
4325
	done; \
4325
	done; \
Lines 5056-5068 Link Here
5056
5056
5057
_PRETTY_PRINT_DEPENDS_LIST=\
5057
_PRETTY_PRINT_DEPENDS_LIST=\
5058
	if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \
5058
	if [ ! -r ${INDEXDIR}/${INDEXFILE} ] ; then \
5059
		${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \
5059
		${ECHO_MSG} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \
5060
	else \
5060
	else \
5061
		target=${.TARGET:C/pretty-print-(.*)-depends-list/\1/} ; \
5061
		target=${.TARGET:C/pretty-print-(.*)-depends-list/\1/} ; \
5062
		if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi ; \
5062
		if [ "$$target" = "build" ] ; then fldnum=8 ; else fldnum=9 ; fi ; \
5063
		${ECHO_CMD} -n 'This port requires package(s) "' ; \
5063
		${ECHO_MSG} -n 'This port requires package(s) "' ; \
5064
		${ECHO_CMD} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \
5064
		${ECHO_MSG} -n `${AWK} -F\| "\\$$1 ~ /^${PKGNAME}/ {print \\$$$${fldnum};}" ${INDEXDIR}/${INDEXFILE}` ; \
5065
		${ECHO_CMD} "\" to $$target."; \
5065
		${ECHO_MSG} "\" to $$target."; \
5066
	fi;
5066
	fi;
5067
5067
5068
5068
Lines 5089-5095 Link Here
5089
.if defined(SUB_FILES)
5089
.if defined(SUB_FILES)
5090
.for file in ${SUB_FILES}
5090
.for file in ${SUB_FILES}
5091
.if !exists(${FILESDIR}/${file}.in)
5091
.if !exists(${FILESDIR}/${file}.in)
5092
	@${ECHO_CMD} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1
5092
	@${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1
5093
.else
5093
.else
5094
	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file}
5094
	@${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file}
5095
.endif
5095
.endif
Lines 5109-5115 Link Here
5109
generate-plist:
5109
generate-plist:
5110
	@${ECHO_MSG} "===>   Generating temporary packing list"
5110
	@${ECHO_MSG} "===>   Generating temporary packing list"
5111
	@${MKDIR} `${DIRNAME} ${TMPPLIST}`
5111
	@${MKDIR} `${DIRNAME} ${TMPPLIST}`
5112
	@if [ ! -f ${DESCR} ]; then ${ECHO_CMD} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
5112
	@if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
5113
	@>${TMPPLIST}
5113
	@>${TMPPLIST}
5114
	@for file in ${PLIST_FILES}; do \
5114
	@for file in ${PLIST_FILES}; do \
5115
		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
5115
		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
Lines 5248-5254 Link Here
5248
install-rc-script:
5248
install-rc-script:
5249
.if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
5249
.if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
5250
.if defined(USE_RCORDER)
5250
.if defined(USE_RCORDER)
5251
	@${ECHO_CMD} "===> Installing early rc.d startup script(s)"
5251
	@${ECHO_MSG} "===> Installing early rc.d startup script(s)"
5252
	@${ECHO_CMD} "@cwd /" >> ${TMPPLIST}
5252
	@${ECHO_CMD} "@cwd /" >> ${TMPPLIST}
5253
	@for i in ${USE_RCORDER}; do \
5253
	@for i in ${USE_RCORDER}; do \
5254
		${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
5254
		${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \
Lines 5257-5263 Link Here
5257
	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5257
	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5258
.endif
5258
.endif
5259
.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
5259
.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES"
5260
	@${ECHO_CMD} "===> Installing rc.d startup script(s)"
5260
	@${ECHO_MSG} "===> Installing rc.d startup script(s)"
5261
	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5261
	@${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}
5262
.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
5262
.if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 ))
5263
	@for i in ${USE_RC_SUBR}; do \
5263
	@for i in ${USE_RC_SUBR}; do \
Lines 5629-5635 Link Here
5629
.if defined(DESKTOP_ENTRIES)
5629
.if defined(DESKTOP_ENTRIES)
5630
	@set ${DESKTOP_ENTRIES} XXX; \
5630
	@set ${DESKTOP_ENTRIES} XXX; \
5631
	if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \
5631
	if [ `${EXPR} \( $$# - 1 \) % 6` -ne 0 ]; then \
5632
		${ECHO_CMD} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
5632
		${ECHO_MSG} "${PKGNAME}: Makefile error: the DESKTOP_ENTRIES list must contain one or more groups of 6 elements"; \
5633
		exit 1; \
5633
		exit 1; \
5634
	fi; \
5634
	fi; \
5635
	num=1; \
5635
	num=1; \
Lines 5641-5651 Link Here
5641
			entry="$$entry ($$1)"; \
5641
			entry="$$entry ($$1)"; \
5642
		fi; \
5642
		fi; \
5643
		if [ -z "$$1" ]; then \
5643
		if [ -z "$$1" ]; then \
5644
			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \
5644
			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 1 (Name) is empty"; \
5645
			exit 1; \
5645
			exit 1; \
5646
		fi; \
5646
		fi; \
5647
		if [ -z "$$4" ]; then \
5647
		if [ -z "$$4" ]; then \
5648
			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \
5648
			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 4 (Exec) is empty"; \
5649
			exit 1; \
5649
			exit 1; \
5650
		fi; \
5650
		fi; \
5651
		if [ -n "$$5" ]; then \
5651
		if [ -n "$$5" ]; then \
Lines 5656-5676 Link Here
5656
				fi; \
5656
				fi; \
5657
			done; \
5657
			done; \
5658
			if ! ${ECHO_CMD} "$$5" | ${GREP} -q ';$$'; then \
5658
			if ! ${ECHO_CMD} "$$5" | ${GREP} -q ';$$'; then \
5659
				${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \
5659
				${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) does not end with a semicolon"; \
5660
				exit 1; \
5660
				exit 1; \
5661
			fi; \
5661
			fi; \
5662
		else \
5662
		else \
5663
			if [ -z "`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`" ]; then \
5663
			if [ -z "`cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} desktop-categories`" ]; then \
5664
				${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \
5664
				${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 5 (Categories) is empty and could not be deduced from the CATEGORIES variable"; \
5665
				exit 1; \
5665
				exit 1; \
5666
			fi; \
5666
			fi; \
5667
		fi; \
5667
		fi; \
5668
		if [ -z "$$6" ]; then \
5668
		if [ -z "$$6" ]; then \
5669
			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \
5669
			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is empty"; \
5670
			exit 1; \
5670
			exit 1; \
5671
		fi; \
5671
		fi; \
5672
		if [ "x$$6" != "xtrue" ] && [ "x$$6" != "xfalse" ]; then \
5672
		if [ "x$$6" != "xtrue" ] && [ "x$$6" != "xfalse" ]; then \
5673
			${ECHO_CMD} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \
5673
			${ECHO_MSG} "${PKGNAME}: Makefile error: in desktop entry $$entry: field 6 (StartupNotify) is not \"true\" or \"false\""; \
5674
			exit 1; \
5674
			exit 1; \
5675
		fi; \
5675
		fi; \
5676
		shift 6; \
5676
		shift 6; \

Return to bug 100556