diff options
| -rw-r--r-- | x11-fonts/linux-f10-fontconfig/Makefile | 10 | ||||
| -rw-r--r-- | x11-fonts/linux-f10-fontconfig/pkg-install | 6 | ||||
| -rw-r--r-- | x11-fonts/linux-f8-fontconfig/Makefile | 10 | ||||
| -rw-r--r-- | x11-fonts/linux-f8-fontconfig/pkg-install | 6 | ||||
| -rw-r--r-- | x11-fonts/linux-fontconfig/Makefile | 10 | ||||
| -rw-r--r-- | x11-fonts/linux-fontconfig/pkg-install | 6 |
6 files changed, 12 insertions, 36 deletions
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile index 8aeecf9..c01253b 100644 --- a/x11-fonts/linux-f10-fontconfig/Makefile +++ b/x11-fonts/linux-f10-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts linux DISTNAME= ${PORTNAME}-${PORTVERSION}-5 @@ -23,12 +23,10 @@ INSTALLS_SHLIB= yes BRANDELF_DIRS= usr/bin -post-patch: - @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ - s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \ - ${WRKSRC}/etc/fonts/fonts.conf +post-extract: + ${RM} ${WRKSRC}/etc/fonts/fonts.conf post-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf .include <bsd.port.mk> diff --git a/x11-fonts/linux-f10-fontconfig/pkg-install b/x11-fonts/linux-f10-fontconfig/pkg-install deleted file mode 100644 index ec59429..0000000 --- a/x11-fonts/linux-f10-fontconfig/pkg-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$2" = "POST-INSTALL" ]; then - echo "Running fc-cache to build fontconfig cache..." - ${PKG_PREFIX}/usr/bin/fc-cache -f -v -fi diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile index 8aeecf9..c01253b 100644 --- a/x11-fonts/linux-f8-fontconfig/Makefile +++ b/x11-fonts/linux-f8-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts linux DISTNAME= ${PORTNAME}-${PORTVERSION}-5 @@ -23,12 +23,10 @@ INSTALLS_SHLIB= yes BRANDELF_DIRS= usr/bin -post-patch: - @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ - s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \ - ${WRKSRC}/etc/fonts/fonts.conf +post-extract: + ${RM} ${WRKSRC}/etc/fonts/fonts.conf post-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf .include <bsd.port.mk> diff --git a/x11-fonts/linux-f8-fontconfig/pkg-install b/x11-fonts/linux-f8-fontconfig/pkg-install deleted file mode 100644 index ec59429..0000000 --- a/x11-fonts/linux-f8-fontconfig/pkg-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$2" = "POST-INSTALL" ]; then - echo "Running fc-cache to build fontconfig cache..." - ${PKG_PREFIX}/usr/bin/fc-cache -f -v -fi diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile index 8aeecf9..c01253b 100644 --- a/x11-fonts/linux-fontconfig/Makefile +++ b/x11-fonts/linux-fontconfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= fontconfig PORTVERSION= 2.2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts linux DISTNAME= ${PORTNAME}-${PORTVERSION}-5 @@ -23,12 +23,10 @@ INSTALLS_SHLIB= yes BRANDELF_DIRS= usr/bin -post-patch: - @${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \ - s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \ - ${WRKSRC}/etc/fonts/fonts.conf +post-extract: + ${RM} ${WRKSRC}/etc/fonts/fonts.conf post-install: - PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${LN} -s ${X11BASE}/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/fonts.conf .include <bsd.port.mk> diff --git a/x11-fonts/linux-fontconfig/pkg-install b/x11-fonts/linux-fontconfig/pkg-install deleted file mode 100644 index ec59429..0000000 --- a/x11-fonts/linux-fontconfig/pkg-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ "$2" = "POST-INSTALL" ]; then - echo "Running fc-cache to build fontconfig cache..." - ${PKG_PREFIX}/usr/bin/fc-cache -f -v -fi |
