Date: Sun, 9 Oct 2005 12:56:52 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/87164: [MAINTAINER UPDATE] games/galaxyhack: fix patch Message-ID: <1128873412.0@phobos.mars.bsd> Resent-Message-ID: <200510091600.j99G0Lp0077207@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 87164
>Category: ports
>Synopsis: [MAINTAINER UPDATE] games/galaxyhack: fix patch
>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: Sun Oct 09 16:00:21 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
>Description:
Changes:
* Fix wrong patch in "files" directory and convert DOS to UNIX text files in post-extract.
>How-To-Repeat:
>Fix:
--- galaxyhack.diff begins here ---
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 $@ $^
--- galaxyhack.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1128873412.0>