From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 4 03:00:14 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E177916A41A for ; Sat, 4 Aug 2007 03:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D521D13C442 for ; Sat, 4 Aug 2007 03:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l7430Dve095895 for ; Sat, 4 Aug 2007 03:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l7430Dxh095894; Sat, 4 Aug 2007 03:00:13 GMT (envelope-from gnats) Date: Sat, 4 Aug 2007 03:00:13 GMT Message-Id: <200708040300.l7430Dxh095894@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Martin Tournoij Cc: Subject: Re: ports/115141: Ignore games/trophy X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Tournoij List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Aug 2007 03:00:14 -0000 The following reply was made to PR ports/115141; it has been noted by GNATS. From: Martin Tournoij To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/115141: Ignore games/trophy Date: Sat, 4 Aug 2007 04:41:06 +0200 I made these patches some time ago (Before 1.1.4 was released), but didn't submit them until now because I had some other stuff to do... Anyway, this patch will update trophy to 1.1.4 and pass maintainership to me. diff -urN --exclude CVS /ports/games/trophy.orig/Makefile trophy/Makefile --- /ports/games/trophy.orig/Makefile 2007-05-19 20:07:41.000000000 +0000 +++ trophy/Makefile 2007-08-04 03:36:57.000000000 +0000 @@ -2,46 +2,51 @@ # Date created: 22 Jan 2004 # Whom: Jean-Yves Lefort # +# $Carpetsmoker: ports/games/trophy/Makefile,v 1.3 2007/08/04 03:36:57 carpetsmoker Exp $ # $FreeBSD: ports/games/trophy/Makefile,v 1.8 2007/05/19 20:07:41 flz Exp $ # -PORTNAME= trophy -PORTVERSION= 1.1.3 -PORTREVISION= 2 -CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION}-src - -MAINTAINER= ports@FreeBSD.org -COMMENT= A single player racing game - -LIB_DEPENDS= clanCore.2:${PORTSDIR}/devel/clanlib - -USE_X_PREFIX= yes -USE_GMAKE= yes -BUILD_WRKSRC= ${WRKSRC}/trophy +PORTNAME= trophy +PORTVERSION= 1.1.4 +CATEGORIES= games +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +#MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= http://trophy.sourceforge.net/archives/ + +MAINTAINER= carpetsmoker@xs4all.nl +COMMENT= A single player racing game + +LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib + +USE_GMAKE= yes +MAKEFILE= Makefile.in +BUILD_WRKSRC= ${WRKSRC}/trophy +CXXFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -MAKE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ - PTHREAD_LIBS=${PTHREAD_LIBS} - -post-extract: - @${FIND} ${BUILD_WRKSRC}/resources -name .cvsignore -exec ${RM} -f {} \; +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.scr ${DATADIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/resources.xml ${DATADIR} ${CP} -R ${BUILD_WRKSRC}/resources ${DATADIR} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} \ ${WRKSRC}/AUTHORS \ + ${WRKSRC}/COPYING \ ${WRKSRC}/ChangeLog \ - ${WRKSRC}/ChangeLog.old \ ${WRKSRC}/README \ ${WRKSRC}/TODO \ ${DOCSDIR} diff -urN --exclude CVS /ports/games/trophy.orig/distinfo trophy/distinfo --- /ports/games/trophy.orig/distinfo 2006-01-22 11:18:45.000000000 +0000 +++ trophy/distinfo 2007-08-04 03:35:41.000000000 +0000 @@ -1,3 +1,3 @@ -MD5 (trophy-1.1.3-src.tar.gz) = 45a8c6eec9ab5d110660a32416d1ec8f -SHA256 (trophy-1.1.3-src.tar.gz) = 9f57bc77587b485f7eeb2948bfcb12d3e03c85b86c8b148c49a410df2a433871 -SIZE (trophy-1.1.3-src.tar.gz) = 9330835 +MD5 (trophy-1.1.4.tar.gz) = 5a2a50f2a6f64317f9c7a889fae74e05 +SHA256 (trophy-1.1.4.tar.gz) = 7c5ff8d59f31ec27b96e1759a4f9666be7802f134d258b213b5dc2a3983959d4 +SIZE (trophy-1.1.4.tar.gz) = 9850758 diff -urN --exclude CVS /ports/games/trophy.orig/files/patch-trophy::Makefile trophy/files/patch-trophy::Makefile --- /ports/games/trophy.orig/files/patch-trophy::Makefile 2004-01-25 21:29:45.000000000 +0000 +++ trophy/files/patch-trophy::Makefile 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ ---- trophy/Makefile.orig Thu Jan 22 16:19:22 2004 -+++ trophy/Makefile Thu Jan 22 16:46:00 2004 -@@ -1,6 +1,6 @@ - # Generated automatically from Makefile.in by configure. - --prefix = /usr/local -+prefix = ${PREFIX} - exec_prefix = ${prefix} - datadir = ${prefix}/share - bindir = ${exec_prefix}/bin -@@ -37,7 +37,8 @@ - catrophy.o \ - cawidget.o - #DATAFILES = resources.dat --EXTERN_LIBS = -lclanCore -lclanSound -lclanDisplay -lclanApp -lHermes -+EXTERN_LIBS = -L$(LOCALBASE)/lib -lclanCore -lclanSound -lclanDisplay -lclanApp -lHermes $(PTHREAD_LIBS) -+INCLUDES = -I$(LOCALBASE)/include - - all: trophy $(DATAFILES) - -@@ -54,7 +55,7 @@ - $(CXX) $(EXTERN_LIBS) -o trophy $(OBJF) - - %.o : %.cpp -- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -O3 -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@ -+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) $(INCLUDES) -Wall -DPKGDATADIR=\"$(datadir)/trophy\" $< -o $@ - - %.dat : %.scr trophy - ./trophy -datafile $< $@ diff -urN --exclude CVS /ports/games/trophy.orig/pkg-plist trophy/pkg-plist --- /ports/games/trophy.orig/pkg-plist 2004-01-25 21:29:45.000000000 +0000 +++ trophy/pkg-plist 2007-08-04 03:35:41.000000000 +0000 @@ -1,139 +1,139 @@ bin/trophy -share/trophy/resources.scr -share/trophy/resources/cars/dust.tga -share/trophy/resources/cars/flash2/surface.tga -share/trophy/resources/cars/flash2/surface3d.tga -share/trophy/resources/cars/jeep/surface.tga -share/trophy/resources/cars/jeep/surface3d.tga -share/trophy/resources/cars/vw/surface.tga -share/trophy/resources/cars/vw/surface3d.tga -share/trophy/resources/cars/z3/surface.tga -share/trophy/resources/cars/z3/surface3d.tga -share/trophy/resources/fonts/lcd_13_green.tga -share/trophy/resources/fonts/normal_11_white.tga -share/trophy/resources/fonts/normal_14_white.tga -share/trophy/resources/fonts/normal_22_gray.tga -share/trophy/resources/fonts/normal_22_white.tga -share/trophy/resources/fonts/normal_8_white.tga -share/trophy/resources/goody/bullets.tga -share/trophy/resources/goody/fogbomb.tga -share/trophy/resources/goody/life.tga -share/trophy/resources/goody/money.tga -share/trophy/resources/goody/turbo.tga -share/trophy/resources/gui/arrow_b.tga -share/trophy/resources/gui/arrow_l.tga -share/trophy/resources/gui/arrow_r.tga -share/trophy/resources/gui/arrow_t.tga -share/trophy/resources/gui/border1.tga -share/trophy/resources/gui/border2.tga -share/trophy/resources/gui/border3.tga -share/trophy/resources/gui/border4.tga -share/trophy/resources/gui/button.tga -share/trophy/resources/gui/edge1.tga -share/trophy/resources/gui/edge2.tga -share/trophy/resources/gui/edge3.tga -share/trophy/resources/gui/edge4.tga -share/trophy/resources/gui/loading.tga -share/trophy/resources/gui/progressbar.tga -share/trophy/resources/menu/bar.tga -share/trophy/resources/menu/bg.tga -share/trophy/resources/menu/cursorani.tga -share/trophy/resources/misc/carfire.tga -share/trophy/resources/misc/caution.tga -share/trophy/resources/misc/checkflag.tga -share/trophy/resources/misc/cross.tga -share/trophy/resources/misc/dust.tga -share/trophy/resources/misc/fog.tga -share/trophy/resources/misc/gunfire.tga -share/trophy/resources/misc/hitpoint.tga -share/trophy/resources/misc/info.tga -share/trophy/resources/misc/light.tga -share/trophy/resources/misc/verticalbar.tga -share/trophy/resources/panel/button.tga -share/trophy/resources/panel/death.tga -share/trophy/resources/panel/infoview.tga -share/trophy/resources/panel/label.tga -share/trophy/resources/panel/life.tga -share/trophy/resources/panel/speed.tga -share/trophy/resources/panel/turbo.tga -share/trophy/resources/panel/turbolabel.tga -share/trophy/resources/sounds/background01.wav -share/trophy/resources/sounds/carhorn.wav -share/trophy/resources/sounds/crash.wav -share/trophy/resources/sounds/dog.wav -share/trophy/resources/sounds/engine.wav -share/trophy/resources/sounds/fire.wav -share/trophy/resources/sounds/fogbomb.wav -share/trophy/resources/sounds/goody.wav -share/trophy/resources/sounds/goody_bullets.wav -share/trophy/resources/sounds/goody_fogbomb.wav -share/trophy/resources/sounds/goody_life.wav -share/trophy/resources/sounds/goody_money.wav -share/trophy/resources/sounds/goody_turbo.wav -share/trophy/resources/sounds/light.wav -share/trophy/resources/sounds/menu.wav -share/trophy/resources/sounds/selector.wav -share/trophy/resources/sounds/shoot.wav -share/trophy/resources/sounds/shot.wav -share/trophy/resources/sounds/slide.wav -share/trophy/resources/tracks/Downtown/bridge.tga -share/trophy/resources/tracks/Downtown/config.tck -share/trophy/resources/tracks/Downtown/fmap.tga -share/trophy/resources/tracks/Downtown/thumb.tga -share/trophy/resources/tracks/Downtown/vmap.tga -share/trophy/resources/tracks/Loops/bridge.tga -share/trophy/resources/tracks/Loops/config.tck -share/trophy/resources/tracks/Loops/fmap.tga -share/trophy/resources/tracks/Loops/thumb.tga -share/trophy/resources/tracks/Loops/vmap.tga -share/trophy/resources/tracks/Moon/bridge.tga -share/trophy/resources/tracks/Moon/config.tck -share/trophy/resources/tracks/Moon/fmap.tga -share/trophy/resources/tracks/Moon/thumb.tga -share/trophy/resources/tracks/Moon/vmap.tga -share/trophy/resources/tracks/Rally/config.tck -share/trophy/resources/tracks/Rally/fmap.tga -share/trophy/resources/tracks/Rally/thumb.tga -share/trophy/resources/tracks/Rally/vmap.tga -share/trophy/resources/tracks/Snake/bridge.tga -share/trophy/resources/tracks/Snake/config.tck -share/trophy/resources/tracks/Snake/fmap.tga -share/trophy/resources/tracks/Snake/thumb.tga -share/trophy/resources/tracks/Snake/vmap.tga -share/trophy/resources/tracks/Zigzag/bridge.tga -share/trophy/resources/tracks/Zigzag/config.tck -share/trophy/resources/tracks/Zigzag/fmap.tga -share/trophy/resources/tracks/Zigzag/thumb.tga -share/trophy/resources/tracks/Zigzag/vmap.tga -share/trophy/resources/tracks/Zurich/config.tck -share/trophy/resources/tracks/Zurich/fmap.tga -share/trophy/resources/tracks/Zurich/thumb.tga -share/trophy/resources/tracks/Zurich/vmap.tga -@dirrm share/trophy/resources/cars/flash2 -@dirrm share/trophy/resources/cars/jeep -@dirrm share/trophy/resources/cars/vw -@dirrm share/trophy/resources/cars/z3 -@dirrm share/trophy/resources/cars -@dirrm share/trophy/resources/fonts -@dirrm share/trophy/resources/goody -@dirrm share/trophy/resources/gui -@dirrm share/trophy/resources/menu -@dirrm share/trophy/resources/misc -@dirrm share/trophy/resources/panel -@dirrm share/trophy/resources/sounds -@dirrm share/trophy/resources/tracks/Downtown -@dirrm share/trophy/resources/tracks/Loops -@dirrm share/trophy/resources/tracks/Moon -@dirrm share/trophy/resources/tracks/Rally -@dirrm share/trophy/resources/tracks/Snake -@dirrm share/trophy/resources/tracks/Zigzag -@dirrm share/trophy/resources/tracks/Zurich -@dirrm share/trophy/resources/tracks -@dirrm share/trophy/resources +%%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%%/ChangeLog.old +%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%@dirrm %%DOCSDIR%%