Bug 41604 - [patch] allow games/heretic to use SDL
Summary: [patch] allow games/heretic to use SDL
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-08-13 08:20 UTC by edwin
Modified: 2002-08-30 05:57 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (629 bytes, patch)
2002-08-13 08:20 UTC, edwin
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description edwin 2002-08-13 08:20:01 UTC
Right now, games/heretic has an old lib-dependancy if SDL is specified
and the game doesn't work (it compiles and links but fails to work)
when running full-screen.

How-To-Repeat: 
run "WITH_SDL=1 make install" in /usr/ports/games/heretic
Comment 1 Oliver Lehmann 2002-08-21 16:03:47 UTC
Thanks for your care Edwin. Now i know what the voices in my mind with
"there is sth. with sdl and heretic" tried to say ;). I saw your report,
but i just forgott it...

Generally, i approve to these patch. But i modified it a bit:

-------------
diff -ruN heretic.old/Makefile /usr/ports/games/heretic/Makefile
--- heretic.old/Makefile	Wed Apr 17 19:58:38 2002
+++ /usr/ports/games/heretic/Makefile	Wed Aug 21 16:50:52 2002
@@ -34,8 +34,8 @@
 ALL_TARGET=	sdl
 BINARY=		sdlheretic
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
-LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl10
-MAKE_ENV+=	SDL_CONFIG="${SDL_CONFIG}"
+LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12
+MAKE_ENV+=	SDLLIBS="`${SDL_CONFIG} --libs`"
 CFLAGS+=	`${SDL_CONFIG} --cflags`
 .endif
 
diff -ruN heretic.old/files/patch-aa
/usr/ports/games/heretic/files/patch-aa
--- heretic.old/files/patch-aa	Mon Jan 14 08:13:33 2002
+++ /usr/ports/games/heretic/files/patch-aa	Wed Aug 21 16:15:33 2002
@@ -57,7 +57,7 @@
  
  # Uncomment the line below if you want to use original "[" and "]" keys
  # for inventory access, instead of "k" and "l".
-@@ -85,18 +85,18 @@
+@@ -85,18 +85,17 @@
  COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__
-DMUSSERV # -D_DEBUGSOUND
  X11LIBS = -lXext -lX11
  
@@ -75,7 +75,6 @@
  GGILIBS = -lggi -lm
  VGALIBS = -lvga
 -SDLLIBS = -lSDL -lpthread 
-+SDLLIBS = -L${LOCALBASE}/lib -lSDL ${PTHREAD_LIBS}
  
  OBJS =	am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
  	p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
------------

PORTREVISION change is not needed imho..

  Greetings Oliver
-- 
Oliver Lehmann, lehmann@ans-netz.de, http://www.pofo.de/
  http://wishlist.pofo.de/
Comment 2 Mario Sergio Fujikawa Ferreira freebsd_committer freebsd_triage 2002-08-30 05:56:35 UTC
State Changed
From-To: open->closed

Committed with small changes, thanks! PORTREVISION bumped since 
port builded but did not work.