ports/87954: [MAINTAINER UPDATE] games/excido: fix PREFIX problem

Alejandro Pulver alejandro at varnet.biz
Mon Oct 24 20:30:05 UTC 2005


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



More information about the freebsd-ports-bugs mailing list