games/glbsp: update the port to version 2.24 + miscellaneous fixes

- Catch up with new improved directory layout: the main code moved
  into the ``src'' subdirectory; existing makefiles had been fixed
  and consolidated so each type of target (lib/cmdline/gui) is now
  handled in the same makefile
- Drop PLUGIN option and simply install the header file and static
  library for consumer ports' convenience
- Install more complete set of documentation files while I'm at it

6 files changed, 74 insertions, 72 deletions

diff --git a/games/glbsp/Makefile b/games/glbsp/Makefile
index 2545811194a7..550226d383e8 100644
--- a/games/glbsp/Makefile
+++ b/games/glbsp/Makefile
@@ -1,48 +1,43 @@
 PORTNAME=	glbsp
-PORTVERSION=	2.20
-PORTREVISION=	1
+PORTVERSION=	2.24
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/.//}
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	BSP node builder for OpenGL ports of the DOOM game engine
+COMMENT=	BSP node builder for OpenGL-based DOOM engines
 WWW=		https://glbsp.sourceforge.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 USES=		gmake
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}
+MAKEFILE=	Makefile.unx
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 
-PORTDOCS=	README.txt USAGE.txt
+PORTDOCS=	AUTHORS.txt CHANGES.txt README.txt TRICKS.txt USAGE.txt
+PLIST_FILES=	bin/glbsp man/man1/glbsp.1.gz include/glbsp.h lib/libglbsp.a
 
-OPTIONS_DEFINE=	GUI PLUGIN DOCS
-OPTIONS_SUB=	yes
-PLUGIN_DESC=	Build plugin used in DOOM engines
-GUI_DESC=	Build FLTK based GUI
-GUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk
-
-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's|CC=|CC\?=|; s|CFLAGS=|CFLAGS\+=|' \
-		${WRKSRC}/Makefile ${WRKSRC}/Plugin_unx.mak
+OPTIONS_DEFINE=	DOCS GUI
 
-post-build-GUI-on:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f GUI_unx.mak all
-
-post-build-PLUGIN-on:
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f Plugin_unx.mak all
+GUI_DESC=	Build FLTK based GUI
+GUI_LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
+			libfontconfig.so:x11-fonts/fontconfig \
+			libpng.so:graphics/png
+GUI_USES=	jpeg xorg
+GUI_USE=	XORG=x11,xcursor,xext,xfixes,xft,xinerama,xrender
+GUI_ALL_TARGET=	all glBSPX
+GUI_PLIST_FILES=	bin/glBSPX
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/glbsp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/src/glbsp.h ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-GUI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${STAGEDIR}${PREFIX}/bin
 
-do-install-PLUGIN-on:
-	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${STAGEDIR}${PREFIX}/lib
-
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/games/glbsp/distinfo b/games/glbsp/distinfo
index 627d3a4e8631..6539872ba117 100644
--- a/games/glbsp/distinfo
+++ b/games/glbsp/distinfo
@@ -1,2 +1,3 @@
-SHA256 (glbsp_src_220.tar.gz) = 0b68b82962aff8c66c4663a5283fa28ef1287beb303dc0c09325e1cecaa8e4d3
-SIZE (glbsp_src_220.tar.gz) = 172283
+TIMESTAMP = 1185432952
+SHA256 (glbsp_src_224.tar.gz) = e3b7c4bce21c2f9b77732a9b5920b6877e884b31dd1ed9273776538dba48a75c
+SIZE (glbsp_src_224.tar.gz) = 230977
diff --git a/games/glbsp/files/patch-GUI_unx.mak b/games/glbsp/files/patch-GUI_unx.mak
deleted file mode 100644
index e05e98298208..000000000000
--- a/games/glbsp/files/patch-GUI_unx.mak
+++ /dev/null
@@ -1,26 +0,0 @@
---- GUI_unx.mak.orig	2005-09-16 05:29:39 UTC
-+++ GUI_unx.mak
-@@ -8,16 +8,16 @@ SRC_DIR=glbsp
- 
- PROGNAME=glBSPX
- 
--FLTK_PREFIX=../fltk-1.1.6
--FLTK_CFLAGS=-I$(FLTK_PREFIX) -I$(FLTK_PREFIX)/zlib
--FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg \
--          -lfltk -lX11 -lXext
-+FLTK_PREFIX=${LOCALBASE}
-+FLTK_CFLAGS=`fltk-config --use-images --cflags`
-+FLTK_LIBSTMP=$(shell fltk-config --use-images --ldflags)
-+FLTK_LIBS=$(subst -R,-L,$(FLTK_LIBSTMP))
- 
--CC=gcc
--CXX=g++
-+CC?=gcc
-+CXX?=g++
- CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
- CXXFLAGS=$(CFLAGS)
--LDFLAGS=-L/usr/X11R6/lib
-+LDFLAGS?=-L/usr/X11R6/lib
- LIBS=-lm $(FLTK_LIBS)
- 
- OBJS=$(SYSDIR)/main.o     \
diff --git a/games/glbsp/files/patch-Makefile.unx b/games/glbsp/files/patch-Makefile.unx
new file mode 100644
index 000000000000..fb0a94640312
--- /dev/null
+++ b/games/glbsp/files/patch-Makefile.unx
@@ -0,0 +1,54 @@
+--- Makefile.unx.orig	2007-07-26 03:14:34 UTC
++++ Makefile.unx
+@@ -18,13 +18,13 @@ DOC_NAME=glbsp.txt
+ GUI_NAME=glBSPX
+ DOC_NAME=glbsp.txt
+ 
+-CC=gcc
+-CXX=g++
++CC?=gcc
++CXX?=g++
+ AR=ar rc
+ RANLIB=ranlib
+ STRIP=strip --strip-unneeded
+ 
+-BASE_FLAGS=-Wall -O2 -I./src -DUNIX -DINLINE_G=inline
++BASE_FLAGS=-Wall $(CFLAGS) -I./src -DUNIX -DINLINE_G=inline
+ 
+ FLTK_DIR=./fltk-1.1.7
+ 
+@@ -34,7 +34,7 @@ MAN_PREFIX=$(INSTALL_PREFIX)/share/man
+ 
+ # ----- GENERAL STUFF ----------------------------------------------
+ 
+-all:    $(LIB_NAME) $(CMD_NAME) $(DOC_NAME)
++all:    $(LIB_NAME) $(CMD_NAME)
+ 
+ clean:
+ 	rm -f $(LIB_NAME) $(CMD_NAME) $(GUI_NAME) $(DOC_NAME)
+@@ -80,7 +80,6 @@ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
+ 
+ $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
+ 	$(CC) $(CMD_FLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
+-	$(STRIP) $@
+ 
+ install: $(CMD_NAME)
+ 	cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/
+@@ -94,14 +93,13 @@ install: $(CMD_NAME)
+ 
+ # ----- GUI PROGRAM ---------------------------------------------
+ 
+-FLTK_FLAGS=-I$(FLTK_DIR) -I$(FLTK_DIR)/zlib
+-FLTK_LIBS=-L$(FLTK_DIR)/lib -lfltk_images -lpng -lz -ljpeg \
+-          -lfltk -lX11 -lXext
++FLTK_FLAGS=$(shell fltk-config --use-images --cflags)
++FLTK_LIBS=$(shell fltk-config --use-images --ldflags)
+ 
+ ## may need: -L/usr/X11R6/lib
+ 
+ GUI_FLAGS=$(BASE_FLAGS) $(FLTK_FLAGS)
+-GUI_LIBS=$(FLTK_LIBS) -lm
++GUI_LIBS=$(FLTK_LIBS)
+ 
+ GUI_OBJS=\
+ 	gui/main.o     \
diff --git a/games/glbsp/files/patch-wad.c b/games/glbsp/files/patch-wad.c
deleted file mode 100644
index 2216802a0f36..000000000000
--- a/games/glbsp/files/patch-wad.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- wad.c.orig	2005-09-13 10:19:36 UTC
-+++ wad.c
-@@ -1632,14 +1632,13 @@ void ReportOverflows(boolean_g hard)
- void ReportV5Switches(void)
- {
-   lump_t *cur;
-+  int saw_zdbsp = FALSE;
- 
-   PrintMsg(
-     "V5 FORMAT UPGRADES.  The following levels require a Doom port\n"
-     "which supports V5 GL-Nodes, otherwise they will fail (or crash).\n\n"
-   );
- 
--  int saw_zdbsp = FALSE;
--
-   for (cur=wad.dir_head; cur; cur=cur->next)
-   {
-     level_t *lev = cur->lev_info;
diff --git a/games/glbsp/pkg-plist b/games/glbsp/pkg-plist
deleted file mode 100644
index c55a243659a8..000000000000
--- a/games/glbsp/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/glbsp
-man/man1/glbsp.1.gz
-%%GUI%%bin/glBSPX
-%%PLUGIN%%lib/libglbsp.a