Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 06 Sep 2004 20:29:29 +0000
From:      Chris Laverdure <dashevil@sympatico.ca>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/71440: Updated Port: games/prboom : Updated to the latest
Message-ID:  <1094502568.4369.6.camel@elemental.DashEvil>
Resent-Message-ID: <200409070030.i870UTXC002870@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         71440
>Category:       ports
>Synopsis:       Updated Port: games/prboom : Updated to the latest
>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:   Tue Sep 07 00:30:28 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Chris Laverdure
>Release:        FreeBSD 5.3-BETA3 i386
>Organization:
none 
>Environment:
System: FreeBSD elemental.DashEvil 5.3-BETA3 FreeBSD 5.3-BETA3 #7: Sun
Sep 5 04:57:43 UTC 2004
root@elemental.DashEvil:/usr/src/sys/i386/compile/DASHEVIL i386

       
>Description:
	The PrBoom port has been stuck at 2.2.2 for a long time. I tried
emailing the maintainer but got no response.
>How-To-Repeat:

>Fix:

--- prboom-2-2-4 begins here ---
# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#       /usr/ports/games/prboom
#       /usr/ports/games/prboom/Makefile
#       /usr/ports/games/prboom/distinfo
#       /usr/ports/games/prboom/pkg-descr
#       /usr/ports/games/prboom/pkg-plist
#       /usr/ports/games/prboom/files
#       /usr/ports/games/prboom/files/patch-Makefile.in
#       /usr/ports/games/prboom/files/patch-configure
#       /usr/ports/games/prboom/files/patch-data-Makefile.in
#       /usr/ports/games/prboom/files/patch-doc-Makefile.in
#       /usr/ports/games/prboom/files/patch-src-Makefile.in
#       /usr/ports/games/prboom/files/patch-src-p_maputl.h
#
echo c - /usr/ports/games/prboom
mkdir -p /usr/ports/games/prboom > /dev/null 2>&1
echo x - /usr/ports/games/prboom/Makefile
sed 's/^X//' >/usr/ports/games/prboom/Makefile <<
'END-of-/usr/ports/games/prboom/Makefile'
X# New ports collection makefile for:   prboom
X# Date created:                                10 June 2001
X# Whom:                                        Jordan DeLong
<fracture@allusion.net>
X#
X# $FreeBSD: ports/games/prboom/Makefile,v 1.10 2004/03/16 04:23:45
edwin Exp $
X#
X
XPORTNAME=      prboom
XPORTVERSION=   2.2.4
XCATEGORIES=    games
XMASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR=    ${PORTNAME}
X
XMAINTAINER=    fracture@allusion.net
XCOMMENT=       A multiplayer-capable and modified version of ID's
classic doom game
X
XLIB_DEPENDS=   smpeg.1:${PORTSDIR}/multimedia/smpeg
X
XUSE_SDL=       mixer net sdl
XUSE_GMAKE=     yes
XGNU_CONFIGURE= yes
XCONFIGURE_ENV= CFLAGS+="-I${LOCALBASE}/include" \
X               LDFLAGS="-L${LOCALBASE}/lib"
X
XMAN5=          boom.cfg.5
XMAN6=          prboom.6 prboom-game-server.6
X
Xpost-install:
X.if !defined(NOPORTDOCS)
X       ${MKDIR} ${PREFIX}/share/doc/prboom
X       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/prboom
X       ${INSTALL_DATA} ${WRKSRC}/doc/README.compat
${PREFIX}/share/doc/prboom
X       ${INSTALL_DATA} ${WRKSRC}/doc/README.demos
${PREFIX}/share/doc/prboom
X       ${INSTALL_DATA} ${WRKSRC}/doc/boom.txt
${PREFIX}/share/doc/prboom
X.endif
X
X.include <bsd.port.mk>
END-of-/usr/ports/games/prboom/Makefile
echo x - /usr/ports/games/prboom/distinfo
sed 's/^X//' >/usr/ports/games/prboom/distinfo <<
'END-of-/usr/ports/games/prboom/distinfo'
XMD5 (prboom-2.2.4.tar.gz) = a7cd473d5b6bb69f815bf156b93aeacc
XSIZE (prboom-2.2.4.tar.gz) = 1001103
END-of-/usr/ports/games/prboom/distinfo
echo x - /usr/ports/games/prboom/pkg-descr
sed 's/^X//' >/usr/ports/games/prboom/pkg-descr <<
'END-of-/usr/ports/games/prboom/pkg-descr'
XPrboom is a modified version of the ID Software's classic game Doom.
XIt runs on several platforms (include Win32 and Unixes) and features
Xmany additions to the original game.  It also supports multiplayer
Xgames.
X
XWWW: http://prboom.sourceforge.net/
END-of-/usr/ports/games/prboom/pkg-descr
echo x - /usr/ports/games/prboom/pkg-plist
sed 's/^X//' >/usr/ports/games/prboom/pkg-plist <<
'END-of-/usr/ports/games/prboom/pkg-plist'
Xbin/prboom
Xbin/prboom-game-server
Xshare/doom/prboom.wad
X@dirrm share/doom
X%%PORTDOCS%%share/doc/prboom/README
X%%PORTDOCS%%share/doc/prboom/README.compat
X%%PORTDOCS%%share/doc/prboom/README.demos
X%%PORTDOCS%%share/doc/prboom/boom.txt
X%%PORTDOCS%%@dirrm share/doc/prboom
END-of-/usr/ports/games/prboom/pkg-plist
echo c - /usr/ports/games/prboom/files
mkdir -p /usr/ports/games/prboom/files > /dev/null 2>&1
echo x - /usr/ports/games/prboom/files/patch-Makefile.in
sed 's/^X//' >/usr/ports/games/prboom/files/patch-Makefile.in <<
'END-of-/usr/ports/games/prboom/files/patch-Makefile.in'
X--- Makefile.in.orig   Fri Jun 29 03:30:25 2001
X+++ Makefile.in        Fri Jun 29 03:31:24 2001
X@@ -167,23 +167,8 @@
X       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL)
./config.status
X
X install-docDATA: $(doc_DATA)
X-      @$(NORMAL_INSTALL)
X-      $(mkinstalldirs) $(DESTDIR)$(docdir)
X-      @list='$(doc_DATA)'; for p in $$list; do \
X-        if test -f $(srcdir)/$$p; then \
X-          echo " $(INSTALL_DATA) $(srcdir)/$$p
$(DESTDIR)$(docdir)/$$p"; \
X-          $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \
X-        else if test -f $$p; then \
X-          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
X-          $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
X-        fi; fi; \
X-      done
X
X uninstall-docDATA:
X-      @$(NORMAL_UNINSTALL)
X-      list='$(doc_DATA)'; for p in $$list; do \
X-        rm -f $(DESTDIR)$(docdir)/$$p; \
X-      done
X
X # This directory's subdirectories are mostly independent; you can cd
X # into them and run `make' without going through this Makefile.
END-of-/usr/ports/games/prboom/files/patch-Makefile.in
echo x - /usr/ports/games/prboom/files/patch-configure
sed 's/^X//' >/usr/ports/games/prboom/files/patch-configure <<
'END-of-/usr/ports/games/prboom/files/patch-configure'
X--- configure.orig     Sat Sep 29 04:39:08 2001
X+++ configure  Sat Nov 10 20:30:26 2001
X@@ -922,9 +922,9 @@
X
X
X if test "x$prefix" != xNONE; then
X-  DOOMWADDIR="$prefix/share/games/doom"
X+  DOOMWADDIR="$prefix/share/doom"
X else
X-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
X+  DOOMWADDIR="$ac_default_prefix/share/doom"
X fi
X cat >> confdefs.h <<EOF
X #define DOOMWADDIR "$DOOMWADDIR"
X@@ -1220,7 +1220,7 @@
X   echo '    the source to insert the relevant pragmas so structures
are packed.'
X fi
X
X-CFLAGS_OPT="-O2 -fomit-frame-pointer"
X+CFLAGS_OPT="-fomit-frame-pointer"
X # Check whether --enable-debug or --disable-debug was given.
X if test "${enable_debug+set}" = set; then
X   enableval="$enable_debug"
X@@ -1250,30 +1250,8 @@
X
X
X
X-# Check whether --enable-cpu-opt or --disable-cpu-opt was given.
X-if test "${enable_cpu_opt+set}" = set; then
X-  enableval="$enable_cpu_opt"
X- 
X-CPU_CFLAGS=""
X-
X-else
X- 
X-case "$target" in
X-        # marginal gains from aligning code
X-i386-*) CPU_CFLAGS="-m386" ;;
X-i486-*) CPU_CFLAGS="-m486" ;;
X-        # nothing special for pentium
X-        # CMOV op on ppro/II/686 can help us
X-i686-*) CPU_CFLAGS="-mcpu=i686 -march=i686" ;;
X-esac
X-
X-fi
X-
X-
X-
X-
X NEW_CFLAGS="$CFLAGS"
X-for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT
$CPU_CFLAGS
X+for ac_flag in -Wall -Winline -Wwrite-strings -ffast-math $CFLAGS_OPT
X do
X  echo $ac_n "checking whether compiler supports $ac_flag""... $ac_c"
1>&6
X echo "configure:1280: checking whether compiler supports $ac_flag" >&5
END-of-/usr/ports/games/prboom/files/patch-configure
echo x - /usr/ports/games/prboom/files/patch-data-Makefile.in
sed 's/^X//' >/usr/ports/games/prboom/files/patch-data-Makefile.in <<
'END-of-/usr/ports/games/prboom/files/patch-data-Makefile.in'
X--- data/Makefile.in.orig      Sun Apr  1 02:14:06 2001
X+++ data/Makefile.in   Sun Jun 10 16:49:16 2001
X@@ -91,7 +91,7 @@
X VERSION = @VERSION@
X ac_aux_dir = @ac_aux_dir@
X
X-waddir = $(datadir)/games/doom
X+waddir = $(datadir)/doom
X wad_DATA = prboom.wad
X EXTRA_DIST = prboom.wad
X mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
END-of-/usr/ports/games/prboom/files/patch-data-Makefile.in
echo x - /usr/ports/games/prboom/files/patch-doc-Makefile.in
sed 's/^X//' >/usr/ports/games/prboom/files/patch-doc-Makefile.in <<
'END-of-/usr/ports/games/prboom/files/patch-doc-Makefile.in'
X--- doc/Makefile.in.orig       Sun Apr  1 02:14:05 2001
X+++ doc/Makefile.in    Fri Jun 29 03:39:06 2001
X@@ -196,23 +196,9 @@
X       $(MAKE) $(AM_MAKEFLAGS) uninstall-man5 uninstall-man6
X
X install-docDATA: $(doc_DATA)
X-      @$(NORMAL_INSTALL)
X-      $(mkinstalldirs) $(DESTDIR)$(docdir)
X-      @list='$(doc_DATA)'; for p in $$list; do \
X-        if test -f $(srcdir)/$$p; then \
X-          echo " $(INSTALL_DATA) $(srcdir)/$$p
$(DESTDIR)$(docdir)/$$p"; \
X-          $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \
X-        else if test -f $$p; then \
X-          echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
X-          $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
X-        fi; fi; \
X-      done
X
X uninstall-docDATA:
X-      @$(NORMAL_UNINSTALL)
X-      list='$(doc_DATA)'; for p in $$list; do \
X-        rm -f $(DESTDIR)$(docdir)/$$p; \
X-      done
X+
X tags: TAGS
X TAGS:
X
END-of-/usr/ports/games/prboom/files/patch-doc-Makefile.in
echo x - /usr/ports/games/prboom/files/patch-src-Makefile.in
sed 's/^X//' >/usr/ports/games/prboom/files/patch-src-Makefile.in <<
'END-of-/usr/ports/games/prboom/files/patch-src-Makefile.in'
X--- src/Makefile.in.orig       Sun Apr  1 02:14:08 2001
X+++ src/Makefile.in    Sun Jun 10 16:44:19 2001
X@@ -97,7 +97,7 @@
X
X SUBDIRS = SDL POSIX
X
X-gamesdir = $(prefix)/games
X+gamesdir = $(prefix)/bin
X EXTRA_PROGRAMS = prboom-game-server
X games_PROGRAMS = prboom @BUILD_SERVER@
X
END-of-/usr/ports/games/prboom/files/patch-src-Makefile.in
echo x - /usr/ports/games/prboom/files/patch-src-p_maputl.h
sed 's/^X//' >/usr/ports/games/prboom/files/patch-src-p_maputl.h <<
'END-of-/usr/ports/games/prboom/files/patch-src-p_maputl.h'
X--- src/p_maputl.h.orig        Sun Sep  5 21:50:37 2004
X+++ src/p_maputl.h          Sun Sep  5 21:50:37 2004
X@@ -82,7 +82,7 @@
X void    P_SetThingPosition(mobj_t *thing);
X boolean P_BlockLinesIterator (int x, int y, boolean func(line_t *));
X boolean P_BlockThingsIterator(int x, int y, boolean func(mobj_t *));
X-boolean ThingIsOnLine(const mobj_t *t, const line_t *l);  /* killough
3/15/98 */
X+boolean CONSTFUNC ThingIsOnLine(const mobj_t *t, const line_t *l);  /*
killough 3/15/98 */
X boolean P_PathTraverse(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
X                        int flags, boolean trav(intercept_t *));
X
END-of-/usr/ports/games/prboom/files/patch-src-p_maputl.h
exit
--- prboom-2-2-4 ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:
 release (version 2.2.4) with a patch that fixes a compile issue with GCC
 3.4



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1094502568.4369.6.camel>