SF.net SVN: gar:[26156] csw/mgar/pkg/gnustep-back/trunk

[rmottola at users.sourceforge.net]

Revision: 26156
          http://sourceforge.net/p/gar/code/26156
Author:   rmottola
Date:     2017-04-25 14:19:01 +0000 (Tue, 25 Apr 2017)
Log Message:
-----------
gnustep-back/trunk: upgrade version and clean up include hacks

Modified Paths:
--------------
    csw/mgar/pkg/gnustep-back/trunk/Makefile
    csw/mgar/pkg/gnustep-back/trunk/checksums

Modified: csw/mgar/pkg/gnustep-back/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnustep-back/trunk/Makefile	2017-04-25 10:06:08 UTC (rev 26155)
+++ csw/mgar/pkg/gnustep-back/trunk/Makefile	2017-04-25 14:19:01 UTC (rev 26156)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = gnustep-back
-VERSION = 0.24.1
+VERSION = 0.25.1
 GARTYPE = v2
 
 DESCRIPTION = GNUstep-core back
@@ -13,16 +13,16 @@
 MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/
 DISTFILES  = $(DISTNAME).tar.gz
 
-#EXTRA_MODULATORS = GRAPHICS
-#MODULATIONS_graphics = xlib cairo
-
 BUILD_DEP_PKGS += CSWgmake
 BUILD_DEP_PKGS += CSWsunx11devel
-BUILD_DEP_PKGS += CSWlibfreetype-dev
 BUILD_DEP_PKGS += CSWgnustep-make
 BUILD_DEP_PKGS += CSWgnustep-base
 BUILD_DEP_PKGS += CSWgnustep-gui
+BUILD_DEP_PKGS= CSWlibfreetype-dev
 
+#solaris 10
+BUILD_DEP_PKGS_5.10 += CSWfontconfig-dev
+BUILD_DEP_PKGS_5.10 += CSWlibcairo-dev
 
 BUILD_DEP_PKGS += $(BUILD_DEP_PKGS_$(GAROSREL))
 
@@ -30,7 +30,6 @@
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWgnustep-make
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWgnustep-base
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWgnustep-gui
-RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibxft2
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibxrender
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWmesa
@@ -38,6 +37,8 @@
 RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibgcc-s1
 
 #solaris 10
+RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibcairo2
+RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibfreetype6
 RUNTIME_DEP_PKGS_CSWgnustep-back_5.10 += CSWlibobjc4
 
 #solaris 9
@@ -45,12 +46,6 @@
 
 RUNTIME_DEP_PKGS_CSWgnustep-back += $(RUNTIME_DEP_PKGS_CSWgnustep-back_$(GAROSREL))
 
-#for cairo:
-BUILD_DEP_PKGS += CSWlibcairo-dev
-#for cairo, add these. Perhaps these hould be pulled in by other packages
-BUILD_DEP_PKGS += CSWfontconfig-dev
-RUNTIME_DEP_PKGS_CSWgnustep-back += CSWlibcairo2
-#DEP_PKGS_GRAPHICS_cairo += CSWlibcairo2
 
 #overrides
 CHECKPKG_OVERRIDES_CSWgnustep-back += surplus-dependency|CSWgnustep-gui
@@ -59,7 +54,7 @@
 
 
 #this is by bundle design
-CHECKPKG_OVERRIDES_CSWgnustep-back += shared-library-missing-dot-so|file=opt/csw/GNUstep/System/Library/Bundles/libgnustep-back-024.bundle/libgnustep-back-024
+CHECKPKG_OVERRIDES_CSWgnustep-back += shared-library-missing-dot-so|file=opt/csw/GNUstep/System/Library/Bundles/libgnustep-back-025.bundle/libgnustep-back-025
 
 #we do not care about placement
 CHECKPKG_OVERRIDES_CSWgnustep-back += binary-architecture-does-not-match-placement
@@ -90,10 +85,19 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-#CONFIGURE_ARGS_GRAPHICS_xlib += --enable-graphics=xlib
-#CONFIGURE_ARGS_GRAPHICS_cairo += --enable-graphics=cairo
-CONFIGURE_ARGS += --enable-graphics=cairo 
+CONFIGURE_ARGS_5.9 += --enable-graphics=xlib
+#CONFIGURE_ARGS_5.9 += --without-freetype
+#CONFIGURE_ARGS_5.9 += CFLAGS="$(CFLAGS) -I/opt/csw/include/freetype2"
+#CONFIGURE_ARGS_5.9 += CFLAGS="$(CFLAGS) -I/opt/csw/include/freetype2 -I/opt/csw/include/cairo" LDFLAGS="$(LDFLAGS) -lcairo"
+CONFIGURE_ARGS_5.10 += --enable-graphics=cairo 
 
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
+
+BUILD_ARGS += messages=yes
+
+EXTRA_CPPFLAGS += -I$(includedir)/freetype2
+#EXTRA_CPPFLAGS += -I$(includedir)/cairo
+
 include gar/category.mk
 
 configure-sourcegs:

Modified: csw/mgar/pkg/gnustep-back/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnustep-back/trunk/checksums	2017-04-25 10:06:08 UTC (rev 26155)
+++ csw/mgar/pkg/gnustep-back/trunk/checksums	2017-04-25 14:19:01 UTC (rev 26156)
@@ -1 +1 @@
-da011ba3c0a79c00a49fd3d17143dcd3  gnustep-back-0.24.1.tar.gz
+310880099a4d4c99be13a25c151b53e7  gnustep-back-0.25.1.tar.gz

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