From owner-svn-ports-all@freebsd.org  Sun May 28 23:17:25 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 69897D85833;
 Sun, 28 May 2017 23:17:25 +0000 (UTC)
 (envelope-from sunpoet@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 358C11600;
 Sun, 28 May 2017 23:17:25 +0000 (UTC)
 (envelope-from sunpoet@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4SNHOwn054122;
 Sun, 28 May 2017 23:17:24 GMT (envelope-from sunpoet@FreeBSD.org)
Received: (from sunpoet@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4SNHOZr054121;
 Sun, 28 May 2017 23:17:24 GMT (envelope-from sunpoet@FreeBSD.org)
Message-Id: <201705282317.v4SNHOZr054121@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to
 sunpoet@FreeBSD.org using -f
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sun, 28 May 2017 23:17:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r441957 - head/games/freeciv
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: Sun, 28 May 2017 23:17:25 -0000

Author: sunpoet
Date: Sun May 28 23:17:24 2017
New Revision: 441957
URL: https://svnweb.freebsd.org/changeset/ports/441957

Log:
  Fix options helper
  
  - Fix OPTIONS_DEFAULT: remove IPV6 and NLS which are added by framework
  - Convert to options target helper
  
  Approved by:	portmgr (blanket)

Modified:
  head/games/freeciv/Makefile

Modified: head/games/freeciv/Makefile
==============================================================================
--- head/games/freeciv/Makefile	Sun May 28 23:17:19 2017	(r441956)
+++ head/games/freeciv/Makefile	Sun May 28 23:17:24 2017	(r441957)
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} -
 PORTDATA=	*
 
 OPTIONS_DEFINE?=	NLS X11 SDL MYSQL IPV6 DOCS
-OPTIONS_DEFAULT?=	NLS X11 IPV6
+OPTIONS_DEFAULT?=	X11
 OPTIONS_SUB=		yes
 SDL_CONFIGURE_ON=	--enable-client=gtk,sdl
 SDL_USE=		SDL=sdl,image,ttf,gfx
@@ -72,11 +72,11 @@ post-patch:
 		${WRKSRC}/client/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MX11}
-	${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${STAGEDIR}${DATADIR}/
-	cd ${STAGEDIR}/${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
-.endif
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreeciv*.so
 	${RM} ${STAGEDIR}${PREFIX}/etc/ggz.modules
 
+post-install-X11-on:
+	${INSTALL_DATA} ${WRKSRC}/data/civclient.dsc ${STAGEDIR}${DATADIR}/
+	cd ${STAGEDIR}/${PREFIX}/bin && ${LN} -s freeciv-gtk2 freeciv-client
+
 .include <bsd.port.mk>