update Gargoyle to 20090825 (bug fixes, new features, and some
license cleanup). enable distfiles/packages for ftp; some parts are noncommercial only so not for cdrom.
This commit is contained in:
sthen
parent
a0766c55cc
commit
5815152193
@ -1,14 +1,11 @@
|
|||||||
# $OpenBSD: Makefile,v 1.4 2009/08/10 06:31:42 kili Exp $
|
# $OpenBSD: Makefile,v 1.5 2009/08/28 01:02:20 sthen Exp $
|
||||||
|
|
||||||
SHARED_ONLY = Yes
|
SHARED_ONLY = Yes
|
||||||
|
|
||||||
COMMENT = cross-platform interactive fiction player
|
COMMENT = cross-platform interactive fiction player
|
||||||
|
|
||||||
DISTNAME = gargoyle-2008-12-25-sources
|
DISTNAME = gargoyle-2009-08-25-sources
|
||||||
PKGNAME = gargoyle-20081225p2
|
PKGNAME = gargoyle-20090825
|
||||||
|
|
||||||
# not a libtool port; any additional libs will need further changes.
|
|
||||||
SHARED_LIBS = garglk 0.0
|
|
||||||
|
|
||||||
CATEGORIES = games x11
|
CATEGORIES = games x11
|
||||||
|
|
||||||
@ -18,12 +15,11 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
|
|||||||
|
|
||||||
# Various. Gargoyle is a frontend for various other included
|
# Various. Gargoyle is a frontend for various other included
|
||||||
# programs under differing licenses; many GPL but some others.
|
# programs under differing licenses; many GPL but some others.
|
||||||
# Refer to ${WRKSRC}/License.txt. terps/alan{2,3} and the
|
# Refer to ${WRKSRC}/License.txt.
|
||||||
# Gargoyle Glk library lack a clear license.
|
PERMIT_PACKAGE_CDROM = noncommercial only for some parts
|
||||||
PERMIT_PACKAGE_CDROM = missing a few licenses
|
PERMIT_PACKAGE_FTP = Yes
|
||||||
PERMIT_PACKAGE_FTP = missing a few licenses
|
PERMIT_DISTFILES_CDROM =noncommercial only for some parts
|
||||||
PERMIT_DISTFILES_CDROM =missing a few licenses
|
PERMIT_DISTFILES_FTP = Yes
|
||||||
PERMIT_DISTFILES_FTP = missing a few licenses
|
|
||||||
|
|
||||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
|
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
|
||||||
Xi Xinerama Xrandr Xrender c cairo expat fontconfig \
|
Xi Xinerama Xrandr Xrender c cairo expat fontconfig \
|
||||||
@ -57,34 +53,27 @@ INSTALL_TARGET = install install_man
|
|||||||
JAMDEBUG = -d x # display command-lines
|
JAMDEBUG = -d x # display command-lines
|
||||||
JAMDEBUG += -q # die quickly on build failure
|
JAMDEBUG += -q # die quickly on build failure
|
||||||
MAKE_ENV += CC=${CC} CXX=${CXX}
|
MAKE_ENV += CC=${CC} CXX=${CXX}
|
||||||
|
DESTDIRNAME = DESTPREFIX
|
||||||
|
|
||||||
post-extract:
|
post-extract:
|
||||||
find ${WRKSRC} -name '*.orig' -print0 | xargs -0 rm
|
find ${WRKSRC} -name '*.orig' -print0 | xargs -0 rm
|
||||||
|
|
||||||
# SUBST_CMD replaces $\ with $ which breaks this file.
|
|
||||||
pre-configure:
|
|
||||||
perl -pi -e s,%PREFIX%,${PREFIX},g ${WRKSRC}/garglk/launcher.sh
|
|
||||||
|
|
||||||
do-build:
|
do-build:
|
||||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam ${JAMDEBUG}
|
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam ${JAMDEBUG}
|
||||||
|
|
||||||
do-install:
|
do-install:
|
||||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${ALL_FAKE_FLAGS} jam \
|
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${ALL_FAKE_FLAGS} \
|
||||||
${JAMDEBUG} install
|
DESTDIR=${PREFIX}/libexec/gargoyle jam ${JAMDEBUG} install
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
chmod -R og+rw ${WRKSRC}/build/dist
|
|
||||||
${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/gargoyle
|
|
||||||
for i in `find ${WRKSRC}/build/dist -type f ! \( -name "lib*.so*" \
|
|
||||||
-or -name gargoyle \)`; \
|
|
||||||
do ${INSTALL_PROGRAM} $$i ${PREFIX}/libexec/gargoyle; done
|
|
||||||
${INSTALL_DATA} ${WRKSRC}/build/dist/libgarglk.so* ${PREFIX}/lib
|
|
||||||
${INSTALL_SCRIPT} ${WRKSRC}/build/dist/gargoyle ${PREFIX}/bin
|
|
||||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gargoyle
|
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gargoyle
|
||||||
|
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gargoyle
|
||||||
|
${INSTALL_SCRIPT} ${WRKSRC}/build/openbsd.release/garglk/gargoyle \
|
||||||
|
${PREFIX}/libexec/gargoyle/
|
||||||
|
ln -s ${TRUEPREFIX}/libexec/gargoyle/gargoyle ${PREFIX}/bin/
|
||||||
.for i in License.txt licenses/* garglk/*txt
|
.for i in License.txt licenses/* garglk/*txt
|
||||||
cd ${WRKSRC} && ${INSTALL_DATA} $i ${PREFIX}/share/doc/gargoyle
|
cd ${WRKSRC} && ${INSTALL_DATA} $i ${PREFIX}/share/doc/gargoyle
|
||||||
.endfor
|
.endfor
|
||||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gargoyle
|
|
||||||
${INSTALL_DATA} ${WRKSRC}/garglk/garglk.ini \
|
${INSTALL_DATA} ${WRKSRC}/garglk/garglk.ini \
|
||||||
${PREFIX}/share/examples/gargoyle
|
${PREFIX}/share/examples/gargoyle
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
MD5 (gargoyle-2008-12-25-sources.zip) = bW1rKdrPtSOxATw++FzuUw==
|
MD5 (gargoyle-2009-08-25-sources.zip) = 41r4+801Nu5TH7f5z+xMXA==
|
||||||
RMD160 (gargoyle-2008-12-25-sources.zip) = Yf6WhkmGYtY4FhKUF41fE+X6QT0=
|
RMD160 (gargoyle-2009-08-25-sources.zip) = 3fDMVlH5F/M5SBj95+9lunjRl9A=
|
||||||
SHA1 (gargoyle-2008-12-25-sources.zip) = GLwUEQgL2wk5gV77S2spSrlEN6U=
|
SHA1 (gargoyle-2009-08-25-sources.zip) = xZVHru6Qc1QBQyJgNAfmPNuibfk=
|
||||||
SHA256 (gargoyle-2008-12-25-sources.zip) = h9CqoYagqoh1lMAoplSpCqPf0/9xyuoS3Wuk3A/xY1E=
|
SHA256 (gargoyle-2009-08-25-sources.zip) = j4xJ8KWjo+2HIJKKhTFxOWlvpAPOGgB8jfTqPgT67Kk=
|
||||||
SIZE (gargoyle-2008-12-25-sources.zip) = 10233153
|
SIZE (gargoyle-2009-08-25-sources.zip) = 11551238
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
$OpenBSD: patch-Jamrules,v 1.2 2009/04/05 11:58:38 sthen Exp $
|
$OpenBSD: patch-Jamrules,v 1.3 2009/08/28 01:02:21 sthen Exp $
|
||||||
--- Jamrules.orig Mon Dec 22 15:19:34 2008
|
--- Jamrules.orig Sat Jun 6 08:17:22 2009
|
||||||
+++ Jamrules Wed Jan 21 14:29:25 2009
|
+++ Jamrules Fri Jun 19 12:35:31 2009
|
||||||
@@ -7,8 +7,8 @@ BUILD ?= RELEASE ;
|
@@ -7,8 +7,8 @@ BUILD ?= RELEASE ;
|
||||||
USESDL = yes ;
|
USESDL = yes ;
|
||||||
# USEFMOD = yes ;
|
# USEFMOD = yes ;
|
||||||
@ -12,7 +12,7 @@ $OpenBSD: patch-Jamrules,v 1.2 2009/04/05 11:58:38 sthen Exp $
|
|||||||
|
|
||||||
if $(CROSS)
|
if $(CROSS)
|
||||||
{
|
{
|
||||||
@@ -57,6 +57,23 @@ switch $(OS)
|
@@ -72,6 +72,23 @@ switch $(OS)
|
||||||
SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
|
SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ $OpenBSD: patch-Jamrules,v 1.2 2009/04/05 11:58:38 sthen Exp $
|
|||||||
case MACOSX :
|
case MACOSX :
|
||||||
Echo "OS is MACOSX (gtk+)" ;
|
Echo "OS is MACOSX (gtk+)" ;
|
||||||
SUFDLL = .dylib ;
|
SUFDLL = .dylib ;
|
||||||
@@ -83,7 +100,7 @@ switch $(BUILD)
|
@@ -98,7 +115,7 @@ switch $(BUILD)
|
||||||
|
|
||||||
case RELEASE :
|
case RELEASE :
|
||||||
Echo "BUILD is RELEASE" ;
|
Echo "BUILD is RELEASE" ;
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
$OpenBSD: patch-garglk_launcher_sh,v 1.1.1.1 2009/02/11 13:30:44 sthen Exp $
|
|
||||||
--- garglk/launcher.sh.orig Thu Nov 27 18:51:16 2008
|
|
||||||
+++ garglk/launcher.sh Wed Jan 21 14:29:25 2009
|
|
||||||
@@ -14,9 +14,9 @@ else
|
|
||||||
dirpath=`dirname $0`
|
|
||||||
fi
|
|
||||||
|
|
||||||
-if [ -d /usr/share/gargoyle/bin ]
|
|
||||||
+if [ -d %PREFIX%/libexec/gargoyle ]
|
|
||||||
then
|
|
||||||
- dirpath=/usr/share/gargoyle/bin
|
|
||||||
+ dirpath=%PREFIX%/libexec/gargoyle
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ x"$dirpath" == x ]
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-tads_Jamfile,v 1.1.1.1 2009/02/11 13:30:44 sthen Exp $
|
$OpenBSD: patch-tads_Jamfile,v 1.2 2009/08/28 01:02:21 sthen Exp $
|
||||||
--- tads/Jamfile.orig Mon Dec 22 15:04:02 2008
|
--- tads/Jamfile.orig Sat Jan 17 11:27:28 2009
|
||||||
+++ tads/Jamfile Wed Jan 21 14:29:25 2009
|
+++ tads/Jamfile Fri Jun 19 12:35:32 2009
|
||||||
@@ -26,6 +26,15 @@ if $(OS) = LINUX
|
@@ -26,6 +26,15 @@ if $(OS) = LINUX || $(OS) = SOLARIS
|
||||||
;
|
;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,18 +1,19 @@
|
|||||||
@comment $OpenBSD: PLIST,v 1.2 2009/07/19 21:39:21 sthen Exp $
|
@comment $OpenBSD: PLIST,v 1.3 2009/08/28 01:02:21 sthen Exp $
|
||||||
bin/gargoyle
|
bin/gargoyle
|
||||||
lib/libgarglk.so
|
|
||||||
libexec/gargoyle/
|
libexec/gargoyle/
|
||||||
@bin libexec/gargoyle/advsys
|
@bin libexec/gargoyle/advsys
|
||||||
@bin libexec/gargoyle/agility
|
@bin libexec/gargoyle/agility
|
||||||
@bin libexec/gargoyle/alan2
|
@bin libexec/gargoyle/alan2
|
||||||
@bin libexec/gargoyle/alan3
|
@bin libexec/gargoyle/alan3
|
||||||
@bin libexec/gargoyle/frotz
|
@bin libexec/gargoyle/frotz
|
||||||
|
libexec/gargoyle/gargoyle
|
||||||
@bin libexec/gargoyle/geas
|
@bin libexec/gargoyle/geas
|
||||||
@bin libexec/gargoyle/git
|
@bin libexec/gargoyle/git
|
||||||
@bin libexec/gargoyle/glulxe
|
@bin libexec/gargoyle/glulxe
|
||||||
@bin libexec/gargoyle/hugo
|
@bin libexec/gargoyle/hugo
|
||||||
@bin libexec/gargoyle/jacl
|
@bin libexec/gargoyle/jacl
|
||||||
@bin libexec/gargoyle/level9
|
@bin libexec/gargoyle/level9
|
||||||
|
libexec/gargoyle/libgarglk.so
|
||||||
@bin libexec/gargoyle/magnetic
|
@bin libexec/gargoyle/magnetic
|
||||||
@bin libexec/gargoyle/nitfol
|
@bin libexec/gargoyle/nitfol
|
||||||
@bin libexec/gargoyle/scare
|
@bin libexec/gargoyle/scare
|
||||||
@ -24,7 +25,7 @@ share/doc/gargoyle/HUGO License.txt
|
|||||||
share/doc/gargoyle/LUXI License.txt
|
share/doc/gargoyle/LUXI License.txt
|
||||||
share/doc/gargoyle/License.txt
|
share/doc/gargoyle/License.txt
|
||||||
share/doc/gargoyle/LuxiMono.txt
|
share/doc/gargoyle/LuxiMono.txt
|
||||||
share/doc/gargoyle/TADS License.txt
|
share/doc/gargoyle/MIT License.txt
|
||||||
share/examples/gargoyle/
|
share/examples/gargoyle/
|
||||||
share/examples/gargoyle/garglk.ini
|
share/examples/gargoyle/garglk.ini
|
||||||
@sample ${SYSCONFDIR}/garglk.ini
|
@sample ${SYSCONFDIR}/garglk.ini
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user