Date: Fri, 18 Apr 2014 17:28:40 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351553 - in branches/2014Q2/games/noegnud-nethack-deet: . files Message-ID: <201404181728.s3IHSeK3059675@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Fri Apr 18 17:28:40 2014 New Revision: 351553 URL: http://svnweb.freebsd.org/changeset/ports/351553 QAT: https://qat.redports.org/buildarchive/r351553/ Log: MFH: r351540 - Fix build on 10+ (bmake does not support -E option) - Add staging support - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on homepage Approved by: portmgr (bdrewery) Modified: branches/2014Q2/games/noegnud-nethack-deet/Makefile branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile branches/2014Q2/games/noegnud-nethack-deet/pkg-descr branches/2014Q2/games/noegnud-nethack-deet/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/noegnud-nethack-deet/Makefile ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/Makefile Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/Makefile Fri Apr 18 17:28:40 2014 (r351553) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for Nethack with RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison fmake +USES= bison 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= nh342-dt INSTALL_TARGET= install_nh342-dt MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include <bsd.port.pre.mk> pre-everything:: @@ -46,6 +44,11 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.2-deet) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-nethack-deet.patch) + @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${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.2-deet/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-nethack-3.4.2-deet/Makefile) Modified: branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/files/patch-variants::Makefile Fri Apr 18 17:28:40 2014 (r351553) @@ -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:03:58.205085570 +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 - - install_nh343: nh343 -- make -e -C $(NOEGNUDVERSION)-nethack-3.4.3 install -+ make -EPREFIX -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 +@@ -86,7 +86,7 @@ + make -e -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 ++ make -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install # data Modified: branches/2014Q2/games/noegnud-nethack-deet/pkg-descr ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/pkg-descr Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/pkg-descr Fri Apr 18 17:28:40 2014 (r351553) @@ -6,5 +6,4 @@ and an outstanding 3D-Mode. This port installs noeGNUd for NetHack with DeeT's hack font patch. -Author: Clive Crous WWW: http://noegnud.sourceforge.net/ Modified: branches/2014Q2/games/noegnud-nethack-deet/pkg-plist ============================================================================== --- branches/2014Q2/games/noegnud-nethack-deet/pkg-plist Fri Apr 18 17:24:46 2014 (r351552) +++ branches/2014Q2/games/noegnud-nethack-deet/pkg-plist Fri Apr 18 17:28:40 2014 (r351553) @@ -1,5 +1,7 @@ bin/noegnud-0.8.0-nethack-3.4.2-deet bin/noegnud-nethack-3.4.2-deet +@owner games +@group bin share/noegnud-0.8.0/nethack-3.4.2-deet/license share/noegnud-0.8.0/nethack-3.4.2-deet/logfile share/noegnud-0.8.0/nethack-3.4.2-deet/nhdat @@ -7,7 +9,7 @@ share/noegnud-0.8.0/nethack-3.4.2-deet/n share/noegnud-0.8.0/nethack-3.4.2-deet/perm share/noegnud-0.8.0/nethack-3.4.2-deet/record share/noegnud-0.8.0/nethack-3.4.2-deet/recover -@exec chown games:bin %D/share/noegnud-0.8.0/nethack-3.4.2-deet +@exec chown root:wheel %D/share/noegnud-0.8.0 @exec chmod 775 %D/share/noegnud-0.8.0/nethack-3.4.2-deet @dirrmtry share/noegnud-0.8.0/nethack-3.4.2-deet/save @dirrmtry share/noegnud-0.8.0/nethack-3.4.2-deet
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404181728.s3IHSeK3059675>