diff options
author | Renato Botelho <garga@FreeBSD.org> | 2005-10-10 13:27:31 +0000 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2005-10-10 13:27:31 +0000 |
commit | 4511ad536e0a9957b3c4b9e83f53ecb9b3f7d314 (patch) | |
tree | b9176434354639187f1211c74d196027b92621cc /games/galaxyhack | |
parent | 712fd5b9aebab1e3d2ee82e76daa476b9c07a06a (diff) | |
download | ports-4511ad536e0a9957b3c4b9e83f53ecb9b3f7d314.tar.gz ports-4511ad536e0a9957b3c4b9e83f53ecb9b3f7d314.zip |
Notes
Diffstat (limited to 'games/galaxyhack')
-rw-r--r-- | games/galaxyhack/Makefile | 9 | ||||
-rw-r--r-- | games/galaxyhack/files/patch-Makefile | 23 |
2 files changed, 11 insertions, 21 deletions
diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile index b17580ff1e6c..436be52d31b8 100644 --- a/games/galaxyhack/Makefile +++ b/games/galaxyhack/Makefile @@ -39,6 +39,11 @@ post-extract: @${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 @@ BROKEN= "Does not compile on < 5.x" 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 --git a/games/galaxyhack/files/patch-Makefile b/games/galaxyhack/files/patch-Makefile index 24ce28d44213..2a9578abaec9 100644 --- a/games/galaxyhack/files/patch-Makefile +++ b/games/galaxyhack/files/patch-Makefile @@ -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 $@ $^ |