diff options
author | Pawel Pekala <pawel@FreeBSD.org> | 2014-02-18 19:25:01 +0000 |
---|---|---|
committer | Pawel Pekala <pawel@FreeBSD.org> | 2014-02-18 19:25:01 +0000 |
commit | 2d435bccd1a7f32452dd993816f91c4ca1f0b20a (patch) | |
tree | abb1c15632a2922e7204bdf76f2701c4f02a79e6 /graphics/picpuz/files | |
parent | 7398c2c66abb3696153fe8877b5da02c0cd34fce (diff) | |
download | ports-2d435bccd1a7f32452dd993816f91c4ca1f0b20a.tar.gz ports-2d435bccd1a7f32452dd993816f91c4ca1f0b20a.zip |
- Fix build with clang [1]
- Support staging
PR: ports/186579 [1]
Submitted by: maintainer
MFH: 2014Q1
Notes
Notes:
svn path=/head/; revision=344947
Diffstat (limited to 'graphics/picpuz/files')
-rw-r--r-- | graphics/picpuz/files/patch-Makefile | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/graphics/picpuz/files/patch-Makefile b/graphics/picpuz/files/patch-Makefile index 9795e9200cac..c75beed6f02b 100644 --- a/graphics/picpuz/files/patch-Makefile +++ b/graphics/picpuz/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2009-10-29 14:38:40.000000000 +0600 -+++ Makefile 2010-01-04 19:55:10.000000000 +0600 +--- Makefile.orig 2009-10-29 09:38:40.000000000 +0100 ++++ Makefile 2014-02-18 19:19:51.140331100 +0100 @@ -6,7 +6,7 @@ # replace CFLAGS and LFLAGS -O (oh) with -g for GDB debugging @@ -9,7 +9,25 @@ # use $PREFIX if defined, else assume /usr/local ifeq "$(PREFIX)" "" -@@ -39,15 +39,16 @@ +@@ -19,14 +19,14 @@ + DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop + + $(PROGRAM): $(PROGRAM).o zfuncs.o +- @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o ++ @ ${CXX} $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o + + $(PROGRAM).o: $(SOURCE) zfuncs.h +- @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ ++ @ ${CXX} $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ + -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" + + zfuncs.o: zfuncs.cpp zfuncs.h +- @ g++ $(CFLAGS) zfuncs.cpp \ ++ @ ${CXX} $(CFLAGS) zfuncs.cpp \ + -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" + + install: $(PROGRAM) +@@ -39,15 +39,15 @@ cp $(PROGRAM) $(DESTDIR)$(BINDIR) cp -R locales/* $(DESTDIR)$(DATADIR)/locales # install .desktop file (menu entry) @@ -22,7 +40,6 @@ - @echo "Icon=$(DATADIR)/icons/$(PROGRAM).png" >> $(DESKTOP) - @echo "GenericName=Jigsaw Puzzle" >> $(DESKTOP) - xdg-desktop-menu install $(DESKTOP) -+ ln -s $(DESTDIR)$(DATADIR)/icons/picpuz.png ${PREFIX}/share/pixmaps/picpuz.png +# @echo "[Desktop Entry]" > $(DESKTOP) +# @echo "Name=$(PROGRAM)" >> $(DESKTOP) +# @echo "Categories=Game" >> $(DESKTOP) |