From owner-svn-ports-all@FreeBSD.ORG  Sun Dec  9 16:49:24 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C9A75CA9;
 Sun,  9 Dec 2012 16:49:24 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ABADF8FC0C;
 Sun,  9 Dec 2012 16:49:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB9GnOBE086299;
 Sun, 9 Dec 2012 16:49:24 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB9GnO4O086298;
 Sun, 9 Dec 2012 16:49:24 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201212091649.qB9GnO4O086298@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 9 Dec 2012 16:49:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308541 - head/games/hangman
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.14
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: Sun, 09 Dec 2012 16:49:25 -0000

Author: amdmi3
Date: Sun Dec  9 16:49:24 2012
New Revision: 308541
URL: http://svnweb.freebsd.org/changeset/ports/308541

Log:
  - Add CONFLICTS with games/bsdgames (both install bin/hangman)
  - Trim header
  
  PR:		174302
  Feature safe:	yes

Modified:
  head/games/hangman/Makefile

Modified: head/games/hangman/Makefile
==============================================================================
--- head/games/hangman/Makefile	Sun Dec  9 16:40:55 2012	(r308540)
+++ head/games/hangman/Makefile	Sun Dec  9 16:49:24 2012	(r308541)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hangman
-# Date created:				10 Nov 2005
-# Whom:					Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	hangman
 PORTVERSION=	0.9.2
@@ -15,6 +11,8 @@ MASTER_SITES=	http://www.shiftygames.com
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Challenge your spelling skills in the old western style
 
+CONFLICTS=	bsdgames-*
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image ttf