Date: Sat, 23 Jan 2010 14:59:16 +0100 From: Bernhard Froehlich <decke@bluelife.at> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/143119: [PATCH] games/trophy: update to 1.1.5 Message-ID: <20100123145916.4deffaea@bluelife.at> Resent-Message-ID: <201001231400.o0NE0C1t011207@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 143119
>Category: ports
>Synopsis: [PATCH] games/trophy: update to 1.1.5
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 23 14:00:11 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Bernhard Froehlich
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD chii.bluelife.at 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Jan 8 09:39:23 CET
>Description:
- Update to 1.1.5
- Cleanup port Makefile and remove not needed post-patch
- Add DESKTOP_ENTRIES
Removed file(s):
- files/patch-trophy__Makefile.in
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- trophy-1.1.5.patch begins here ---
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/games/trophy.old/Makefile /usr/ports/games/trophy/Makefile
--- /usr/ports/games/trophy.old/Makefile 2009-08-27 20:31:06.000000000 +0200
+++ /usr/ports/games/trophy/Makefile 2010-01-23 14:19:44.000000000 +0100
@@ -7,8 +7,7 @@
#
PORTNAME= trophy
-PORTVERSION= 1.1.4
-PORTREVISION= 1
+PORTVERSION= 1.1.5
CATEGORIES= games
MASTER_SITES= SF
@@ -17,38 +16,21 @@
LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib
-USE_GMAKE= yes
-MAKEFILE= Makefile.in
-BUILD_WRKSRC= ${WRKSRC}/trophy
-CXXFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-
-post-patch:
- @${REINPLACE_CMD} -e 's/std::sqrt/sqrt/' ${BUILD_WRKSRC}/caimagemanipulation.cpp \
- ${BUILD_WRKSRC}/catrophy.cpp ${BUILD_WRKSRC}/camath.cpp
- @${REINPLACE_CMD} -e 's|resources.xml|${DATADIR}/resources.xml|' \
- ${BUILD_WRKSRC}/caresources.cpp
- @${REINPLACE_CMD} -e 's|@prefix@|${PREFIX}|; \
- s|@exec_prefix@|$${PREFIX}/bin|; \
- s|@datadir@|${DATADIR}|; \
- s|@bindir@|$${PREFIX}/bin|; \
- s|EXTERN_LIBS =|EXTERN_LIBS = ${PTHREAD_LIBS}|;' \
- ${BUILD_WRKSRC}/Makefile.in
-
-do-install:
- ${MKDIR} ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/trophy ${PREFIX}/bin
- ${MKDIR} ${DATADIR}
- ${INSTALL_DATA} ${BUILD_WRKSRC}/resources.xml ${DATADIR}
- ${CP} -R ${BUILD_WRKSRC}/resources ${DATADIR}
+HAS_CONFIGURE= yes
+PORTDOCS= AUTHORS COPYING ChangeLog README TODO
+
+CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --prefix="${PREFIX}" --exec-prefix="${PREFIX}"
+
+DESKTOP_ENTRIES="Trophy" "${COMMENT}" "" "trophy" "Application;Game;" false
+
+post-install:
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} \
- ${WRKSRC}/AUTHORS \
- ${WRKSRC}/COPYING \
- ${WRKSRC}/ChangeLog \
- ${WRKSRC}/README \
- ${WRKSRC}/TODO \
- ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
+.for doc in ${PORTDOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+.endfor
.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/games/trophy.old/distinfo /usr/ports/games/trophy/distinfo
--- /usr/ports/games/trophy.old/distinfo 2007-09-10 01:31:02.000000000 +0200
+++ /usr/ports/games/trophy/distinfo 2010-01-20 22:41:29.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (trophy-1.1.4.tar.gz) = 5a2a50f2a6f64317f9c7a889fae74e05
-SHA256 (trophy-1.1.4.tar.gz) = 7c5ff8d59f31ec27b96e1759a4f9666be7802f134d258b213b5dc2a3983959d4
-SIZE (trophy-1.1.4.tar.gz) = 9850758
+MD5 (trophy-1.1.5.tar.gz) = bf62269cacf794e087ac88f0e39f54c1
+SHA256 (trophy-1.1.5.tar.gz) = bf654a28027c62b36b39c3a23d2d7396b4afa7edbc1377595a99a18a30c26bfe
+SIZE (trophy-1.1.5.tar.gz) = 14402714
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/games/trophy.old/files/patch-trophy__Makefile.in /usr/ports/games/trophy/files/patch-trophy__Makefile.in
--- /usr/ports/games/trophy.old/files/patch-trophy__Makefile.in 2007-09-19 06:37:10.000000000 +0200
+++ /usr/ports/games/trophy/files/patch-trophy__Makefile.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- trophy/Makefile.in.orig Wed Sep 19 14:30:23 2007
-+++ trophy/Makefile.in Wed Sep 19 14:31:48 2007
-@@ -56,7 +56,7 @@
- $(CXX) $(EXTERN_LIBS) -o trophy $(OBJF)
-
- %.o : %.cpp
-- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(HEADERS) -O0 -g -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@
-+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(HEADERS) -O0 -g -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@
-
- doc :
- @echo "Building documentation"
diff -ruN --exclude=CVS --exclude=.svn /usr/ports/games/trophy.old/pkg-plist /usr/ports/games/trophy/pkg-plist
--- /usr/ports/games/trophy.old/pkg-plist 2007-09-10 01:31:02.000000000 +0200
+++ /usr/ports/games/trophy/pkg-plist 2010-01-23 14:15:00.000000000 +0100
@@ -1,139 +1,138 @@
bin/trophy
+%%DATADIR%%/cars/dust.tga
+%%DATADIR%%/cars/flash2/surface.tga
+%%DATADIR%%/cars/flash2/surface3d.tga
+%%DATADIR%%/cars/jeep/surface.tga
+%%DATADIR%%/cars/jeep/surface3d.tga
+%%DATADIR%%/cars/vw/surface.tga
+%%DATADIR%%/cars/vw/surface3d.tga
+%%DATADIR%%/cars/z3/surface.tga
+%%DATADIR%%/cars/z3/surface3d.tga
+%%DATADIR%%/fonts/lcd_13_green.tga
+%%DATADIR%%/fonts/normal_11_white.tga
+%%DATADIR%%/fonts/normal_14_white.tga
+%%DATADIR%%/fonts/normal_22_gray.tga
+%%DATADIR%%/fonts/normal_22_white.tga
+%%DATADIR%%/fonts/normal_8_white.tga
+%%DATADIR%%/goody/bullets.tga
+%%DATADIR%%/goody/fogbomb.tga
+%%DATADIR%%/goody/life.tga
+%%DATADIR%%/goody/money.tga
+%%DATADIR%%/goody/turbo.tga
+%%DATADIR%%/gui/arrow_b.tga
+%%DATADIR%%/gui/arrow_l.tga
+%%DATADIR%%/gui/arrow_r.tga
+%%DATADIR%%/gui/arrow_t.tga
+%%DATADIR%%/gui/border1.tga
+%%DATADIR%%/gui/border2.tga
+%%DATADIR%%/gui/border3.tga
+%%DATADIR%%/gui/border4.tga
+%%DATADIR%%/gui/button.tga
+%%DATADIR%%/gui/edge1.tga
+%%DATADIR%%/gui/edge2.tga
+%%DATADIR%%/gui/edge3.tga
+%%DATADIR%%/gui/edge4.tga
+%%DATADIR%%/gui/loading.tga
+%%DATADIR%%/gui/progressbar.tga
+%%DATADIR%%/menu/bar.tga
+%%DATADIR%%/menu/bg.tga
+%%DATADIR%%/menu/cursorani.tga
+%%DATADIR%%/misc/carfire.tga
+%%DATADIR%%/misc/caution.tga
+%%DATADIR%%/misc/checkflag.tga
+%%DATADIR%%/misc/cross.tga
+%%DATADIR%%/misc/dust.tga
+%%DATADIR%%/misc/fog.tga
+%%DATADIR%%/misc/gunfire.tga
+%%DATADIR%%/misc/hitpoint.tga
+%%DATADIR%%/misc/info.tga
+%%DATADIR%%/misc/light.tga
+%%DATADIR%%/misc/verticalbar.tga
+%%DATADIR%%/panel/button.tga
+%%DATADIR%%/panel/death.tga
+%%DATADIR%%/panel/infoview.tga
+%%DATADIR%%/panel/label.tga
+%%DATADIR%%/panel/life.tga
+%%DATADIR%%/panel/speed.tga
+%%DATADIR%%/panel/turbo.tga
+%%DATADIR%%/panel/turbolabel.tga
%%DATADIR%%/resources.xml
-%%DATADIR%%/resources/cars/dust.tga
-%%DATADIR%%/resources/cars/flash2/surface.tga
-%%DATADIR%%/resources/cars/flash2/surface3d.tga
-%%DATADIR%%/resources/cars/jeep/surface.tga
-%%DATADIR%%/resources/cars/jeep/surface3d.tga
-%%DATADIR%%/resources/cars/vw/surface.tga
-%%DATADIR%%/resources/cars/vw/surface3d.tga
-%%DATADIR%%/resources/cars/z3/surface.tga
-%%DATADIR%%/resources/cars/z3/surface3d.tga
-%%DATADIR%%/resources/fonts/lcd_13_green.tga
-%%DATADIR%%/resources/fonts/normal_11_white.tga
-%%DATADIR%%/resources/fonts/normal_14_white.tga
-%%DATADIR%%/resources/fonts/normal_22_gray.tga
-%%DATADIR%%/resources/fonts/normal_22_white.tga
-%%DATADIR%%/resources/fonts/normal_8_white.tga
-%%DATADIR%%/resources/goody/bullets.tga
-%%DATADIR%%/resources/goody/fogbomb.tga
-%%DATADIR%%/resources/goody/life.tga
-%%DATADIR%%/resources/goody/money.tga
-%%DATADIR%%/resources/goody/turbo.tga
-%%DATADIR%%/resources/gui/arrow_b.tga
-%%DATADIR%%/resources/gui/arrow_l.tga
-%%DATADIR%%/resources/gui/arrow_r.tga
-%%DATADIR%%/resources/gui/arrow_t.tga
-%%DATADIR%%/resources/gui/border1.tga
-%%DATADIR%%/resources/gui/border2.tga
-%%DATADIR%%/resources/gui/border3.tga
-%%DATADIR%%/resources/gui/border4.tga
-%%DATADIR%%/resources/gui/button.tga
-%%DATADIR%%/resources/gui/edge1.tga
-%%DATADIR%%/resources/gui/edge2.tga
-%%DATADIR%%/resources/gui/edge3.tga
-%%DATADIR%%/resources/gui/edge4.tga
-%%DATADIR%%/resources/gui/loading.tga
-%%DATADIR%%/resources/gui/progressbar.tga
-%%DATADIR%%/resources/menu/bar.tga
-%%DATADIR%%/resources/menu/bg.tga
-%%DATADIR%%/resources/menu/cursorani.tga
-%%DATADIR%%/resources/misc/carfire.tga
-%%DATADIR%%/resources/misc/caution.tga
-%%DATADIR%%/resources/misc/checkflag.tga
-%%DATADIR%%/resources/misc/cross.tga
-%%DATADIR%%/resources/misc/dust.tga
-%%DATADIR%%/resources/misc/fog.tga
-%%DATADIR%%/resources/misc/gunfire.tga
-%%DATADIR%%/resources/misc/hitpoint.tga
-%%DATADIR%%/resources/misc/info.tga
-%%DATADIR%%/resources/misc/light.tga
-%%DATADIR%%/resources/misc/verticalbar.tga
-%%DATADIR%%/resources/panel/button.tga
-%%DATADIR%%/resources/panel/death.tga
-%%DATADIR%%/resources/panel/infoview.tga
-%%DATADIR%%/resources/panel/label.tga
-%%DATADIR%%/resources/panel/life.tga
-%%DATADIR%%/resources/panel/speed.tga
-%%DATADIR%%/resources/panel/turbo.tga
-%%DATADIR%%/resources/panel/turbolabel.tga
-%%DATADIR%%/resources/sounds/background01.wav
-%%DATADIR%%/resources/sounds/carhorn.wav
-%%DATADIR%%/resources/sounds/crash.wav
-%%DATADIR%%/resources/sounds/dog.wav
-%%DATADIR%%/resources/sounds/engine.wav
-%%DATADIR%%/resources/sounds/fire.wav
-%%DATADIR%%/resources/sounds/fogbomb.wav
-%%DATADIR%%/resources/sounds/goody.wav
-%%DATADIR%%/resources/sounds/goody_bullets.wav
-%%DATADIR%%/resources/sounds/goody_fogbomb.wav
-%%DATADIR%%/resources/sounds/goody_life.wav
-%%DATADIR%%/resources/sounds/goody_money.wav
-%%DATADIR%%/resources/sounds/goody_turbo.wav
-%%DATADIR%%/resources/sounds/light.wav
-%%DATADIR%%/resources/sounds/menu.wav
-%%DATADIR%%/resources/sounds/selector.wav
-%%DATADIR%%/resources/sounds/shoot.wav
-%%DATADIR%%/resources/sounds/shot.wav
-%%DATADIR%%/resources/sounds/slide.wav
-%%DATADIR%%/resources/tracks/Downtown/bridge.tga
-%%DATADIR%%/resources/tracks/Downtown/config.tck
-%%DATADIR%%/resources/tracks/Downtown/fmap.tga
-%%DATADIR%%/resources/tracks/Downtown/thumb.tga
-%%DATADIR%%/resources/tracks/Downtown/vmap.tga
-%%DATADIR%%/resources/tracks/Loops/bridge.tga
-%%DATADIR%%/resources/tracks/Loops/config.tck
-%%DATADIR%%/resources/tracks/Loops/fmap.tga
-%%DATADIR%%/resources/tracks/Loops/thumb.tga
-%%DATADIR%%/resources/tracks/Loops/vmap.tga
-%%DATADIR%%/resources/tracks/Moon/bridge.tga
-%%DATADIR%%/resources/tracks/Moon/config.tck
-%%DATADIR%%/resources/tracks/Moon/fmap.tga
-%%DATADIR%%/resources/tracks/Moon/thumb.tga
-%%DATADIR%%/resources/tracks/Moon/vmap.tga
-%%DATADIR%%/resources/tracks/Rally/config.tck
-%%DATADIR%%/resources/tracks/Rally/fmap.tga
-%%DATADIR%%/resources/tracks/Rally/thumb.tga
-%%DATADIR%%/resources/tracks/Rally/vmap.tga
-%%DATADIR%%/resources/tracks/Snake/bridge.tga
-%%DATADIR%%/resources/tracks/Snake/config.tck
-%%DATADIR%%/resources/tracks/Snake/fmap.tga
-%%DATADIR%%/resources/tracks/Snake/thumb.tga
-%%DATADIR%%/resources/tracks/Snake/vmap.tga
-%%DATADIR%%/resources/tracks/Zigzag/bridge.tga
-%%DATADIR%%/resources/tracks/Zigzag/config.tck
-%%DATADIR%%/resources/tracks/Zigzag/fmap.tga
-%%DATADIR%%/resources/tracks/Zigzag/thumb.tga
-%%DATADIR%%/resources/tracks/Zigzag/vmap.tga
-%%DATADIR%%/resources/tracks/Zurich/config.tck
-%%DATADIR%%/resources/tracks/Zurich/fmap.tga
-%%DATADIR%%/resources/tracks/Zurich/thumb.tga
-%%DATADIR%%/resources/tracks/Zurich/vmap.tga
-@dirrm %%DATADIR%%/resources/cars/flash2
-@dirrm %%DATADIR%%/resources/cars/jeep
-@dirrm %%DATADIR%%/resources/cars/vw
-@dirrm %%DATADIR%%/resources/cars/z3
-@dirrm %%DATADIR%%/resources/cars
-@dirrm %%DATADIR%%/resources/fonts
-@dirrm %%DATADIR%%/resources/goody
-@dirrm %%DATADIR%%/resources/gui
-@dirrm %%DATADIR%%/resources/menu
-@dirrm %%DATADIR%%/resources/misc
-@dirrm %%DATADIR%%/resources/panel
-@dirrm %%DATADIR%%/resources/sounds
-@dirrm %%DATADIR%%/resources/tracks/Downtown
-@dirrm %%DATADIR%%/resources/tracks/Loops
-@dirrm %%DATADIR%%/resources/tracks/Moon
-@dirrm %%DATADIR%%/resources/tracks/Rally
-@dirrm %%DATADIR%%/resources/tracks/Snake
-@dirrm %%DATADIR%%/resources/tracks/Zigzag
-@dirrm %%DATADIR%%/resources/tracks/Zurich
-@dirrm %%DATADIR%%/resources/tracks
-@dirrm %%DATADIR%%/resources
-@dirrm share/trophy
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/sounds/background01.wav
+%%DATADIR%%/sounds/carhorn.wav
+%%DATADIR%%/sounds/crash.wav
+%%DATADIR%%/sounds/dog.wav
+%%DATADIR%%/sounds/engine.wav
+%%DATADIR%%/sounds/fire.wav
+%%DATADIR%%/sounds/fogbomb.wav
+%%DATADIR%%/sounds/goody.wav
+%%DATADIR%%/sounds/goody_bullets.wav
+%%DATADIR%%/sounds/goody_fogbomb.wav
+%%DATADIR%%/sounds/goody_life.wav
+%%DATADIR%%/sounds/goody_money.wav
+%%DATADIR%%/sounds/goody_turbo.wav
+%%DATADIR%%/sounds/light.wav
+%%DATADIR%%/sounds/menu.wav
+%%DATADIR%%/sounds/selector.wav
+%%DATADIR%%/sounds/shoot.wav
+%%DATADIR%%/sounds/shot.wav
+%%DATADIR%%/sounds/slide.wav
+%%DATADIR%%/tracks/Downtown/bridge.tga
+%%DATADIR%%/tracks/Downtown/config.tck
+%%DATADIR%%/tracks/Downtown/fmap.tga
+%%DATADIR%%/tracks/Downtown/thumb.tga
+%%DATADIR%%/tracks/Downtown/vmap.tga
+%%DATADIR%%/tracks/Industrial/bridge.tga
+%%DATADIR%%/tracks/Industrial/config.tck
+%%DATADIR%%/tracks/Industrial/fmap.tga
+%%DATADIR%%/tracks/Industrial/thumb.tga
+%%DATADIR%%/tracks/Industrial/vmap.tga
+%%DATADIR%%/tracks/Loops/bridge.tga
+%%DATADIR%%/tracks/Loops/config.tck
+%%DATADIR%%/tracks/Loops/fmap.tga
+%%DATADIR%%/tracks/Loops/thumb.tga
+%%DATADIR%%/tracks/Loops/vmap.tga
+%%DATADIR%%/tracks/Moon/bridge.tga
+%%DATADIR%%/tracks/Moon/config.tck
+%%DATADIR%%/tracks/Moon/fmap.tga
+%%DATADIR%%/tracks/Moon/thumb.tga
+%%DATADIR%%/tracks/Moon/vmap.tga
+%%DATADIR%%/tracks/Rally/config.tck
+%%DATADIR%%/tracks/Rally/fmap.tga
+%%DATADIR%%/tracks/Rally/thumb.tga
+%%DATADIR%%/tracks/Rally/vmap.tga
+%%DATADIR%%/tracks/Snake/bridge.tga
+%%DATADIR%%/tracks/Snake/config.tck
+%%DATADIR%%/tracks/Snake/fmap.tga
+%%DATADIR%%/tracks/Snake/thumb.tga
+%%DATADIR%%/tracks/Snake/vmap.tga
+%%DATADIR%%/tracks/Zigzag/bridge.tga
+%%DATADIR%%/tracks/Zigzag/config.tck
+%%DATADIR%%/tracks/Zigzag/fmap.tga
+%%DATADIR%%/tracks/Zigzag/thumb.tga
+%%DATADIR%%/tracks/Zigzag/vmap.tga
+%%DATADIR%%/tracks/Zurich/config.tck
+%%DATADIR%%/tracks/Zurich/fmap.tga
+%%DATADIR%%/tracks/Zurich/thumb.tga
+%%DATADIR%%/tracks/Zurich/vmap.tga
+@dirrm %%DATADIR%%/tracks/Zurich
+@dirrm %%DATADIR%%/tracks/Zigzag
+@dirrm %%DATADIR%%/tracks/Snake
+@dirrm %%DATADIR%%/tracks/Rally
+@dirrm %%DATADIR%%/tracks/Moon
+@dirrm %%DATADIR%%/tracks/Loops
+@dirrm %%DATADIR%%/tracks/Industrial
+@dirrm %%DATADIR%%/tracks/Downtown
+@dirrm %%DATADIR%%/tracks
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/panel
+@dirrm %%DATADIR%%/misc
+@dirrm %%DATADIR%%/menu
+@dirrm %%DATADIR%%/gui
+@dirrm %%DATADIR%%/goody
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/cars/z3
+@dirrm %%DATADIR%%/cars/vw
+@dirrm %%DATADIR%%/cars/jeep
+@dirrm %%DATADIR%%/cars/flash2
+@dirrm %%DATADIR%%/cars
+@dirrm %%DATADIR%%
--- trophy-1.1.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100123145916.4deffaea>