Index: head/games/glbsp/Makefile
===================================================================
--- head/games/glbsp/Makefile	(revision 427288)
+++ head/games/glbsp/Makefile	(revision 427289)
@@ -1,52 +1,52 @@
 # Created by: Igor Pokrovsky <tiamat@comset.net>
 # $FreeBSD$
 
 PORTNAME=	glbsp
 PORTVERSION=	2.20
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	BSP node builder for OpenGL ports of the DOOM game engine
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING.txt
+
 USES=		gmake
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}
 
-OPTIONS_DEFINE=	GUI PLUGIN DOCS
-GUI_DESC=	Build FLTK based GUI
-PLUGIN_DESC=	Build plugin used in DOOM engines
-OPTIONS_SUB=	yes
-
 PORTDOCS=	README.txt USAGE.txt
 
+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
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -i '' -e 's|CC=|CC\?=|; s|CFLAGS=|CFLAGS\+=|' \
 		${WRKSRC}/Makefile ${WRKSRC}/Plugin_unx.mak
 
-post-build:
-.if ${PORT_OPTIONS:MGUI}
+post-build-GUI-on:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f GUI_unx.mak all
-.endif
-.if ${PORT_OPTIONS:MPLUGIN}
+
+post-build-PLUGIN-on:
 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC} -f Plugin_unx.mak all
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MGUI}
+	${INSTALL_MAN} ${WRKSRC}/glbsp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+do-install-GUI-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${STAGEDIR}${PREFIX}/bin
-.endif
-.if ${PORT_OPTIONS:MPLUGIN}
+
+do-install-PLUGIN-on:
 	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${STAGEDIR}${PREFIX}/lib
-.endif
-	${INSTALL_MAN} ${WRKSRC}/glbsp.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/glbsp/files/patch-GUI_unx.mak
===================================================================
--- head/games/glbsp/files/patch-GUI_unx.mak	(revision 427288)
+++ head/games/glbsp/files/patch-GUI_unx.mak	(revision 427289)
@@ -1,26 +1,26 @@
---- ./GUI_unx.mak.orig	2005-09-16 02:29:39.000000000 -0300
-+++ ./GUI_unx.mak	2013-11-01 20:56:43.000000000 -0200
-@@ -8,16 +8,16 @@
+--- 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     \
Index: head/games/glbsp/files/patch-wad.c
===================================================================
--- head/games/glbsp/files/patch-wad.c	(revision 427288)
+++ head/games/glbsp/files/patch-wad.c	(revision 427289)
@@ -1,18 +1,18 @@
---- ./wad.c.orig	2005-09-13 07:19:36.000000000 -0300
-+++ ./wad.c	2013-11-01 20:55:13.000000000 -0200
-@@ -1632,14 +1632,13 @@
+--- 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;