SF.net SVN: gar:[26279] csw/mgar/pkg/subversion/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Fri Sep 8 15:54:57 CEST 2017
Revision: 26279
http://sourceforge.net/p/gar/code/26279
Author: dmichelsen
Date: 2017-09-08 13:54:56 +0000 (Fri, 08 Sep 2017)
Log Message:
-----------
subversion/trunk: Update to 1.9.7 and make Apache 2.4 bindings only
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.postinstall
csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.preremove
Removed Paths:
-------------
csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall
csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2017-09-08 12:03:05 UTC (rev 26278)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2017-09-08 13:54:56 UTC (rev 26279)
@@ -20,7 +20,7 @@
# http://subversion.apache.org/mailing-lists.html
NAME = subversion
-VERSION = 1.9.5
+VERSION = 1.9.7
GARTYPE = v2
DESCRIPTION = Version control rethought
@@ -29,10 +29,10 @@
that is a compelling replacement for CVS in the open source community.
endef
-MASTER_SITES = http://mirror.serversupportforum.de/apache/subversion/
+MASTER_SITES = ftp://ftp.fau.de/apache/subversion/
DISTFILES += $(DISTNAME).tar.bz2
-DISTFILES += CSWap2-subversion.preremove
-DISTFILES += CSWap2-subversion.postinstall
+DISTFILES += CSWap24-subversion.preremove
+DISTFILES += CSWap24-subversion.postinstall
DISTFILES += httpd-svn.conf.CSW
DISTFILES += svn_access.conf.CSW
@@ -335,24 +335,23 @@
RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL))
RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0 += $(RUNTIME_DEP_PKGS_CSWlibsvn-wc1-0-$(GAROSREL)-$(GARCH))
-PACKAGES += CSWap2-subversion
-SPKG_DESC_CSWap2-subversion = Subversion Modules for Apache 2.2
-PKGFILES_CSWap2-subversion += $(prefix)/apache2/.*
-PKGFILES_CSWap2-subversion += $(docdir)/$(CATALOGNAME_CSWap2-subversion)/changelog.CSW
-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 += CSWlibintl9
-RUNTIME_DEP_PKGS_CSWap2-subversion += $(RUNTIME_DEP_PKGS_CSWap2-subversion-$(GAROSREL)-$(GARCH))
+PACKAGES += CSWap24-subversion
+SPKG_DESC_CSWap24-subversion = Subversion Modules for Apache 2.4
+PKGFILES_CSWap24-subversion += $(sysconfdir)/apache2/.*
+PKGFILES_CSWap24-subversion += $(libdir)/apache2/.*
+PKGFILES_CSWap24-subversion += $(docdir)/$(CATALOGNAME_CSWap24-subversion)/changelog.CSW
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWapache24
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibapr1-0
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibaprutil1-0
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-repos1-0
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-fs1-0
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-delta1-0
+RUNTIME_DEP_PKGS_CSWap24-subversion += CSWlibsvn-subr1-0
+RUNTIME_DEP_PKGS_CSWap24-subversion-5.10-sparc += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWap24-subversion-5.10-sparc += CSWlibintl9
+RUNTIME_DEP_PKGS_CSWap24-subversion += $(RUNTIME_DEP_PKGS_CSWap24-subversion-$(GAROSREL)-$(GARCH))
+CHECKPKG_OVERRIDES_CSWap24-subversion += surplus-dependency|CSWapache24
-OBSOLETED_BY_CSWap2-subversion += CSWap2svn
-CATALOGNAME_CSWap2svn = ap2_subversion_stub
-
PACKAGES-5.10 += CSWjavasvn
PACKAGES += $(PACKAGES-$(GAROSREL))
SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
@@ -539,13 +538,16 @@
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-apxs=$(bindir)/apxs
CONFIGURE_ARGS += --with-sasl=$(prefix)
CONFIGURE_ARGS += --with-serf=$(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
+# Apache 2.2
+#CONFIGURE_ARGS += --with-apache-libexecdir=$(prefix)/apache2/libexec
+# Apache 2.4
+CONFIGURE_ARGS += --with-apache-libexecdir=$(libdir)/apache2/modules
# No Keyring on Solaris 9
CONFIGURE_ARGS-5.10-32 += --with-gnome-keyring=$(prefix)
@@ -663,7 +665,6 @@
/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:
@echo " ==> Building Perl bindings"
@@ -672,7 +673,6 @@
$(WORKSRC)/subversion/bindings/swig/perl/native/*.pm
/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-pl
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl
- @$(MAKECOOKIE)
svn-ruby:
@echo " ==> Building Ruby bindings"
@@ -679,7 +679,6 @@
touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c
/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) swig-rb
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-swig-rb
- @$(MAKECOOKIE)
svn-java: EXTRA_LINKER_FLAGS += -norunpath
svn-java:
@@ -687,7 +686,6 @@
touch $(WORKSRC)/subversion/bindings/javahl/native/*.c
/usr/bin/env -i $(BUILD_ENV) /opt/csw/bin/gmake -C $(WORKSRC) javahl;
/usr/bin/env -i $(INSTALL_ENV) /opt/csw/bin/gmake -C $(WORKSRC) install-javahl;
- @$(MAKECOOKIE)
#post-merge: $(foreach P,$(_PKG_SPECS),install-changelog-$P)
@@ -699,23 +697,20 @@
( cd $(WORKSRC)/doc/book ; \
ginstall svn-book.html $(DESTDIR)$(docdir) ; \
ginstall svn-book.pdf $(DESTDIR)$(docdir) )
- @$(MAKECOOKIE)
copy-templates:
- ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
- ginstall -m 0644 \
+ ginstall -d $(DESTDIR)$(sysconfdir)/apache2/extra
+ ginstall -D -m 0644 \
$(WORKDIR)/httpd-svn.conf.CSW \
- $(DESTDIR)$(prefix)/apache2/etc/extra
- ginstall -m 0644 \
+ $(DESTDIR)$(sysconfdir)/apache2/extra
+ ginstall -D -m 0644 \
$(WORKDIR)/svn_access.conf.CSW \
- $(DESTDIR)$(prefix)/apache2/etc
- @$(MAKECOOKIE)
+ $(DESTDIR)$(sysconfdir)/apache2
install-man:
ginstall -m 0644 \
$(WORKSRC)/subversion/svnsync/svnsync.1 \
$(DESTDIR)$(mandir)/man1
- @$(MAKECOOKIE)
post-merge:
Deleted: csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall 2017-09-08 12:03:05 UTC (rev 26278)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall 2017-09-08 13:54:56 UTC (rev 26279)
@@ -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/CSWap2-subversion.preremove
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove 2017-09-08 12:03:05 UTC (rev 26278)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove 2017-09-08 13:54:56 UTC (rev 26279)
@@ -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
Copied: csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.postinstall (from rev 26278, csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.postinstall)
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.postinstall (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.postinstall 2017-09-08 13:54:56 UTC (rev 26279)
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX
+AP2_BINDIR=$AP2_PREFIX/bin
+AP2_LIBEXEC=$AP2_PREFIX/lib/apache2/modules
+AP2_CONFDIR=${PKG_INSTALL_ROOT}/etc/opt/csw/apache2
+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/CSWap24-subversion.preremove (from rev 26278, csw/mgar/pkg/subversion/trunk/files/CSWap2-subversion.preremove)
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.preremove (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/CSWap24-subversion.preremove 2017-09-08 13:54:56 UTC (rev 26279)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_PREFIX=$CSW_PREFIX
+AP2_BINDIR=$AP2_PREFIX/bin
+AP2_LIBEXEC=$AP2_PREFIX/lib/apache2/modules
+AP2_CONFDIR=${PKG_INSTALL_ROOT}/etc/opt/csw/apache2
+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