diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-30 08:27:22 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2010-08-30 08:27:22 +0000 |
| commit | 6b5ff5c552721d47703873cb3bee428da5f0f9f2 (patch) | |
| tree | 273d463403a8898011d3fc49339eb9cd58883672 /ftp | |
| parent | Update to 1.6.3 (diff) | |
Use system pgrep instead of pidof
Fix pure-ftpd naming
Notes
Notes:
svn path=/head/; revision=260186
Diffstat (limited to 'ftp')
3 files changed, 22 insertions, 1 deletions
diff --git a/ftp/plasma-applet-ftpmonitor/Makefile b/ftp/plasma-applet-ftpmonitor/Makefile index 067333b8b756..74495d65bd52 100644 --- a/ftp/plasma-applet-ftpmonitor/Makefile +++ b/ftp/plasma-applet-ftpmonitor/Makefile @@ -7,6 +7,7 @@ PORTNAME= ftpmonitor PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= ftp kde MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= plasma-applet- diff --git a/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpmonitorloop.cpp b/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpmonitorloop.cpp new file mode 100644 index 000000000000..281eed53b394 --- /dev/null +++ b/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpmonitorloop.cpp @@ -0,0 +1,11 @@ +--- ./src/ftpmonitorloop.cpp.orig 2010-06-12 10:18:35.000000000 +0400 ++++ ./src/ftpmonitorloop.cpp 2010-08-30 12:10:58.553618412 +0400 +@@ -84,7 +84,7 @@ + bool FTPMonitorLoop::ftpdServerIsRunning(QString ftpdServerName) + { + QProcess checkFtpd; +- checkFtpd.start( "pidof " + ftpdServerName ); ++ checkFtpd.start( "pgrep " + ftpdServerName ); + + if (!checkFtpd.waitForStarted()) + return true; diff --git a/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpserver__pureftpdmonitor.h b/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpserver__pureftpdmonitor.h index 31271b619c41..60638ec422c5 100644 --- a/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpserver__pureftpdmonitor.h +++ b/ftp/plasma-applet-ftpmonitor/files/patch-src__ftpserver__pureftpdmonitor.h @@ -1,5 +1,5 @@ --- ./src/ftpserver/pureftpdmonitor.h.orig 2010-06-12 01:33:45.000000000 +0400 -+++ ./src/ftpserver/pureftpdmonitor.h 2010-06-15 22:44:35.632390428 +0400 ++++ ./src/ftpserver/pureftpdmonitor.h 2010-08-28 02:58:47.738230460 +0400 @@ -50,7 +50,7 @@ void createExecCommand(bool useSudo,QString whoPath) { @@ -9,3 +9,12 @@ else mFtpWhoCommand.bin = whoPath + ftpWhoBinaryName(); +@@ -101,7 +101,7 @@ + */ + QString ftpdServerName() + { +- return QString("pureftpd"); ++ return QString("pure-ftpd"); + } + + QString static ftpWhoBinaryName() |