[csw-devel] SF.net SVN: gar:[18498] csw/mgar/pkg/pilotlink/trunk

[pfelecan at users.sourceforge.net]

Revision: 18498
          http://gar.svn.sourceforge.net/gar/?rev=18498&view=rev
Author:   pfelecan
Date:     2012-06-22 09:24:46 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
all bindings; still not ready for release: monolithic package.

Modified Paths:
--------------
    csw/mgar/pkg/pilotlink/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch

Modified: csw/mgar/pkg/pilotlink/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/Makefile	2012-06-22 08:41:45 UTC (rev 18497)
+++ csw/mgar/pkg/pilotlink/trunk/Makefile	2012-06-22 09:24:46 UTC (rev 18498)
@@ -32,14 +32,14 @@
 BUILD_DEP_PKGS		+=	CSWtcl
 BUILD_DEP_PKGS		+=	CSWpython-dev
 BUILD_DEP_PKGS		+=	SUNWlibusb
-#BUILD_DEP_PKGS		+=	SUNWj6dev
+BUILD_DEP_PKGS		+=	SUNWj6dev
 BUILD_DEP_PKGS		+=	CSWdoxygen
 
 RUNTIME_DEP_PKGS	=	CSWperl
 RUNTIME_DEP_PKGS	+=	CSWtcl
 RUNTIME_DEP_PKGS	+=	CSWpython
 RUNTIME_DEP_PKGS	+=	SUNWlibusb
-#RUNTIME_DEP_PKGS	+=	SUNWj6rt
+RUNTIME_DEP_PKGS	+=	SUNWj6rt
 
 # This cannot be tracked with checkpkg
 # CHECKPKG_OVERRIDES_CSWpilot-link += surplus-dependency|CSWperl
@@ -49,6 +49,7 @@
 PATCHFILES			=	0001-Fix-python-binding-configuration.patch
 PATCHFILES			+=	0002-Fix-ctime_r-prototype.patch
 PATCHFILES			+=	0003-Avoid-including-redundant-SFW.patch
+PATCHFILES			+=	0004-Include-Solaris-specifics-Java-binding.patch
 
 #GARCOMPILER			=	GNU
 EXTRA_INC			=	/usr/sfw/include
@@ -59,7 +60,7 @@
 CONFIGURE_ARGS		+=	--enable-conduits
 CONFIGURE_ARGS		+=	--enable-libusb
 CONFIGURE_ARGS		+=	--with-perl=$(bindir)/perl
-# #CONFIGURE_ARGS		+=	--with-java=/usr/java
+CONFIGURE_ARGS		+=	--with-java=/usr/java
 CONFIGURE_ARGS		+=	--with-tcl=$(libdir)
 CONFIGURE_ARGS		+=	--with-tclinclude=$(includedir)
 CONFIGURE_ARGS		+=	--with-python

Added: csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch
===================================================================
--- csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch	                        (rev 0)
+++ csw/mgar/pkg/pilotlink/trunk/files/0004-Include-Solaris-specifics-Java-binding.patch	2012-06-22 09:24:46 UTC (rev 18498)
@@ -0,0 +1,25 @@
+From 65c4910a8801f031652d2e7985062a20f9938e48 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Fri, 22 Jun 2012 11:02:26 +0200
+Subject: [PATCH] Include Solaris specifics Java binding
+
+---
+ bindings/Java/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bindings/Java/Makefile.am b/bindings/Java/Makefile.am
+index cdeb59d..30fc38f 100644
+--- a/bindings/Java/Makefile.am
++++ b/bindings/Java/Makefile.am
+@@ -7,7 +7,7 @@ INCLUDES= 				\
+ 	-I $(top_srcdir)/include 	\
+ 	-I $(top_builddir)/include	\
+ 	-I $(JAVABASE)/include		\
+-	-I $(JAVABASE)/include/linux
++	-I $(JAVABASE)/include/solaris
+ 
+ java_files= \
+ 	$(srcdir)/MidiMgr.java	\
+-- 
+1.7.10.3
+

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