From monkey@vectors.cx  Sun Jul 28 19:04:56 2002
Return-Path: <monkey@vectors.cx>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 34F3037B400
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Jul 2002 19:04:56 -0700 (PDT)
Received: from vectors.cx (manifold.vectors.cx [64.163.147.229])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DB0A543E65
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Jul 2002 19:04:55 -0700 (PDT)
	(envelope-from monkey@vectors.cx)
Received: from vectors.cx (37abd2c5c5e24f8f36226f139fadd90f@localhost [127.0.0.1])
	by vectors.cx (8.12.4/8.12.4) with ESMTP id g6T25T2e071353
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Jul 2002 19:05:29 -0700 (PDT)
	(envelope-from monkey@vectors.cx)
Received: (from monkey@localhost)
	by vectors.cx (8.12.4/8.12.4/Submit) id g6T25TVA071352;
	Sun, 28 Jul 2002 19:05:29 -0700 (PDT)
	(envelope-from monkey)
Message-Id: <200207290205.g6T25TVA071352@vectors.cx>
Date: Sun, 28 Jul 2002 19:05:29 -0700 (PDT)
From: Adam Weinberger <adam@vectors.cx>
Reply-To: Adam Weinberger <adam@vectors.cx>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: patch: fix emulators/xmess 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         41099
>Category:       ports
>Synopsis:       patch: fix emulators/xmess
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 28 19:10:01 PDT 2002
>Closed-Date:    Wed Aug 07 10:41:32 PDT 2002
>Last-Modified:  Wed Aug 07 10:41:32 PDT 2002
>Originator:     Adam Weinberger
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD smacky.vectors.cx 4.6-STABLE FreeBSD 4.6-STABLE #113: Wed Jul 24 12:13:03 PDT 2002 root@smacky.vectors.cx:/usr/src/sys/compile/smacky i386


	
>Description:
	paths are incorrect, and the patches from emulators/xmame aren't applied.
	
>How-To-Repeat:
	
>Fix:

	

	this contains stuff leeched from emulators/xmame/files/patch-ac

	this can live happily as emulators/xmess/files/patch-src.unix.unix.mak

--- patch-src.unix.unix.mak begins here ---
--- src/unix/unix.mak.orig	Sun Jul 28 18:47:11 2002
+++ src/unix/unix.mak	Sun Jul 28 18:54:26 2002
@@ -45,20 +45,20 @@
 
 # svga and ggi also use $(X11LIB) since that's where zlib often is
 LIBS.x11        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext 
-LIBS.svgalib    = $(X11LIB) -lvga -lvgagl
+LIBS.svgalib    = $(LOCALBASE)/lib -lvga -lvgagl
 LIBS.ggi        = $(X11LIB) -lggi
-LIBS.xgl        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
+LIBS.xgl        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L$(LOCALBASE)/lib -ljpeg
 LIBS.xfx        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
 LIBS.svgafx     = $(X11LIB) -lvga -lvgagl -lglide2x
 LIBS.openstep	= -framework AppKit
-LIBS.SDL	= `sdl-config --libs`
+LIBS.SDL	= `$(SDL_CONFIG) --libs`
 LIBS.photon2	= -L/usr/lib -lph -lphrender
 
 CFLAGS.x11      = $(X11INC) $(JOY_X11_CFLAGS)
-CFLAGS.xgl      = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS)
+CFLAGS.xgl      = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I$(LOCALBASE)/include $(PTHREAD_CFLAGS)
 CFLAGS.xfx      = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
 CFLAGS.svgafx   = -I/usr/include/glide
-CFLAGS.SDL      = -D_REENTRANT
+CFLAGS.SDL      = $(X11INC) `$(SDL_CONFIG) --cflags`
 CFLAGS.photon2	=
 
 INST.x11        = doinstall
--- patch-src.unix.unix.mak ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Wed Aug 7 10:41:22 PDT 2002 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=41099 
>Unformatted:
