Of course, I forgot to remove the patches that are required any more.....

7 files changed, 0 insertions, 199 deletions

diff --git a/misc/calibre/patches/patch-setup_____init____.py b/misc/calibre/patches/patch-setup_____init____.py
deleted file mode 100644
index a3eb9f9c37e..00000000000
--- a/misc/calibre/patches/patch-setup_____init____.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup_____init____.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- setup/__init__.py.orig	2011-05-20 14:41:31.000000000 +0000
-+++ setup/__init__.py
-@@ -12,7 +12,9 @@ is64bit = platform.architecture()[0] == 
- 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')
diff --git a/misc/calibre/patches/patch-setup_extensions.py b/misc/calibre/patches/patch-setup_extensions.py
deleted file mode 100644
index a419c3c5dd7..00000000000
--- a/misc/calibre/patches/patch-setup_extensions.py
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-setup_extensions.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- setup/extensions.py.orig	2011-05-20 14:36:29.000000000 +0000
-+++ setup/extensions.py
-@@ -11,7 +11,7 @@ from distutils import sysconfig
- 
- 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 @@ from setup.build_environment import fc_i
-         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 @@ if islinux:
-     ldflags.append('-lpython'+sysconfig.get_python_version())
- 
- 
--if isfreebsd:
-+if isbsd:
-     cflags.append('-pthread')
-     ldflags.append('-shared')
-     cflags.append('-I'+sysconfig.get_python_inc())
diff --git a/misc/calibre/patches/patch-setup_install.py b/misc/calibre/patches/patch-setup_install.py
deleted file mode 100644
index ff05547f5cb..00000000000
--- a/misc/calibre/patches/patch-setup_install.py
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-setup_install.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- setup/install.py.orig	2011-05-20 13:49:07.000000000 +0000
-+++ setup/install.py
-@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
- 
- 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 @@ class Develop(Command):
- 
- 
-     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 @@ class Develop(Command):
-             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 @@ class Develop(Command):
-         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)
diff --git a/misc/calibre/patches/patch-src_calibre_____init____.py b/misc/calibre/patches/patch-src_calibre_____init____.py
deleted file mode 100644
index b09cec24529..00000000000
--- a/misc/calibre/patches/patch-src_calibre_____init____.py
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_calibre_____init____.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- src/calibre/__init__.py.orig	2011-05-13 17:49:55.000000000 +0000
-+++ src/calibre/__init__.py
-@@ -13,6 +13,7 @@ warnings.simplefilter('ignore', Deprecat
- 
- 
- from calibre.constants import (iswindows, isosx, islinux, isfreebsd, isfrozen,
-+			      isnetbsd, isbsd,
-                               preferred_encoding, __appname__, __version__, __author__,
-                               win32event, win32api, winerror, fcntl,
-                               filesystem_encoding, plugins, config_dir)
diff --git a/misc/calibre/patches/patch-src_calibre_constants.py b/misc/calibre/patches/patch-src_calibre_constants.py
deleted file mode 100644
index 94407a50542..00000000000
--- a/misc/calibre/patches/patch-src_calibre_constants.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_calibre_constants.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- src/calibre/constants.py.orig	2011-05-13 17:49:55.000000000 +0000
-+++ src/calibre/constants.py
-@@ -27,7 +27,9 @@ iswindows = 'win32' in _plat or 'win64' 
- 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
- 
diff --git a/misc/calibre/patches/patch-src_calibre_linux.py b/misc/calibre/patches/patch-src_calibre_linux.py
deleted file mode 100644
index 8b1aeec4f49..00000000000
--- a/misc/calibre/patches/patch-src_calibre_linux.py
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-src_calibre_linux.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- src/calibre/linux.py.orig	2011-05-13 17:49:55.000000000 +0000
-+++ src/calibre/linux.py
-@@ -7,7 +7,7 @@ import sys, os, cPickle, textwrap, stat,
- from subprocess import check_call
- 
- from calibre import  __appname__, prints, guess_type
--from calibre.constants import islinux, isfreebsd
-+from calibre.constants import islinux, isfreebsd, isnetbsd, isbsd
- from calibre.customize.ui import all_input_formats
- from calibre.ptempfile import TemporaryDirectory
- from calibre import CurrentDir
-@@ -136,17 +136,17 @@ class PostInstall:
-         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 @@ class PostInstall:
-             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 @@ class PostInstall:
-     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 @@ class PostInstall:
-                     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')
diff --git a/misc/calibre/patches/patch-src_calibre_utils_help2man.py b/misc/calibre/patches/patch-src_calibre_utils_help2man.py
deleted file mode 100644
index 650ad93adea..00000000000
--- a/misc/calibre/patches/patch-src_calibre_utils_help2man.py
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_calibre_utils_help2man.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
-
---- src/calibre/utils/help2man.py.orig	2011-04-08 17:20:30.000000000 +0000
-+++ src/calibre/utils/help2man.py
-@@ -4,7 +4,7 @@ __copyright__ = '2009, Kovid Goyal <kovi
- __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 create_man_page(prog, parser):
-     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')