Attachment #156506 for bug #199978




				LINUXBASE=${LINUXBASE} \
				LOCALBASE=${LOCALBASE} \
				"STRIP=${STRIP}" \
				TMPPLIST=${TMPPLIST} \
				TMPPLISTORIG=${TMPPLIST_ORIG}
.if !empty(USES:Mdesktop-file-utils)
QA_ENV+=		USESDESKTOPFILEUTILS=yes
.endif

				WRKSRC=${WRKSRC} \
				MTREE_FILE=${MTREE_FILE} \
				TMPPLIST=${TMPPLIST} \
				TMPPLISTORIG=${TMPPLIST_ORIG} \
				SCRIPTSDIR=${SCRIPTSDIR} \
				PLIST_SUB_SED="${PLIST_SUB_SED}" \
				PORT_OPTIONS="${PORT_OPTIONS}" \

PKGMESSAGE?=	${PKGDIR}/pkg-message

TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
TMPPLIST_ORIG?=	${WRKDIR}/.PLIST.mktmp.orig
TMPPLIST_SORT?=	${WRKDIR}/.PLIST.mktmp.sorted
TMPGUCMD?=	${WRKDIR}/.PLIST.gucmd


		DATADIR="${DATADIR_REL}" \
		WWWDIR="${WWWDIR_REL}" \
		ETCDIR="${ETCDIR_REL}"
PLIST_SUB_REGEX=	${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}

DESKTOPDIR?=		${PREFIX}/share/applications


	@if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
	@>${TMPPLIST}
	@for file in ${PLIST_FILES}; do \
		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB_REGEX} >> ${TMPPLIST}; \
	done
	@if [ -f ${PLIST} ]; then \
		${SED} ${PLIST_SUB_REGEX} ${PLIST} >> ${TMPPLIST}; \
	fi
	@${CP} ${TMPPLIST} ${TMPPLIST_ORIG}

# Keep PLIST_DIRSTRY as compatibility
.for dir in ${PLIST_DIRS} ${PLIST_DIRSTRY}
	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_REGEX} -e 's,^,@dir ,' >> ${TMPPLIST}
.endfor

.if defined(USE_LINUX_PREFIX)

Lines 261-268 Link Here

(-)Mk/Scripts/qa.sh (-1 / +18 lines)
261	fi	261	fi
262	}	262	}
263		263
264	checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar"	264	infoplist() {
		265	local cnt=0
		266	for f in $(cat ${TMPPLISTORIG} \| grep -E "^info\/.*\.info$"); do
		267	if [ -n "${f}" ]; then
		268	err "Info files not allowed in plist, they should be declared with INFO: ${f}"
		269	cnt=$((cnt+1))
		270	fi
		271	done
		272	for f in $(cat ${TMPPLISTORIG} \| grep -E "^@info"); do
		273	if [ -n "${f}" ]; then
		274	err "@info macros should never be in plist: ${f}"
		275	cnt=$((cnt+1))
		276	fi
		277	done
		278	[ $cnt -eq 0 ] \|\| return 1
		279	}
265		280
		281	checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar infoplist"
		282
266	ret=0	283	ret=0
267	cd ${STAGEDIR}	284	cd ${STAGEDIR}
268	for check in ${checks}; do	285	for check in ${checks}; do

Return to bug 199978

Lines 1521-1527 Link Here

(-)Mk/bsd.port.mk (-4 / +9 lines)
1521	LINUXBASE=${LINUXBASE} \	1521	LINUXBASE=${LINUXBASE} \
1522	LOCALBASE=${LOCALBASE} \	1522	LOCALBASE=${LOCALBASE} \
1523	"STRIP=${STRIP}" \	1523	"STRIP=${STRIP}" \
1524	TMPPLIST=${TMPPLIST}	1524	TMPPLIST=${TMPPLIST} \
		1525	TMPPLISTORIG=${TMPPLIST_ORIG}
1525	.if !empty(USES:Mdesktop-file-utils)	1526	.if !empty(USES:Mdesktop-file-utils)
1526	QA_ENV+= USESDESKTOPFILEUTILS=yes	1527	QA_ENV+= USESDESKTOPFILEUTILS=yes
1527	.endif	1528	.endif
Lines 1539-1544 Link Here
1539	WRKSRC=${WRKSRC} \	1540	WRKSRC=${WRKSRC} \
1540	MTREE_FILE=${MTREE_FILE} \	1541	MTREE_FILE=${MTREE_FILE} \
1541	TMPPLIST=${TMPPLIST} \	1542	TMPPLIST=${TMPPLIST} \
		1543	TMPPLISTORIG=${TMPPLIST_ORIG} \
1542	SCRIPTSDIR=${SCRIPTSDIR} \	1544	SCRIPTSDIR=${SCRIPTSDIR} \
1543	PLIST_SUB_SED="${PLIST_SUB_SED}" \	1545	PLIST_SUB_SED="${PLIST_SUB_SED}" \
1544	PORT_OPTIONS="${PORT_OPTIONS}" \	1546	PORT_OPTIONS="${PORT_OPTIONS}" \
Lines 2185-2190 Link Here
2185	PKGMESSAGE?= ${PKGDIR}/pkg-message	2187	PKGMESSAGE?= ${PKGDIR}/pkg-message
2186		2188
2187	TMPPLIST?= ${WRKDIR}/.PLIST.mktmp	2189	TMPPLIST?= ${WRKDIR}/.PLIST.mktmp
		2190	TMPPLIST_ORIG?= ${WRKDIR}/.PLIST.mktmp.orig
2188	TMPPLIST_SORT?= ${WRKDIR}/.PLIST.mktmp.sorted	2191	TMPPLIST_SORT?= ${WRKDIR}/.PLIST.mktmp.sorted
2189	TMPGUCMD?= ${WRKDIR}/.PLIST.gucmd	2192	TMPGUCMD?= ${WRKDIR}/.PLIST.gucmd
2190		2193
Lines 2741-2746 Link Here
2741	DATADIR="${DATADIR_REL}" \	2744	DATADIR="${DATADIR_REL}" \
2742	WWWDIR="${WWWDIR_REL}" \	2745	WWWDIR="${WWWDIR_REL}" \
2743	ETCDIR="${ETCDIR_REL}"	2746	ETCDIR="${ETCDIR_REL}"
		2747	PLIST_SUB_REGEX= ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
2744		2748
2745	DESKTOPDIR?= ${PREFIX}/share/applications	2749	DESKTOPDIR?= ${PREFIX}/share/applications
2746		2750
Lines 5030-5044 Link Here
5030	@if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi	5034	@if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi
5031	@>${TMPPLIST}	5035	@>${TMPPLIST}
5032	@for file in ${PLIST_FILES}; do \	5036	@for file in ${PLIST_FILES}; do \
5033	${ECHO_CMD} $${file} \| ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \	5037	${ECHO_CMD} $${file} \| ${SED} ${PLIST_SUB_REGEX} >> ${TMPPLIST}; \
5034	done	5038	done
5035	@if [ -f ${PLIST} ]; then \	5039	@if [ -f ${PLIST} ]; then \
5036	${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \	5040	${SED} ${PLIST_SUB_REGEX} ${PLIST} >> ${TMPPLIST}; \
5037	fi	5041	fi
		5042	@${CP} ${TMPPLIST} ${TMPPLIST_ORIG}
5038		5043
5039	# Keep PLIST_DIRSTRY as compatibility	5044	# Keep PLIST_DIRSTRY as compatibility
5040	.for dir in ${PLIST_DIRS} ${PLIST_DIRSTRY}	5045	.for dir in ${PLIST_DIRS} ${PLIST_DIRSTRY}
5041	@${ECHO_CMD} ${dir} \| ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}	5046	@${ECHO_CMD} ${dir} \| ${SED} ${PLIST_SUB_REGEX} -e 's,^,@dir ,' >> ${TMPPLIST}
5042	.endfor	5047	.endfor
5043		5048
5044	.if defined(USE_LINUX_PREFIX)	5049	.if defined(USE_LINUX_PREFIX)