From owner-svn-ports-all@FreeBSD.ORG Wed Apr 16 15:26:08 2014 Return-Path: Delivered-To: svn-ports-all@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 C7C8D84F; Wed, 16 Apr 2014 15:26:08 +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 B3D3B1B47; Wed, 16 Apr 2014 15:26:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3GFQ8JX084655; Wed, 16 Apr 2014 15:26:08 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3GFQ7tZ084648; Wed, 16 Apr 2014 15:26:07 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404161526.s3GFQ7tZ084648@svn.freebsd.org> From: Pawel Pekala Date: Wed, 16 Apr 2014 15:26:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r351397 - in branches/2014Q2/games/noegnud-littlehack: . files X-SVN-Group: ports-branches 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2014 15:26:08 -0000 Author: pawel Date: Wed Apr 16 15:26:07 2014 New Revision: 351397 URL: http://svnweb.freebsd.org/changeset/ports/351397 QAT: https://qat.redports.org/buildarchive/r351397/ Log: MFH: r351386 - Add staging support - Fix build on 10+, bmake does not support -E option - Convert to USES=tar:bzip2 - Remove Author tag from pkg-descr, info available on homepage Approved by: portmgr (erwin) Modified: branches/2014Q2/games/noegnud-littlehack/Makefile branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile branches/2014Q2/games/noegnud-littlehack/pkg-descr branches/2014Q2/games/noegnud-littlehack/pkg-plist Directory Properties: branches/2014Q2/ (props changed) Modified: branches/2014Q2/games/noegnud-littlehack/Makefile ============================================================================== --- branches/2014Q2/games/noegnud-littlehack/Makefile Wed Apr 16 15:23:10 2014 (r351396) +++ branches/2014Q2/games/noegnud-littlehack/Makefile Wed Apr 16 15:26:07 2014 (r351397) @@ -18,18 +18,16 @@ COMMENT= The noeGNUd UI for the LittleHa RUN_DEPENDS= ${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data NOEGNUDVERSION= ${PORTNAME}-0.8.0 -USES= bison +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= lh001 INSTALL_TARGET= install_lh001 MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes .include pre-everything:: @@ -46,7 +44,11 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-littlehack-0.0.1) @(${PATCH} ${PATCH_ARGS} < ${FILESDIR}/noegnud-littlehack.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}-littlehack-0.0.1/sys/unix/Makefile.top do-configure: (cd ${WRKSRC} && ${MAKE} ${NOEGNUDVERSION}-littlehack-0.0.1/Makefile) Modified: branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile ============================================================================== --- branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile Wed Apr 16 15:23:10 2014 (r351396) +++ branches/2014Q2/games/noegnud-littlehack/files/patch-variants::Makefile Wed Apr 16 15:26:07 2014 (r351397) @@ -1,55 +1,24 @@ ---- variants/Makefile.orig Mon Aug 23 12:13:51 2004 -+++ variants/Makefile Sun Nov 21 00:49:21 2004 -@@ -1,7 +1,6 @@ +--- variants/Makefile.orig 2004-08-23 19:13:51.000000000 +0200 ++++ variants/Makefile 2014-04-15 14:55:14.044062891 +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 +@@ -83,7 +83,7 @@ + make -e -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 ++ make -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 - -@@ -204,7 +203,7 @@ + make -e -C $(NOEGNUDVERSION)-nethack-3.4.2-deet install +@@ -204,7 +204,7 @@ patch -p0