Attachment 156506 Details for Bug 199978 – Updated patch

[patch] Updated patch

ports-Mk-infoplist-2.patch (text/plain), 2.85 KB, created by Yuri Victorovich on 2015-05-08 11:14:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-05-08 11:14:37 UTC

Size: 2.85 KB

patch

obsolete

>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 385760)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -1521,7 +1521,8 @@
> 				LINUXBASE=${LINUXBASE} \
> 				LOCALBASE=${LOCALBASE} \
> 				"STRIP=${STRIP}" \
>-				TMPPLIST=${TMPPLIST}
>+				TMPPLIST=${TMPPLIST} \
>+				TMPPLISTORIG=${TMPPLIST_ORIG}
> .if !empty(USES:Mdesktop-file-utils)
> QA_ENV+=		USESDESKTOPFILEUTILS=yes
> .endif
>@@ -1539,6 +1540,7 @@
> 				WRKSRC=${WRKSRC} \
> 				MTREE_FILE=${MTREE_FILE} \
> 				TMPPLIST=${TMPPLIST} \
>+				TMPPLISTORIG=${TMPPLIST_ORIG} \
> 				SCRIPTSDIR=${SCRIPTSDIR} \
> 				PLIST_SUB_SED="${PLIST_SUB_SED}" \
> 				PORT_OPTIONS="${PORT_OPTIONS}" \
>@@ -2185,6 +2187,7 @@
> PKGMESSAGE?=	${PKGDIR}/pkg-message
> 
> TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
>+TMPPLIST_ORIG?=	${WRKDIR}/.PLIST.mktmp.orig
> TMPPLIST_SORT?=	${WRKDIR}/.PLIST.mktmp.sorted
> TMPGUCMD?=	${WRKDIR}/.PLIST.gucmd
> 
>@@ -2741,6 +2744,7 @@
> 		DATADIR="${DATADIR_REL}" \
> 		WWWDIR="${WWWDIR_REL}" \
> 		ETCDIR="${ETCDIR_REL}"
>+PLIST_SUB_REGEX=	${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/}
> 
> DESKTOPDIR?=		${PREFIX}/share/applications
> 
>@@ -5030,15 +5034,16 @@
> 	@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:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \
>+		${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB_REGEX} >> ${TMPPLIST}; \
> 	done
> 	@if [ -f ${PLIST} ]; then \
>-		${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \
>+		${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:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}
>+	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB_REGEX} -e 's,^,@dir ,' >> ${TMPPLIST}
> .endfor
> 
> .if defined(USE_LINUX_PREFIX)
>Index: Mk/Scripts/qa.sh
>===================================================================
>--- Mk/Scripts/qa.sh	(revision 385760)
>+++ Mk/Scripts/qa.sh	(working copy)
>@@ -261,8 +261,25 @@
> 	fi
> }
> 
>-checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar"
>+infoplist() {
>+	local cnt=0
>+	for f in $(cat ${TMPPLISTORIG} | grep -E "^info\/.*\.info$"); do
>+		if [ -n "${f}" ]; then
>+			err "Info files not allowed in plist, they should be declared with INFO: ${f}"
>+			cnt=$((cnt+1))
>+		fi
>+	done
>+	for f in $(cat ${TMPPLISTORIG} | grep -E "^@info"); do
>+		if [ -n "${f}" ]; then
>+			err "@info macros should never be in plist: ${f}"
>+			cnt=$((cnt+1))
>+		fi
>+	done
>+	[ $cnt -eq 0 ] || return 1
>+}
> 
>+checks="shebang symlinks paths stripped desktopfileutils sharedmimeinfo suidfiles libtool libperl prefixvar infoplist"
>+
> ret=0
> cd ${STAGEDIR}
> for check in ${checks}; do

Actions: View | Diff

Attachments on bug 199978: 156411 | 156412 | 156415 | 156480 | 156506 | 156507