CVS commit: pkgsrc/games/gargoyle

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/gargoyle
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Sat, 29 Jul 2017 06:25:39 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 29 06:25:39 UTC 2017

Added Files:
        pkgsrc/games/gargoyle: DESCR Makefile PLIST distinfo
        pkgsrc/games/gargoyle/patches: patch-Jamrules
            patch-terps_nitfol_nitfol.h

Log Message:
Import gargoyle-2011.1 as games/gargoyle.

Packaged by Wes Frazier in PR 52431, some fixes by myself.

Gargoyle is an IF player that supports all the major interactive fiction
formats.

Most interactive fiction is distributed as portable game files. These portable
game files come in many formats. In the past, you used to have to download a
separate player (interpreter) for each format of IF you wanted to play.

Gargoyle is based on the standard interpreters for the formats it supports.
Gargoyle is free software released under the terms of the GNU General Public
License.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/games/gargoyle/DESCR \
    pkgsrc/games/gargoyle/Makefile pkgsrc/games/gargoyle/PLIST \
    pkgsrc/games/gargoyle/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/games/gargoyle/patches/patch-Jamrules \
    pkgsrc/games/gargoyle/patches/patch-terps_nitfol_nitfol.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/games/gargoyle/DESCR
diff -u /dev/null pkgsrc/games/gargoyle/DESCR:1.1
--- /dev/null   Sat Jul 29 06:25:39 2017
+++ pkgsrc/games/gargoyle/DESCR Sat Jul 29 06:25:39 2017
@@ -0,0 +1,10 @@
+Gargoyle is an IF player that supports all the major interactive fiction
+formats.
+
+Most interactive fiction is distributed as portable game files. These portable
+game files come in many formats. In the past, you used to have to download a
+separate player (interpreter) for each format of IF you wanted to play.
+
+Gargoyle is based on the standard interpreters for the formats it supports.
+Gargoyle is free software released under the terms of the GNU General Public
+License.
Index: pkgsrc/games/gargoyle/Makefile
diff -u /dev/null pkgsrc/games/gargoyle/Makefile:1.1
--- /dev/null   Sat Jul 29 06:25:39 2017
+++ pkgsrc/games/gargoyle/Makefile      Sat Jul 29 06:25:39 2017
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1 2017/07/29 06:25:39 wiz Exp $
+
+DISTNAME=      gargoyle-2011.1
+CATEGORIES=    games
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=garglk/}
+GITHUB_PROJECT=        garglk
+GITHUB_TAG=    stable-${PKGVERSION_NOREV}
+
+MAINTAINER=    wes.frazier%members.fsf.org@localhost
+HOMEPAGE=      http://ccxvii.net/gargoyle/
+COMMENT=       Graphical player for Interactive Fiction games
+#LICENSE=      gnu-gpl-v2 AND mit AND original-bsd AND artistic-? AND some font licenses
+
+WRKSRC=                ${WRKDIR}/garglk-stable-2011.1
+
+BUILD_DEPENDS+= jam-[0-9]*:../../devel/jam
+
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES+=        c c++
+
+INSTALLATION_DIRS=     bin libexec/gargoyle
+
+do-build:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam
+
+do-install:
+       cd ${WRKSRC} && \
+               ${SETENV} ${MAKE_ENV} jam install && \
+               ${INSTALL_PROGRAM} ${WRKSRC}/build/dist/* ${DESTDIR}${PREFIX}/libexec/gargoyle && \
+               ln -s -f ${DESTDIR}${PREFIX}/libexec/gargoyle/gargoyle ${DESTDIR}${PREFIX}/bin/gargoyle
+
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../audio/SDL_sound/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/SDL/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../multimedia/smpeg/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/gargoyle/PLIST
diff -u /dev/null pkgsrc/games/gargoyle/PLIST:1.1
--- /dev/null   Sat Jul 29 06:25:39 2017
+++ pkgsrc/games/gargoyle/PLIST Sat Jul 29 06:25:39 2017
@@ -0,0 +1,20 @@
+@comment $NetBSD: PLIST,v 1.1 2017/07/29 06:25:39 wiz Exp $
+bin/gargoyle
+libexec/gargoyle/advsys
+libexec/gargoyle/agility
+libexec/gargoyle/alan2
+libexec/gargoyle/alan3
+libexec/gargoyle/bocfel
+libexec/gargoyle/frotz
+libexec/gargoyle/gargoyle
+libexec/gargoyle/geas
+libexec/gargoyle/git
+libexec/gargoyle/glulxe
+libexec/gargoyle/hugo
+libexec/gargoyle/jacl
+libexec/gargoyle/level9
+libexec/gargoyle/magnetic
+libexec/gargoyle/nitfol
+libexec/gargoyle/scare
+libexec/gargoyle/scott
+libexec/gargoyle/tadsr
Index: pkgsrc/games/gargoyle/distinfo
diff -u /dev/null pkgsrc/games/gargoyle/distinfo:1.1
--- /dev/null   Sat Jul 29 06:25:39 2017
+++ pkgsrc/games/gargoyle/distinfo      Sat Jul 29 06:25:39 2017
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2017/07/29 06:25:39 wiz Exp $
+
+SHA1 (gargoyle-2011.1.tar.gz) = ce4716eb83118564dfe482f7f810a9f40d381015
+RMD160 (gargoyle-2011.1.tar.gz) = 6cdb66eb25f2e4b7351504835747b019bbe671e3
+SHA512 (gargoyle-2011.1.tar.gz) = 3d2eb71e34b9faaace63963b55dddb61f81cfb1f3d42918036d942ffa0e59ca7f8a9747b1059230c32cfd8d467e09aae88befac1dd77723c2edfcb5acf8d4fa8
+Size (gargoyle-2011.1.tar.gz) = 10598371 bytes
+SHA1 (patch-Jamrules) = 47c66be77d89dea8dc7a1d54c78b1734fa83be7b
+SHA1 (patch-terps_nitfol_nitfol.h) = 63e73928684260cd5ae9446604fbdd3d76f364c7

Index: pkgsrc/games/gargoyle/patches/patch-Jamrules
diff -u /dev/null pkgsrc/games/gargoyle/patches/patch-Jamrules:1.1
--- /dev/null   Sat Jul 29 06:25:39 2017
+++ pkgsrc/games/gargoyle/patches/patch-Jamrules        Sat Jul 29 06:25:39 2017
@@ -0,0 +1,38 @@
+$NetBSD: patch-Jamrules,v 1.1 2017/07/29 06:25:39 wiz Exp $
+
+Turned on a static compile option (as no other apps use GARGLK at this time and made changes to the build file to support compiling on NetBSD. Also reported upstream in github. Issue #274
+
+--- Jamrules.orig      2011-10-19 20:34:39.000000000 +0000
++++ Jamrules
+@@ -6,6 +6,7 @@ BUILD ?= RELEASE ;
+ USESDL ?= yes ;
+ USEBABEL ?= yes ;
+ BUNDLEFONTS ?= yes ;
++STATIC = yes ;
+ 
+ # jam -sGUILIB=EFL
+ GUILIB ?= gtk+ ;
+@@ -100,6 +101,23 @@ switch $(OS)
+         if $(STATIC) { LINKLIBS += $(GARGLKLIBS) ; }
+         else      { SHRLINKLIBS += $(GARGLKLIBS) ; }
+ 
++    case NETBSD :
++        Echo "OS is NETBSD ($(GUILIB))" ;
++        PKGCONFIG = "pkg-config freetype2 gtk+-x11-2.0 gdk-x11-2.0 gobject-2.0 glib-2.0 fontconfig libpng16" ;
++
++        GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" -fPIC ;
++        GARGLKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lz ;
++        LINKLIBS = -lz -lm "`$(PKGCONFIG) --libs`" ;
++
++        if $(USESDL) = yes
++        {
++            GARGLKCCFLAGS += -I${DESTDIR}/include/SDL ;
++            GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL -lsmpeg -lvorbisfile ;
++        }
++
++        if $(STATIC) { LINKLIBS += $(GARGLKLIBS) ; }
++        else      { SHRLINKLIBS += $(GARGLKLIBS) ; }
++
+ 
+     case IPLINUX :
+         Echo "OS is IPLINUX (EFL)" ;
Index: pkgsrc/games/gargoyle/patches/patch-terps_nitfol_nitfol.h
diff -u /dev/null pkgsrc/games/gargoyle/patches/patch-terps_nitfol_nitfol.h:1.1
--- /dev/null   Sat Jul 29 06:25:39 2017
+++ pkgsrc/games/gargoyle/patches/patch-terps_nitfol_nitfol.h   Sat Jul 29 06:25:39 2017
@@ -0,0 +1,23 @@
+$NetBSD: patch-terps_nitfol_nitfol.h,v 1.1 2017/07/29 06:25:39 wiz Exp $
+
+No point in using inline, and it breaks compilation with gcc-5.4
+on NetBSD-8.99.1/amd64.
+
+--- terps/nitfol/nitfol.h.orig 2011-10-19 20:34:39.000000000 +0000
++++ terps/nitfol/nitfol.h
+@@ -115,15 +115,7 @@ typedef unsigned long offset;
+ #define XPASTE(a, b) PASTE(a, b)
+ 
+ 
+-#if defined(__cplusplus) || defined(USE_INLINE)
+-#define N_INLINE inline
+-#elif defined(INLINE)
+-#define N_INLINE INLINE
+-#elif defined(__GNUC__)
+-#define N_INLINE __inline__
+-#else
+ #define N_INLINE
+-#endif
+ 
+ 
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/games
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/games
Indexes:

Home | Main Index | Thread Index | Old Index