freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix broken upstream staging support

Browse Source
This commit is contained in:
Dmitry Marakasov
2013-12-25 14:55:33 +00:00
parent 30f4742849
commit 13ccc1cadf
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
games/instead/Makefile
View File

@@ -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/

11
games/instead/files/patch-desktop-Makefile Normal file
View File

@@ -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

11
games/instead/files/patch-src-instead-Makefile Normal file
View File

@@ -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:

11
games/instead/files/patch-src-sdl-instead-Makefile Normal file
View File

@@ -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)