From owner-svn-ports-all@FreeBSD.ORG  Wed Jul 10 01:31:19 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6BF49CD8;
 Wed, 10 Jul 2013 01:31:19 +0000 (UTC)
 (envelope-from glewis@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 46A031ACE;
 Wed, 10 Jul 2013 01:31:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6A1VJi9024866;
 Wed, 10 Jul 2013 01:31:19 GMT (envelope-from glewis@svn.freebsd.org)
Received: (from glewis@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6A1VJIr024865;
 Wed, 10 Jul 2013 01:31:19 GMT (envelope-from glewis@svn.freebsd.org)
Message-Id: <201307100131.r6A1VJIr024865@svn.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Wed, 10 Jul 2013 01:31:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322594 - head/games/nethack33
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: Wed, 10 Jul 2013 01:31:19 -0000

Author: glewis
Date: Wed Jul 10 01:31:18 2013
New Revision: 322594
URL: http://svnweb.freebsd.org/changeset/ports/322594

Log:
  . Remove the vestiges of support for the expired QT2 port.
  . Convert Makefile header.
  . NOPORTDOCS -> PORT_OPTIONS:MDOCS.
  
  PR:		180273
  Submitted by:	rene@

Modified:
  head/games/nethack33/Makefile   (contents, props changed)

Modified: head/games/nethack33/Makefile
==============================================================================
--- head/games/nethack33/Makefile	Wed Jul 10 01:19:12 2013	(r322593)
+++ head/games/nethack33/Makefile	Wed Jul 10 01:31:18 2013	(r322594)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nethack
-# Date created:		27 March 1995
-# Whom:			asami
-#
+# Created by: asami
 # $FreeBSD$
-#
 
 PORTNAME=	nethack
 PORTVERSION=	3.3.1
@@ -47,16 +43,13 @@ USE_GNOME=	gnomelibs
 GRAPHICS=	GNOME_GRAPHICS
 .elif ${PKGNAMESUFFIX} == "-nox11"
 GRAPHICS=	# none
-.elif ${PKGNAMESUFFIX} == "-qt"
-USE_QT_VER=	2
-MAKE_ENV+=	QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" \
-		MOC="${MOC}" LIBQT="-l${QTNAME}"
-GRAPHICS=	QT_GRAPHICS
 .endif
 .endif
 
 .include <bsd.port.pre.mk>
 
+.include <bsd.port.options.mk>
+
 .if !exists(${PREFIX}/bin/${HACKLINK}) && ${HACKNAME} != ${HACKLINK}
 PLIST_SUB+=	HACKLINK=""
 .else
@@ -64,7 +57,7 @@ PLIST_SUB+=	HACKLINK="@comment "
 .endif
 
 pre-everything::
-.if defined(WITH_GNOME_GRAPHICS) || defined(WITH_QT_GRAPHICS) \
+.if defined(WITH_GNOME_GRAPHICS) \
 		|| defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} " You cannot install nethack and ${PKGBASE} in parallel   "
@@ -76,7 +69,6 @@ pre-everything::
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} " You may use the following build options:                "
 	@${ECHO_MSG} " WITH_GNOME_GRAPHICS=yes            build with GNOME GUI "
-	@${ECHO_MSG} " WITH_QT_GRAPHICS=yes               build with Qt GUI    "
 	@${ECHO_MSG} " WITH_TTY_GRAPHICS=yes              build with no GUI    "
 	@${ECHO_MSG} " WITHOUT_X11=yes                    same as above        "
 	@${ECHO_MSG} "                                                         "
@@ -114,7 +106,7 @@ post-install:
 	@${LN} -s -f ${PREFIX}/bin/${HACKNAME} ${PREFIX}/bin/${HACKLINK}
 .endif
 	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
 .endif