Attachment 23628 Details for Bug 40621 – file.diff

[patch] file.diff

file.diff (text/plain), 6.75 KB, created by tkato on 2002-07-15 22:00:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2002-07-15 22:00:04 UTC

Size: 6.75 KB

patch

obsolete

>diff -urN /usr/ports/games/crossfire-client/Makefile games/crossfire-client/Makefile
>--- /usr/ports/games/crossfire-client/Makefile	Thu Apr 18 19:58:07 2002
>+++ games/crossfire-client/Makefile	Sat Jul 13 04:09:22 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	crossfire
>-PORTVERSION=	1.1.0
>+PORTVERSION=	1.3.0
> CATEGORIES=	games
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
> 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
>@@ -14,32 +14,45 @@
> MASTER_SITE_SUBDIR=	${PORTNAME}
> PKGNAMESUFFIX=	-client
> DISTFILES=	${PORTNAME}-client-${PORTVERSION}.tar.gz \
>-		${PORTNAME}-client-sounds-${PORTVERSION}.tar.gz
>+		${PORTNAME}-client-images-${PORTVERSION}.tar.gz \
>+		${PORTNAME}-client-sounds-1.1.0.tar.gz
> 
> MAINTAINER=	ports@FreeBSD.org
> 
>-LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
>-		png.5:${PORTSDIR}/graphics/png
>+BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
>+LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
> 
> SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
>+
>+USE_X_PREFIX=	yes
>+USE_PERL5=	yes
> USE_XPM=	yes
> USE_GTK=	yes
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-USE_X_PREFIX=	yes
> GNU_CONFIGURE=	yes
>+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
> CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
> CONFIGURE_ARGS=	--with-includes=-I${LOCALBASE}/include \
> 		--with-ldflags=-L${LOCALBASE}/lib \
>-		--with-sound-dir=${PREFIX}/share/cfclient/sounds \
> 		--disable-gnome # Gnome client currently broken
> 
> MAN1=		cfclient.1 gcfclient.1
> 
>+DATADIR=	${PREFIX}/share/${PKGBASE}
>+
>+pre-configure:
>+	@cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf
>+
> post-install:
>-	@${MKDIR} ${PREFIX}/share/cfclient/sounds
>-	@${INSTALL_DATA} ${WRKDIR}/sounds/*.raw ${WRKDIR}/sounds/README \
>-		${PREFIX}/share/cfclient/sounds
>+	@${MKDIR} ${DATADIR}
>+	${INSTALL_DATA} ${WRKDIR}/bmaps.client ${DATADIR}
>+	${INSTALL_DATA} ${WRKDIR}/crossfire.base ${DATADIR}
>+	${INSTALL_DATA} ${WRKDIR}/crossfire.clsc ${DATADIR}
>+	@${MKDIR} ${DATADIR}/sounds
>+	${INSTALL_DATA} ${WRKDIR}/sounds/README ${DATADIR}/sounds
>+	${INSTALL_DATA} ${WRKDIR}/sounds/*.raw ${DATADIR}/sounds
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/games/crossfire-client/distinfo games/crossfire-client/distinfo
>--- /usr/ports/games/crossfire-client/distinfo	Fri Mar  8 19:11:10 2002
>+++ games/crossfire-client/distinfo	Sat Jul 13 02:00:14 2002
>@@ -1,2 +1,3 @@
>-MD5 (crossfire-client-1.1.0.tar.gz) = ee6785ad5a0cfa43f8a920528f2a94d4
>+MD5 (crossfire-client-1.3.0.tar.gz) = fc4c91bcd66c53e8da8ef13ab9554b04
>+MD5 (crossfire-client-images-1.3.0.tar.gz) = d0115d1e429116a42080b48ea8cdfae3
> MD5 (crossfire-client-sounds-1.1.0.tar.gz) = f9390112a3cd1788b4c310fc5d53a609
>diff -urN /usr/ports/games/crossfire-client/files/patch-configure.in games/crossfire-client/files/patch-configure.in
>--- /usr/ports/games/crossfire-client/files/patch-configure.in	Thu Jan  1 09:00:00 1970
>+++ games/crossfire-client/files/patch-configure.in	Sat Jul 13 04:10:58 2002
>@@ -0,0 +1,11 @@
>+--- configure.in.orig	Tue Jul  2 08:52:54 2002
>++++ configure.in	Sat Jul 13 04:10:47 2002
>+@@ -226,6 +226,8 @@
>+ dnl so I'll just assume it is in the same dir as SDL
>+ if eval "test x$use_sdl = xyes"; then
>+   AM_PATH_SDL(1.1.3)
>++  CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
>++  LIBS="$LIBS $SDL_LIBS"
>+   if eval "test x$no_sdl = x"; then
>+       AC_CHECK_LIB( SDL_image, IMG_LoadPNG_RW, 
>+                     have_sdlimage="yes", have_sdlimage="no", $SDL_CFLAGS) 
>diff -urN /usr/ports/games/crossfire-client/files/patch-x11::Makefile.in games/crossfire-client/files/patch-x11::Makefile.in
>--- /usr/ports/games/crossfire-client/files/patch-x11::Makefile.in	Fri Mar  8 10:32:14 2002
>+++ games/crossfire-client/files/patch-x11::Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- x11/Makefile.in.orig	Wed Jan 30 02:27:36 2002
>-+++ x11/Makefile.in	Wed Jan 30 02:27:45 2002
>-@@ -61,7 +61,7 @@
>- install:
>- 	$(INSTALL) -d ${bindir}
>- 	$(INSTALL) -d ${mandir}
>--	$(INSTALL) cfclient ${bindir}/gcfclient
>-+	$(INSTALL) cfclient ${bindir}/cfclient
>- 	$(INSTALL) cfclient.man ${mandir}/cfclient.1
>- 
>- depend:
>diff -urN /usr/ports/games/crossfire-client/pkg-plist games/crossfire-client/pkg-plist
>--- /usr/ports/games/crossfire-client/pkg-plist	Fri Mar  8 19:11:12 2002
>+++ games/crossfire-client/pkg-plist	Sat Jul 13 04:48:51 2002
>@@ -1,35 +1,38 @@
>-bin/cfsndserv
> bin/cfclient
>+bin/cfsndserv
> bin/gcfclient
>-share/cfclient/sounds/ouch1.raw
>-share/cfclient/sounds/Evil_Laugh.raw
>-share/cfclient/sounds/MetalCrash.raw
>-share/cfclient/sounds/README
>-share/cfclient/sounds/click1.raw
>-share/cfclient/sounds/click2.raw
>-share/cfclient/sounds/Missed.raw
>-share/cfclient/sounds/boink2.raw
>-share/cfclient/sounds/chord.raw
>-share/cfclient/sounds/Missle1.raw
>-share/cfclient/sounds/blip.raw
>-share/cfclient/sounds/Explosion.raw
>-share/cfclient/sounds/Whoosh.raw
>-share/cfclient/sounds/drip.raw
>-share/cfclient/sounds/bugle_charge.raw
>-share/cfclient/sounds/magic.raw
>-share/cfclient/sounds/squish.raw
>-share/cfclient/sounds/Creaky-1.raw
>-share/cfclient/sounds/TowerClock.raw
>-share/cfclient/sounds/Teeswing.raw
>-share/cfclient/sounds/swish.raw
>-share/cfclient/sounds/Tear.raw
>-share/cfclient/sounds/gong.raw
>-share/cfclient/sounds/Puke.raw
>-share/cfclient/sounds/sci_fi_gun.raw
>-share/cfclient/sounds/lightning1.raw
>-share/cfclient/sounds/FloorTom.raw
>-share/cfclient/sounds/phit2.raw
>-share/cfclient/sounds/Gun-5.raw
>-share/cfclient/sounds/first_try.raw
>-@dirrm share/cfclient/sounds
>-@dirrm share/cfclient
>+share/crossfire-client/bmaps.client
>+share/crossfire-client/crossfire.base
>+share/crossfire-client/crossfire.clsc
>+share/crossfire-client/sounds/Creaky-1.raw
>+share/crossfire-client/sounds/Evil_Laugh.raw
>+share/crossfire-client/sounds/Explosion.raw
>+share/crossfire-client/sounds/FloorTom.raw
>+share/crossfire-client/sounds/Gun-5.raw
>+share/crossfire-client/sounds/MetalCrash.raw
>+share/crossfire-client/sounds/Missed.raw
>+share/crossfire-client/sounds/Missle1.raw
>+share/crossfire-client/sounds/Puke.raw
>+share/crossfire-client/sounds/README
>+share/crossfire-client/sounds/Tear.raw
>+share/crossfire-client/sounds/Teeswing.raw
>+share/crossfire-client/sounds/TowerClock.raw
>+share/crossfire-client/sounds/Whoosh.raw
>+share/crossfire-client/sounds/blip.raw
>+share/crossfire-client/sounds/boink2.raw
>+share/crossfire-client/sounds/bugle_charge.raw
>+share/crossfire-client/sounds/chord.raw
>+share/crossfire-client/sounds/click1.raw
>+share/crossfire-client/sounds/click2.raw
>+share/crossfire-client/sounds/drip.raw
>+share/crossfire-client/sounds/first_try.raw
>+share/crossfire-client/sounds/gong.raw
>+share/crossfire-client/sounds/lightning1.raw
>+share/crossfire-client/sounds/magic.raw
>+share/crossfire-client/sounds/ouch1.raw
>+share/crossfire-client/sounds/phit2.raw
>+share/crossfire-client/sounds/sci_fi_gun.raw
>+share/crossfire-client/sounds/squish.raw
>+share/crossfire-client/sounds/swish.raw
>+@dirrm share/crossfire-client/sounds
>+@dirrm share/crossfire-client

Actions: View | Diff

Attachments on bug 40621: 23628