summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-09-29 12:09:48 +0000
committerjoerg <joerg@pkgsrc.org>2016-09-29 12:09:48 +0000
commit7b4ae1655eac4f32656aa7dc73227964e29aa81f (patch)
tree83fce7b4a70172b8d0eae873ccec54d7bd35d004
parent85c53b86467a869c066574660fad1f32c50d5689 (diff)
downloadpkgsrc-7b4ae1655eac4f32656aa7dc73227964e29aa81f.tar.gz
Fix rpath when using native X. Bump revision.
-rw-r--r--games/einstein-puzzle/Makefile3
-rw-r--r--games/einstein-puzzle/distinfo4
-rw-r--r--games/einstein-puzzle/patches/patch-Makefile18
3 files changed, 19 insertions, 6 deletions
diff --git a/games/einstein-puzzle/Makefile b/games/einstein-puzzle/Makefile
index 9c2fdff9091..af2d7605ff8 100644
--- a/games/einstein-puzzle/Makefile
+++ b/games/einstein-puzzle/Makefile
@@ -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}
diff --git a/games/einstein-puzzle/distinfo b/games/einstein-puzzle/distinfo
index f86c1c17b41..3f9b8ab16d7 100644
--- a/games/einstein-puzzle/distinfo
+++ b/games/einstein-puzzle/distinfo
@@ -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
diff --git a/games/einstein-puzzle/patches/patch-Makefile b/games/einstein-puzzle/patches/patch-Makefile
index b245acd22e1..14a75441053 100644
--- a/games/einstein-puzzle/patches/patch-Makefile
+++ b/games/einstein-puzzle/patches/patch-Makefile
@@ -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 directories automatically.
########################################
#
+@@ -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)