4 files changed, 30 insertions, 30 deletions

diff --git a/games/glbsp/Makefile b/games/glbsp/Makefile
index 809bd2a7238b..544ea5f33b4e 100644
--- a/games/glbsp/Makefile
+++ b/games/glbsp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	glbsp
-PORTVERSION=	2.05
-PORTREVISION=	1
+PORTVERSION=	2.10c
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,7 +22,7 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}
 
 .if !defined (WITH_GUI_VERSION)
 PLIST_SUB=	GUI_VERSION="@comment "
@@ -39,23 +38,20 @@ pre-everything::
 .endif
 
 .ifdef (WITH_GUI_VERSION)
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%FLTK_CONFIG%%|${X11BASE}\/bin\/fltk-config|g' \
-		${WRKSRC}/fltk/makefile.unx
-.endif
-
-do-build:
-	${SETENV} CC=${CC} "CFLAGS=${CFLAGS}" \
-		${GMAKE} -C ${WRKSRC}/cmdline -f makefile.unx all
-.ifdef (WITH_GUI_VERSION)
-	${SETENV} CC=${CC} CXX=${CXX} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" \
-		${GMAKE} -C ${WRKSRC}/fltk -f makefile.unx all
+post-build:
+	${SETENV} CC=${CC} \
+		  CXX=${CXX} \
+		  CFLAGS="${CFLAGS}" \
+		  CXXFLAGS="${CXXFLAGS}" \
+		  X11BASE=${X11BASE} \
+		  LOCALBASE=${LOCALBASE} \
+		${GMAKE} -C ${WRKSRC} -f GUI.mak all
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cmdline/glbsp ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${PREFIX}/bin
 .ifdef (WITH_GUI_VERSION)
-	${INSTALL_PROGRAM} ${WRKSRC}/fltk/glBSPX ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${PREFIX}/bin
 .endif
 
 .ifndef (NOPORTDOCS)
diff --git a/games/glbsp/distinfo b/games/glbsp/distinfo
index 2a82a0aef670..8f61864b9c44 100644
--- a/games/glbsp/distinfo
+++ b/games/glbsp/distinfo
@@ -1,2 +1,2 @@
-MD5 (glbsp_src_205.tar.gz) = fd6779afb5fb8ffe5f266fe038584ac9
-SIZE (glbsp_src_205.tar.gz) = 179352
+MD5 (glbsp_src_210c.tar.gz) = 6d4891492866543ee81febf8b2b19dfb
+SIZE (glbsp_src_210c.tar.gz) = 184427
diff --git a/games/glbsp/files/patch-fltk-makefile.unx b/games/glbsp/files/patch-GUI.mak
index 1110fa178986..0ca2a31b913f 100644
--- a/games/glbsp/files/patch-fltk-makefile.unx
+++ b/games/glbsp/files/patch-GUI.mak
@@ -1,24 +1,25 @@
---- fltk/makefile.unx.orig	Thu Jan 22 12:32:28 2004
-+++ fltk/makefile.unx	Thu Jan 22 12:35:18 2004
+
+$FreeBSD$
+
+--- GUI.mak.orig
++++ GUI.mak
 @@ -8,14 +8,14 @@
  
  PROGNAME=glBSPX
  
 -FLTK_CFLAGS=-I/usr/local/lib
--FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
-+FLTK_CFLAGS=`%%FLTK_CONFIG%% --cflags`
-+FLTK_LIBS=`%%FLTK_CONFIG%% --ldflags` -lfltk_images
++FLTK_CFLAGS=-I${X11BASE}/include
+ FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
  
 -CC=gcc
 -CXX=g++
 -CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
--CXXFLAGS=$(CFLAGS)
--LDFLAGS=-L/usr/X11R6/lib
 +CC?=gcc
 +CXX?=g++
 +CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
-+CXXFLAGS+=$(CFLAGS)
-+LDFLAGS=-L${X11BASE}/lib
+ CXXFLAGS=$(CFLAGS)
+-LDFLAGS=-L/usr/X11R6/lib
++LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib
  LIBS=-lm $(FLTK_LIBS)
  
  OBJS=$(SYSDIR)/main.o     \
diff --git a/games/glbsp/files/patch-cmdline-makefile.unx b/games/glbsp/files/patch-Makefile
index 6e96f89e26f0..9165a5474026 100644
--- a/games/glbsp/files/patch-cmdline-makefile.unx
+++ b/games/glbsp/files/patch-Makefile
@@ -1,12 +1,15 @@
---- cmdline/makefile.unx.orig	Thu Jan 22 12:16:08 2004
-+++ cmdline/makefile.unx	Thu Jan 22 12:18:10 2004
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
 @@ -8,8 +8,8 @@
  
  PROGNAME=glbsp
  
 -CC=cc
 -CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
-+CC?=gcc
++CC?=cc
 +CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
  LIBS=-lm