[csw-devel] SF.net SVN: gar:[8336] csw/mgar/pkg/hatari/trunk

jake_goerzen at users.sourceforge.net jake_goerzen at users.sourceforge.net
Wed Feb 3 22:32:01 CET 2010


Revision: 8336
          http://gar.svn.sourceforge.net/gar/?rev=8336&view=rev
Author:   jake_goerzen
Date:     2010-02-03 21:31:57 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
upgrade to 1.3.1

Modified Paths:
--------------
    csw/mgar/pkg/hatari/trunk/Makefile
    csw/mgar/pkg/hatari/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch

Removed Paths:
-------------
    csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend
    csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec
    csw/mgar/pkg/hatari/trunk/files/stdint.h.diff

Modified: csw/mgar/pkg/hatari/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hatari/trunk/Makefile	2010-02-03 18:36:29 UTC (rev 8335)
+++ csw/mgar/pkg/hatari/trunk/Makefile	2010-02-03 21:31:57 UTC (rev 8336)
@@ -1,5 +1,5 @@
 GARNAME = hatari
-GARVERSION = 1.2.0
+GARVERSION = 1.3.1
 CATEGORIES = apps
 
 DESCRIPTION = Atari ST emulator
@@ -9,14 +9,17 @@
 
 MASTER_SITES = http://download.berlios.de/hatari/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-DISTFILES += $(call admfiles,CSWhatari, depend )
+PACKAGES = CSWhatari
+RUNTIME_DEP_PKGS = CSWlibsdl CSWpng CSWreadline CSWzlib
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
 LICENSE = gpl.txt
-PATCHFILES = stdint.h.diff
+PATCHFILES = solaris8-compile.patch
+
 GARCOMPILER = GNU
 TEST_SCRIPTS =
 CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket'
 BUILD_ARGS = LD_OPTIONS='-R/opt/csw/lib/$ISALIST -R/opt/csw/lib -L/opt/csw/lib'
+
 include gar/category.mk

Modified: csw/mgar/pkg/hatari/trunk/checksums
===================================================================
--- csw/mgar/pkg/hatari/trunk/checksums	2010-02-03 18:36:29 UTC (rev 8335)
+++ csw/mgar/pkg/hatari/trunk/checksums	2010-02-03 21:31:57 UTC (rev 8336)
@@ -1,4 +1,2 @@
-4aecd42784fae8c5e8c9a9a341146fbb  download/hatari-1.2.0.tar.bz2
-1f74fc77f3c0664cdd49e2c9cba3fe2d  download/CSWhatari.gspec
-c9dda36e1f7a79cf0c8b65d3503fdc5d  download/CSWhatari.depend
-26ec668f0b919c0d3c5dc264df17a83f  download/stdint.h.diff
+112b544ec4affb7c04e931088e62a115  hatari-1.3.1.tar.bz2
+7c76f74423cf214b5065f83632e4cb69  solaris8-compile.patch

Deleted: csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend
===================================================================
--- csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend	2010-02-03 18:36:29 UTC (rev 8335)
+++ csw/mgar/pkg/hatari/trunk/files/CSWhatari.depend	2010-02-03 21:31:57 UTC (rev 8336)
@@ -1,4 +0,0 @@
-P	CSWlibsdl
-P	CSWpng
-P	CSWreadline
-P	CSWzlib

Deleted: csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec
===================================================================
--- csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec	2010-02-03 18:36:29 UTC (rev 8335)
+++ csw/mgar/pkg/hatari/trunk/files/CSWhatari.gspec	2010-02-03 21:31:57 UTC (rev 8336)
@@ -1,4 +0,0 @@
-%var            bitname hatari
-%var            pkgname CSWhatari
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/gpl.txt

Added: csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch
===================================================================
--- csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch	                        (rev 0)
+++ csw/mgar/pkg/hatari/trunk/files/solaris8-compile.patch	2010-02-03 21:31:57 UTC (rev 8336)
@@ -0,0 +1,45 @@
+diff -rupN hatari-1.3.1/src/breakcond.c hatari-1.3.1.new/src/breakcond.c
+--- hatari-1.3.1/src/breakcond.c	2009-09-05 00:52:42.000000000 +0200
++++ hatari-1.3.1.new/src/breakcond.c	2010-02-03 20:50:17.710281057 +0100
+@@ -951,7 +951,7 @@ static char *BreakCond_TokenizeExpressio
+ 		}
+ 		/* validate & copy other characters */
+ 		if (!sep) {
+-			if (!(isalnum(*src) || isblank(*src) ||
++			if (!(isalnum(*src) || isspace(*src) ||
+ 			      *src == '$' || *src == '%')) {
+ 				pstate->error = "invalid character";
+ 				pstate->arg = src-expression;
+diff -rupN hatari-1.3.1/src/int.c hatari-1.3.1.new/src/int.c
+--- hatari-1.3.1/src/int.c	2009-09-05 00:52:43.000000000 +0200
++++ hatari-1.3.1.new/src/int.c	2010-02-03 20:50:33.010231152 +0100
+@@ -66,7 +66,11 @@
+ 
+ const char Int_fileid[] = "Hatari int.c : " __DATE__ " " __TIME__;
+ 
+-#include <stdint.h>
++#if defined (__SVR4)  && defined (__sun)
++#include <sys/types.h>
++#else
++ #include <stdint.h>
++#endif
+ #include <assert.h>
+ #include "main.h"
+ #include "blitter.h"
+diff -rupN hatari-1.3.1/src/uae-cpu/sysdeps.h hatari-1.3.1.new/src/uae-cpu/sysdeps.h
+--- hatari-1.3.1/src/uae-cpu/sysdeps.h	2009-09-05 00:52:44.000000000 +0200
++++ hatari-1.3.1.new/src/uae-cpu/sysdeps.h	2010-02-03 20:50:53.445742428 +0100
+@@ -30,8 +30,11 @@
+ #endif
+ 
+ #include <stdarg.h>
+-#include <stdint.h>
+-
++#if defined (__SVR4)  && defined (__sun)
++#include <sys/types.h>
++#else
++ #include <stdint.h>
++#endif
+ 
+ #if EEXIST == ENOTEMPTY
+ #define BROKEN_OS_PROBABLY_AIX

Deleted: csw/mgar/pkg/hatari/trunk/files/stdint.h.diff
===================================================================
--- csw/mgar/pkg/hatari/trunk/files/stdint.h.diff	2010-02-03 18:36:29 UTC (rev 8335)
+++ csw/mgar/pkg/hatari/trunk/files/stdint.h.diff	2010-02-03 21:31:57 UTC (rev 8336)
@@ -1,31 +0,0 @@
-diff --speed-large-files --minimal -Nru hatari-1.2.0.orig/src/int.c hatari-1.2.0/src/int.c
---- hatari-1.2.0.orig/src/int.c	2009-01-24 15:12:44.000000000 +0100
-+++ hatari-1.2.0/src/int.c	2009-03-14 02:54:10.150429990 +0100
-@@ -66,7 +66,12 @@
- 
- const char Int_fileid[] = "Hatari int.c : " __DATE__ " " __TIME__;
- 
-+#if defined (__SVR4)  && defined (__sun)
-+#include <sys/types.h>
-+#else
- #include <stdint.h>
-+#endif
-+
- #include "main.h"
- #include "blitter.h"
- #include "dmaSnd.h"
-diff --speed-large-files --minimal -Nru hatari-1.2.0.orig/src/uae-cpu/sysdeps.h hatari-1.2.0/src/uae-cpu/sysdeps.h
---- hatari-1.2.0.orig/src/uae-cpu/sysdeps.h	2009-01-24 15:12:45.000000000 +0100
-+++ hatari-1.2.0/src/uae-cpu/sysdeps.h	2009-03-14 02:54:19.410281923 +0100
-@@ -30,7 +30,11 @@
- #endif
- 
- #include <stdarg.h>
-+#if defined (__SVR4)  && defined (__sun)
-+#include <sys/types.h>
-+#else
- #include <stdint.h>
-+#endif
- 
- 
- #if EEXIST == ENOTEMPTY


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


More information about the devel mailing list