From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 24 20:30:05 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 72B6716A41F for ; Mon, 24 Oct 2005 20:30:05 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0421643D4C for ; Mon, 24 Oct 2005 20:30:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j9OKU4pp050354 for ; Mon, 24 Oct 2005 20:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j9OKU4ku050353; Mon, 24 Oct 2005 20:30:04 GMT (envelope-from gnats) Resent-Date: Mon, 24 Oct 2005 20:30:04 GMT Resent-Message-Id: <200510242030.j9OKU4ku050353@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DD99316A41F for ; Mon, 24 Oct 2005 20:24:39 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: from relay.pair.com (relay00.pair.com [209.68.5.9]) by mx1.FreeBSD.org (Postfix) with SMTP id 6FB4D43D45 for ; Mon, 24 Oct 2005 20:24:39 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 33370 invoked from network); 24 Oct 2005 20:24:38 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 24 Oct 2005 20:24:38 -0000 Message-Id: <1130185505.0@phobos.mars.bsd> Date: Mon, 24 Oct 2005 17:25:05 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/87954: [MAINTAINER UPDATE] games/excido: fix PREFIX problem X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2005 20:30:05 -0000 >Number: 87954 >Category: ports >Synopsis: [MAINTAINER UPDATE] games/excido: fix PREFIX problem >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 24 20:30:04 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: >Description: Changes: * Fix PREFIX redefinition as "/usr/local". >How-To-Repeat: >Fix: --- excido.diff begins here --- diff -urN /usr/ports/games/excido/Makefile excido/Makefile --- /usr/ports/games/excido/Makefile Tue Oct 4 13:55:32 2005 +++ excido/Makefile Mon Oct 24 17:19:22 2005 @@ -21,16 +21,8 @@ USE_BZIP2= yes USE_GMAKE= yes -USE_REINPLACE= yes USE_GL= yes USE_SDL= image sdl ttf - -post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \ - s|%%CFLAGS%%|${CFLAGS}| ; \ - s|%%DATADIR%%|${DATADIR}| ; \ - s|%%X11BASE%%|${X11BASE}|' \ - ${WRKSRC}/${MAKEFILE} post-install: .if !defined(NOPORTDOCS) diff -urN /usr/ports/games/excido/files/patch-Makefile excido/files/patch-Makefile --- /usr/ports/games/excido/files/patch-Makefile Tue Oct 4 13:55:33 2005 +++ excido/files/patch-Makefile Mon Oct 24 17:19:50 2005 @@ -1,22 +1,19 @@ --- Makefile.orig Thu Jul 29 14:17:13 2004 -+++ Makefile Fri Aug 19 15:00:16 2005 -@@ -1,12 +1,11 @@ ++++ Makefile Mon Oct 24 17:19:43 2005 +@@ -1,10 +1,8 @@ -CC=g++ -CFLAGS=`sdl-config --cflags` #-g -Wall #-O2 -+CFLAGS=%%CFLAGS%% -I%%X11BASE%%/include `sdl-config --cflags` #-g -Wall #-O2 ++CFLAGS += -I${X11BASE}/include `${SDL_CONFIG} --cflags` #CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2 OBJS := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}} -LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU -+LIBS = -L%%X11BASE%%/lib `sdl-config --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU ++LIBS = -L${X11BASE}/lib `${SDL_CONFIG} --libs` -lSDL_image -lSDL_ttf -lphysfs -lopenal -lGL -lGLU #LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU - PREFIX=/usr/local +-PREFIX=/usr/local BINDIR=$(PREFIX)/bin/ --DATADIR=$(PREFIX)/share/excido/ -+DATADIR=%%DATADIR%%/ + DATADIR=$(PREFIX)/share/excido/ - INSTALL=/usr/bin/install - -@@ -28,9 +27,9 @@ +@@ -28,9 +26,9 @@ install: [ -d $(BINDIR) ] || mkdir $(BINDIR) --- excido.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: