From owner-svn-ports-all@freebsd.org  Thu Mar  9 09:19:22 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
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 9C96FD04FC9;
 Thu,  9 Mar 2017 09:19:22 +0000 (UTC)
 (envelope-from amdmi3@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 5AE1D75B;
 Thu,  9 Mar 2017 09:19:22 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v299JLj9059905;
 Thu, 9 Mar 2017 09:19:21 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v299JL3h059902;
 Thu, 9 Mar 2017 09:19:21 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201703090919.v299JL3h059902@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 9 Mar 2017 09:19:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r435750 - in head/x11/xkbctrl: . 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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Mar 2017 09:19:22 -0000

Author: amdmi3
Date: Thu Mar  9 09:19:21 2017
New Revision: 435750
URL: https://svnweb.freebsd.org/changeset/ports/435750

Log:
  - Add LICENSE
  - Pet portlint
  - Regenerate patches

Modified:
  head/x11/xkbctrl/Makefile
  head/x11/xkbctrl/files/patch-Imakefile
  head/x11/xkbctrl/files/patch-xkbctrl.c

Modified: head/x11/xkbctrl/Makefile
==============================================================================
--- head/x11/xkbctrl/Makefile	Thu Mar  9 09:01:49 2017	(r435749)
+++ head/x11/xkbctrl/Makefile	Thu Mar  9 09:19:21 2017	(r435750)
@@ -11,6 +11,9 @@ DISTFILES=	Imakefile xkbctrl.c
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display and manipulate XKB keyboard controls from the commandline
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 DIST_SUBDIR=	xkbctrl
 PLIST_FILES=	bin/xkbctrl
 USES=		imake
@@ -18,13 +21,14 @@ USE_XORG=	x11 xkbfile
 NO_WRKSUBDIR=	yes
 
 do-extract:
-		@${RM} -r ${WRKSRC}
-		@${MKDIR} ${WRKSRC}
-		@for _file in ${DISTFILES}; do \
-			${CP} ${DISTDIR}/${DIST_SUBDIR}/$${_file} ${WRKSRC}; \
-		done
+	@${RM} -r ${WRKSRC}
+	@${MKDIR} ${WRKSRC}
+	@for _file in ${DISTFILES}; do \
+		${CP} ${DISTDIR}/${DIST_SUBDIR}/$${_file} ${WRKSRC}; \
+	done
+	@${SED} -n '3,24p' <${WRKSRC}/xkbctrl.c >${WRKSRC}/COPYING
 
 do-install:
-		@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/x11/xkbctrl/files/patch-Imakefile
==============================================================================
--- head/x11/xkbctrl/files/patch-Imakefile	Thu Mar  9 09:01:49 2017	(r435749)
+++ head/x11/xkbctrl/files/patch-Imakefile	Thu Mar  9 09:19:21 2017	(r435750)
@@ -1,6 +1,6 @@
---- Imakefile.org	Sun Jan  9 22:48:52 2000
-+++ Imakefile	Sun Jan  9 22:49:13 2000
-@@ -7,35 +7,9 @@
+--- Imakefile.orig	2017-03-09 09:12:29 UTC
++++ Imakefile
+@@ -7,35 +7,9 @@ XCOMM $XConsortium: Imakefile /main/7 19
     DEPLIBS = $(DEPXKBFILELIB) $(DEPXONLYLIB)
     XTLOCLIBS = $(XTOOLLIB) $(XONLYLIB)
     XTDEPLIBS = $(DEPXTOOLLIB) $(DEPXONLYLIB)

Modified: head/x11/xkbctrl/files/patch-xkbctrl.c
==============================================================================
--- head/x11/xkbctrl/files/patch-xkbctrl.c	Thu Mar  9 09:01:49 2017	(r435749)
+++ head/x11/xkbctrl/files/patch-xkbctrl.c	Thu Mar  9 09:19:21 2017	(r435750)
@@ -1,6 +1,6 @@
---- xkbctrl.c.org	Sun Jan  9 22:51:02 2000
-+++ xkbctrl.c	Wed Jul  5 22:15:09 2000
-@@ -27,7 +27,7 @@
+--- xkbctrl.c.orig	2017-03-09 09:12:29 UTC
++++ xkbctrl.c
+@@ -27,7 +27,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
  #include <stdio.h>
  #include <stdlib.h>
@@ -9,7 +9,7 @@
  #include <ctype.h>
  #include <X11/Xos.h>
  #include <X11/Xlib.h>
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ register char *tmp;
  	if (*tmp=='4') {
  	    *changes|= Mod4Mask;
  	    if (onOff)	*mods|= Mod4Mask;