From owner-svn-ports-all@freebsd.org Sat Jul 30 09:40:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7848BA9CF2; Sat, 30 Jul 2016 09:40:46 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A1A911DE4; Sat, 30 Jul 2016 09:40:46 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6U9ejrn050660; Sat, 30 Jul 2016 09:40:45 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6U9ejUs050656; Sat, 30 Jul 2016 09:40:45 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201607300940.u6U9ejUs050656@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 30 Jul 2016 09:40:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419304 - in head/sysutils/flock: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jul 2016 09:40:46 -0000 Author: pi Date: Sat Jul 30 09:40:45 2016 New Revision: 419304 URL: https://svnweb.freebsd.org/changeset/ports/419304 Log: sysutils/flock: 2.19 -> 2.28 - This brings flock to the current state based on fetching the original util-linux sources and configuring them accordingly - adding a NLS knob as suggested by portlint. - For background on DIOCGDINFO see https://lists.freebsd.org/pipermail/freebsd-current/2015-January/053963.html - Submitter becomes maintainer PR: 210185 Changes: http://git.kernel.org/?p=utils/util-linux/util-linux.git/ Submitted by: Franco Fichtner Approved by: zont (maintainer) Added: head/sysutils/flock/files/ head/sysutils/flock/files/patch-include_pathnames.h (contents, props changed) head/sysutils/flock/files/patch-lib_blkdev.c (contents, props changed) Modified: head/sysutils/flock/Makefile head/sysutils/flock/distinfo Modified: head/sysutils/flock/Makefile ============================================================================== --- head/sysutils/flock/Makefile Sat Jul 30 09:10:22 2016 (r419303) +++ head/sysutils/flock/Makefile Sat Jul 30 09:40:45 2016 (r419304) @@ -2,18 +2,34 @@ # $FreeBSD$ PORTNAME= flock -PORTVERSION= 2.19 +PORTVERSION= 2.28 CATEGORIES= sysutils -MASTER_SITES= http://www.zonov.org/${PORTNAME}/ +MASTER_SITES= KERNEL_ORG/linux/utils/util-linux/v${PORTVERSION}/ +DISTNAME= util-linux-${PORTVERSION} -MAINTAINER= zont@FreeBSD.org +MAINTAINER= franco@opnsense.org COMMENT= Manage locks from shell scripts -PLIST_FILES= bin/${PORTNAME} \ - man/man1/${PORTNAME}.1.gz +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}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/flock ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/sys-utils/flock.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1 .include Modified: head/sysutils/flock/distinfo ============================================================================== --- head/sysutils/flock/distinfo Sat Jul 30 09:10:22 2016 (r419303) +++ head/sysutils/flock/distinfo Sat Jul 30 09:40:45 2016 (r419304) @@ -1,2 +1,3 @@ -SHA256 (flock-2.19.tar.gz) = 9716618042a753cc4bd6e787d0886ea5fce8a167d5ce62421cee2c09ea86fbda -SIZE (flock-2.19.tar.gz) = 5452 +TIMESTAMP = 1464715562 +SHA256 (util-linux-2.28.tar.gz) = b79901455901d0e8cd5aa58671dcc9118fa333cce805a26904155e80a621f595 +SIZE (util-linux-2.28.tar.gz) = 8860808 Added: head/sysutils/flock/files/patch-include_pathnames.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/flock/files/patch-include_pathnames.h Sat Jul 30 09:40:45 2016 (r419304) @@ -0,0 +1,17 @@ +--- 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" Added: head/sysutils/flock/files/patch-lib_blkdev.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/flock/files/patch-lib_blkdev.c Sat Jul 30 09:40:45 2016 (r419304) @@ -0,0 +1,20 @@ +--- 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;