From dae425f82bd70de822c9058ab2c6c7d46cb2d3bd Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Wed, 10 Jan 2001 16:09:25 +0000 Subject: Upgrade to 1.1 PR: 24201 Submitted by: Ports Fury --- games/heretic/Makefile | 43 +++++++++++------- games/heretic/distinfo | 2 +- games/heretic/files/patch-aa | 101 +++++++++++++++---------------------------- games/heretic/pkg-plist | 12 ++++- 4 files changed, 73 insertions(+), 85 deletions(-) (limited to 'games') diff --git a/games/heretic/Makefile b/games/heretic/Makefile index d151544868c5..c4318996f1ed 100644 --- a/games/heretic/Makefile +++ b/games/heretic/Makefile @@ -6,12 +6,12 @@ # PORTNAME= heretic -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= games MASTER_SITES= http://heretic.linuxgames.com/heretic/src/ \ - http://heretic.linuxgames.com/wad/ -DISTNAME= glheretic-1.0 -.if !defined(NO_WAD) + http://heretic.linuxgames.com/wad/ +DISTNAME= gl${PORTNAME}-${PORTVERSION} +.if !defined(WITHOUT_WAD) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} heretic_share.wad.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} .endif @@ -21,23 +21,36 @@ MAINTAINER= ports@FreeBSD.org FETCH_BEFORE_ARGS+= -b USE_X_PREFIX= yes USE_GMAKE= yes -MAKE_ENV= WANT_OGL="no" WANT_OGL_FULLSCREEN="no" WANT_NICE_OGL="no" -.if !defined(NO_WAD) -PLIST= ${PKGDIR}/pkg-plist.nowad -.endif -ALL_TARGET= x11 -BINARY= xheretic + .if defined(WANT_FASTX11) -BINARY= xaheretic ALL_TARGET= fastx11 +BINARY= xaheretic +.else +ALL_TARGET= x11 +BINARY= xheretic +.endif + +.if defined(WITHOUT_WAD) +PLIST_SUB= WAD:="@comment " +.else +PLIST_SUB= WAD:="" +.endif + +post-extract: +.if !defined(WITHOUT_WAD) + @${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \ + > ${WRKSRC}/heretic_share.wad .endif do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic +.if !defined(WITHOUT_WAD) @${MKDIR} ${PREFIX}/share/heretic - @${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic -.if !defined(NO_WAD) - @${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/heretic_share.wad.gz \ - > ${PREFIX}/share/heretic/heretic_share.wad + ${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${PREFIX}/share/heretic +.endif +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/heretic + ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/heretic .endif .include diff --git a/games/heretic/distinfo b/games/heretic/distinfo index db830d3bdc3e..4c5adb2242c5 100644 --- a/games/heretic/distinfo +++ b/games/heretic/distinfo @@ -1,2 +1,2 @@ -MD5 (glheretic-1.0.tar.gz) = 82874571b280c6907a2c781377393f6e +MD5 (glheretic-1.1.tar.gz) = b2db87a126cee747bb2882259e1acec1 MD5 (heretic_share.wad.gz) = efc102ab90b0cb4bfe9177303e549d6f diff --git a/games/heretic/files/patch-aa b/games/heretic/files/patch-aa index 4f3acae47e25..373ec3e14755 100644 --- a/games/heretic/files/patch-aa +++ b/games/heretic/files/patch-aa @@ -1,44 +1,47 @@ ---- Makefile Thu Feb 3 17:56:16 2000 -+++ Makefile.new Sun Feb 13 04:15:18 2000 -@@ -1,24 +1,24 @@ +--- Makefile.orig Tue May 2 10:57:07 2000 ++++ Makefile Wed Jan 10 04:45:14 2001 +@@ -1,19 +1,19 @@ # Makefile for Linux Heretic/GLHeretic # Comment the line below if you don't want to build GLHeretic. -WANT_OGL = yes -+WANT_OGL ?= yes - - # Comment the line below if you don't want fullscreen - # support under GLHeretic. - # (Only if you have WANT_OGL !) --WANT_OGL_FULLSCREEN = yes -+WANT_OGL_FULLSCREEN ?= yes ++#WANT_OGL = yes # Comment this if you don't want to build GLHeretic # with highest quality options. # (Only if you have WANT_OGL !) -WANT_NICE_OGL = yes -+WANT_NICE_OGL ?= yes ++#WANT_NICE_OGL = yes # Uncomment the line below if you want to use GSI for sound. # (doesn't really work yet. :-() #WANT_GSI = yes --CC = gcc -+CC ?= gcc +-CC = gcc -pipe ++#CC = gcc -pipe # # For old SVGALIB, comment out -D__NEWVGALIB__ -@@ -26,7 +26,7 @@ +@@ -21,7 +21,7 @@ CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ -DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ -D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS -CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \ -+CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE -DHOMEDIR="\"/usr/X11R6/share/heretic\"" \ ++CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE \ -DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \ -D__NEWVGALIB__ # -DEXTRA_WADS -@@ -61,11 +61,11 @@ +@@ -38,7 +38,7 @@ + + COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H + +-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__ ++COPT.FreeBSD = -D__32BIT__ -DHOMEDIR="\"${PREFIX}/share/heretic\"" + + COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \ + -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\) +@@ -57,12 +57,12 @@ endif # Change this to change the platform @@ -48,24 +51,29 @@ # If you want IPX-netcode compiled, replace $(CDEFS.udp) with $(CDEFS.ipx) -CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \ -+CFLAGS = $(PCFLAGS) -Wall $(CDEFS.udp) $(COPT.arch) \ - -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) +- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl) ++CFLAGS += $(CDEFS.udp) $(COPT.arch) \ ++ -I. -I.. -I${X11BASE}/include $(COPT.sound) $(COPT.opengl) # Uncomment the line below if you want to use original "[" and "]" keys -@@ -94,10 +94,10 @@ + # for inventory access, instead of "k" and "l". +@@ -85,12 +85,12 @@ + COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND + X11LIBS = -lXext -lX11 + +-MUSSERV = musserver +-SNDSERV = sndserver ++#MUSSERV = musserver ++#SNDSERV = sndserver endif -X_LDFLAGS = -L/usr/X11R6/lib -+X_LDFLAGS = -L$(X11BASE)/lib ++X_LDFLAGS = -L${X11BASE}/lib X11LIBS = -lXext -lX11 --GLLIBS = -lXmu -lXi -lm -ldl -+GLLIBS = -lXmu -lXi -lm -lGL -lGLU - GGILIBS = -lggi -lm - VGALIBS = -lvga - SDLLIBS = -lSDL -lpthread -@@ -108,7 +108,7 @@ + GLLIBS = -lSDL -lpthread +@@ -104,7 +104,7 @@ p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \ r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \ tables.o v_video.o w_wad.o z_zone.o in_lude.o \ @@ -74,44 +82,3 @@ GLOBJS = opengl/gl_effects.o opengl/gl_floorceil.o opengl/gl_fonts.o \ opengl/gl_func.o opengl/gl_init.o opengl/gl_lights.o \ -@@ -184,17 +184,17 @@ - $(CC) -E -M $(CFLAGS) $(X_LDFLAGS) *.c $(SOUND_REFS) \ - graphics/i_sdl.c > .depend - --x11: depx11 $(OBJS) graphics/i_x11.o $(MUSSERV) $(SNDSERV) -+x11: depx11 $(OBJS) graphics/i_x11.o - $(CC) $(CFLAGS) $(X_LDFLAGS) $(X11LIBS) $(OBJS) \ - graphics/i_x11.o -o xheretic - --fastx11:depx11f $(OBJS) graphics/i_x11_fast.o $(MUSSERV) $(SNDSERV) -- $(CC) $(CFLAGS) $(X_LDFLAGS) $(X11LIBS) $(OBJS) \ -+fastx11:depx11f $(OBJS) graphics/i_x11_fast.o -+ $(CC) $(CFLAGS) $(X_LDFLAGS) $(GLLIBS) $(X11LIBS) $(OBJS) \ - graphics/i_x11_fast.o -o xaheretic - - - glheretic:depx11ogl $(OBJS) $(GLOBJS) graphics/i_x11_ogl.o \ -- $(MUSSERV) $(SNDSERV) sgi-libtess -+ sgi-libtess - ifeq ($(WANT_OGL_FULLSCREEN),yes) - $(CC) $(CFLAGS) $(X_LDFLAGS) $(X11LIBS) $(GLLIBS) \ - $(OBJS) $(GLOBJS) /usr/X11R6/lib/libXxf86vm.a \ -@@ -205,15 +205,15 @@ - endif - - --ggi: depggi $(OBJS) graphics/i_ggi.o $(MUSSERV) $(SNDSERV) -+ggi: depggi $(OBJS) graphics/i_ggi.o - $(CC) $(CFLAGS) $(GGILIBS) $(OBJS) \ - graphics/i_ggi.o -o ggiheretic - --vga: depvga $(OBJS) graphics/i_vga.o $(MUSSERV) $(SNDSERV) -+vga: depvga $(OBJS) graphics/i_vga.o - $(CC) $(CFLAGS) $(VGALIBS) $(OBJS) \ - graphics/i_vga.o -o vgaheretic - --sdl: depsdl $(OBJS) graphics/i_sdl.o $(MUSSERV) $(SNDSERV) -+sdl: depsdl $(OBJS) graphics/i_sdl.o - $(CC) $(CFLAGS) $(X_LDFLAGS) $(SDLLIBS) $(OBJS) \ - graphics/i_sdl.o -o sdlheretic - diff --git a/games/heretic/pkg-plist b/games/heretic/pkg-plist index a08e4b9a88ec..f4d82efe2310 100644 --- a/games/heretic/pkg-plist +++ b/games/heretic/pkg-plist @@ -1,3 +1,11 @@ bin/heretic -share/heretic/heretic_share.wad -@dirrm share/heretic +share/doc/heretic/AUTHORS +share/doc/heretic/Changelog +share/doc/heretic/End User License Heretic Source Code.txt +share/doc/heretic/Gamekeys.txt +share/doc/heretic/README.opengl +share/doc/heretic/README.txt +share/doc/heretic/SourceReadme.txt +@dirrm share/doc/heretic +%%WAD:%%share/heretic/heretic_share.wad +%%WAD:%%@dirrm share/heretic -- cgit v1.2.3