diff -ruN ../py-daemon.old/Makefile ./Makefile --- ../py-daemon.old/Makefile 2014-02-19 07:53:00.000000000 +0100 +++ ./Makefile 2014-03-08 21:56:42.758974900 +0100 @@ -2,8 +2,7 @@ # $FreeBSD: head/devel/py-daemon/Makefile 345007 2014-02-19 06:53:00Z miwi $ PORTNAME= daemon -PORTVERSION= 1.5.5 -PORTREVISION= 3 +PORTVERSION= 1.6 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,5 +18,4 @@ USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes - .include diff -ruN ../py-daemon.old/distinfo ./distinfo --- ../py-daemon.old/distinfo 2014-01-22 16:30:13.000000000 +0100 +++ ./distinfo 2014-03-08 21:52:59.969970232 +0100 @@ -1,2 +1,2 @@ -SHA256 (python-daemon-1.5.5.tar.gz) = 1406962e48ce03642c6057f40f9ffd49493792a7b34357fe9e264708748c83c0 -SIZE (python-daemon-1.5.5.tar.gz) = 41045 +SHA256 (python-daemon-1.6.tar.gz) = 1665fb16bfeae72f16aa2de40bc75661458bd42731a7d463a911a8d5eaf96c0b +SIZE (python-daemon-1.6.tar.gz) = 41564 diff -ruN ../py-daemon.old/files/patch-daemon-pidlockfile.py ./files/patch-daemon-pidlockfile.py --- ../py-daemon.old/files/patch-daemon-pidlockfile.py 2014-01-22 18:40:44.000000000 +0100 +++ ./files/patch-daemon-pidlockfile.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ ---- daemon/pidlockfile.py.orig 2010-08-24 16:57:37.753374406 +0000 -+++ daemon/pidlockfile.py 2010-08-24 16:58:57.825989360 +0000 -@@ -22,6 +22,7 @@ - NotLocked, NotMyLock, - ) - -+from lockfile.pidlockfile import PIDLockFile - - class PIDFileError(Exception): - """ Abstract base class for errors specific to PID files. """ -@@ -30,61 +31,6 @@ - """ Raised when parsing contents of PID file fails. """ - - --class PIDLockFile(LinkFileLock, object): -- """ Lockfile implemented as a Unix PID file. -- -- The PID file is named by the attribute `path`. When locked, -- the file will be created with a single line of text, -- containing the process ID (PID) of the process that acquired -- the lock. -- -- The lock is acquired and maintained as per `LinkFileLock`. -- -- """ -- -- def read_pid(self): -- """ Get the PID from the lock file. -- """ -- result = read_pid_from_pidfile(self.path) -- return result -- -- def acquire(self, *args, **kwargs): -- """ Acquire the lock. -- -- Locks the PID file then creates the PID file for this -- lock. The `timeout` parameter is used as for the -- `LinkFileLock` class. -- -- """ -- super(PIDLockFile, self).acquire(*args, **kwargs) -- try: -- write_pid_to_pidfile(self.path) -- except OSError, exc: -- error = LockFailed("%(exc)s" % vars()) -- raise error -- -- def release(self): -- """ Release the lock. -- -- Removes the PID file then releases the lock, or raises an -- error if the current process does not hold the lock. -- -- """ -- if self.i_am_locking(): -- remove_existing_pidfile(self.path) -- super(PIDLockFile, self).release() -- -- def break_lock(self): -- """ Break an existing lock. -- -- If the lock is held, breaks the lock and removes the PID -- file. -- -- """ -- super(PIDLockFile, self).break_lock() -- remove_existing_pidfile(self.path) -- -- - class TimeoutPIDLockFile(PIDLockFile): - """ Lockfile with default timeout, implemented as a Unix PID file. -