Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory 
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20739/10.4/stable/main/finkinfo/graphics

Modified Files:
        freetype.info freetype-hinting.info 
Log Message:
Bury headers in subdir so not automatically found by compilers
Need to do stable and unstable b/c requires other pkgs' flags be updated.


Index: freetype.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/freetype.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freetype.info       20 Jan 2006 20:12:53 -0000      1.1
+++ freetype.info       13 Nov 2006 23:56:09 -0000      1.2
@@ -1,8 +1,8 @@
 Package: freetype
 Version: 1.3.1
-Revision: 9
-BuildDepends: gettext-dev, gettext-bin, gettext-tools, x11-dev
-Depends: %N-shlibs (= %v-%r), %N-bin 
+Revision: 11
+BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, x11-dev
+Depends: %N-shlibs (= %v-%r), %N-bin
 BuildDependsOnly: True
 Conflicts: freetype-hinting
 Replaces: freetype-hinting
@@ -18,6 +18,7 @@
  mv INSTALL INSTALL.txt
  perl -pi -e 's|##||g' test/ftdump.c
 <<
+ConfigureParams: --includedir=%i/include/freetype1
 CompileScript: <<
  ./configure %c
  sed -e 's/.*#undef.*TT_CONFIG_OPTION_NO_INTERPRETER.*/#define 
TT_CONFIG_OPTION_NO_INTERPRETER/' <ft_conf.h >ft_conf.h.tmp
@@ -29,7 +30,7 @@
 <<
 SplitOff: <<
   Package: %N-shlibs
-  Depends: x11
+  Depends: x11, libgettext3-shlibs
   Conflicts: freetype-hinting-shlibs
   Replaces: freetype-hinting-shlibs, %N (<= 1.3.1-4), freetype-hinting (<= 
1.3.1-3)
   Files: lib/libttf.2.2.0.dylib lib/libttf.2.dylib
@@ -66,6 +67,11 @@
 INSTALL file out of the way so the Makefile will actually do a 'make
 install' ...
 <<
+DescUsage: <<
+ As of 1.3.1-11, the headers are moved into the freetype1 subdir of 
+ %p/include/ so that they are not found by the compiler unless
+ explicit an -I flag is passed for them.
+<<
 License: OSI-Approved
 Homepage: http://www.freetype.org/
 Maintainer: None <fink-devel@lists.sourceforge.net>

Index: freetype-hinting.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/freetype-hinting.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freetype-hinting.info       20 Jan 2006 20:12:53 -0000      1.1
+++ freetype-hinting.info       13 Nov 2006 23:56:09 -0000      1.2
@@ -1,7 +1,7 @@
 Package: freetype-hinting
 Version: 1.3.1
-Revision: 9
-BuildDepends: gettext-dev, gettext-bin, gettext-tools, x11-dev
+Revision: 11
+BuildDepends: libgettext3-dev, gettext-bin, gettext-tools, x11-dev
 Depends: %N-shlibs (= %v-%r), %N-bin
 BuildDependsOnly: True
 Provides: freetype
@@ -19,12 +19,13 @@
  mv INSTALL INSTALL.txt
  perl -pi -e 's|##||g' test/ftdump.c
 <<
+ConfigureParams: --includedir=%i/include/freetype1
 InstallScript: <<
  make install prefix=%i
 <<
 SplitOff: <<
   Package: %N-shlibs
-  Depends: x11
+  Depends: x11, libgettext3-shlibs
   Conflicts: freetype-shlibs
   Replaces: freetype-shlibs, %N (<= 1.3.1-3), freetype (<= 1.3.1-4)
   Provides: freetype-shlibs
@@ -34,7 +35,7 @@
 <<
 SplitOff2: <<
   Package: %N-bin
-  Depends: %N-shlibs (= %v-%r) 
+  Depends: %N-shlibs (= %v-%r)
   Conflicts: freetype-bin
   Replaces: freetype-bin, %N (<= 1.3.1-3), freetype (<= 1.3.1-4)
   Provides: freetype-bin
@@ -62,6 +63,11 @@
 INSTALL file out of the way so the Makefile will actually do a 'make
 install' ...
 <<
+DescUsage: <<
+ As of 1.3.1-11, the headers are moved into the freetype1 subdir of 
+ %p/include/ so that they are not found by the compiler unless
+ explicit an -I flag is passed for them.
+<<
 License: Restrictive
 Homepage: http://www.freetype.org/
 Maintainer: None <fink-devel@lists.sourceforge.net>


-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to