1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

- Fix build with clang [1]

- Support staging

PR:		ports/186579 [1]
Submitted by:	maintainer
MFH:		2014Q1
This commit is contained in:
Pawel Pekala 2014-02-18 19:25:01 +00:00
parent 7398c2c66a
commit 2d435bccd1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=344947
2 changed files with 26 additions and 6 deletions

View File

@ -16,7 +16,7 @@ USE_GNOME= gtk20
ALL_TARGET= #
#RUN_DEPENDS+= xdg-desktop-menu:${PORTSDIR}/devel/xdg-utils
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
DESKTOP_ENTRIES="Picpuz" \
"Jigsaw Puzzle" \
"${PREFIX}/share/pixmaps/picpuz.png" \
@ -24,5 +24,8 @@ DESKTOP_ENTRIES="Picpuz" \
"Graphics;Game;GTK;" \
true
NO_STAGE= yes
post-install:
(cd ${STAGEDIR}${PREFIX}/share/pixmaps && \
${LN} -s ${DATADIR}/icons/picpuz.png .)
.include <bsd.port.mk>

View File

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