Revision: 25580
http://sourceforge.net/p/gar/code/25580
Author: dmichelsen
Date: 2016-02-24 07:46:29 +0000 (Wed, 24 Feb 2016)
Log Message:
-----------
subversion/trunk: Update to 1.9.3, disable Solaris 9 java for now
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
csw/mgar/pkg/subversion/trunk/checksums
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2016-02-22 17:59:39 UTC (rev
25579)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2016-02-24 07:46:29 UTC (rev
25580)
@@ -20,7 +20,7 @@
# http://subversion.apache.org/mailing-lists.html
NAME = subversion
-VERSION = 1.8.15
+VERSION = 1.9.3
GARTYPE = v2
DESCRIPTION = Version control rethought
@@ -29,7 +29,7 @@
that is a compelling replacement for CVS in the open source community.
endef
-MASTER_SITES = http://archive.apache.org/dist/subversion/
+MASTER_SITES = http://mirror.serversupportforum.de/apache/subversion/
DISTFILES += $(DISTNAME).tar.bz2
DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
@@ -38,11 +38,8 @@
# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
PATCHFILES += javahl_headers_for_nested_classes.diff
-# Hardcode location of system wide configuration to /etc/opt/csw/subversion
-PATCHFILES += 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
-
# Relocate locations of foreign language bindings
-PATCHFILES += 0002-Fix-location-of-bindings.patch
+###PATCHFILES += 0002-Fix-location-of-bindings.patch
VENDOR_URL = http://subversion.apache.org
LICENSE = LICENSE
@@ -99,7 +96,8 @@
RUNTIME_DEP_PKGS_CSWap2svn += CSWbdb48
RUNTIME_DEP_PKGS_CSWap2svn += CSWlibiconv2
-PACKAGES += CSWjavasvn
+PACKAGES-5.10 += CSWjavasvn
+PACKAGES += $(PACKAGES-$(GAROSREL))
SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.*
PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
@@ -123,6 +121,8 @@
CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib/rw7|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/SUNWspro/lib/v8|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
+CHECKPKG_OVERRIDES_CSWjavasvn +=
bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/lib/svn/libsvnjavahl-1.so.0.0.0
PACKAGES += CSWpmsvn
SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding
@@ -130,7 +130,9 @@
CHECKPKG_OVERRIDES_CSWpmsvn +=
catalogname-does-not-match-pkgname|pkgname=CSWpmsvn|catalogname=pm_subversion|expected-catalogname=pmsvn
PKGFILES_CSWpmsvn += $(libdir)/perl.*
PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.*
-PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.*
+# Put .3* manpages in this package, not *-dev
+PKGFILES_CSWpmsvn += $(mandir)/.*\.3perl
+PKGFILES_DEVEL_MAN3_MANPAGE =
PKGFILES_CSWpmsvn += $(docdir)/$(CATALOGNAME_CSWpmsvn)/changelog.CSW
RUNTIME_DEP_PKGS_CSWpmsvn += CSWperl
RUNTIME_DEP_PKGS_CSWpmsvn += CSWsvn
@@ -149,10 +151,11 @@
PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.*
PKGFILES_CSWrbsvn += $(docdir)/$(CATALOGNAME_CSWrbsvn)/changelog.CSW
RUNTIME_DEP_PKGS_CSWrbsvn += CSWsvn
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWruby
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWrbsvn-5.9 += CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWrbsvn-5.10 += CSWruby20
+RUNTIME_DEP_PKGS_CSWrbsvn += $(RUNTIME_DEP_PKGS_CSWrbsvn-$(GAROSREL))
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibexpat1
@@ -163,10 +166,13 @@
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibaprutil1-0
RUNTIME_DEP_PKGS_CSWrbsvn += CSWlibserf1-1
+# We do depend on CSWruby20, this is an artifact of checkpkg lack of following
symlinks
+CHECKPKG_OVERRIDES_CSWrbsvn +=
missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
+
PACKAGES += CSWpythonsvn
SPKG_DESC_CSWpythonsvn = Subversion Python Language Binding
-PKGFILES_CSWpythonsvn += $(libdir)/python.*
-PKGFILES_CSWpythonsvn += $(SVNLIB)/python.*
+PKGFILES_CSWpythonsvn += $(libdir)/.*python.*
+PKGFILES_CSWpythonsvn += $(SVNLIB)/.*python.*
PKGFILES_CSWpythonsvn += $(SVNLIB)/.*swig_py.*
PKGFILES_CSWpythonsvn += $(docdir)/$(CATALOGNAME_CSWpythonsvn)/changelog.CSW
RUNTIME_DEP_PKGS_CSWpythonsvn += CSWlibapr1-0
@@ -192,7 +198,7 @@
CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibmagic1
CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibexpat1
CHECKPKG_OVERRIDES_CSWap2svn += surplus-dependency|CSWlibsqlite3-0
-HECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
+CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibserf1-1
CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibsasl2-2
CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWlibaprutil1-0
CHECKPKG_OVERRIDES_CSWjavasvn += surplus-dependency|CSWbdb48
@@ -231,6 +237,17 @@
CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibserf1-1
CHECKPKG_OVERRIDES_CSWsvn += surplus-dependency|CSWlibiconv2
+# This is for /usr/share/lib/zoneinfo
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_delta.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_ra.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_fs.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_diff.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_client.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_core.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_wc.so
+CHECKPKG_OVERRIDES_CSWpythonsvn-5.9 +=
file-with-bad-content|/usr/share|root/opt/csw/lib/svn/svn-python/libsvn/_repos.so
+CHECKPKG_OVERRIDES_CSWpythonsvn +=
$(CHECKPKG_OVERRIDES_CSWpythonsvn-$(GAROSREL))
+
# should be in lib ... put something below to at least make it compile.
# on the svn mailing list people say we should not build the package
# with svn installed, and here it seems basic that we build with svn
@@ -239,7 +256,7 @@
SVNLIB = $(prefix)/lib/svn
JAVA_HOME-5.9 = /usr/jdk1.6.0_20/
-JAVA_HOME-5.10 = /usr/jdk/latest
+JAVA_HOME-5.10 = $(prefix)/java/jdk/jdk8
JAVA_HOME = $(JAVA_HOME-$(GAROSREL))
#EXTRA_INC += $(prefix)/apache2/include
@@ -257,23 +274,41 @@
# This is an example for a hook
REINPLACE_USRLOCAL += subversion/libsvn_repos/repos.c
+# This replaces 0001-make-subversion-sysconfigdir-as-it-should-be-for-csw.patch
+REINPLACEMENTS += conf
+REINPLACE_MATCH_conf = /etc/subversion
+REINPLACE_WITH_conf = $(sysconfdir)/subversion
+REINPLACE_FILES_conf += subversion/libsvn_subr/config_file.c
+
PYCOMPILE = 1
EXTRA_MERGE_EXCLUDE_FILES += .*/perllocal\.pod
+# Relocate from /opt/csw/man to /opt/csw/share/man
+EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),'
+
STRIP_LIBTOOL = 1
+# This is now the default and makes building the language integrations for
Perl etc. easier
+#GARCOMPILER = GCC4
+GARCOMPILER-5.9 = SOS12
+GARCOMPILER-5.10 = SOS12U3
+GARCOMPILER += $(GARCOMPILER-$(GAROSREL))
+
NODIRPATHS = --libdir --libexecdir
CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
CONFIGURE_ARGS += --disable-mod-activation
CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
-CONFIGURE_ARGS += --enable-javahl
+# 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 += --with-ssl=$(prefix)
+# 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
@@ -282,6 +317,10 @@
CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GAROSREL))
+# XXX: Where does this come from?
+# cc: Warning: illegal option -d=c90
+# The original option is -std=c90, where is it added?
+
# 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.
#
@@ -302,21 +341,22 @@
include gar/category.mk
# pygthon bindings do not link since svn-1.6.5 ...
-BINDING_LANGS = java perl python ruby
-BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS))
+BINDING_LANGS-5.9 = perl python ruby
+BINDING_LANGS-5.10 = java perl python ruby
+BINDING_TARGETS = $(addprefix svn-,$(BINDING_LANGS-$(GAROSREL)))
PI_DEPENDS += copy-templates
-PI_DEPENDS += create-ra_dav-symlinks
+#PI_DEPENDS += create-ra_dav-symlinks
PI_DEPENDS += $(BINDING_TARGETS)
-post-install-modulated: $(PI_DEPENDS)
+post-install: $(PI_DEPENDS)
$(MAKECOOKIE)
# The whole subversion build is done with Sun's cc. Ruby language bindings
# need to be built with gcc. Hack (!) together Makefile.gcc/libtool.gcc which
# are then used in the "svn-ruby" target.
# See http://lists.opencsw.org/pipermail/maintainers/2009-May/002325.html
-post-configure-modulated:
+post-configure:
@echo "~~~ Creating GCC Makefile and libtool for ruby ~~~"
gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc
@@ -353,20 +393,31 @@
# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* in the new versions
# of subversion (starting with?), we need to link for backward compatability
-create-ra_dav-symlinks:
- ( cd $(DESTDIR)$(SVNLIB); \
- ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so.0; \
- ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; )
- @$(MAKECOOKIE)
+#create-ra_dav-symlinks:
+# ( cd $(DESTDIR)$(SVNLIB); \
+# ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so.0; \
+# ln -s libsvn_ra_neon-1.so.0.0.0 libsvn_ra_dav-1.so; )
+# @$(MAKECOOKIE)
svn-python:
@echo " ==> Building Python bindings"
touch \
$(WORKSRC)/subversion/bindings/swig/python/*.c \
$(WORKSRC)/subversion/bindings/swig/python/*.py
- @/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py
- @/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC)
install-swig-py DESTDIR=$(DESTDIR)
+ @# Switch from Sun Studio PIC to GCC PIC
+ cd $(WORKSRC) && cp libtool libtool.suncc && perl -i.orig -npe 's/-KPIC
-DPIC/-fPIC/g; s/-xarch=pentium_pro -xchip=pentium_pro/-march=pentiumpro/g'
libtool
+ cd $(WORKSRC) && perl -i.orig -np \
+ -e 's,(SWIG_PY_COMPILE = .*) -xO3 (.*) -xarch=pentium_pro
-xchip=pentium_pro,$$1 -O2 -pipe $$2 -march=pentiumpro,g;' \
+ -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=sparc (.*)!$$1
-mcpu=v9 -Wa,-xarch=v8plus $$2!;' \
+ -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=386 +-mt(.*)!$$1
-m32 -march=i386 $$2!;' \
+ -e 's!(SWIG_PY_COMPILE = .*) -xO3 -m32 -xarch=v8 +-mt(.*)!$$1
-mcpu=v8 $$2!;' \
+ -e 's,/opt/solarisstudio12.3/bin/cc,/opt/csw/bin/gcc-5.2,g;' \
+ -e 's,(SWIG_PY_LINK = .*) -march=pentiumpro (.*),$$1 $$2,;' \
+ Makefile
+ /usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-py
+ /usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC)
install-swig-py DESTDIR=$(DESTDIR)
#@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py
+ cd $(WORKSRC) && cp libtool.suncc libtool
@$(MAKECOOKIE)
svn-perl:
@@ -423,5 +474,5 @@
post-merge:
- @(cd $(PKGROOT)/opt/csw/lib/svn/python; find . -name '*pyc' -exec rm {}
\;)
+ find $(PKGROOT) -name '*\.pyc' -exec rm {} \;
@$(MAKECOOKIE)
Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums 2016-02-22 17:59:39 UTC (rev
25579)
+++ csw/mgar/pkg/subversion/trunk/checksums 2016-02-24 07:46:29 UTC (rev
25580)
@@ -1 +1 @@
-42f2ff8194b52e6287faec29f5775edf subversion-1.8.15.tar.bz2
+243036eb28b50ce517fc228eb3250add subversion-1.9.3.tar.bz2
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
