Index: base/stdint_.h
--- base/stdint_.h.orig	2008-02-24 02:12:18 +0100
+++ base/stdint_.h	2009-02-07 18:47:17 +0100
@@ -68,6 +68,13 @@
    typedef unsigned long long uint64_t;
 #  define STDINT_TYPES_DEFINED
 # endif
+#ifdef __sun__
+#  include <sys/int_types.h>
+#  define STDINT_TYPES_DEFINED
+#endif
+#ifdef __FreeBSD__
+#  define STDINT_TYPES_DEFINED
+#endif
    /* other archs may want to add defines here, 
       or use the fallbacks in std.h */
 #endif
Index: base/unix-gcc.mak
--- base/unix-gcc.mak.orig	2008-10-02 21:33:22 +0200
+++ base/unix-gcc.mak	2009-02-07 18:48:04 +0100
@@ -229,7 +229,7 @@
 #   gcc to accept ANSI-style function prototypes and function definitions.
 XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
 
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) $(XINCLUDE)
 
 # Define platform flags for ld.
 # SunOS 4.n may need -Bstatic.
@@ -240,7 +240,7 @@
 # XLDFLAGS can be set from the command line.
 XLDFLAGS=
 
-LDFLAGS=$(XLDFLAGS)
+LDFLAGS=$(XLDFLAGS) $(XLIBDIRS)
 
 # Define any extra libraries to link into the executable.
 # ISC Unix 2.2 wants -linet.
@@ -389,8 +389,8 @@
 DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev $(DD)pamcmyk32.dev
 
 # Shared library target to build.
-GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
-#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
+#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
+GS_SHARED_OBJS=
 
 # ---------------------------- End of options --------------------------- #
 
