Attachment #57229 for bug #86382

View | Details | Raw Unified | Return to bug 86382
Collapse All | Expand All

Lines 6-12 Link Here

(-)glbsp/Makefile (-14 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= glbsp	8	PORTNAME= glbsp
9	PORTVERSION= 2.10c	9	PORTVERSION= 2.20
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 21-51 Link Here
21		21
22	USE_GMAKE= yes	22	USE_GMAKE= yes
23	USE_REINPLACE= yes	23	USE_REINPLACE= yes
		24	MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" X11BASE="${X11BASE}"
24		25
25	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}	26	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/[[:alpha:]]//}
26		27
		28	MAN1= glbsp.1
		29	PORTDOCS= README.txt USAGE.txt
		30
27	.if !defined (WITH_GUI_VERSION)	31	.if !defined (WITH_GUI_VERSION)
28	PLIST_SUB= GUI_VERSION="@comment "	32	PLIST_SUB= GUI_VERSION="@comment "
29	.else	33	.else
30	PLIST_SUB= GUI_VERSION=""	34	PLIST_SUB= GUI_VERSION=""
31	.endif	35	.endif
32		36
33	.ifndef (WITH_GUI_VERSION)	37	.if !defined (WITH_PLUGIN)
		38	PLIST_SUB+= PLUGIN="@comment "
		39	.else
		40	PLIST_SUB+= PLUGIN=""
		41	.endif
		42
34	pre-everything::	43	pre-everything::
35	@${ECHO_CMD} "***********************************************************"	44	.ifndef (WITH_GUI_VERSION)
36	@${ECHO_CMD} "Define WITH_GUI_VERSION=yes to build FLTK based GUI version"	45	@${ECHO_CMD} "Define WITH_GUI_VERSION=yes to build FLTK based GUI version"
37	@${ECHO_CMD} "***********************************************************"	46	.endif
		47	.ifndef (WITH_PLUGIN)
		48	@${ECHO_CMD} "Define WITH_PLUGIN=yes to build plugin version of glBSP used in DOOM engines"
38	.endif	49	.endif
39		50
40	.ifdef (WITH_GUI_VERSION)	51	post-patch:
		52	@${REINPLACE_CMD} -i '' -e 's\|CC=\|CC\?=\|; s\|CFLAGS=\|CFLAGS\+=\|' \
		53	${WRKSRC}/Makefile ${WRKSRC}/Plugin_unx.mak
		54
41	post-build:	55	post-build:
42	${SETENV} CC=${CC} \	56	.ifdef (WITH_GUI_VERSION)
43	CXX=${CXX} \	57	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} -f GUI_unx.mak all
44	CFLAGS="${CFLAGS}" \	58	.endif
45	CXXFLAGS="${CXXFLAGS}" \	59	.ifdef (WITH_PLUGIN)
46	X11BASE=${X11BASE} \	60	${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} -f Plugin_unx.mak all
47	LOCALBASE=${LOCALBASE} \
48	${GMAKE} -C ${WRKSRC} -f GUI.mak all
49	.endif	61	.endif
50		62
51	do-install:	63	do-install:
Lines 53-63 Link Here
53	.ifdef (WITH_GUI_VERSION)	65	.ifdef (WITH_GUI_VERSION)
54	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${PREFIX}/bin	66	${INSTALL_PROGRAM} ${WRKSRC}/glBSPX ${PREFIX}/bin
55	.endif	67	.endif
		68	.ifdef (WITH_PLUGIN)
		69	${INSTALL_DATA} ${WRKSRC}/libglbsp.a ${PREFIX}/lib
		70	.endif
56		71
57	.ifndef (NOPORTDOCS)	72	.ifndef (NOPORTDOCS)
58	@${MKDIR} ${DOCSDIR}	73	@${MKDIR} ${DOCSDIR}
59	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}	74	${INSTALL_MAN} ${MAN1:S\|^\|${WRKSRC}/\|} ${MANPREFIX}/man/man1
60	${INSTALL_DATA} ${WRKSRC}/USAGE.txt ${DOCSDIR}	75	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${DOCSDIR}
61	.endif	76	.endif
62		77
63	.include <bsd.port.mk>	78	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)glbsp/distinfo (-2 / +2 lines)
1	MD5 (glbsp_src_210c.tar.gz) = 6d4891492866543ee81febf8b2b19dfb	1	MD5 (glbsp_src_220.tar.gz) = 67936f6ba13e6acdf8a0b8022dad8694
2	SIZE (glbsp_src_210c.tar.gz) = 184427	2	SIZE (glbsp_src_220.tar.gz) = 172283





$FreeBSD: ports/games/glbsp/files/patch-GUI.mak,v 1.1 2004/12/18 18:33:12 pav Exp $

--- 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     \




--- GUI_unx.mak.orig
+++ GUI_unx.mak
@@ -8,16 +8,16 @@
 
 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 \
+FLTK_PREFIX=${X11BASE}
+FLTK_CFLAGS=-I$(FLTK_PREFIX)/include
+FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images \
           -lfltk -lX11 -lXext
 
-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
 LIBS=-lm $(FLTK_LIBS)
 
 OBJS=$(SYSDIR)/main.o     \





$FreeBSD: ports/games/glbsp/files/patch-Makefile,v 1.1 2004/12/18 18:33:12 pav Exp $

--- 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     \




--- wad.c.orig
+++ wad.c
@@ -1632,13 +1632,12 @@
 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)
   {

Lines 1-5 Link Here

(-)glbsp/pkg-plist (-3 / +1 lines)
1	bin/glbsp	1	bin/glbsp
2	%%GUI_VERSION%%bin/glBSPX	2	%%GUI_VERSION%%bin/glBSPX
3	%%PORTDOCS%%%%DOCSDIR%%/README.txt	3	%%PLUGIN%%lib/libglbsp.a
4	%%PORTDOCS%%%%DOCSDIR%%/USAGE.txt
5	%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 86382

Lines 1-25 Link Here

(-)glbsp/files/patch-GUI.mak (-25 lines)
1
2	$FreeBSD: ports/games/glbsp/files/patch-GUI.mak,v 1.1 2004/12/18 18:33:12 pav Exp $
3
4	--- GUI.mak.orig
5	+++ GUI.mak
6	@@ -8,14 +8,14 @@
7
8	PROGNAME=glBSPX
9
10	-FLTK_CFLAGS=-I/usr/local/lib
11	+FLTK_CFLAGS=-I${X11BASE}/include
12	FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
13
14	-CC=gcc
15	-CXX=g++
16	-CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
17	+CC?=gcc
18	+CXX?=g++
19	+CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
20	CXXFLAGS=$(CFLAGS)
21	-LDFLAGS=-L/usr/X11R6/lib
22	+LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib
23	LIBS=-lm $(FLTK_LIBS)
24
25	OBJS=$(SYSDIR)/main.o \

Line 0 Link Here

(-)glbsp/files/patch-GUI_unx.mak (+26 lines)
	1	--- GUI_unx.mak.orig
	2	+++ GUI_unx.mak
	3	@@ -8,16 +8,16 @@
	4
	5	PROGNAME=glBSPX
	6
	7	-FLTK_PREFIX=../fltk-1.1.6
	8	-FLTK_CFLAGS=-I$(FLTK_PREFIX) -I$(FLTK_PREFIX)/zlib
	9	-FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg \
	10	+FLTK_PREFIX=${X11BASE}
	11	+FLTK_CFLAGS=-I$(FLTK_PREFIX)/include
	12	+FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images \
	13	-lfltk -lX11 -lXext
	14
	15	-CC=gcc
	16	-CXX=g++
	17	-CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
	18	+CC?=gcc
	19	+CXX?=g++
	20	+CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
	21	CXXFLAGS=$(CFLAGS)
	22	-LDFLAGS=-L/usr/X11R6/lib
	23	+LDFLAGS=-L${X11BASE}/lib
	24	LIBS=-lm $(FLTK_LIBS)
	25
	26	OBJS=$(SYSDIR)/main.o \

Lines 1-16 Link Here

(-)glbsp/files/patch-Makefile (-16 lines)
1
2	$FreeBSD: ports/games/glbsp/files/patch-Makefile,v 1.1 2004/12/18 18:33:12 pav Exp $
3
4	--- Makefile.orig
5	+++ Makefile
6	@@ -8,8 +8,8 @@
7
8	PROGNAME=glbsp
9
10	-CC=cc
11	-CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
12	+CC?=cc
13	+CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
14	LIBS=-lm
15
16	OBJS=$(SYSDIR)/main.o \

Line 0 Link Here

(-)glbsp/files/patch-wad.c (+17 lines)
	1	--- wad.c.orig
	2	+++ wad.c
	3	@@ -1632,13 +1632,12 @@
	4	void ReportV5Switches(void)
	5	{
	6	lump_t *cur;
	7	+ int saw_zdbsp = FALSE;
	8
	9	PrintMsg(
	10	"V5 FORMAT UPGRADES. The following levels require a Doom port\n"
	11	"which supports V5 GL-Nodes, otherwise they will fail (or crash).\n\n"
	12	);
	13	-
	14	- int saw_zdbsp = FALSE;
	15
	16	for (cur=wad.dir_head; cur; cur=cur->next)
	17	{