From owner-svn-ports-all@FreeBSD.ORG Fri Mar 14 19:22:34 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 229B49FD; Fri, 14 Mar 2014 19:22:34 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0F28C320; Fri, 14 Mar 2014 19:22:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2EJMXrl047195; Fri, 14 Mar 2014 19:22:33 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2EJMX0i047193; Fri, 14 Mar 2014 19:22:33 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201403141922.s2EJMX0i047193@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 14 Mar 2014 19:22:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348276 - in head/games/megamario: . 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-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: Fri, 14 Mar 2014 19:22:34 -0000 Author: nemysis Date: Fri Mar 14 19:22:33 2014 New Revision: 348276 URL: http://svnweb.freebsd.org/changeset/ports/348276 QAT: https://qat.redports.org/buildarchive/r348276/ Log: - Use DOS2UNIX_GLOB instead of DOS2UNIX_FILES - Fix STAGEDIR, Mega Mario now load correctly from DATADIR, change files/patch-Makefile - Mute dir install - Remove linux.txt from DOCS - Change REINPLACE, cosmetical changes - Strip executable Modified: head/games/megamario/Makefile head/games/megamario/files/patch-Makefile Modified: head/games/megamario/Makefile ============================================================================== --- head/games/megamario/Makefile Fri Mar 14 19:21:55 2014 (r348275) +++ head/games/megamario/Makefile Fri Mar 14 19:22:33 2014 (r348276) @@ -16,22 +16,20 @@ WRKSRC= ${WRKDIR}/${DISTNAME} EXTRACT_AFTER_ARGS= -d ${WRKSRC} USES= dos2unix gmake zip:infozip -DOS2UNIX_FILES= src/*.cpp src/*.h *.ini Makefile* *.txt *.desktop +DOS2UNIX_GLOB= *.cpp *.h *.ini Makefile* *.txt *.desktop USE_SDL= sdl image mixer ttf USE_GL= glu ALL_TARGET= ${PORTNAME} -MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} pre-extract: - ${MKDIR} ${WRKDIR}/${DISTNAME} - -PORTDOCS= CONTROLS.txt linux.txt readme.txt + @${MKDIR} ${WRKDIR}/${DISTNAME} +PORTDOCS= CONTROLS.txt readme.txt OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's|/usr/share/pixmaps/megamario.png|${PORTNAME}|' \ - -e 's|Name=megamario|Name=Mega Mario|' \ + @${REINPLACE_CMD} -e 's|/usr/share/pixmaps/megamario.png|${PORTNAME}|; \ + s|Name=megamario|Name=Mega Mario|' \ ${WRKSRC}/${PORTNAME}.desktop @${REINPLACE_CMD} -e 's|slidebar.PNG|slidebar.png|' \ ${WRKSRC}/data/levels/Edit2/main ${WRKSRC}/data/levels/3_2/main @@ -40,6 +38,7 @@ post-patch: ${MV} $$i `echo $$i | ${SED} -e 's/PNG/png/;s/JPG/jpg/'`; done post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .for d in help mp3music screens @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}) .endfor Modified: head/games/megamario/files/patch-Makefile ============================================================================== --- head/games/megamario/files/patch-Makefile Fri Mar 14 19:21:55 2014 (r348275) +++ head/games/megamario/files/patch-Makefile Fri Mar 14 19:22:33 2014 (r348276) @@ -1,5 +1,5 @@ ---- ./Makefile.orig 2014-01-13 00:20:07.000000000 +0100 -+++ ./Makefile 2014-01-13 00:30:43.000000000 +0100 +--- ./Makefile.orig 2014-03-14 18:14:24.974932178 +0000 ++++ ./Makefile 2014-03-14 18:19:52.624925473 +0000 @@ -1,8 +1,7 @@ -PREFIX = /home/opt DATADIR = $(PREFIX)/share/$(TARGET) @@ -11,3 +11,29 @@ DEFINES = -DDATADIR=\"$(DATADIR)/\" OBJS = src/bonus.o src/gamepad.o src/killerblume.o src/player.o \ src/bowser.o src/global.o src/levels.o src/spiny.o \ +@@ -22,17 +21,17 @@ + $(CXX) $(CXXFLAGS) $(DEFINES) -o $@ -c $< + + install: $(TARGET) +- rm -fr $(DATADIR) +- mkdir -p $(PREFIX)/bin +- mkdir -p $(PREFIX)/share +- install -p -m 755 $(TARGET) $(PREFIX)/bin +- cp -a data $(DATADIR) ++# rm -fr $(DATADIR) ++ mkdir -p $(DESTDIR)$(PREFIX)/bin ++ mkdir -p $(DESTDIR)$(PREFIX)/share ++ install -p -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin ++ cp -a data $(DESTDIR)$(DATADIR) + # fix broken permission +- chmod 755 $(DATADIR)/gfx/tiles/pipes/left +- for i in `find $(DATADIR) -name "*.PNG"`; do \ ++ chmod 755 $(DESTDIR)$(DATADIR)/gfx/tiles/pipes/left ++ for i in `find $(DESTDIR)$(DATADIR) -name "*.PNG"`; do \ + mv $$i `echo $$i|sed s/PNG/png/`; \ + done +- for i in `find $(DATADIR) -name "*.JPG"`; do \ ++ for i in `find $(DESTDIR)$(DATADIR) -name "*.JPG"`; do \ + mv $$i `echo $$i|sed s/JPG/jpg/`; \ + done +