Date: Fri, 1 Nov 2013 23:28:31 +0000 (UTC) From: Danilo Egea Gondolfo <danilo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332424 - in head/games/glbsp: . files Message-ID: <201311012328.rA1NSVRE001865@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danilo Date: Fri Nov 1 23:28:31 2013 New Revision: 332424 URL: http://svnweb.freebsd.org/changeset/ports/332424 Log: - Add stage support - Convert USE_GMAKE to USES - Convert LIB_DEPENDS to new syntax - Use options helpers - Fix build with clang Modified: head/games/glbsp/Makefile head/games/glbsp/files/patch-GUI_unx.mak head/games/glbsp/files/patch-wad.c head/games/glbsp/pkg-plist Modified: head/games/glbsp/Makefile ============================================================================== --- head/games/glbsp/Makefile Fri Nov 1 23:22:49 2013 (r332423) +++ head/games/glbsp/Makefile Fri Nov 1 23:28:31 2013 (r332424) @@ -11,31 +11,19 @@ DISTNAME= ${PORTNAME}_src_${PORTVERSION: MAINTAINER= ports@FreeBSD.org COMMENT= BSP node builder for OpenGL ports of the DOOM game engine -USE_GMAKE= yes +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 -MAN1= glbsp.1 PORTDOCS= README.txt USAGE.txt -NO_STAGE= yes -.include <bsd.port.options.mk> +GUI_LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk -.if ${PORT_OPTIONS:MGUI} -LIB_DEPENDS+= fltk.1:${PORTSDIR}/x11-toolkits/fltk -PLIST_SUB= GUI_VERSION="" -.else -PLIST_SUB= GUI_VERSION="@comment " -.endif - -.if ${PORT_OPTIONS:MPLUGIN} -PLIST_SUB+= PLUGIN="" -.else -PLIST_SUB+= PLUGIN="@comment " -.endif +.include <bsd.port.options.mk> post-patch: @${REINPLACE_CMD} -i '' -e 's|CC=|CC\?=|; s|CFLAGS=|CFLAGS\+=|' \ @@ -50,18 +38,15 @@ post-build: .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/glbsp ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MGUI} - ${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${STAGEDIR}${PREFIX}/bin .endif .if ${PORT_OPTIONS:MPLUGIN} - ${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${PREFIX}/lib -.endif - - ${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${MANPREFIX}/man/man1 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${STAGEDIR}${PREFIX}/lib .endif + ${INSTALL_MAN} ${WRKSRC}/glbsp.1 ${STAGEDIR}${MANPREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/games/glbsp/files/patch-GUI_unx.mak ============================================================================== --- head/games/glbsp/files/patch-GUI_unx.mak Fri Nov 1 23:22:49 2013 (r332423) +++ head/games/glbsp/files/patch-GUI_unx.mak Fri Nov 1 23:28:31 2013 (r332424) @@ -1,6 +1,6 @@ ---- GUI_unx.mak.orig 2005-09-16 07:29:39.000000000 +0200 -+++ GUI_unx.mak 2010-01-08 15:40:37.000000000 +0100 -@@ -8,16 +8,15 @@ +--- ./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 @@ PROGNAME=glBSPX @@ -10,7 +10,8 @@ - -lfltk -lX11 -lXext +FLTK_PREFIX=${LOCALBASE} +FLTK_CFLAGS=`fltk-config --use-images --cflags` -+FLTK_LIBS=`fltk-config --use-images --ldflags` ++FLTK_LIBSTMP=$(shell fltk-config --use-images --ldflags) ++FLTK_LIBS=$(subst -R,-L,$(FLTK_LIBSTMP)) -CC=gcc -CXX=g++ Modified: head/games/glbsp/files/patch-wad.c ============================================================================== --- head/games/glbsp/files/patch-wad.c Fri Nov 1 23:22:49 2013 (r332423) +++ head/games/glbsp/files/patch-wad.c Fri Nov 1 23:28:31 2013 (r332424) @@ -1,6 +1,6 @@ ---- wad.c.orig -+++ wad.c -@@ -1632,13 +1632,12 @@ +--- ./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 @@ void ReportV5Switches(void) { lump_t *cur; @@ -10,8 +10,9 @@ "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; +- int saw_zdbsp = FALSE; +- for (cur=wad.dir_head; cur; cur=cur->next) { + level_t *lev = cur->lev_info; Modified: head/games/glbsp/pkg-plist ============================================================================== --- head/games/glbsp/pkg-plist Fri Nov 1 23:22:49 2013 (r332423) +++ head/games/glbsp/pkg-plist Fri Nov 1 23:28:31 2013 (r332424) @@ -1,3 +1,4 @@ bin/glbsp -%%GUI_VERSION%%bin/glBSPX +man/man1/glbsp.1.gz +%%GUI%%bin/glBSPX %%PLUGIN%%lib/libglbsp.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311012328.rA1NSVRE001865>