summaryrefslogtreecommitdiffstats
path: root/tdeprint
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-14 20:29:21 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-14 20:30:24 +0200
commitd8091396166f7ffd9020a78ffd9669587655f82c (patch)
tree72eb2c0e03399d7e4a11201965d2651b606f1119 /tdeprint
parentb71166c66ac55345899a6998d57cc13ab3d93720 (diff)
downloadtdelibs-d8091396166f7ffd9020a78ffd9669587655f82c.tar.gz
tdelibs-d8091396166f7ffd9020a78ffd9669587655f82c.zip
Fix several issues on freebsd
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit e469e42c76000b70aebaf838f5a3c4ded184b0e3)
Diffstat (limited to 'tdeprint')
-rw-r--r--tdeprint/cups/cupsdconf2/cupsddialog.cpp2
-rw-r--r--tdeprint/cups/kmcupsmanager.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.cpp b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
index 1800aaae4..066d50953 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.cpp
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.cpp
@@ -71,7 +71,7 @@ extern "C"
int getServerPid()
{
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
TQProcess *proc = new TQProcess();
proc->addArgument("pgrep");
proc->addArgument("cupsd");
diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp
index 5271dcd12..ee1c62728 100644
--- a/tdeprint/cups/kmcupsmanager.cpp
+++ b/tdeprint/cups/kmcupsmanager.cpp
@@ -102,7 +102,7 @@ TQString KMCupsManager::driverDirectory()
{
TQString d = cupsInstallDir();
if (d.isEmpty()) {
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
d = "/usr/local";
#else
d = "/usr";
@@ -110,7 +110,7 @@ TQString KMCupsManager::driverDirectory()
}
d.append("/share/cups/model");
// raw foomatic support
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
d.append(":/usr/local/share/foomatic/db/source");
#else
d.append(":/usr/share/foomatic/db/source");
@@ -640,7 +640,7 @@ DrMain* KMCupsManager::loadMaticDriver(const TQString& drname)
{
TQStringList comps = TQStringList::split('/', drname, false);
TQString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/local/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
#else
TQString PATH = getenv("PATH") + TQString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
@@ -959,7 +959,7 @@ void KMCupsManager::exportDriver()
{
TQString path = cupsInstallDir();
if (path.isEmpty()) {
-#ifdef __OpenBSD__
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
path = "/usr/local/share/cups";
#else
path = "/usr/share/cups";