[csw-devel] SF.net SVN: gar:[4190] csw/mgar/pkg/fltk/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 4190
          http://gar.svn.sourceforge.net/gar/?rev=4190&view=rev
Author:   jake_goerzen
Date:     2009-04-05 04:43:44 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
switch to mGAR v2

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

Added Paths:
-----------
    csw/mgar/pkg/fltk/trunk/files/Makefile.diff

Property Changed:
----------------
    csw/mgar/pkg/fltk/trunk/


Property changes on: csw/mgar/pkg/fltk/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/fltk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fltk/trunk/Makefile	2009-04-05 00:07:48 UTC (rev 4189)
+++ csw/mgar/pkg/fltk/trunk/Makefile	2009-04-05 04:43:44 UTC (rev 4190)
@@ -10,19 +10,20 @@
 MASTER_SITES = http://ftp.easysw.com/pub/fltk/$(GARVERSION)/
 
 DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.gz
-DISTFILES += $(call admfiles,CSWfltk, prototype)
+DISTFILES += $(call admfiles,CSWfltk)
 
-UFILES_REGEX = (\d+(?:\.\d+)*)
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PATCHFILES = makeinclude.in.diff
+PATCHFILES = makeinclude.in.diff Makefile.diff
 
-CONFIGURE_ARGS = $(DIRPATHS) LDFLAGS='-L/opt/csw/lib -L../lib'
+CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 CONFIGURE_ARGS += --disable-localpng
 CONFIGURE_ARGS += --disable-localjpeg
 CONFIGURE_ARGS += --disable-localzlib
 CONFIGURE_ARGS += --enable-threads
 CONFIGURE_ARGS += --enable-largefile
+CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --enable-shared 
 
 include gar/category.mk

Modified: csw/mgar/pkg/fltk/trunk/checksums
===================================================================
--- csw/mgar/pkg/fltk/trunk/checksums	2009-04-05 00:07:48 UTC (rev 4189)
+++ csw/mgar/pkg/fltk/trunk/checksums	2009-04-05 04:43:44 UTC (rev 4190)
@@ -1,4 +1,4 @@
 d3c76db1b6cebce7a009429bbd125470  download/fltk-1.1.9-source.tar.gz
 5b35d77bcd4cb9dbb8a68eab89b358c8  download/CSWfltk.gspec
-72ba3eb7711deeaad9d44004da12cc63  download/CSWfltk.prototype
 1c51238fcb309cc77681874450d1bb28  download/makeinclude.in.diff
+3c8162474dca50e2a8def66fc76f890d  download/Makefile.diff

Added: csw/mgar/pkg/fltk/trunk/files/Makefile.diff
===================================================================
--- csw/mgar/pkg/fltk/trunk/files/Makefile.diff	                        (rev 0)
+++ csw/mgar/pkg/fltk/trunk/files/Makefile.diff	2009-04-05 04:43:44 UTC (rev 4190)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru fltk-1.1.9.orig/fluid/Makefile fltk-1.1.9/fluid/Makefile
+--- fltk-1.1.9.orig/fluid/Makefile	2008-02-26 16:26:08.000000000 +0100
++++ fltk-1.1.9/fluid/Makefile	2009-04-05 06:25:12.680119819 +0200
+@@ -64,7 +64,7 @@
+ fluid-shared$(EXEEXT):	$(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
+ 			../src/$(IMGDSONAME)
+ 	echo Linking $@...
+-	$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
++	$(CXX) $(ARCHFLAGS) -L../src $(LDFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(LDLIBS)
+ 	$(POSTBUILD) $@ ../FL/mac.r
+ 
+ clean:


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