diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2016-11-24 10:41:15 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2016-11-24 10:41:15 +0000 |
| commit | 7df0055f44902e48c113cf63bdf76a66d954507c (patch) | |
| tree | e6c797260a88f734cbe6839f6d78b108ed78a31b /sysutils/flock | |
| parent | 309ae39263ea03de0f3de57b5022aa3b8c0c2972 (diff) | |
| download | ports-7df0055f44902e48c113cf63bdf76a66d954507c.tar.gz ports-7df0055f44902e48c113cf63bdf76a66d954507c.zip | |
Unbreak build - according to PR 214773 custom patches are not
needed anymore.
PR: 214773
Notes
Notes:
svn path=/head/; revision=427003
Diffstat (limited to 'sysutils/flock')
| -rw-r--r-- | sysutils/flock/files/patch-include_pathnames.h | 17 | ||||
| -rw-r--r-- | sysutils/flock/files/patch-lib_blkdev.c | 20 |
2 files changed, 0 insertions, 37 deletions
diff --git a/sysutils/flock/files/patch-include_pathnames.h b/sysutils/flock/files/patch-include_pathnames.h deleted file mode 100644 index 05b2998dac1a..000000000000 --- a/sysutils/flock/files/patch-include_pathnames.h +++ /dev/null @@ -1,17 +0,0 @@ ---- include/pathnames.h.orig 2016-03-09 10:44:05 UTC -+++ include/pathnames.h -@@ -46,10 +46,14 @@ - #define _PATH_MAILDIR "/var/spool/mail" - #endif - #define _PATH_MOTDFILE "/etc/motd" -+#ifndef _PATH_NOLOGIN - #define _PATH_NOLOGIN "/etc/nologin" -+#endif - #define _PATH_VAR_NOLOGIN "/var/run/nologin" - -+#ifndef _PATH_LOGIN - #define _PATH_LOGIN "/bin/login" -+#endif - #define _PATH_SHUTDOWN "/sbin/shutdown" - - #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d" diff --git a/sysutils/flock/files/patch-lib_blkdev.c b/sysutils/flock/files/patch-lib_blkdev.c deleted file mode 100644 index f37989e9ce4b..000000000000 --- a/sysutils/flock/files/patch-lib_blkdev.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lib/blkdev.c.orig 2016-07-30 07:16:42 UTC -+++ lib/blkdev.c -@@ -133,7 +133,7 @@ blkdev_get_size(int fd, unsigned long lo - } - #endif /* FDGETPRM */ - --#ifdef HAVE_SYS_DISKLABEL_H -+#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) - { - /* - * This code works for FreeBSD 4.11 i386, except for the full device -@@ -161,7 +161,7 @@ blkdev_get_size(int fd, unsigned long lo - } - } - } --#endif /* HAVE_SYS_DISKLABEL_H */ -+#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */ - - { - struct stat st; |