kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Try to fix font handling for xorg fonts when using staging and pkgng.

Browse source 
This should silence all QAT messages about leftover font files.

Bump portrevision for all affected ports.

Original idea:		bapt
This commit is contained in:
Niclas Zeising 2013-12-19 10:49:00 +00:00
parent 837e3284ec
commit 0406d5b04f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=336886
42 changed files with 97 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Keywords/fc.yaml Normal file
View file

@ -0,0 +1,9 @@
# $FreeBSD$
#
# MAINTAINER: x11@FreeBSD.org
actions: [dirrmtry]
post-install: |
fc-cache -s %D/%@ 2>/dev/null || true
post-deinstall: |
fc-cache -s %D/%@ 2>/dev/null || true

19
Keywords/fcfontsdir.yaml Normal file
View file

@ -0,0 +1,19 @@
# $FreeBSD$
#
# MAINTAINER: x11@FreeBSD.org
actions: [dirrmtry]
post-install: |
fc-cache -s %D/%@ 2>/dev/null || true
mkfontscale %D/%@ 2>/dev/null || true
mkfontdir %D/%@ 2>/dev/null || true
post-deinstall: |
fc-cache -s %D/%@ 2>/dev/null || true
mkfontscale %D/%@ 2>/dev/null || true
if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then
rm %D/%@/fonts.scale
fi
mkfontdir %D/%@ 2>/dev/null || true
if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@/fonts.dir 2>/dev/null`" = '2' ]; then
rm %D/%@/fonts.dir
fi

17
Keywords/fontsdir.yaml Normal file
View file

@ -0,0 +1,17 @@
# $FreeBSD$
#
# MAINTAINER: x11@FreeBSD.org
actions: [dirrmtry]
post-install: |
mkfontscale %D/%@ 2>/dev/null || true
mkfontsdir %D/%@ 2>/dev/null || true
post-deinstall: |
mkfontscale %@ 2>/dev/null || true
if [ -e %D/%@/fonts.scale -a "`stat -f '%%z' %D/%@/fonts.scale 2>/dev/null`" = '2' ]; then
rm %D/%@/fonts.scale
fi
mkfontdir %@ 2>/dev/null || true
if [ -e %D/%@/fonts.dir -a "`stat -f '%%z' %D/%@§fonts.dir 2>/dev/null`" = '2' ]; then
rm %D/%@/fonts.dir
fi

14
Mk/bsd.xorg.mk
View file

@ -104,6 +104,19 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
. endif
post-install:
.if defined(WITH_PKGNG)
. for _fontdir in ${FONTDIR}
. if ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == yes
@${ECHO_CMD} "@fcfontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
. elif ${INSTALLS_TTF} == yes && ${NEED_MKFONTFOO} == no
@${ECHO_CMD} "@fc lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
. elif ${NEED_MKFONTFOO} == yes
@${ECHO_CMD} "@fontsdir lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
. else
@${ECHO_CMD} "@dirrmtry lib/X11/fonts/${_fontdir}" >> ${TMPPLIST}
. endif
. endfor
.else
. if ${INSTALLS_TTF} == "yes"
. for _fontdir in ${FONTDIR}
@${ECHO_CMD} "@exec fc-cache -s %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
@ -123,6 +136,7 @@ post-install:
@${ECHO_CMD} "@unexec rmdir %D/lib/X11/fonts/${_fontdir} 2>/dev/null || true" >> ${TMPPLIST}
. endfor
. endif
.endif
. if ${XORG_CAT} == "lib"
USES+= pathfix

1
x11-fonts/encodings/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= encodings
PORTVERSION= 1.0.4
PORTREVISION=
PORTEPOCH= 1
CATEGORIES= x11-fonts

1
x11-fonts/font-adobe-100dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-adobe-100dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-adobe-75dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-adobe-75dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-adobe-utopia-100dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-adobe-utopia-100dpi
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-adobe-utopia-75dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-adobe-utopia-75dpi
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-adobe-utopia-type1/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-adobe-utopia-type1
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-alias/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-alias
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-arabic-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-arabic-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bh-100dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bh-100dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bh-75dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bh-75dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-100dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bh-lucidatypewriter-75dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bh-ttf/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bh-ttf
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bh-type1/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bh-type1
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bitstream-100dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bitstream-100dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bitstream-75dpi/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bitstream-75dpi
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bitstream-speedo/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= font-bitstream-speedo
PORTVERSION= 1.0.2
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-bitstream-type1/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-bitstream-type1
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-cronyx-cyrillic/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-cronyx-cyrillic
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-cursor-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-cursor-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-daewoo-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-daewoo-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-dec-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-dec-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-ibm-type1/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-ibm-type1
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-isas-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-isas-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-jis-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-jis-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-micro-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-micro-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-misc-cyrillic/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-misc-cyrillic
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-misc-ethiopic/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= font-misc-ethiopic
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-misc-meltho/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= font-misc-meltho
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-misc-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-misc-misc
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-mutt-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-mutt-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-schumacher-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-schumacher-misc
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-screen-cyrillic/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-screen-cyrillic
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-sony-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-sony-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-sun-misc/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-sun-misc
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-util/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-util
PORTVERSION= 1.3.0
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-winitzki-cyrillic/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-winitzki-cyrillic
PORTVERSION= 1.0.3
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org

1
x11-fonts/font-xfree86-type1/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= font-xfree86-type1
PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= x11-fonts
MAINTAINER= x11@FreeBSD.org