SF.net SVN: gar:[25655] csw/mgar/pkg/subversion/branches

[cgrzemba at users.sourceforge.net]

Revision: 25655
          http://sourceforge.net/p/gar/code/25655
Author:   cgrzemba
Date:     2016-04-11 10:32:12 +0000 (Mon, 11 Apr 2016)
Log Message:
-----------
create an IPS branch

Modified Paths:
--------------
    csw/mgar/pkg/subversion/branches/ips/Makefile

Added Paths:
-----------
    csw/mgar/pkg/subversion/branches/ips/

Modified: csw/mgar/pkg/subversion/branches/ips/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2016-03-23 10:20:15 UTC (rev 25629)
+++ csw/mgar/pkg/subversion/branches/ips/Makefile	2016-04-11 10:32:12 UTC (rev 25655)
@@ -47,11 +47,25 @@
 # 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 += CSWlibsqlite3-dev
+#BUILD_DEP_PKGS += CSWlibexpat-dev
+#BUILD_DEP_PKGS += CSWlibsqlite3-dev
+#BUILD_DEP_PKGS += CSWggettext-dev
 BUILD_DEP_PKGS-5.10 += CSWlibserf-dev
 BUILD_DEP_PKGS += $(BUILD_DEP_PKGS-$(GAROSREL))
 
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.7
+# MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
+
+IPS_PACKAGE_PREFIX = developer/versioning/
 PACKAGES += CSWsvn
 SPKG_DESC_CSWsvn = Version control rethought
 CATALOGNAME_CSWsvn = subversion
@@ -262,9 +276,9 @@
 #EXTRA_INC += $(prefix)/apache2/include
 
 #EXTRA_LIB += /opt/csw/apache2/lib
-EXTRA_LIB += /opt/csw/bdb48/lib
+# EXTRA_LIB += /opt/csw/bdb48/lib
 EXTRA_LIB += $(SVNLIB)
-EXTRA_LINKER_FLAGS = -lintl -liconv
+EXTRA_LINKER_FLAGS = -L/usr/gnu/lib -R/usr/gnu/lib -lintl -liconv -R/usr/apr/1.5/lib -R/usr/apr-util/1.5/lib
 
 # Only add $ISALIST to dirs which ship optimized versions (done by explicitly
 # excluding those lib dirs which are known not to ship optimized versions).
@@ -298,22 +312,22 @@
 NODIRPATHS      = --libdir --libexecdir
 CONFIGURE_ARGS  = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
 CONFIGURE_ARGS += --disable-mod-activation
-CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
+# CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
 # Solaris 9 has issues with JDK 1.6.0 and Sun Studio 12:
 #   Error: Could not find a match for EditorProxy::EditorProxy
-CONFIGURE_ARGS_5.10 += --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-sasl=$(prefix)
-CONFIGURE_ARGS += --with-serf=$(prefix)
+# CONFIGURE_ARGS_5.10 += --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-sasl=$(prefix)
+CONFIGURE_ARGS += --with-serf=/usr/gnu
 # XXX: configure: WARNING: unrecognized options: --with-ssl
 # CONFIGURE_ARGS += --with-ssl=$(prefix)
-CONFIGURE_ARGS += --with-zlib=$(prefix)
-CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
+# CONFIGURE_ARGS += --with-zlib=$(prefix)
+# CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
 
 # No Keyring on Solaris9
-CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
+# CONFIGURE_ARGS_5.10 += --with-gnome-keyring=$(prefix)
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
 

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