From owner-svn-ports-all@FreeBSD.ORG Tue Feb 18 20:03:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74249C43; Tue, 18 Feb 2014 20:03:39 +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 556441E12; Tue, 18 Feb 2014 20:03:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IK3dqg023354; Tue, 18 Feb 2014 20:03:39 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IK3cDO023352; Tue, 18 Feb 2014 20:03:38 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402182003.s1IK3cDO023352@svn.freebsd.org> From: Pawel Pekala Date: Tue, 18 Feb 2014 20:03:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r344953 - in branches/2014Q1/graphics/picpuz: . files X-SVN-Group: ports-branches 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: Tue, 18 Feb 2014 20:03:39 -0000 Author: pawel Date: Tue Feb 18 20:03:38 2014 New Revision: 344953 URL: http://svnweb.freebsd.org/changeset/ports/344953 QAT: https://qat.redports.org/buildarchive/r344953/ Log: MFH: r344947 - Fix build with clang [1] - Support staging PR: ports/186579 [1] Submitted by: maintainer Approved by: portmgr (erwin) Modified: branches/2014Q1/graphics/picpuz/Makefile branches/2014Q1/graphics/picpuz/files/patch-Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/picpuz/Makefile ============================================================================== --- branches/2014Q1/graphics/picpuz/Makefile Tue Feb 18 19:45:31 2014 (r344952) +++ branches/2014Q1/graphics/picpuz/Makefile Tue Feb 18 20:03:38 2014 (r344953) @@ -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 Modified: branches/2014Q1/graphics/picpuz/files/patch-Makefile ============================================================================== --- branches/2014Q1/graphics/picpuz/files/patch-Makefile Tue Feb 18 19:45:31 2014 (r344952) +++ branches/2014Q1/graphics/picpuz/files/patch-Makefile Tue Feb 18 20:03:38 2014 (r344953) @@ -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)