[cvs] dists/10.4/unstable/main/finkinfo/sci qgis16-mac.info,1.5,1.6

2011-06-15 Thread Andreas Gockel
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory 
vz-cvs-3.sog:/tmp/cvs-serv19742/dists/10.4/unstable/main/finkinfo/sci

Modified Files:
qgis16-mac.info 
Log Message:
Fixing error not catched by the validator


Index: qgis16-mac.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qgis16-mac.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qgis16-mac.info 25 May 2011 11:11:00 -  1.5
+++ qgis16-mac.info 15 Jun 2011 08:03:15 -  1.6
@@ -45,7 +45,7 @@
   libgeos3.2.2,
   gdal-dev | gdal-pgsql-dev | gdal-mysql-dev| gdal-pgsql-mysql-dev, 
   postgresql84-dev, 
-  (%type_pkg[grass] = -grass) grass64-mac-dev | (%type_pkg[grass] = -grass) 
grass64-x11-dev, 
+  (%type_raw[grass] = -grass) grass64-mac-dev | (%type_raw[grass] = -grass) 
grass64-x11-dev, 
   proj (>=4),
   qwt-qt4-mac
 <<


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] web/pdb package.php,1.79,1.80

2011-06-15 Thread Andreas Gockel
Update of /cvsroot/fink/web/pdb
In directory vz-cvs-3.sog:/tmp/cvs-serv20214/web/pdb

Modified Files:
package.php 
Log Message:
look nicer =)


Index: package.php
===
RCS file: /cvsroot/fink/web/pdb/package.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- package.php 27 Nov 2010 21:58:08 -  1.79
+++ package.php 15 Jun 2011 08:05:38 -  1.80
@@ -94,7 +94,7 @@
 
 if ($result == "DBerror") {
 ?>
-Warning: DBError, try again later!
+Warning: DBerror, try again later!
 http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci qtoctave.info,1.18,1.19

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv27704

Modified Files:
qtoctave.info 
Log Message:
only Replaces (not Conflicts) the old version of the now-bundle...otherwise 
deadlock when upgrading that one


Index: qtoctave.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtoctave.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- qtoctave.info   1 Jun 2010 22:03:06 -   1.18
+++ qtoctave.info   15 Jun 2011 08:44:28 -  1.19
@@ -1,7 +1,7 @@
 Info2: <<
 Package: qtoctave%type_pkg[-ui]
 Version: 0.9.1
-Revision: 1004
+Revision: 1005
 Type: -ui (-x11 -mac)
 Source: http://forja.rediris.es/frs/download.php/1760/%{ni}-%v.tar.bz2
 ##PatchFile: %{ni}.patch
@@ -10,7 +10,7 @@
 Depends: qt4%type_pkg[-ui]-core-shlibs (>= 4.6-1), 
qt4%type_pkg[-ui]-gui-shlibs (>= 4.6-1), fontconfig2-shlibs
 BuildDepends: (type_pkg[-ui] = -x11) x11-dev, qt4%type_pkg[-ui] (>= 4.6-1), 
cmake (>= 2.6.1-2), fink (>= 0.24.12-1), fontconfig2-dev
 Suggests: octave | octave-atlas
-Conflicts: qtoctave (<< 0.7.4-1006), qtoctave-x11, qtoctave-mac
+Conflicts: qtoctave-x11, qtoctave-mac
 Replaces: qtoctave (<< 0.7.4-1006), qtoctave-x11, qtoctave-mac
 Maintainer: Jack Fink 
 Homepage: http://qtoctave.wordpress.com


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci qtoctave.info, 1.19, 1.20 qtoctave.patch, 1.1, 1.2

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv27872

Modified Files:
qtoctave.info qtoctave.patch 
Log Message:
dep upgrade (buildable with newer qt)...no idea if it *works* (should be nuked 
entirely if no version is both buildable and at least marginally functional).


Index: qtoctave.patch
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtoctave.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- qtoctave.patch  3 Sep 2008 17:36:09 -   1.1
+++ qtoctave.patch  15 Jun 2011 08:45:53 -  1.2
@@ -1,29 +1,20 @@
-diff -r b0aef91c89a5 src/CMakeLists.txt
 a/src/CMakeLists.txt   Sat May 31 18:52:24 2008 +0200
-+++ b/src/CMakeLists.txt   Sat May 31 18:56:13 2008 +0200
-@@ -58,7 +58,7 @@
-   moc_command_list.cxx
-   config.h
-   dynamic_help/dynamic_help.h
--  moc_dynamic_help.cxx
-+  dynamic_help/moc_dynamic_help.cxx
-   editor.h
-   moc_editor.cxx
-   generate_menu.h
-@@ -76,13 +76,13 @@
-   octave_connection.h
-   moc_octave_connection.cxx
-   operations/general_menu.h
--  moc_general_menu.cxx
-+  operations/moc_general_menu.cxx
-   operations/table_plot.h
--  moc_table_plot.cxx
-+  operations/moc_table_plot.cxx
-   operations.h
-   moc_operations.cxx
-   projects/projects.h
--  moc_projects.cxx
-+  projects/moc_projects.cxx
-   search_dialog.h
-   moc_search_dialog.cxx
-   session.h
+diff -Nurd -x'*~' qtoctave-0.9.1.orig/CMakeLists.txt 
qtoctave-0.9.1/CMakeLists.txt
+--- qtoctave-0.9.1.orig/CMakeLists.txt 2010-01-25 08:19:48.0 -0500
 qtoctave-0.9.1/CMakeLists.txt  2011-06-15 04:28:28.0 -0400
+@@ -28,13 +28,13 @@
+ 
+ include(UseQt4)
+ 
+-if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
++if( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 7   )
+   MESSAGE (FATAL_ERROR 
+-  "Qt version 4.6 required.\n"
++  "Qt version 4.7 required.\n"
+   "Qt version installed is: 
${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}\n"
+   "Please install required version.\n"
+   )
+-endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 6   )
++endif( NOT ${QT_VERSION_MAJOR} EQUAL 4 OR NOT ${QT_VERSION_MINOR} EQUAL 7   )
+ 
+ add_subdirectory (qtoctave_pkg/src)
+ add_subdirectory (xmlwidget/qt4)

Index: qtoctave.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtoctave.info,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- qtoctave.info   15 Jun 2011 08:44:28 -  1.19
+++ qtoctave.info   15 Jun 2011 08:45:53 -  1.20
@@ -1,14 +1,30 @@
 Info2: <<
 Package: qtoctave%type_pkg[-ui]
 Version: 0.9.1
-Revision: 1005
+Revision: 1006
 Type: -ui (-x11 -mac)
 Source: http://forja.rediris.es/frs/download.php/1760/%{ni}-%v.tar.bz2
-##PatchFile: %{ni}.patch
-##PatchFile-MD5: 8623a4ab63e4373f1328b4add483e235
-PatchScript: perl -pi -e "s,qtinfo,qtoctave-info,g" src/scripts_octave/qtinfo.m
-Depends: qt4%type_pkg[-ui]-core-shlibs (>= 4.6-1), 
qt4%type_pkg[-ui]-gui-shlibs (>= 4.6-1), fontconfig2-shlibs
-BuildDepends: (type_pkg[-ui] = -x11) x11-dev, qt4%type_pkg[-ui] (>= 4.6-1), 
cmake (>= 2.6.1-2), fink (>= 0.24.12-1), fontconfig2-dev
+PatchFile: %{ni}.patch
+PatchFile-MD5: 652aacdce6c09dcbadcaffc2f330b42c
+PatchScript: <<
+   %{default_script}
+   perl -pi -e "s,qtinfo,qtoctave-info,g" src/scripts_octave/qtinfo.m
+<<
+Depends: <<
+   qt4-base%type_pkg[-ui]-qtcore-shlibs (>= 4.7.3-1),
+   qt4-base%type_pkg[-ui]-qtgui-shlibs (>= 4.7.3-1),
+   qt4-base%type_pkg[-ui]-qtnetwork-shlibs (>= 4.7.3-1),
+   qt4-base%type_pkg[-ui]-qtscript-shlibs (>= 4.7.3-1),
+   qt4-base%type_pkg[-ui]-qtsql-shlibs (>= 4.7.3-1),
+   qt4-base%type_pkg[-ui]-qtsvg-shlibs (>= 4.7.3-1),
+   qt4-base%type_pkg[-ui]-qtxml-shlibs (>= 4.7.3-1)
+<<
+BuildDepends: <<
+   cmake (>= 2.6.1-2),
+   fink (>= 0.24.12-1),
+   qt4-base%type_pkg[-ui] (>= 4.7.3-1),
+   (type_pkg[-ui] = -x11) x11-dev
+<<
 Suggests: octave | octave-atlas
 Conflicts: qtoctave-x11, qtoctave-mac
 Replaces: qtoctave (<< 0.7.4-1006), qtoctave-x11, qtoctave-mac


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/shells mksh-cur.info, 1.6, 1.7 mksh-cur.patch, 1.5, 1.6 mksh.info, 1.24, 1.25

2011-06-15 Thread Andreas Gockel
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells
In directory vz-cvs-3.sog:/tmp/cvs-serv31753

Modified Files:
mksh-cur.info mksh-cur.patch mksh.info 
Log Message:
Upstream released R40


Index: mksh-cur.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/mksh-cur.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mksh-cur.patch  8 May 2011 11:03:41 -   1.5
+++ mksh-cur.patch  15 Jun 2011 09:07:00 -  1.6
@@ -1,20833 +1,110 @@
 Index: src/bin/mksh/Build.sh
-diff -u src/bin/mksh/Build.sh:1.443 src/bin/mksh/Build.sh:1.477
 src/bin/mksh/Build.sh:1.443Tue Feb 23 22:02:35 2010
-+++ src/bin/mksh/Build.sh  Sat Apr  9 21:00:58 2011
-@@ -1,7 +1,7 @@
+diff -u src/bin/mksh/Build.sh:1.482 src/bin/mksh/Build.sh:1.483
+--- src/bin/mksh/Build.sh:1.482Sun Jun 12 14:37:00 2011
 src/bin/mksh/Build.sh  Sun Jun 12 15:54:42 2011
+@@ -1,5 +1,5 @@
  #!/bin/sh
--srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.443 2010/02/23 22:02:35 tg Exp 
$'
[...20877 lines suppressed...]
-+  /*
-+   * either we have very chap entropy get and push available,
-+   * with malloc() pulling in this code already anyway, or the
-+   * user requested us to use the old functions
-+   */
-+  lcg_state = h;
-+  oaat1_fini_impl(lcg_state);
-+#if defined(arc4random_pushb_fast)
-+  arc4random_pushb_fast(&lcg_state, sizeof(lcg_state));
-+  lcg_state = arc4random();
-+#else
-+  lcg_state = arc4random_pushb(&lcg_state, sizeof(lcg_state));
-+#endif
-+  oaat1_addmem_impl(h, &lcg_state, sizeof(lcg_state));
-+#endif
-+
-+  oaat1_fini_impl(h);
-+  lcg_state = h;
- }
+ FN("bgnice", FBGNICE, 0, OF_ANY)

Index: mksh.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/mksh.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mksh.info   28 Mar 2010 09:14:46 -  1.24
+++ mksh.info   15 Jun 2011 09:07:00 -  1.25
@@ -1,21 +1,21 @@
 Info2: <<
 Package: mksh%type_pkg[-llvm]
-Version: 39
-Revision: 3
+Version: 40
+Revision: 1
 Description: Enhanced version of the Korn shell
 Type: -llvm (boolean)
 License: OSI-Approved
 Maintainer: Andreas Gockel 
 Distribution: (%type_raw[-llvm] = -llvm) 10.5, (%type_raw[-llvm] = -llvm) 10.6
-Replaces: mirbsdksh (<< 29.5-1), mksh, mksh-llvm
-Conflicts: mirbsdksh (<< 29.5-1), mksh, mksh-llvm
+Replaces: mirbsdksh (<< 29.5-1), mksh, mksh-cur, mksh-llvm
+Conflicts: mirbsdksh (<< 29.5-1), mksh, mksh-cur, mksh-llvm
 CustomMirror: <<
  Primary: http://www.mirbsd.org/MirOS/dist/mir/mksh/
  asi-JP: http://pub.allbsd.org/MirOS/dist/mir/mksh/
 <<
-Source: mirror:custom:mksh-R%vc.cpio.gz
+Source: mirror:custom:mksh-R%v.cpio.gz
 SourceRename: mksh-%v-%r.cpio.gz
-Source-md5: 0c3cd172b47eefcdf9a302baa42f5092
+Source-md5: 395a6c5f39c7e2afd8f6504d90ca90bd
 NoSourceDirectory: true
 PatchScript: /bin/pax -s ',^/*mksh//*,%f/,' -zf mksh-%v-%r.cpio.gz -r
 CompileScript: <<
@@ -24,7 +24,7 @@
  if [ "%type_raw[-llvm]" == "." ]; then
   env /bin/sh ./Build.sh -r -Q -j
  elif [ "%type_raw[-llvm]" == "-llvm" ]; then
-  env CC="$(xcode-select -print-path)/usr/bin/llvm-gcc" /bin/sh ./Build.sh -r 
-Q -combine
+  env CC="$(xcode-select -print-path)/usr/bin/llvm-gcc" /bin/sh ./Build.sh -r 
-Q -c combine
  fi
 <<
 InstallScript: <<

Index: mksh-cur.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/shells/mksh-cur.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mksh-cur.info   8 May 2011 11:03:41 -   1.6
+++ mksh-cur.info   15 Jun 2011 09:07:00 -  1.7
@@ -1,6 +1,6 @@
 Package: mksh-cur
-Version: 39
-Revision: 3+cvs201105081259
+Version: 40
+Revision: 1+cvs201106150900
 Description: Enhanced version of the Korn shell
 License: OSI-Approved
 Maintainer: Andreas Gockel 
@@ -11,15 +11,15 @@
  Primary: http://www.mirbsd.org/MirOS/dist/mir/mksh/
  asi-JP: http://pub.allbsd.org/MirOS/dist/mir/mksh/
 <<
-Source: mirror:custom:mksh-R%vc.cpio.gz
-SourceRename: mksh-%v-3.cpio.gz
-Source-MD5: 0c3cd172b47eefcdf9a302baa42f5092
+Source: mirror:custom:mksh-R%v.cpio.gz
+SourceRename: mksh-%v-1.cpio.gz
+Source-MD5: 395a6c5f39c7e2afd8f6504d90ca90bd
 PatchFile: mksh-cur.patch
-PatchFile-MD5: 097c819e49132f1dcc674899ce62d7de
+PatchFile-MD5: ac0329b18556c0cb6c276ee36daefb77
 NoSourceDirectory: true
 PatchScript: <<
  #!/bin/sh -ev
-  /bin/pax -s ',^/*mksh//*,%f/,' -zf mksh-%v-3.cpio.gz -r
+  /bin/pax -s ',^/*mksh//*,%f/,' -zf mksh-%v-1.cpio.gz -r
   cd %f
   /usr/bin/patch -p3 <%{PatchFile}
 <<
@@ -69,10 +69,11 @@
 <<
 DescPackaging: <<
  Create the patchfile:
- cvs -Rqd _anon...@anoncvs.mirbsd.org:/cvs rdiff -u -p -rmksh-R39c -rHEAD mksh 
>mksh-cur.patch
+ cvs -qd _anon...@anoncvs.m

[cvs] dists/10.4/stable/main/finkinfo/devel ftidy.info,NONE,1.1

2011-06-15 Thread K.-M. Schindler
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv3909/stable/main/finkinfo/devel

Added Files:
ftidy.info 
Log Message:
new package: ftidy, fortran code formatter

--- NEW FILE: ftidy.info ---
Package: ftidy
Version: 7.2
Revision: 1
Description: Fortran code formatter
Architecture: powerpc, i386, x86_64
BuildDepends: g77 | g95 | gcc42 | gcc43 | gcc44 | gcc45
License: OSI-Approved

# Unpack Phase:
Source: http://www.unb.ca/fredericton/science/chem/ajit/tidy/tidy72sc.zip
Source-MD5: f940dfa793408368f92af6aab535619b

NoSourceDirectory: true

# Compile Phase (NOTE: there is no configure):
CompileScript: <<
#!/bin/sh -ev
 gfortran -o ftidy tidy.for
<<

# Install Phase:
DocFiles: *.txt
ConfFiles: %p/bin/tidy.ini

InstallScript: <<
#!/bin/sh -ev
# programs
  mkdir -p %i/bin
  install-m 755 ftidy%i/bin/
  install -c -m 666 tidy.ini %i/bin/
<<

DescDetail: <<
  TIDY v7.2 is a highly configurable FORTRAN program to indent and renumber
  statements, selectively change case of keywords or non-keywords, and do
  various other clean-up tasks on FORTRAN-77 source programs.  TIDY can
  convert some FORTRAN-66 features such as Hollerith constants to
  FORTRAN-77.  TIDY can either retain DO/END DO loops or convert them to
  standard FORTRAN-77 loops.  It can change comment specifiers from C, c,
  or * to ! as in F90 style.  Supports F90 CYCLE, EXIT, DO WHILE loops,
  IMPLICIT NONE, INCLUDE statements, long variable names, relational
  operators in symbolic form such as == and /=, and the use of underscores
  in variable names.
<<

DescUsage: <<
see the files in %p/share/doc/ftidy/
<<

DescPort: Renamed to ftidy because of name conflict with HTML tidy
Homepage: http://www.unb.ca/fredericton/science/chem/ajit/tidy/
Maintainer: Karl-Michael Schindler 


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/devel ftidy.info,NONE,1.1

2011-06-15 Thread K.-M. Schindler
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv3909/unstable/main/finkinfo/devel

Added Files:
ftidy.info 
Log Message:
new package: ftidy, fortran code formatter

--- NEW FILE: ftidy.info ---
Package: ftidy
Version: 7.2
Revision: 1
Description: Fortran code formatter
Architecture: powerpc, i386, x86_64
BuildDepends: g77 | g95 | gcc42 | gcc43 | gcc44 | gcc45
License: OSI-Approved

# Unpack Phase:
Source: http://www.unb.ca/fredericton/science/chem/ajit/tidy/tidy72sc.zip
Source-MD5: f940dfa793408368f92af6aab535619b

NoSourceDirectory: true

# Compile Phase (NOTE: there is no configure):
CompileScript: <<
#!/bin/sh -ev
 gfortran -o ftidy tidy.for
<<

# Install Phase:
DocFiles: *.txt
ConfFiles: %p/bin/tidy.ini

InstallScript: <<
#!/bin/sh -ev
# programs
  mkdir -p %i/bin
  install-m 755 ftidy%i/bin/
  install -c -m 666 tidy.ini %i/bin/
<<

DescDetail: <<
  TIDY v7.2 is a highly configurable FORTRAN program to indent and renumber
  statements, selectively change case of keywords or non-keywords, and do
  various other clean-up tasks on FORTRAN-77 source programs.  TIDY can
  convert some FORTRAN-66 features such as Hollerith constants to
  FORTRAN-77.  TIDY can either retain DO/END DO loops or convert them to
  standard FORTRAN-77 loops.  It can change comment specifiers from C, c,
  or * to ! as in F90 style.  Supports F90 CYCLE, EXIT, DO WHILE loops,
  IMPLICIT NONE, INCLUDE statements, long variable names, relational
  operators in symbolic form such as == and /=, and the use of underscores
  in variable names.
<<

DescUsage: <<
see the files in %p/share/doc/ftidy/
<<

DescPort: Renamed to ftidy because of name conflict with HTML tidy
Homepage: http://www.unb.ca/fredericton/science/chem/ajit/tidy/
Maintainer: Karl-Michael Schindler 


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/gecko2/scripts sync-distfiles-finkinfo.sh, 1.11, 1.12

2011-06-15 Thread Andreas Gockel
Update of /cvsroot/fink/experimental/gecko2/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv21646/experimental/gecko2/scripts

Modified Files:
sync-distfiles-finkinfo.sh 
Log Message:
Get local changes into cvs


Index: sync-distfiles-finkinfo.sh
===
RCS file: /cvsroot/fink/experimental/gecko2/scripts/sync-distfiles-finkinfo.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- sync-distfiles-finkinfo.sh  22 Nov 2009 00:17:21 -  1.11
+++ sync-distfiles-finkinfo.sh  15 Jun 2011 11:22:58 -  1.12
@@ -3,7 +3,7 @@
 # Change this to match your local mirror structur
 ###
 GENERATEDIR="/home/f/fink/finkinfo"
-HTTPSNAPDIR="/home/f/fink/infodist"
+HTTPSNAPDIR="/home/f/fink/httpsnap"
 LOGDIR="/home/f/fink/log"
 SCRIPTDIR="/home/f/fink/scripts"
 TMPDIR="/home/f/fink/mirwork"
@@ -68,6 +68,7 @@
fi
printf ' Getting TIMESTAMP\n'
cp -p ${GENERATEDIR}/dists.public/TIMESTAMP ${HTTPSNAPDIR}/TIMESTAMP
+   ln -f ${GENERATEDIR}/dists.public/TIMESTAMP 
${GENERATEDIR}/dists.public/LOCAL
printf ' Cleaning up\n'
rm -f ${LOGDIR}/change.log
printf 'done\n'


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/gecko2/scripts update.sh, NONE, 1.1 generate-distfiles-and-finkinfo-mirror.pl, 1.3, 1.4 sync-bindist.sh, 1.1, 1.2 sync-cvs.sh, 1.2, 1.3

2011-06-15 Thread Andreas Gockel
Update of /cvsroot/fink/experimental/gecko2/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv23925

Modified Files:
generate-distfiles-and-finkinfo-mirror.pl sync-bindist.sh 
sync-cvs.sh 
Added Files:
update.sh 
Log Message:
Latest changes from ber.de.eu mirror


--- NEW FILE: update.sh ---
#!/bin/sh
# $Id: update.sh,v 1.1 2011/06/15 11:34:35 gecko2 Exp $

OLDDIR="$PWD"
CVSROOT="/srv/fink/cvs/fink"
TMPDIR="/home/f/fink/mirwork"
WEBDIR="/srv/fink/web"

if [ -d ${TMPDIR}/xml ]; then
cd ${TMPDIR}/xml
cvs -q up -PAd
else
cd ${TMPDIR}
cvs -Rqd ${CVSROOT} co -PA xml
fi

cd ${WEBDIR}
test -d ${WEBDIR}/xml && rm -r ${WEBDIR}/xml
cp -a ${TMPDIR}/xml ${WEBDIR}/xml
grep -ZRl http://www.finkproject.org/ xml | xargs -0 perl -pi -e 
's,http://www.finkproject.org/,http://fink.thetis.ig42.org/,g'
cd xml
#make -s --no-print-directory all
find . -name hostlogo.inc -exec cp ~fink/public_html/hostlogo.inc {} \;
#cp -a /usr/share/php/XML ${WEBDIR}/xml/web/XML
~fink/scripts/ranger/rss-newpackages.pl
cd $OLDDIR

Index: sync-cvs.sh
===
RCS file: /cvsroot/fink/experimental/gecko2/scripts/sync-cvs.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sync-cvs.sh 12 Feb 2010 09:49:55 -  1.2
+++ sync-cvs.sh 15 Jun 2011 11:34:35 -  1.3
@@ -1,10 +1,14 @@
 #!/bin/sh -e
+# $Id$
 
 EXTERNIP=85.214.23.162
+OLDDIR="$PWD"
+
 if [ "$1" == "master" ]; then
rsync -4 -azvO --exclude=fink/CVSROOT/passwd --delete --delete-after 
rsync://fink.cvs.sourceforge.net:/cvsroot-data/f/fi/fink ~fink/cvs && \
date -u +%s >~fink/log/TIMESTAMP.cvs
+   ~fink/scripts/update.sh
 elif [ "$1" == "slave" ]; then
rsync -4 --address=$EXTERNIP -azv --delete --delete-after 
rsync://unixforge.de/finkcvs ~fink/cvs && \
date -u +%s >~fink/log/TIMESTAMP.cvs
-fi
\ No newline at end of file
+fi

Index: generate-distfiles-and-finkinfo-mirror.pl
===
RCS file: 
/cvsroot/fink/experimental/gecko2/scripts/generate-distfiles-and-finkinfo-mirror.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- generate-distfiles-and-finkinfo-mirror.pl   22 Nov 2009 00:10:42 -  
1.3
+++ generate-distfiles-and-finkinfo-mirror.pl   15 Jun 2011 11:34:35 -  
1.4
@@ -42,7 +42,7 @@
my $msg = "Another process is already running.\n";
if (-f $LOGFILE && -r _) {
$msg .= "Existing logfile:\n";
-   $msg .= `grep -ve 'has not changed' -e 'fetching files for' -e 
'exists$' $LOGFILE`;
+   $msg .= `grep -ve 'has not changed' -e 'fetching files for' -e 
'exists\$' $LOGFILE`;
}
die $msg;
 }

Index: sync-bindist.sh
===
RCS file: /cvsroot/fink/experimental/gecko2/scripts/sync-bindist.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sync-bindist.sh 24 Aug 2009 10:03:47 -  1.1
+++ sync-bindist.sh 15 Jun 2011 11:34:35 -  1.2
@@ -1,9 +1,15 @@
 #!/bin/sh
-rsync -av --delete --delete-after 
rsync://distfiles.master.finkmirrors.net/finkbindist ~fink/finkbindist
+# $Id$
+
+#RSYNCHOST="rsync://distfiles.master.finkmirrors.net"
+RSYNCHOST="rsync://distfiles.ams.nl.eu.finkmirrors.net"
+
+rsync -av --delete --delete-after $RSYNCHOST/finkbindist ~fink/finkbindist
 printf "\n\n"
-cp -av ~fink/public_html/hostlogo.inc ~fink/finkbindist/hostlogo.inc
+
 cp -av ~fink/public_html/hostlogo.inc ~fink/bindist/hostlogo.inc
-ln -sf ~fink/distfiles ~fink/bindist/source
-rm -v ~fink/bindist/fink.css ~fink/bindist/dists/fink.css
-cp -av ~fink/public_html/fink.css ~fink/bindist/fink.css
-cp -av ~fink/public_html/fink.css ~fink/bindist/dists/fink.css
+cp -av ~fink/public_html/hostlogo.inc ~fink/bindist/bindist/hostlogo.inc
+ln -sf ~fink/distfiles ~fink/bindist/bindist/source
+rm -v ~fink/bindist/bindist/fink.css ~fink/bindist/bindist/dists/fink.css
+cp -av ~fink/public_html/fink.css ~fink/bindist/bindist/fink.css
+cp -av ~fink/public_html/fink.css ~fink/bindist/bindist/dists/fink.css


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci gpsd-py.info, NONE, 1.1 gpsd.info, 1.6, 1.7

2011-06-15 Thread Kurt Schwehr
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv21646

Modified Files:
gpsd.info 
Added Files:
gpsd-py.info 
Log Message:
Updated to 2.96.  Split off the python modules into a gpsd-py and allow for 
variants.
  Hopefully the update-alternatives with slaves works correctly.
  Added DescDetail and DescPackaging to both.
  Not adding py25.  Only adding py27 because py26 existed.
Talked to Jack on IRC before committing.


--- NEW FILE: gpsd-py.info ---
Info2: <<
Package: gpsd-py%type_pkg[python]
Version: 2.96bis
Revision: 1
Type: python (2.6 2.7)

# FIX: may not require gpsd-shlibs!
Depends: python%type_pkg[python]-shlibs, gpsd-shlibs
BuildDepends: libxslt-bin, pkgconfig, python%type_pkg[python]

GCC: 4.0
Source: http://download.berlios.de/gpsd/gpsd-%v.tar.gz
SourceDirectory: gpsd-2.96
Source-MD5: 52b00cab0fb34bbf1923ae35c7ced6c4
SetCFLAGS: -Os

# FIX: For speed of the build, it might be good to turn off all of the gps 
types if they are only needed for the daemon.
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
--enable-dbus PYTHON=%p/bin/python%type_raw[python]
InstallScript: <<
  #!/bin/bash -ev
  make install DESTDIR=%d

  # Version the python files
  for file in gpscat gpsfake gpsprof xgps xgpsspeed ; do
mv %i/bin/${file} %i/bin/${file}-py%type_pkg[python]
  done

  # === remove non-python files ===

  # gpsd-shlibs files
  rm -r %i/lib/*.dylib

  # gpsd-dev files
  rm -r %i/include %i/lib/pkgconfig %i/lib/*.{a,la}

  # gpsd files - the command line programs
  rm -r %i/sbin %i/share/man
  # C/C++ programs
  rm %i/bin/{cgps,gpsctl,gpsdecode,gpsmon,gpspipe,gpxlogger,lcdgps}
<<

PostInstScript: <<
  # Add --verbose to update-alternatives for debugging
  update-alternatives --install %p/bin/gpscat gpscat 
%p/bin/gpscat-py%type_pkg[python] %type_pkg[python] --slave %p/bin/gpsfake 
gpsfake %p/bin/gpsfake-py%type_pkg[python] --slave %p/bin/gpsprof gpsprof 
%p/bin/gpsprof-py%type_pkg[python] --slave %p/bin/xgps xgps 
%p/bin/xgps-py%type_pkg[python] --slave %p/bin/xgpsspeed xgpsspeed 
%p/bin/xgpsspeed-py%type_pkg[python] 
<<

PreRmScript: <<

  if [ $1 != "upgrade" ]; then
update-alternatives --verbose --remove gpscat 
%p/bin/gpscat-py%type_pkg[python]
  fi

<<

License: BSD
Homepage: http://gpsd.berlios.de
Maintainer: Jack Fink 
Description: Monitors one or more GPS/AIS receivers
DescDetail: <<
gpsd is a service daemon that monitors one or more GPSes or AIS
receivers attached to a host computer through serial or USB ports,
making all data on the location/course/velocity of the sensors
available to be queried on TCP port 2947 of the host computer. With
gpsd, multiple location-aware client applications (such as
navigational and wardriving software) can share access to receivers
without contention or loss of data. Also, gpsd responds to queries
with a format that is substantially easier to parse than the NMEA 0183
emitted by most GPSes. The gpsd distribution includes a linkable C
service library, a C++ wrapper class, and a Python module that
developers of gpsd-aware applications can use to encapsulate all
communication with gpsd.

Besides gpsd itself, the project provides auxiliary tools for
diagnostic monitoring and profiling of receivers and feeding
location-aware applications GPS/AIS logs for diagnostic purposes.

The goal of the gpsd project is to create a solid layer of open-source
infrastructure for programs running under Linux and other open-source
Unixes that want to be location-sensitive. We aim for simple, robust
interfaces, unfussy operation, and an easy learning curve for
application developers.
<<

DescPackaging: <<

2011-Jun Kurt Schwehr / goatbar: reworked gpsd to have the python code
build separately to allow for python variants.  gpsd currently does
not use setup.py to handle python, so we have to do extra work with configure.

<<

# Info2
<<

Index: gpsd.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gpsd.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gpsd.info   14 Jun 2011 16:05:02 -  1.6
+++ gpsd.info   15 Jun 2011 14:07:54 -  1.7
@@ -1,39 +1,46 @@
 Package: gpsd
-Version: 2.94
-Revision: 4
-Depends: dbus1.3-shlibs, dbus-glib1.2-shlibs, glib2-shlibs (>= 2.22.0-1), 
gpsd-shlibs (>= 2.90-1), libgettext8-shlibs (>= 0.17-12), libiconv (>= 1.12-3), 
libncurses5-shlibs (>= 5.4-20041023-1011), %N-shlibs (= %v-%r)
-BuildDepends: dbus1.3-dev, dbus-glib1.2-dev, glib2-dev (>= 2.22.0-1), 
libgettext8-dev (>= 0.17-12), libiconv-dev (>= 1.12-3), libncurses5 (>= 
5.4-20041023-1011), python26 (>= 1:2.6.2-2), libxslt-bin, pkgconfig
+Version: 2.96bis
+# The "bis" is specific to 2.96 and will go away in future versions.
+Revision: 1
+
+Depends: dbus1.3-shlibs, dbus-glib1.2-shlibs, glib2-shlibs (>= 2.22.0-1), 
gpsd-shlibs (>= 2.90-1), libgettext8-shlibs (>= 0.17-12), libiconv (>= 1

[cvs] dists/10.4/unstable/main/finkinfo/sci minfx-py.info,1.4,1.5

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv22112

Modified Files:
minfx-py.info 
Log Message:
new version (now with a maintainer!), from 
http://sourceforge.net/tracker/?func=detail&aid=3315120&group_id=17203&atid=414256


Index: minfx-py.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/minfx-py.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- minfx-py.info   10 Sep 2009 17:44:42 -  1.4
+++ minfx-py.info   15 Jun 2011 15:54:12 -  1.5
@@ -1,14 +1,14 @@
 Info2: <<
 Package: minfx-py%type_pkg[python]
-Version: 1.0.2
+Version: 1.0.3
 Revision: 1
 Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
-Type: python (2.4 2.5 2.6)
-Maintainer: None 
+Type: python (2.4 2.5 2.6 2.7)
+Maintainer: Jack Howarth 
 Depends: python%type_pkg[python]
 BuildDepends: python%type_pkg[python]
 Source: http://download.gna.org/minfx/minfx-%v.zip
-Source-MD5: 212ff8800ce5f400954f165adbc64454
+Source-MD5: 641666bbfdf04f5ec85494424a129383
 CompileScript: <<
 <<
 InstallScript: <<


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/sci relax-py-1.3.4.info, 1.1, 1.2

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23596/stable/main/finkinfo/sci

Modified Files:
relax-py-1.3.4.info 
Log Message:
fix weird Distribution: tag


Index: relax-py-1.3.4.info
===
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/relax-py-1.3.4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- relax-py-1.3.4.info 12 Sep 2010 08:51:00 -  1.1
+++ relax-py-1.3.4.info 15 Jun 2011 15:59:26 -  1.2
@@ -2,7 +2,7 @@
 Package: relax-py%type_pkg[python]
 Version: 1.3.4
 Revision: 2
-Distribution: 2.4
+Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
 Type: python (2.4)
 Source: http://download.gna.org/relax/relax-%v.src.tar.bz2
 Source-MD5: 421d92a998bfd359678d689e2f65fc62


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci relax-py-1.3.4.info, 1.1, 1.2

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23596/unstable/main/finkinfo/sci

Modified Files:
relax-py-1.3.4.info 
Log Message:
fix weird Distribution: tag


Index: relax-py-1.3.4.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/relax-py-1.3.4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- relax-py-1.3.4.info 12 Sep 2010 08:51:00 -  1.1
+++ relax-py-1.3.4.info 15 Jun 2011 15:59:26 -  1.2
@@ -2,7 +2,7 @@
 Package: relax-py%type_pkg[python]
 Version: 1.3.4
 Revision: 2
-Distribution: 2.4
+Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
 Type: python (2.4)
 Source: http://download.gna.org/relax/relax-%v.src.tar.bz2
 Source-MD5: 421d92a998bfd359678d689e2f65fc62


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci relax-py-1.3.4.info, 1.2, 1.3

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23802/unstable/main/finkinfo/sci

Modified Files:
relax-py-1.3.4.info 
Log Message:
there's no variant-difference, so add 2.5 and 2.6 to this legacy .info (new %v 
will require keeping this old one for certain platforms)


Index: relax-py-1.3.4.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/relax-py-1.3.4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- relax-py-1.3.4.info 15 Jun 2011 15:59:26 -  1.2
+++ relax-py-1.3.4.info 15 Jun 2011 16:01:36 -  1.3
@@ -3,7 +3,7 @@
 Version: 1.3.4
 Revision: 2
 Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
-Type: python (2.4)
+Type: python (2.4 2.5 2.6)
 Source: http://download.gna.org/relax/relax-%v.src.tar.bz2
 Source-MD5: 421d92a998bfd359678d689e2f65fc62
 SourceDirectory: relax-%v


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/sci relax-py-1.3.4.info, 1.2, 1.3

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23802/stable/main/finkinfo/sci

Modified Files:
relax-py-1.3.4.info 
Log Message:
there's no variant-difference, so add 2.5 and 2.6 to this legacy .info (new %v 
will require keeping this old one for certain platforms)


Index: relax-py-1.3.4.info
===
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/relax-py-1.3.4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- relax-py-1.3.4.info 15 Jun 2011 15:59:26 -  1.2
+++ relax-py-1.3.4.info 15 Jun 2011 16:01:36 -  1.3
@@ -3,7 +3,7 @@
 Version: 1.3.4
 Revision: 2
 Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
-Type: python (2.4)
+Type: python (2.4 2.5 2.6)
 Source: http://download.gna.org/relax/relax-%v.src.tar.bz2
 Source-MD5: 421d92a998bfd359678d689e2f65fc62
 SourceDirectory: relax-%v


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/sci relax-py.info, 1.3, NONE relax-py.patch, 1.1, NONE

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv24092/stable/main/finkinfo/sci

Removed Files:
relax-py.info relax-py.patch 
Log Message:
new not stable yet and all old in other .info


--- relax-py.info DELETED ---

--- relax-py.patch DELETED ---


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/devel pylint-py.info, 1.12, 1.13

2011-06-15 Thread Kurt Schwehr
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv25633

Modified Files:
pylint-py.info 
Log Message:
Fix Conflicts Replaces, which has been broken for years in this package.  Need 
to switch to update-alternatives!


Index: pylint-py.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/pylint-py.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pylint-py.info  18 Jan 2011 07:40:19 -  1.12
+++ pylint-py.info  15 Jun 2011 16:06:37 -  1.13
@@ -3,7 +3,7 @@
 Package: pylint-py%type_pkg[python]
 Type: python (2.5 2.6 2.7)
 Version: 0.23.0
-Revision: 1
+Revision: 2
 #Source: http://ftp.logilab.org/pub/pylint/pylint-%v.tar.gz
 Source: http://pypi.python.org/packages/source/p/pylint/pylint-%v.tar.gz
 Source-MD5: f010eee3289b1af77cd8e8e45fb72829
@@ -29,8 +29,8 @@
   Description: Analyzes Python code - main binary
   Package: %N-bin
   Depends: %N (= %v-%r)
-  Conflicts: %N-py25-bin, %N-py24-bin
-  Replaces: %N-py25, %N-py24-bin
+  Conflicts: pylint-py27-bin, pylint-py26-bin, pylint-py25-bin
+  Replaces:  pylint-py27-bin, pylint-py26-bin, pylint-py25-bin
   InstallScript: <<
 mkdir %i/bin
 ln -s pylint-gui%type_pkg[python] %i/bin/pylint-gui


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/x11 wxgtk2.8.info,1.8,1.9

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv26443/stable/main/finkinfo/x11

Modified Files:
wxgtk2.8.info 
Log Message:
stray char


Index: wxgtk2.8.info
===
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wxgtk2.8.info   6 Nov 2010 17:21:17 -   1.8
+++ wxgtk2.8.info   15 Jun 2011 16:13:56 -  1.9
@@ -45,7 +45,7 @@
libtiff,
libxml2 (>= 2.6.32-1),
pango1-xft2-ft219-dev (>= 1.24.5-4),
-   pixman (>= 0.16x.0-1),
+   pixman (>= 0.16.0-1),
pkgconfig (>= 0.23-1),
sdl,
x11-dev


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/x11 wxgtk2.8.info,1.22,1.23

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv26443/unstable/main/finkinfo/x11

Modified Files:
wxgtk2.8.info 
Log Message:
stray char


Index: wxgtk2.8.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- wxgtk2.8.info   8 Jun 2011 11:10:44 -   1.22
+++ wxgtk2.8.info   15 Jun 2011 16:13:56 -  1.23
@@ -45,7 +45,7 @@
libtiff,
libxml2 (>= 2.6.32-1),
pango1-xft2-ft219-dev (>= 1.24.5-4),
-   pixman (>= 0.16x.0-1),
+   pixman (>= 0.16.0-1),
pkgconfig (>= 0.23-1),
sdl,
x11-dev


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/gnome gtkspell2-shlibs.info, 1.2, 1.3

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory vz-cvs-3.sog:/tmp/cvs-serv28262/stable/main/finkinfo/gnome

Modified Files:
gtkspell2-shlibs.info 
Log Message:
latest from unstable


Index: gtkspell2-shlibs.info
===
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/gtkspell2-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtkspell2-shlibs.info   2 Nov 2010 15:46:16 -   1.2
+++ gtkspell2-shlibs.info   15 Jun 2011 16:21:51 -  1.3
@@ -1,6 +1,6 @@
 Package: gtkspell2-shlibs
 Version: 2.0.16
-Revision: 2
+Revision: 3
 BuildDepends: <<
aspell-dev (>= 0.60.5-1002),
atk1 (>= 1.28.0-1),
@@ -49,6 +49,7 @@
 <<
 InstallScript: <<
make install DESTDIR=%d
+   perl -ni -e 'print unless /Libs.private:/' 
%i/lib/pkgconfig/gtkspell-2.0.pc
 <<
 DocFiles: AUTHORS COPYING ChangeLog po/ChangeLog:ChangeLog.po NEWS README
 Shlibs: %p/lib/libgtkspell.0.dylib 1.0.0 %n (>= 2.0.11-1)
@@ -84,6 +85,11 @@
 
Recent glib doesn't publish -lintl, so pass it directly.
 <<
+DescPackaging: <<
+   Clean up .pc Libs.private: don't need entries that are not in
+   public interface to avoid publishing useless and hidden
+   InheritedBuildDepends.
+<<
 License: GPL
 Maintainer: The Gnome Core Team 
 Homepage: http://gtkspell.sourceforge.net/


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/devel forttopas.info,1.1,1.2

2011-06-15 Thread K.-M. Schindler
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv32644/unstable/main/finkinfo/devel

Modified Files:
forttopas.info 
Log Message:
forttopas: fix compilation on powerpc

Index: forttopas.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/forttopas.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forttopas.info  12 May 2011 07:46:21 -  1.1
+++ forttopas.info  15 Jun 2011 16:56:31 -  1.2
@@ -1,9 +1,9 @@
 Package: forttopas
 Version: 1.01
-Revision: 1
+Revision: 3
 Description: Semi-automatic Fortran to Pascal converter
 Architecture: powerpc, i386
-BuildDepends: fpc, xdev-toolkit, libicns1-bin, imagemagick
+BuildDepends: fpc | fpc-trunk, xdev-toolkit, libicns1-bin, imagemagick
 License: GPL
 
 # Unpack Phase:
@@ -154,7 +154,7 @@
 dfmtolfm fForToPas.dfm -s
 #dfmtolfm fAbout.dfm -s
 
-fpc -dLCL -Mdelphi -Fu%p/share/lazarus/lcl/units/i386-darwin 
-Fu%p/share/lazarus/lcl/units/i386-darwin/carbon FortToPas.dpr
+fpc -dLCL -Mdelphi -Fu%p/share/lazarus/lcl/units/%m-darwin 
-Fu%p/share/lazarus/lcl/units/%m-darwin/carbon FortToPas.dpr
 
 convert F2P.ico -resize 512x512 F2Pa.png
 convert F2P.ico -resize 256x256 F2Pb.png


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/stable/main/finkinfo/devel forttopas.info,1.1,1.2

2011-06-15 Thread K.-M. Schindler
Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory vz-cvs-3.sog:/tmp/cvs-serv32644/stable/main/finkinfo/devel

Modified Files:
forttopas.info 
Log Message:
forttopas: fix compilation on powerpc

Index: forttopas.info
===
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/forttopas.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- forttopas.info  14 Jun 2011 11:47:47 -  1.1
+++ forttopas.info  15 Jun 2011 16:56:31 -  1.2
@@ -1,9 +1,9 @@
 Package: forttopas
 Version: 1.01
-Revision: 1
+Revision: 3
 Description: Semi-automatic Fortran to Pascal converter
 Architecture: powerpc, i386
-BuildDepends: fpc, xdev-toolkit, libicns1-bin, imagemagick
+BuildDepends: fpc | fpc-trunk, xdev-toolkit, libicns1-bin, imagemagick
 License: GPL
 
 # Unpack Phase:
@@ -154,7 +154,7 @@
 dfmtolfm fForToPas.dfm -s
 #dfmtolfm fAbout.dfm -s
 
-fpc -dLCL -Mdelphi -Fu%p/share/lazarus/lcl/units/i386-darwin 
-Fu%p/share/lazarus/lcl/units/i386-darwin/carbon FortToPas.dpr
+fpc -dLCL -Mdelphi -Fu%p/share/lazarus/lcl/units/%m-darwin 
-Fu%p/share/lazarus/lcl/units/%m-darwin/carbon FortToPas.dpr
 
 convert F2P.ico -resize 512x512 F2Pa.png
 convert F2P.ico -resize 256x256 F2Pb.png


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/languages wxgtk2.8-py.info, 1.9, 1.10

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory vz-cvs-3.sog:/tmp/cvs-serv5941

Modified Files:
wxgtk2.8-py.info 
Log Message:
GNOME dep cleanup, variant cleanup; libxml2-py25 seems broken, not our fault 
here


Index: wxgtk2.8-py.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/wxgtk2.8-py.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- wxgtk2.8-py.info10 Jul 2010 14:32:47 -  1.9
+++ wxgtk2.8-py.info15 Jun 2011 17:36:38 -  1.10
@@ -2,34 +2,36 @@
 
 Package: wxgtk2.8-py%type_pkg[python]
 Version: 2.8.9.1
-Revision: 4
+Revision: 5
 Distribution: (%type_pkg[python] = 24) 10.4 
-Type: python (2.4 2.5 2.6)
+Type: python (2.4 2.5 2.6 2.7)
 Maintainer: None 
 BuildDepends: <<
-   atk1,
-   cairo,
-   expat1,
+   atk1 (>= 1.28.0-1),
+   cairo (>= 1.8.8-3),
+   fink-package-precedence,
+   fontconfig2-dev (>= 2.8.0-4),
+   freetype219 (>= 2.3.12-1),
gettext-bin,
gettext-tools,
-   glib2-dev,
+   glib2-dev (>= 2.22.0-1),
glitz,
-   gtk+2-dev,
-   libgettext3-dev,
-   libgl,
+   gtk+2-dev (>= 2.18.0-1),
+   libgettext8-dev,
libiconv-dev,
-   libjpeg,
-   libpng3,
-   libtiff,
-   pango1-xft2-ft219-dev,
-   pkgconfig,
+   libpng14,
+   pango1-xft2-ft219-dev (>= 1.24.5-4),
+   pkgconfig (>= 0.23),
wxgtk2.8 (>=2.8.10-24),
x11-dev
 <<
 Depends: <<
-python%type_pkg[python],
-wxgtk2.8-shlibs (>= 2.8.10-24),
-opengl-py%type_pkg[python] (>= 3.0.1-1)
+   glib2-shlibs (>= 2.22.0-1),
+   gtk+2-shlibs (>= 2.18.0-1),
+   python%type_pkg[python],
+   wxgtk2.8-shlibs (>= 2.8.10-24),
+   opengl-py%type_pkg[python] (>= 3.0.1-1),
+   x11
 <<
 Conflicts: wxpython-py23, wxpython-py24
 Replaces: wxpython-py23, wxpython-py24
@@ -37,12 +39,16 @@
 Source-MD5: 4ad9a64e05529097618c7e48fbb10a84 
 SourceDirectory: wxPython-src-%v/wxPython
 GCC: 4.0
+SetCPPFLAGS: -MD
 CompileScript: <<
+#!/bin/sh -ev
+   export 
PKG_CONFIG_PATH="%p/lib/glib-2.0/pkgconfig-strict:%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH"
%p/bin/python%type_raw[python] setup.py WXPORT=gtk2 
WX_CONFIG=%p/lib/wx/config/gtk2-unicode-release-2.8 build_ext
+   fink-package-precedence --dep='\.d$' .
 <<
 InstallScript: <<
%p/bin/python%type_raw[python] setup.py WXPORT=gtk2 
WX_CONFIG=%p/lib/wx/config/gtk2-unicode-release-2.8 install --root=%d
-cd %i/bin; for filename in *; do mv -v $filename 
$filename-py%type_pkg[python]; done;
+   cd %i/bin; for filename in *; do mv -v $filename 
$filename-py%type_pkg[python]; done;
mkdir -p %i/share/doc/%n
cp -R demo %i/share/doc/%n
cp -R samples %i/share/doc/%n
@@ -103,10 +109,10 @@
 
 SplitOff: <<
Package: wxgtk2.8-py%type_pkg[python]-dev
-   Conflicts: wxpython-py23-dev, wxpython-py24-dev
-   Replaces: wxpython-py23-dev, wxpython-py24-dev
+   Conflicts: wxpython-py23-dev, wxpython-py24-dev, wxpython-py25-dev, 
wxpython-py26-dev, wxpython-py27-dev
+   Replaces: wxpython-py23-dev, wxpython-py24-dev, wxpython-py25-dev, 
wxpython-py26-dev, wxpython-py27-dev
Depends: wxgtk2.8-py%type_pkg[python] (= %v-%r)
-   Files: include/wx-2.8/wx/wxPython
+   Files: include
DocFiles: ../docs/preamble.txt ../docs/gpl.txt ../docs/licence.txt 
../docs/lgpl.txt docs/*.txt
 <<
 


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci gpsd-py.info, 1.1, 1.2 gpsd.info, 1.7, 1.8

2011-06-15 Thread Kurt Schwehr
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv11584

Modified Files:
gpsd-py.info gpsd.info 
Log Message:
clean up update-alternatives so that the name is gpsd-py, not gpscat

Index: gpsd-py.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gpsd-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gpsd-py.info15 Jun 2011 14:07:54 -  1.1
+++ gpsd-py.info15 Jun 2011 18:04:45 -  1.2
@@ -1,7 +1,7 @@
 Info2: <<
 Package: gpsd-py%type_pkg[python]
 Version: 2.96bis
-Revision: 1
+Revision: 2
 Type: python (2.6 2.7)
 
 # FIX: may not require gpsd-shlibs!
@@ -38,24 +38,23 @@
   # C/C++ programs
   rm %i/bin/{cgps,gpsctl,gpsdecode,gpsmon,gpspipe,gpxlogger,lcdgps}
 <<
+DocFiles: COPYING
 
 PostInstScript: <<
   # Add --verbose to update-alternatives for debugging
-  update-alternatives --install %p/bin/gpscat gpscat 
%p/bin/gpscat-py%type_pkg[python] %type_pkg[python] --slave %p/bin/gpsfake 
gpsfake %p/bin/gpsfake-py%type_pkg[python] --slave %p/bin/gpsprof gpsprof 
%p/bin/gpsprof-py%type_pkg[python] --slave %p/bin/xgps xgps 
%p/bin/xgps-py%type_pkg[python] --slave %p/bin/xgpsspeed xgpsspeed 
%p/bin/xgpsspeed-py%type_pkg[python] 
+  update-alternatives --verbose --install %p/bin/gpscat gpsd-py 
%p/bin/gpscat-py%type_pkg[python] %type_pkg[python] --slave %p/bin/gpsfake 
gpsfake %p/bin/gpsfake-py%type_pkg[python] --slave %p/bin/gpsprof gpsprof 
%p/bin/gpsprof-py%type_pkg[python] --slave %p/bin/xgps xgps 
%p/bin/xgps-py%type_pkg[python] --slave %p/bin/xgpsspeed xgpsspeed 
%p/bin/xgpsspeed-py%type_pkg[python] 
 <<
 
 PreRmScript: <<
-
   if [ $1 != "upgrade" ]; then
-update-alternatives --verbose --remove gpscat 
%p/bin/gpscat-py%type_pkg[python]
+update-alternatives --verbose --remove gpsd-py 
%p/bin/gpscat-py%type_pkg[python]
   fi
-
 <<
 
 License: BSD
 Homepage: http://gpsd.berlios.de
 Maintainer: Jack Fink 
-Description: Monitors one or more GPS/AIS receivers
+Description: Gpsd client and programs GPS/AIS receivers in python
 DescDetail: <<
 gpsd is a service daemon that monitors one or more GPSes or AIS
 receivers attached to a host computer through serial or USB ports,

Index: gpsd.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gpsd.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gpsd.info   15 Jun 2011 14:07:54 -  1.7
+++ gpsd.info   15 Jun 2011 18:04:45 -  1.8
@@ -23,6 +23,7 @@
 DocFiles: AUTHORS COPYING NEWS README TODO
 
 Splitoff: <<
+  Description: Shared libraries for gpsd
   Package: %N-shlibs
   Replaces: %N (<< 2.96bis-1)
   Files: <<
@@ -37,6 +38,7 @@
 <<
 
 Splitoff2: <<
+  Description: Headers and libraries for gpsd
   Package: %N-dev
   Depends: %N-shlibs (= %v-%r)
   BuildDependsOnly: true
@@ -61,7 +63,7 @@
 License: BSD
 Homepage: http://gpsd.berlios.de
 Maintainer: Jack Fink 
-Description: Monitors one or more GPS/AIS receivers
+Description: Daemon that monitors one or more GPS/AIS receivers
 
 DescDetail: <<
 You will likely want to install one of the version of gpsd-py to


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/sci gpsd-py.info, 1.2, 1.3 gpsd.info, 1.8, 1.9

2011-06-15 Thread Kurt Schwehr
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv12030

Modified Files:
gpsd-py.info gpsd.info 
Log Message:
switch maintainer - as suggested by Jack

Index: gpsd-py.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gpsd-py.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gpsd-py.info15 Jun 2011 18:04:45 -  1.2
+++ gpsd-py.info15 Jun 2011 18:09:07 -  1.3
@@ -53,7 +53,7 @@
 
 License: BSD
 Homepage: http://gpsd.berlios.de
-Maintainer: Jack Fink 
+Maintainer: Kurt Schwehr 
 Description: Gpsd client and programs GPS/AIS receivers in python
 DescDetail: <<
 gpsd is a service daemon that monitors one or more GPSes or AIS

Index: gpsd.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gpsd.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gpsd.info   15 Jun 2011 18:04:45 -  1.8
+++ gpsd.info   15 Jun 2011 18:09:07 -  1.9
@@ -62,7 +62,7 @@
 
 License: BSD
 Homepage: http://gpsd.berlios.de
-Maintainer: Jack Fink 
+Maintainer: Maintainer: Kurt Schwehr 
 Description: Daemon that monitors one or more GPS/AIS receivers
 
 DescDetail: <<


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] experimental/dmacks/finkinfo kdelibs4.info, NONE, 1.1 kdelibs4.patch, NONE, 1.1

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv5229

Added Files:
kdelibs4.info kdelibs4.patch 
Log Message:
import from unstable


--- NEW FILE: kdelibs4.patch ---
diff -Nurd kdelibs-4.4.1/cmake/modules/FindFAM.cmake 
kdelibs-4.4.1-new/cmake/modules/FindFAM.cmake
--- kdelibs-4.4.1/cmake/modules/FindFAM.cmake   2008-05-21 07:06:10.0 
-0400
+++ kdelibs-4.4.1-new/cmake/modules/FindFAM.cmake   2010-03-06 
12:39:25.0 -0500
@@ -16,12 +16,12 @@
   set(FAM_FIND_QUIETLY TRUE)
 endif (FAM_INCLUDE_DIR)
 
-FIND_PATH(FAM_INCLUDE_DIR fam.h)
-
-FIND_LIBRARY(FAM_LIBRARIES NAMES fam )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FAM DEFAULT_MSG FAM_INCLUDE_DIR 
FAM_LIBRARIES )
+#FIND_PATH(FAM_INCLUDE_DIR fam.h)
+#
+#FIND_LIBRARY(FAM_LIBRARIES NAMES fam )
+#
+#include(FindPackageHandleStandardArgs)
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(FAM DEFAULT_MSG FAM_INCLUDE_DIR 
FAM_LIBRARIES )
[...1046 lines suppressed...]
+++ kdelibs-4.4.1-new/solid/solid/managerbase.cpp   2010-03-06 
12:39:26.0 -0500
@@ -23,7 +23,8 @@
 
 #include "backends/fakehw/fakemanager.h"
 
-#if defined (Q_OS_MAC)
+#if (defined (Q_OS_MAC) || defined(Q_OS_DARWIN))
+#include "backends/hal/halmanager.h"
 #include "backends/iokit/iokitmanager.h"
 #elif defined (Q_OS_UNIX)
 #include "backends/hal/halmanager.h"
@@ -48,7 +49,7 @@
 if (!solidFakeXml.isEmpty()) {
 m_backend = new Solid::Backends::Fake::FakeManager(0, solidFakeXml);
 } else {
-#if defined (Q_OS_MAC)
+#if (defined (Q_OS_MAC) || defined(Q_OS_DARWIN))
 m_backend = new Solid::Backends::IOKit::IOKitManager(0);
 #elif defined (Q_OS_UNIX)
 m_backend = new Solid::Backends::Hal::HalManager(0);

--- NEW FILE: kdelibs4.info ---
Info4: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.4.1
Revision: 1
Description: KDE4 - essential libraries
Type: kde (x11 mac)
License: GPL/LGPL
Maintainer: Benjamin Reed 

Depends: <<
%N-shlibs (= %v-%r),
aspell,
dbus (>= 1.2.12-1),
default-icon-theme (>= 0.5-2),
hspell,
shared-desktop-ontologies,
shared-mime-info (>= 0.51-1)
<<
BuildDepends: <<
aspell-dev,
automoc-%type_pkg[kde] (>= 0.9.89-0),
avahi-dev,
bzip2-dev,
cmake (>= 2.6.4-1),
cups-dev,
dbus-dev (>= 1.2.12-1),
enchant1-dev,
expat1,
fink (>= 0.29.7-1),
freetype219 (>= 2.3.7-7),
gettext-tools,
giflib,
hspell,
kde4-buildenv (>= 4.4.0-1),
libattica-%type_pkg[kde]-dev,
libgettext8-dev,
libidn,
libjasper.1,
libjpeg8,
liblzma,
libpng3,
libtiff,
libxml2,
libxslt,
openexr-dev,
pcre (>= 7.6-1),
pkgconfig (>= 0.23-1),
qt4-%type_pkg[kde] (>= 4.6.1-1),
shared-desktop-ontologies,
shared-mime-info (>= 0.51-1),
soprano-%type_pkg[kde]-dev (>= 2.4.0-1),
strigi-dev (>= 0.6.3-1),
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev,
xmkmf
<<
BuildConflicts: gamin-dev
GCC: 4.0

Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
Source-MD5: 5057908fb9dcf7997a87fe27a382bfc9
SourceDirectory: kdelibs-%v
PatchScript: sed -e 's,@KDEPREFIX@,%p,g' -e 's,@KDETYPE@,%type_pkg[kde],g' 
%{PatchFile} | patch -p1
PatchFile: kdelibs4.patch
PatchFile-MD5: ab46fedfd409d5a87f2d98d1a5fef3ba

CompileScript: <<
#!/bin/sh -ev

export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]" 
SKIP_VISIBILITY_OVERRIDE=1
. %p/sbin/kde4-buildenv.sh

mkdir -p build
pushd build
cmake $KDE4_CMAKE_ARGS ..
make VERBOSE=1
popd
<<

InstallScript: <<
#!/bin/sh -ev

pushd build
make -j1 install/fast DESTDIR="%d"
popd

install -c -m 755 kde4-postinst.sh kde4-check-sycoca.sh 
%i/opt/kde4/%type_pkg[kde]/bin/

install -d -m 755 %i/etc/profile.d
echo "%p/opt/kde4/%type_pkg[kde]/bin/kde4-check-sycoca.sh" > 
%i/etc/profile.d/%N.sh
echo "%p/opt/kde4/%type_pkg[kde]/bin/kde4-check-sycoca.sh" > 
%i/etc/profile.d/%N.csh
chmod 755 %i/etc/profile.d/*

install -d -m 755 %i/opt/kde4/%type_pkg[kde]/etc
cat <%i/opt/kde4/%type_pkg[kde]/etc/kde4rc
[Directories]
prefixes=%p/opt/kde4/%type_pkg[kde],%p/opt/akonadi/%type_pkg[kde],%p/opt/soprano/%type_pkg[kde],%p/opt/strigi/%type_pkg[kde],%p/lib/qt4-%type_pkg[kde]
END
<<
DocFiles: COPYING COPYING.LIB INSTALL
SplitOff: <<
Package: %N-shlibs
Description: KDE4 - essential shared libraries
Depends: <<
aspell-shlibs,
bzip2-shlibs,
dbus-shlibs (>= 1.2.12-1),
enchant1-shlibs,
giflib-shlibs,
libattica-%type_pkg[kde]-shlibs,
libavahi-client3-shlibs,
libgettext8

[cvs] experimental/dmacks/finkinfo kdelibs4.info, 1.1, 1.2 kdelibs4.patch, 1.1, 1.2

2011-06-15 Thread Daniel Macks
Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv5296

Modified Files:
kdelibs4.info kdelibs4.patch 
Log Message:
fix building against new qt, I think--fails with ld codegen error under xcode4


Index: kdelibs4.patch
===
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/kdelibs4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdelibs4.patch  15 Jun 2011 20:52:03 -  1.1
+++ kdelibs4.patch  15 Jun 2011 20:53:06 -  1.2
@@ -107,6 +107,18 @@
  /* not sure why, but this is causing lockups */
close( d->fd[0] );
close( d->fd[1] );
+diff -Nurd kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp 
kdelibs-4.4.1-new/kde3support/kdeui/k3passworddialog.cpp
+--- kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp   2008-05-21 
07:06:15.0 -0400
 kdelibs-4.4.1-new/kde3support/kdeui/k3passworddialog.cpp   2011-06-15 
07:11:00.0 -0400
+@@ -83,7 +83,7 @@
+ {
+ public:
+   K3PasswordDialogPrivate()
+-   : m_MatchLabel( 0 ), iconName( 0 ), allowEmptyPasswords( false ),
++   : m_MatchLabel( 0 ), allowEmptyPasswords( false ),
+  minimumPasswordLength(0), 
maximumPasswordLength(K3PasswordEdit::PassLen - 1),
+  passwordStrengthWarningLevel(1), m_strengthBar(0),
+  reasonablePasswordLength(8)
 diff -Nurd kdelibs-4.4.1/kde4-check-sycoca.sh 
kdelibs-4.4.1-new/kde4-check-sycoca.sh
 --- kdelibs-4.4.1/kde4-check-sycoca.sh 1969-12-31 19:00:00.0 -0500
 +++ kdelibs-4.4.1-new/kde4-check-sycoca.sh 2010-03-06 12:39:25.0 
-0500

Index: kdelibs4.info
===
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/kdelibs4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdelibs4.info   15 Jun 2011 20:52:03 -  1.1
+++ kdelibs4.info   15 Jun 2011 20:53:06 -  1.2
@@ -1,7 +1,7 @@
 Info4: <<
 Package: kdelibs4-%type_pkg[kde]
 Version: 4.4.1
-Revision: 1
+Revision: 2
 Description: KDE4 - essential libraries
 Type: kde (x11 mac)
 License: GPL/LGPL
@@ -22,7 +22,6 @@
avahi-dev,
bzip2-dev,
cmake (>= 2.6.4-1),
-   cups-dev,
dbus-dev (>= 1.2.12-1),
enchant1-dev,
expat1,
@@ -45,7 +44,9 @@
openexr-dev,
pcre (>= 7.6-1),
pkgconfig (>= 0.23-1),
-   qt4-%type_pkg[kde] (>= 4.6.1-1),
+   phonon-%type_pkg[kde] (>= 4.5.0-1),
+   qt4-base-%type_pkg[kde] (>= 4.7.3-1),
+   qtwebkit-%type_pkg[kde] (>= 2.0.0-4),
shared-desktop-ontologies,
shared-mime-info (>= 0.51-1),
soprano-%type_pkg[kde]-dev (>= 2.4.0-1),
@@ -62,7 +63,7 @@
 SourceDirectory: kdelibs-%v
 PatchScript: sed -e 's,@KDEPREFIX@,%p,g' -e 's,@KDETYPE@,%type_pkg[kde],g' 
%{PatchFile} | patch -p1
 PatchFile: kdelibs4.patch
-PatchFile-MD5: ab46fedfd409d5a87f2d98d1a5fef3ba
+PatchFile-MD5: cf90f01c779ff22c07a27a49239bfefc
 
 CompileScript: <<
 #!/bin/sh -ev
@@ -120,8 +121,21 @@
libxslt-shlibs (>= 1.0.27-1),
macosx (>= 10.4.3-1),
pcre-shlibs (>= 7.6-1),
-   qt4-%type_pkg[kde]-designer-shlibs (>= 4.6.1-1),
-   qt4-%type_pkg[kde]-gui-shlibs (>= 4.6.1-1),
+   qt4-base-%type_pkg[kde]-qtdesigner-shlibs (>= 4.7.3-1),
+
+qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtdeclarative-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qthelp-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtmultimedia-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtopengl-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtscripttools-shlibs (>= 4.7.3-1),
+qt4-base-%type_pkg[kde]-qtsvg-shlibs (>= 4.7.3-1),
+phonon-%type_pkg[kde]-shlibs (>= 4.5.0-1),
+phonon-%type_pkg[kde]-backend (>= 4.5.0-1),
+qtwebkit-%type_pkg[kde]-shlibs (>= 2.0.0-4),
+
soprano-%type_pkg[kde]-shlibs (>= 2.4.0-1),
strigi-shlibs (>= 0.6.3-1),
xdg-base


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/crypto firefox3.info, 1.11, 1.12 firefox3.patch, 1.4, 1.5

2011-06-15 Thread Hanspeter Niederstrasser
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto
In directory vz-cvs-3.sog:/tmp/cvs-serv26222

Modified Files:
firefox3.info firefox3.patch 
Log Message:
remove use of 10.5 sdk so that we can build with Xcode4

Index: firefox3.info
===
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/firefox3.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- firefox3.info   29 Apr 2011 23:38:20 -  1.11
+++ firefox3.info   15 Jun 2011 23:09:30 -  1.12
@@ -1,6 +1,6 @@
 Package: firefox3
 Version: 3.6.17
-Revision: 2
+Revision: 4
 Architecture: i386, powerpc
 Distribution: 10.5, 10.6
 Description: Lightweight browser from mozilla.org
@@ -45,7 +45,6 @@
pixman (>= 0.16.0-1),
pkgconfig (>= 0.23),
sqlite3-dev (>= 3.7.4-1),
-   system-sdk-10.5,
x11-dev,
xft2-dev (>= 2.1.14-1)
 <<
@@ -53,7 +52,7 @@
 SourceDirectory: mozilla-1.9.2
 Source-MD5: 49509c51010bd91a198aee63780aeaf9
 PatchFile: %n.patch
-PatchFile-MD5: e92390b827b6413b96a0fca0e53b4ed8
+PatchFile-MD5: 6d53b248b175d9dfd13d5c55a0b64fe8
 PatchScript: <<
   ### apply the patch
   /usr/bin/sed -e 's|@FINKPREFIX@|%p|g' -e 's|@FINK_ARCH_TARGET@|%m|g' 
<%{PatchFile} | /usr/bin/patch -p1
@@ -230,6 +229,8 @@
 GTK+2 build of the Mozilla Firefox browser for Mac OS X/X11.  Compiled 
 without built-in support for GNOME (except for an app launcher button).
 
+## following option was removed so that it can build with XCode4.
+## kept here as a note for future reference
 ac_add_options --enable-macos-target=foo in patch file (.mozconfig) is 
 for the minimum OS version that this will compile in, so usually the 
 lowest Distribution used in the Fink tree this lives in.

Index: firefox3.patch
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/crypto/firefox3.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- firefox3.patch  2 Mar 2011 22:19:35 -   1.4
+++ firefox3.patch  15 Jun 2011 23:09:30 -  1.5
@@ -18,7 +18,7 @@
 +CC="gcc-4.2"
 +CXX="g++-4.2"
 +ac_add_options --target=@FINK_ARCH_TARGET@-apple-darwin`uname -r`
-+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
++#ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
 +HOST_CC="gcc-4.2"
 +HOST_CXX="g++-4.2"
 +RANLIB=/usr/bin/ranlib
@@ -52,7 +52,7 @@
 +ac_add_options --disable-debug
 +ac_add_options --disable-tests
 +ac_add_options --enable-strip
-+ac_add_options --enable-macos-target=10.5
++#ac_add_options --enable-macos-target=10.5
 +#ac_add_options --with-default-mozilla-five-home=@FINKPREFIX@/lib/firefox3
 +ac_add_options --with-system-jpeg=@FINKPREFIX@
 +ac_add_options --disable-system-cairo


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs


[cvs] dists/10.4/unstable/main/finkinfo/database sqlite3.info, 1.27, 1.28

2011-06-15 Thread Daniel Johnson
Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/database
In directory vz-cvs-3.sog:/tmp/cvs-serv7372

Modified Files:
sqlite3.info 
Log Message:
New upstream sqlite3 3.7.6.3.


Index: sqlite3.info
===
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/database/sqlite3.info,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sqlite3.info29 Apr 2011 23:11:51 -  1.27
+++ sqlite3.info16 Jun 2011 00:28:04 -  1.28
@@ -1,8 +1,8 @@
 Info2: <<
 Package: sqlite3
-Version: 3.7.6.2
+Version: 3.7.6.3
 # Upstream is using 3XXYYZZ as version in tarballs instead of 3.X.Y.Z.
-Type: vers (3070602)
+Type: vers (3070603)
 Revision: 1
 
 Description: Embedded SQL database, version 3
@@ -29,7 +29,7 @@
 DocFiles: README LICENSE
 
 Source: http://sqlite.org/sqlite-autoconf-%type_raw[vers].tar.gz
-Source-MD5: f16c08617968b4087b3d591fd575f59f
+Source-MD5: 7eb41eea5ffa5cbe359a48629084c425
 
 NoSetCPPFLAGS: true
 NoSetLDFLAGS: true


--
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs