Author: ranger
Date: Wed Dec 19 19:17:00 2007
New Revision: 1091
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1091&repname=user%3a+ranger
Log:
be much more anal about generating the dummy package
Modified:
trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info
trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
Modified: trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info&rev=1091&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info
(original)
+++ trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev-10.5.info Wed Dec
19 19:17:00 2007
@@ -1,6 +1,6 @@
Package: fontconfig2-dev
Version: 2.4.1
-Revision: 5
+Revision: 101
Distribution: 10.5
Description: Font configuration library
Type: nosource
@@ -21,15 +21,58 @@
FC_ROOT="%i/lib/fontconfig2"
X11_ROOT="/usr/X11"
+ declare -a bad_files
+
+ bad_file() {
+ bad_files[${#bad_files[*]}]="$1"
+ }
+
install -d -m 755 $FC_ROOT/{bin,include,lib,lib/pkgconfig}
- /bin/ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
- /bin/ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
- for file in libfontconfig.1.1.0.dylib libfontconfig.1.dylib
libfontconfig.dylib libfontconfig.la; do
- /bin/ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
+
+ for file in \
+ fcfreetype.h \
+ fcprivate.h \
+ fontconfig.h \
+ ; do
+ [ -e "$X11_ROOT/include/fontconfig/$file" ] || bad_file
"$X11_ROOT/include/fontconfig/$file"
done
- for file in fc-cache fc-cat fc-list fc-match; do
- /bin/ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
+
+ for file in \
+ include/fontconfig \
+ lib/pkgconfig/fontconfig.pc \
+ lib/libfontconfig.1.1.0.dylib \
+ lib/libfontconfig.1.dylib \
+ lib/libfontconfig.dylib \
+ lib/libfontconfig.la \
+ bin/fc-cache \
+ bin/fc-cat \
+ bin/fc-list \
+ bin/fc-match \
+ ; do
+ [ -e "$X11_ROOT/$file" ] || bad_file "$X11_ROOT/$file"
+ /bin/ln -sfh "$X11_ROOT/$file" "$FC_ROOT/$file"
done
+
+ if [ ${#bad_files[*]} -gt 0 ]; then
+ echo ""
+ echo ""
+ echo ""
+ echo "=== ERROR === ERROR === ERROR === ERROR === ERROR ===
ERROR === ERROR ==="
+ echo ""
+ echo "Your X11 installation appears to be missing one or more
required files:"
+ for file in "[EMAIL PROTECTED]"; do
+ echo " $file"
+ done
+ echo ""
+ echo "You may need to reinstall the X11User or X11SDK packages
from your"
+ echo "Leopard install media."
+ echo ""
+ echo "=== ERROR === ERROR === ERROR === ERROR === ERROR ===
ERROR === ERROR ==="
+ echo ""
+ echo ""
+ echo ""
+ exit 1
+ fi
<<
SplitOff: <<
Package: fontconfig2-shlibs
Modified: trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info&rev=1091&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info (original)
+++ trunk/experimental/10.4/main/finkinfo/x11/fontconfig2-dev.info Wed Dec 19
19:17:00 2007
@@ -13,7 +13,7 @@
BuildDepends: <<
expat1,
x11-dev,
- freetype219
+ freetype219 (>= 2.3.5-1)
<<
BuildDependsOnly: true
@@ -32,7 +32,7 @@
Depends: <<
fontconfig-config (= %v-%r),
expat1-shlibs,
- freetype219-shlibs
+ freetype219-shlibs (>= 2.3.5-1)
<<
DocFiles: README
Files: <<
Modified: trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info&rev=1091&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info
(original)
+++ trunk/experimental/common/main/finkinfo/x11/fontconfig2-dev-10.5.info Wed
Dec 19 19:17:00 2007
@@ -1,6 +1,6 @@
Package: fontconfig2-dev
Version: 2.4.1
-Revision: 5
+Revision: 101
Distribution: 10.5
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
BuildDependsOnly: true
@@ -13,15 +13,59 @@
FC_ROOT="%i/lib/fontconfig2"
X11_ROOT="/usr/X11"
+ declare -a bad_files
+
+ bad_file() {
+ bad_files[${#bad_files[*]}]="$1"
+ }
+
install -d -m 755 $FC_ROOT/{bin,include,lib,lib/pkgconfig}
- /bin/ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
- /bin/ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
- for file in libfontconfig.1.1.0.dylib libfontconfig.1.dylib
libfontconfig.dylib libfontconfig.la; do
- /bin/ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
+
+ for file in \
+ fcfreetype.h \
+ fcprivate.h \
+ fontconfig.h \
+ ; do
+ [ -e "$X11_ROOT/include/fontconfig/$file" ] || bad_file
"$X11_ROOT/include/fontconfig/$file"
done
- for file in fc-cache fc-cat fc-list fc-match; do
- /bin/ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
+
+ for file in \
+ include/fontconfig \
+ lib/pkgconfig/fontconfig.pc \
+ lib/libfontconfig.1.1.0.dylib \
+ lib/libfontconfig.1.dylib \
+ lib/libfontconfig.dylib \
+ lib/libfontconfig.la \
+ bin/fc-cache \
+ bin/fc-cat \
+ bin/fc-list \
+ bin/fc-match \
+ ; do
+ [ -e "$X11_ROOT/$file" ] || bad_file "$X11_ROOT/$file"
+ /bin/ln -sfh "$X11_ROOT/$file" "$FC_ROOT/$file"
done
+
+ if [ ${#bad_files[*]} -gt 0 ]; then
+ echo ""
+ echo ""
+ echo ""
+ echo "=== ERROR === ERROR === ERROR === ERROR === ERROR ===
ERROR === ERROR ==="
+ echo ""
+ echo "Your X11 installation appears to be missing one or more
required files:"
+ for file in "[EMAIL PROTECTED]"; do
+ echo " $file"
+ done
+ echo ""
+ echo "You may need to reinstall the X11User or X11SDK packages
from your"
+ echo "Leopard install media."
+ echo ""
+ echo "=== ERROR === ERROR === ERROR === ERROR === ERROR ===
ERROR === ERROR ==="
+ echo ""
+ echo ""
+ echo ""
+ exit 1
+ fi
+
<<
PreInstScript: <<
for file in "%p/lib/fontconfig2/include/fontconfig"
"%p/lib/fontconfig2/lib/pkgconfig/fontconfig.pc" \
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
