Attachment 81848 Details for Bug 117143 – file.diff

[patch] file.diff

file.diff (text/plain), 6.50 KB, created by Pedro F. Giffuni on 2007-10-12 21:00:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2007-10-12 21:00:06 UTC

Size: 6.50 KB

patch

obsolete

>diff -ruN prboom.orig/Makefile prboom/Makefile
>--- prboom.orig/Makefile	Fri Oct 12 13:47:28 2007
>+++ prboom/Makefile	Fri Oct 12 14:45:07 2007
>@@ -6,14 +6,13 @@
> #
> 
> PORTNAME=	prboom
>-PORTVERSION=	2.2.6
>-PORTREVISION=	2
>+PORTVERSION=	2.4.7
> CATEGORIES=	games
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	robin.schoonover@gmail.com
>-COMMENT=	A multiplayer-capable and modified version of ID's classic doom game
>+COMMENT=	A multiplayer-capable and modified version of ID's classic DOOM game
> 
> LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
> 
>@@ -37,8 +36,9 @@
> .include <bsd.port.pre.mk>
> 
> .if defined(WITH_GL)
>-CONFIGURE_ARGS+=--enable-gl
> USE_GL=		yes
>+.else
>+CONFIGURE_ARGS+=--disable-gl
> .endif
> 
> post-install:
>diff -ruN prboom.orig/distinfo prboom/distinfo
>--- prboom.orig/distinfo	Fri Oct 12 13:47:28 2007
>+++ prboom/distinfo	Fri Oct 12 13:51:08 2007
>@@ -1,3 +1,3 @@
>-MD5 (prboom-2.2.6.tar.gz) = ef0abe0aad017514857552434b5c6aaa
>-SHA256 (prboom-2.2.6.tar.gz) = 200d3c50b082ae46be8c014bb576b4e2d23b1704508fd528c47e3e2b3b04759e
>-SIZE (prboom-2.2.6.tar.gz) = 1047612
>+MD5 (prboom-2.4.7.tar.gz) = 9942f521764d7f89df2218a456da4f02
>+SHA256 (prboom-2.4.7.tar.gz) = de22dbaacd25a0f0b16c507aa2326a90b7f5dcfcf862c3dc7076996c6187cd2f
>+SIZE (prboom-2.4.7.tar.gz) = 999524
>diff -ruN prboom.orig/files/patch-Makefile.in prboom/files/patch-Makefile.in
>--- prboom.orig/files/patch-Makefile.in	Fri Oct 12 13:47:28 2007
>+++ prboom/files/patch-Makefile.in	Fri Oct 12 14:28:01 2007
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	Thu Feb 17 13:43:28 2005
>-+++ Makefile.in	Thu Feb 17 13:45:50 2005
>-@@ -262,22 +262,8 @@
>+--- Makefile.in.orig	Fri Oct 12 14:26:41 2007
>++++ Makefile.in	Fri Oct 12 14:27:32 2007
>+@@ -269,22 +269,8 @@
>  	cd $(top_builddir) && $(SHELL) ./config.status $@
>  uninstall-info-am:
>  install-docDATA: $(doc_DATA)
>@@ -8,7 +8,7 @@
> -	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
> -	@list='$(doc_DATA)'; for p in $$list; do \
> -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>+-	  f=$(am__strip_dir) \
> -	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
> -	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
> -	done
>@@ -16,7 +16,7 @@
>  uninstall-docDATA:
> -	@$(NORMAL_UNINSTALL)
> -	@list='$(doc_DATA)'; for p in $$list; do \
>--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>+-	  f=$(am__strip_dir) \
> -	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
> -	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
> -	done
>diff -ruN prboom.orig/files/patch-configure prboom/files/patch-configure
>--- prboom.orig/files/patch-configure	Fri Oct 12 13:47:28 2007
>+++ prboom/files/patch-configure	Fri Oct 12 14:04:52 2007
>@@ -1,23 +1,14 @@
>---- configure.orig	Sat Sep 29 04:39:08 2001
>-+++ configure	Sat Nov 10 20:30:26 2001
>-@@ -922,9 +922,9 @@
>- 
>- 
>- if test "x$prefix" != xNONE; then
>+--- configure.orig	Sun Nov 19 12:45:22 2006
>++++ configure	Fri Oct 12 14:02:43 2007
>+@@ -1913,9 +1913,9 @@
>+   DOOMWADDIR="$withval"
>+ else
>+   if test "x$prefix" != xNONE; then
> -  DOOMWADDIR="$prefix/share/games/doom"
> +  DOOMWADDIR="$prefix/share/doom"
>  else
> -  DOOMWADDIR="$ac_default_prefix/share/games/doom"
> +  DOOMWADDIR="$ac_default_prefix/share/doom"
>  fi
>- cat >> confdefs.h <<EOF
>- #define DOOMWADDIR "$DOOMWADDIR"
>-@@ -1220,7 +1220,7 @@
>-   echo '    the source to insert the relevant pragmas so structures are packed.'
>- fi
>  
>--CFLAGS_OPT="-O2 -fomit-frame-pointer"
>-+CFLAGS_OPT="-fomit-frame-pointer"
>- # Check whether --enable-debug or --disable-debug was given.
>- if test "${enable_debug+set}" = set; then
>-   enableval="$enable_debug"
>+ fi;
>diff -ruN prboom.orig/files/patch-data-Makefile.in prboom/files/patch-data-Makefile.in
>--- prboom.orig/files/patch-data-Makefile.in	Fri Oct 12 13:47:28 2007
>+++ prboom/files/patch-data-Makefile.in	Wed Dec 31 19:00:00 1969
>@@ -1,11 +0,0 @@
>---- data/Makefile.in.orig	Thu Feb 17 14:46:13 2005
>-+++ data/Makefile.in	Mon Sep 27 11:31:31 2004
>-@@ -163,7 +163,7 @@
>- target_cpu = @target_cpu@
>- target_os = @target_os@
>- target_vendor = @target_vendor@
>--waddir = $(datadir)/games/doom
>-+waddir = $(datadir)/doom
>- wad_DATA = prboom.wad
>- EXTRA_DIST = prboom.wad
>- all: all-am
>diff -ruN prboom.orig/files/patch-doc-Makefile.in prboom/files/patch-doc-Makefile.in
>--- prboom.orig/files/patch-doc-Makefile.in	Fri Oct 12 13:47:28 2007
>+++ prboom/files/patch-doc-Makefile.in	Wed Dec 31 19:00:00 1969
>@@ -1,35 +0,0 @@
>---- doc/Makefile.in.orig	Mon Sep 27 11:31:31 2004
>-+++ doc/Makefile.in	Thu Feb 17 14:55:23 2005
>-@@ -32,7 +32,7 @@
>- install_sh_PROGRAM = $(install_sh) -c
>- install_sh_SCRIPT = $(install_sh) -c
>- INSTALL_HEADER = $(INSTALL_DATA)
>--transform = $(program_transform_name)
>-+transform = 
>- NORMAL_INSTALL = :
>- PRE_INSTALL = :
>- POST_INSTALL = :
>-@@ -297,22 +297,9 @@
>- 	  rm -f "$(DESTDIR)$(man6dir)/$$inst"; \
>- 	done
>- install-docDATA: $(doc_DATA)
>--	@$(NORMAL_INSTALL)
>--	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
>--	@list='$(doc_DATA)'; for p in $$list; do \
>--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>--	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
>--	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
>--	done
>- 
>- uninstall-docDATA:
>--	@$(NORMAL_UNINSTALL)
>--	@list='$(doc_DATA)'; for p in $$list; do \
>--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>--	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
>--	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
>--	done
>-+
>- tags: TAGS
>- TAGS:
>- 
>diff -ruN prboom.orig/files/patch-src-Makefile.in prboom/files/patch-src-Makefile.in
>--- prboom.orig/files/patch-src-Makefile.in	Fri Oct 12 13:47:28 2007
>+++ prboom/files/patch-src-Makefile.in	Fri Oct 12 14:14:14 2007
>@@ -1,5 +1,5 @@
>---- src/Makefile.in.orig	Mon Sep 27 11:31:32 2004
>-+++ src/Makefile.in	Thu Feb 17 15:01:16 2005
>+--- src/Makefile.in.orig	Sun Nov 19 12:45:21 2006
>++++ src/Makefile.in	Fri Oct 12 14:12:30 2007
> @@ -37,7 +37,7 @@
>  install_sh_PROGRAM = $(install_sh) -c
>  install_sh_SCRIPT = $(install_sh) -c
>@@ -9,12 +9,12 @@
>  NORMAL_INSTALL = :
>  PRE_INSTALL = :
>  POST_INSTALL = :
>-@@ -276,7 +276,7 @@
>+@@ -248,7 +248,7 @@
>+ target_os = @target_os@
>  target_vendor = @target_vendor@
>- EXTRA_SUBDIRS = Posix SDL
>- SUBDIRS = SDL POSIX
>+ SUBDIRS = SDL POSIX MAC
> -gamesdir = $(prefix)/games
> +gamesdir = $(prefix)/bin
>- prboom_game_server_SOURCES = d_server.c i_udp_sdl.c protocol.h
>- prboom_game_server_LDADD = POSIX/libposixdoom.a @NET_LIBS@ @SDL_LIBS@
>+ prboom_game_server_SOURCES = d_server.c protocol.h
>+ prboom_game_server_LDADD = POSIX/libposixdoom.a SDL/i_network.o @NET_LIBS@ @SDL_LIBS@
>  COMMON_SRC = \

Actions: View | Diff

Attachments on bug 117143: 81848