From owner-svn-ports-head@FreeBSD.ORG Fri Apr 18 15:05:07 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E8556A0; Fri, 18 Apr 2014 15:05:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 3E5E11998; Fri, 18 Apr 2014 15:05:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3IF57JZ000607; Fri, 18 Apr 2014 15:05:07 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3IF56Ut000599; Fri, 18 Apr 2014 15:05:06 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404181505.s3IF56Ut000599@svn.freebsd.org> From: Pawel Pekala Date: Fri, 18 Apr 2014 15:05:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351543 - in head/games/noegnud-nethack: . files 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.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2014 15:05:07 -0000 Author: pawel Date: Fri Apr 18 15:05:06 2014 New Revision: 351543 URL: http://svnweb.freebsd.org/changeset/ports/351543 QAT: https://qat.redports.org/buildarchive/r351543/ Log: - Fix build on 10+ (use gmake during build) - Add staging support - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on homepage MFH: 2014Q2 Modified: head/games/noegnud-nethack/Makefile head/games/noegnud-nethack/files/patch-variants::Makefile head/games/noegnud-nethack/pkg-descr head/games/noegnud-nethack/pkg-plist Modified: head/games/noegnud-nethack/Makefile ============================================================================== --- head/games/noegnud-nethack/Makefile Fri Apr 18 15:03:41 2014 (r351542) +++ head/games/noegnud-nethack/Makefile Fri Apr 18 15:05:06 2014 (r351543) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for the vanilla RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison gmake +USES= bison gmake tar:bzip2 USE_GL= yes WANT_SDL= yes USE_SDL= sdl image mixer -USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/variants PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} ALL_TARGET= nh343 INSTALL_TARGET= install_nh343 MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include pre-everything:: @@ -46,6 +44,12 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.3) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-nethack.patch) + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ + -e 's|make|${MAKE_CMD}|' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -E -e 's,ch(grp|own),true,' \ + -e '/(^VARDIR|ln -s|sed)/! s,(GAME|SHELL|VAR)DIR),DESTDIR)$$(&,g' \ + -e '/ln -s/ s,SHELLDIR,DESTDIR)$$(&,2' \ + ${WRKSRC}/${NOEGNUDVERSION}-nethack-3.4.3/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.3/Makefile) Modified: head/games/noegnud-nethack/files/patch-variants::Makefile ============================================================================== --- head/games/noegnud-nethack/files/patch-variants::Makefile Fri Apr 18 15:03:41 2014 (r351542) +++ head/games/noegnud-nethack/files/patch-variants::Makefile Fri Apr 18 15:05:06 2014 (r351543) @@ -1,51 +1,20 @@ ---- variants/Makefile.orig Mon Nov 15 03:02:30 2004 -+++ variants/Makefile Mon Nov 15 03:03:25 2004 -@@ -1,7 +1,6 @@ +--- variants/Makefile.orig 2004-08-23 19:13:51.000000000 +0200 ++++ variants/Makefile 2014-04-17 11:20:10.067045121 +0200 +@@ -1,7 +1,7 @@ NOEGNUDVERSION=noegnud-0.8.0 # you __MUST__ change this if you change the prefix for any variants' install !!!!!!!!!!!!! # although ..... " make -e foo " also works :O ;) -PREFIX = /usr/local ++PREFIX = %%PREFIX%% GAMEUID = games GAMEGRP = bin CHOWN = chown -@@ -62,31 +61,31 @@ - install: install_all - - install_nh342: nh342 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2 install +@@ -65,7 +65,7 @@ + make -e -C $(NOEGNUDVERSION)-nethack-3.4.2 install install_nh343: nh343 - make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.3 install ++ make -C $(NOEGNUDVERSION)-nethack-3.4.3 install install_se006e4f8: se006e4f8 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install - - install_se007e2: se007e2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E2 install - - install_se007e5: se007e5 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E5 install - - install_se007e6: se007e6 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6 install - - install_se007e6f2: se007e6f2 -- make -e -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-slashem-0.0.7E6F2 install - - install_lh001: lh001 -- make -e -C $(NOEGNUDVERSION)-littlehack-0.0.1 install -+ make -EPREFIX -C $(NOEGNUDVERSION)-littlehack-0.0.1 install - - install_nh342-dt: nh342-dt -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install -+ make -EPREFIX -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install - - # data - + make -e -C $(NOEGNUDVERSION)-slashem-0.0.6E4F8 install Modified: head/games/noegnud-nethack/pkg-descr ============================================================================== --- head/games/noegnud-nethack/pkg-descr Fri Apr 18 15:03:41 2014 (r351542) +++ head/games/noegnud-nethack/pkg-descr Fri Apr 18 15:05:06 2014 (r351543) @@ -6,5 +6,4 @@ and an outstanding 3D-Mode. This port installs noeGNUd for the vanilla NetHack. -Author: Clive Crous WWW: http://noegnud.sourceforge.net/ Modified: head/games/noegnud-nethack/pkg-plist ============================================================================== --- head/games/noegnud-nethack/pkg-plist Fri Apr 18 15:03:41 2014 (r351542) +++ head/games/noegnud-nethack/pkg-plist Fri Apr 18 15:05:06 2014 (r351543) @@ -1,5 +1,7 @@ bin/noegnud-0.8.0-nethack-3.4.3 bin/noegnud-nethack-3.4.3 +@owner games +@group bin share/noegnud-0.8.0/nethack-3.4.3/license share/noegnud-0.8.0/nethack-3.4.3/logfile share/noegnud-0.8.0/nethack-3.4.3/nhdat @@ -7,7 +9,7 @@ share/noegnud-0.8.0/nethack-3.4.3/noegnu share/noegnud-0.8.0/nethack-3.4.3/perm share/noegnud-0.8.0/nethack-3.4.3/record share/noegnud-0.8.0/nethack-3.4.3/recover -@exec chown games:bin %D/share/noegnud-0.8.0/nethack-3.4.3 +@exec chown root:wheel %D/share/noegnud-0.8.0 @exec chmod 775 %D/share/noegnud-0.8.0/nethack-3.4.3 @dirrmtry share/noegnud-0.8.0/nethack-3.4.3/save @dirrmtry share/noegnud-0.8.0/nethack-3.4.3