Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26080
Modified Files:
gtk-doc.info gtk-doc.patch
Log Message:
new version that doesn't require Depends:glib2-dev
Index: gtk-doc.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/gtk-doc.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtk-doc.patch 15 Jul 2008 01:40:48 -0000 1.2
+++ gtk-doc.patch 7 Apr 2009 16:57:32 -0000 1.3
@@ -1,19 +1,36 @@
-diff -uNr gtk-doc-1.8/omf.make gtk-doc-1.8-new/omf.make
---- gtk-doc-1.8/omf.make 2007-01-03 10:05:21.000000000 -0500
-+++ gtk-doc-1.8-new/omf.make 2007-02-16 12:01:16.000000000 -0500
-@@ -45,7 +45,6 @@
- for file in $(omffile); do \
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- done
-- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o
$(DESTDIR)$(omf_dest_dir)
+diff -Nurd -x'*~' gtk-doc-1.11.orig/gtkdoc-depscan.in
gtk-doc-1.11/gtkdoc-depscan.in
+--- gtk-doc-1.11.orig/gtkdoc-depscan.in 2007-12-20 09:09:16.000000000
-0500
++++ gtk-doc-1.11/gtkdoc-depscan.in 2009-04-07 12:50:54.000000000 -0400
+@@ -260,7 +260,7 @@
+ path = path and path.split(':') or []
- uninstall-local-omf:
- -for file in $(srcdir)/*.omf; do \
-@@ -53,7 +52,6 @@
- rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
- done
- -rmdir $(DESTDIR)$(omf_dest_dir)
-- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
+ prefix = popen(
+- 'pkg-config --variable=prefix glib-2.0'
++ '@prefix@'
+ ).readline().rstrip()
- clean-local-omf:
- -for file in $(omffile); do \
+ path.insert(0, prefix)
+diff -Nurd -x'*~' gtk-doc-1.11.orig/gtkdoc-fixxref.in
gtk-doc-1.11/gtkdoc-fixxref.in
+--- gtk-doc-1.11.orig/gtkdoc-fixxref.in 2008-06-08 01:30:22.000000000
-0400
++++ gtk-doc-1.11/gtkdoc-fixxref.in 2009-04-07 12:23:39.000000000 -0400
+@@ -80,7 +80,7 @@
+
+ # We scan the directory containing GLib and any directories in GNOME2_PATH
+ # first, but these will be overriden by any later scans.
+-$dir = `pkg-config --variable=prefix glib-2.0`;
++$dir = '@prefix@';
+ $dir =~ s/\s+$//;
+ $dir = $dir . "/share/gtk-doc/html";
+ if (-d $dir && $dir ne $HTML_DIR) {
+diff -Nurd -x'*~' gtk-doc-1.11.orig/gtkdoc-rebase.in
gtk-doc-1.11/gtkdoc-rebase.in
+--- gtk-doc-1.11.orig/gtkdoc-rebase.in 2008-06-03 16:40:35.000000000 -0400
++++ gtk-doc-1.11/gtkdoc-rebase.in 2009-04-07 12:23:19.000000000 -0400
+@@ -105,7 +105,7 @@
+ }
+ }
+
+-$dir = `pkg-config --variable=prefix glib-2.0`;
++$dir = '@prefix@';
+ $dir =~ s/^\s*(\S*)\s*$/$1/;
+ $dir = $dir . "/share/gtk-doc/html";
+ print "Prepending GLib directory $dir\n" if $VERBOSE;
Index: gtk-doc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/gtk-doc.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gtk-doc.info 15 Jul 2008 01:40:48 -0000 1.9
+++ gtk-doc.info 7 Apr 2009 16:57:31 -0000 1.10
@@ -1,29 +1,31 @@
Package: gtk-doc
-Version: 1.9
-Revision: 2
+Version: 1.11
+Revision: 1
BuildDepends: <<
fink (>= 0.24.12-1),
- libxml2 (>= 2.6.22-1003),
- libxslt (>= 1.1.14-1)
+ glib2-dev (>= 2.18.0-1),
+ gnome-doc-utils (>= 0.14.2-1),
+ libxml2 (>= 2.6.30-1),
+ libxslt (>= 1.1.14-1),
+ pkgconfig (>= 0.23)
<<
Depends: <<
docbook-dtd (>= 4.2.0-2),
docbook-xsl (>= 1.62.4-2),
docbook-dsssl-nwalsh (>= 1.78-2),
- libxml2-bin (>= 2.6.22-1003),
+ libxml2-bin (>= 2.6.30-1),
libxslt-bin (>= 1.1.14-1),
libxslt-shlibs (>= 1.1.14-1),
openjade (>= 1.3.2-1029),
- pkgconfig (>= 0.20-1),
rarian-compat
<<
Source: mirror:gnome:sources/%n/%v/%n-%v.tar.bz2
-Source-MD5: bcd002f381385812737a05538eb8b21e
+Source-MD5: b5e268c71fa90aad890cf53715664d0a
PatchFile: %n.patch
-PatchFile-MD5: 01bd15eacaea27cfffa4bd6aacf6338f
-ConfigureParams: --with-xml-catalog=%p/etc/xml/catalog
--disable-dependency-tracking ac_cv_path_scrollkeeper_config=no
+PatchFile-MD5: 7730fade0dae01d028cebad947df0c46
+ConfigureParams: --with-xml-catalog=%p/etc/xml/catalog
--disable-dependency-tracking --disable-scrollkeeper --disable-static
PERL=/usr/bin/perl PYTHON=/usr/bin/python
CompileScript: <<
- PERL=/usr/bin/perl ./configure %c
+ ./configure %c
make
<<
InstallScript: <<
@@ -57,12 +59,8 @@
Formerly maintained by Masanori Sekino and Michele Garoche.
Added libxslt-bin to Depends in order to get xsltproc, otherwise some
packages fail to build.
- Changed the version of libxml2 and libxslt to be sure to get the right
- split offs.
- Added scrollkeeper to update omf files.
- Usual patch for omf.make and Makefile.in to update files during
- post installation.
Customized docbook-to-man, and tools not installed
- Avoid dependency mess if /sw/bin/perl exists at compile-time
+ Apple's perl and python are sufficient, so make sure they are used
+ Patch programs to avoid needing glib2-dev at runtime
<<
Homepage: http://www.gtk.org/gtk-doc/
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
