Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 2011D7A210 for ; Thu, 29 Sep 2016 12:09:50 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C34BE85F04; Thu, 29 Sep 2016 12:09:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 50E6C85F01 for ; Thu, 29 Sep 2016 12:09:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id e1VaaMtfluIA for ; Thu, 29 Sep 2016 12:09:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C93BA85E96 for ; Thu, 29 Sep 2016 12:09:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C3FF4FBD2; Thu, 29 Sep 2016 12:09:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475150988182660" MIME-Version: 1.0 Date: Thu, 29 Sep 2016 12:09:48 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/games/einstein-puzzle To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20160929120948.C3FF4FBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475150988182660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Thu Sep 29 12:09:48 UTC 2016 Modified Files: pkgsrc/games/einstein-puzzle: Makefile distinfo pkgsrc/games/einstein-puzzle/patches: patch-Makefile Log Message: Fix rpath when using native X. Bump revision. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/einstein-puzzle/Makefile \ pkgsrc/games/einstein-puzzle/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/einstein-puzzle/patches/patch-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475150988182660 Content-Disposition: inline Content-Length: 3029 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/einstein-puzzle/Makefile diff -u pkgsrc/games/einstein-puzzle/Makefile:1.1 pkgsrc/games/einstein-puzzle/Makefile:1.2 --- pkgsrc/games/einstein-puzzle/Makefile:1.1 Sun Jul 24 11:48:14 2016 +++ pkgsrc/games/einstein-puzzle/Makefile Thu Sep 29 12:09:48 2016 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2016/07/24 11:48:14 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2016/09/29 12:09:48 joerg Exp $ DISTNAME= einstein-puzzle-2.1.1 +PKGREVISION= 1 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=lksj/} GITHUB_TAG= v${PKGVERSION_NOREV} Index: pkgsrc/games/einstein-puzzle/distinfo diff -u pkgsrc/games/einstein-puzzle/distinfo:1.1 pkgsrc/games/einstein-puzzle/distinfo:1.2 --- pkgsrc/games/einstein-puzzle/distinfo:1.1 Sun Jul 24 11:48:14 2016 +++ pkgsrc/games/einstein-puzzle/distinfo Thu Sep 29 12:09:48 2016 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1 2016/07/24 11:48:14 wiz Exp $ +$NetBSD: distinfo,v 1.2 2016/09/29 12:09:48 joerg Exp $ SHA1 (einstein-puzzle-2.1.1.tar.gz) = d64acf11a56ed278eced25572c245ec1d9ac3822 RMD160 (einstein-puzzle-2.1.1.tar.gz) = c2a97550cf2c7aa45b113cec2cd7d968f6ae0bc2 SHA512 (einstein-puzzle-2.1.1.tar.gz) = e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3 Size (einstein-puzzle-2.1.1.tar.gz) = 1317979 bytes -SHA1 (patch-Makefile) = f761dfe51a52382181e1471dcb3134171ef78d16 +SHA1 (patch-Makefile) = 7d185d20983e07e2aa6f0ad8f82aa4cf31934aa1 Index: pkgsrc/games/einstein-puzzle/patches/patch-Makefile diff -u pkgsrc/games/einstein-puzzle/patches/patch-Makefile:1.1 pkgsrc/games/einstein-puzzle/patches/patch-Makefile:1.2 --- pkgsrc/games/einstein-puzzle/patches/patch-Makefile:1.1 Sun Jul 24 11:48:14 2016 +++ pkgsrc/games/einstein-puzzle/patches/patch-Makefile Thu Sep 29 12:09:48 2016 @@ -1,7 +1,8 @@ -$NetBSD: patch-Makefile,v 1.1 2016/07/24 11:48:14 wiz Exp $ +$NetBSD: patch-Makefile,v 1.2 2016/09/29 12:09:48 joerg Exp $ -Add DESTDIR support. -Support install(1) that does not create directories automatically. +- Add DESTDIR support. +- Support install(1) that does not create directories automatically. +- Fix linking against freetype. --- Makefile.orig 2015-12-03 16:45:59.000000000 +0000 +++ Makefile @@ -13,6 +14,17 @@ Support install(1) that does not create ######################################## # +@@ -16,8 +17,8 @@ PREFIX=/usr/local + OPTIMIZE=#-O6 -march=pentium4 -mfpmath=sse -fomit-frame-pointer -funroll-loops + PROFILER=#-pg + DEBUG=#-ggdb +-CXXFLAGS=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER) +-LNFLAGS=-pipe -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER) ++CXXFLAGS+=-pipe -Wall $(OPTIMIZE) $(DEBUG) `sdl-config --cflags` -DPREFIX=L\"$(PREFIX)\" $(PROFILER) ++LNFLAGS= ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lSDL_ttf -lfreetype `sdl-config --libs` -lz -lSDL_mixer $(PROFILER) + INSTALL=install + + TARGET=einstein @@ -61,8 +62,10 @@ run: $(TARGET) ./$(TARGET) --_----------=_1475150988182660--