summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>2000-06-01 06:46:32 +0000
committerasami <asami@FreeBSD.org>2000-06-01 06:46:32 +0000
commit92170126a08edf49e32c345c624893dd842ed7de (patch)
tree671aad50e217d29cd957e667904457479f03ed5e
parent272323e5ce0d55c612b70d1af2ccbde6a5ae673a (diff)
downloadFreeBSD-ports-92170126a08edf49e32c345c624893dd842ed7de.zip
FreeBSD-ports-92170126a08edf49e32c345c624893dd842ed7de.tar.gz
Remove empty fonts.dir and fonts.alias files. (Note chinese/kcfonts still
leaves fonts.alias behind -- it is not removing any entries from that file.)
Diffstat
-rw-r--r--chinese/kcfonts/pkg-plist2
-rw-r--r--games/xjewel/pkg-plist1
-rw-r--r--japanese/elisa10x8/pkg-plist2
-rw-r--r--japanese/elisa8x8/pkg-plist2
-rw-r--r--japanese/k10/pkg-plist2
-rw-r--r--japanese/k12/pkg-plist2
-rw-r--r--japanese/kanji18/files/DEINSTALL.tmpl1
-rw-r--r--japanese/kanji18/pkg-plist3
-rw-r--r--japanese/kanji26/files/DEINSTALL.tmpl1
-rw-r--r--japanese/kanji26/pkg-plist3
-rw-r--r--japanese/kappa20/pkg-plist2
-rw-r--r--korean/baekmukfonts-bdf/pkg-plist1
-rw-r--r--korean/hanyangfonts/pkg-plist1
-rw-r--r--korean/johabfonts/pkg-plist1
-rw-r--r--korean/kaistfonts/pkg-plist1
-rw-r--r--korean/mizifont/pkg-plist1
-rw-r--r--korean/pinetreefonts/pkg-plist1
-rw-r--r--x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl1
-rw-r--r--x11/x3270/pkg-plist10
19 files changed, 30 insertions, 8 deletions
diff --git a/chinese/kcfonts/pkg-plist b/chinese/kcfonts/pkg-plist
index 43edd48..788d08f 100644
--- a/chinese/kcfonts/pkg-plist
+++ b/chinese/kcfonts/pkg-plist
@@ -6,3 +6,5 @@ lib/X11/fonts/local/kc_fonts.alias
@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
@exec cd %D/lib/X11/fonts/local ; cat kc_fonts.alias >> fonts.alias ; cp fonts.alias ..fonts.alias.. ; sort ..fonts.alias.. | uniq > fonts.alias ; rm ..fonts.alias..
@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
+@unexec if [ ! -s %D/lib/X11/fonts/local/fonts.alias ]; then rm -f %D/lib/X11/fonts/local/fonts.alias; fi
diff --git a/games/xjewel/pkg-plist b/games/xjewel/pkg-plist
index 2032cfc..11b6785 100644
--- a/games/xjewel/pkg-plist
+++ b/games/xjewel/pkg-plist
@@ -3,4 +3,5 @@ lib/X11/xjewel/xjewel.scores
%%FONTSDIR%%/seven_seg.pcf.gz
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
@dirrm lib/X11/xjewel
diff --git a/japanese/elisa10x8/pkg-plist b/japanese/elisa10x8/pkg-plist
index 3ee9e0a..fc60452 100644
--- a/japanese/elisa10x8/pkg-plist
+++ b/japanese/elisa10x8/pkg-plist
@@ -5,4 +5,6 @@ share/doc/elisa8/elisau10.doc
share/doc/elisa8/hosoku.txt
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/elisa8
diff --git a/japanese/elisa8x8/pkg-plist b/japanese/elisa8x8/pkg-plist
index 6ab9a5b..452c6be 100644
--- a/japanese/elisa8x8/pkg-plist
+++ b/japanese/elisa8x8/pkg-plist
@@ -6,4 +6,6 @@ share/doc/elisa/elisat10.doc
share/doc/elisa/elisat10.html
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/elisa
diff --git a/japanese/k10/pkg-plist b/japanese/k10/pkg-plist
index c6eeff8..1e08bfe 100644
--- a/japanese/k10/pkg-plist
+++ b/japanese/k10/pkg-plist
@@ -6,4 +6,6 @@
share/doc/naga10/README
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/naga10
diff --git a/japanese/k12/pkg-plist b/japanese/k12/pkg-plist
index 4a15dfc..91b8871 100644
--- a/japanese/k12/pkg-plist
+++ b/japanese/k12/pkg-plist
@@ -11,4 +11,6 @@ share/doc/k12/readme.kaname_bdf
share/doc/k12/readme.knm
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/k12
diff --git a/japanese/kanji18/files/DEINSTALL.tmpl b/japanese/kanji18/files/DEINSTALL.tmpl
index ee96237..5acdd06 100644
--- a/japanese/kanji18/files/DEINSTALL.tmpl
+++ b/japanese/kanji18/files/DEINSTALL.tmpl
@@ -9,4 +9,5 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then
echo "to enable this update."
echo "**********************************************************"
)
+ [ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
fi
diff --git a/japanese/kanji18/pkg-plist b/japanese/kanji18/pkg-plist
index 8f6d494..cb2db49 100644
--- a/japanese/kanji18/pkg-plist
+++ b/japanese/kanji18/pkg-plist
@@ -3,6 +3,5 @@ share/doc/kanji18/18to16.sed
share/doc/kanji18/README.kanji18
share/doc/kanji18/kanji16.alias
share/doc/kanji18/kanji18.alias
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/kanji18
diff --git a/japanese/kanji26/files/DEINSTALL.tmpl b/japanese/kanji26/files/DEINSTALL.tmpl
index ee96237..5acdd06 100644
--- a/japanese/kanji26/files/DEINSTALL.tmpl
+++ b/japanese/kanji26/files/DEINSTALL.tmpl
@@ -9,4 +9,5 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then
echo "to enable this update."
echo "**********************************************************"
)
+ [ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
fi
diff --git a/japanese/kanji26/pkg-plist b/japanese/kanji26/pkg-plist
index 19988c3..edfcc86 100644
--- a/japanese/kanji26/pkg-plist
+++ b/japanese/kanji26/pkg-plist
@@ -3,6 +3,5 @@ share/doc/kanji26/26to24.sed
share/doc/kanji26/README.kanji26
share/doc/kanji26/kanji24.alias
share/doc/kanji26/kanji26.alias
-@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
-@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/kanji26
diff --git a/japanese/kappa20/pkg-plist b/japanese/kappa20/pkg-plist
index b5f7efc..2d6ac72 100644
--- a/japanese/kappa20/pkg-plist
+++ b/japanese/kappa20/pkg-plist
@@ -8,4 +8,6 @@ share/doc/kappa20/README
share/doc/kappa20/fonts.alias.kappa
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
+@unexec if [ ! -s %D/%%FONTSDIR%%/fonts.alias ]; then rm -f %D/%%FONTSDIR%%/fonts.alias; fi
@dirrm share/doc/kappa20
diff --git a/korean/baekmukfonts-bdf/pkg-plist b/korean/baekmukfonts-bdf/pkg-plist
index a668e93..51e631f 100644
--- a/korean/baekmukfonts-bdf/pkg-plist
+++ b/korean/baekmukfonts-bdf/pkg-plist
@@ -42,3 +42,4 @@
%%FONTSDIR%%/hline24.pcf.gz
@exec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
@unexec cd %D/%%FONTSDIR%% ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/%%FONTSDIR%%/fonts.dir; fi
diff --git a/korean/hanyangfonts/pkg-plist b/korean/hanyangfonts/pkg-plist
index 4eda8151..1a659f3 100644
--- a/korean/hanyangfonts/pkg-plist
+++ b/korean/hanyangfonts/pkg-plist
@@ -12,3 +12,4 @@ lib/X11/fonts/local/hgm18.pcf.gz
lib/X11/fonts/local/hgm20.pcf.gz
@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
diff --git a/korean/johabfonts/pkg-plist b/korean/johabfonts/pkg-plist
index 74507ec..fda064c 100644
--- a/korean/johabfonts/pkg-plist
+++ b/korean/johabfonts/pkg-plist
@@ -11,3 +11,4 @@ lib/X11/fonts/local/johabsm16.pcf.gz
lib/X11/fonts/local/johabsp16.pcf.gz
@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
diff --git a/korean/kaistfonts/pkg-plist b/korean/kaistfonts/pkg-plist
index b071f9a..e9891fe 100644
--- a/korean/kaistfonts/pkg-plist
+++ b/korean/kaistfonts/pkg-plist
@@ -4,3 +4,4 @@ lib/X11/fonts/local/ks_iyagi16.pcf.gz
lib/X11/fonts/local/ks_philgi16.pcf.gz
@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
diff --git a/korean/mizifont/pkg-plist b/korean/mizifont/pkg-plist
index 9301eef..38c80f5 100644
--- a/korean/mizifont/pkg-plist
+++ b/korean/mizifont/pkg-plist
@@ -9,3 +9,4 @@ lib/X11/fonts/local/mzsm16e.pcf.gz
lib/X11/fonts/local/mzsm16h.pcf.gz
@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
diff --git a/korean/pinetreefonts/pkg-plist b/korean/pinetreefonts/pkg-plist
index 4ea15ef..af2a3f3 100644
--- a/korean/pinetreefonts/pkg-plist
+++ b/korean/pinetreefonts/pkg-plist
@@ -14,3 +14,4 @@ lib/X11/fonts/local/ptptB14.pcf.gz
lib/X11/fonts/local/pttpB14.pcf.gz
@exec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
@unexec cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
diff --git a/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl b/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl
index ee96237..5acdd06 100644
--- a/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl
+++ b/x11-fonts/bitmap-fonts/files/DEINSTALL.tmpl
@@ -9,4 +9,5 @@ if [ "x$2" = "xPOST-DEINSTALL" ]; then
echo "to enable this update."
echo "**********************************************************"
)
+ [ `wc -c ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir | awk '{print $1}'` = 2 ] && rm -f ${PKG_PREFIX}/%%FONTSDIR%%/fonts.dir
fi
diff --git a/x11/x3270/pkg-plist b/x11/x3270/pkg-plist
index b60f4e7..6990c35 100644
--- a/x11/x3270/pkg-plist
+++ b/x11/x3270/pkg-plist
@@ -18,8 +18,10 @@ lib/X11/fonts/local/3270gt24b.pcf.gz
lib/X11/fonts/local/3270gt32.pcf.gz
lib/X11/fonts/local/3270gt32b.pcf.gz
lib/X11/x3270/ibm_hosts
-@exec /bin/chmod u+w /usr/X11R6/lib/X11/fonts/local /usr/X11R6/lib/X11/fonts/local/fonts.dir
-@exec /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/local
-@exec /bin/chmod u=rwx,go=rx /usr/X11R6/lib/X11/fonts/local
-@exec /bin/chmod a=r /usr/X11R6/lib/X11/fonts/local/fonts.dir
+@exec /bin/chmod u+w %D/lib/X11/fonts/local %D/lib/X11/fonts/local/fonts.dir
+@exec %D/bin/mkfontdir %D/lib/X11/fonts/local
+@exec /bin/chmod u=rwx,go=rx %D/lib/X11/fonts/local
+@exec /bin/chmod a=r %D/lib/X11/fonts/local/fonts.dir
+@unexec %D/bin/mkfontdir %D/lib/X11/fonts/local
+@unexec if [ `wc -c %D/lib/X11/fonts/local/fonts.dir | awk '{print $1}'` = 2 ]; then rm -f %D/lib/X11/fonts/local/fonts.dir; fi
@dirrm lib/X11/x3270
OpenPOWER on IntegriCloud