Attachment 57780 Details for Bug 87164 – galaxyhack.diff

[patch] galaxyhack.diff

galaxyhack.diff (text/plain), 2.37 KB, created by Alejandro Pulver on 2005-10-09 17:00:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2005-10-09 17:00:21 UTC

Size: 2.37 KB

patch

obsolete

>diff -urN /usr/ports/games/galaxyhack/Makefile galaxyhack/Makefile
>--- /usr/ports/games/galaxyhack/Makefile	Tue Oct  4 12:38:53 2005
>+++ galaxyhack/Makefile	Sun Oct  9 12:55:23 2005
>@@ -39,6 +39,11 @@
> 	@${FIND} ${WRKDIR}/${PORTNAME} -type d -name CVS -print0 | \
> 		${XARGS} -0 ${RM} -rf
> 
>+# Convert DOS text files to UNIX
>+	@${FIND} -E ${WRKSRC} -type f \
>+		-iregex "(.*Makefile.*|.*\.(cpp|h))" \
>+		-exec ${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" {} \;
>+
> do-install:
> # Script
> 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}-sh ${PREFIX}/bin/${PORTNAME}
>@@ -69,9 +74,7 @@
> 
> post-patch:
> # Fix Makefile
>-	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}| ; \
>-			s|%%PREFIX%%|${PREFIX}| ; \
>-			s|sdl-config|${SDL_CONFIG}|' \
>+	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' \
> 				${WRKSRC}/${MAKEFILE}
> 
> # Enable/disable compilation optimizations
>diff -urN /usr/ports/games/galaxyhack/files/patch-Makefile galaxyhack/files/patch-Makefile
>--- /usr/ports/games/galaxyhack/files/patch-Makefile	Tue Oct  4 12:38:54 2005
>+++ galaxyhack/files/patch-Makefile	Sun Oct  9 12:52:56 2005
>@@ -1,28 +1,15 @@
> --- Makefile.orig	Sat May  7 05:50:48 2005
>-+++ Makefile	Sun Aug  7 16:56:09 2005
>-@@ -7,12 +7,11 @@
>- #
>- 
>++++ Makefile	Sun Oct  9 12:45:33 2005
>+@@ -9,10 +9,9 @@
>  INSTALL_DIR=/usr/local/share
>--INSTALL_BIN_DIR=/usr/local/bin
>-+INSTALL_BIN_DIR=%%PREFIX%%/bin
>+ INSTALL_BIN_DIR=/usr/local/bin
>  
> -CXX = g++
> -CXXFLAGS = $(shell sdl-config --cflags) -O3
>-+CXXFLAGS = %%CFLAGS%% $(shell sdl-config --cflags) $(shell freetype-config --cflags) -O3
>++CXXFLAGS = $(CFLAGS) -O3 $(shell sdl-config --cflags) $(shell freetype-config --cflags)
>  DEFINES = -D__linux__
> -LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lSDL_gfx -lboost_filesystem
>-+LDFLAGS = $(shell sdl-config --libs) $(shell freetype-config --libs) -lSDL_image -lSDL_mixer -lSDL_gfx -lboost_filesystem
>++LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lSDL_gfx -lboost_filesystem $(shell freetype-config --libs)
>  
>  OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
>  	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o Globals.o \
>-@@ -37,8 +36,7 @@
>- 
>- .PHONY: install
>- install: $(TARGET)
>--	install -d $(INSTALL_BIN_DIR)
>--	install $(TARGET) $(INSTALL_BIN_DIR)
>-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALL_BIN_DIR)
>- 
>- $(TARGET): $(OBJS)
>- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^

Actions: View | Diff

Attachments on bug 87164: 57780