Fix #786290 (Enhancements for building on NetBSD)

setup/__init__.py

@@ -12,7 +12,9 @@
 iswindows = re.search('win(32|64)', sys.platform)
 isosx = 'darwin' in sys.platform
 isfreebsd = 'freebsd' in sys.platform
-islinux = not isosx and not iswindows and not isfreebsd
+isnetbsd = 'netbsd' in sys.platform
+isbsd = isnetbsd or isfreebsd
+islinux = not isosx and not iswindows and not isbsd
 SRC = os.path.abspath('src')
 sys.path.insert(0, SRC)
 sys.resources_location = os.path.join(os.path.dirname(SRC), 'resources')

setup/extensions.py

@@ -11,7 +11,7 @@
 
 from PyQt4.pyqtconfig import QtGuiModuleMakefile
 
-from setup import Command, islinux, isfreebsd, isosx, SRC, iswindows
+from setup import Command, islinux, isfreebsd, isbsd, isosx, SRC, iswindows
 from setup.build_environment import fc_inc, fc_lib, chmlib_inc_dirs, \
         fc_error, poppler_libs, poppler_lib_dirs, poppler_inc_dirs, podofo_inc, \
         podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \
@@ -21,7 +21,7 @@
         jpg_lib_dirs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs, \
         icu_lib_dirs
 MT
-isunix = islinux or isosx or isfreebsd
+isunix = islinux or isosx or isbsd
 
 make = 'make' if isunix else NMAKE
 
@@ -205,7 +205,7 @@ def __init__(self, name, sources, **kwargs):
     ldflags.append('-lpython'+sysconfig.get_python_version())
 
 
-if isfreebsd:
+if isbsd:
     cflags.append('-pthread')
     ldflags.append('-shared')
     cflags.append('-I'+sysconfig.get_python_inc())

setup/install.py

@@ -8,7 +8,7 @@
 
 import sys, os, textwrap, subprocess, shutil, tempfile, atexit, stat, shlex
 
-from setup import Command, islinux, isfreebsd, basenames, modules, functions, \
+from setup import Command, islinux, isfreebsd, isbsd, basenames, modules, functions, \
         __appname__, __version__
 
 HEADER = '''\
@@ -116,7 +116,7 @@ def consolidate_paths(self):
 
 
     def pre_sub_commands(self, opts):
-        if not (islinux or isfreebsd):
+        if not (islinux or isbsd):
             self.info('\nSetting up a source based development environment is only '
                     'supported on linux. On other platforms, see the User Manual'
                     ' for help with setting up a development environment.')
@@ -156,7 +156,7 @@ def warn():
             self.warn('Failed to compile mount helper. Auto mounting of',
                 ' devices will not work')
 
-        if not isfreebsd and os.geteuid() != 0:
+        if not isbsd and os.geteuid() != 0:
             return self.warn('Must be run as root to compile mount helper. Auto '
                     'mounting of devices will not work.')
         src = os.path.join(self.SRC, 'calibre', 'devices', 'linux_mount_helper.c')
@@ -168,7 +168,7 @@ def warn():
         ret = p.wait()
         if ret != 0:
             return warn()
-        if not isfreebsd:
+        if not isbsd:
             os.chown(dest, 0, 0)
             os.chmod(dest, stat.S_ISUID|stat.S_ISGID|stat.S_IRUSR|stat.S_IWUSR|\
                     stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)

src/calibre/__init__.py

@@ -12,10 +12,10 @@
 warnings.simplefilter('ignore', DeprecationWarning)
 
 
-from calibre.constants import (iswindows, isosx, islinux, isfreebsd, isfrozen,
-                              preferred_encoding, __appname__, __version__, __author__,
-                              win32event, win32api, winerror, fcntl,
-                              filesystem_encoding, plugins, config_dir)
+from calibre.constants import (iswindows, isosx, islinux, isfrozen,
+        isbsd, preferred_encoding, __appname__, __version__, __author__,
+        win32event, win32api, winerror, fcntl,
+        filesystem_encoding, plugins, config_dir)
 from calibre.startup import winutil, winutilerror
 
 if False and islinux and not getattr(sys, 'frozen', False):
@@ -31,7 +31,7 @@
     # Prevent pyflakes from complaining
     winutil, winutilerror, __appname__, islinux, __version__
     fcntl, win32event, isfrozen, __author__
-    winerror, win32api, isfreebsd
+    winerror, win32api, isbsd
 
 _mt_inited = False
 def _init_mimetypes():

src/calibre/constants.py

@@ -27,7 +27,9 @@ def terminal_controller():
 isosx     = 'darwin' in _plat
 isnewosx  = isosx and getattr(sys, 'new_app_bundle', False)
 isfreebsd = 'freebsd' in _plat
-islinux   = not(iswindows or isosx or isfreebsd)
+isnetbsd = 'netbsd' in _plat
+isbsd = isfreebsd or isnetbsd
+islinux   = not(iswindows or isosx or isbsd)
 isfrozen  = hasattr(sys, 'frozen')
 isunix = isosx or islinux
 

src/calibre/devices/libusb.py

@@ -8,10 +8,10 @@
                    c_ubyte, c_ushort, c_int, c_char, c_void_p, c_byte, c_uint
 from errno import EBUSY, ENOMEM
 
-from calibre import iswindows, isosx, isfreebsd, load_library
+from calibre import iswindows, isosx, isbsd, load_library
 
 _libusb_name = 'libusb'
-PATH_MAX = 511 if iswindows else 1024 if (isosx or isfreebsd) else 4096
+PATH_MAX = 511 if iswindows else 1024 if (isosx or isbsd) else 4096
 if iswindows:
     class Structure(_Structure):
         _pack_ = 1

src/calibre/ebooks/html/input.py

@@ -20,7 +20,7 @@
 from calibre.customize.conversion import InputFormatPlugin
 from calibre.ebooks.chardet import xml_to_unicode
 from calibre.customize.conversion import OptionRecommendation
-from calibre.constants import islinux, isfreebsd, iswindows
+from calibre.constants import islinux, isbsd, iswindows
 from calibre import unicode_path, as_unicode
 from calibre.utils.localization import get_lang
 from calibre.utils.filenames import ascii_filename
@@ -302,7 +302,7 @@ def is_case_sensitive(self, path):
         if getattr(self, '_is_case_sensitive', None) is not None:
             return self._is_case_sensitive
         if not path or not os.path.exists(path):
-            return islinux or isfreebsd
+            return islinux or isbsd
         self._is_case_sensitive = not (os.path.exists(path.lower()) \
                 and os.path.exists(path.upper()))
         return self._is_case_sensitive

src/calibre/ebooks/pdf/pdftohtml.py

@@ -13,7 +13,7 @@
 
 from calibre.ebooks import ConversionError, DRMError
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre.constants import isosx, iswindows, islinux, isfreebsd
+from calibre.constants import isosx, iswindows, islinux, isbsd
 from calibre import CurrentDir
 
 PDFTOHTML = 'pdftohtml'
@@ -23,7 +23,7 @@
 if iswindows and hasattr(sys, 'frozen'):
     PDFTOHTML = os.path.join(os.path.dirname(sys.executable), 'pdftohtml.exe')
     popen = partial(subprocess.Popen, creationflags=0x08) # CREATE_NO_WINDOW=0x08 so that no ugly console is popped up
-if (islinux or isfreebsd) and getattr(sys, 'frozen', False):
+if (islinux or isbsd) and getattr(sys, 'frozen', False):
     PDFTOHTML = os.path.join(sys.executables_location, 'bin', 'pdftohtml')
 
 def pdftohtml(output_dir, pdf_path, no_images):
@@ -43,7 +43,7 @@ def pdftohtml(output_dir, pdf_path, no_images):
         # This is neccessary as pdftohtml doesn't always (linux) respect absolute paths
         pdf_path = os.path.abspath(pdf_path)
         cmd = [PDFTOHTML, '-enc', 'UTF-8', '-noframes', '-p', '-nomerge', '-nodrm', '-q', pdf_path, os.path.basename(index)]
-        if isfreebsd:
+        if isbsd:
             cmd.remove('-nodrm')
         if no_images:
             cmd.append('-i')

src/calibre/gui2/__init__.py

@@ -12,7 +12,7 @@
 
 ORG_NAME = 'KovidsBrain'
 APP_UID  = 'libprs500'
-from calibre.constants import islinux, iswindows, isfreebsd, isfrozen, isosx
+from calibre.constants import islinux, iswindows, isbsd, isfrozen, isosx
 from calibre.utils.config import Config, ConfigProxy, dynamic, JSONConfig
 from calibre.utils.localization import set_qt_translator
 from calibre.ebooks.metadata import MetaInformation
@@ -628,7 +628,7 @@ def __init__(self, args):
         st = self.style()
         if st is not None:
             st = unicode(st.objectName()).lower()
-        if (islinux or isfreebsd) and st in ('windows', 'motif', 'cde'):
+        if (islinux or isbsd) and st in ('windows', 'motif', 'cde'):
             from PyQt4.Qt import QStyleFactory
             styles = set(map(unicode, QStyleFactory.keys()))
             if 'Plastique' in styles and os.environ.get('KDE_FULL_SESSION',
@@ -697,7 +697,7 @@ def open_local_file(path):
 
 def is_ok_to_use_qt():
     global gui_thread, _store_app
-    if (islinux or isfreebsd) and ':' not in os.environ.get('DISPLAY', ''):
+    if (islinux or isbsd) and ':' not in os.environ.get('DISPLAY', ''):
         return False
     if _store_app is None and QApplication.instance() is None:
         _store_app = QApplication([])

src/calibre/gui2/lrf_renderer/main.py

@@ -5,7 +5,7 @@
 from PyQt4.QtGui import QKeySequence, QPainter, QDialog, QSpinBox, QSlider, QIcon
 from PyQt4.QtCore import Qt, QObject, SIGNAL, QCoreApplication, QThread
 
-from calibre import __appname__, setup_cli_handlers, islinux, isfreebsd
+from calibre import __appname__, setup_cli_handlers, islinux, isbsd
 from calibre.ebooks.lrf.lrfparser import LRFDocument
 
 from calibre.gui2 import ORG_NAME, APP_UID, error_dialog, \
@@ -258,7 +258,7 @@ def file_renderer(stream, opts, parent=None, logger=None):
         level = logging.DEBUG if opts.verbose else logging.INFO
         logger = logging.getLogger('lrfviewer')
         setup_cli_handlers(logger, level)
-    if islinux or isfreebsd:
+    if islinux or isbsd:
         try: # Set lrfviewer as the default for LRF files for this user
             from subprocess import call
             call('xdg-mime default calibre-lrfviewer.desktop application/lrf', shell=True)
@@ -307,7 +307,7 @@ def main(args=sys.argv, logger=None):
     if hasattr(opts, 'help'):
         parser.print_help()
         return 1
-    pid = os.fork() if (islinux or isfreebsd) else -1
+    pid = os.fork() if (islinux or isbsd) else -1
     if pid <= 0:
         app = Application(args)
         app.setWindowIcon(QIcon(I('viewer.png')))

src/calibre/gui2/viewer/main.py

@@ -20,7 +20,7 @@
     info_dialog, error_dialog, open_url, available_height
 from calibre.ebooks.oeb.iterator import EbookIterator
 from calibre.ebooks import DRMError
-from calibre.constants import islinux, isfreebsd, isosx, filesystem_encoding
+from calibre.constants import islinux, isbsd, isosx, filesystem_encoding
 from calibre.utils.config import Config, StringConfig, JSONConfig
 from calibre.gui2.search_box import SearchBox2
 from calibre.ebooks.metadata import MetaInformation
@@ -801,7 +801,7 @@ def main(args=sys.argv):
 
     parser = option_parser()
     opts, args = parser.parse_args(args)
-    pid = os.fork() if False and (islinux or isfreebsd) else -1
+    pid = os.fork() if False and (islinux or isbsd) else -1
     if pid <= 0:
         app = Application(args)
         app.setWindowIcon(QIcon(I('viewer.png')))

src/calibre/linux.py

@@ -7,7 +7,7 @@
 from subprocess import check_call
 
 from calibre import  __appname__, prints, guess_type
-from calibre.constants import islinux, isfreebsd
+from calibre.constants import islinux, isnetbsd, isbsd
 from calibre.customize.ui import all_input_formats
 from calibre.ptempfile import TemporaryDirectory
 from calibre import CurrentDir
@@ -136,17 +136,17 @@ def __init__(self, opts, info=prints, warn=None, manifest=None):
         self.icon_resources = []
         self.menu_resources = []
         self.mime_resources = []
-        if islinux or isfreebsd:
+        if islinux or isbsd:
             self.setup_completion()
         self.install_man_pages()
-        if islinux or isfreebsd:
+        if islinux or isbsd:
             self.setup_desktop_integration()
         self.create_uninstaller()
 
         from calibre.utils.config import config_dir
         if os.path.exists(config_dir):
             os.chdir(config_dir)
-            if islinux or isfreebsd:
+            if islinux or isbsd:
                 for f in os.listdir('.'):
                     if os.stat(f).st_uid == 0:
                         import shutil
@@ -196,7 +196,10 @@ def setup_completion(self): # {{{
             if os.path.exists(bc):
                 f = os.path.join(bc, 'calibre')
             else:
-                f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
+                if isnetbsd:
+                    f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
+                else:
+                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
             if not os.path.exists(os.path.dirname(f)):
                 os.makedirs(os.path.dirname(f))
             self.manifest.append(f)
@@ -300,7 +303,7 @@ def setup_completion(self): # {{{
     def install_man_pages(self): # {{{
         try:
             from calibre.utils.help2man import create_man_page
-            if isfreebsd:
+            if isbsd:
                 manpath = os.path.join(self.opts.staging_root, 'man/man1')
             else:
                 manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
@@ -316,7 +319,7 @@ def install_man_pages(self): # {{{
                     continue
                 parser = parser()
                 raw = create_man_page(prog, parser)
-                if isfreebsd:
+                if isbsd:
                     manfile = os.path.join(manpath, prog+'.1')
                 else:
                     manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')

src/calibre/utils/fonts/__init__.py

@@ -8,14 +8,14 @@
 
 import os, sys
 
-from calibre.constants import plugins, iswindows, islinux, isfreebsd
+from calibre.constants import plugins, iswindows, islinux, isbsd
 
 _fc, _fc_err = plugins['fontconfig']
 
 if _fc is None:
     raise RuntimeError('Failed to load fontconfig with error:'+_fc_err)
 
-if islinux or isfreebsd:
+if islinux or isbsd:
     Thread = object
 else:
     from threading import Thread
@@ -49,7 +49,7 @@ def run(self):
             self.failed = True
 
     def wait(self):
-        if not (islinux or isfreebsd):
+        if not (islinux or isbsd):
             self.join()
         if self.failed:
             raise RuntimeError('Failed to initialize fontconfig')
@@ -149,7 +149,7 @@ def match(self, name, all=False, verbose=False):
         return fonts if all else (fonts[0] if fonts else None)
 
 fontconfig = FontConfig()
-if islinux or isfreebsd:
+if islinux or isbsd:
     # On X11 Qt also uses fontconfig, so initialization must happen in the
     # main thread. In any case on X11 initializing fontconfig should be very
     # fast

src/calibre/utils/help2man.py

@@ -4,7 +4,7 @@
 __docformat__ = 'restructuredtext en'
 
 import time, bz2
-from calibre.constants import isfreebsd
+from calibre.constants import isbsd
 
 from calibre.constants import __version__, __appname__, __author__
 
@@ -58,7 +58,7 @@ def format_option(opt):
     lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
             x in lines]
 
-    if not isfreebsd:
+    if not isbsd:
         return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
     else:
         return  (u'\n'.join(lines)).encode('utf-8')

src/calibre/utils/network.py

@@ -6,7 +6,7 @@
 __copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from calibre.constants import iswindows, islinux, isfreebsd
+from calibre.constants import iswindows, islinux, isbsd
 
 class LinuxNetworkStatus(object):
 
@@ -47,7 +47,7 @@ def __call__(self):
         return True
 
 _network_status = WindowsNetworkStatus() if iswindows else \
-        LinuxNetworkStatus() if (islinux or isfreebsd) else \
+        LinuxNetworkStatus() if (islinux or isbsd) else \
         DummyNetworkStatus()
 
 def internet_connected():