From owner-svn-ports-all@freebsd.org  Mon Mar 28 18:43:59 2016
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 4E528AE081A;
 Mon, 28 Mar 2016 18:43:59 +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 209711A3D;
 Mon, 28 Mar 2016 18:43:59 +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 u2SIhwDh075459;
 Mon, 28 Mar 2016 18:43:58 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2SIhwhv075458;
 Mon, 28 Mar 2016 18:43:58 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201603281843.u2SIhwhv075458@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: Mon, 28 Mar 2016 18:43:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412066 - head/misc/xosd
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.21
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: Mon, 28 Mar 2016 18:43:59 -0000

Author: amdmi3
Date: Mon Mar 28 18:43:58 2016
New Revision: 412066
URL: https://svnweb.freebsd.org/changeset/ports/412066

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers

Modified:
  head/misc/xosd/Makefile

Modified: head/misc/xosd/Makefile
==============================================================================
--- head/misc/xosd/Makefile	Mon Mar 28 18:16:36 2016	(r412065)
+++ head/misc/xosd/Makefile	Mon Mar 28 18:43:58 2016	(r412066)
@@ -10,7 +10,8 @@ MASTER_SITES=	SF/libxosd/libxosd/${PORTN
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 on-screen-display program and library
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake pkgconfig libtool
 USE_CSTD=	gnu89
@@ -31,30 +32,25 @@ XFT_DESC=	Unofficial Xft support
 OPTIONS_SUB=	yes
 
 MSEC_EXTRA_PATCHES=	${FILESDIR}/extra-patch-msec-timeout
+MSEC_VARS=	DELAY_UNITS=milliseconds
+MSEC_VARS_OFF=	DELAY_UNITS=seconds
 
 XFT_EXTRA_PATCHES=	${FILESDIR}/extra-patch-xft
 XFT_USE=		GNOME=pango XORG=xft
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMSEC}
-DELAY_UNITS=	milliseconds
-.else
-DELAY_UNITS=	seconds
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,^\(CFLAGS =\)\(.*\)$$,\1 -I..\2,' \
 		${WRKSRC}/src/libxosd/Makefile.in \
 		${WRKSRC}/src/xmms_plugin/Makefile.in
 	@${REINPLACE_CMD} -e 's,specified time,& (${DELAY_UNITS}),' \
 		${WRKSRC}/src/osd_cat.c
-.if ${PORT_OPTIONS:MXFT}	# unbreak against Clang
+
+post-patch-XFT-on:
+# unbreak against Clang
 	@${REINPLACE_CMD} -e '52s,^,void xosd_xypos(xosd *osd);,' \
 		${WRKSRC}/src/libxosd/xosd.c
-.endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}