Attachment 146429 Details for Bug 193082 – second patch

[patch] second patch

fonts-package-building.patch (text/plain), 3.35 KB, created by Adam Weinberger on 2014-08-28 01:35:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Weinberger

Created: 2014-08-28 01:35:55 UTC

Size: 3.35 KB

patch

obsolete

>Index: Mk/bsd.port.mk
>===================================================================
>--- Mk/bsd.port.mk	(revision 366330)
>+++ Mk/bsd.port.mk	(working copy)
>@@ -1571,7 +1571,7 @@
> INSTALL_WRKSRC?=${WRKSRC}
> 
> PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} \
>-			RESETPREFIX=${PREFIX}
>+			RESETPREFIX=${PREFIX} PACKAGE_BUILDING=${PACKAGE_BUILDING}
> SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
> 		DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
> 		WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}
>Index: Keywords/fc.ucl
>===================================================================
>--- Keywords/fc.ucl	(revision 366330)
>+++ Keywords/fc.ucl	(working copy)
>@@ -4,7 +4,7 @@
> 
> actions: [dirrmtry]
> post-install: <<EOD
>-  fc-cache -s %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && fc-cache -s %D/%@ 2>/dev/null || true
> EOD
> post-deinstall: <<EOD
>   fc-cache -s %D/%@ 2>/dev/null || true
>Index: Keywords/fcfontsdir.ucl
>===================================================================
>--- Keywords/fcfontsdir.ucl	(revision 366330)
>+++ Keywords/fcfontsdir.ucl	(working copy)
>@@ -4,9 +4,9 @@
> 
> actions: [dirrmtry]
> post-install: <<EOD
>-  fc-cache -s %D/%@ 2>/dev/null || true
>-  mkfontscale %D/%@ 2>/dev/null || true
>-  mkfontdir %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && fc-cache -s %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontscale %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontdir %D/%@ 2>/dev/null || true
> EOD
> post-deinstall: <<EOD
>   fc-cache -s %D/%@ 2>/dev/null || true
>Index: Keywords/fcfontsdir.yaml
>===================================================================
>--- Keywords/fcfontsdir.yaml	(revision 366330)
>+++ Keywords/fcfontsdir.yaml	(working copy)
>@@ -4,9 +4,9 @@
> 
> actions: [dirrmtry]
> post-install: |
>-  fc-cache -s %D/%@ 2>/dev/null || true
>-  mkfontscale %D/%@ 2>/dev/null || true
>-  mkfontdir %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && fc-cache -s %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontscale %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontdir %D/%@ 2>/dev/null || true
> post-deinstall: |
>   fc-cache -s %D/%@ 2>/dev/null || true
>   mkfontscale %D/%@ 2>/dev/null || true
>Index: Keywords/fontsdir.ucl
>===================================================================
>--- Keywords/fontsdir.ucl	(revision 366330)
>+++ Keywords/fontsdir.ucl	(working copy)
>@@ -4,8 +4,8 @@
> 
> actions: [dirrmtry]
> post-install: <<EOD
>-  mkfontscale %D/%@ 2>/dev/null || true
>-  mkfontdir %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontscale %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontdir %D/%@ 2>/dev/null || true
> EOD
> post-deinstall: <<EOD
>   mkfontscale %D/%@ 2>/dev/null || true
>Index: Keywords/fontsdir.yaml
>===================================================================
>--- Keywords/fontsdir.yaml	(revision 366330)
>+++ Keywords/fontsdir.yaml	(working copy)
>@@ -4,8 +4,8 @@
> 
> actions: [dirrmtry]
> post-install: |
>-  mkfontscale %D/%@ 2>/dev/null || true
>-  mkfontdir %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontscale %D/%@ 2>/dev/null || true
>+  [ -z "${PACKAGE_BUILDING}" ] && mkfontdir %D/%@ 2>/dev/null || true
> post-deinstall: |
>   mkfontscale %D/%@ 2>/dev/null || true
>   if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then

Actions: View | Diff

Attachments on bug 193082: 146414 | 146429 | 146432