Update to 3.3.1

PR:		ports/29822
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

This port should be repocopied and renamed to nethack3-qt later.

1 files changed, 25 insertions, 51 deletions

diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index 3fbc438c3ef0..baf3973c83dc 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -5,69 +5,43 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qt-nethack
-PORTVERSION=	1.0.1
+PORTNAME=	nethack
+PKGNAMESUFFIX=	-qt
+PORTVERSION=	3.3.1
 CATEGORIES=	games
-MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
-		ftp://ftp.troll.no/contrib/ \
-		${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	nethack
-DISTNAME=	nethack-3.2.2
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
+MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/nh${PORTVERSION:S/.//g}/src/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	auplay:${PORTSDIR}/audio/nas \
-		xpmtoppm:${PORTSDIR}/graphics/netpbm
-RUN_DEPENDS=	auplay:${PORTSDIR}/audio/nas
-
-QT_PATCH=	qnethack-3.2.2.1.0.1.src.tar.gz
-QT_SOUND=	nhs.tar.gz
-EXTRACT_ONLY=	nethack-3.2.2.tar.gz
-
-USE_QT_VER=	1
-USE_XPM=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_QT_VER=	2
 USE_GMAKE=	yes
+MAKE_ENV=	CXX="${CXX}" MOC="${MOC}" LIBQT="-l${QTNAME}" \
+		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
-BROKEN=		"Compiler error"
+pre-everything:
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!! You cannot install nethack and nethack-qt in parallel  !!"
+	@${ECHO} "!! But nethack-qt might read your prior nethack scores    !!"
+	@${ECHO} "!! Don't forget to backup your nethack libdir if it's     !!"
+	@${ECHO} "!! important for you                                      !!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 
-pre-configure:
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ ${ECHO} "!! You cannot install nethack and nethack-qt in parallel !!"
-	@ ${ECHO} "!! But nethack-qt might read your prior nethack scores   !!"
-	@ ${ECHO} "!! Don't forget to backup your nethack libdir if it's    !!"
-	@ ${ECHO} "!! important for you                                     !!"
-	@ ${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@ cd ${WRKSRC}/win; tar xzf ${DISTDIR}/${QT_PATCH}
-	@ cd ${WRKSRC}; ${PATCH} -s < win/Qt/nhqt.patch
-	@ cd ${WRKSRC}/sys/unix; ${SH} setup.sh
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-Makefile.diff
-	@ cd ${WRKSRC}/src; ${PATCH} -s < ${FILESDIR}/src-sounds.c.diff
-	@ cd ${WRKSRC}; ${PATCH} -s < ${FILESDIR}/include-unixconf.h.diff
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/include/config.h
 
-pre-build:
-	(cd ${WRKSRC}/util; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} tile2x11 )
+pre-configure:
+	@cd ${WRKSRC}/sys/unix; ${SH} setup.sh
 
 post-install:
-	@ cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
-	@ cd ${WRKSRC}/doc; PREFIX=${PREFIX} ${MAKE} manpages
+	@cd ${WRKSRC}/doc; ${CHMOD} 644 *.6
+	@cd ${WRKSRC}/doc; ${SETENV} ${MAKE_ENV} ${MAKE} manpages
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/nethack
-	${CP} ${WRKSRC}/doc/Guidebook.txt ${PREFIX}/share/doc/nethack
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/Guidebook.txt ${DOCSDIR}
 .endif
-	@ cd ${PREFIX}/lib/nethackdir; tar xzf ${DISTDIR}/${QT_SOUND}
-	@ cd ${PREFIX}/lib/nethackdir; ${CHOWN} root:games *.au .nethackrc
-	@ cd ${PREFIX}/lib/nethackdir; ${CHMOD} 444 *.au .nethackrc
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "post-installation hints
-	@ ${ECHO}  "-----------------------"
-	@ ${ECHO}  "a) Add this to your user environment:"
-	@ ${ECHO}  "   setenv AUDIOSERVER `hostname`:0"
-	@ ${ECHO}  "b) Start the NAS audio server"
-	@ ${ECHO}  "   auvoxware -aa &    # -aa allows any host access"
-	@ ${ECHO}  "c) Copy the example nethackrc file from ${FILESDIR} to your"
-	@ ${ECHO}  "   login directory:"
-	@ ${ECHO}  "   ${CP} ${FILESDIR}/sample.nethackrc ${HOME}/.nethackrc"
 
 .include <bsd.port.mk>