ports/176562: devel/kyra: Update to version 2.1.3
KATO Tsuguru
tkato432 at yahoo.com
Thu Feb 28 18:10:12 UTC 2013
>Number: 176562
>Category: ports
>Synopsis: devel/kyra: Update to version 2.1.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Feb 28 18:10:12 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 2.1.3
New file:
files/patch-encoder__MakefileKyra
files/patch-engine__MakefileKyra
Remove file:
files/patch-engine_imnode.h
files/patch-util_gltypes.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/kyra/Makefile devel/kyra/Makefile
--- /usr/ports/devel/kyra/Makefile 2012-11-08 05:23:20.000000000 +0900
+++ devel/kyra/Makefile 2013-02-24 05:10:32.000000000 +0900
@@ -1,32 +1,46 @@
-# New ports collection makefile for: kyra
-# Date created: 10.05.2003
-# Whom: Kirill Ponomarew <ponomarew at oberon.net>
-#
+# Created by: Kirill Ponomarew <ponomarew at oberon.net>
# $FreeBSD: head/devel/kyra/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
PORTNAME= kyra
-PORTVERSION= 2.0.7
-PORTREVISION= 12
+PORTVERSION= 2.1.3
CATEGORIES= devel
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}2/${PORTVERSION}
DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g}
MAINTAINER= ports at FreeBSD.org
-COMMENT= A simple Sprite engine written in C++
+COMMENT= Simple Sprite engine written in C++
-LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
- tiff.4:${PORTSDIR}/graphics/tiff \
- jpeg.11:${PORTSDIR}/graphics/jpeg
+LICENSE= GPLv2
+
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
+ png15:${PORTSDIR}/graphics/png \
+ tiff:${PORTSDIR}/graphics/tiff
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_AUTOTOOLS= libtool
+USE_ZIP= yes
+USE_GL= gl
USE_SDL= image sdl
-USE_GNOME= lthack
-GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= yes
+USE_GMAKE= yes
+MAKEFILE= MakefileKyra
+MAKE_ENV= MAKE_KYRA=RELEASE KYRA_OPENGL=YES
+MAKE_ARGS= CC="${CC}" CXX="${CXX}" LD="${CXX}" \
+ RELEASE_CFLAGS="${CFLAGS}" RELEASE_CXXFLAGS="${CXXFLAGS}"
+MAKE_JOBS_SAFE= yes
+
+do-install:
+.for i in encoder spriteed
+ (cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} kr${i} ${PREFIX}/bin)
+.endfor
+ (cd ${WRKSRC}/engine && ${INSTALL_DATA} libkyra.a ${PREFIX}/lib)
+ @${MKDIR} ${PREFIX}/include/Kyra
+ (cd ${WRKSRC} && ${INSTALL_DATA} kyra.h ${PREFIX}/include/Kyra)
+.for i in engine gui guiExtended util
+ @${MKDIR} ${PREFIX}/include/Kyra/${i}
+ (cd ${WRKSRC}/${i} && ${INSTALL_DATA} *.h ${PREFIX}/include/Kyra/${i})
+.endfor
+ @${MKDIR} ${PREFIX}/include/Kyra/tinyxml
+ (cd ${WRKSRC}/../tinyxml && ${INSTALL_DATA} *.h \
+ ${PREFIX}/include/Kyra/tinyxml)
.include <bsd.port.mk>
diff -urN /usr/ports/devel/kyra/distinfo devel/kyra/distinfo
--- /usr/ports/devel/kyra/distinfo 2012-11-08 05:23:20.000000000 +0900
+++ devel/kyra/distinfo 2013-02-23 22:57:24.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (kyra_src_2_0_7.tar.gz) = 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6
-SIZE (kyra_src_2_0_7.tar.gz) = 1994743
+SHA256 (kyra_src_2_1_3.zip) = 19a9f2bceca6ddd5945fb687590e18f29b73819901a476f85ce9c37bec4170f0
+SIZE (kyra_src_2_1_3.zip) = 3595503
diff -urN /usr/ports/devel/kyra/files/patch-encoder__MakefileKyra devel/kyra/files/patch-encoder__MakefileKyra
--- /usr/ports/devel/kyra/files/patch-encoder__MakefileKyra 1970-01-01 09:00:00.000000000 +0900
+++ devel/kyra/files/patch-encoder__MakefileKyra 2013-02-24 04:45:01.000000000 +0900
@@ -0,0 +1,11 @@
+--- encoder/MakefileKyra.orig
++++ encoder/MakefileKyra
+@@ -110,7 +110,7 @@
+ # Output
+ #****************************************************************************
+
+-${OUTPUT}: ${OBJS} ${LIBS}
++${OUTPUT}: ${OBJS} ../engine/libkyra.a
+ ${LD} -o $@ ${LDFLAGS} ${OBJS} ${LIBS} ${EXTRA_LIBS}
+
+ #****************************************************************************
diff -urN /usr/ports/devel/kyra/files/patch-engine__MakefileKyra devel/kyra/files/patch-engine__MakefileKyra
--- /usr/ports/devel/kyra/files/patch-engine__MakefileKyra 1970-01-01 09:00:00.000000000 +0900
+++ devel/kyra/files/patch-engine__MakefileKyra 2013-02-24 04:18:09.000000000 +0900
@@ -0,0 +1,10 @@
+--- engine/MakefileKyra.orig
++++ engine/MakefileKyra
+@@ -130,6 +130,7 @@
+ ../util/glstring.cpp \
+ ../util/glisomath.cpp \
+ ../../grinliz/gldebug.cpp \
++ ../../grinliz/gldynamic.cpp \
+ ../../grinliz/glperformance.cpp \
+ ../../grinliz/glgeometry.cpp \
+ ../../grinliz/glprime.cpp \
diff -urN /usr/ports/devel/kyra/files/patch-engine_imagetree.h devel/kyra/files/patch-engine_imagetree.h
--- /usr/ports/devel/kyra/files/patch-engine_imagetree.h 2012-11-08 05:23:21.000000000 +0900
+++ devel/kyra/files/patch-engine_imagetree.h 2013-02-24 03:20:48.000000000 +0900
@@ -1,11 +1,11 @@
--- engine/imagetree.h.orig 2007-11-12 17:22:54.000000000 +0100
+++ engine/imagetree.h 2007-11-12 17:23:06.000000000 +0100
-@@ -217,7 +217,7 @@
+@@ -190,7 +190,7 @@
void Clear( KrImNode* root ); // delete the entire tree
// Recursive hit test walk.
-- bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray<KrImage*>* outputArray, int windowIndex );
-+ bool HitTestRec( KrImNode* node, int x, int y, int flags, GlDynArray<KrImage*>* outputArray, int windowIndex );
+- bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex );
++ bool HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex );
KrImNode* root; // The root to position the window
KrImNode* offsetRoot; // The root as returned to the client
diff -urN /usr/ports/devel/kyra/files/patch-engine_imnode.h devel/kyra/files/patch-engine_imnode.h
--- /usr/ports/devel/kyra/files/patch-engine_imnode.h 2012-11-08 05:23:21.000000000 +0900
+++ devel/kyra/files/patch-engine_imnode.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- engine/imnode.h.orig 2007-11-13 12:15:46.000000000 +0100
-+++ engine/imnode.h 2007-11-13 12:18:19.000000000 +0100
-@@ -288,7 +288,7 @@
- /// Fetches the user defined data.
- void* GetUserData() { return userData; }
- /// Fetches the user defined data. Fetches the *same* user data as GetUserData, just uses a convenience cast.
-- U32 GetUserDataU32() { return (U32) userData; }
-+ //U32 GetUserDataU32() { return (U32) userData; }
-
- /** Return a copy if this object, not in a Tree(). It is
- return untransformed. In the case of a sprite, the action
diff -urN /usr/ports/devel/kyra/files/patch-util_gltypes.h devel/kyra/files/patch-util_gltypes.h
--- /usr/ports/devel/kyra/files/patch-util_gltypes.h 2012-11-08 05:23:21.000000000 +0900
+++ devel/kyra/files/patch-util_gltypes.h 1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
---- util/gltypes.h.orig Tue Sep 12 19:01:55 2006
-+++ util/gltypes.h Tue Sep 12 19:02:26 2006
-@@ -40,8 +40,8 @@
- typedef Sint32 S32;
-
- #ifdef SDL_HAS_64BIT_TYPE
-- typedef SDL_HAS_64BIT_TYPE S64;
-- typedef unsigned SDL_HAS_64BIT_TYPE U64;
-+ typedef Sint64 S64;
-+ typedef Uint64 U64;
- #else
- #error No 64-bit integer.
- #endif
diff -urN /usr/ports/devel/kyra/pkg-plist devel/kyra/pkg-plist
--- /usr/ports/devel/kyra/pkg-plist 2012-11-08 05:23:21.000000000 +0900
+++ devel/kyra/pkg-plist 2013-02-24 05:08:53.000000000 +0900
@@ -1,6 +1,5 @@
bin/krencoder
bin/krspriteed
-bin/kyra-config
include/Kyra/engine/action.h
include/Kyra/engine/box.h
include/Kyra/engine/boxresource.h
@@ -28,7 +27,6 @@
include/Kyra/engine/pixelblock.h
include/Kyra/engine/rle.h
include/Kyra/engine/sdlutil.h
-include/Kyra/engine/splash.h
include/Kyra/engine/sprite.h
include/Kyra/engine/spriteresource.h
include/Kyra/engine/tags.h
@@ -46,33 +44,20 @@
include/Kyra/guiExtended/progress.h
include/Kyra/kyra.h
include/Kyra/tinyxml/tinyxml.h
+include/Kyra/tinyxml/tinystr.h
include/Kyra/util/glbitstream.h
include/Kyra/util/glcirclelist.h
include/Kyra/util/gldebug.h
-include/Kyra/util/gldynarray.h
include/Kyra/util/glfixed.h
-include/Kyra/util/glgraph.h
include/Kyra/util/glinsidelist.h
include/Kyra/util/glintarrayset.h
include/Kyra/util/glisomath.h
include/Kyra/util/gllist.h
-include/Kyra/util/glmap.h
-include/Kyra/util/glmemorypool.h
-include/Kyra/util/glperformance.h
-include/Kyra/util/glprime.h
-include/Kyra/util/glrandom.h
-include/Kyra/util/glstack.h
include/Kyra/util/glstring.h
-include/Kyra/util/gltypes.h
-include/Kyra/util/glutil.h
lib/libkyra.a
-lib/libkyra.la
-lib/libkyra.so
-lib/libkyra.so.0
-share/aclocal/kyra.m4
@dirrm include/Kyra/util
- at dirrm include/Kyra/gui
+ at dirrm include/Kyra/tinyxml
@dirrm include/Kyra/guiExtended
+ at dirrm include/Kyra/gui
@dirrm include/Kyra/engine
- at dirrm include/Kyra/tinyxml
@dirrm include/Kyra
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list