Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Nov 2016 09:00:44 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r427289 - in head/games/glbsp: . files
Message-ID:  <201611280900.uAS90iv7074586@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Nov 28 09:00:44 2016
New Revision: 427289
URL: https://svnweb.freebsd.org/changeset/ports/427289

Log:
  - Add LICENSE
  - Switch to options helpers
  - Regenerate patches

Modified:
  head/games/glbsp/Makefile
  head/games/glbsp/files/patch-GUI_unx.mak
  head/games/glbsp/files/patch-wad.c

Modified: head/games/glbsp/Makefile
==============================================================================
--- head/games/glbsp/Makefile	Mon Nov 28 08:40:29 2016	(r427288)
+++ head/games/glbsp/Makefile	Mon Nov 28 09:00:44 2016	(r427289)
@@ -11,41 +11,41 @@ DISTNAME=	${PORTNAME}_src_${PORTVERSION:
 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}
 

Modified: head/games/glbsp/files/patch-GUI_unx.mak
==============================================================================
--- head/games/glbsp/files/patch-GUI_unx.mak	Mon Nov 28 08:40:29 2016	(r427288)
+++ head/games/glbsp/files/patch-GUI_unx.mak	Mon Nov 28 09:00:44 2016	(r427289)
@@ -1,6 +1,6 @@
---- ./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
  

Modified: head/games/glbsp/files/patch-wad.c
==============================================================================
--- head/games/glbsp/files/patch-wad.c	Mon Nov 28 08:40:29 2016	(r427288)
+++ head/games/glbsp/files/patch-wad.c	Mon Nov 28 09:00:44 2016	(r427289)
@@ -1,6 +1,6 @@
---- ./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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611280900.uAS90iv7074586>