From owner-svn-ports-all@FreeBSD.ORG  Fri Nov 28 11:22:27 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 189DC8D5;
 Fri, 28 Nov 2014 11:22:27 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0571B93A;
 Fri, 28 Nov 2014 11:22:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sASBMQuM057131;
 Fri, 28 Nov 2014 11:22:26 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sASBMQRf057129;
 Fri, 28 Nov 2014 11:22:26 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201411281122.sASBMQRf057129@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 28 Nov 2014 11:22:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373555 - head/games/lgeneral
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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Nov 2014 11:22:27 -0000

Author: amdmi3
Date: Fri Nov 28 11:22:26 2014
New Revision: 373555
URL: https://svnweb.freebsd.org/changeset/ports/373555
QAT: https://qat.redports.org/buildarchive/r373555/

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Use canonical makefile statement otder
  - Remove obsolete CONFLICTS
  - Add empty directories to plist

Modified:
  head/games/lgeneral/Makefile
  head/games/lgeneral/pkg-plist

Modified: head/games/lgeneral/Makefile
==============================================================================
--- head/games/lgeneral/Makefile	Fri Nov 28 11:21:42 2014	(r373554)
+++ head/games/lgeneral/Makefile	Fri Nov 28 11:22:26 2014	(r373555)
@@ -13,13 +13,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:DE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Turn-based strategy engine inspired by Panzer General
 
-LICENSE=	GPLv2
-
-CONFLICTS=	lgeneral-data-[0-9]*
-
-OPTIONS_DEFINE=	SOUND NLS DOCS
-OPTIONS_DEFAULT=	SOUND
-SOUND_DESC=	Enable sound support
+LICENSE=	GPLv2 # or later
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_SDL=	sdl
 USES=		gmake
@@ -29,6 +24,10 @@ USE_CSTD=	gnu89
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	SOUND NLS DOCS
+OPTIONS_DEFAULT=	SOUND
+SOUND_DESC=	Enable sound support
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSOUND}

Modified: head/games/lgeneral/pkg-plist
==============================================================================
--- head/games/lgeneral/pkg-plist	Fri Nov 28 11:21:42 2014	(r373554)
+++ head/games/lgeneral/pkg-plist	Fri Nov 28 11:22:26 2014	(r373555)
@@ -216,3 +216,6 @@ share/applications/lgeneral.desktop
 %%NLS%%share/locale/en/LC_MESSAGES/lgeneral.mo
 %%NLS%%share/locale/en/LC_MESSAGES/pg.mo
 share/pixmaps/lgeneral48.png
+@dir %%DATADIR%%/terrain
+@dir %%DATADIR%%/music
+@dir %%DATADIR%%/ai_modules