[csw-devel] SF.net SVN: gar:[3717] csw/mgar/pkg/subversion/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Wed Mar 11 18:41:57 CET 2009
Revision: 3717
http://gar.svn.sourceforge.net/gar/?rev=3717&view=rev
Author: valholla
Date: 2009-03-11 17:41:57 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
working copy
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
csw/mgar/pkg/subversion/trunk/checksums
csw/mgar/pkg/subversion/trunk/files/fixme.sh
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2009-03-11 17:40:00 UTC (rev 3716)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2009-03-11 17:41:57 UTC (rev 3717)
@@ -1,16 +1,16 @@
GARNAME = subversion
-DISTVERSION = 1.5.5
+DISTVERSION = 1.5.6
GARVERSION = $(subst -,,$(DISTVERSION))
CATEGORIES = utils
DESCRIPTION = Version control rethought
define BLURB
- The goal of the Subversion project is to build a version control system that
- is a compelling replacement for CVS in the open source community.
+ The goal of the Subversion project is to build a version control system
+ that is a compelling replacement for CVS in the open source community.
endef
# Vendor site
-SPKG_SOURCEURL = http://subversion.tigris.org/
+SPKG_SOURCEURL = http://subversion.tigris.org/downloads/
# Release site
MASTER_SITES = http://subversion.tigris.org/downloads/
@@ -20,10 +20,15 @@
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+EXTRA_LIB = $(prefix)/bdb44/lib $(SVNLIB)
+EXTRA_LIB += $(prefix)/apache2/lib
+EXTRA_INC = $(prefix)/bdb44/include
+EXTRA_INC += $(prefix)/apache2/include
+
WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION)
PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn
-#PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn
+PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn
PACKAGES += CSWpysvn CSWjavasvn
SPKG_DESC_CSWsvn = Version control rethought
@@ -46,9 +51,9 @@
SPKG_DESC_CSWpysvn = Subversion Python Language Binding
CATALOGNAME_CSWpysvn = pysvn
REQUIRED_PKGS_CSWpysvn = CSWsvn CSWpython
-#SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
-#CATALOGNAME_CSWrbsvn = rbsvn
-#REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby
+SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
+CATALOGNAME_CSWrbsvn = rbsvn
+REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby
PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL)
PKGFILES_CSWap2svn = $(prefix)/apache2*
@@ -58,32 +63,36 @@
PKGFILES_CSWpmsvn += $(mandir)/*swig_perl*
PKGFILES_CSWpysvn = $(libdir)/python*
PKGFILES_CSWpysvn += $(SVNLIB)/*swig_py*
-#PKGFILES_CSWrbsvn = $(libdir)/ruby*
-#PKGFILES_CSWrbsvn += $(SVNLIB)/*swig_ruby*
+PKGFILES_CSWrbsvn = $(libdir)/ruby*
+PKGFILES_CSWrbsvn += $(SVNLIB)/*swig_ruby*
DISTFILES += CSWsvn.checkinstall
DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
DISTFILES += fixme.sh
+DISTFILES += gccMake.sh
# Fix: Add java headers for nested classes
# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
-#PATCHFILES += javahl_headers_for_nested_classes.diff
-PATCHFILES += subversion155.diff
+PATCHFILES += javahl_headers_for_nested_classes.diff
+PATCHFILES += subversion156.diff
DEPENDS = server/apache2
DEPENDS = lib/neon
NODIRPATHS = --libdir --libexecdir
+JDK = /usr/jdk1.5.0_15
+EXTRA_INC += $(JDK)/include
SVNLIB = $(prefix)/lib/svn
CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
+CONFIGURE_ARGS += --with-gnu-ld=/opt/csw/bin/gld
CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
CONFIGURE_ARGS += --disable-mod-activation
-CONFIGURE_ARGS += --with-jdk=/usr/jdk1.5.0_15
+CONFIGURE_ARGS += --with-jdk=$(JDK)
CONFIGURE_ARGS += --enable-javahl
CONFIGURE_ARGS += --with-neon=$(prefix)
CONFIGURE_ARGS += --with-zlib=$(prefix)
@@ -95,18 +104,12 @@
# Tests take *forever*
TEST_SCRIPTS =
-EXTRA_LIB = $(prefix)/bdb44/lib $(SVNLIB)
-EXTRA_LIB += $(prefix)/apache2/lib
-EXTRA_INC = $(prefix)/bdb44/include
-EXTRA_INC += $(prefix)/apache2/include
-
# Add libintl when linking
EXTRA_LINKER_FLAGS += -lintl -liconv
include gar/category.mk
-#BINDING_LANGS = java perl python ruby
-BINDING_LANGS = java perl python
+BINDING_LANGS = java perl python ruby
BINDING_TARGETS = $(foreach LANG,$(BINDING_LANGS),svn-$(LANG))
PI_DEPENDS = $(BINDING_TARGETS)
@@ -118,6 +121,7 @@
post-configure-modulated:
@(echo "~~~ Fixing Libtool ~~~")
@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
+ @$(DOWNLOADDIR)/gccMake.sh $(WORKSRC)
$(DONADA)
copy-templates:
@@ -137,7 +141,6 @@
$(WORKSRC)/subversion/bindings/swig/python/*.py
@$(BUILD_ENV) gmake -C $(WORKSRC) swig-py
@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py
- @$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py
$(DONADA)
svn-perl:
@@ -147,22 +150,20 @@
$(WORKSRC)/subversion/bindings/swig/perl/native/*.pm
@$(BUILD_ENV) gmake -C $(WORKSRC) swig-pl
@$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl
- @$(TEST_ENV) gmake -C $(WORKSRC) check-swig-pl
$(DONADA)
svn-ruby:
@echo " ==> Building Ruby bindings"
@touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c
- @$(BUILD_ENV) gmake -C $(WORKSRC) swig-rb
- @$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-rb
- @$(TEST_ENV) gmake -C $(WORKSRC) check-swig-rb
+ @$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb
+ @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb
$(DONADA)
svn-java:
@echo " ==> Building Java bindings"
- @$(BUILD_ENV) gmake -C $(WORKSRC) javahl
- @$(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl
- @$(TEST_ENV) gmake -C $(WORKSRC) check-javahl
+ @touch $(WORKSRC)/subversion/bindings/javahl/native/*.c
+ @$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) javahl
+ @$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-javahl
$(DONADA)
Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums 2009-03-11 17:40:00 UTC (rev 3716)
+++ csw/mgar/pkg/subversion/trunk/checksums 2009-03-11 17:41:57 UTC (rev 3717)
@@ -1,8 +1,10 @@
-6f3701a0f2acf3fe53093491ba3d77ee download/subversion-1.5.5.tar.bz2
+3d1dabbbcacf262e3e0baa3de79220d7 download/subversion-1.5.6.tar.bz2
395ec6d1bfe07efadc1c0aa8816673fa download/CSWsvn.checkinstall
1e19681e6d988d35cfc6d708883ab7aa download/CSWap2svn.postinstall
586b9c9924c1547d44451a84d2aca702 download/CSWap2svn.preremove
f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW
1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW
-59ff30dc3a9abaa15b2bd4faa116ab3c download/fixme.sh
-89b68eb851673a9a0ebe29cd0010f0ed download/subversion155.diff
+41ec540885de7c34625768aa1fb9682b download/fixme.sh
+a1983ac6084ab919be687906d0892c44 download/gccMake.sh
+f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff
+89b68eb851673a9a0ebe29cd0010f0ed download/subversion156.diff
Modified: csw/mgar/pkg/subversion/trunk/files/fixme.sh
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/fixme.sh 2009-03-11 17:40:00 UTC (rev 3716)
+++ csw/mgar/pkg/subversion/trunk/files/fixme.sh 2009-03-11 17:41:57 UTC (rev 3717)
@@ -1,36 +1,49 @@
#!/bin/bash
+####################################################
+#
+# fixme.sh
+# Intended to remove the use of libtool's
+# pseudo-libraries for opencsw builds.
+#
+# Author: Mike Watters mwatters_at_opencsw.org
+# Initial Version: 0.1
+#
+####################################################
-touch /tmp/mike-fixme
-
umask 0022
-PATH=/opt/csw/bin:/usr/bin:/sbin
+PATH=/opt/csw/bin
if [ $# -ne 1 ]; then
- echo "USAGE: $(basename $0) WORKSRC"
+ gecho "USAGE: $(basename $0) WORKSRC"
exit 1
fi
BASEPATH=$1
## Fix Makefiles
for mk in $(gfind ${BASEPATH} -name Makefile -print); do
- LT_FILES=$(ggrep '/opt/csw.*/lib/.*.la' ${mk} | \
+ LT_FILES=$(ggrep '/opt/csw.*/lib/.*\.la' ${mk} | \
gsed "s/^.*\(\/opt\/csw.*\/lib\/.*\.la\).*$/\1/")
for file in ${LT_FILES}; do
- LIB_NAME=$(ggrep dlname= ${file} | \
+ LIB_NAME=$(ggrep 'dlname=' ${file} | \
gsed -e "s/.*'\(.*\)'/\1/" \
-e "s/^lib//" \
-e "s/\.so.*$//")
- fixpath=$(echo $file |gsed 's/\//\\\//g')
- sed "s/${fixpath}/-l${LIB_NAME}/g" \
- ${mk} >Makefile.new
- mv Makefile.new ${mk}
+ fixpath=$(gecho $file |gsed 's/\//\\\//g')
+ gsed "s/${fixpath}/-l${LIB_NAME}/g" ${mk} >Makefile.new
+ gmv Makefile.new ${mk}
done
done
-## Fix libtool
+## Fix libtool Script
for lt in $(gfind ${BASEPATH} -name libtool -print); do
gsed "/for search_ext in .*\.la/s/\.la//" ${lt} >${lt}.new
- mv ${lt}.new ${lt}
+ gmv ${lt}.new ${lt}
done
+LTMAIN=$(gfind ${BASEPATH} -name ltmain.sh -print)
+if [ -f ${LTMAIN} ]; then
+ gsed "/for search_ext in .*\.la/s/\.la//" ${LTMAIN} >${LTMAIN}.new
+ gmv ${LTMAIN}.new ${LTMAIN}
+fi
+
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