ports/75203: Update port: games/glbsp 2.05 -> 2.10c

[Igor Pokrovsky]

>Number:         75203
>Category:       ports
>Synopsis:       Update port: games/glbsp 2.05 -> 2.10c
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 17 21:20:21 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Mon Nov 22 09:16:46 MSK 2004 root at doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
Update to 2.10c.

Removed files:
	files/patch-cmdline-makefile.unx
	files/patch-fltk-makefile.unx

Added files:
	files/patch-GUI.mak
	files/patch-Makefile
	
>How-To-Repeat:
	
>Fix:

	

--- glbsp.diff begins here ---
diff -ruN /usr/ports/games/glbsp/Makefile glbsp/Makefile
--- /usr/ports/games/glbsp/Makefile	Sun Aug  1 21:22:06 2004
+++ glbsp/Makefile	Sat Dec 18 00:04:05 2004
@@ -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 @@
 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 @@
 .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 -ruN /usr/ports/games/glbsp/distinfo glbsp/distinfo
--- /usr/ports/games/glbsp/distinfo	Wed Mar 31 07:07:53 2004
+++ glbsp/distinfo	Fri Dec 17 23:41:21 2004
@@ -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 -ruN /usr/ports/games/glbsp/files/patch-GUI.mak glbsp/files/patch-GUI.mak
--- /usr/ports/games/glbsp/files/patch-GUI.mak	Thu Jan  1 03:00:00 1970
+++ glbsp/files/patch-GUI.mak	Sat Dec 18 00:01:59 2004
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- GUI.mak.orig
++++ GUI.mak
+@@ -8,14 +8,14 @@
+ 
+ PROGNAME=glBSPX
+ 
+-FLTK_CFLAGS=-I/usr/local/lib
++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)
++CC?=gcc
++CXX?=g++
++CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
+ CXXFLAGS=$(CFLAGS)
+-LDFLAGS=-L/usr/X11R6/lib
++LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib
+ LIBS=-lm $(FLTK_LIBS)
+ 
+ OBJS=$(SYSDIR)/main.o     \
diff -ruN /usr/ports/games/glbsp/files/patch-Makefile glbsp/files/patch-Makefile
--- /usr/ports/games/glbsp/files/patch-Makefile	Thu Jan  1 03:00:00 1970
+++ glbsp/files/patch-Makefile	Fri Dec 17 23:48:02 2004
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
+@@ -8,8 +8,8 @@
+ 
+ PROGNAME=glbsp
+ 
+-CC=cc
+-CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
++CC?=cc
++CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
+ LIBS=-lm
+ 
+ OBJS=$(SYSDIR)/main.o     \
diff -ruN /usr/ports/games/glbsp/files/patch-cmdline-makefile.unx glbsp/files/patch-cmdline-makefile.unx
--- /usr/ports/games/glbsp/files/patch-cmdline-makefile.unx	Fri Jan 23 12:55:33 2004
+++ glbsp/files/patch-cmdline-makefile.unx	Thu Jan  1 03:00:00 1970
@@ -1,13 +0,0 @@
---- cmdline/makefile.unx.orig	Thu Jan 22 12:16:08 2004
-+++ cmdline/makefile.unx	Thu Jan 22 12:18:10 2004
-@@ -8,8 +8,8 @@
- 
- PROGNAME=glbsp
- 
--CC=cc
--CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
-+CC?=gcc
-+CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
- LIBS=-lm
- 
- OBJS=$(SYSDIR)/main.o     \
diff -ruN /usr/ports/games/glbsp/files/patch-fltk-makefile.unx glbsp/files/patch-fltk-makefile.unx
--- /usr/ports/games/glbsp/files/patch-fltk-makefile.unx	Fri Jan 23 12:55:33 2004
+++ glbsp/files/patch-fltk-makefile.unx	Thu Jan  1 03:00:00 1970
@@ -1,24 +0,0 @@
---- fltk/makefile.unx.orig	Thu Jan 22 12:32:28 2004
-+++ fltk/makefile.unx	Thu Jan 22 12:35:18 2004
-@@ -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
- 
--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
- LIBS=-lm $(FLTK_LIBS)
- 
- OBJS=$(SYSDIR)/main.o     \
--- glbsp.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: