Author: ranger
Date: Tue Mar 10 05:18:02 2009
New Revision: 1389
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1389&repname=user%3a+ranger>
Log:
more work on this
Removed:
trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4-mac.info
trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4-x11.info
Modified:
trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-mac.info
trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-x11.info
trunk/experimental/common/main/finkinfo/kde/ (props changed)
trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4.info.in
trunk/experimental/generate-infofiles.pl
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-mac.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-mac.info&rev=1389&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-mac.info
(original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-mac.info Tue
Mar 10 05:18:02 2009
@@ -7,10 +7,7 @@
License: GPL/LGPL
Maintainer: Benjamin Reed <[email protected]>
-Depends: <<
- kmouth-%type_pkg[kde] (>= %v-%r),
- ktts-%type_pkg[kde] (>= %v-%r)
-<<
+Depends: kmouth-%type_pkg[kde] (>= %v-%r)
BuildDepends: <<
automoc-%type_pkg[kde] (>= 0.9.88-1),
cmake (>= 2.6.3-1),
@@ -43,6 +40,7 @@
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
+ export PATH="%p/share/java/freetts:$PATH"
mkdir -p build
pushd build
@@ -78,21 +76,6 @@
<<
<<
SplitOff2: <<
- Package: ktts-%type_pkg[kde]
- Depends: %N-base (>= %v-%r)
- Files: <<
- lib/%type_pkg[kde]/bin/ktts*
- lib/%type_pkg[kde]/lib/kde4/*tts*
- lib/%type_pkg[kde]/lib/libkttsd.4*.dylib
- lib/%type_pkg[kde]/share/applications/kde4/kttsmgr*
- lib/%type_pkg[kde]/share/apps/kttsd
- lib/%type_pkg[kde]/share/doc/HTML/en/kttsd
- lib/%type_pkg[kde]/share/kde4/services/*tts*
- lib/%type_pkg[kde]/share/kde4/servicetypes/*tts*
- <<
- Shlibs: %p/lib/%type_pkg[kde]/lib/libkttsd.4.dylib 4.0.0 %n (>= 4.2.1-1)
-<<
-SplitOff3: <<
Package: %N-base
Depends: kdebase4-runtime-%type_pkg[kde] (>= 4.2.1-1)
Files: lib
Modified: trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-x11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-x11.info&rev=1389&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-x11.info
(original)
+++ trunk/experimental/10.4/main/finkinfo/kde/kdeaccessibility4-x11.info Tue
Mar 10 05:18:02 2009
@@ -10,8 +10,8 @@
Depends: <<
kmag-%type_pkg[kde] (>= %v-%r),
kmousetool-%type_pkg[kde] (>= %v-%r),
- kmouth-%type_pkg[kde] (>= %v-%r),
- ktts-%type_pkg[kde] (>= %v-%r)
+ ktts-%type_pkg[kde] (>= %v-%r),
+ kmouth-%type_pkg[kde] (>= %v-%r)
<<
BuildDepends: <<
automoc-%type_pkg[kde] (>= 0.9.88-1),
@@ -45,6 +45,7 @@
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
+ export PATH="%p/share/java/freetts:$PATH"
mkdir -p build
pushd build
Propchange: trunk/experimental/common/main/finkinfo/kde/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 10 05:18:02 2009
@@ -1,1 +1,2 @@
.*.swp
+*.ignore
Modified: trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4.info.in
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4.info.in&rev=1389&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4.info.in
(original)
+++ trunk/experimental/common/main/finkinfo/kde/kdeaccessibility4.info.in Tue
Mar 10 05:18:02 2009
@@ -29,9 +29,9 @@
#ifdef TYPE_X11
kmag-%type_pkg[kde] (>= %v-%r),
kmousetool-%type_pkg[kde] (>= %v-%r),
+ ktts-%type_pkg[kde] (>= %v-%r),
#endif
kmouth-%type_pkg[kde] (>= %v-%r),
- ktts-%type_pkg[kde] (>= %v-%r),
<<
BuildDepends: <<
@@ -61,6 +61,7 @@
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
. %p/sbin/kde4-buildenv.sh
+ export PATH="%p/share/java/freetts:$PATH"
mkdir -p build
pushd build
@@ -97,6 +98,7 @@
<<
<<
+#ifdef TYPE_X11
SplitOff2: <<
Package: ktts-%type_pkg[kde]
Depends: %N-base (>= %v-%r)
@@ -115,7 +117,6 @@
<<
<<
-#ifdef TYPE_X11
SplitOff3: <<
Package: kmag-%type_pkg[kde]
Depends: %N-base (>= %v-%r)
@@ -148,7 +149,7 @@
#ifdef TYPE_X11
SplitOff5: <<
#else
-SplitOff3: <<
+SplitOff2: <<
#endif
Package: %N-base
Depends: <<
Modified: trunk/experimental/generate-infofiles.pl
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/generate-infofiles.pl&rev=1389&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/generate-infofiles.pl (original)
+++ trunk/experimental/generate-infofiles.pl Tue Mar 10 05:18:02 2009
@@ -192,8 +192,8 @@
my $in_x11 = 0;
my $in_mac = 0;
my $line;
- if (open($x11, '>' . $dir . '/' . $noext .
'-x11.info')) {
- if (open($mac, '>' . $dir . '/' . $noext .
'-mac.info')) {
+ if (open($x11, '>' . $dir . '/' . $noext .
'-x11.ignore')) {
+ if (open($mac, '>' . $dir . '/' . $noext .
'-mac.ignore')) {
while ($line = <FILEIN>) {
if ($in_x11) {
if ($line =~
/^\s*\#else\s*$/) {
@@ -230,8 +230,8 @@
}
close($x11);
close($mac);
- handle_file($dir, $noext . '-x11.info');
- handle_file($dir, $noext . '-mac.info');
+ handle_file($dir, $noext .
'-x11.ignore');
+ handle_file($dir, $noext .
'-mac.ignore');
} else {
warn "unable to write to
$noext-mac.info: $!\n";
close($x11);
@@ -267,7 +267,7 @@
return;
}
- if ($file =~ /\.info(\.in)?$/) {
+ if ($file =~ /\.(info|ignore)$/) {
my $properties = info_hash_from_var(
$file,
$contents,
@@ -290,7 +290,9 @@
mkdir_p($todir) unless (-d $todir);
my $info = serialize_to_info($treeproperties) . "\n";
- if (open (FILEOUT, '>' . $todir . '/' . $filename)) {
+ my $outfilename = $filename;
+ $outfilename =~ s/\.ignore$/.info/;
+ if (open (FILEOUT, '>' . $todir . '/' . $outfilename)) {
print FILEOUT $info;
close (FILEOUT);
}
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
