mr_bones_ 15/07/29 01:46:07 Modified: opengfx-0.5.1-gcc48.patch Added: opengfx-0.5.2-Makefile.patch Log: version bump (bug #555968) (Portage version: 2.2.20/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch?r1=1.1&r2=1.2 Index: opengfx-0.5.1-gcc48.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.1-gcc48.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opengfx-0.5.1-gcc48.patch 13 Jun 2014 08:57:57 -0000 1.1 +++ opengfx-0.5.1-gcc48.patch 29 Jul 2015 01:46:07 -0000 1.2 @@ -1,5 +1,5 @@ ---- scripts/Makefile.nml.old 2013-05-09 20:09:52.992038666 +0200 -+++ scripts/Makefile.nml 2013-05-09 20:10:36.942970903 +0200 +--- scripts/Makefile.nml.old ++++ scripts/Makefile.nml @@ -14,11 +14,11 @@ %.src.dep: $(SRC_DIR)/%.pnml 1.1 games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-misc/opengfx/files/opengfx-0.5.2-Makefile.patch?rev=1.1&content-type=text/plain Index: opengfx-0.5.2-Makefile.patch =================================================================== diff -ru opengfx-0.5.2-source.orig/Makefile opengfx-0.5.2-source/Makefile --- opengfx-0.5.2-source.orig/Makefile 2015-04-12 12:57:17.000000000 -0400 +++ opengfx-0.5.2-source/Makefile 2015-07-28 21:13:46.496708233 -0400 @@ -99,8 +99,8 @@ AWK ?= awk GREP ?= grep PYTHON ?= python -UNIX2DOS ?= unix2dos -UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "") +UNIX2DOS ?= $(shell which unix2dos 2>/dev/null) +UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "") # Graphics processing GIMP ?= gimp @@ -196,7 +196,7 @@ endif # Days of commit since 2000-1-1 00-00 -REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days") +REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)") # Filename addition, if we're not building the default branch REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi) @@ -377,7 +377,11 @@ | sed -e "s/$(REPLACE_REVISION)/$(NEWGRF_VERSION)/" \ | sed -e "s/$(REPLACE_FILENAME)/$(OUTPUT_FILENAME)/" \ > $@ - $(_V) [ -z "$(UNIX2DOS)" ] || $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@ +ifeq ($(UNIX2DOS),) + $(_E) Warning: unix2dos not available. $@ keeps current eol style. +else + $(_V) $(UNIX2DOS) $(UNIX2DOS_FLAGS) $@ +endif clean:: $(_E) "[CLEAN DOC]" @@ -714,7 +718,7 @@ $(_E) endif $(_E) "Release:" - $(_E) "bananas: Upload bundle to BaNaNaS + $(_E) "bananas: Upload bundle to BaNaNaS" $(_E) $(_E) "Valid command line variables are:" $(_E) "Helper programmes:"
