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

Collapse All | Expand All

(-)b/Mk/Uses/apache.mk (-6 / +6 lines)
Lines 372-378 show-modules: Link Here
372 
.for module in ${AVAILABLE_MODULES}
 372 
.for module in ${AVAILABLE_MODULES}
373 
	@${PRINTF} "%-20s : " ${module}
 373 
	@${PRINTF} "%-20s : " ${module}
374 
.	if ${APACHE_MODULES:M${module}}
 374 
.	if ${APACHE_MODULES:M${module}}
375 
		@${ECHO} -n "enabled "
 375 
		@${ECHO_MSG} -n "enabled "
376 
.		if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
 376 
.		if !empty(WITH_STATIC_MODULES) && ${WITH_STATIC_MODULES:M${module}}
377 
			@${ECHO_CMD} " (static)"
 377 
			@${ECHO_CMD} " (static)"
378 
.		else
 378 
.		else
Lines 404-414 _USES_build+= 490:ap-gen-plist Link Here
404 
ap-gen-plist:
 404 
ap-gen-plist:
405 
.if defined(AP_GENPLIST)
 405 
.if defined(AP_GENPLIST)
406 
.	if !exists(${PLIST})
 406 
.	if !exists(${PLIST})
407 
	@${ECHO} "===>  Generating apache plist"
 407 
	@${ECHO_MSG} "===>  Generating apache plist"
408 
	@${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
 408 
	@${ECHO_CMD} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST}
409 
	@${ECHO} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
 409 
	@${ECHO_CMD} "@postexec %D/sbin/apxs -e ${AP_MOD_EN} -n %%AP_NAME%% %D/%F" >> ${PLIST}
410 
	@${ECHO} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
 410 
	@${ECHO_CMD} "@postunexec ${SED} -i '' -E '/LoadModule[[:blank:]]+%%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST}
411 
	@${ECHO} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
 411 
	@${ECHO_CMD} "@postunexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST}
412 
.	endif
 412 
.	endif
413 
.endif
 413 
.endif
414 
.endif
 414 
.endif
(-)b/Mk/Uses/gem.mk (-1 / +1 lines)
Lines 118-124 do-install: Link Here
118 
.if empty(gem_ARGS:Mnoautoplist)
 118 
.if empty(gem_ARGS:Mnoautoplist)
119 
_USES_install+=	820:gem-autoplist
 119 
_USES_install+=	820:gem-autoplist
120 
gem-autoplist:
 120 
gem-autoplist:
121 
	@${ECHO} ${GEM_SPEC} >> ${TMPPLIST}
 121 
	@${ECHO_CMD} ${GEM_SPEC} >> ${TMPPLIST}
122 
.if ${PORT_OPTIONS:MDOCS}
 122 
.if ${PORT_OPTIONS:MDOCS}
123 
	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
 123 
	@${FIND} -ds ${STAGEDIR}${PREFIX}/${DOC_DIR} -type f -print | ${SED} -E -e \
124 
		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
 124 
		's,^${STAGEDIR}${PREFIX}/?,,' >> ${TMPPLIST}
(-)b/Mk/Uses/mono.mk (-1 / +1 lines)
Lines 224-230 makenupkg: Link Here
224 
				eval url="\$${$${feed}_URL}$${0%%=*}/$${0##*=}/$${0%%=*}.$${0##*=}.nupkg"; \
 224 
				eval url="\$${$${feed}_URL}$${0%%=*}/$${0##*=}/$${0%%=*}.$${0##*=}.nupkg"; \
225 
			fi; \
 225 
			fi; \
226 
			if curl --output /dev/null --silent --head --fail $$url; then\
 226 
			if curl --output /dev/null --silent --head --fail $$url; then\
227 
				${ECHO} $$0 >> ${WRKDIR}/nupkg-$$feed; \
 227 
				${ECHO_CMD} $$0 >> ${WRKDIR}/nupkg-$$feed; \
228 
				found=yes; \
 228 
				found=yes; \
229 
				break; \
 229 
				break; \
230 
			fi; \
 230 
			fi; \
(-)b/Mk/Uses/perl5.mk (-1 / +1 lines)
Lines 305-311 fix-perl-things: Link Here
305 
	@(if [ -d ${STAGEDIR}${PACKLIST_DIR} ] ; then \
 305 
	@(if [ -d ${STAGEDIR}${PACKLIST_DIR} ] ; then \
306 
		${FIND} ${STAGEDIR}${PACKLIST_DIR} -name .packlist | while read f ; do \
 306 
		${FIND} ${STAGEDIR}${PACKLIST_DIR} -name .packlist | while read f ; do \
307 
			${SED} -i '' 's|^${STAGEDIR}||' "$$f"; \
 307 
			${SED} -i '' 's|^${STAGEDIR}||' "$$f"; \
308 
			${ECHO} $$f | ${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}; \
 308 
			${ECHO_CMD} $$f | ${SED} -e 's|^${STAGEDIR}||' >> ${TMPPLIST}; \
309 
		done \
 309 
		done \
310 
	fi) || :
 310 
	fi) || :
311 

          311
          

        






  

  Return to bug 256185