Date: Thu, 4 Jul 2013 16:39:59 GMT From: Rene Ladan <rene@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/180275: games/nethack34 : remove QT3 support Message-ID: <201307041639.r64Gdxiv076030@oldred.freebsd.org> Resent-Message-ID: <201307041650.r64Go0ub099774@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 180275
>Category: ports
>Synopsis: games/nethack34 : remove QT3 support
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 04 16:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Rene Ladan
>Release: FreeBSD 9.1-amd64
>Organization:
>Environment:
FreeBSD 9.1-amd64
Ports r322216
>Description:
Remove support for the expired QT3 port.
While here convert Makefile header, NOPORTDOCS, and pet portlint by putting LICENSE_FILE line at the correct place.
This PR can partially overlap with ports/177861
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 322216)
+++ Makefile (working copy)
@@ -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.4.3
@@ -18,8 +14,8 @@
LICENSE= nethack
LICENSE_NAME= NETHACK GENERAL PUBLIC LICENSE
+LICENSE_FILE= ${WRKSRC}/dat/license
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_FILE= ${WRKSRC}/dat/license
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -75,12 +71,6 @@
PATCH_DIST_STRIP= -p1
CFLAGS+= -DHPMON
.endif
-.elif ${PKGNAMESUFFIX} == "-qt"
-USE_QT_VER= 3
-MAKE_ENV+= QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
- QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}" \
- MOC="${MOC}" LIBQT="-lqt-mt"
-GRAPHICS= QT_GRAPHICS
.endif
.endif
@@ -96,6 +86,8 @@
${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" ; \
fi
+.include <bsd.port.options.mk>
+
post-patch:
.for f in include/config.h sys/unix/Makefile.src sys/unix/Makefile.top
@${REINPLACE_CMD} -e 's|%%HACKNAME%%|${HACKNAME}|g;s|%%HACKDIR%%|${PREFIX}/${HACKDIR}|g' ${WRKSRC}/${f}
@@ -113,7 +105,7 @@
post-install:
@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${PREFIX}/${HACKDOCSDIR}
${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/${HACKDOCSDIR}
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307041639.r64Gdxiv076030>