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

[jake_goerzen at users.sourceforge.net]

Revision: 3757
          http://gar.svn.sourceforge.net/gar/?rev=3757&view=rev
Author:   jake_goerzen
Date:     2009-03-14 02:13:39 +0000 (Sat, 14 Mar 2009)

Log Message:
-----------
add patch file and updates to Makefile

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

Added Paths:
-----------
    csw/mgar/pkg/hatari/trunk/files/stdint.h.diff

Modified: csw/mgar/pkg/hatari/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hatari/trunk/Makefile	2009-03-14 00:49:23 UTC (rev 3756)
+++ csw/mgar/pkg/hatari/trunk/Makefile	2009-03-14 02:13:39 UTC (rev 3757)
@@ -11,19 +11,19 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
 DISTFILES += $(call admfiles,CSWhatari, depend )
 
-# We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 # If the url used to check for software update is different of MASTER_SITES, then 
 # uncomment the next line. Otherwise it is set by default to the value of MASTER_SITES
 # UPSTREAM_MASTER_SITES = 
 
-# NOTE: before building replace stdint.h -> sys/types.h in file src/int.c & src/uae-cpu/sysdeps.h   At final link stage linker cannot find -lpng -lreadline force it with LD_OPTIONS=-L/opt/csw/lib gmake build   need to make patch.
+# NOTE: before building replace stdint.h -> sys/types.h in file src/int.c & src/uae-cpu/sysdeps.h   need to make patch.
 
 LICENSE = gpl.txt
-
+PATCHFILES = stdint.h.diff
 GARCOMPILER = GNU
 TEST_SCRIPTS =
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS) LIBS='-lm -lsocket'
+BUILD_ARGS = LD_OPTIONS=-L/opt/csw/lib
 
 include gar/category.mk

Modified: csw/mgar/pkg/hatari/trunk/checksums
===================================================================
--- csw/mgar/pkg/hatari/trunk/checksums	2009-03-14 00:49:23 UTC (rev 3756)
+++ csw/mgar/pkg/hatari/trunk/checksums	2009-03-14 02:13:39 UTC (rev 3757)
@@ -1,3 +1,4 @@
 4aecd42784fae8c5e8c9a9a341146fbb  download/hatari-1.2.0.tar.bz2
 1f74fc77f3c0664cdd49e2c9cba3fe2d  download/CSWhatari.gspec
 c9dda36e1f7a79cf0c8b65d3503fdc5d  download/CSWhatari.depend
+26ec668f0b919c0d3c5dc264df17a83f  download/stdint.h.diff

Added: csw/mgar/pkg/hatari/trunk/files/stdint.h.diff
===================================================================
--- csw/mgar/pkg/hatari/trunk/files/stdint.h.diff	                        (rev 0)
+++ csw/mgar/pkg/hatari/trunk/files/stdint.h.diff	2009-03-14 02:13:39 UTC (rev 3757)
@@ -0,0 +1,31 @@
+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.