diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2001-11-11 23:20:02 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2001-11-11 23:20:02 +0000 |
| commit | 50a80bb849e6bfc34b9f701d2370fe360bf4e6fb (patch) | |
| tree | 658e3e0519e3f957ba2071fa12ab14610212234b /games/prboom | |
| parent | Add LATEST_LINK to avoid conflict with www/linux-netscape4 package. (diff) | |
Update to prboom 2.2.2 and respect CFLAGS
Reviewed by: maintainer
Notes
Notes:
svn path=/head/; revision=49948
Diffstat (limited to 'games/prboom')
| -rw-r--r-- | games/prboom/Makefile | 4 | ||||
| -rw-r--r-- | games/prboom/distinfo | 2 | ||||
| -rw-r--r-- | games/prboom/files/patch-configure | 47 |
3 files changed, 47 insertions, 6 deletions
diff --git a/games/prboom/Makefile b/games/prboom/Makefile index 35112bbfdf86..cedb2f13683c 100644 --- a/games/prboom/Makefile +++ b/games/prboom/Makefile @@ -6,7 +6,7 @@ # PORTNAME= prboom -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,7 +23,7 @@ SDL_CONFIG= ${LOCALBASE}/bin/sdl11-config USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= SDL_CONFIG="${SDL_CONFIG}" \ - CFLAGS="-I${LOCALBASE}/include" \ + CFLAGS+="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN5= boom.cfg.5 diff --git a/games/prboom/distinfo b/games/prboom/distinfo index 7fc2d75f1d54..6b8f36a6722b 100644 --- a/games/prboom/distinfo +++ b/games/prboom/distinfo @@ -1 +1 @@ -MD5 (prboom-2.2.1.tar.gz) = 9d8201e1aad27cd66a355a42a24ca2df +MD5 (prboom-2.2.2.tar.gz) = 90becb895114ab04fbb0644751a3d80b diff --git a/games/prboom/files/patch-configure b/games/prboom/files/patch-configure index 4c89c7c17a31..cda1ea5e866b 100644 --- a/games/prboom/files/patch-configure +++ b/games/prboom/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Mar 31 12:50:28 2001 -+++ configure Sun Jun 10 16:41:12 2001 -@@ -920,9 +920,9 @@ +--- 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 @@ -12,3 +12,44 @@ 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" +@@ -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 |