[pkgsrc/trunk]: pkgsrc/databases/luma Fix broken patch files and install file...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/610563c773f3
branches:  trunk
changeset: 639742:610563c773f3
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Sep 24 12:49:38 2014 +0000

description:
Fix broken patch files and install files with non-world-writeable perms.

diffstat:

 databases/luma/Makefile                   |   7 +++-
 databases/luma/distinfo                   |   6 +-
 databases/luma/patches/patch-luma_luma.py |  42 +++++++++++++-------------
 databases/luma/patches/patch-setup.py     |  50 +++++++++++++++---------------
 4 files changed, 55 insertions(+), 50 deletions(-)

diffs (152 lines):

diff -r aa57a3e37d6f -r 610563c773f3 databases/luma/Makefile
--- a/databases/luma/Makefile   Wed Sep 24 12:33:44 2014 +0000
+++ b/databases/luma/Makefile   Wed Sep 24 12:49:38 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/08/20 19:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/09/24 12:49:38 jperkin Exp $
 
 DISTNAME=      luma-3.0.7
 CATEGORIES=    databases
@@ -21,6 +21,11 @@
 SUBST_SED.luma=                -e "s|@PATH@|${PREFIX}/${PYSITELIB}/luma|"
 SUBST_MESSAGE.luma=    Adding library path to luma.
 
+# world-writeable files
+pre-build:
+       ${CHMOD} 0644 ${WRKSRC}/data/icons/*/*.{png,svg}
+       ${CHMOD} 0644 ${WRKSRC}/data/*.desktop
+
 # some templates are not installed, do it manually
 # https://sourceforge.net/p/luma/bugs/48/
 post-install:
diff -r aa57a3e37d6f -r 610563c773f3 databases/luma/distinfo
--- a/databases/luma/distinfo   Wed Sep 24 12:33:44 2014 +0000
+++ b/databases/luma/distinfo   Wed Sep 24 12:49:38 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2014/08/20 19:39:02 wiz Exp $
+$NetBSD: distinfo,v 1.8 2014/09/24 12:49:38 jperkin Exp $
 
 SHA1 (luma-3.0.7.zip) = 6b82ddc1ac5948b02a2843c3a4dd76cf6c797494
 RMD160 (luma-3.0.7.zip) = 30577b1afae57734c4e1b7fdff0dfc4fd7543001
 Size (luma-3.0.7.zip) = 815984 bytes
-SHA1 (patch-luma_luma.py) = fc8e0a171303cc85a5ef7c51d802480ffac8ee6e
-SHA1 (patch-setup.py) = 3e6864a9f1d4a9a88ed47b431717ed37093b9024
+SHA1 (patch-luma_luma.py) = fc0639d17d1b6fcdd97f1c8193b363ee748a6672
+SHA1 (patch-setup.py) = 55809b4ccc654d6a8c75cc3c12f490718caf265f
diff -r aa57a3e37d6f -r 610563c773f3 databases/luma/patches/patch-luma_luma.py
--- a/databases/luma/patches/patch-luma_luma.py Wed Sep 24 12:33:44 2014 +0000
+++ b/databases/luma/patches/patch-luma_luma.py Wed Sep 24 12:49:38 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-luma_luma.py,v 1.1 2014/08/20 19:24:28 wiz Exp $
+$NetBSD: patch-luma_luma.py,v 1.2 2014/09/24 12:49:38 jperkin Exp $
 
 Adding luma library path to search path.
 Remove some variables that should be set by __init__.py, but aren't;
@@ -7,24 +7,24 @@
 --- luma/luma.py.orig  2011-05-24 23:09:06.000000000 +0000
 +++ luma/luma.py
 @@ -30,6 +30,8 @@ import StringIO
- import sys
- import traceback
- 
-+sys.path.append("@PATH@")
-+
- failed = 0
- 
- if sys.version_info < (2,6):
+ import sys
+ import traceback
+ 
++sys.path.append("@PATH@")
++
+ failed = 0
+ 
+ if sys.version_info < (2,6):
 @@ -161,9 +163,9 @@ def startApplication(argv, verbose=False
-         #QApplication.setStyle(QStyleFactory.create("plastique"))
-         #QApplication.setPalette(QApplication.style().standardPalette())
- 
--    app.setOrganizationName(appinfo.ORGNAME)
--    app.setApplicationName(appinfo.APPNAME)
--    app.setApplicationVersion(appinfo.VERSION)
-+    #app.setOrganizationName(appinfo.ORGNAME)
-+    #app.setApplicationName(appinfo.APPNAME)
-+    #app.setApplicationVersion(appinfo.VERSION)
-     app.setWindowIcon(QIcon(':/icons/128/luma'))
- 
-     # Setup the logging mechanism
+         #QApplication.setStyle(QStyleFactory.create("plastique"))
+         #QApplication.setPalette(QApplication.style().standardPalette())
+ 
+-    app.setOrganizationName(appinfo.ORGNAME)
+-    app.setApplicationName(appinfo.APPNAME)
+-    app.setApplicationVersion(appinfo.VERSION)
++    #app.setOrganizationName(appinfo.ORGNAME)
++    #app.setApplicationName(appinfo.APPNAME)
++    #app.setApplicationVersion(appinfo.VERSION)
+     app.setWindowIcon(QIcon(':/icons/128/luma'))
+ 
+     # Setup the logging mechanism
diff -r aa57a3e37d6f -r 610563c773f3 databases/luma/patches/patch-setup.py
--- a/databases/luma/patches/patch-setup.py     Wed Sep 24 12:33:44 2014 +0000
+++ b/databases/luma/patches/patch-setup.py     Wed Sep 24 12:49:38 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.2 2014/08/20 19:39:02 wiz Exp $
+$NetBSD: patch-setup.py,v 1.3 2014/09/24 12:49:38 jperkin Exp $
 
 Handle all non-Windows the same for pkgsrc,
 in particular do not handle OS X differently.
@@ -9,29 +9,29 @@
 --- setup.py.orig      2011-05-25 12:32:02.000000000 +0000
 +++ setup.py
 @@ -146,7 +146,7 @@ if sys.platform.lower().startswith('win'
-     )
- 
- # Mac OS X
--elif sys.platform.lower().startswith('darwin'):
-+elif sys.platform.lower().startswith('darwin_not_in_pkgsrc'):
-     # TODO: add Mac OS X spesifics. (py2app?)
- 
-     # Create the Nroff man page for mac.
+     )
+ 
+ # Mac OS X
+-elif sys.platform.lower().startswith('darwin'):
++elif sys.platform.lower().startswith('darwin_not_in_pkgsrc'):
+     # TODO: add Mac OS X spesifics. (py2app?)
+ 
+     # Create the Nroff man page for mac.
 @@ -159,7 +159,7 @@ elif sys.platform.lower().startswith('da
-     )
- 
- # Linux
--elif sys.platform.lower().startswith('linux'):
-+else:
-     # Include the application icon in various sizes, so that icon themers
-     # can change this as per the iconthemeing standards defined by
-     # freedesktop.org
+     )
+ 
+ # Linux
+-elif sys.platform.lower().startswith('linux'):
++else:
+     # Include the application icon in various sizes, so that icon themers
+     # can change this as per the iconthemeing standards defined by
+     # freedesktop.org
 @@ -183,7 +183,7 @@ elif sys.platform.lower().startswith('li
- 
-     _extras = dict(
-         data_files=_data_files,
--        scripts=['bin/luma']
-+        scripts=['luma/luma.py']
-     )
- 
- if __name__ == '__main__':
+ 
+     _extras = dict(
+         data_files=_data_files,
+-        scripts=['bin/luma']
++        scripts=['luma/luma.py']
+     )
+ 
+ if __name__ == '__main__':