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>
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
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
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.
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
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
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