Merge branch 'master' into update_xephem

fink · Mar 8, 2018 · 570e9a5 · 570e9a5
2 parents 1b1fd44 + 026a995
commit 570e9a5
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 38 deletions.
diff --git a/10.4/stable/main/finkinfo/devel/autorevision.info b/10.4/stable/main/finkinfo/devel/autorevision.info
@@ -1,19 +1,22 @@
 Package: autorevision
-Version: 1.6
 Revision: 1
-Maintainer: dak180 <dak180@users.sf.net>
+Version: 1.21
+Source-MD5: 4906670221b1e502f07de03351377e87
 #
 Source: https://github.com/Autorevision/%n/releases/download/v/%v/%n-%v.tgz
-Source-MD5: 1006533003eee60440f73d8dc85229b5
 BuildDepends: asciidoc-a2x
-CompileScript: make cmd; make man
+Recommends: <<
+	bash,
+	git | mercurial | svn | bzr-py27
+<<
+CompileScript: make all
 InstallScript: make install DESTDIR=%d prefix=%p
-DocFiles: COPYING.md README.md CONTRIBUTING.md NEWS
+DocFiles: COPYING.md README.md CONTRIBUTING.md NEWS AUTHORS.txt
 #
 Description: Extracts metadata from VCS repositories
 DescDetail: <<
-Extracts metadata about the current revision from your repository. This
-program is meant to be used by project build systems to extract
+Extracts metadata about the current revision from your repository.
+This program is meant to be used by project build systems to extract
 properties that can be used in software version strings. Repository
 types supported include git, hg, bzr, and svn. It can create files
 containing variable and macro definitions suitable for C, C++, Java,
@@ -24,6 +27,10 @@ other useful pieces of meta-information. There is support for reading
 and writing a cache file so autorevision will remain useful during a
 build from an unpacked distribution tarball.
 <<
-DescPackaging: dak180 is also the main dev of autorevision
+DescPackaging: <<
+dak180 is also the main dev of autorevision
+gist for this file: https://git.io/autorevision
+<<
 License: OSI-Approved
-Homepage: https://github.com/Autorevision/autorevision
+Homepage: https://autorevision.github.io/
+Maintainer: dak180 <dak180@users.sf.net>
diff --git a/10.7/stable/main/finkinfo/devel/autorevision.info b/10.7/stable/main/finkinfo/devel/autorevision.info
@@ -1,13 +1,17 @@
 Package: autorevision
 Revision: 1
-Version: 1.12
-Source-MD5: 739b46af508668094dad3fe9e71c06cd
+Version: 1.21
+Source-MD5: 4906670221b1e502f07de03351377e87
 #
 Source: https://github.com/Autorevision/%n/releases/download/v/%v/%n-%v.tgz
 BuildDepends: asciidoc-a2x
+Recommends: <<
+	bash,
+	git | mercurial | svn | bzr-py27
+<<
 CompileScript: make all
 InstallScript: make install DESTDIR=%d prefix=%p
-DocFiles: COPYING.md README.md CONTRIBUTING.md NEWS
+DocFiles: COPYING.md README.md CONTRIBUTING.md NEWS AUTHORS.txt
 #
 Description: Extracts metadata from VCS repositories
 DescDetail: <<
@@ -23,7 +27,10 @@ other useful pieces of meta-information. There is support for reading
 and writing a cache file so autorevision will remain useful during a
 build from an unpacked distribution tarball.
 <<
-DescPackaging: dak180 is also the main dev of autorevision
+DescPackaging: <<
+dak180 is also the main dev of autorevision
+gist for this file: https://git.io/autorevision
+<<
 License: OSI-Approved
 Homepage: https://autorevision.github.io/
-Maintainer: dak180 <dak180@users.sf.net>
+Maintainer: dak180 <dak180@users.sf.net>
diff --git a/10.9-libcxx/stable/main/finkinfo/devel/autorevision.info b/10.9-libcxx/stable/main/finkinfo/devel/autorevision.info
@@ -1,7 +1,7 @@
 Package: autorevision
 Revision: 1
-Version: 1.20
-Source-MD5: 27f390d702f481fe943146d29239f005
+Version: 1.21
+Source-MD5: 4906670221b1e502f07de03351377e87
 #
 Source: https://github.com/Autorevision/%n/releases/download/v/%v/%n-%v.tgz
 BuildDepends: asciidoc-a2x

diff --git a/10.9-libcxx/stable/main/finkinfo/devel/importchecker-py.info b/10.9-libcxx/stable/main/finkinfo/devel/importchecker-py.info
@@ -2,7 +2,7 @@ Info2: <<
 Package: importchecker-py%type_pkg[python]
 Version: 1.0
 Revision: 1
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 
 Type: python (2.7)
 

diff --git a/10.9-libcxx/stable/main/finkinfo/editors/bluefish.info b/10.9-libcxx/stable/main/finkinfo/editors/bluefish.info
@@ -111,5 +111,5 @@ DescPort: <<
 <<
 License: GPL
 Homepage: http://bluefish.openoffice.nl
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 <<
diff --git a/10.9-libcxx/stable/main/finkinfo/graphics/aquaterm.info b/10.9-libcxx/stable/main/finkinfo/graphics/aquaterm.info
@@ -66,5 +66,5 @@ DescPackaging: <<
   Package previously maintained by Jeffrey Whitaker. 
   Package ownership assumed by Kevin Horton as of aquaterm-1.0.1-5.
 <<
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Homepage: http://aquaterm.github.com
diff --git a/10.9-libcxx/stable/main/finkinfo/libs/perlmods/dbi-pm.info b/10.9-libcxx/stable/main/finkinfo/libs/perlmods/dbi-pm.info
@@ -6,7 +6,7 @@ Epoch: 1
 Description: Perl Database Interface by Tim Bunce
 Type: perl (5.16.2 5.18.2)
 License: Artistic
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 
 Depends: <<
 	clone-pm%type_pkg[perl] (>= 0.34),

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/perlmods/device-serialport-pm.info b/10.9-libcxx/stable/main/finkinfo/libs/perlmods/device-serialport-pm.info
@@ -5,7 +5,7 @@ Revision: 1
 Type: perl (5.16.2 5.18.2)
 Description: Perl5 interface to serial ports
 License: Artistic
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 
 # Dependencies.
 Depends: perl%type_pkg[perl]-core

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/perlmods/image-exiftool-pm.info b/10.9-libcxx/stable/main/finkinfo/libs/perlmods/image-exiftool-pm.info
@@ -1,15 +1,15 @@
 Info2: <<
 Package: image-exiftool-pm
-Version: 9.94
+Version: 10.80
 Revision: 1
 Description: Read and write image/movie meta information
 Type: perl
 License: Artistic/GPL
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 
 Source: http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-%v.tar.gz
-Source-MD5: 44b66ccf64c4023efbee559d8b1834f3
-
+#Source-MD5: 71eb5b335dc3129de5d378294b713c42
+Source-MD5: 4b830155ab20e1f6280d5dec82d521f1
 UpdatePOD: true
 DocFiles: Changes META.yml README
 

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/perlmods/test-numeric-pm.info b/10.9-libcxx/stable/main/finkinfo/libs/perlmods/test-numeric-pm.info
@@ -5,7 +5,7 @@ Revision: 3
 Type: perl (5.16.2 5.18.2)
 Description: Testing utilities for numbers
 License: Artistic
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 
 # Dependencies.
 # Optional dependency Test-inline removed, as it doesn't seem to work

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/pythonmods/beautifulsoup-py.info b/10.9-libcxx/stable/main/finkinfo/libs/pythonmods/beautifulsoup-py.info
@@ -3,7 +3,7 @@ Info2: <<
 Package: beautifulsoup-py%type_pkg[python]
 Version: 4.6.0
 Revision: 1
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Type: python (2.7 3.4 3.5 3.6)
 Depends: python%type_pkg[python]
 Source: http://www.crummy.com/software/BeautifulSoup/bs4/download/4.6/beautifulsoup4-%v.tar.gz

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/pythonmods/geopy-py.info b/10.9-libcxx/stable/main/finkinfo/libs/pythonmods/geopy-py.info
@@ -3,7 +3,7 @@ Info2: <<
 Package: geopy-py%type_pkg[python]
 Version: 1.10.0
 Revision: 1
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Type: python (2.7)
 BuildDepends: setuptools-tng-py%type_pkg[python]
 Depends: python%type_pkg[python]

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/pythonmods/simplejson-py.info b/10.9-libcxx/stable/main/finkinfo/libs/pythonmods/simplejson-py.info
@@ -3,7 +3,7 @@ Info2: <<
 Package: simplejson-py%type_pkg[python]
 Version: 3.8.0
 Revision: 1
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Type: python ( 2.7 3.4 3.5 )
 
 BuildDepends: setuptools-tng-py%type_pkg[python]

diff --git a/10.9-libcxx/stable/main/finkinfo/libs/qt5-qtwebengine.info b/10.9-libcxx/stable/main/finkinfo/libs/qt5-qtwebengine.info
@@ -1,5 +1,6 @@
 Info4: <<
 Package: qt5-%type_pkg[qt]-qtwebengine
+# OPENSSL110 not bothering to try, keep in sync with qt5-qtbase
 Version: 5.7.1
 Revision: 2
 Description: Cross-Platform framework (%type_pkg[qt])

diff --git a/10.9-libcxx/stable/main/finkinfo/sci/convertall.info b/10.9-libcxx/stable/main/finkinfo/sci/convertall.info
@@ -1,26 +1,27 @@
 Info2: <<
 Package: convertall
-Version: 0.6.0
+Version: 0.7.3
 Revision: 1
 Type: python (3.4)
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Depends: <<
   python%type_pkg[python], 
   python%type_pkg[python]-shlibs, 
-  pyqt4-mac-py%type_pkg[python] (>= 4.11.3-1) 
+  pyqt5-mac-py%type_pkg[python] (>= 5.6-2),
+  qt5-mac-qcocoa-plugin (>=5.7.1-5)
 <<
 Source: http://sourceforge.net/projects/convertall/files/%v/convertall-%v.tar.gz
-Source-MD5: b68244fa83ccbdeaf223b9ad22399606
+Source-MD5: 1d2e012d18f12950add237dc7611331a
 SourceDirectory: ConvertAll
 CompileScript: <<
 echo "Nothing to do in compile phase"
 <<
 InstallScript: <<
   #! /bin/sh -ev
-  export PYTHONPATH="%p/lib/qt4-mac/lib/python%type_raw[python]/site-packages:$PYTHONPATH"
+  export PYTHONPATH="%p/lib/qt5-mac/lib/python%type_raw[python]/site-packages:$PYTHONPATH"
   %p/bin/python%type_raw[python] install.py -p %p -b %d
   rm -fr %i/share/doc/convertall
-  perl -pi -e 's|exec|exec env PYTHONPATH="%p/lib/qt4-mac/lib/python%type_raw[python]/site-packages:$PYTHONPATH"|g' %i/bin/convertall
+  perl -pi -e 's|exec|exec env PYTHONPATH="%p/lib/qt5-mac/lib/python%type_raw[python]/site-packages:$PYTHONPATH"|g' %i/bin/convertall
 <<
 License: GPL
 DocFiles: doc/*

diff --git a/10.9-libcxx/stable/main/finkinfo/sci/xephem.info b/10.9-libcxx/stable/main/finkinfo/sci/xephem.info
@@ -72,5 +72,5 @@ echo "Go to http://www.clearskyinstitute.com for more information"
 <<
 
 License: Restrictive/Distributable
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Homepage: http://www.clearskyinstitute.com/xephem/
diff --git a/10.9-libcxx/stable/main/finkinfo/sci/xfoil.info b/10.9-libcxx/stable/main/finkinfo/sci/xfoil.info
@@ -3,7 +3,7 @@ Version: 699
 Revision: 2
 License: GPL
 Architecture: x86_64
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>
 Depends: <<
   gcc5-shlibs,
   x11-shlibs,

diff --git a/10.9-libcxx/stable/main/finkinfo/text/aspell.info b/10.9-libcxx/stable/main/finkinfo/text/aspell.info
@@ -76,4 +76,4 @@ DescPackaging: <<
   nieder: patch aspell.h to build with clang from Xcode > 5, avoiding
   redefinitions.
 <<
-Maintainer: Kevin Horton <khorton01@rogers.com>
+Maintainer: Kevin Horton <khorton02@gmail.com>