Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sc8-pr-cvs17:/tmp/cvs-serv11068

Modified Files:
        t1lib1.info t1lib5.info 
Added Files:
        t1lib5-5.1.1-3.info t1lib5-shlibs.info 
Log Message:
latest version to stable


Index: t1lib1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/t1lib1.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- t1lib1.info 13 Dec 2006 17:45:24 -0000      1.4
+++ t1lib1.info 31 Jul 2007 03:57:21 -0000      1.5
@@ -1,11 +1,11 @@
 Package: t1lib1
 Version: 1.3.1
-Revision: 4
+Revision: 5
 Depends: %N-shlibs (= %v-%r)
 BuildDepends: x11-dev
 BuildDependsOnly: True
-Conflicts: t1lib5
-Replaces: t1lib5
+Conflicts: t1lib5, t1lib5-x11, t1lib5-nox
+Replaces: t1lib5, t1lib5-x11, t1lib5-nox
 UpdateLibtoolinDirs: ac-tools
 PatchScript: <<
   perl -pi -e "s|hardcode_direct=yes|hardcode_direct=no|" ac-tools/ltconfig

Index: t1lib5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/t1lib5.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- t1lib5.info 12 May 2007 20:27:40 -0000      1.5
+++ t1lib5.info 31 Jul 2007 03:57:24 -0000      1.6
@@ -1,31 +1,44 @@
-Package: t1lib5
+Info2: <<
+Package: t1lib5%type_pkg[-nox]
 Version: 5.1.1
-Revision: 1
+Revision: 3
+Type: -nox (-nox -x11)
 Depends: %N-shlibs (= %v-%r)
-BuildDepends: x11-dev
+BuildDepends: fink (>= 0.27.2-1), (%type_raw[-nox] = -x11) x11-dev
 BuildDependsOnly: True
-Conflicts: t1lib1
-Replaces: t1lib1
+Conflicts: t1lib1, t1lib5
+Replaces: t1lib1, t1lib5
 PatchScript: <<
   perl -pi -e 's/-o .* \$\(T1LIBX_OBJS\)/$& \$(X_LIBS) \$(XLIB)/' 
lib/Makefile.in
 <<
+ConfigureParams: (%type_raw[-nox] = -nox) --without-x
 CompileScript: <<
  ./configure %c
  make without_doc
 <<
 InstallScript: <<
+ #!/bin/sh -ev
  make install prefix=%i
+ if [ %type_raw[-nox] = "-x11" ]; then 
+ rm %i/bin/type1afm %i/include/t1lib.h %i/lib/libt1.*
+ elif [ %type_raw[-nox] = "-nox" ]; then
+ mv %i/share/t1lib/t1lib.config %i/share/t1lib/t1lib-nox.config
+ fi
  mkdir -p %i/share/doc/%n
  mv %i/share/t1lib/doc/t1lib_doc.pdf %i/share/doc/%n
  /bin/rm -rf %i/share/t1lib/doc
 <<
 SplitOff: <<
   Package: %N-shlibs
-  Depends: x11
+  Depends: <<
+    (%type_raw[-nox] = -x11) x11, 
+    (%type_raw[-nox] = -x11) t1lib5-nox-shlibs
+  <<
+  Replaces: t1lib5-shlibs (<= 5.1.1-1)
   Files: lib/*.5*dylib
   Shlibs: <<
-    %p/lib/libt1.5.dylib 7.0.0 %n (>= 5.1.1-1)
-    %p/lib/libt1x.5.dylib 7.0.0 %n (>= 5.1.1-1)
+    (%type_raw[-nox] = -nox) %p/lib/libt1.5.dylib 7.0.0 %n (>= 5.1.1-2)
+    (%type_raw[-nox] = -x11) %p/lib/libt1x.5.dylib 7.0.0 %n (>= 5.1.1-2)
   <<
   DocFiles: README.t1lib-%v LICENSE LGPL
   Description: Shared libs for generating Type 1 Font bitmaps
@@ -33,13 +46,19 @@
 License: GPL
 DocFiles: README.t1lib-%v LICENSE LGPL
 Source: http://sunsite.unc.edu/pub/linux/libs/graphics/t1lib-%v.tar.gz
-#Source: mirror:sourceforge:fink/direct_download/source/t1lib-%v.tar.gz
 Source-MD5: b1b86b5014364d92ab3b7cee6c81e29d
 Homepage: http://sunsite.unc.edu/pub/linux/libs/graphics/
 Description: Generates bitmaps from Type 1 fonts
+DescPackaging: <<
+ The x11-dependent portions of t1lib5 have now been made into a separate
+ package.  Other packages would typically depend on either "t1lib5-nox-shlibs"
+ or "t1lib5-nox-shlibs, t1lib5-x11-shlibs", depending on whether they were
+ using x11 features or not.
+<<
 DescPort: <<
   Make sure libt1x, which uses x11, links against the x11 libs.
   libt1x also uses libt1, but cannot link against it because the
   libtool is tool old.
 <<
 Maintainer:  Dave Morrison <[EMAIL PROTECTED]>
+<<

--- NEW FILE: t1lib5-5.1.1-3.info ---
Package: t1lib5
Version: 5.1.1
Revision: 3
Depends: %N-x11-shlibs, %N-nox-shlibs
BuildDepends: x11-dev
BuildDependsOnly: True
Conflicts: t1lib1, t1lib5-x11, t1lib5-nox
Replaces: t1lib1, t1lib5-x11, t1lib5-nox
PatchScript: <<
  perl -pi -e 's/-o .* \$\(T1LIBX_OBJS\)/$& \$(X_LIBS) \$(XLIB)/' 
lib/Makefile.in
<<
CompileScript: <<
 ./configure %c
 make without_doc
<<
InstallScript: <<
 make install prefix=%i
 rm %i/lib/*.5*dylib
 mkdir -p %i/share/doc/%n
 mv %i/share/t1lib/doc/t1lib_doc.pdf %i/share/doc/%n
 /bin/rm -rf %i/share/t1lib/doc
<<
License: GPL
DocFiles: README.t1lib-%v LICENSE LGPL
Source: http://sunsite.unc.edu/pub/linux/libs/graphics/t1lib-%v.tar.gz
#Source: mirror:sourceforge:fink/direct_download/source/t1lib-%v.tar.gz
Source-MD5: b1b86b5014364d92ab3b7cee6c81e29d
Homepage: http://sunsite.unc.edu/pub/linux/libs/graphics/
Description: Generates bitmaps from Type 1 fonts
DescPackaging: <<
  Although t1lib5 as a separate package is obsolete, this collection of
  headers and library links is being provided during the transition
  period until t1lib5 has been completely replaced by t1lib5-x11 and
  t1lib5-nox.
<<
DescPort: <<
  Make sure libt1x, which uses x11, links against the x11 libs.
  libt1x also uses libt1, but cannot link against it because the
  libtool is tool old.
<<
Maintainer:  Dave Morrison <[EMAIL PROTECTED]>

--- NEW FILE: t1lib5-shlibs.info ---
Package: t1lib5-shlibs
Version: 5.1.1
Revision: 2
Type: bundle
Depends: t1lib5-x11-shlibs, t1lib5-nox-shlibs
Description: Placeholder for t1lib5-*-shlibs
DescPackaging: <<
 The shared libraries for t1lib5 have now been split into two separate
 packages: t1lib5-x11-shlibs and t1lib5-nox-shlibs.

 This bundle package exists to satisfy the requirements of the Shlibs
 field from the previous t1lib5-shlibs package, which guaranteed that
 both shared libraries would always be available from a package called
 "t1lib5-shlibs".
<<
Maintainer:  Dave Morrison <[EMAIL PROTECTED]>


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to