diff options
| author | joerg <joerg> | 2014-08-19 13:33:30 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-08-19 13:33:30 +0000 |
| commit | 3ace5c17385ac6818843f479915d47d8c8704076 (patch) | |
| tree | b0cc09d8532b0d797c406ebc9324590be9214d4e /games | |
| parent | 75c3fe9ba0f94f9278c9891c5dcca8ace8a3c545 (diff) | |
| download | pkgsrc-3ace5c17385ac6818843f479915d47d8c8704076.tar.gz | |
Find & use the right Lua.
Diffstat (limited to 'games')
| -rw-r--r-- | games/stratagus/Makefile | 6 | ||||
| -rw-r--r-- | games/stratagus/distinfo | 3 | ||||
| -rw-r--r-- | games/stratagus/patches/patch-Rules.make.in | 29 |
3 files changed, 34 insertions, 4 deletions
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile index 0df1ff0314a..37bb9d588be 100644 --- a/games/stratagus/Makefile +++ b/games/stratagus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2014/05/03 13:14:37 alnsn Exp $ +# $NetBSD: Makefile,v 1.31 2014/08/19 13:33:30 joerg Exp $ # DISTNAME= stratagus-2.1-src @@ -21,8 +21,8 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes MAKE_ENV+= X11_LDFLAGS=${X_LDFLAGS:M*:Q} -CONFIGURE_ARGS+= --with-flac --with-mad - +CONFIGURE_ARGS+= --with-flac --with-mad --with-lua=${BUILDLINK_PREFIX.lua} +CPPFLAGS+= -I${BUILDLINK_PREFIX.lua}/${LUA_INCDIR} INSTALLATION_DIRS= bin .include "../../mk/bsd.prefs.mk" diff --git a/games/stratagus/distinfo b/games/stratagus/distinfo index f78dc6d4f9d..3ddee6c600e 100644 --- a/games/stratagus/distinfo +++ b/games/stratagus/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.8 2011/08/05 00:56:36 wiz Exp $ +$NetBSD: distinfo,v 1.9 2014/08/19 13:33:30 joerg Exp $ SHA1 (stratagus-2.1-src.tar.gz) = 33181d57e018825a450f1e8c0ec31b0887cbd39c RMD160 (stratagus-2.1-src.tar.gz) = f5f97854cad9f17104de34613012fd3aa2efbb9b Size (stratagus-2.1-src.tar.gz) = 995686 bytes +SHA1 (patch-Rules.make.in) = 262ae07f5199f92aee47462033ae1f7d2d4de065 SHA1 (patch-aa) = 2f1403d58b3a745845c3b3e94abb7cf65b00194d SHA1 (patch-ab) = cd9235023dcb2bc05828857c8f1d538a0d06eab5 SHA1 (patch-ac) = 78aca58075dd730a799dc9d0fb79ca4c6c010a34 diff --git a/games/stratagus/patches/patch-Rules.make.in b/games/stratagus/patches/patch-Rules.make.in new file mode 100644 index 00000000000..a2c544f56bc --- /dev/null +++ b/games/stratagus/patches/patch-Rules.make.in @@ -0,0 +1,29 @@ +$NetBSD: patch-Rules.make.in,v 1.1 2014/08/19 13:33:30 joerg Exp $ + +--- Rules.make.in.orig 2014-08-19 09:06:12.000000000 +0000 ++++ Rules.make.in +@@ -29,13 +29,13 @@ VIDEO_CFLAGS = @VIDEO_CFLAGS@ + COMP_CFLAGS = -DUSE_ZLIB @BZ2_CFLAGS@ + COMP_LIBS = -lz @BZ2_LIBS@ + +-TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ -L/usr/local/lib \ ++TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ \ + @STATIC_LDFLAGS@ + + STRATAGUS_LIBS= -lpng -lz -lm \ + @EXTRA_LIBS@ @VIDEO_LIBS@ @THREAD_LIBS@ $(CCLLIB) $(COMP_LIBS) \ + @FLAC_LIBS@ @OGG_LIBS@ @MAD_LIBS@ @MIKMOD_LIBS@ @CDAUDIO_LIBS@ \ +- @LUA_LIBS@ @STATIC_LDFLAGS@ -lz -lm -L/usr/local/lib ++ @LUA_LIBS@ @STATIC_LDFLAGS@ -lz -lm + + DISTLIST=$(TOPDIR)/distlist + TAGS=$(TOPDIR)/src/tags +@@ -49,7 +49,7 @@ OBJDIR=@OBJDIR@ + + IFLAGS= -I$(TOPDIR)/src/include $(XIFLAGS) -I$(TOPDIR)/src/movie/vp31/include + +-CFLAGS=@EXTRA_CFLAGS@ @PROFILE_CFLAGS@ @DEBUG_CFLAGS@ $(IFLAGS) \ ++CFLAGS=@CPPFLAGS@ @EXTRA_CFLAGS@ @PROFILE_CFLAGS@ @DEBUG_CFLAGS@ $(IFLAGS) \ + -DUSE_HP_FOR_XP -DMAP_REGIONS \ + @PROFILE_CFLAGS@ @DEBUG_CFLAGS@ @VIDEO_CFLAGS@ @BZ2_CFLAGS@ \ + @OGG_CFLAGS@ @MAD_CFLAGS@ @FLAC_CFLAGS@ @CDAUDIO_CFLAGS@ \ |