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

4 files changed, 55 insertions, 50 deletions

diff --git a/databases/luma/Makefile b/databases/luma/Makefile
index 1935b59d3a1..c1b9646588c 100644
--- a/databases/luma/Makefile
+++ b/databases/luma/Makefile
@@ -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_FILES.luma=	luma/luma.py
 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 --git a/databases/luma/distinfo b/databases/luma/distinfo
index 47d7d7cc930..66ac355d43f 100644
--- a/databases/luma/distinfo
+++ b/databases/luma/distinfo
@@ -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 --git a/databases/luma/patches/patch-luma_luma.py b/databases/luma/patches/patch-luma_luma.py
index ed1fbc911e6..721c4e9e644 100644
--- a/databases/luma/patches/patch-luma_luma.py
+++ b/databases/luma/patches/patch-luma_luma.py
@@ -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 @@ don't know why.
 --- 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 --git a/databases/luma/patches/patch-setup.py b/databases/luma/patches/patch-setup.py
index a1a769caeb8..36e1a414174 100644
--- a/databases/luma/patches/patch-setup.py
+++ b/databases/luma/patches/patch-setup.py
@@ -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 @@ https://sourceforge.net/p/luma/bugs/47/
 --- 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__':