Sat Sep 27 09:46:24 2014 UTC ()
Use tr to handle differences between unzip implementations.
(jperkin)
diff -r1.36 -r1.37 pkgsrc/databases/luma/Makefile
diff -r1.8 -r1.9 pkgsrc/databases/luma/distinfo
diff -r1.2 -r1.3 pkgsrc/databases/luma/patches/patch-luma_luma.py
diff -r1.3 -r1.4 pkgsrc/databases/luma/patches/patch-setup.py
--- pkgsrc/databases/luma/Attic/Makefile 2014/09/24 12:49:38 1.36
+++ pkgsrc/databases/luma/Attic/Makefile 2014/09/27 09:46:24 1.37
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/09/24 12:49:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2014/09/27 09:46:24 jperkin Exp $
DISTNAME= luma-3.0.7
CATEGORIES= databases
@@ -20,6 +20,12 @@
SUBST_FILES.luma= luma/luma.py
SUBST_SED.luma= -e "s|@PATH@|${PREFIX}/${PYSITELIB}/luma|"
SUBST_MESSAGE.luma= Adding library path to luma.
+
+post-extract:
+ for f in ${WRKSRC}/luma/luma.py ${WRKSRC}/setup.py; do \
+ ${TR} -d '\r' < $${f} > $${f}.new; \
+ ${MV} $${f}.new $${f}; \
+ done
# world-writeable files
pre-build:
--- pkgsrc/databases/luma/Attic/distinfo 2014/09/24 12:49:38 1.8
+++ pkgsrc/databases/luma/Attic/distinfo 2014/09/27 09:46:24 1.9
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2014/09/24 12:49:38 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2014/09/27 09:46:24 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) = fc0639d17d1b6fcdd97f1c8193b363ee748a6672
+SHA1 (patch-luma_luma.py) = fc8e0a171303cc85a5ef7c51d802480ffac8ee6e
-SHA1 (patch-setup.py) = 55809b4ccc654d6a8c75cc3c12f490718caf265f
+SHA1 (patch-setup.py) = 3e6864a9f1d4a9a88ed47b431717ed37093b9024
--- pkgsrc/databases/luma/patches/Attic/patch-luma_luma.py 2014/09/24 12:49:38 1.2
+++ pkgsrc/databases/luma/patches/Attic/patch-luma_luma.py 2014/09/27 09:46:24 1.3
@@ -1,4 +1,4 @@
-$NetBSD: patch-luma_luma.py,v 1.2 2014/09/24 12:49:38 jperkin Exp $
+$NetBSD: patch-luma_luma.py,v 1.3 2014/09/27 09:46:24 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.setStyle(QStyleFactory.create("plastique"))
- #QApplication.setPalette(QApplication.style().standardPalette())
+ #QApplication.setPalette(QApplication.style().standardPalette())
-
+
-- app.setOrganizationName(appinfo.ORGNAME)
+- app.setOrganizationName(appinfo.ORGNAME)
-- app.setApplicationName(appinfo.APPNAME)
+- app.setApplicationName(appinfo.APPNAME)
-- app.setApplicationVersion(appinfo.VERSION)
+- app.setApplicationVersion(appinfo.VERSION)
-+ #app.setOrganizationName(appinfo.ORGNAME)
++ #app.setOrganizationName(appinfo.ORGNAME)
-+ #app.setApplicationName(appinfo.APPNAME)
++ #app.setApplicationName(appinfo.APPNAME)
-+ #app.setApplicationVersion(appinfo.VERSION)
++ #app.setApplicationVersion(appinfo.VERSION)
- app.setWindowIcon(QIcon(':/icons/128/luma'))
+ app.setWindowIcon(QIcon(':/icons/128/luma'))
-
+
- # Setup the logging mechanism
+ # Setup the logging mechanism
--- pkgsrc/databases/luma/patches/Attic/patch-setup.py 2014/09/24 12:49:38 1.3
+++ pkgsrc/databases/luma/patches/Attic/patch-setup.py 2014/09/27 09:46:24 1.4
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.3 2014/09/24 12:49:38 jperkin Exp $
+$NetBSD: patch-setup.py,v 1.4 2014/09/27 09:46:24 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(
+ _extras = dict(
- data_files=_data_files,
+ data_files=_data_files,
-- scripts=['bin/luma']
+- scripts=['bin/luma']
-+ scripts=['luma/luma.py']
++ scripts=['luma/luma.py']
- )
+ )
-
+
- if __name__ == '__main__':
+ if __name__ == '__main__':