Date: Mon, 12 Oct 1998 22:45:59 +0900 (JST) From: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/8283: change the way to modify fonts.alias Message-ID: <199810121345.WAA00702@milk.tea.forus.or.jp>
next in thread | raw e-mail | index | archive | help
>Number: 8283
>Category: ports
>Synopsis: change the way to modify fonts.alias
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 12 07:10:00 PDT 1998
>Last-Modified:
>Originator: Toshihiko SHIMOKAWA
>Organization:
ForUs
>Release: FreeBSD 2.2.7-RELEASE i386
>Environment:
with X Window System
>Description:
Before this patch, elisa8x8 ports add fonts alias by do-install target.
And remove fonts alias & add fonts alias in package by PLIST's @exec &
@unexec command.
This patch modify it. I stop to use @exec & @unexec. But I start to use
pkg/REQ script. Modification of fonts.alias moves into the file.
>How-To-Repeat:
>Fix:
diff -u -ruN elisa8x8.old/Makefile elisa8x8/Makefile
--- elisa8x8.old/Makefile Sun Aug 23 01:05:35 1998
+++ elisa8x8/Makefile Sun Oct 11 23:34:18 1998
@@ -35,26 +35,15 @@
${INSTALL_DATA} elisat10.pcf.gz ${FONTSDIR} ;\
${INSTALL_DATA} jpnhn4-jis.pcf.gz ${FONTSDIR} ;\
${INSTALL_DATA} jpnhn4-iso.pcf.gz ${FONTSDIR} ;\
- ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\
- ${ECHO} "Updating fonts.dir" ;\
- ${MKFONTDIR_CMD} ${FONTSDIR} ;\
- ${ECHO} "Updating fonts.alias" ;\
- ${TOUCH} ${FONTSDIR}/fonts.alias ;\
- ${CAT} ${FONTSDIR}/fonts.alias fonts.alias > fonts.alias.tmp ;\
- ${INSTALL_DATA} fonts.alias.tmp ${FONTSDIR} ;\
- ${MV} -f ${FONTSDIR}/fonts.alias.tmp ${FONTSDIR}/fonts.alias ;\
)
post-install:
+ @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCDIR}
@(cd ${WRKSRC} ;\
${INSTALL_DATA} ${PORTDOCS} ${DOCDIR} ;\
)
.endif
- @${ECHO} "**********************************************************"
- @${ECHO} "You should restart X server or do 'xset fp rehash' command"
- @${ECHO} "to use installed fonts."
- @${ECHO} "**********************************************************"
.include <bsd.port.mk>
diff -u -ruN elisa8x8.old/pkg/PLIST elisa8x8/pkg/PLIST
--- elisa8x8.old/pkg/PLIST Sat Aug 22 02:11:02 1998
+++ elisa8x8/pkg/PLIST Sat Oct 10 21:40:07 1998
@@ -4,15 +4,4 @@
share/doc/elisa/elisa100.doc
share/doc/elisa/elisat10.doc
share/doc/elisa/elisat10.html
-@exec echo "Updating fonts.dir"
-@exec mkfontdir %D/lib/X11/fonts/misc
-@exec echo "Updating fonts.alias"
-@exec cd %D/lib/X11/fonts/misc ; touch fonts.alias ; cp fonts.alias fonts.alias.orig ; (cat fonts.alias.orig ; echo "k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0" ; echo "r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0"; echo "a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1"; echo "4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1" ) > fonts.alias ; rm fonts.alias.orig
-@unexec echo "Updating fonts.dir"
-@unexec mkfontdir %D/lib/X11/fonts/misc
-@unexec echo "updating fonts.alias" ; cd %D/lib/X11/fonts/misc; cp fonts.alias fonts.alias.orig; grep -v 'elisa100\-fixed\-medium\-r\-normal' fonts.alias.orig | grep -v 'hiro\-fixed\-medium\-r\-normal' > fonts.alias; rm fonts.alias.orig
-@exec echo "**********************************************************"
-@exec echo "You should restart X server or do 'xset fp rehash' command"
-@exec echo "to use installed fonts."
-@exec echo "**********************************************************"
@dirrm share/doc/elisa
diff -u -ruN elisa8x8.old/pkg/REQ elisa8x8/pkg/REQ
--- elisa8x8.old/pkg/REQ Thu Jan 1 09:00:00 1970
+++ elisa8x8/pkg/REQ Sun Oct 11 23:15:34 1998
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+if [ x$1 = x ]; then
+ exit 1
+fi
+if [ x$2 != xINSTALL -a x$2 != xDEINSTALL ]; then
+ exit 1
+fi
+
+FONTDIR=${PKG_PREFIX}/lib/X11/fonts/misc
+export FONTDIR
+
+# font alias entry here!
+TMPFILE=/tmp/install-fonts-alias-$$
+cat << EOF > ${TMPFILE}
+k8 -elisa100-fixed-medium-r-normal--8-70-75-75-c-80-jisx0208.1983-0
+r8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-jisx0201.1976-0
+a8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+4x8 -hiro-fixed-medium-r-normal--8-70-75-75-c-40-iso8859-1
+EOF
+
+echo Updating ${FONTDIR}/fonts.alias
+cd ${FONTDIR}
+touch fonts.alias
+cp fonts.alias fonts.alias.orig
+if [ x$2 = xINSTALL ]; then
+ cat fonts.alias.orig ${TMPFILE} > fonts.alias
+elif [ x$2 = xDEINSTALL ]; then
+ grep -v -e "`cat ${TMPFILE}`" fonts.alias.orig > fonts.alias
+fi
+rm fonts.alias.orig ${TMPFILE}
+echo Making fonts.dir in ${FONTDIR}
+mkfontdir
+
+echo '**********************************************************'
+echo "You should restart X server or do 'xset fp rehash' command"
+echo 'to enable this update.'
+echo '**********************************************************'
+
+exit 0
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199810121345.WAA00702>