- update gargoyle to 2001.1

- use new style DEPENDS

ok sthen@ (MAINTAINER)
This commit is contained in:
jasper 2010-10-23 09:15:16 +00:00
parent fe4a9f9fe5
commit d58090ce1a
7 changed files with 72 additions and 46 deletions

View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.7 2010/10/17 22:21:55 jasper Exp $
# $OpenBSD: Makefile,v 1.8 2010/10/23 09:15:16 jasper Exp $
SHARED_ONLY = Yes
COMMENT = cross-platform interactive fiction player
DISTNAME = gargoyle-2009-08-25-sources
PKGNAME = gargoyle-20090825
REVISION = 1
DISTNAME = gargoyle-2010.1-sources
PKGNAME = gargoyle-2010.1
EPOCH = 0
CATEGORIES = games x11
@ -25,23 +25,21 @@ PERMIT_DISTFILES_FTP = Yes
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
Xi Xinerama Xrandr Xrender c cairo expat fontconfig \
freetype iconv m pixman-1 pthread pthread-stubs xcb stdc++ \
vorbisfile z gdk_pixbuf-2.0
vorbisfile z gdk_pixbuf-2.0 SDL.>=2.0 SDL_sound SDL_mixer \
atk-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0 \
gdk-x11-2.0 jpeg.>=62 pango-1.0.>=1600.0 \
pangocairo-1.0.>=1600.0 pangoft2-1.0.>=1600.0 png.>=3 smpeg \
GL Xxf86vm drm gthread-2.0 xcb-render xcb-shm
MASTER_SITES = http://garglk.googlecode.com/files/
EXTRACT_SUFX = .zip
MODULES = devel/gettext
BUILD_DEPENDS = ::devel/jam
LIB_DEPENDS = SDL.>=2.0::devel/sdl \
SDL_sound::devel/sdl-sound \
SDL_mixer::devel/sdl-mixer \
atk-1.0::devel/atk \
gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0::devel/glib2 \
gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 \
jpeg.>=62::graphics/jpeg \
pango-1.0.>=1600.0,pangocairo-1.0.>=1600.0,pangoft2-1.0.>=1600.0::devel/pango \
png.>=3::graphics/png \
smpeg::devel/smpeg
LIB_DEPENDS = ::devel/sdl-sound \
::devel/sdl-mixer \
::x11/gtk+2 \
::graphics/jpeg
USE_X11 = Yes
@ -55,8 +53,8 @@ JAMDEBUG += -q # die quickly on build failure
MAKE_ENV += CC=${CC} CXX=${CXX}
DESTDIRNAME = DESTPREFIX
post-extract:
find ${WRKSRC} -name '*.orig' -print0 | xargs -0 rm
pre-configure:
${SUBST_CMD} ${WRKSRC}/garglk/launchgtk.c
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} jam ${JAMDEBUG}
@ -71,6 +69,7 @@ post-install:
${INSTALL_SCRIPT} ${WRKSRC}/build/openbsd.release/garglk/gargoyle \
${PREFIX}/libexec/gargoyle/
ln -s ${TRUEPREFIX}/libexec/gargoyle/gargoyle ${PREFIX}/bin/
ln -s ${TRUEPREFIX}/libexec/gargoyle/libgarglk.so ${PREFIX}/lib/
.for i in License.txt licenses/* garglk/*txt
cd ${WRKSRC} && ${INSTALL_DATA} $i ${PREFIX}/share/doc/gargoyle
.endfor

View File

@ -1,5 +1,5 @@
MD5 (gargoyle-2009-08-25-sources.zip) = 41r4+801Nu5TH7f5z+xMXA==
RMD160 (gargoyle-2009-08-25-sources.zip) = 3fDMVlH5F/M5SBj95+9lunjRl9A=
SHA1 (gargoyle-2009-08-25-sources.zip) = xZVHru6Qc1QBQyJgNAfmPNuibfk=
SHA256 (gargoyle-2009-08-25-sources.zip) = j4xJ8KWjo+2HIJKKhTFxOWlvpAPOGgB8jfTqPgT67Kk=
SIZE (gargoyle-2009-08-25-sources.zip) = 11551238
MD5 (gargoyle-2010.1-sources.zip) = Wxs6ebfBpa0shb75cX3giA==
RMD160 (gargoyle-2010.1-sources.zip) = aEB8oZtMOk78QMGKNj5ePcFelQ8=
SHA1 (gargoyle-2010.1-sources.zip) = 7uoXs0unzesNwbYZuIs27Cu4No8=
SHA256 (gargoyle-2010.1-sources.zip) = FkZWViXPljvyfwy+kXNVI+HIPqLUm++f9TTBrHiqfh0=
SIZE (gargoyle-2010.1-sources.zip) = 10771623

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Jamrules,v 1.4 2010/10/17 22:21:55 jasper Exp $
--- Jamrules.orig Sat Jun 6 08:17:22 2009
+++ Jamrules Fri Jun 19 12:35:31 2009
@@ -7,8 +7,8 @@ BUILD ?= RELEASE ;
$OpenBSD: patch-Jamrules,v 1.5 2010/10/23 09:15:16 jasper Exp $
--- Jamrules.orig Mon Sep 27 15:05:16 2010
+++ Jamrules Thu Oct 21 23:12:05 2010
@@ -6,8 +6,8 @@ BUILD ?= RELEASE ;
USESDL = yes ;
# USEFMOD = yes ;
BUNDLEFONTS = yes ;
-CC = gcc ;
-C++ = g++ ;
@ -12,9 +12,9 @@ $OpenBSD: patch-Jamrules,v 1.4 2010/10/17 22:21:55 jasper Exp $
if $(CROSS)
{
@@ -72,6 +72,23 @@ switch $(OS)
SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
}
@@ -89,6 +89,23 @@ switch $(OS)
else { SHRLINKLIBS += $(GARGLKLIBS) ; }
+ case OPENBSD :
+ Echo "OS is OpenBSD (gtk+)" ;
@ -34,9 +34,9 @@ $OpenBSD: patch-Jamrules,v 1.4 2010/10/17 22:21:55 jasper Exp $
+ }
+
case MACOSX :
Echo "OS is MACOSX (gtk+)" ;
Echo "OS is MACOSX (cocoa)" ;
SUFDLL = .dylib ;
@@ -98,7 +115,7 @@ switch $(BUILD)
@@ -121,7 +138,7 @@ switch $(BUILD)
case RELEASE :
Echo "BUILD is RELEASE" ;

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-garglk_launchgtk_c,v 1.1 2010/10/23 09:15:16 jasper Exp $
Remove Linux'ism to figure out the libexec dir.
--- garglk/launchgtk.c.orig Fri Sep 24 12:36:30 2010
+++ garglk/launchgtk.c Fri Oct 22 18:00:34 2010
@@ -146,6 +146,7 @@ void winbrowsefile(char *buffer)
void winpath(char *buffer)
{
+#if defined(__linux__)
char exepath[MaxBuffer] = {0};
unsigned int exelen;
@@ -157,6 +158,10 @@ void winpath(char *buffer)
}
strcpy(buffer, exepath);
+#elif defined(__OpenBSD__)
+ char exepath[MaxBuffer] = "${LOCALBASE}/libexec/gargoyle/";
+ snprintf(buffer, sizeof(exepath), "%s", exepath );
+#endif
char *dirpos = strrchr(buffer, *DirSeparator);
if ( dirpos != NULL )

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-tads_Jamfile,v 1.2 2009/08/28 01:02:21 sthen Exp $
--- tads/Jamfile.orig Sat Jan 17 11:27:28 2009
+++ tads/Jamfile Fri Jun 19 12:35:32 2009
@@ -26,6 +26,15 @@ if $(OS) = LINUX || $(OS) = SOLARIS
;
$OpenBSD: patch-tads_Jamfile,v 1.3 2010/10/23 09:15:16 jasper Exp $
--- tads/Jamfile.orig Mon Sep 13 16:53:08 2010
+++ tads/Jamfile Mon Oct 18 00:09:08 2010
@@ -32,6 +32,15 @@ if $(OS) = MACOSX
LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
}
+if $(OS) = OPENBSD
@ -16,8 +16,8 @@ $OpenBSD: patch-tads_Jamfile,v 1.2 2009/08/28 01:02:21 sthen Exp $
+
SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ;
SEARCH_SOURCE = [ FDirName $(SUBDIR) tads2 ] ;
@@ -74,7 +83,7 @@ Main tadsr :
SEARCH_SOURCE =
@@ -81,7 +90,7 @@ Main tadsr :
LinkLibraries tadsr : libtads2 libtads3 ;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-terps_Jamfile,v 1.1.1.1 2009/02/11 13:30:44 sthen Exp $
--- terps/Jamfile.orig Wed Dec 10 11:08:14 2008
+++ terps/Jamfile Wed Jan 21 14:29:26 2009
@@ -156,7 +156,7 @@ if $(MAKE_GEAS) = yes
$OpenBSD: patch-terps_Jamfile,v 1.2 2010/10/23 09:15:16 jasper Exp $
--- terps/Jamfile.orig Thu Sep 30 09:33:34 2010
+++ terps/Jamfile Mon Oct 18 00:09:08 2010
@@ -165,7 +165,7 @@ if $(MAKE_GEAS) = yes
istring.cc readfile.cc
;

View File

@ -1,12 +1,13 @@
@comment $OpenBSD: PLIST,v 1.3 2009/08/28 01:02:21 sthen Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/10/23 09:15:16 jasper Exp $
bin/gargoyle
lib/libgarglk.so
libexec/gargoyle/
@bin libexec/gargoyle/advsys
@bin libexec/gargoyle/agility
@bin libexec/gargoyle/alan2
@bin libexec/gargoyle/alan3
@bin libexec/gargoyle/frotz
libexec/gargoyle/gargoyle
@bin libexec/gargoyle/gargoyle
@bin libexec/gargoyle/geas
@bin libexec/gargoyle/git
@bin libexec/gargoyle/glulxe
@ -19,10 +20,11 @@ libexec/gargoyle/libgarglk.so
@bin libexec/gargoyle/scare
@bin libexec/gargoyle/tadsr
share/doc/gargoyle/
share/doc/gargoyle/CharterBT.txt
share/doc/gargoyle/GNU General Public License.txt
share/doc/gargoyle/HUGO License.txt
share/doc/gargoyle/LUXI License.txt
share/doc/gargoyle/Liberation License.txt
share/doc/gargoyle/Libertine OFL.txt
share/doc/gargoyle/License.txt
share/doc/gargoyle/LuxiMono.txt
share/doc/gargoyle/MIT License.txt