[csw-devel] SF.net SVN: gar:[20480] csw/mgar/pkg/subversion/trunk/Makefile

[janholzh at users.sourceforge.net]

Revision: 20480
          http://gar.svn.sourceforge.net/gar/?rev=20480&view=rev
Author:   janholzh
Date:     2013-03-19 13:28:09 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
subversion/trunk: reenable solaris 9 builds

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

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2013-03-18 23:27:43 UTC (rev 20479)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2013-03-19 13:28:09 UTC (rev 20480)
@@ -36,8 +36,8 @@
 
 LICENSE = LICENSE
 
-# solaris9 does not have the newest glib2 any more
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+# solaris9 does not have the newest glib2 any more so no gnome-keychain on Solaris9
+PACKAGING_PLATFORMS = solaris9-sparc solaris9-i386  solaris10-sparc solaris10-i386
 
 BUILD_DEP_PKGS += CSWlibexpat-dev
 BUILD_DEP_PKGS += CSWlibserf-dev
@@ -57,16 +57,23 @@
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibapr1-0
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibaprutil1-0
 RUNTIME_DEP_PKGS_CSWsvn   += CSWlibneon27
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibdbus1-3
-RUNTIME_DEP_PKGS_CSWsvn   += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibdbus1-3
+RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWsvn_5.10   += CSWlibglib2-0-0
 CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibdbus1-3
 
+RUNTIME_DEP_PKGS_CSWsvn += $(RUNTIME_DEP_PKGS_CSWsvn_$(GAROSREL))
+
+
 PACKAGES += CSWsvn-dev
 SPKG_DESC_CSWsvn-dev       = Subversion Development Support
 PKGFILES_CSWsvn-dev        = $(PKGFILES_DEVEL)
 PKGFILES_CSWsvn-dev       += $(docdir)/$(CATALOGNAME_CSWsvn-dev)/changelog.CSW
+#Needed for Solaris9 again:
+OBSOLETED_BY_CSWsvn-dev_5.9    = CSWsvn-devel
+OBSOLETED_BY_CSWsvn-dev += $(OBSOLETED_BY_CSWsvn-dev_$(GAROSREL))
 
+
 PACKAGES += CSWap2svn
 SPKG_DESC_CSWap2svn         = Subversion Modules for Apache 2.2
 CATALOGNAME_CSWap2svn       = ap2_subversion
@@ -182,18 +189,21 @@
 NODIRPATHS      = --libdir --libexecdir
 CONFIGURE_ARGS  = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
 CONFIGURE_ARGS += --disable-mod-activation
-CONFIGURE_ARGS += --with-jdk=/usr/jdk/j2sdk1.4.2_02/j2se
+CONFIGURE_ARGS_5.9 += --with-jdk=/usr/jdk1.6.0_20
 CONFIGURE_ARGS += --enable-javahl
 CONFIGURE_ARGS += --with-apr=$(bindir)/apr-1-config
 CONFIGURE_ARGS += --with-apr-util=$(bindir)/apu-1-config
 CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
-CONFIGURE_ARGS += --with-gnome-keyring=$(prefix)
-CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
+CONFIGURE_ARGS_5.10 += --with-jdk=$(JAVA_HOME)
 CONFIGURE_ARGS += --with-sasl=$(prefix)
 CONFIGURE_ARGS += --with-serf=$(prefix)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
 CONFIGURE_ARGS += --with-zlib=$(prefix)
 
+#No Keyring on Solaris9
+CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
+
 # Once you have verified that a new upstream release passes the tests, you can use
 # "SKIPTEST=1 gmake <target>" to skip the tests for simple repackaging tasks.
 #

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