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

[dmichelsen at users.sourceforge.net]

Revision: 10264
          http://gar.svn.sourceforge.net/gar/?rev=10264&view=rev
Author:   dmichelsen
Date:     2010-06-19 20:40:14 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
fltk: Update to 1.1.10 and mGAR v2

Modified Paths:
--------------
    csw/mgar/pkg/fltk/trunk/Makefile
    csw/mgar/pkg/fltk/trunk/checksums
    csw/mgar/pkg/fltk/trunk/files/makeinclude.in.diff

Removed Paths:
-------------
    csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend
    csw/mgar/pkg/fltk/trunk/files/CSWfltk.gspec

Modified: csw/mgar/pkg/fltk/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fltk/trunk/Makefile	2010-06-19 18:42:08 UTC (rev 10263)
+++ csw/mgar/pkg/fltk/trunk/Makefile	2010-06-19 20:40:14 UTC (rev 10264)
@@ -1,5 +1,5 @@
 GARNAME = fltk
-GARVERSION = 1.1.9
+GARVERSION = 1.1.10
 CATEGORIES = lib
 
 DESCRIPTION = Fast light Tool Kit
@@ -10,12 +10,16 @@
 MASTER_SITES = http://ftp.easysw.com/pub/fltk/$(GARVERSION)/
 
 DISTFILES  = $(GARNAME)-$(GARVERSION)-source.tar.gz
-DISTFILES += $(call admfiles,CSWfltk, depend)
+PATCHFILES = makeinclude.in.diff Makefile.diff
 
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-PATCHFILES = makeinclude.in.diff Makefile.diff
+VENDOR_URL = http://www.fltk.org/
 
+DEP_PKGS = CSWzlib CSWjpeg CSWpng
+
+BUILD64 = 1
+NOISAEXEC = 1
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --mandir=/opt/csw/share/man
 CONFIGURE_ARGS += --disable-localpng
@@ -26,4 +30,9 @@
 CONFIGURE_ARGS += --disable-static
 CONFIGURE_ARGS += --enable-shared 
 
+EXTRA_BUILD_EXPORTS = libdir
+
+MERGE_SCRIPTS_isa-extra = copy-relocated-only copy-config-only
+MERGE_DIRS_isa-extra = $(libdir)
+
 include gar/category.mk

Modified: csw/mgar/pkg/fltk/trunk/checksums
===================================================================
--- csw/mgar/pkg/fltk/trunk/checksums	2010-06-19 18:42:08 UTC (rev 10263)
+++ csw/mgar/pkg/fltk/trunk/checksums	2010-06-19 20:40:14 UTC (rev 10264)
@@ -1,5 +1,3 @@
-d3c76db1b6cebce7a009429bbd125470  download/fltk-1.1.9-source.tar.gz
-5b35d77bcd4cb9dbb8a68eab89b358c8  download/CSWfltk.gspec
-043fee4145d49b611961c22859edc4ec  download/CSWfltk.depend
-1c51238fcb309cc77681874450d1bb28  download/makeinclude.in.diff
-3c8162474dca50e2a8def66fc76f890d  download/Makefile.diff
+3c8162474dca50e2a8def66fc76f890d  Makefile.diff
+e6378a76ca1ef073bcb092df1ef3ba55  fltk-1.1.10-source.tar.gz
+ececb135c37c3b8cd92010634a4456eb  makeinclude.in.diff

Deleted: csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend
===================================================================
--- csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend	2010-06-19 18:42:08 UTC (rev 10263)
+++ csw/mgar/pkg/fltk/trunk/files/CSWfltk.depend	2010-06-19 20:40:14 UTC (rev 10264)
@@ -1,4 +0,0 @@
-P	CSWcommon
-P	CSWjpeg
-P	CSWpng
-P	CSWzlib

Deleted: csw/mgar/pkg/fltk/trunk/files/CSWfltk.gspec
===================================================================
--- csw/mgar/pkg/fltk/trunk/files/CSWfltk.gspec	2010-06-19 18:42:08 UTC (rev 10263)
+++ csw/mgar/pkg/fltk/trunk/files/CSWfltk.gspec	2010-06-19 20:40:14 UTC (rev 10264)
@@ -1,4 +0,0 @@
-%var            bitname fltk
-%var            pkgname CSWfltk
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

Modified: csw/mgar/pkg/fltk/trunk/files/makeinclude.in.diff
===================================================================
--- csw/mgar/pkg/fltk/trunk/files/makeinclude.in.diff	2010-06-19 18:42:08 UTC (rev 10263)
+++ csw/mgar/pkg/fltk/trunk/files/makeinclude.in.diff	2010-06-19 20:40:14 UTC (rev 10264)
@@ -1,12 +1,34 @@
-diff --speed-large-files --minimal -Nru fltk-1.1.9.orig/makeinclude.in fltk-1.1.9/makeinclude.in
---- fltk-1.1.9.orig/makeinclude.in	2008-02-26 16:26:08.000000000 +0100
-+++ fltk-1.1.9/makeinclude.in	2009-03-29 18:19:13.217084442 +0200
-@@ -83,7 +83,7 @@
+From 6b84ed88addcef4139cbfd9540ffd56ba12011f1 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Sat, 19 Jun 2010 22:18:12 +0200
+Subject: [PATCH] Adjust linker flags
+
+---
+ makeinclude.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/makeinclude.in b/makeinclude.in
+index 058ba7d..80c566b 100644
+--- a/makeinclude.in
++++ b/makeinclude.in
+@@ -79,7 +79,7 @@ IMGLIBBASENAME	= @IMGLIBBASENAME@
+ 
+ # libraries to link with:
+ AUDIOLIBS	= @AUDIOLIBS@
+-DSOFLAGS	= -L. @DSOFLAGS@
++DSOFLAGS	= -L. $(LDFLAGS) @DSOFLAGS@
+ LDFLAGS		= $(OPTIM) @LDFLAGS@
+ LDLIBS		= @LIBS@
+ GLDLIBS		= @GLLIB@ @LIBS@
+@@ -88,7 +88,7 @@ LINKFLTKGL	= @LINKFLTKGL@
  LINKFLTKFORMS	= @LINKFLTKFORMS@ @LINKFLTK@
  LINKFLTKIMG	= @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS)
  LINKSHARED	= @DSOLINK@ @LINKSHARED@ $(IMAGELIBS)
 -IMAGELIBS	= -L../lib @IMAGELIBS@
-+IMAGELIBS	= -L../lib -L/opt/csw/lib @IMAGELIBS@
++IMAGELIBS	= -L../lib -L$(libdir) @IMAGELIBS@
  
  # image libraries to build...
  IMAGEDIRS	= @JPEG@ @ZLIB@ @PNG@
+-- 
+1.7.1
+


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