From owner-svn-ports-all@FreeBSD.ORG Wed Dec 25 14:55:35 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38A1B3D7; Wed, 25 Dec 2013 14:55:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23DA31B36; Wed, 25 Dec 2013 14:55:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBPEtZwG068746; Wed, 25 Dec 2013 14:55:35 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBPEtYqE068742; Wed, 25 Dec 2013 14:55:34 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312251455.rBPEtYqE068742@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 25 Dec 2013 14:55:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337420 - in head/games/instead: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Dec 2013 14:55:35 -0000 Author: amdmi3 Date: Wed Dec 25 14:55:33 2013 New Revision: 337420 URL: http://svnweb.freebsd.org/changeset/ports/337420 Log: - Fix broken upstream staging support Added: head/games/instead/files/patch-desktop-Makefile (contents, props changed) head/games/instead/files/patch-src-instead-Makefile (contents, props changed) head/games/instead/files/patch-src-sdl-instead-Makefile (contents, props changed) Modified: head/games/instead/Makefile Modified: head/games/instead/Makefile ============================================================================== --- head/games/instead/Makefile Wed Dec 25 14:54:11 2013 (r337419) +++ head/games/instead/Makefile Wed Dec 25 14:55:33 2013 (r337420) @@ -3,7 +3,7 @@ PORTNAME= instead PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/instead/instead/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ Added: head/games/instead/files/patch-desktop-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/instead/files/patch-desktop-Makefile Wed Dec 25 14:55:33 2013 (r337420) @@ -0,0 +1,11 @@ +--- desktop/Makefile.orig 2013-06-23 15:26:58.000000000 +0400 ++++ desktop/Makefile 2013-12-25 18:47:41.313221986 +0400 +@@ -7,7 +7,7 @@ + all: instead.desktop + + instead.desktop: instead.desktop.in +- cat instead.desktop.in | sed -e "s|@BIN|$(BIN)|g" > instead.desktop ++ cat instead.desktop.in | sed -e "s|@BIN|$(BIN:${DESTDIR}%=%)|g" > instead.desktop + + install: + $(INSTALLD) $(DESTDIR)$(PREFIX)/share/applications Added: head/games/instead/files/patch-src-instead-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/instead/files/patch-src-instead-Makefile Wed Dec 25 14:55:33 2013 (r337420) @@ -0,0 +1,11 @@ +--- src/instead/Makefile.orig 2013-06-23 15:26:48.000000000 +0400 ++++ src/instead/Makefile 2013-12-25 18:45:45.639220432 +0400 +@@ -4,7 +4,7 @@ + + all: instead + instead: instead.c rline.c +- $(CC) $(CFLAGS) -DSTEAD_PATH=\"${STEADPATH}/\" instead.c $(LUA_CFLAGS) rline.c $(LUA_LFLAGS) -lncurses -lreadline -o instead ++ $(CC) $(CFLAGS) -DSTEAD_PATH=\"${STEADPATH:${DESTDIR}%=%}/\" instead.c $(LUA_CFLAGS) rline.c $(LUA_LFLAGS) -lncurses -lreadline -o instead + clean: + $(RM) -rf *.o instead + install: Added: head/games/instead/files/patch-src-sdl-instead-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/instead/files/patch-src-sdl-instead-Makefile Wed Dec 25 14:55:33 2013 (r337420) @@ -0,0 +1,11 @@ +--- src/sdl-instead/Makefile.orig 2013-06-23 15:26:49.000000000 +0400 ++++ src/sdl-instead/Makefile 2013-12-25 18:46:16.823227850 +0400 +@@ -1,7 +1,7 @@ + include ../../Rules.make + include ../../config.make + +-CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) $(ZLIB_CFLAGS) $(EXTRA_CFLAGS) -DLANG_PATH=\"${LANGPATH}/\" -DSTEAD_PATH=\"${STEADPATH}/\" -DGAMES_PATH=\"${GAMESPATH}/\" -DTHEMES_PATH=\"${THEMESPATH}/\" -DVERSION=\"$(VERSION)\" -DICON_PATH=\"${ICONPATH}/\" ++CFLAGS += $(SDL_CFLAGS) $(LUA_CFLAGS) $(ZLIB_CFLAGS) $(EXTRA_CFLAGS) -DLANG_PATH=\"${LANGPATH:${DESTDIR}%=%}/\" -DSTEAD_PATH=\"${STEADPATH:${DESTDIR}%=%}/\" -DGAMES_PATH=\"${GAMESPATH:${DESTDIR}%=%}/\" -DTHEMES_PATH=\"${THEMESPATH:${DESTDIR}%=%}/\" -DVERSION=\"$(VERSION)\" -DICON_PATH=\"${ICONPATH:${DESTDIR}%=%}/\" + + LDFLAGS += $(SDL_LFLAGS) $(LUA_LFLAGS) $(ZLIB_LFLAGS) $(EXTRA_LDFLAGS) +