From owner-svn-ports-head@FreeBSD.ORG  Thu Jun 13 16:12:11 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 92D0180C;
 Thu, 13 Jun 2013 16:12:11 +0000 (UTC)
 (envelope-from bsam@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 743411600;
 Thu, 13 Jun 2013 16:12:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DGCBnS018648;
 Thu, 13 Jun 2013 16:12:11 GMT (envelope-from bsam@svn.freebsd.org)
Received: (from bsam@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DGCBYm018646;
 Thu, 13 Jun 2013 16:12:11 GMT (envelope-from bsam@svn.freebsd.org)
Message-Id: <201306131612.r5DGCBYm018646@svn.freebsd.org>
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Thu, 13 Jun 2013 16:12:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320812 - head/games/conquest
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jun 2013 16:12:11 -0000

Author: bsam
Date: Thu Jun 13 16:12:10 2013
New Revision: 320812
URL: http://svnweb.freebsd.org/changeset/ports/320812

Log:
  . fix building with clang (CFLAGS+=-Wno-return-type);
  . trim Makefile headers;
  . remove the indefinite article from COMMENT;
  . add LICENSE=ART10;
  . NOPORTDOCS -> PORT_OPTIONS:MDOCS;
  . mute MKDIR;
  . use standard DOCSDIR and DATADIR;
  . utilize PORTDOCS.

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

Modified: head/games/conquest/Makefile
==============================================================================
--- head/games/conquest/Makefile	Thu Jun 13 16:07:05 2013	(r320811)
+++ head/games/conquest/Makefile	Thu Jun 13 16:12:10 2013	(r320812)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	conquest
-# Date created:			Apr 9, 2001
-# Whom:				Mark Pulford <mark@kyne.com.au>
-#
+# Created by: Mark Pulford <mark@kyne.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	conquest
 PORTVERSION=	7.2
@@ -12,16 +8,22 @@ MASTER_SITES=	SF/conq/Conquest/Conquest%
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A multi-player curses space warfare game similar to Netrek
+COMMENT=	Multi-player curses space warfare game similar to Netrek
+
+LICENSE=	ART10
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc/conquest \
 		--datadir=${LOCALBASE}/share/conquest \
 		--localstatedir=/var/games
+CFLAGS+=	-Wno-return-type
 GROUPS=		${PORTNAME}
 BINGRP=		conquest
 SHAREGRP=	conquest
 MAKE_JOBS_UNSAFE=	yes
+PORTDOCS=	README
+
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	${REINPLACE_CMD} "s|^.*@chgrp .(CONQGROUP) conq.*||g; \
@@ -29,22 +31,23 @@ post-patch:
 	${REINPLACE_CMD} "s/# include <termio.h>//g" ${WRKSRC}/c_defs.h
 	${REINPLACE_CMD} "s/-O2 -fPIC//g" ${WRKSRC}/configure
 
+.include <bsd.port.options.mk>
+
 do-install:
 	${INSTALL_PROGRAM} -m 2550 ${WRKSRC}/conqai ${PREFIX}/sbin
 	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqdriv ${PREFIX}/libexec
 	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqoper ${PREFIX}/sbin
 	${INSTALL_PROGRAM} ${WRKSRC}/conqstrat ${PREFIX}/sbin
 	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conquest ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/conquest
+	@${MKDIR} ${PREFIX}/etc/conquest
 	${INSTALL_DATA} ${WRKSRC}/conqrule \
 		${PREFIX}/etc/conquest/conqrule.sample
-	${MKDIR} ${PREFIX}/share/conquest
-	${INSTALL_DATA} ${WRKSRC}/conqnews.doc \
-		${PREFIX}/share/conquest/conqnews.doc.sample
-	${INSTALL_DATA} ${WRKSRC}/conquest.doc ${PREFIX}/share/conquest
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/conquest
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/conquest
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/conqnews.doc ${DATADIR}/conqnews.doc.sample
+	${INSTALL_DATA} ${WRKSRC}/conquest.doc ${DATADIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 	@${SH} pkg-install ${PORTNAME} POST-INSTALL
 

Modified: head/games/conquest/pkg-plist
==============================================================================
--- head/games/conquest/pkg-plist	Thu Jun 13 16:07:05 2013	(r320811)
+++ head/games/conquest/pkg-plist	Thu Jun 13 16:12:10 2013	(r320812)
@@ -6,7 +6,5 @@ sbin/conqoper
 sbin/conqstrat
 %%DATADIR%%/conqnews.doc.sample
 %%DATADIR%%/conquest.doc
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/conquest
 @dirrm %%DATADIR%%