Attachment 111717 Details for Bug 153025 – file.diff

[patch] file.diff

file.diff (text/plain), 9.73 KB, created by Max Brazhnikov on 2010-12-11 21:30:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Max Brazhnikov

Created: 2010-12-11 21:30:15 UTC

Size: 9.73 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/games/tbe/Makefile,v
>retrieving revision 1.1
>diff -u -r1.1 Makefile
>--- Makefile	8 Nov 2010 21:46:57 -0000	1.1
>+++ Makefile	11 Dec 2010 20:53:01 -0000
>@@ -6,11 +6,10 @@
> #
> 
> PORTNAME=	tbe
>-PORTVERSION=	M7
>+PORTVERSION=	8.2
> CATEGORIES=	games
>-MASTER_SITES=	SF
>-MASTER_SITE_SUBDIR=	${PORTNAME}/Milestone%20${PORTVERSION:S/M//}
>-DISTNAME=	TheButterflyEffect-${PORTVERSION}.src
>+MASTER_SITES=	SF/${PORTNAME}/Milestone%20${PORTVERSION}
>+DISTNAME=	TheButterflyEffect-m${PORTVERSION}.src
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	johans@FreeBSD.org
>@@ -20,22 +19,28 @@
> 
> USE_GMAKE=	yes
> USE_QT_VER=	4
>-QT_COMPONENTS=	qmake corelib gui moc rcc svg uic xml
>-WRKSRC=		${WRKDIR}/TheButterflyEffect-${PORTVERSION}
>+QT_COMPONENTS=	qmake_build corelib gui moc_build rcc_build svg uic_build xml
>+MAKE_JOBS_SAFE=	yes
>+WRKSRC=		${WRKDIR}/TheButterflyEffect-m${PORTVERSION}
>+
>+DESKTOP_ENTRIES="The Butterfly Effect" "Inspired by The Incredible Machine" \
>+		"${DATADIR}/images/tbe-icon.png" \
>+		"${PREFIX}/bin/tbe" "Application;LogicGame;Game;" false
> 
> post-patch:
> 		@${REINPLACE_CMD} 's/ make/ ${GMAKE}/' \
> 			${WRKSRC}/3rdParty/Makefile
> 		@${REINPLACE_CMD} 's/debug/release link_prl/' ${WRKSRC}/tbe.pro
>-		@${REINPLACE_CMD} 's:BINARY_DIRECTORY+":"${DATADIR}:' \
>-			${WRKSRC}/src/tbe_global.h
>+		@${SED} 's:%%DATADIR:QString("${DATADIR}"):'  \
>+			${WRKSRC}/src/tbe_global.h.in > ${WRKSRC}/src/tbe_global.h
> 
> pre-build:
> 		# This is supposedly done by the ./configure script
> 		@cd ${WRKSRC}/3rdParty && ${GMAKE}
>-		@cd ${WRKSRC} && ${QMAKE}
>+		@cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS}
> 
> do-install:
>+		@${MKDIR} ${PREFIX}/bin
> 		@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
> 		@${MKDIR} ${DATADIR}
> 		@cd ${WRKSRC} && ${PAX} -rw images levels ${DATADIR}
>Index: distinfo
>===================================================================
>RCS file: /home/pcvs/ports/games/tbe/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- distinfo	8 Nov 2010 21:46:57 -0000	1.1
>+++ distinfo	11 Dec 2010 20:26:24 -0000
>@@ -1,2 +1,2 @@
>-SHA256 (TheButterflyEffect-M7.src.tgz) = 45c08f886c59ebc8efd0aa8ae43b17ebc0cacb1274e290a82b7fc1e9a1ca0652
>-SIZE (TheButterflyEffect-M7.src.tgz) = 4853165
>+SHA256 (TheButterflyEffect-m8.2.src.tgz) = a04d59619939947836aa8a2b982d8334a15fd624d76d98abbbf4e6c2e1eedde8
>+SIZE (TheButterflyEffect-m8.2.src.tgz) = 6737571
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/games/tbe/pkg-plist,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-plist
>--- pkg-plist	8 Nov 2010 21:46:57 -0000	1.1
>+++ pkg-plist	11 Dec 2010 20:55:44 -0000
>@@ -8,19 +8,41 @@
> %%DATADIR%%/images/ActionResizeVerti.svg
> %%DATADIR%%/images/ActionRotate.svg
> %%DATADIR%%/images/ActionUndo.svg
>+%%DATADIR%%/images/Anonymous_daffodil.klaas.svg
>+%%DATADIR%%/images/Balloon.svg
>+%%DATADIR%%/images/BalloonPoof.svg
>+%%DATADIR%%/images/BalloonRest.svg
>+%%DATADIR%%/images/BedOfNails.svg
> %%DATADIR%%/images/BigCross.svg
> %%DATADIR%%/images/BowlingBall.png
>-%%DATADIR%%/images/Bowling_Pin.svg
>-%%DATADIR%%/images/Butterfly.svg
>-%%DATADIR%%/images/CokeMentosBottle.svg
>+%%DATADIR%%/images/BowlingPin.svg
>+%%DATADIR%%/images/ButterflyHalfOpen.svg
>+%%DATADIR%%/images/ButterflyOpen.svg
>+%%DATADIR%%/images/ButterflyStill.svg
>+%%DATADIR%%/images/Cactus.svg
>+%%DATADIR%%/images/CokeBottleBlowing.svg
>+%%DATADIR%%/images/CokeBottleEmpty.svg
>+%%DATADIR%%/images/CokeBottleFoaming.svg
>+%%DATADIR%%/images/CokeBottleNormal.svg
> %%DATADIR%%/images/CokeSplatter.svg
>+%%DATADIR%%/images/CustomBall.svg
> %%DATADIR%%/images/Domino-Stone-Red.svg
> %%DATADIR%%/images/DominoBlue.svg
> %%DATADIR%%/images/DominoGreen.svg
> %%DATADIR%%/images/DominoRed.svg
>+%%DATADIR%%/images/Empty.svg
>+%%DATADIR%%/images/IconBold.svg
>+%%DATADIR%%/images/IconItalics.svg
>+%%DATADIR%%/images/IconModified.svg
>+%%DATADIR%%/images/IconNewline.svg
>+%%DATADIR%%/images/LeftRamp.svg
> %%DATADIR%%/images/NotFound.svg
>+%%DATADIR%%/images/PolyObject.svg
> %%DATADIR%%/images/PostIt.svg
> %%DATADIR%%/images/README
>+%%DATADIR%%/images/RectObject.svg
>+%%DATADIR%%/images/RightRamp.svg
>+%%DATADIR%%/images/Scenery.svg
> %%DATADIR%%/images/Skyhook.svg
> %%DATADIR%%/images/SoccerBall.png
> %%DATADIR%%/images/StartStopWatch.svg
>@@ -30,37 +52,37 @@
> %%DATADIR%%/images/ToRight.png
> %%DATADIR%%/images/VolleyBall.svg
> %%DATADIR%%/images/Weight.svg
>+%%DATADIR%%/images/basket.svg
> %%DATADIR%%/images/birch_bar.png
>+%%DATADIR%%/images/brass-pin.svg
> %%DATADIR%%/images/chickenwire-texture.svg
>+%%DATADIR%%/images/coke-crate.svg
> %%DATADIR%%/images/congrat-death-border.svg
>+%%DATADIR%%/images/goal-scenery.svg
>+%%DATADIR%%/images/i-beam.svg
> %%DATADIR%%/images/illustrations/installer-side-image.png
> %%DATADIR%%/images/illustrations/installer-top-icon.png
> %%DATADIR%%/images/illustrations/tbe-icon.png
> %%DATADIR%%/images/illustrations/tbe-icon.qrc
>-%%DATADIR%%/images/left-ramp.svg
> %%DATADIR%%/images/oldbrick.png
>-%%DATADIR%%/images/right-ramp.svg
> %%DATADIR%%/images/styrofoam.png
>+%%DATADIR%%/images/tbe-icon.ico
> %%DATADIR%%/images/tbe-icon.png
> %%DATADIR%%/images/title_page.svg
> %%DATADIR%%/images/used_wood_bar.png
>-%%DATADIR%%/levels/draft/003_jumping_around.xml
>-%%DATADIR%%/levels/draft/006_domino_day.xml
> %%DATADIR%%/levels/draft/Anonymous_Blue_bike.svg
>-%%DATADIR%%/levels/draft/Anonymous_daffodil.klaas.svg
> %%DATADIR%%/levels/draft/BottleKnot-left.svg
> %%DATADIR%%/levels/draft/BottleKnot-right.svg
>-%%DATADIR%%/levels/draft/Empty.svg
> %%DATADIR%%/levels/draft/README
> %%DATADIR%%/levels/draft/SABROG_Glass_Blue_Ball.svg
> %%DATADIR%%/levels/draft/White-to-green.svg
> %%DATADIR%%/levels/draft/agone_chains.svg
>-%%DATADIR%%/levels/draft/basket.svg
>+%%DATADIR%%/levels/draft/balloons-do-poof.xml
>+%%DATADIR%%/levels/draft/balloons-go-up.xml
> %%DATADIR%%/levels/draft/blue_bike_frame.svg
> %%DATADIR%%/levels/draft/blue_bike_wheel.svg
> %%DATADIR%%/levels/draft/bouncing_balls.xml
> %%DATADIR%%/levels/draft/bowling_pin_plays_soccer.xml
>-%%DATADIR%%/levels/draft/brass-pin.svg
> %%DATADIR%%/levels/draft/bridge-2.xml
> %%DATADIR%%/levels/draft/bridge-3.xml
> %%DATADIR%%/levels/draft/bridge_gap.xml
>@@ -72,12 +94,16 @@
> %%DATADIR%%/levels/draft/coke-powered-bike.xml
> %%DATADIR%%/levels/draft/contraption1.xml
> %%DATADIR%%/levels/draft/contraption2.xml
>+%%DATADIR%%/levels/draft/domino_day.xml
>+%%DATADIR%%/levels/draft/driver-1m.svg
>+%%DATADIR%%/levels/draft/driver-2m.svg
>+%%DATADIR%%/levels/draft/factory.xml
> %%DATADIR%%/levels/draft/find-the-message.xml
>-%%DATADIR%%/levels/draft/goal-scenery.svg
>+%%DATADIR%%/levels/draft/float-balloon-float.xml
> %%DATADIR%%/levels/draft/hammer.svg
> %%DATADIR%%/levels/draft/house_of_cards.xml
>-%%DATADIR%%/levels/draft/i-beam.svg
> %%DATADIR%%/levels/draft/imperfectbalance.xml
>+%%DATADIR%%/levels/draft/jumping_around.xml
> %%DATADIR%%/levels/draft/jumpingjack.svg
> %%DATADIR%%/levels/draft/nicubunu_White_deck_10_of_hearts.svg
> %%DATADIR%%/levels/draft/nicubunu_White_deck_2_of_spades.svg
>@@ -88,14 +114,20 @@
> %%DATADIR%%/levels/draft/pinrack.xml
> %%DATADIR%%/levels/draft/poing-poing-poing.xml
> %%DATADIR%%/levels/draft/prizes.svg
>+%%DATADIR%%/levels/draft/rope.svg
>+%%DATADIR%%/levels/draft/save-the-butterfly.xml
> %%DATADIR%%/levels/draft/skyhook.xml
>+%%DATADIR%%/levels/draft/spare-the-balloon.xml
> %%DATADIR%%/levels/draft/springboard.xml
>+%%DATADIR%%/levels/draft/steam-machine.xml
>+%%DATADIR%%/levels/draft/steam-wheel.svg
> %%DATADIR%%/levels/draft/styrofoam-left.png
> %%DATADIR%%/levels/draft/styrofoam-right.png
> %%DATADIR%%/levels/draft/styrofoam.xml
> %%DATADIR%%/levels/draft/thank-you-stone.png
> %%DATADIR%%/levels/draft/topple-the-other-way.xml
> %%DATADIR%%/levels/draft/turn-it-around.xml
>+%%DATADIR%%/levels/draft/xray2000.svg
> %%DATADIR%%/levels/elce09/001.xml
> %%DATADIR%%/levels/elce09/002.xml
> %%DATADIR%%/levels/elce09/003.xml
>@@ -106,32 +138,41 @@
> %%DATADIR%%/levels/elce09/006.xml
> %%DATADIR%%/levels/elce09/007.xml
> %%DATADIR%%/levels/elce09/Anonymous_daffodil.klaas.svg
>-%%DATADIR%%/levels/elce09/Anonymous_daffodil.svg
> %%DATADIR%%/levels/elce09/DarkerBlue.svg
> %%DATADIR%%/levels/elce09/DarkerGreen.svg
> %%DATADIR%%/levels/elce09/DarkerRed.svg
>-%%DATADIR%%/levels/elce09/Empty.svg
> %%DATADIR%%/levels/elce09/README
> %%DATADIR%%/levels/elce09/White-to-green.svg
> %%DATADIR%%/levels/elce09/Yellow-to-brown.svg
>-%%DATADIR%%/levels/elce09/basket.svg
> %%DATADIR%%/levels/elce09/black.svg
> %%DATADIR%%/levels/elce09/boulder.svg
> %%DATADIR%%/levels/elce09/brother-plays-soccer.xml
> %%DATADIR%%/levels/elce09/brother-soccer-leg.svg
> %%DATADIR%%/levels/elce09/brother-soccer.svg
> %%DATADIR%%/levels/elce09/coconut.svg
>-%%DATADIR%%/levels/elce09/coke-crate.svg
> %%DATADIR%%/levels/elce09/dream-of-flowers.svg
>-%%DATADIR%%/levels/elce09/goal-scenery.svg
> %%DATADIR%%/levels/elce09/palmtree.svg
> %%DATADIR%%/levels/elce09/right-side-frame.003.svg
> %%DATADIR%%/levels/elce09/round_coconut.svg
> %%DATADIR%%/levels/elce09/triangle.svg
>+%%DATADIR%%/levels/jumpingjack/README
>+%%DATADIR%%/levels/jumpingjack/body.png
>+%%DATADIR%%/levels/jumpingjack/elkbuntu_Blue_gift_with_golden_ribbon.svg
>+%%DATADIR%%/levels/jumpingjack/leftfoot.png
>+%%DATADIR%%/levels/jumpingjack/lefthand.png
>+%%DATADIR%%/levels/jumpingjack/leftleg.png
>+%%DATADIR%%/levels/jumpingjack/party-at-office.xml
>+%%DATADIR%%/levels/jumpingjack/rightfoot.png
>+%%DATADIR%%/levels/jumpingjack/righthand.png
>+%%DATADIR%%/levels/jumpingjack/rightleg.png
>+%%DATADIR%%/levels/jumpingjack/rope.svg
>+%%DATADIR%%/levels/jumpingjack/rope_rot.svg
>+%%DATADIR%%/levels/jumpingjack/shortballoonrope.svg
> %%DATADIR%%/levels/levels.xml
>-@dirrm %%DATADIR%%/images/illustrations
>-@dirrm %%DATADIR%%/images
>-@dirrm %%DATADIR%%/levels/draft
>+@dirrm %%DATADIR%%/levels/jumpingjack
> @dirrm %%DATADIR%%/levels/elce09
>+@dirrm %%DATADIR%%/levels/draft
> @dirrm %%DATADIR%%/levels
>+@dirrm %%DATADIR%%/images/illustrations
>+@dirrm %%DATADIR%%/images
> @dirrm %%DATADIR%%

Actions: View | Diff

Attachments on bug 153025: 111717