Attachment #173111 for bug #210185




# $FreeBSD$

PORTNAME=	flock
PORTVERSION=	2.28
CATEGORIES=	sysutils
MASTER_SITES=	KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/
DISTNAME=	util-linux-${PORTVERSION}

MAINTAINER=	franco@opnsense.org
COMMENT=	Manage locks from shell scripts

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

GNU_CONFIGURE=	yes
USES=		libtool pkgconfig

OPTIONS_DEFINE=	NLS

NLS_CONFIGURE_OFF=--disable-nls
NLS_USES=	autoreconf:autopoint gettext

PLIST_FILES=	bin/flock man/man1/flock.1.gz

do-build:
	# skip building unneeded utils
	${MAKE} -C ${WRKSRC} flock

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/flock ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/sys-utils/flock.1 \
	    ${STAGEDIR}${MANPREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/sysutils/flock/distinfo (-2 / +3 lines)
1	SHA256 (flock-2.19.tar.gz) = 9716618042a753cc4bd6e787d0886ea5fce8a167d5ce62421cee2c09ea86fbda	1	TIMESTAMP = 1464715562
2	SIZE (flock-2.19.tar.gz) = 5452	2	SHA256 (util-linux-2.28.tar.gz) = b79901455901d0e8cd5aa58671dcc9118fa333cce805a26904155e80a621f595
		3	SIZE (util-linux-2.28.tar.gz) = 8860808




--- 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"




--- 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;

Return to bug 210185

Lines 2-19 Link Here

(-)b/sysutils/flock/Makefile (-7 / +23 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= flock	4	PORTNAME= flock
5	PORTVERSION= 2.19	5	PORTVERSION= 2.28
6	CATEGORIES= sysutils	6	CATEGORIES= sysutils
7	MASTER_SITES= http://www.zonov.org/${PORTNAME}/	7	MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/
		8	DISTNAME= util-linux-${PORTVERSION}
8		9
9	MAINTAINER= zont@FreeBSD.org	10	MAINTAINER= franco@opnsense.org
10	COMMENT= Manage locks from shell scripts	11	COMMENT= Manage locks from shell scripts
11		12
12	PLIST_FILES= bin/${PORTNAME} \	13	LICENSE= GPLv2
13	man/man1/${PORTNAME}.1.gz	14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
		16	GNU_CONFIGURE= yes
		17	USES= libtool pkgconfig
		18
		19	OPTIONS_DEFINE= NLS
		20
		21	NLS_CONFIGURE_OFF=--disable-nls
		22	NLS_USES= autoreconf:autopoint gettext
		23
		24	PLIST_FILES= bin/flock man/man1/flock.1.gz
		25
		26	do-build:
		27	# skip building unneeded utils
		28	${MAKE} -C ${WRKSRC} flock
14		29
15	do-install:	30	do-install:
16	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin	31	${INSTALL_PROGRAM} ${WRKSRC}/flock ${STAGEDIR}${PREFIX}/bin
17	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1	32	${INSTALL_MAN} ${WRKSRC}/sys-utils/flock.1 \
		33	${STAGEDIR}${MANPREFIX}/man/man1
18		34
19	.include <bsd.port.mk>	35	.include <bsd.port.mk>

Added Link Here

(-)b/sysutils/flock/files/patch-include_pathnames.h (+17 lines)
1	--- include/pathnames.h.orig 2016-03-09 10:44:05 UTC
2	+++ include/pathnames.h
3	@@ -46,10 +46,14 @@
4	#define _PATH_MAILDIR "/var/spool/mail"
5	#endif
6	#define _PATH_MOTDFILE "/etc/motd"
7	+#ifndef _PATH_NOLOGIN
8	#define _PATH_NOLOGIN "/etc/nologin"
9	+#endif
10	#define _PATH_VAR_NOLOGIN "/var/run/nologin"
11
12	+#ifndef _PATH_LOGIN
13	#define _PATH_LOGIN "/bin/login"
14	+#endif
15	#define _PATH_SHUTDOWN "/sbin/shutdown"
16
17	#define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"

Added Link Here

(-)b/sysutils/flock/files/patch-lib_blkdev.c (+20 lines)
1	--- lib/blkdev.c.orig 2016-07-30 07:16:42 UTC
2	+++ lib/blkdev.c
3	@@ -133,7 +133,7 @@ blkdev_get_size(int fd, unsigned long lo
4	}
5	#endif /* FDGETPRM */
6
7	-#ifdef HAVE_SYS_DISKLABEL_H
8	+#if defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO)
9	{
10	/*
11	* This code works for FreeBSD 4.11 i386, except for the full device
12	@@ -161,7 +161,7 @@ blkdev_get_size(int fd, unsigned long lo
13	}
14	}
15	}
16	-#endif /* HAVE_SYS_DISKLABEL_H */
17	+#endif /* defined(HAVE_SYS_DISKLABEL_H) && defined(DIOCGDINFO) */
18
19	{
20	struct stat st;