Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (c697e19d2a47cb324782b282fd41e09903bcf8c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c697e19d2a47cb324782b282fd41e09903bcf8c7)
  • Date: Thu, 29 Jun 2006 13:54:09 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

x11-libs/amspsfnt/BUILD | 8 --
x11-libs/amspsfnt/DETAILS | 9 --
x11-libs/amspsfnt/FINAL | 8 ++
x11-libs/amspsfnt/HISTORY | 12 +++
x11-libs/amspsfnt/INSTALL | 2
x11-libs/amspsfnt/POST_INSTALL | 8 --
x11-libs/amspsfnt/POST_REMOVE | 2
x11-libs/amspsfnt/PREPARE | 8 --
x11-libs/artwiz-fonts/DETAILS | 1
x11-libs/artwiz-fonts/HISTORY | 3
x11-libs/cairo-java/DETAILS | 1
x11-libs/cairo-java/HISTORY | 3
x11-libs/cairo/DETAILS | 1
x11-libs/cairo/HISTORY | 3
x11-libs/cairomm/DETAILS | 1
x11-libs/cairomm/HISTORY | 3
x11-libs/cmpsfont/BUILD | 8 --
x11-libs/cmpsfont/DETAILS | 7 -
x11-libs/cmpsfont/FINAL | 8 ++
x11-libs/cmpsfont/HISTORY | 12 +++
x11-libs/cmpsfont/INSTALL | 2
x11-libs/cmpsfont/POST_INSTALL | 8 --
x11-libs/cmpsfont/POST_REMOVE | 2
x11-libs/cmpsfont/PREPARE | 8 --
x11-libs/dbz/BUILD | 9 --
x11-libs/dbz/DETAILS | 6 -
x11-libs/dbz/FINAL | 6 +
x11-libs/dbz/HISTORY | 11 +++
x11-libs/dbz/INSTALL | 5 +
x11-libs/dbz/POST_INSTALL | 7 -
x11-libs/dbz/PREPARE | 8 --
x11-libs/dejavu-ttf/DETAILS | 1
x11-libs/dejavu-ttf/HISTORY | 3
x11-libs/dri/DETAILS | 1
x11-libs/dri/HISTORY | 3
x11-libs/essays1743-ttf/DETAILS | 1
x11-libs/essays1743-ttf/HISTORY | 3
x11-libs/fontconfig/DETAILS | 1
x11-libs/fontconfig/HISTORY | 3
x11-libs/freefont-ttf/DETAILS | 1
x11-libs/freefont-ttf/HISTORY | 3
x11-libs/hunkyfonts/DETAILS | 1
x11-libs/hunkyfonts/HISTORY | 3
x11-libs/isabella-ttf/DETAILS | 1
x11-libs/isabella-ttf/HISTORY | 3
x11-libs/latex-xft-fonts/BUILD | 9 --
x11-libs/latex-xft-fonts/DETAILS | 7 -
x11-libs/latex-xft-fonts/HISTORY | 8 ++
x11-libs/latex-xft-fonts/INSTALL | 3
x11-libs/libpixman/DETAILS | 1
x11-libs/libpixman/HISTORY | 3
x11-libs/lineak_defaultplugin/DETAILS | 1
x11-libs/lineak_defaultplugin/HISTORY | 3
x11-libs/lineak_kdeplugins/DETAILS | 1
x11-libs/lineak_kdeplugins/HISTORY | 3
x11-libs/lineak_xosdplugin/DETAILS | 1
x11-libs/lineak_xosdplugin/HISTORY | 3
x11-libs/lineakd/DETAILS | 1
x11-libs/lineakd/HISTORY | 3
x11-libs/matht1/DETAILS | 1
x11-libs/matht1/HISTORY | 3
x11-libs/python-xlib/DETAILS | 1
x11-libs/python-xlib/HISTORY | 3
x11-libs/terminus-font/DETAILS | 1
x11-libs/terminus-font/HISTORY | 3
x11-libs/ttf-bitstream-vera/DETAILS | 1
x11-libs/ttf-bitstream-vera/HISTORY | 3
x11-libs/ttmkfdir/BUILD | 11 ---
x11-libs/ttmkfdir/DETAILS | 7 -
x11-libs/ttmkfdir/HISTORY | 5 +
x11-libs/type1inst/BUILD | 9 --
x11-libs/type1inst/DETAILS | 11 +--
x11-libs/type1inst/HISTORY | 10 ++
x11-libs/type1inst/INSTALL | 3
x11-libs/xfree86-4.3/BUILD | 118
+++------------------------------
x11-libs/xfree86-4.3/DETAILS | 8 --
x11-libs/xfree86-4.3/FINAL | 7 +
x11-libs/xfree86-4.3/HISTORY | 14 +++
x11-libs/xfree86-4.3/INSTALL | 40 +++++++++++
x11-libs/xfree86-4.3/POST_INSTALL | 7 -
x11-libs/xfree86-4.3/PRE_BUILD | 58 ++++++++++++----
x11-libs/xfree86-devel/BUILD | 120
+++++-----------------------------
x11-libs/xfree86-devel/DETAILS | 8 --
x11-libs/xfree86-devel/FINAL | 7 +
x11-libs/xfree86-devel/HISTORY | 8 ++
x11-libs/xfree86-devel/INSTALL | 40 +++++++++++
x11-libs/xfree86-devel/POST_INSTALL | 7 -
x11-libs/xfree86-devel/PRE_BUILD | 60 +++++++++--------
x11-libs/xfree86-libs/DETAILS | 1
x11-libs/xfree86-libs/HISTORY | 3
x11-libs/xfree86/DETAILS | 1
x11-libs/xfree86/HISTORY | 3
x11-libs/xorg/DETAILS | 1
x11-libs/xorg/HISTORY | 3
94 files changed, 415 insertions(+), 426 deletions(-)

New commits:
commit c697e19d2a47cb324782b282fd41e09903bcf8c7
Merge: f94b5e13bca54eee315202476c1812d04f086271
9e333cde90f006be91b7196cb11627eabd837078
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire

commit f94b5e13bca54eee315202476c1812d04f086271
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Removed BUILD_API=2 as it is grimoire-wide

commit 29f9c30fa120213d807ddebadca3a02ef2ffaae1
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted latex-xft-fonts to build_api 2

commit c441d3fe22b142344d335255a32ac2e2c8156f5c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted xfree86-devel to build_api 2

commit 5d92816fc93738827a80c3b3239e2ac3b5e87861
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Make sure INSTALL is in the proper directory

commit 0b112ea354e55f70e6209d2af798ae5f0575331e
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted xfree86-4.3 to build_api 2

commit 73489a4e3ae1f3cb783b624471c9e8c667f73222
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted type1inst to build_api 2

commit f0ccba071c6d0eab5fe58fc974a76a7a9bf32702
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted ttmkfdir to build_api 2

commit 81135273066de5ba064cc23edfe936b239f40ac7
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Rest of dbz conversion to build_api 2

commit a4f25a01d179bb251b629f40578829df7ad38c75
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted dbz to build_api 2

commit 0d38c635d0804f2541e28379061aa722466edc6a
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted to build_api 2

commit 943497d9aceea6f7addf5874640c1977cf899ef2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

Converted to build_api 2

diff --git a/x11-libs/amspsfnt/BUILD b/x11-libs/amspsfnt/BUILD
index ebe2c8f..27ba77d 100755
--- a/x11-libs/amspsfnt/BUILD
+++ b/x11-libs/amspsfnt/BUILD
@@ -1,7 +1 @@
-(
-
- prepare_install &&
- mkdir -p /usr/share/fonts/Type1 &&
- install -o root -g root -m 644 pfb/* /usr/share/fonts/Type1
-
-) > $C_FIFO 2>&1
+true
diff --git a/x11-libs/amspsfnt/DETAILS b/x11-libs/amspsfnt/DETAILS
index 88de899..4952551 100755
--- a/x11-libs/amspsfnt/DETAILS
+++ b/x11-libs/amspsfnt/DETAILS
@@ -3,15 +3,12 @@
SOURCE=amsps-unix.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=ftp://ftp.ams.org/pub/tex/psfonts/ams/$SOURCE
- WEB_SITE=http://www.ams.org/tex/type1-fonts.html
- MAINTAINER=v.merkatz AT gmx.net

SOURCE_HASH=sha512:203c134821514f8ef9b7874bb4b4debd85e86c2e315d6afa32fc8fd1de93d7d9582afbf73b1f52fbd5759de8a96af6da80497f293532670284023938c4b54407
- ENTERED=20020617
- UPDATED=20020617
ARCHIVE="off"
+ WEB_SITE=http://www.ams.org/tex/type1-fonts.html
KEYWORDS="fonts x11 libs"
- BUILD_API=1
- SHORT="The AMSFonts collection includes the Euler, 'extra symbol'
and cyrillic fonts."
+ ENTERED=20020617
+ SHORT="Includes the Euler, 'extra symbol' and cyrillic fonts"
cat << EOF
The AMSFonts collection includes the Euler, 'extra symbol' and cyrillic fonts
in Type1 format.
diff --git a/x11-libs/amspsfnt/FINAL b/x11-libs/amspsfnt/FINAL
new file mode 100755
index 0000000..5579fe0
--- /dev/null
+++ b/x11-libs/amspsfnt/FINAL
@@ -0,0 +1,8 @@
+cd $INSTALL_ROOT/usr/share/fonts/Type1 &&
+rm -f fonts.dir fonts.scale &&
+type1inst -nogs -nolog -quiet
+
+message "Note: To use these fonts add the line"
+message "'FontPath \"/usr/share/fonts/Type1\"'"
+message "to the Files section of $INSTALL_ROOT/etc/X11/XF86Config"
+message "and 'dir \"/usr/share/fonts/Type1\"' to
$INSTALL_ROOT/etc/X11/XftConfig file."
diff --git a/x11-libs/amspsfnt/HISTORY b/x11-libs/amspsfnt/HISTORY
index 536e938..a5efaf5 100644
--- a/x11-libs/amspsfnt/HISTORY
+++ b/x11-libs/amspsfnt/HISTORY
@@ -1,3 +1,15 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
+ Shortened SHORT
+ * PREPARE: Removed, no longer needed after over 2 years
+ * BUILD: Run only `true`
+ * INSTALL: Copied from BUILD
+ Converted to BUILD_API=2
+ Use INSTALL_ROOT for copying fonts
+ * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
+ Use INSTALL_ROOT for file locations
+ * POST_REMOVE: Use INSTALL_ROOT
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/amspsfnt/INSTALL b/x11-libs/amspsfnt/INSTALL
new file mode 100755
index 0000000..d691c42
--- /dev/null
+++ b/x11-libs/amspsfnt/INSTALL
@@ -0,0 +1,2 @@
+mkdir -p $INSTALL_ROOT/usr/share/fonts/Type1 &&
+install -o root -g root -m 644 pfb/* $INSTALL_ROOT/usr/share/fonts/Type1
diff --git a/x11-libs/amspsfnt/POST_INSTALL b/x11-libs/amspsfnt/POST_INSTALL
deleted file mode 100755
index d17d50d..0000000
--- a/x11-libs/amspsfnt/POST_INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-cd /usr/share/fonts/Type1 &&
-rm -f fonts.dir fonts.scale &&
-type1inst -nogs -nolog -quiet
-
-message "Note: To use these fonts add the line"
-message "'FontPath \"/usr/share/fonts/Type1\"'"
-message "to the Files section of /etc/X11/XF86Config"
-message "and 'dir \"/usr/share/fonts/Type1\"' to /etc/X11/XftConfig file."
diff --git a/x11-libs/amspsfnt/POST_REMOVE b/x11-libs/amspsfnt/POST_REMOVE
index 4d085e6..0428309 100755
--- a/x11-libs/amspsfnt/POST_REMOVE
+++ b/x11-libs/amspsfnt/POST_REMOVE
@@ -1,3 +1,3 @@
-cd /usr/share/fonts/Type1/ &&
+cd INSTALL_ROOT/usr/share/fonts/Type1/ &&
rm -f fonts.scale fonts.dir &&
type1inst -nogs -nolog -quiet
diff --git a/x11-libs/amspsfnt/PREPARE b/x11-libs/amspsfnt/PREPARE
deleted file mode 100755
index a4866ca..0000000
--- a/x11-libs/amspsfnt/PREPARE
+++ /dev/null
@@ -1,8 +0,0 @@
-#simple hack to remove old cache before it becomes a problem
-#PREPARE doesn't know version, atleast old version is covered by "prune"
-NUMBER="$(grep VERSION= $SCRIPT_DIRECTORY/DETAILS | cut -d= -f2)"
-OLDCACHE="$INSTALL_CACHE/$SPELL-$NUMBER-$BUILD.tar.bz2"
-if [ -f $OLDCACHE ] ;
-then rm -rf $OLDCACHE
-fi &&
-message "${SPELL_COLOR} ${SPELL} won't ARCHIVE installed
files${DEFAULT_COLOR}"
diff --git a/x11-libs/artwiz-fonts/DETAILS b/x11-libs/artwiz-fonts/DETAILS
index d78db9d..a8c7d6f 100755
--- a/x11-libs/artwiz-fonts/DETAILS
+++ b/x11-libs/artwiz-fonts/DETAILS
@@ -7,7 +7,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL

SOURCE_HASH=sha512:18f315314f6a03bc94920d7e83958d15ea4d80ab84911317bcec75486f46d07edafda2c58c82fd98b5350e939680d73b9c323843f7eebffdb4d2bbebc311400b
WEB_SITE=http://artwizaleczapka.sourceforge.net/
ENTERED=20020321
- BUILD_API=2
ARCHIVE="off"
LICENSE=GPL
KEYWORDS="fonts x11 libs"
diff --git a/x11-libs/artwiz-fonts/HISTORY b/x11-libs/artwiz-fonts/HISTORY
index 3f6b50a..79c769c 100644
--- a/x11-libs/artwiz-fonts/HISTORY
+++ b/x11-libs/artwiz-fonts/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-05-21 Treeve Jelbert <treeve01 AT pi.be>
* DETAILS: change website to artwiz-aleczapka
version en-1.3
diff --git a/x11-libs/cairo-java/DETAILS b/x11-libs/cairo-java/DETAILS
index 8b9a9f4..16226f8 100755
--- a/x11-libs/cairo-java/DETAILS
+++ b/x11-libs/cairo-java/DETAILS
@@ -6,7 +6,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]="LGPL"
- BUILD_API=2
KEYWORDS="java x11 libs"
WEB_SITE=http://java-gnome.sourceforge.net
ENTERED=20051029
diff --git a/x11-libs/cairo-java/HISTORY b/x11-libs/cairo-java/HISTORY
index aaa7ab2..71a1b14 100644
--- a/x11-libs/cairo-java/HISTORY
+++ b/x11-libs/cairo-java/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-05-30 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.4

diff --git a/x11-libs/cairo/DETAILS b/x11-libs/cairo/DETAILS
index d7e61f7..7ba5569 100755
--- a/x11-libs/cairo/DETAILS
+++ b/x11-libs/cairo/DETAILS
@@ -6,7 +6,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=http://cairographics.org
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=MIT
- BUILD_API=2
ENTERED=20040617
UPDATED=20050206
KEYWORDS="x11 libs"
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 60f2168..763457f 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-15 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 1.0.4

diff --git a/x11-libs/cairomm/DETAILS b/x11-libs/cairomm/DETAILS
index 77d8eea..6ee0b98 100755
--- a/x11-libs/cairomm/DETAILS
+++ b/x11-libs/cairomm/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://cairographics.org/releases/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=MIT
- BUILD_API=2
KEYWORDS="x11 libs"
WEB_SITE=http://cairographics.org
ENTERED=20060408
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index 84fa9d8..4cd3f24 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,2 +1,5 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-04-08 Robin Cook <rcook AT wyrms.net>
* Initial Spell
diff --git a/x11-libs/cmpsfont/BUILD b/x11-libs/cmpsfont/BUILD
index ebe2c8f..27ba77d 100755
--- a/x11-libs/cmpsfont/BUILD
+++ b/x11-libs/cmpsfont/BUILD
@@ -1,7 +1 @@
-(
-
- prepare_install &&
- mkdir -p /usr/share/fonts/Type1 &&
- install -o root -g root -m 644 pfb/* /usr/share/fonts/Type1
-
-) > $C_FIFO 2>&1
+true
diff --git a/x11-libs/cmpsfont/DETAILS b/x11-libs/cmpsfont/DETAILS
index 1440d08..e9ccb53 100755
--- a/x11-libs/cmpsfont/DETAILS
+++ b/x11-libs/cmpsfont/DETAILS
@@ -4,14 +4,11 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=ftp://ftp.ams.org/pub/tex/psfonts/cm/$SOURCE
WEB_SITE=http://www.ams.org/tex/type1-fonts.html
- MAINTAINER=v.merkatz AT gmx.net

SOURCE_HASH=sha512:98c62790b04208abd4e9b9208b44b8c2d40ca228d4fc7ed0718f618e213b2e8aab42c5d2a6a36d4992dec95db9f7777d9ea9e94dfc4a50e722b78953b3648604
+ KEYWORDS="mozilla fonts x11 libs"
ENTERED=20020617
- UPDATED=20020617
ARCHIVE="off"
- KEYWORDS="mozilla fonts x11 libs"
- BUILD_API=1
- SHORT="TeX's computer modern fonts in a Type1 version usable by
mozilla for MathML rendering"
+ SHORT="Modern Type1 fonts usable by mozilla for MathML"
cat << EOF
TeX's computer modern fonts in a Type1 version usable by mozilla for
rendering of MathML documents.
EOF
diff --git a/x11-libs/cmpsfont/FINAL b/x11-libs/cmpsfont/FINAL
new file mode 100755
index 0000000..5579fe0
--- /dev/null
+++ b/x11-libs/cmpsfont/FINAL
@@ -0,0 +1,8 @@
+cd $INSTALL_ROOT/usr/share/fonts/Type1 &&
+rm -f fonts.dir fonts.scale &&
+type1inst -nogs -nolog -quiet
+
+message "Note: To use these fonts add the line"
+message "'FontPath \"/usr/share/fonts/Type1\"'"
+message "to the Files section of $INSTALL_ROOT/etc/X11/XF86Config"
+message "and 'dir \"/usr/share/fonts/Type1\"' to
$INSTALL_ROOT/etc/X11/XftConfig file."
diff --git a/x11-libs/cmpsfont/HISTORY b/x11-libs/cmpsfont/HISTORY
index 536e938..c6781e8 100644
--- a/x11-libs/cmpsfont/HISTORY
+++ b/x11-libs/cmpsfont/HISTORY
@@ -1,3 +1,15 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
+ Shortened SHORT
+ * PREPARE: Removed, no longer needed after over 2 years
+ * BUILD: Run only `true`
+ * INSTALL: Copied from BUILD
+ Converted to build_api 2
+ Use INSTALL_ROOT
+ * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
+ Use INSTALL_ROOT for config file locations
+ * POST_REMOVE: Use INSTALL_ROOT
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/cmpsfont/INSTALL b/x11-libs/cmpsfont/INSTALL
new file mode 100755
index 0000000..d691c42
--- /dev/null
+++ b/x11-libs/cmpsfont/INSTALL
@@ -0,0 +1,2 @@
+mkdir -p $INSTALL_ROOT/usr/share/fonts/Type1 &&
+install -o root -g root -m 644 pfb/* $INSTALL_ROOT/usr/share/fonts/Type1
diff --git a/x11-libs/cmpsfont/POST_INSTALL b/x11-libs/cmpsfont/POST_INSTALL
deleted file mode 100755
index d17d50d..0000000
--- a/x11-libs/cmpsfont/POST_INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-cd /usr/share/fonts/Type1 &&
-rm -f fonts.dir fonts.scale &&
-type1inst -nogs -nolog -quiet
-
-message "Note: To use these fonts add the line"
-message "'FontPath \"/usr/share/fonts/Type1\"'"
-message "to the Files section of /etc/X11/XF86Config"
-message "and 'dir \"/usr/share/fonts/Type1\"' to /etc/X11/XftConfig file."
diff --git a/x11-libs/cmpsfont/POST_REMOVE b/x11-libs/cmpsfont/POST_REMOVE
index 4d085e6..4696f75 100755
--- a/x11-libs/cmpsfont/POST_REMOVE
+++ b/x11-libs/cmpsfont/POST_REMOVE
@@ -1,3 +1,3 @@
-cd /usr/share/fonts/Type1/ &&
+cd $INSTALL_ROOT/usr/share/fonts/Type1/ &&
rm -f fonts.scale fonts.dir &&
type1inst -nogs -nolog -quiet
diff --git a/x11-libs/cmpsfont/PREPARE b/x11-libs/cmpsfont/PREPARE
deleted file mode 100755
index a4866ca..0000000
--- a/x11-libs/cmpsfont/PREPARE
+++ /dev/null
@@ -1,8 +0,0 @@
-#simple hack to remove old cache before it becomes a problem
-#PREPARE doesn't know version, atleast old version is covered by "prune"
-NUMBER="$(grep VERSION= $SCRIPT_DIRECTORY/DETAILS | cut -d= -f2)"
-OLDCACHE="$INSTALL_CACHE/$SPELL-$NUMBER-$BUILD.tar.bz2"
-if [ -f $OLDCACHE ] ;
-then rm -rf $OLDCACHE
-fi &&
-message "${SPELL_COLOR} ${SPELL} won't ARCHIVE installed
files${DEFAULT_COLOR}"
diff --git a/x11-libs/dbz/BUILD b/x11-libs/dbz/BUILD
index cbbfd22..27ba77d 100755
--- a/x11-libs/dbz/BUILD
+++ b/x11-libs/dbz/BUILD
@@ -1,8 +1 @@
-(
-
- prepare_install &&
- mkdir -p /usr/share/fonts/truetype &&
- install -o root -g root -m 644 -p *.TTF /usr/share/fonts/truetype &&
- install -o root -g root -m 644 -p *.ttf /usr/share/fonts/truetype
-
-) > $C_FIFO 2>&1
+true
diff --git a/x11-libs/dbz/DETAILS b/x11-libs/dbz/DETAILS
index 6cc1bdc..339a407 100755
--- a/x11-libs/dbz/DETAILS
+++ b/x11-libs/dbz/DETAILS
@@ -4,13 +4,11 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.andrew.cmu.edu/~twm/fonts/$SOURCE

SOURCE_HASH=sha512:18e622e693644b7ad24ea8b6d35e7405f81592a5ca2bf2c2dc4fa1fc5dfb95a67e7d334a162db4dad8475b608e75f0e064384b9465c26dc98a71570dd53b0eec
+ KEYWORDS="fonts x11 libs"
WEB_SITE=http://fonts.tom7.com/
ENTERED=20020512
- UPDATED=20020512
ARCHIVE="off"
- LICENSE=http://fonts.tom7.com/legal/
- KEYWORDS="fonts x11 libs"
- BUILD_API=1
+ LICENSE[0]=http://fonts.tom7.com/legal/
SHORT="The Divide By Zero truetype font set by tom7."
cat << EOF
A set of nearly a hundred truetype fonts created by Tom Murphy the seventh.
diff --git a/x11-libs/dbz/FINAL b/x11-libs/dbz/FINAL
new file mode 100755
index 0000000..add3448
--- /dev/null
+++ b/x11-libs/dbz/FINAL
@@ -0,0 +1,6 @@
+rm -f $INSTALL_ROOT/usr/share/fonts/truetype/XftCache &&
+
+message "Note: To use these fonts add the line"
+message "'FontPath \"/usr/share/fonts/truetype\"'"
+message "to the Files section of $INSTALL_ROOT/etc/X11/XF86Config"
+message "and 'dir \"/usr/share/fonts/truetype\"' to
$INSTALL_ROOT/etc/X11/XftConfig file."
diff --git a/x11-libs/dbz/HISTORY b/x11-libs/dbz/HISTORY
index eb7bba5..77e4c68 100644
--- a/x11-libs/dbz/HISTORY
+++ b/x11-libs/dbz/HISTORY
@@ -1,3 +1,14 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1 and UPDATED
+ Changed LICENSE to LICENSE[0]
+ * PREPARE: Removed, no longer needed after over 2 years
+ * BUILD: Run only `true`
+ * INSTALL: Copied from BUILD
+ Converted to BUILD_API=2
+ Use INSTALL_ROOT
+ * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
+ Use INSTALL_ROOT
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/dbz/INSTALL b/x11-libs/dbz/INSTALL
new file mode 100755
index 0000000..52a751d
--- /dev/null
+++ b/x11-libs/dbz/INSTALL
@@ -0,0 +1,5 @@
+mkdir -p $INSTALL_ROOT/usr/share/fonts/truetype &&
+install -o root -g root -m 644 -p *.TTF \
+ $INSTALL_ROOT/usr/share/fonts/truetype &&
+install -o root -g root -m 644 -p *.ttf \
+ $INSTALL_ROOT/usr/share/fonts/truetype
diff --git a/x11-libs/dbz/POST_INSTALL b/x11-libs/dbz/POST_INSTALL
deleted file mode 100755
index 15c3506..0000000
--- a/x11-libs/dbz/POST_INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-
-rm -f /usr/share/fonts/truetype/XftCache
-
-message "Note: To use these fonts add the line"
-message "'FontPath \"/usr/share/fonts/truetype\"'"
-message "to the Files section of /etc/X11/XF86Config"
-message "and 'dir \"/usr/share/fonts/truetype\"' to /etc/X11/XftConfig file."
diff --git a/x11-libs/dbz/PREPARE b/x11-libs/dbz/PREPARE
deleted file mode 100755
index a4866ca..0000000
--- a/x11-libs/dbz/PREPARE
+++ /dev/null
@@ -1,8 +0,0 @@
-#simple hack to remove old cache before it becomes a problem
-#PREPARE doesn't know version, atleast old version is covered by "prune"
-NUMBER="$(grep VERSION= $SCRIPT_DIRECTORY/DETAILS | cut -d= -f2)"
-OLDCACHE="$INSTALL_CACHE/$SPELL-$NUMBER-$BUILD.tar.bz2"
-if [ -f $OLDCACHE ] ;
-then rm -rf $OLDCACHE
-fi &&
-message "${SPELL_COLOR} ${SPELL} won't ARCHIVE installed
files${DEFAULT_COLOR}"
diff --git a/x11-libs/dejavu-ttf/DETAILS b/x11-libs/dejavu-ttf/DETAILS
index 9374e16..d62c349 100755
--- a/x11-libs/dejavu-ttf/DETAILS
+++ b/x11-libs/dejavu-ttf/DETAILS
@@ -10,7 +10,6 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPEL
FRESHMEAT_URL="http://freshmeat.net/projects/$PACKAGE/";
LICENSE[0]='Freely Distributable'
UPDATED=20060115
- BUILD_API=2
KEYWORDS="fonts x11 libs"
SHORT='A font family based on the Bitstream Vera Fonts'
cat << EOF
diff --git a/x11-libs/dejavu-ttf/HISTORY b/x11-libs/dejavu-ttf/HISTORY
index e1bfaed..8d35efb 100644
--- a/x11-libs/dejavu-ttf/HISTORY
+++ b/x11-libs/dejavu-ttf/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-04-19 Sergey Lipnevich <sergey AT sourcemage.org>
* DETAILS: upgrade to 2.5.

diff --git a/x11-libs/dri/DETAILS b/x11-libs/dri/DETAILS
index c8dd31f..8573146 100755
--- a/x11-libs/dri/DETAILS
+++ b/x11-libs/dri/DETAILS
@@ -12,7 +12,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE3_IGNORE=volatile
WEB_SITE=http://dri.sourceforge.net/
FORCE_DOWNLOAD=on
- BUILD_API=2
ENTERED=20040311
UPDATED=20040515
LICENSE[0]=GPL
diff --git a/x11-libs/dri/HISTORY b/x11-libs/dri/HISTORY
index 5af3ca5..70a165a 100644
--- a/x11-libs/dri/HISTORY
+++ b/x11-libs/dri/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/essays1743-ttf/DETAILS b/x11-libs/essays1743-ttf/DETAILS
index 92291df..b9e677c 100755
--- a/x11-libs/essays1743-ttf/DETAILS
+++ b/x11-libs/essays1743-ttf/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/Essays
SOURCE_URL[0]=http://www.thibault.org/fonts/essays/$SOURCE

SOURCE_HASH=sha512:e3402be25314adce72a81c17e9e789f815d2bd7b20450a65599a8408f09a7a86d26a59de806317a0cc4c56889bef63b1dd24c708348c82d313356049b1bc8cc6
LICENSE[0]=LGPL
- BUILD_API=2
WEB_SITE=http://www.thibault.org/fonts/essays/
ENTERED=20041014
UPDATED=20041014
diff --git a/x11-libs/essays1743-ttf/HISTORY b/x11-libs/essays1743-ttf/HISTORY
index ea6c903..f5203be 100644
--- a/x11-libs/essays1743-ttf/HISTORY
+++ b/x11-libs/essays1743-ttf/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/fontconfig/DETAILS b/x11-libs/fontconfig/DETAILS
index c382455..fc9936a 100755
--- a/x11-libs/fontconfig/DETAILS
+++ b/x11-libs/fontconfig/DETAILS
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20020909
UPDATED=20050331
PATCHLEVEL=2
- BUILD_API=2
SHORT="Library for configuring and customizing font access"
cat << EOF
Fontconfig is a library for configuring and customizing font access.
diff --git a/x11-libs/fontconfig/HISTORY b/x11-libs/fontconfig/HISTORY
index fde719d..4fa19ba 100644
--- a/x11-libs/fontconfig/HISTORY
+++ b/x11-libs/fontconfig/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-11 Arwed v. Merkatz <v.merkatz AT gmx.net>
* BUILD: revert back to specific font paths, apparently adding all of
them makes mozilla use bitmap fonts for some stuff which doesn't
look
diff --git a/x11-libs/freefont-ttf/DETAILS b/x11-libs/freefont-ttf/DETAILS
index 6d25306..da6968a 100755
--- a/x11-libs/freefont-ttf/DETAILS
+++ b/x11-libs/freefont-ttf/DETAILS
@@ -11,7 +11,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/freefo
SOURCE_GPG=primoz.peterlin.gpg:$SOURCE.sig:UPSTREAM_KEY
SOURCE2_IGNORE=signature
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="fonts x11 libs"
SHORT="provide a set of free outline (i.e. OpenType) fonts"

diff --git a/x11-libs/freefont-ttf/HISTORY b/x11-libs/freefont-ttf/HISTORY
index a38e0bd..94ec651 100644
--- a/x11-libs/freefont-ttf/HISTORY
+++ b/x11-libs/freefont-ttf/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/hunkyfonts/DETAILS b/x11-libs/hunkyfonts/DETAILS
index 781a988..a959b91 100755
--- a/x11-libs/hunkyfonts/DETAILS
+++ b/x11-libs/hunkyfonts/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE

SOURCE_HASH=sha512:4361d15840080e6f548a57c90d6c6e644a4c6817fb165a33892600a3a0505fa347add462b98143ffc90dd9d2ce8652df0a42b25a161d20234a51bed05ce40d49
LICENSE[0]=http://www.gnome.org/fonts/
- BUILD_API=2
WEB_SITE=http://www.yoper.com/ariszlo/index.html
ENTERED=20041102
UPDATED=20041103
diff --git a/x11-libs/hunkyfonts/HISTORY b/x11-libs/hunkyfonts/HISTORY
index b283122..857cc23 100644
--- a/x11-libs/hunkyfonts/HISTORY
+++ b/x11-libs/hunkyfonts/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/isabella-ttf/DETAILS b/x11-libs/isabella-ttf/DETAILS
index 423a2ca..001d6e5 100755
--- a/x11-libs/isabella-ttf/DETAILS
+++ b/x11-libs/isabella-ttf/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.thibault.org/fonts/isabella/$SOURCE

SOURCE_HASH=sha512:8145bb965a55f516a3d515c4a444549b3d40402e6c38f04e36e0810f46eb3bb90a006ed81e82868d87ee0eecb1d6ceb5fd4e4177e45ba4390ec64728b90556c8
LICENSE[0]=LGPL
- BUILD_API=2
WEB_SITE=http://www.thibault.org/fonts/isabella/
ENTERED=20041014
UPDATED=20041014
diff --git a/x11-libs/isabella-ttf/HISTORY b/x11-libs/isabella-ttf/HISTORY
index 219bc60..3b468b1 100644
--- a/x11-libs/isabella-ttf/HISTORY
+++ b/x11-libs/isabella-ttf/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/latex-xft-fonts/BUILD b/x11-libs/latex-xft-fonts/BUILD
index 0a5eac4..27ba77d 100755
--- a/x11-libs/latex-xft-fonts/BUILD
+++ b/x11-libs/latex-xft-fonts/BUILD
@@ -1,8 +1 @@
-(
-
- prepare_install &&
- mkdir -p /usr/share/fonts/truetype &&
- install -o root -g root -m 644 -p \
- $SOURCE_DIRECTORY/*.ttf /usr/share/fonts/truetype
-
-) > $C_FIFO 2>&1
+true
diff --git a/x11-libs/latex-xft-fonts/DETAILS
b/x11-libs/latex-xft-fonts/DETAILS
index 88dd111..0b199a9 100755
--- a/x11-libs/latex-xft-fonts/DETAILS
+++ b/x11-libs/latex-xft-fonts/DETAILS
@@ -5,14 +5,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://movementarian.org/${SOURCE}
SOURCE_URL[1]=ftp://ftp.lyx.org/pub/lyx/contrib/${SOURCE}

SOURCE_HASH=sha512:e2153b0619ac0909aeea7fda435980e7955a2a9cbf7a8713317fd0423c276cee708a7fe5f5bb48adab188ef41254b9f20475eeb13d7cff0af38b694631de251a
+ LICENSE[0]=UNKNOWN
WEB_SITE=http://www.lyx.org/download/contrib.php3
+ KEYWORDS="latex fonts x11 libs"
ENTERED=20040331
- UPDATED=20040331
- LICENSE=
ARCHIVE="off"
- MAINTAINER=
- KEYWORDS="latex fonts x11 libs"
- BUILD_API=1
SHORT="TrueType Version of some LaTeX fonts"
cat << EOF
TrueType Version of some LaTeX fonts
diff --git a/x11-libs/latex-xft-fonts/HISTORY
b/x11-libs/latex-xft-fonts/HISTORY
index 20ed0d7..0838b04 100644
--- a/x11-libs/latex-xft-fonts/HISTORY
+++ b/x11-libs/latex-xft-fonts/HISTORY
@@ -1,3 +1,11 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
+ Changed LICENSE= to LICENSE[0]=UNKNOWN
+ * BUILD: Run only `true`
+ * INSTALL: Copied from BUILD
+ Converted to build_api 2
+ Use INSTALL_ROOT
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/latex-xft-fonts/INSTALL
b/x11-libs/latex-xft-fonts/INSTALL
new file mode 100755
index 0000000..bc44819
--- /dev/null
+++ b/x11-libs/latex-xft-fonts/INSTALL
@@ -0,0 +1,3 @@
+mkdir -p $INSTALL_ROOT/usr/share/fonts/truetype &&
+install -o root -g root -m 644 -p \
+ $SOURCE_DIRECTORY/*.ttf $INSTALL_ROOT/usr/share/fonts/truetype
diff --git a/x11-libs/libpixman/DETAILS b/x11-libs/libpixman/DETAILS
index 171b20d..1863c42 100755
--- a/x11-libs/libpixman/DETAILS
+++ b/x11-libs/libpixman/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
LICENSE[0]=MIT
ENTERED=20040617
UPDATED=20040617
- BUILD_API=2
SHORT="Pixel manipulation library"
cat << EOF
libpixman is a merge of libpixregion and libic.
diff --git a/x11-libs/libpixman/HISTORY b/x11-libs/libpixman/HISTORY
index d09d1ad..3e7cac1 100644
--- a/x11-libs/libpixman/HISTORY
+++ b/x11-libs/libpixman/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2005-05-20 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: downgrade to 0.1.4

diff --git a/x11-libs/lineak_defaultplugin/DETAILS
b/x11-libs/lineak_defaultplugin/DETAILS
index fcb0e3e..2537e50 100755
--- a/x11-libs/lineak_defaultplugin/DETAILS
+++ b/x11-libs/lineak_defaultplugin/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20041117
UPDATED=20041117
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="x11 libs"
SHORT="Default plugin for linEAK."
cat << EOF
diff --git a/x11-libs/lineak_defaultplugin/HISTORY
b/x11-libs/lineak_defaultplugin/HISTORY
index c231616..0984fc6 100644
--- a/x11-libs/lineak_defaultplugin/HISTORY
+++ b/x11-libs/lineak_defaultplugin/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/lineak_kdeplugins/DETAILS
b/x11-libs/lineak_kdeplugins/DETAILS
index 40ae234..d108d04 100755
--- a/x11-libs/lineak_kdeplugins/DETAILS
+++ b/x11-libs/lineak_kdeplugins/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20041117
UPDATED=20041117
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="kde x11 libs"
SHORT="KDE plugins for linEAK"
cat << EOF
diff --git a/x11-libs/lineak_kdeplugins/HISTORY
b/x11-libs/lineak_kdeplugins/HISTORY
index c231616..0984fc6 100644
--- a/x11-libs/lineak_kdeplugins/HISTORY
+++ b/x11-libs/lineak_kdeplugins/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/lineak_xosdplugin/DETAILS
b/x11-libs/lineak_xosdplugin/DETAILS
index a4513a2..2cfcff4 100755
--- a/x11-libs/lineak_xosdplugin/DETAILS
+++ b/x11-libs/lineak_xosdplugin/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20041117
UPDATED=20041117
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="x11 libs"
SHORT="xosd plugin for LinEAK"
cat << EOF
diff --git a/x11-libs/lineak_xosdplugin/HISTORY
b/x11-libs/lineak_xosdplugin/HISTORY
index c231616..0984fc6 100644
--- a/x11-libs/lineak_xosdplugin/HISTORY
+++ b/x11-libs/lineak_xosdplugin/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/lineakd/DETAILS b/x11-libs/lineakd/DETAILS
index 13a1fde..af70596 100755
--- a/x11-libs/lineakd/DETAILS
+++ b/x11-libs/lineakd/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
ENTERED=20020322
UPDATED=20030809
LICENSE[0]=GPL
- BUILD_API=2
KEYWORDS="x11 libs"
SHORT="Linux support for Easy Access and Internet Keyboards -
daemon"
cat << EOF
diff --git a/x11-libs/lineakd/HISTORY b/x11-libs/lineakd/HISTORY
index 03ac117..f1f3973 100644
--- a/x11-libs/lineakd/HISTORY
+++ b/x11-libs/lineakd/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/matht1/DETAILS b/x11-libs/matht1/DETAILS
index c60bb4e..611a388 100755
--- a/x11-libs/matht1/DETAILS
+++ b/x11-libs/matht1/DETAILS
@@ -8,7 +8,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/MathT1
ENTERED=20050228
UPDATED=20050228
ARCHIVE="off"
- BUILD_API=2
KEYWORDS="mozilla fonts x11 libs"
SHORT="mathematica fonts used for MathML rendering in mozilla"
cat << EOF
diff --git a/x11-libs/matht1/HISTORY b/x11-libs/matht1/HISTORY
index d05c231..8f950c5 100644
--- a/x11-libs/matht1/HISTORY
+++ b/x11-libs/matht1/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/python-xlib/DETAILS b/x11-libs/python-xlib/DETAILS
index b8d9c9a..cfc345d 100755
--- a/x11-libs/python-xlib/DETAILS
+++ b/x11-libs/python-xlib/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=$SOURCEFORGE_URL/python-xlib/$SOURCE

SOURCE_HASH=sha512:c317f4347a9d62c2ed4953a8df0ad8b6cbbd10bdcc32a9b5f4a3d9d3dfdea9c058256976de4d039f4d855cf97b897943ac920b43afeba8a9cda95b88bc20e7f8
LICENSE[0]=GPL
- BUILD_API=2
WEB_SITE=http://python-xlib.sourceforge.net
ENTERED=20040430
UPDATED=20040430
diff --git a/x11-libs/python-xlib/HISTORY b/x11-libs/python-xlib/HISTORY
index b3b046a..8f7e95d 100644
--- a/x11-libs/python-xlib/HISTORY
+++ b/x11-libs/python-xlib/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/terminus-font/DETAILS b/x11-libs/terminus-font/DETAILS
index 316848f..9b343ae 100755
--- a/x11-libs/terminus-font/DETAILS
+++ b/x11-libs/terminus-font/DETAILS
@@ -5,7 +5,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=http://www.is-vn.bg/hamster/${SOURCE}

SOURCE_HASH=sha512:bd91e30699c1edbd03977763a43a5a9fb0916ce1b925497c65e14553aaa469fd9815d1cafed38be3b43e0e9b9bcf25d1670944f607050a7c245679879a150acd
WEB_SITE=http://www.is-vn.bg/hamster/jimmy-en.html
- BUILD_API=2
ENTERED=20050720
UPDATED=20050720
LICENSE[0]=GPL
diff --git a/x11-libs/terminus-font/HISTORY b/x11-libs/terminus-font/HISTORY
index 4d228f7..96681e8 100644
--- a/x11-libs/terminus-font/HISTORY
+++ b/x11-libs/terminus-font/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/ttf-bitstream-vera/DETAILS
b/x11-libs/ttf-bitstream-vera/DETAILS
index cf3bde2..5051699 100755
--- a/x11-libs/ttf-bitstream-vera/DETAILS
+++ b/x11-libs/ttf-bitstream-vera/DETAILS
@@ -6,7 +6,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
SOURCE_URL[0]=${GNOME_URL}/sources/$SPELL/$BRANCH/$SOURCE

SOURCE_HASH=sha512:75b481553dbe27711ff779c13990397f76d59de819085e55092fb2ee86d2780232512487a5dce33b29e38edfcc73e34efbba07f7016e7ff4e59bb35301e7a392
LICENSE[0]=http://www.gnome.org/fonts/
- BUILD_API=2
WEB_SITE=http://www.gnome.org/fonts/
ENTERED=20030423
UPDATED=20030423
diff --git a/x11-libs/ttf-bitstream-vera/HISTORY
b/x11-libs/ttf-bitstream-vera/HISTORY
index eeb72ed..7f16c2c 100644
--- a/x11-libs/ttf-bitstream-vera/HISTORY
+++ b/x11-libs/ttf-bitstream-vera/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/ttmkfdir/BUILD b/x11-libs/ttmkfdir/BUILD
index 09bf100..8f58e6d 100755
--- a/x11-libs/ttmkfdir/BUILD
+++ b/x11-libs/ttmkfdir/BUILD
@@ -1,10 +1 @@
-(
-
- make &&
- prepare_install &&
- make install
-
-) > $C_FIFO 2>&1
-
-
-
+make
diff --git a/x11-libs/ttmkfdir/DETAILS b/x11-libs/ttmkfdir/DETAILS
index 9356934..ac8fc63 100755
--- a/x11-libs/ttmkfdir/DETAILS
+++ b/x11-libs/ttmkfdir/DETAILS
@@ -4,13 +4,10 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.joerg-pommnitz.de/TrueType/$SPELL.tar.gz

SOURCE_HASH=sha512:ac1624f611b4818eb4dce0b3e2cc92843993c7c6c95f5f5d9159ce60b6f119a24e93aee6814e9d97263c06b40d0cb8148fce6fa2edfca6e6ddccc740f106cab8
+ LICENSE[0]=XCL
+ KEYWORDS="fonts x11 libs"
WEB_SITE=None
ENTERED=20020208
- UPDATED=20020215
- LICENSE=XCL
- MAINTAINER=aeron AT netcabo.pt
- KEYWORDS="fonts x11 libs"
- BUILD_API=1
SHORT="Create fonts.dir from TrueType fonts. To use TT fonts in
X."
cat << EOF
ttmkfdir is a tool to create valid and complete fonts.dir files from
diff --git a/x11-libs/ttmkfdir/HISTORY b/x11-libs/ttmkfdir/HISTORY
index d28b2c5..2aa1da5 100644
--- a/x11-libs/ttmkfdir/HISTORY
+++ b/x11-libs/ttmkfdir/HISTORY
@@ -1,3 +1,8 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
+ Changed LICENSE to LICENSE[0]
+ * BUILD: Converted to build_api 2
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/type1inst/BUILD b/x11-libs/type1inst/BUILD
index 18e31c0..27ba77d 100755
--- a/x11-libs/type1inst/BUILD
+++ b/x11-libs/type1inst/BUILD
@@ -1,8 +1 @@
-(
-
- prepare_install &&
- install -o root -g root -m 755 -p type1inst /usr/bin
- install -o root -g root -m 755 -p t1embed /usr/bin
- install -o root -g root -m 644 -p type1inst.man /usr/man/man1
-
-) > $C_FIFO 2>&1
+true
diff --git a/x11-libs/type1inst/DETAILS b/x11-libs/type1inst/DETAILS
index 082fee4..ae46501 100755
--- a/x11-libs/type1inst/DETAILS
+++ b/x11-libs/type1inst/DETAILS
@@ -3,15 +3,12 @@
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.ibiblio.org/pub/Linux/X11/xutils/$SOURCE
- WEB_SITE=http://www.xfree86.org/4.2.0/fonts2.html
- MAINTAINER=v.merkatz AT gmx.net

SOURCE_HASH=sha512:fe509e4030fde355dfc7b1e1aaeffdc387af123bcb9a0fd564c7ac21c72bcaa7bce13da1a2e2ee6b76406f3649faaaf72277cab44331a6b6609c4029a8c9819f
- LICENSE=GPL
- ENTERED=20020617
- UPDATED=20020617
+ LICENSE[0]=GPL
KEYWORDS="fonts x11 libs"
- BUILD_API=1
- SHORT="a utility to create fonts.scale and fonts.dir files for
Type1 fonts"
+ WEB_SITE=http://www.xfree86.org/4.2.0/fonts2.html
+ ENTERED=20020617
+ SHORT="Create fonts.scale and fonts.dir files for Type1 fonts"
cat << EOF
While it is possible to create the 'fonts.scale' file by hand, it is simpler
and more convenient to have it generated automatically. Utilities to perform
this task are available, but are not currently included with XFree86. For
Type 1 fonts, you may use a utility called 'type1inst' which is available
from standard Free Software repositories throughout the world.
EOF
diff --git a/x11-libs/type1inst/HISTORY b/x11-libs/type1inst/HISTORY
index de2eb12..f6707a5 100644
--- a/x11-libs/type1inst/HISTORY
+++ b/x11-libs/type1inst/HISTORY
@@ -1,3 +1,13 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1, MAINTAINER, and UPDATED
+ Changed LICENSE to LICENSE[0]
+ Shortened SHORT
+ * BUILD: Run only `true`
+ * INSTALL: Copied from BUILD
+ Converted to build_api 2
+ Use INSTALL_ROOT
+ Added "&&" to all installs except the last
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/type1inst/INSTALL b/x11-libs/type1inst/INSTALL
new file mode 100755
index 0000000..c590919
--- /dev/null
+++ b/x11-libs/type1inst/INSTALL
@@ -0,0 +1,3 @@
+install -o root -g root -m 755 -p type1inst $INSTALL_ROOT/usr/bin &&
+install -o root -g root -m 755 -p t1embed $INSTALL_ROOT/usr/bin &&
+install -o root -g root -m 644 -p type1inst.man
$INSTALL_ROOT/usr/man/man1
diff --git a/x11-libs/xfree86-4.3/BUILD b/x11-libs/xfree86-4.3/BUILD
index 384e140..63400a1 100755
--- a/x11-libs/xfree86-4.3/BUILD
+++ b/x11-libs/xfree86-4.3/BUILD
@@ -1,105 +1,15 @@
-install_drm() {
-
- DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
- DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/char/drm"
- mkdir -p $DRM_DEST
- cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
- depmod -a
- true
-
-}
-
-
-if [ -f $CONFIG_CACHE/host.def ]
-then cp $CONFIG_CACHE/host.def config/cf/host.def
-fi &&
-### but if it can't be copied then use system defaults for these
-if ! grep -q HasFreetype2 config/cf/host.def
- then echo "#define HasFreetype2 YES" >> config/cf/host.def
-fi &&
-if ! grep -q BuildFreetype2Library config/cf/host.def
- then echo "#define BuildFreetype2Library NO" >> config/cf/host.def
-fi &&
-if ! grep -q HasZlib config/cf/host.def
- then echo "#define HasZlib YES" >> config/cf/host.def
-fi &&
-if ! grep -q HasFontconfig config/cf/host.def
- then echo "#define HasFontconfig YES" >> config/cf/host.def
-fi &&
-if ! grep -q HasExpat config/cf/host.def
- then echo "#define HasExpat YES" >> config/cf/host.def
-fi &&
-message "Building XFree86 takes a very long time."
-
-(
-
- ### Apply 4.3.0.1 patch
- zcat ${SOURCE_CACHE}/${SOURCE8} | patch -p1 &&
-
- ### Apply Xinput locking patch
- patch -p2 < $SCRIPT_DIRECTORY/Xi-locking.patch &&
- ### Apply linux version patch to support 2.6.X
- patch -p1 < $SCRIPT_DIRECTORY/XFree86-4.3.0-linux-2.6.0.patch &&
-
- ### removing -Os from copied host.def bug#3694 and cleaning up $CFLAGS
- if [ -f config/cf/host.def ]
- then sedit s"/-Os//g" config/cf/host.def
- fi &&
- if (echo $CFLAGS | grep -q -- "-Os"); then
- export CFLAGS="-O2 ${CFLAGS//-Os/}"
- fi &&
-
- if spell_ok linux-pam
- then echo "#define HasPam YES" >> config/cf/site.def
- fi &&
- ### xfree86.org recommends building in a shadow tree
- cd config/util &&
- make -f Makefile.ini lndir &&
- cp lndir $SOURCE_DIRECTORY.bld/ &&
- cd $SOURCE_DIRECTORY.bld &&
- ./lndir ../xc/ &&
- ### differnet approach to old bug
- ### Fix Bug #3486, which stops the build process if builtinfonts is
selected
- ln -sf $SOURCE_DIRECTORY.bld/lib/font/builtins
$SOURCE_DIRECTORY.bld/lib/font/builtins/unshared &&
-
- make World
+cd config/util &&
+make -f Makefile.ini lndir &&
+cp lndir $SOURCE_DIRECTORY.bld/ &&
+cd $SOURCE_DIRECTORY.bld &&
+./lndir ../xc/ &&
+### differnet approach to old bug
+### Fix Bug #3486, which stops the build process if builtinfonts is selected
+ln -sf $SOURCE_DIRECTORY.bld/lib/font/builtins
$SOURCE_DIRECTORY.bld/lib/font/builtins/unshared &&
+
+make World

- ### will this fix the mysterious error ?
- ln -sf $SOURCE_DIRECTORY/lib/xtrans/Xtrans.h
$SOURCE_DIRECTORY.bld/exports/include/X11/Xtrans.h &&
- ### Start compiling where the prior left off
- make &&
- prepare_install &&
- #### the following is needed for pkgconfig to find the .pc files
- mkdir -p /usr/X11R6/lib &&
- ln -sf /usr/lib/pkgconfig /usr/X11R6/lib &&
- make install &&
- make install.man &&
- install_drm &&
- mkdir -p /usr/X11R6/include/GL
-
-) > $C_FIFO 2>&1 && (
-
- rm -f /usr/X11R6/include/zlib.h
- rm -f /usr/X11R6/lib/libz.a
-
- if [ ! -e /etc/skel/.xsession ]; then
- cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
- fi
-
- if [ ! -e /usr/bin/X11 ]; then
- ln -sf /usr/X11R6/bin /usr/bin/X11
- fi
-
- if [ ! -e /usr/X11 ]; then
- ln -sf X11R6 /usr/X11
- fi
-
- if [ ! -e /usr/include/X11 ]; then
- ln -sf ../X11R6/include/X11 /usr/include/X11
- fi
-
- if [ ! -e /usr/lib/X11 ]; then
- ln -sf ../X11R6/lib/X11 /usr/lib/X11
- fi
-
-)
+### will this fix the mysterious error ?
+ln -sf $SOURCE_DIRECTORY/lib/xtrans/Xtrans.h
$SOURCE_DIRECTORY.bld/exports/include/X11/Xtrans.h &&
+### Start compiling where the prior left off
+make
diff --git a/x11-libs/xfree86-4.3/DETAILS b/x11-libs/xfree86-4.3/DETAILS
index 1a8b579..ed937df 100755
--- a/x11-libs/xfree86-4.3/DETAILS
+++ b/x11-libs/xfree86-4.3/DETAILS
@@ -31,13 +31,11 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc

SOURCE7_HASH=sha512:bcc4aef471547bc6fdc6fa9c2422e0fd9da0899e9ae9d00aaa287f0a6e5e604da53dbeea66be3576ba3013a7e87725e367a1df324008b5044f2bc433387dcb44

SOURCE8_HASH=sha512:772e97afd84d49c428ca5cfa13f8b7ad7833e5b72893d0d57292a4fd897b75120d41c92f88d1d88776f9ff1aac646ca78a9fb3c2890c85b3d7c48f3aadbeb0b5

SOURCE9_HASH=sha512:9045c89b934d502a5525a3c6551d0111641c7a44ca5793b1eef816e2b4720096e0f5c4b79c0c6e0a41d575e9cd37b51f4733ca1ad0f5087d5abad9aec06aa7fa
- WEB_SITE=http://www.xfree86.org/
- ENTERED=20010922
- UPDATED=20050920
LICENSE[0]=XCL
KEYWORDS="x11 libs"
- BUILD_API=1
- SHORT="xfree86 is the stable free implementation of the X Window
System."
+ WEB_SITE=http://www.xfree86.org/
+ ENTERED=20010922
+ SHORT="Stable free implementation of the X Window System"
cat << EOF
What is XFree86?

diff --git a/x11-libs/xfree86-4.3/FINAL b/x11-libs/xfree86-4.3/FINAL
new file mode 100755
index 0000000..90bf863
--- /dev/null
+++ b/x11-libs/xfree86-4.3/FINAL
@@ -0,0 +1,7 @@
+rm_source_dir $SOURCE_DIRECTORY.bld &&
+rm -f $BOOST_LOCK
+if ! grep -q /usr/X11R6/lib /etc/ld.so.conf
+then echo "/usr/X11R6/lib/" >> /etc/ld.so.conf
+ ldconfig
+fi
+
diff --git a/x11-libs/xfree86-4.3/HISTORY b/x11-libs/xfree86-4.3/HISTORY
index c28c74f..6e0558e 100644
--- a/x11-libs/xfree86-4.3/HISTORY
+++ b/x11-libs/xfree86-4.3/HISTORY
@@ -1,3 +1,13 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1 and UPDATED
+ Shortened SHORT
+ * PRE_BUILD: Move pre-build setup from BUILD to PRE_BUILD
+ * BUILD: Removed pre-build setup
+ Removed installation of files
+ Converted to build_api 2
+ * INSTALL: Install xfree86 files
+ * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

@@ -14,8 +24,8 @@
* PRE_BUILD: unpack api update

2005-09-20 Thomas Houssin <Thomas.Houssin AT sourcemage.org>
- * PRE_BUILD, CAN-2005-2495.patch: security fix
- see CAN-2005-2495
+ * PRE_BUILD, CAN-2005-2495.patch: security fix
+ see CAN-2005-2495

2005-08-22 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD, xfree86-xft-releasefile-crash.patch:
diff --git a/x11-libs/xfree86-4.3/INSTALL b/x11-libs/xfree86-4.3/INSTALL
new file mode 100755
index 0000000..9670906
--- /dev/null
+++ b/x11-libs/xfree86-4.3/INSTALL
@@ -0,0 +1,40 @@
+install_drm() {
+ DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
+ DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/char/drm"
+ mkdir -p $DRM_DEST
+ cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
+ depmod -a
+ true
+}
+
+#### the following is needed for pkgconfig to find the .pc files
+cd $SOURCE_DIRECTORY.bld &&
+mkdir -p /usr/X11R6/lib &&
+ln -sf /usr/lib/pkgconfig /usr/X11R6/lib &&
+make install &&
+make install.man &&
+ install_drm &&
+mkdir -p /usr/X11R6/include/GL
+
+rm -f /usr/X11R6/include/zlib.h
+rm -f /usr/X11R6/lib/libz.a
+
+if [ ! -e /etc/skel/.xsession ]; then
+ cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
+fi
+
+if [ ! -e /usr/bin/X11 ]; then
+ ln -sf /usr/X11R6/bin /usr/bin/X11
+fi
+
+if [ ! -e /usr/X11 ]; then
+ ln -sf X11R6 /usr/X11
+fi
+
+if [ ! -e /usr/include/X11 ]; then
+ ln -sf ../X11R6/include/X11 /usr/include/X11
+fi
+
+if [ ! -e /usr/lib/X11 ]; then
+ ln -sf ../X11R6/lib/X11 /usr/lib/X11
+fi
diff --git a/x11-libs/xfree86-4.3/POST_INSTALL
b/x11-libs/xfree86-4.3/POST_INSTALL
deleted file mode 100755
index 90bf863..0000000
--- a/x11-libs/xfree86-4.3/POST_INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-rm_source_dir $SOURCE_DIRECTORY.bld &&
-rm -f $BOOST_LOCK
-if ! grep -q /usr/X11R6/lib /etc/ld.so.conf
-then echo "/usr/X11R6/lib/" >> /etc/ld.so.conf
- ldconfig
-fi
-
diff --git a/x11-libs/xfree86-4.3/PRE_BUILD b/x11-libs/xfree86-4.3/PRE_BUILD
index ebdfc07..2575ee4 100755
--- a/x11-libs/xfree86-4.3/PRE_BUILD
+++ b/x11-libs/xfree86-4.3/PRE_BUILD
@@ -1,15 +1,43 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
-unpack_file 2 &&
-unpack_file 3 &&
-unpack_file 4 &&
-unpack_file 5 &&
-unpack_file 6 &&
-unpack_file 7 &&
-unpack_file 8 &&
-unpack_file 9 &&
-patch -d xc/lib/font/fontfile/ < $SOURCE_CACHE/$SOURCE9 &&
-patch -d xc -p0 < $SCRIPT_DIRECTORY/xfree86-xft-releasefile-crash.patch
&&
-patch -d xc -p0 < $SCRIPT_DIRECTORY/CAN-2005-2495.patch &&
-#recommended by xfree86.org
-mk_source_dir $SOURCE_DIRECTORY.bld
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+if [ -f $CONFIG_CACHE/host.def ]
+then cp $CONFIG_CACHE/host.def config/cf/host.def
+fi &&
+### but if it can't be copied then use system defaults for these
+if ! grep -q HasFreetype2 config/cf/host.def
+ then echo "#define HasFreetype2 YES" >> config/cf/host.def
+fi &&
+if ! grep -q BuildFreetype2Library config/cf/host.def
+ then echo "#define BuildFreetype2Library NO" >> config/cf/host.def
+fi &&
+if ! grep -q HasZlib config/cf/host.def
+ then echo "#define HasZlib YES" >> config/cf/host.def
+fi &&
+if ! grep -q HasFontconfig config/cf/host.def
+ then echo "#define HasFontconfig YES" >> config/cf/host.def
+fi &&
+if ! grep -q HasExpat config/cf/host.def
+ then echo "#define HasExpat YES" >> config/cf/host.def
+fi &&
+message "Building XFree86 takes a very long time."
+
+### Apply 4.3.0.1 patch
+zcat ${SOURCE_CACHE}/${SOURCE8} | patch -p1 &&
+
+### Apply Xinput locking patch
+patch -p2 < $SCRIPT_DIRECTORY/Xi-locking.patch &&
+### Apply linux version patch to support 2.6.X
+patch -p1 < $SCRIPT_DIRECTORY/XFree86-4.3.0-linux-2.6.0.patch &&
+
+### removing -Os from copied host.def bug#3694 and cleaning up $CFLAGS
+if [ -f config/cf/host.def ]
+then sedit s"/-Os//g" config/cf/host.def
+fi &&
+if (echo $CFLAGS | grep -q -- "-Os"); then
+ export CFLAGS="-O2 ${CFLAGS//-Os/}"
+fi &&
+
+if spell_ok linux-pam
+then echo "#define HasPam YES" >> config/cf/site.def
+fi
diff --git a/x11-libs/xfree86-devel/BUILD b/x11-libs/xfree86-devel/BUILD
index fa36b34..56c4479 100755
--- a/x11-libs/xfree86-devel/BUILD
+++ b/x11-libs/xfree86-devel/BUILD
@@ -1,104 +1,22 @@
-install_drm() {
-
- DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
- DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/char/drm"
- mkdir -p $DRM_DEST
- cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
- depmod -a
- true
-
-}
-
-
-if [ -f $CONFIG_CACHE/host.def ]
-then cp $CONFIG_CACHE/host.def config/cf/host.def
-fi &&
-### but if it can't be copied then use system defaults for these
-if ! grep -q HasFreetype2 config/cf/host.def
- then echo "#define HasFreetype2 YES" >> config/cf/host.def
-fi &&
-if ! grep -q BuildFreetype2Library config/cf/host.def
- then echo "#define BuildFreetype2Library NO" >> config/cf/host.def
-fi &&
-if ! grep -q HasZlib config/cf/host.def
- then echo "#define HasZlib YES" >> config/cf/host.def
-fi &&
-if ! grep -q HasFontconfig config/cf/host.def
- then echo "#define HasFontconfig YES" >> config/cf/host.def
-fi &&
-if ! grep -q HasExpat config/cf/host.def
- then echo "#define HasExpat YES" >> config/cf/host.def
-fi &&
-
-(
- ### removing -Os from copied host.def bug#3694 and cleaning up $CFLAGS
- if [ -f config/cf/host.def ]
- then sedit s"/-Os//g" config/cf/host.def
- fi &&
- if (echo $CFLAGS | grep -q -- "-Os"); then
- export CFLAGS="-O2 ${CFLAGS//-Os/}"
- fi &&
-
- if spell_ok linux-pam
- then echo "#define HasPam YES" >> config/cf/site.def
- fi &&
-
- ### xfree86.org recommends building in a shadow tree
- cd config/util &&
- make -f Makefile.ini lndir &&
- cp lndir $SOURCE_DIRECTORY.bld/ &&
- cd $SOURCE_DIRECTORY.bld &&
- ./lndir ../xc/ &&
-
- ### differnet approach to old bug
- ### Fix Bug #3486, which stops the build process
- ln -sf $SOURCE_DIRECTORY.bld/lib/font/builtins
$SOURCE_DIRECTORY.bld/lib/font/builtins/unshared &&
-
- ### will this fix the mysterious error ?
- mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/
&&
- ln -sf $SOURCE_DIRECTORY/lib/xtrans/Xtrans.h
$SOURCE_DIRECTORY.bld/exports/include/X11/Xtrans.h &&
+cd config/util &&
+make -f Makefile.ini lndir &&
+cp lndir $SOURCE_DIRECTORY.bld/ &&
+cd $SOURCE_DIRECTORY.bld &&
+./lndir ../xc/ &&
+
+### differnet approach to old bug
+### Fix Bug #3486, which stops the build process
+ln -sf $SOURCE_DIRECTORY.bld/lib/font/builtins
$SOURCE_DIRECTORY.bld/lib/font/builtins/unshared &&
+
+### will this fix the mysterious error ?
+mkdir -p $SOURCE_DIRECTORY.bld/exports/include/X11/
&&
+ln -sf $SOURCE_DIRECTORY/lib/xtrans/Xtrans.h
$SOURCE_DIRECTORY.bld/exports/include/X11/Xtrans.h &&

- ### Copy sis_common.h from the drivers to the GL dri dir
- cp -f
$SOURCE_DIRECTORY.bld/programs/Xserver/hw/xfree86/drivers/sis/sis_common.h
$SOURCE_DIRECTORY.bld/lib/GL/mesa/src/drv/sis/ &&
- cp $SOURCE_DIRECTORY.bld/extras/freetype2/include/ft2build.h
$SOURCE_DIRECTORY.bld/lib/font/FreeType &&
- make World
+### Copy sis_common.h from the drivers to the GL dri dir
+cp -f
$SOURCE_DIRECTORY.bld/programs/Xserver/hw/xfree86/drivers/sis/sis_common.h
$SOURCE_DIRECTORY.bld/lib/GL/mesa/src/drv/sis/ &&
+cp $SOURCE_DIRECTORY.bld/extras/freetype2/include/ft2build.h
$SOURCE_DIRECTORY.bld/lib/font/FreeType &&
+make World

- ### Start compiling where the prior left off
-
- make &&
- prepare_install &&
-
- #### the following is needed for pkgconfig to find the .pc files
- mkdir -p /usr/X11R6/lib &&
- ln -sf /usr/lib/pkgconfig /usr/X11R6/lib &&
- make install &&
- make install.man &&
- install_drm &&
- mkdir -p /usr/X11R6/include/GL
-
-) > $C_FIFO 2>&1 && (
-
- rm -f /usr/X11R6/include/zlib.h
- rm -f /usr/X11R6/lib/libz.a
-
- if [ ! -e /etc/skel/.xsession ]; then
- cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
- fi
-
- if [ ! -e /usr/bin/X11 ]; then
- ln -sf /usr/X11R6/bin /usr/bin/X11
- fi
-
- if [ ! -e /usr/X11 ]; then
- ln -sf X11R6 /usr/X11
- fi
-
- if [ ! -e /usr/include/X11 ]; then
- ln -sf ../X11R6/include/X11 /usr/include/X11
- fi
-
- if [ ! -e /usr/lib/X11 ]; then
- ln -sf ../X11R6/lib/X11 /usr/lib/X11
- fi
+### Start compiling where the prior left off

-)
+make
diff --git a/x11-libs/xfree86-devel/DETAILS b/x11-libs/xfree86-devel/DETAILS
index 263e952..275d415 100755
--- a/x11-libs/xfree86-devel/DETAILS
+++ b/x11-libs/xfree86-devel/DETAILS
@@ -84,13 +84,11 @@ # SOURCE26_URL[0]=$XFREE86_URL/$BASE_VER

SOURCE25_HASH=sha512:e1ec64f9b5889a3037c5558140f9f51987190edaef3519b44ccd5ee3f41d7c54f649da56b7ecc9f349b1496a768dea8d8b54b0afed43d052244264b0859c815d
#
SOURCE26_HASH=sha512:9045c89b934d502a5525a3c6551d0111641c7a44ca5793b1eef816e2b4720096e0f5c4b79c0c6e0a41d575e9cd37b51f4733ca1ad0f5087d5abad9aec06aa7fa
PATCH_SOURCES=($SOURCE8 $SOURCE9 $SOURCE10 $SOURCE11 $SOURCE12 $SOURCE13
$SOURCE14 $SOURCE15 $SOURCE16 $SOURCE17 $SOURCE18 $SOURCE19 $SOURCE20
$SOURCE21 $SOURCE22 $SOURCE23 $SOURCE24 $SOURCE25)
- WEB_SITE=http://www.xfree86.org/
- ENTERED=20010922
- UPDATED=20050822
LICENSE[0]=XCL
KEYWORDS="x11 libs"
- BUILD_API=1
- SHORT='XFree86-devel is a the snapshot version of the X Window
System'
+ WEB_SITE=http://www.xfree86.org/
+ ENTERED=20010922
+ SHORT='Snapshot version of the X Window System'
cat << EOF
This is the cvs snapshot version of the xfree86 spell
EOF
diff --git a/x11-libs/xfree86-devel/FINAL b/x11-libs/xfree86-devel/FINAL
new file mode 100755
index 0000000..90bf863
--- /dev/null
+++ b/x11-libs/xfree86-devel/FINAL
@@ -0,0 +1,7 @@
+rm_source_dir $SOURCE_DIRECTORY.bld &&
+rm -f $BOOST_LOCK
+if ! grep -q /usr/X11R6/lib /etc/ld.so.conf
+then echo "/usr/X11R6/lib/" >> /etc/ld.so.conf
+ ldconfig
+fi
+
diff --git a/x11-libs/xfree86-devel/HISTORY b/x11-libs/xfree86-devel/HISTORY
index 3597085..f0be51c 100644
--- a/x11-libs/xfree86-devel/HISTORY
+++ b/x11-libs/xfree86-devel/HISTORY
@@ -1,3 +1,11 @@
+2006-06-29 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=1 and UPDATED
+ Shortened SHORT
+ * PRE_BUILD: Apply pre-build sedits and patches
+ * BUILD: Converted to build_api 2
+ * INSTALL: Install xfree86 files
+ * POST_INSTALL,FINAL: POST_INSTALL renamed to FINAL
+
2006-06-12 Arwed v. Merkatz <v.merkatz AT gmx.net>
* DETAILS: inserted BUILD_API=1 line

diff --git a/x11-libs/xfree86-devel/INSTALL b/x11-libs/xfree86-devel/INSTALL
new file mode 100755
index 0000000..9670906
--- /dev/null
+++ b/x11-libs/xfree86-devel/INSTALL
@@ -0,0 +1,40 @@
+install_drm() {
+ DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
+ DRM_DEST="/lib/modules/$(uname -r)/kernel/drivers/char/drm"
+ mkdir -p $DRM_DEST
+ cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
+ depmod -a
+ true
+}
+
+#### the following is needed for pkgconfig to find the .pc files
+cd $SOURCE_DIRECTORY.bld &&
+mkdir -p /usr/X11R6/lib &&
+ln -sf /usr/lib/pkgconfig /usr/X11R6/lib &&
+make install &&
+make install.man &&
+ install_drm &&
+mkdir -p /usr/X11R6/include/GL
+
+rm -f /usr/X11R6/include/zlib.h
+rm -f /usr/X11R6/lib/libz.a
+
+if [ ! -e /etc/skel/.xsession ]; then
+ cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
+fi
+
+if [ ! -e /usr/bin/X11 ]; then
+ ln -sf /usr/X11R6/bin /usr/bin/X11
+fi
+
+if [ ! -e /usr/X11 ]; then
+ ln -sf X11R6 /usr/X11
+fi
+
+if [ ! -e /usr/include/X11 ]; then
+ ln -sf ../X11R6/include/X11 /usr/include/X11
+fi
+
+if [ ! -e /usr/lib/X11 ]; then
+ ln -sf ../X11R6/lib/X11 /usr/lib/X11
+fi
diff --git a/x11-libs/xfree86-devel/POST_INSTALL
b/x11-libs/xfree86-devel/POST_INSTALL
deleted file mode 100755
index 90bf863..0000000
--- a/x11-libs/xfree86-devel/POST_INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-rm_source_dir $SOURCE_DIRECTORY.bld &&
-rm -f $BOOST_LOCK
-if ! grep -q /usr/X11R6/lib /etc/ld.so.conf
-then echo "/usr/X11R6/lib/" >> /etc/ld.so.conf
- ldconfig
-fi
-
diff --git a/x11-libs/xfree86-devel/PRE_BUILD
b/x11-libs/xfree86-devel/PRE_BUILD
index 1364977..b82378b 100755
--- a/x11-libs/xfree86-devel/PRE_BUILD
+++ b/x11-libs/xfree86-devel/PRE_BUILD
@@ -1,30 +1,34 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
-unpack_file 2 &&
-unpack_file 3 &&
-unpack_file 4 &&
-unpack_file 5 &&
-unpack_file 6 &&
-unpack_file 7 &&
-cd $SOURCE_DIRECTORY &&
-INDEX=7 &&
-for p in ${PATCH_SOURCES[*]}
- do message "${MESSAGE_COLOR}Checking integrity of patch
$p...${DEFAULT_COLOR}" &&
- SUM=$(bzip2 -cd $SOURCE_CACHE/$p | md5sum | cut -d ' ' -f 1)
&&
- if [ "$SUM" != "${MD5[$((INDEX++))]}" ]
- then message "${PROBLEM_COLOR}Integrity check for patch $p
failed${DEFAULT_COLOR}" &&
- return 1 # in a loop, '&&' thingy doesn't do what it's supposed
to
- fi
&&
- message "${MESSAGE_COLOR}Applying patch $p...${DEFAULT_COLOR}"
&&
- if ! bzip2 -cd $SOURCE_CACHE/$p | patch -N -p1 -s; then
- ### xfree86 patches may not be maintained properly, and some minor
errors
- ### may occur during their application, that do not preclude us from
proceeding.
- true
- fi
- done
&&
- rm -fr lib/zlib # moved in CVS, patch doesn't apply cleanly
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

-patch -d $SOURCE_DIRECTORY -p0 <
$SCRIPT_DIRECTORY/xfree86-xft-releasefile-crash.patch &&
-#recommended by xfree86.org
-mk_source_dir $SOURCE_DIRECTORY.bld
+if [ -f $CONFIG_CACHE/host.def ]
+then cp $CONFIG_CACHE/host.def config/cf/host.def
+fi &&
+### but if it can't be copied then use system defaults for these
+if ! grep -q HasFreetype2 config/cf/host.def
+ then echo "#define HasFreetype2 YES" >> config/cf/host.def
+fi &&
+if ! grep -q BuildFreetype2Library config/cf/host.def
+ then echo "#define BuildFreetype2Library NO" >> config/cf/host.def
+fi &&
+if ! grep -q HasZlib config/cf/host.def
+ then echo "#define HasZlib YES" >> config/cf/host.def
+fi &&
+if ! grep -q HasFontconfig config/cf/host.def
+ then echo "#define HasFontconfig YES" >> config/cf/host.def
+fi &&
+if ! grep -q HasExpat config/cf/host.def
+ then echo "#define HasExpat YES" >> config/cf/host.def
+fi &&

+### removing -Os from copied host.def bug#3694 and cleaning up $CFLAGS
+if [ -f config/cf/host.def ]
+then sedit s"/-Os//g" config/cf/host.def
+fi &&
+if (echo $CFLAGS | grep -q -- "-Os"); then
+ export CFLAGS="-O2 ${CFLAGS//-Os/}"
+fi &&
+
+if spell_ok linux-pam
+then echo "#define HasPam YES" >> config/cf/site.def
+fi
diff --git a/x11-libs/xfree86-libs/DETAILS b/x11-libs/xfree86-libs/DETAILS
index 229a220..6360b50 100755
--- a/x11-libs/xfree86-libs/DETAILS
+++ b/x11-libs/xfree86-libs/DETAILS
@@ -14,7 +14,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
ENTERED=20030908
UPDATED=20050822
LICENSE[0]=XCL
- BUILD_API=2
KEYWORDS="x11 libs"
SHORT="Libs only from the xfree86 project"
cat << EOF
diff --git a/x11-libs/xfree86-libs/HISTORY b/x11-libs/xfree86-libs/HISTORY
index e7cd6d6..fc1af46 100644
--- a/x11-libs/xfree86-libs/HISTORY
+++ b/x11-libs/xfree86-libs/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS

diff --git a/x11-libs/xfree86/DETAILS b/x11-libs/xfree86/DETAILS
index febf93d..c4ac142 100755
--- a/x11-libs/xfree86/DETAILS
+++ b/x11-libs/xfree86/DETAILS
@@ -26,7 +26,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
ENTERED=20010922
UPDATED=20050920
LICENSE[0]=XCL
- BUILD_API=2
KEYWORDS="x11 libs"
SHORT="Stable free implementation of the X Window System"
cat << EOF
diff --git a/x11-libs/xfree86/HISTORY b/x11-libs/xfree86/HISTORY
index 0caaa99..42b4ca6 100644
--- a/x11-libs/xfree86/HISTORY
+++ b/x11-libs/xfree86/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-05-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PROVIDES: added X11-UTILS and removed extra "provides"

diff --git a/x11-libs/xorg/DETAILS b/x11-libs/xorg/DETAILS
index 6c8bc94..d527a24 100755
--- a/x11-libs/xorg/DETAILS
+++ b/x11-libs/xorg/DETAILS
@@ -21,7 +21,6 @@ fi
ENTERED=20040407
UPDATED=20051104
LICENSE[0]=XCL
- BUILD_API=2
KEYWORDS="x11 libs"
SHORT="X.Org is an Open Source version of the X Window System"
cat << EOF
diff --git a/x11-libs/xorg/HISTORY b/x11-libs/xorg/HISTORY
index 3504c08..abcd9f0 100644
--- a/x11-libs/xorg/HISTORY
+++ b/x11-libs/xorg/HISTORY
@@ -1,3 +1,6 @@
+2006-06-28 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Removed BUILD_API=2, set grimoire-wide
+
2006-05-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* PROVIDES: added X11-UTILS and removed extra "provides"




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c697e19d2a47cb324782b282fd41e09903bcf8c7), Eric Sandall, 06/29/2006

Archive powered by MHonArc 2.6.24.

Top of Page