Index: head/games/q3cellshading/Makefile
===================================================================
--- head/games/q3cellshading/Makefile	(revision 149170)
+++ head/games/q3cellshading/Makefile	(revision 149171)
@@ -1,50 +1,57 @@
 # New ports collection makefile for:	quake3
 # Date created:				23 August 2005
 # Whom:					pypt
 #
 # $FreeBSD$
 #
 
 PORTNAME=	quake3
 PORTVERSION=	1.32b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/ \
 		http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
 		http://www.planetgargoyle.com/ \
 		http://www.teamdarkside.net/ \
 		http://0day.icculus.org/mirrors/quake3/ \
 		http://www.olpainless.net/files/
 DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
 
 MAINTAINER=	shirshegsm@gmail.com
 COMMENT=	Quake III Arena -- first person shooter (native build)
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
 USE_GL=		yes
+USE_GCC=	3.2+
 
 PLIST_FILES=	bin/q3ded bin/quake3
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%Q3DIR%%|"${Q3DIR}"|' \
 		${WRKSRC}/code/unix/unix_shared.c
 
 pre-build:
 	${MKDIR} ${WRKSRC}/lcc/build
 
 do-build:
-	cd ${WRKSRC}/code && ${PERL} unix/cons
+	cd ${WRKSRC}/code && ${MAKE_ENV} ${PERL} unix/cons
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/code/install/linuxq3ded \
 		${PREFIX}/bin/q3ded
 	${INSTALL_PROGRAM} ${WRKSRC}/code/install/linuxquake3 \
 		${PREFIX}/bin/quake3
 
 .include "${.CURDIR}/../quake3-data/Makefile.include"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Property changes on: head/games/q3cellshading/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/games/q3cellshading/files/patch-code-Construct
===================================================================
--- head/games/q3cellshading/files/patch-code-Construct	(revision 149170)
+++ head/games/q3cellshading/files/patch-code-Construct	(revision 149171)
@@ -1,58 +1,69 @@
---- code/Construct	Mon Aug 15 23:56:27 2005
-+++ ../../work/quake3-1.32b/code/Construct	Sun Aug 28 23:13:56 2005
+--- /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct.orig	Mon Aug 15 20:56:27 2005
++++ /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct	Wed Nov 23 10:37:04 2005
 @@ -19,8 +19,8 @@
  use Cons_gcc;
  
  # defaults
 -$config = 'debug';
 -$do_smp = 1;
 +$config = 'release';
 +$do_smp = 0;
  $do_masterserver = 0;
  $do_authserver = 0;
  $do_authport = 0;
+@@ -32,8 +32,8 @@
+ $DO_WIN32 = 0;
+ $NO_VM = 0;
+ $NO_SO = 0;
+-$CC='gcc';
+-$CXX='g++';
++$CC=$ENV{CC};
++$CXX=$ENV{CXX};
+ 
+ # detect an sdk build (don't attempt client build and other things)
+ if ( -r 'unix/Conscript-client' )
 @@ -63,9 +63,9 @@
  else
  {
  	# libc .. do the little magic!
 -	$libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3';
 -	$libc = `$libc_cmd`;
 -	chop ($libc);
 +	# $libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3';
 +	# $libc = `$libc_cmd`;
 +	# chop ($libc);
  }
  
  if ($DO_WIN32 eq 1)
 @@ -227,7 +227,7 @@
  # build the config directory
  $CONFIG_DIR = $config . '-' . $cpu . '-' . $OS . '-' . $libc;
  
 -$COMMON_CFLAGS = '-pipe -fsigned-char ';
 +$COMMON_CFLAGS = '-pipe -fsigned-char -I/usr/local/include -L/usr/local/lib -I/usr/X11R6/include -L/usr/X11R6/lib ';
  
  if ($config eq 'debug')
  {
 @@ -237,7 +237,7 @@
  }
  else
  {
 -  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
 +  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -march=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
  	$BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp ';
  }
  
 @@ -287,11 +287,11 @@
    system("mkdir qvmtools 2>/dev/null");
    if (@_[0] eq 'q3lcc')
    {
 -    system("cd ../lcc ; make all ; cp /tmp/lcc ../code/qvmtools/q3lcc ; cp /tmp/rcc ../code/qvmtools/q3rcc ; cp /tmp/cpp ../code/qvmtools/q3cpp");
 +    system("cd ../lcc ; gmake all ; cp ../lcc/build/lcc ../code/qvmtools/q3lcc ; cp ../lcc/build/rcc ../code/qvmtools/q3rcc ; cp ../lcc/build/cpp ../code/qvmtools/q3cpp");
    }
    elsif (@_[0] eq 'q3asm')
    {
 -    system("cd ../q3asm ; make ; cp q3asm ../code/qvmtools");
 +    system("cd ../q3asm ; gmake ; cp q3asm ../code/qvmtools");
    }
    else
    {

Property changes on: head/games/q3cellshading/files/patch-code-Construct
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/games/q3cellshading/files/patch-code-qcommon-common.c
===================================================================
--- head/games/q3cellshading/files/patch-code-qcommon-common.c	(revision 149170)
+++ head/games/q3cellshading/files/patch-code-qcommon-common.c	(revision 149171)
@@ -1,19 +1,19 @@
-diff -ruN ./code/qcommon/common.c ../quake3-1.32b-BUILT/./code/qcommon/common.c
---- ./code/qcommon/common.c	Tue Aug 16 02:10:07 2005
-+++ ../quake3-1.32b-BUILT/./code/qcommon/common.c	Mon Aug 22 21:03:32 2005
-@@ -24,15 +24,7 @@
+--- code/qcommon/common.c.orig	Mon Aug 15 23:10:07 2005
++++ code/qcommon/common.c	Wed Nov 23 10:53:29 2005
+@@ -24,15 +24,8 @@
  #include "../game/q_shared.h"
  #include "qcommon.h"
  #include <setjmp.h>
 -#ifdef __linux__
++#include <sys/types.h>
  #include <netinet/in.h>
 -#else
 -#if defined(MACOS_X)
 -#include <netinet/in.h>
 -#else
 -#include <winsock.h>
 -#endif
 -#endif
  
  int demo_protocols[] =
  { 66, 67, 68, 0 };

Property changes on: head/games/q3cellshading/files/patch-code-qcommon-common.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/games/q3cellshading/files/patch-code-unix-cons
===================================================================
--- head/games/q3cellshading/files/patch-code-unix-cons	(revision 149170)
+++ head/games/q3cellshading/files/patch-code-unix-cons	(revision 149171)
@@ -1,21 +1,27 @@
-diff -ruN ./code/unix/cons ../quake3-1.32b-BUILT/./code/unix/cons
---- ./code/unix/cons	Fri Jun 14 15:01:32 2002
-+++ ../quake3-1.32b-BUILT/./code/unix/cons	Tue Aug 23 14:21:45 2005
-@@ -271,7 +271,7 @@
+--- /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons.orig	Fri Jun 14 13:01:32 2002
++++ /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons	Wed Nov 23 10:32:49 2005
+@@ -271,11 +271,11 @@
       # Defaults for a typical (?) UNIX platform.
       # Your mileage may vary.
       'unix' => [
 -		'CC'             => 'cc',
-+		'CC'             => 'gcc',
- 		'CFLAGS'         => '',
+-		'CFLAGS'         => '',
++		'CC'             => $ENV{CC},
++		'CFLAGS'         => $ENV{CFLAGS},
  		'CCCOM'          => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
- 		'CXX'            => '%CC',
+-		'CXX'            => '%CC',
+-		'CXXFLAGS'       => '%CFLAGS',
++		'CXX'            => $ENV{CXX},
++		'CXXFLAGS'       => $ENV{CXXFLAGS},
+ 		'CXXCOM'         => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>',
+ 		'INCDIRPREFIX'   => '-I',
+ 		'INCDIRSUFFIX'   => '',
 @@ -294,7 +294,7 @@
  		'LD'             => 'ld',
  		'LDFLAGS'        => '',
  		'PREFLIB'        => 'lib',
 -		'ENV'            => { 'PATH' => '/bin:/usr/bin' },
 +		'ENV'            => { 'PATH' => '/bin:/usr/bin:/usr/local/bin' },
  		],
       );
  

Property changes on: head/games/q3cellshading/files/patch-code-unix-cons
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/games/quake3/Makefile
===================================================================
--- head/games/quake3/Makefile	(revision 149170)
+++ head/games/quake3/Makefile	(revision 149171)
@@ -1,50 +1,57 @@
 # New ports collection makefile for:	quake3
 # Date created:				23 August 2005
 # Whom:					pypt
 #
 # $FreeBSD$
 #
 
 PORTNAME=	quake3
 PORTVERSION=	1.32b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/ \
 		http://www.proarena.com/p/ftpx/x8524/quake_3_arena/ \
 		http://www.planetgargoyle.com/ \
 		http://www.teamdarkside.net/ \
 		http://0day.icculus.org/mirrors/quake3/ \
 		http://www.olpainless.net/files/
 DISTFILES=	${DISTNAME}-source${EXTRACT_SUFX}
 
 MAINTAINER=	shirshegsm@gmail.com
 COMMENT=	Quake III Arena -- first person shooter (native build)
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
 USE_GL=		yes
+USE_GCC=	3.2+
 
 PLIST_FILES=	bin/q3ded bin/quake3
 
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%Q3DIR%%|"${Q3DIR}"|' \
 		${WRKSRC}/code/unix/unix_shared.c
 
 pre-build:
 	${MKDIR} ${WRKSRC}/lcc/build
 
 do-build:
-	cd ${WRKSRC}/code && ${PERL} unix/cons
+	cd ${WRKSRC}/code && ${MAKE_ENV} ${PERL} unix/cons
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/code/install/linuxq3ded \
 		${PREFIX}/bin/q3ded
 	${INSTALL_PROGRAM} ${WRKSRC}/code/install/linuxquake3 \
 		${PREFIX}/bin/quake3
 
 .include "${.CURDIR}/../quake3-data/Makefile.include"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Property changes on: head/games/quake3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/games/quake3/files/patch-code-Construct
===================================================================
--- head/games/quake3/files/patch-code-Construct	(revision 149170)
+++ head/games/quake3/files/patch-code-Construct	(revision 149171)
@@ -1,58 +1,69 @@
---- code/Construct	Mon Aug 15 23:56:27 2005
-+++ ../../work/quake3-1.32b/code/Construct	Sun Aug 28 23:13:56 2005
+--- /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct.orig	Mon Aug 15 20:56:27 2005
++++ /work/a/ports/games/quake3/work/quake3-1.32b/code/Construct	Wed Nov 23 10:37:04 2005
 @@ -19,8 +19,8 @@
  use Cons_gcc;
  
  # defaults
 -$config = 'debug';
 -$do_smp = 1;
 +$config = 'release';
 +$do_smp = 0;
  $do_masterserver = 0;
  $do_authserver = 0;
  $do_authport = 0;
+@@ -32,8 +32,8 @@
+ $DO_WIN32 = 0;
+ $NO_VM = 0;
+ $NO_SO = 0;
+-$CC='gcc';
+-$CXX='g++';
++$CC=$ENV{CC};
++$CXX=$ENV{CXX};
+ 
+ # detect an sdk build (don't attempt client build and other things)
+ if ( -r 'unix/Conscript-client' )
 @@ -63,9 +63,9 @@
  else
  {
  	# libc .. do the little magic!
 -	$libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3';
 -	$libc = `$libc_cmd`;
 -	chop ($libc);
 +	# $libc_cmd = '/lib/libc.so.6 |grep "GNU C "|grep version|awk -F "version " \'{ print $2 }\'|cut -b -3';
 +	# $libc = `$libc_cmd`;
 +	# chop ($libc);
  }
  
  if ($DO_WIN32 eq 1)
 @@ -227,7 +227,7 @@
  # build the config directory
  $CONFIG_DIR = $config . '-' . $cpu . '-' . $OS . '-' . $libc;
  
 -$COMMON_CFLAGS = '-pipe -fsigned-char ';
 +$COMMON_CFLAGS = '-pipe -fsigned-char -I/usr/local/include -L/usr/local/lib -I/usr/X11R6/include -L/usr/X11R6/lib ';
  
  if ($config eq 'debug')
  {
 @@ -237,7 +237,7 @@
  }
  else
  {
 -  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -mcpu=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
 +  $BASE_CFLAGS = $COMMON_CFLAGS . '-DNDEBUG -O6 -march=pentiumpro -march=pentium -fomit-frame-pointer -ffast-math -falign-loops=2 -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing -fstrength-reduce ';
  	$BSPC_BASE_CFLAGS = $BASE_CFLAGS . '-DLINUX -DBSPC -Dstricmp=strcasecmp ';
  }
  
 @@ -287,11 +287,11 @@
    system("mkdir qvmtools 2>/dev/null");
    if (@_[0] eq 'q3lcc')
    {
 -    system("cd ../lcc ; make all ; cp /tmp/lcc ../code/qvmtools/q3lcc ; cp /tmp/rcc ../code/qvmtools/q3rcc ; cp /tmp/cpp ../code/qvmtools/q3cpp");
 +    system("cd ../lcc ; gmake all ; cp ../lcc/build/lcc ../code/qvmtools/q3lcc ; cp ../lcc/build/rcc ../code/qvmtools/q3rcc ; cp ../lcc/build/cpp ../code/qvmtools/q3cpp");
    }
    elsif (@_[0] eq 'q3asm')
    {
 -    system("cd ../q3asm ; make ; cp q3asm ../code/qvmtools");
 +    system("cd ../q3asm ; gmake ; cp q3asm ../code/qvmtools");
    }
    else
    {

Property changes on: head/games/quake3/files/patch-code-Construct
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/games/quake3/files/patch-code-qcommon-common.c
===================================================================
--- head/games/quake3/files/patch-code-qcommon-common.c	(revision 149170)
+++ head/games/quake3/files/patch-code-qcommon-common.c	(revision 149171)
@@ -1,19 +1,19 @@
-diff -ruN ./code/qcommon/common.c ../quake3-1.32b-BUILT/./code/qcommon/common.c
---- ./code/qcommon/common.c	Tue Aug 16 02:10:07 2005
-+++ ../quake3-1.32b-BUILT/./code/qcommon/common.c	Mon Aug 22 21:03:32 2005
-@@ -24,15 +24,7 @@
+--- code/qcommon/common.c.orig	Mon Aug 15 23:10:07 2005
++++ code/qcommon/common.c	Wed Nov 23 10:53:29 2005
+@@ -24,15 +24,8 @@
  #include "../game/q_shared.h"
  #include "qcommon.h"
  #include <setjmp.h>
 -#ifdef __linux__
++#include <sys/types.h>
  #include <netinet/in.h>
 -#else
 -#if defined(MACOS_X)
 -#include <netinet/in.h>
 -#else
 -#include <winsock.h>
 -#endif
 -#endif
  
  int demo_protocols[] =
  { 66, 67, 68, 0 };

Property changes on: head/games/quake3/files/patch-code-qcommon-common.c
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/games/quake3/files/patch-code-unix-cons
===================================================================
--- head/games/quake3/files/patch-code-unix-cons	(revision 149170)
+++ head/games/quake3/files/patch-code-unix-cons	(revision 149171)
@@ -1,21 +1,27 @@
-diff -ruN ./code/unix/cons ../quake3-1.32b-BUILT/./code/unix/cons
---- ./code/unix/cons	Fri Jun 14 15:01:32 2002
-+++ ../quake3-1.32b-BUILT/./code/unix/cons	Tue Aug 23 14:21:45 2005
-@@ -271,7 +271,7 @@
+--- /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons.orig	Fri Jun 14 13:01:32 2002
++++ /work/a/ports/games/quake3/work/quake3-1.32b/code/unix/cons	Wed Nov 23 10:32:49 2005
+@@ -271,11 +271,11 @@
       # Defaults for a typical (?) UNIX platform.
       # Your mileage may vary.
       'unix' => [
 -		'CC'             => 'cc',
-+		'CC'             => 'gcc',
- 		'CFLAGS'         => '',
+-		'CFLAGS'         => '',
++		'CC'             => $ENV{CC},
++		'CFLAGS'         => $ENV{CFLAGS},
  		'CCCOM'          => '%CC %CFLAGS %_IFLAGS -c %< -o %>',
- 		'CXX'            => '%CC',
+-		'CXX'            => '%CC',
+-		'CXXFLAGS'       => '%CFLAGS',
++		'CXX'            => $ENV{CXX},
++		'CXXFLAGS'       => $ENV{CXXFLAGS},
+ 		'CXXCOM'         => '%CXX %CXXFLAGS %_IFLAGS -c %< -o %>',
+ 		'INCDIRPREFIX'   => '-I',
+ 		'INCDIRSUFFIX'   => '',
 @@ -294,7 +294,7 @@
  		'LD'             => 'ld',
  		'LDFLAGS'        => '',
  		'PREFLIB'        => 'lib',
 -		'ENV'            => { 'PATH' => '/bin:/usr/bin' },
 +		'ENV'            => { 'PATH' => '/bin:/usr/bin:/usr/local/bin' },
  		],
       );
  

Property changes on: head/games/quake3/files/patch-code-unix-cons
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property