diff -ruN prboom.old/Makefile prboom/Makefile --- prboom.old/Makefile Thu Feb 17 12:53:42 2005 +++ prboom/Makefile Thu Feb 17 16:25:47 2005 @@ -6,13 +6,12 @@ # PORTNAME= prboom -PORTVERSION= 2.2.2 -PORTREVISION= 2 +PORTVERSION= 2.2.6 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -MAINTAINER= fracture@allusion.net +MAINTAINER= robin.schoonover@gmail.com COMMENT= A multiplayer-capable and modified version of ID's classic doom game LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg @@ -22,15 +21,17 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+=--disable-cpu-opt MAN5= boom.cfg.5 MAN6= prboom.6 prboom-game-server.6 -.include - -.if ${OSVERSION} >= 502126 -BROKEN= "Does not compile on FreeBSD >= 5.x" +.if defined(WITH_GL) +CONFIGURE_ARGS+=--enable-gl +USE_GL= yes .endif + +.include post-install: .if !defined(NOPORTDOCS) diff -ruN prboom.old/distinfo prboom/distinfo --- prboom.old/distinfo Thu Feb 17 12:53:43 2005 +++ prboom/distinfo Thu Feb 17 12:56:26 2005 @@ -1,2 +1,2 @@ -MD5 (prboom-2.2.2.tar.gz) = 90becb895114ab04fbb0644751a3d80b -SIZE (prboom-2.2.2.tar.gz) = 1005898 +MD5 (prboom-2.2.6.tar.gz) = ef0abe0aad017514857552434b5c6aaa +SIZE (prboom-2.2.6.tar.gz) = 1047612 diff -ruN prboom.old/files/patch-Makefile.in prboom/files/patch-Makefile.in --- prboom.old/files/patch-Makefile.in Thu Feb 17 12:53:42 2005 +++ prboom/files/patch-Makefile.in Thu Feb 17 13:46:13 2005 @@ -1,25 +1,24 @@ ---- Makefile.in.orig Fri Jun 29 03:30:25 2001 -+++ Makefile.in Fri Jun 29 03:31:24 2001 -@@ -167,23 +167,8 @@ - cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - +--- Makefile.in.orig Thu Feb 17 13:43:28 2005 ++++ Makefile.in Thu Feb 17 13:45:50 2005 +@@ -262,22 +262,8 @@ + cd $(top_builddir) && $(SHELL) ./config.status $@ + uninstall-info-am: install-docDATA: $(doc_DATA) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(docdir) +- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ -- fi; fi; \ +- 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 \ -- rm -f $(DESTDIR)$(docdir)/$$p; \ +- @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 # This directory's subdirectories are mostly independent; you can cd diff -ruN prboom.old/files/patch-configure prboom/files/patch-configure --- prboom.old/files/patch-configure Thu Feb 17 12:53:42 2005 +++ prboom/files/patch-configure Thu Feb 17 13:50:12 2005 @@ -21,35 +21,3 @@ # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" -@@ -1250,30 +1250,8 @@ - - - --# Check whether --enable-cpu-opt or --disable-cpu-opt was given. --if test "${enable_cpu_opt+set}" = set; then -- enableval="$enable_cpu_opt" -- --CPU_CFLAGS="" -- --else -- --case "$target" in -- # marginal gains from aligning code --i386-*) CPU_CFLAGS="-m386" ;; --i486-*) CPU_CFLAGS="-m486" ;; -- # nothing special for pentium -- # CMOV op on ppro/II/686 can help us --i686-*) CPU_CFLAGS="-mcpu=i686 -march=i686" ;; --esac -- --fi -- -- -- -- - NEW_CFLAGS="$CFLAGS" --for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT $CPU_CFLAGS -+for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT - do - echo $ac_n "checking whether compiler supports $ac_flag""... $ac_c" 1>&6 - echo "configure:1280: checking whether compiler supports $ac_flag" >&5 diff -ruN prboom.old/files/patch-data-Makefile.in prboom/files/patch-data-Makefile.in --- prboom.old/files/patch-data-Makefile.in Thu Feb 17 12:53:42 2005 +++ prboom/files/patch-data-Makefile.in Thu Feb 17 14:47:27 2005 @@ -1,11 +1,11 @@ ---- data/Makefile.in.orig Sun Apr 1 02:14:06 2001 -+++ data/Makefile.in Sun Jun 10 16:49:16 2001 -@@ -91,7 +91,7 @@ - VERSION = @VERSION@ - ac_aux_dir = @ac_aux_dir@ - +--- 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 - mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs + all: all-am diff -ruN prboom.old/files/patch-doc-Makefile.in prboom/files/patch-doc-Makefile.in --- prboom.old/files/patch-doc-Makefile.in Thu Feb 17 12:53:42 2005 +++ prboom/files/patch-doc-Makefile.in Thu Feb 17 14:55:57 2005 @@ -1,25 +1,33 @@ ---- doc/Makefile.in.orig Sun Apr 1 02:14:05 2001 -+++ doc/Makefile.in Fri Jun 29 03:39:06 2001 -@@ -196,23 +196,9 @@ - $(MAKE) $(AM_MAKEFLAGS) uninstall-man5 uninstall-man6 - +--- 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) -- $(mkinstalldirs) $(DESTDIR)$(docdir) +- test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)" - @list='$(doc_DATA)'; for p in $$list; do \ -- if test -f $(srcdir)/$$p; then \ -- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \ -- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \ -- else if test -f $$p; then \ -- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \ -- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \ -- fi; fi; \ +- 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 \ -- rm -f $(DESTDIR)$(docdir)/$$p; \ +- @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 diff -ruN prboom.old/files/patch-src-Makefile.in prboom/files/patch-src-Makefile.in --- prboom.old/files/patch-src-Makefile.in Thu Feb 17 12:53:42 2005 +++ prboom/files/patch-src-Makefile.in Thu Feb 17 15:01:55 2005 @@ -1,11 +1,20 @@ ---- src/Makefile.in.orig Sun Apr 1 02:14:08 2001 -+++ src/Makefile.in Sun Jun 10 16:44:19 2001 -@@ -97,7 +97,7 @@ - +--- src/Makefile.in.orig Mon Sep 27 11:31:32 2004 ++++ src/Makefile.in Thu Feb 17 15:01:16 2005 +@@ -37,7 +37,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 = : +@@ -276,7 +276,7 @@ + target_vendor = @target_vendor@ + EXTRA_SUBDIRS = Posix SDL SUBDIRS = SDL POSIX - -gamesdir = $(prefix)/games +gamesdir = $(prefix)/bin - EXTRA_PROGRAMS = prboom-game-server - games_PROGRAMS = prboom @BUILD_SERVER@ - + prboom_game_server_SOURCES = d_server.c i_udp_sdl.c protocol.h + prboom_game_server_LDADD = POSIX/libposixdoom.a @NET_LIBS@ @SDL_LIBS@ + COMMON_SRC = \