SF.net SVN: gar:[25835] csw/mgar/pkg/subversion/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Jul 12 20:26:03 CEST 2016
Revision: 25835
http://sourceforge.net/p/gar/code/25835
Author: dmichelsen
Date: 2016-07-12 18:26:02 +0000 (Tue, 12 Jul 2016)
Log Message:
-----------
subversion/trunk: Packagesplit
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/subversion/trunk/files/0001-Put-pkgconfig-files-in-libdir-instead-of-datadir.patch
csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall
csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove
Removed Paths:
-------------
csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall
csw/mgar/pkg/subversion/trunk/files/CSWap2svn.preremove
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2016-07-12 16:16:37 UTC (rev 25834)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2016-07-12 18:26:02 UTC (rev 25835)
@@ -31,8 +31,10 @@
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
+DISTFILES += CSWap2-subversion.preremove
+DISTFILES += CSWap2-subversion.postinstall
+DISTFILES += httpd-svn.conf.CSW
+DISTFILES += svn_access.conf.CSW
# Fix: Add java headers for nested classes
# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
@@ -41,6 +43,8 @@
# Relocate locations of foreign language bindings
###PATCHFILES += 0002-Fix-location-of-bindings.patch
+PATCHFILES += 0001-Put-pkgconfig-files-in-libdir-instead-of-datadir.patch
+
VENDOR_URL = http://subversion.apache.org
LICENSE = LICENSE
@@ -61,20 +65,20 @@
PACKAGES += CSWsubversion
SPKG_DESC_CSWsubversion = Version control rethought
-RUNTIME_DEP_PKGS_CSWsubversion = CSWbdb48
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibmagic1
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsqlite3-0
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibexpat1
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibz1
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibintl8
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWsubversion += CSWlibaprutil1-0
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibserf1-1
-RUNTIME_DEP_PKGS_CSWsubversion += CSWlibgnome-keyring0
-RUNTIME_DEP_PKGS_CSWsubversion-5.9 += CSWglib2
-RUNTIME_DEP_PKGS_CSWsubversion-5.10 += CSWlibglib2-0-0
-RUNTIME_DEP_PKGS_CSWsubversion += $(RUNTIME_DEP_PKGS_CSWsubversion-$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-client1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-ra-svn1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs-fs1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWsubversion += CSWlibsvn-fs1-0
OBSOLETED_BY_CSWsubversion += CSWsvn
CATALOGNAME_CSWsvn = subversion_stub
@@ -83,8 +87,187 @@
SPKG_DESC_CSWsubversion-dev = Subversion Development Support
PKGFILES_CSWsubversion-dev += $(PKGFILES_DEVEL)
PKGFILES_CSWsubversion-dev += $(docdir)/$(CATALOGNAME_CSWsubversion-dev)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-auth-gnome-keyring1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs-fs1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-client1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra-svn1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWrb-subversion
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs-x1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWjavasvn
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWpy-subversion
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra-local1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs-base1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-fs-util1-0
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWpm-subversion
+RUNTIME_DEP_PKGS_CSWsubversion-dev += CSWlibsvn-ra-serf1-0
OBSOLETED_BY_CSWsubversion-dev += CSWsvn-dev
+PACKAGES += CSWlibsvn-auth-gnome-keyring1-0
+SPKG_DESC_CSWlibsvn-auth-gnome-keyring1-0 = Subversion library libsvn_auth_gnome_keyring-1.so.0
+PKGFILES_CSWlibsvn-auth-gnome-keyring1-0 += $(call pkgfiles_lib,libsvn_auth_gnome_keyring-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibgnome-keyring0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.9 += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-5.10 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-auth-gnome-keyring1-0-$(GAROSREL))
+
+PACKAGES += CSWlibsvn-client1-0
+SPKG_DESC_CSWlibsvn-client1-0 = Subversion library libsvn_client-1.so.0
+PKGFILES_CSWlibsvn-client1-0 += $(call pkgfiles_lib,libsvn_client-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-client1-0 += CSWlibsvn-delta1-0
+
+PACKAGES += CSWlibsvn-delta1-0
+SPKG_DESC_CSWlibsvn-delta1-0 = Subversion library libsvn_delta-1.so.0
+PKGFILES_CSWlibsvn-delta1-0 += $(call pkgfiles_lib,libsvn_delta-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-delta1-0 += CSWlibsvn-subr1-0
+
+PACKAGES += CSWlibsvn-diff1-0
+SPKG_DESC_CSWlibsvn-diff1-0 = Subversion library libsvn_diff-1.so.0
+PKGFILES_CSWlibsvn-diff1-0 += $(call pkgfiles_lib,libsvn_diff-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-diff1-0 += CSWlibsvn-subr1-0
+
+PACKAGES += CSWlibsvn-fs-base1-0
+SPKG_DESC_CSWlibsvn-fs-base1-0 = Subversion library libsvn_fs_base-1.so.0
+PKGFILES_CSWlibsvn-fs-base1-0 += $(call pkgfiles_lib,libsvn_fs_base-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWbdb48
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-base1-0 += CSWlibsvn-fs-util1-0
+
+PACKAGES += CSWlibsvn-fs-fs1-0
+SPKG_DESC_CSWlibsvn-fs-fs1-0 = Subversion library libsvn_fs_fs-1.so.0
+PKGFILES_CSWlibsvn-fs-fs1-0 += $(call pkgfiles_lib,libsvn_fs_fs-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-fs-util1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-fs1-0 += CSWlibsvn-subr1-0
+
+PACKAGES += CSWlibsvn-fs-util1-0
+SPKG_DESC_CSWlibsvn-fs-util1-0 = Subversion library libsvn_fs_util-1.so.0
+PKGFILES_CSWlibsvn-fs-util1-0 += $(call pkgfiles_lib,libsvn_fs_util-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-util1-0 += CSWlibsvn-subr1-0
+
+PACKAGES += CSWlibsvn-fs-x1-0
+SPKG_DESC_CSWlibsvn-fs-x1-0 = Subversion library libsvn_fs_x-1.so.0
+PKGFILES_CSWlibsvn-fs-x1-0 += $(call pkgfiles_lib,libsvn_fs_x-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-fs-util1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs-x1-0 += CSWlibsvn-subr1-0
+
+PACKAGES += CSWlibsvn-fs1-0
+SPKG_DESC_CSWlibsvn-fs1-0 = Subversion library libsvn_fs-1.so.0
+PKGFILES_CSWlibsvn-fs1-0 += $(call pkgfiles_lib,libsvn_fs-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-x1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-base1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-util1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-fs1-0 += CSWlibsvn-fs-fs1-0
+
+PACKAGES += CSWlibsvn-ra-local1-0
+SPKG_DESC_CSWlibsvn-ra-local1-0 = Subversion library libsvn_ra_local-1.so.0
+PKGFILES_CSWlibsvn-ra-local1-0 += $(call pkgfiles_lib,libsvn_ra_local-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-local1-0 += CSWlibsvn-fs1-0
+
+PACKAGES += CSWlibsvn-ra-serf1-0
+SPKG_DESC_CSWlibsvn-ra-serf1-0 = Subversion library libsvn_ra_serf-1.so.0
+PKGFILES_CSWlibsvn-ra-serf1-0 += $(call pkgfiles_lib,libsvn_ra_serf-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibserf1-1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-serf1-0 += CSWlibsvn-delta1-0
+
+PACKAGES += CSWlibsvn-ra-svn1-0
+SPKG_DESC_CSWlibsvn-ra-svn1-0 = Subversion library libsvn_ra_svn-1.so.0
+PKGFILES_CSWlibsvn-ra-svn1-0 += $(call pkgfiles_lib,libsvn_ra_svn-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra-svn1-0 += CSWlibsvn-delta1-0
+
+PACKAGES += CSWlibsvn-ra1-0
+SPKG_DESC_CSWlibsvn-ra1-0 = Subversion library libsvn_ra-1.so.0
+PKGFILES_CSWlibsvn-ra1-0 += $(call pkgfiles_lib,libsvn_ra-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-local1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-svn1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-ra1-0 += CSWlibsvn-ra-serf1-0
+
+PACKAGES += CSWlibsvn-repos1-0
+SPKG_DESC_CSWlibsvn-repos1-0 = Subversion library libsvn_repos-1.so.0
+PKGFILES_CSWlibsvn-repos1-0 += $(call pkgfiles_lib,libsvn_repos-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-fs1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-repos1-0 += CSWlibsvn-subr1-0
+
+PACKAGES += CSWlibsvn-subr1-0
+SPKG_DESC_CSWlibsvn-subr1-0 = Subversion library libsvn_subr-1.so.0
+PKGFILES_CSWlibsvn-subr1-0 += $(call pkgfiles_lib,libsvn_subr-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibsqlite3-0
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibexpat1
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-subr1-0 += CSWlibaprutil1-0
+
+PACKAGES += CSWlibsvn-wc1-0
+SPKG_DESC_CSWlibsvn-wc1-0 = Subversion library libsvn_wc-1.so.0
+PKGFILES_CSWlibsvn-wc1-0 += $(call pkgfiles_lib,libsvn_wc-1.so.0)
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += CSWlibsvn-delta1-0
+
PACKAGES += CSWap2-subversion
SPKG_DESC_CSWap2-subversion = Subversion Modules for Apache 2.2
PKGFILES_CSWap2-subversion += $(prefix)/apache2/.*
@@ -93,6 +276,10 @@
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWapache2
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-fs1-0
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWap2-subversion += CSWlibsvn-subr1-0
RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWap2-subversion-5.10-sparc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWap2-subversion += $(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GAROSREL)-$(GARCH))
@@ -103,30 +290,50 @@
PACKAGES-5.10 += CSWjavasvn
PACKAGES += $(PACKAGES-$(GAROSREL))
SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
-PKGFILES_CSWjavasvn += $(SVNLIB)/.*java.*
+# Lets not factor that library out
+PKGFILES_CSWjavasvn += $(call pkgfiles_lib,libsvnjavahl-1.so.0)
+CHECKPKG_OVERRIDES_CSWjavasvn += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvnjavahl-1.so.0.0.0|soname=libsvnjavahl-1.so.0|pkgname=CSWjavasvn|expected=CSWlibsvnjavahl1-0
+PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/svn-javahl.jar
+PKGFILES_CSWjavasvn += $(libdir)/svn-javahl/include.*
PKGFILES_CSWjavasvn += $(docdir)/$(CATALOGNAME_CSWjavasvn)/changelog.CSW
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWjavasvn += CSWsubversion
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-client1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWjavasvn += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWjavasvn-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWjavasvn += $(RUNTIME_DEP_PKGS_CSWjavasvn-$(GARCH))
# This would go away when -norunpath would make it to the linker, but at this point this is difficult.
# Override for now as it is not harmful.
-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|opt/csw/lib/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 += CSWpm-subversion
SPKG_DESC_CSWpm-subversion = Subversion Perl Language Binding
-PKGFILES_CSWpm-subversion += $(libdir)/perl.*
-PKGFILES_CSWpm-subversion += $(SVNLIB)/.*perl.*
+# Lets not factor that library out
+PKGFILES_CSWpm-subversion += $(call pkgfiles_lib,libsvn_swig_perl-1.so.0)
+CHECKPKG_OVERRIDES_CSWpm-subversion += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvn_swig_perl-1.so.0.0.0|soname=libsvn_swig_perl-1.so.0|pkgname=CSWpm-subversion|expected=CSWlibsvn-swig-perl1-0
+PKGFILES_CSWpm-subversion += $(SVNLIB)/perl.*
# Put .3* manpages in this package, not *-dev
PKGFILES_CSWpm-subversion += $(mandir)/.*\.3perl
PKGFILES_DEVEL_MAN3_MANPAGE =
PKGFILES_CSWpm-subversion += $(docdir)/$(CATALOGNAME_CSWpm-subversion)/changelog.CSW
RUNTIME_DEP_PKGS_CSWpm-subversion += CSWperl
-RUNTIME_DEP_PKGS_CSWpm-subversion += CSWsubversion
RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-client1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWpm-subversion += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWpm-subversion-5.10-sparc += CSWlibintl8
@@ -137,12 +344,22 @@
PACKAGES += CSWrb-subversion
SPKG_DESC_CSWrb-subversion = Subversion Ruby Language Binding
+# Lets not factor that library out
+PKGFILES_CSWrb-subversion += $(call pkgfiles_lib,libsvn_swig_ruby-1.so.0)
+CHECKPKG_OVERRIDES_CSWrb-subversion += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvn_swig_ruby-1.so.0.0.0|soname=libsvn_swig_ruby-1.so.0|pkgname=CSWrb-subversion|expected=CSWlibsvn-swig-ruby1-0
PKGFILES_CSWrb-subversion += $(libdir)/ruby.*
-PKGFILES_CSWrb-subversion += $(SVNLIB)/.*swig_ruby.*
PKGFILES_CSWrb-subversion += $(docdir)/$(CATALOGNAME_CSWrb-subversion)/changelog.CSW
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWsubversion
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-client1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWrb-subversion += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWrb-subversion-5.9 += CSWlibruby18-1
RUNTIME_DEP_PKGS_CSWrb-subversion-5.10 += CSWruby20
RUNTIME_DEP_PKGS_CSWrb-subversion += $(RUNTIME_DEP_PKGS_CSWrb-subversion-$(GAROSREL))
@@ -156,12 +373,20 @@
PACKAGES += CSWpy-subversion
SPKG_DESC_CSWpy-subversion = Subversion Python Language Binding
-PKGFILES_CSWpy-subversion += $(libdir)/.*python.*
-PKGFILES_CSWpy-subversion += $(SVNLIB)/.*python.*
-PKGFILES_CSWpy-subversion += $(SVNLIB)/.*swig_py.*
+# Lets not factor that library out
+PKGFILES_CSWpy-subversion += $(call pkgfiles_lib,libsvn_swig_py-1.so.0)
+CHECKPKG_OVERRIDES_CSWpy-subversion += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsvn_swig_py-1.so.0.0.0|soname=libsvn_swig_py-1.so.0|pkgname=CSWpy-subversion|expected=CSWlibsvn-swig-py1-0
+PKGFILES_CSWpy-subversion += $(SVNLIB)/python.*
PKGFILES_CSWpy-subversion += $(docdir)/$(CATALOGNAME_CSWpy-subversion)/changelog.CSW
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibapr1-0
-RUNTIME_DEP_PKGS_CSWpy-subversion += CSWsubversion
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-ra1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-client1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-wc1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-diff1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWpy-subversion += CSWlibsvn-fs1-0
RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibmagic1
RUNTIME_DEP_PKGS_CSWpy-subversion-5.10-sparc += CSWlibintl8
RUNTIME_DEP_PKGS_CSWpy-subversion += CSWpython
@@ -197,7 +422,8 @@
# with svn installed, and here it seems basic that we build with svn
# installed.
# SVNLIB = $(prefix)/lib
-SVNLIB = $(prefix)/lib/svn
+# SVNLIB = $(prefix)/lib/svn
+SVNLIB = $(libdir)
JAVA_HOME-5.9 = /usr/jdk1.6.0_20/
JAVA_HOME-5.10 = $(prefix)/java/jdk/jdk8
@@ -239,8 +465,10 @@
GARCOMPILER-5.10 = SOS12U3
GARCOMPILER += $(GARCOMPILER-$(GAROSREL))
-NODIRPATHS = --libdir --libexecdir
-CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
+#NODIRPATHS = --libdir --libexecdir
+#CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
+CONFIGURE_ARGS += $(DIRPATHS)
+
CONFIGURE_ARGS += --disable-mod-activation
CONFIGURE_ARGS += --with-jdk=$(JAVA_HOME)
# Solaris 9 has issues with JDK 1.6.0 and Sun Studio 12:
@@ -285,7 +513,7 @@
# At the moment the is one test failing because 1.8.5 does some funky statements sqlite 3.8.x doesn't understand but 3.7.x did:
# http://subversion.tigris.org/issues/show_bug.cgi?id=4453
-SKIPTEST ?= 1
+# SKIPTEST ?= 1
include gar/category.mk
Added: csw/mgar/pkg/subversion/trunk/files/0001-Put-pkgconfig-files-in-libdir-instead-of-datadir.patch
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/0001-Put-pkgconfig-files-in-libdir-instead-of-datadir.patch (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/0001-Put-pkgconfig-files-in-libdir-instead-of-datadir.patch 2016-07-12 18:26:02 UTC (rev 25835)
@@ -0,0 +1,25 @@
+From a258c591c0e099662148faf62f362f5f9a1fdc4b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 12 Jul 2016 15:22:46 +0200
+Subject: [PATCH] Put pkgconfig files in libdir instead of datadir
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e63a09c..84c8dec 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -89,7 +89,7 @@ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ toolsdir = @bindir@/svn-tools
+
+ # where to install pkg-config files
+-pkgconfig_dir = $(datadir)/pkgconfig
++pkgconfig_dir = @libdir@/pkgconfig
+
+ javahl_javadir = @libdir@/svn-javahl
+ javahl_javahdir = @libdir@/svn-javahl/include
+--
+2.4.0
+
Copied: csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall (from rev 25802, csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall)
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall 2016-07-12 18:26:02 UTC (rev 25835)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+APXS=$AP2_BINDIR/apxs
+
+# Enable modules
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+for mod in dav dav_fs dav_svn dav_lock authz_svn
+do
+ perl -i -lne "print unless /^#?LoadModule.*mod_$mod.so/" $AP2_CONFIG
+ chroot $PKG_INSTALL_ROOT \
+ $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n $mod mod_$mod.so
+done
+
+# Configure mod_dav_svn in httpd.conf
+if [ -n "`egrep 'IfModule (mod_dav_svn|dav_svn_module)' $AP2_CONFIG`" ]
+then
+ echo "Existing mod_dav_svn configuration detected"
+elif [ -n "`egrep '#Include etc/extra/httpd-svn.conf' $AP2_CONFIG`" ]; then
+ echo "Re-enabling existing config"
+ perl -i -plne 's,^#(Include etc/extra/httpd-svn.conf),$1,' $AP2_CONFIG
+else
+ echo "Adding Include for extra/http-svn.conf to httpd.conf"
+ cat << END >> $AP2_CONFIG
+
+Include etc/extra/httpd-svn.conf
+END
+fi
+
+# Copy templates
+for file in $AP2_EXTRADIR/httpd-svn.conf $AP2_CONFDIR/svn_access.conf
+do
+ if [ ! -f $file ]; then
+ echo "Creating $file"
+ cp $file.CSW $file
+ else
+ echo "Preserving existing $file"
+ fi
+done
+
+# Finito
+cat <<END
+
+NOTICE: mod_dav, mod_dav_fs, mod_dav_svn, and mod_authz_svn are enabled in
+httpd.conf, but the server was not restarted. Please examine your mod_dav_svn configuration and restart apache.
+
+END
+
+exit 0
Copied: csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove (from rev 25802, csw/mgar/pkg/subversion/trunk/files/CSWap2svn.preremove)
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove 2016-07-12 18:26:02 UTC (rev 25835)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX/apache2
+AP2_BINDIR=$AP2_PREFIX/sbin
+AP2_LIBEXEC=$AP2_PREFIX/libexec
+AP2_CONFDIR=$AP2_PREFIX/etc
+AP2_EXTRADIR=$AP2_CONFDIR/extra
+AP2_CONFIG=$AP2_CONFDIR/httpd.conf
+APXS=$AP2_BINDIR/apxs
+
+# Disable the dav_svn module
+PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
+chroot $PKG_INSTALL_ROOT \
+ $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n dav_svn mod_dav_svn.so
+chroot $PKG_INSTALL_ROOT \
+ $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n authz_svn mod_authz_svn.so
+
+echo "Disabling extra/httpd-svn.conf in httpd.conf"
+perl -i -plne 's,(?<!#)(Include etc/extra/httpd-svn.conf),#$1,' $AP2_CONFIG
+
+cat << END
+
+NOTICE: mod_dav_svn and mod_authz_svn are disabled in httpd.conf, but the
+server was not restarted. Please check your configuration and restart apache.
+
+END
+
+exit 0
Deleted: csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall 2016-07-12 16:16:37 UTC (rev 25834)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap2svn.postinstall 2016-07-12 18:26:02 UTC (rev 25835)
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_EXTRADIR=$AP2_CONFDIR/extra
-AP2_CONFIG=$AP2_CONFDIR/httpd.conf
-APXS=$AP2_BINDIR/apxs
-
-# Enable modules
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-for mod in dav dav_fs dav_svn dav_lock authz_svn
-do
- perl -i -lne "print unless /^#?LoadModule.*mod_$mod.so/" $AP2_CONFIG
- chroot $PKG_INSTALL_ROOT \
- $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -a -n $mod mod_$mod.so
-done
-
-# Configure mod_dav_svn in httpd.conf
-if [ -n "`egrep 'IfModule (mod_dav_svn|dav_svn_module)' $AP2_CONFIG`" ]
-then
- echo "Existing mod_dav_svn configuration detected"
-elif [ -n "`egrep '#Include etc/extra/httpd-svn.conf' $AP2_CONFIG`" ]; then
- echo "Re-enabling existing config"
- perl -i -plne 's,^#(Include etc/extra/httpd-svn.conf),$1,' $AP2_CONFIG
-else
- echo "Adding Include for extra/http-svn.conf to httpd.conf"
- cat << END >> $AP2_CONFIG
-
-Include etc/extra/httpd-svn.conf
-END
-fi
-
-# Copy templates
-for file in $AP2_EXTRADIR/httpd-svn.conf $AP2_CONFDIR/svn_access.conf
-do
- if [ ! -f $file ]; then
- echo "Creating $file"
- cp $file.CSW $file
- else
- echo "Preserving existing $file"
- fi
-done
-
-# Finito
-cat <<END
-
-NOTICE: mod_dav, mod_dav_fs, mod_dav_svn, and mod_authz_svn are enabled in
-httpd.conf, but the server was not restarted. Please examine your mod_dav_svn configuration and restart apache.
-
-END
-
-exit 0
Deleted: csw/mgar/pkg/subversion/trunk/files/CSWap2svn.preremove
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap2svn.preremove 2016-07-12 16:16:37 UTC (rev 25834)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap2svn.preremove 2016-07-12 18:26:02 UTC (rev 25835)
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
-AP2_PREFIX=$CSW_PREFIX/apache2
-AP2_BINDIR=$AP2_PREFIX/sbin
-AP2_LIBEXEC=$AP2_PREFIX/libexec
-AP2_CONFDIR=$AP2_PREFIX/etc
-AP2_EXTRADIR=$AP2_CONFDIR/extra
-AP2_CONFIG=$AP2_CONFDIR/httpd.conf
-APXS=$AP2_BINDIR/apxs
-
-# Disable the dav_svn module
-PKG_INSTALL_ROOT=${PKG_INSTALL_ROOT:-'/'}
-chroot $PKG_INSTALL_ROOT \
- $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n dav_svn mod_dav_svn.so
-chroot $PKG_INSTALL_ROOT \
- $APXS -S LIBEXECDIR=$AP2_LIBEXEC -e -A -n authz_svn mod_authz_svn.so
-
-echo "Disabling extra/httpd-svn.conf in httpd.conf"
-perl -i -plne 's,(?<!#)(Include etc/extra/httpd-svn.conf),#$1,' $AP2_CONFIG
-
-cat << END
-
-NOTICE: mod_dav_svn and mod_authz_svn are disabled in httpd.conf, but the
-server was not restarted. Please check your configuration and restart apache.
-
-END
-
-exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list