[csw-devel] SF.net SVN: gar:[21355] csw/mgar/pkg/rapidsvn/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Mon Jun 17 13:29:33 CEST 2013
Revision: 21355
http://gar.svn.sourceforge.net/gar/?rev=21355&view=rev
Author: dmichelsen
Date: 2013-06-17 11:29:33 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
rapidsvn/trunk: Update to 0.12.1, split packages
Modified Paths:
--------------
csw/mgar/pkg/rapidsvn/trunk/Makefile
csw/mgar/pkg/rapidsvn/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch
csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch
Removed Paths:
-------------
csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch
Modified: csw/mgar/pkg/rapidsvn/trunk/Makefile
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/Makefile 2013-06-17 11:23:05 UTC (rev 21354)
+++ csw/mgar/pkg/rapidsvn/trunk/Makefile 2013-06-17 11:29:33 UTC (rev 21355)
@@ -1,6 +1,5 @@
NAME = rapidsvn
-VERSION = 0.12.0-1
-SPKG_VERSION = $(subst -,.,$(VERSION))
+VERSION = 0.12.1
GARTYPE = v2
DESCRIPTION = GUI front-end for the Subversion revision system
@@ -11,70 +10,64 @@
are working on the Documentation and Online Help of RapidSVN
endef
-MASTER_SITES = http://www.rapidsvn.org/download/release/0.12/
+MASTER_SITES = http://www.rapidsvn.org/download/release/0.12.1/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-# DISTFILES += $(call admfiles,CSWrapidsvn,depend prototype)
-# DISTFILES += $(call admfiles,CSWsvncpp,depend prototype)
-PATCHFILES = 0001-Use-explicit-constructor-for-wxString.patch
-PATCHFILES += 0002-Make-sure-to-pass-norunpath-through-libtool.patch
+PATCHFILES += 0001-Use-explicit-constructor-for-wxString.patch
+PATCHFILES += 0001-Do-not-strip-norunpath-on-libtool.patch
+PATCHFILES += 0001-Add-missing-svncpp.dox-not-in-tarball.patch
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-PACKAGES = CSWrapidsvn CSWlibsvncpp3
+VENDOR_URL = http://rapidsvn.tigris.org/
-CATALOGNAME_CSWrapidsvn = rapidsvn
-CATALOGNAME_CSWlibsvncpp3 = libsvncpp3
+BUILD_DEP_PKGS += CSWsvn-dev
+BUILD_DEP_PKGS += CSWapache2-dev
+BUILD_DEP_PKGS += CSWdocbookxsl
+PACKAGES += CSWrapidsvn
SPKG_DESC_CSWrapidsvn = $(DESCRIPTION)
-SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding
-
-SPKG_SOURCEURL = http://rapidsvn.tigris.org/
-
-BUILD_DEP_PKGS = CSWsvn-devel CSWapache2-devel
-
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetscommon
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWexpat
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWbdb48
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWncurses
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWapr-util
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsunmath
-RUNTIME_DEP_PKGS_CSWrapidsvn += CSWiconv
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgets
+RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibapr1-0
RUNTIME_DEP_PKGS_CSWrapidsvn += CSWlibsvncpp3
RUNTIME_DEP_PKGS_CSWrapidsvn += CSWsvn
+RUNTIME_DEP_PKGS_CSWrapidsvn += CSWwxwidgetsgtk2
-BUILD_DEP_PKGS += CSWdocbookxsl
+PACKAGES += CSWlibsvncpp3
+SPKG_DESC_CSWlibsvncpp3 = Subversion C++ language binding
+PKGFILES_CSWlibsvncpp3 += $(call pkgfiles_lib,libsvncpp.so.3)
+
+PACKAGES += CSWlibsvncpp-dev
+SPKG_DESC_CSWlibsvncpp-dev = Development files for libsvncpp.so.3
+PKGFILES_CSWlibsvncpp-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWlibsvncpp-dev += CSWlibsvncpp3
+
DOCBOOK_MANPAGE = $(sharedstatedir)/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl
APR_CONFIG = $(bindir)/apr-1-config
APU_CONFIG = $(bindir)/apu-1-config
SVNLIBDIR = $(libdir)/svn
+EXTRA_LINKER_FLAGS += -norunpath
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-apr-config=$(APR_CONFIG)
CONFIGURE_ARGS += --with-apu-config=$(APU_CONFIG)
CONFIGURE_ARGS += --with-svn-lib=$(SVNLIBDIR)
CONFIGURE_ARGS += --with-svn-include=$(includedir)
CONFIGURE_ARGS += --with-docbook-xsl-manpages=$(DOCBOOK_MANPAGE)
+CONFIGURE_ARGS += --with-manpage=yes
# This must match the apr bdb binding. We need this to make sure
# libdb.so is found at the correct place.
EXTRA_LIB = $(SVNLIBDIR) $(prefix)/bdb48/lib
-PKGFILES_CSWlibsvncpp3 = $(PKGFILES_RT)
-PKGFILES_CSWlibsvncpp3 += $(PKGFILES_DEVEL)
-
-# We don't have a devel package
-CHECKPKG_OVERRIDES_CSWlibsvncpp3 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libsvncpp.so
-
include gar/category.mk
-post-install-modulated:
- ginstall -d $(DESTDIR)$(mandir)/man1
- ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1
- @$(MAKECOOKIE)
+#post-install-modulated:
+# ginstall -d $(DESTDIR)$(mandir)/man1
+# ginstall $(WORKSRC)/doc/manpage/rapidsvn.1 $(DESTDIR)$(mandir)/man1
+# @$(MAKECOOKIE)
Modified: csw/mgar/pkg/rapidsvn/trunk/checksums
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/checksums 2013-06-17 11:23:05 UTC (rev 21354)
+++ csw/mgar/pkg/rapidsvn/trunk/checksums 2013-06-17 11:29:33 UTC (rev 21355)
@@ -1 +1 @@
-8ec54104fca32d81e396a68e25324263 rapidsvn-0.12.0-1.tar.gz
+8de3ca6da3ef6a27d59f959d1bbcd96b rapidsvn-0.12.1.tar.gz
Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch (rev 0)
+++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Add-missing-svncpp.dox-not-in-tarball.patch 2013-06-17 11:29:33 UTC (rev 21355)
@@ -0,0 +1,202 @@
+From 63cd5923fb6ec46ec7b1415a22cf0540518b5bcb Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 17 Jun 2013 11:04:48 +0200
+Subject: [PATCH] Add missing svncpp.dox not in tarball
+
+---
+ doc/svncpp/svncpp.dox | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 183 insertions(+)
+ create mode 100644 doc/svncpp/svncpp.dox
+
+diff --git a/doc/svncpp/svncpp.dox b/doc/svncpp/svncpp.dox
+new file mode 100644
+index 0000000..b60e62b
+--- /dev/null
++++ b/doc/svncpp/svncpp.dox
+@@ -0,0 +1,183 @@
++# Doxyfile for SvnCpp
++# To build this documentation download Doxygen http://www.doxygen.org/
++
++#---------------------------------------------------------------------------
++# General configuration options
++#---------------------------------------------------------------------------
++PROJECT_NAME = SvnCpp
++PROJECT_NUMBER =
++OUTPUT_DIRECTORY = .
++OUTPUT_LANGUAGE = English
++EXTRACT_ALL = YES
++EXTRACT_PRIVATE = NO
++EXTRACT_STATIC = NO
++EXTRACT_LOCAL_CLASSES = YES
++HIDE_UNDOC_MEMBERS = NO
++HIDE_UNDOC_CLASSES = NO
++BRIEF_MEMBER_DESC = YES
++REPEAT_BRIEF = YES
++ALWAYS_DETAILED_SEC = NO
++INLINE_INHERITED_MEMB = NO
++FULL_PATH_NAMES = NO
++STRIP_FROM_PATH =
++INTERNAL_DOCS = NO
++STRIP_CODE_COMMENTS = YES
++CASE_SENSE_NAMES = YES
++SHORT_NAMES = NO
++HIDE_SCOPE_NAMES = NO
++VERBATIM_HEADERS = YES
++SHOW_INCLUDE_FILES = YES
++JAVADOC_AUTOBRIEF = NO
++MULTILINE_CPP_IS_BRIEF = NO
++DETAILS_AT_TOP = NO
++INHERIT_DOCS = YES
++INLINE_INFO = YES
++SORT_MEMBER_DOCS = YES
++DISTRIBUTE_GROUP_DOC = NO
++TAB_SIZE = 8
++GENERATE_TODOLIST = YES
++GENERATE_TESTLIST = YES
++GENERATE_BUGLIST = YES
++ALIASES =
++ENABLED_SECTIONS =
++MAX_INITIALIZER_LINES = 30
++OPTIMIZE_OUTPUT_FOR_C = YES
++OPTIMIZE_OUTPUT_JAVA = NO
++SHOW_USED_FILES = YES
++#---------------------------------------------------------------------------
++# configuration options related to warning and progress messages
++#---------------------------------------------------------------------------
++QUIET = NO
++WARNINGS = YES
++WARN_IF_UNDOCUMENTED = NO
++WARN_FORMAT = "$file:$line: $text"
++WARN_LOGFILE =
++#---------------------------------------------------------------------------
++# configuration options related to the input files
++#---------------------------------------------------------------------------
++INPUT = ../../include/svncpp
++FILE_PATTERNS = *.hpp
++RECURSIVE = NO
++EXCLUDE =
++EXCLUDE_SYMLINKS = NO
++EXCLUDE_PATTERNS =
++EXAMPLE_PATH =
++EXAMPLE_PATTERNS =
++EXAMPLE_RECURSIVE = NO
++IMAGE_PATH =
++INPUT_FILTER =
++FILTER_SOURCE_FILES = NO
++#---------------------------------------------------------------------------
++# configuration options related to source browsing
++#---------------------------------------------------------------------------
++SOURCE_BROWSER = NO
++INLINE_SOURCES = NO
++REFERENCED_BY_RELATION = YES
++REFERENCES_RELATION = YES
++#---------------------------------------------------------------------------
++# configuration options related to the alphabetical class index
++#---------------------------------------------------------------------------
++ALPHABETICAL_INDEX = NO
++COLS_IN_ALPHA_INDEX = 5
++IGNORE_PREFIX =
++#---------------------------------------------------------------------------
++# configuration options related to the HTML output
++#---------------------------------------------------------------------------
++GENERATE_HTML = YES
++HTML_OUTPUT = html
++HTML_FILE_EXTENSION = .html
++HTML_HEADER =
++HTML_FOOTER =
++HTML_STYLESHEET =
++HTML_ALIGN_MEMBERS = YES
++GENERATE_HTMLHELP = YES
++CHM_FILE = svncpp.chm
++HHC_LOCATION =
++GENERATE_CHI = NO
++BINARY_TOC = NO
++TOC_EXPAND = NO
++DISABLE_INDEX = NO
++ENUM_VALUES_PER_LINE = 4
++GENERATE_TREEVIEW = NO
++TREEVIEW_WIDTH = 250
++#---------------------------------------------------------------------------
++# configuration options related to the LaTeX output
++#---------------------------------------------------------------------------
++GENERATE_LATEX = NO
++LATEX_OUTPUT = latex
++LATEX_CMD_NAME = latex
++MAKEINDEX_CMD_NAME = makeindex
++COMPACT_LATEX = NO
++PAPER_TYPE = a4wide
++EXTRA_PACKAGES =
++LATEX_HEADER =
++PDF_HYPERLINKS = NO
++USE_PDFLATEX = NO
++LATEX_BATCHMODE = NO
++#---------------------------------------------------------------------------
++# configuration options related to the RTF output
++#---------------------------------------------------------------------------
++GENERATE_RTF = NO
++RTF_OUTPUT = rtf
++COMPACT_RTF = NO
++RTF_HYPERLINKS = NO
++RTF_STYLESHEET_FILE =
++RTF_EXTENSIONS_FILE =
++#---------------------------------------------------------------------------
++# configuration options related to the man page output
++#---------------------------------------------------------------------------
++GENERATE_MAN = NO
++MAN_OUTPUT = man
++MAN_EXTENSION = .3
++MAN_LINKS = NO
++#---------------------------------------------------------------------------
++# configuration options related to the XML output
++#---------------------------------------------------------------------------
++GENERATE_XML = NO
++#---------------------------------------------------------------------------
++# configuration options for the AutoGen Definitions output
++#---------------------------------------------------------------------------
++GENERATE_AUTOGEN_DEF = NO
++#---------------------------------------------------------------------------
++# Configuration options related to the preprocessor
++#---------------------------------------------------------------------------
++ENABLE_PREPROCESSING = YES
++MACRO_EXPANSION = NO
++EXPAND_ONLY_PREDEF = NO
++SEARCH_INCLUDES = YES
++INCLUDE_PATH =
++INCLUDE_FILE_PATTERNS =
++PREDEFINED =
++EXPAND_AS_DEFINED =
++SKIP_FUNCTION_MACROS = YES
++#---------------------------------------------------------------------------
++# Configuration::addtions related to external references
++#---------------------------------------------------------------------------
++TAGFILES =
++GENERATE_TAGFILE =
++ALLEXTERNALS = NO
++EXTERNAL_GROUPS = YES
++PERL_PATH = /usr/bin/perl
++#---------------------------------------------------------------------------
++# Configuration options related to the dot tool
++#---------------------------------------------------------------------------
++CLASS_DIAGRAMS = YES
++HIDE_UNDOC_RELATIONS = YES
++HAVE_DOT = YES
++CLASS_GRAPH = NO
++COLLABORATION_GRAPH = NO
++TEMPLATE_RELATIONS = YES
++INCLUDE_GRAPH = NO
++INCLUDED_BY_GRAPH = YES
++GRAPHICAL_HIERARCHY = YES
++DOT_IMAGE_FORMAT = png
++DOT_PATH =
++DOTFILE_DIRS =
++MAX_DOT_GRAPH_WIDTH = 1024
++MAX_DOT_GRAPH_HEIGHT = 1024
++GENERATE_LEGEND = NO
++DOT_CLEANUP = YES
++#---------------------------------------------------------------------------
++# Configuration::addtions related to the search engine
++#---------------------------------------------------------------------------
++SEARCHENGINE = NO
+--
+1.8.1.4
+
Added: csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch (rev 0)
+++ csw/mgar/pkg/rapidsvn/trunk/files/0001-Do-not-strip-norunpath-on-libtool.patch 2013-06-17 11:29:33 UTC (rev 21355)
@@ -0,0 +1,25 @@
+From f1b39457612f77450c34ebb3f8ff3b1e22cfea6d Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 17 Jun 2013 12:53:52 +0200
+Subject: [PATCH] Do not strip -norunpath on libtool
+
+---
+ ltmain.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index c2852d8..24983b6 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -5853,7 +5853,7 @@ func_mode_link ()
+ # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-norunpath)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+--
+1.8.1.4
+
Deleted: csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch
===================================================================
--- csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch 2013-06-17 11:23:05 UTC (rev 21354)
+++ csw/mgar/pkg/rapidsvn/trunk/files/0002-Make-sure-to-pass-norunpath-through-libtool.patch 2013-06-17 11:29:33 UTC (rev 21355)
@@ -1,25 +0,0 @@
-From 1b25c39d53c48db42781fad4c4d8762949c91bba Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 20 Oct 2010 14:16:27 +0200
-Subject: [PATCH] Make sure to pass -norunpath through libtool
-
----
- ltmain.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/ltmain.sh b/ltmain.sh
-index b612e9a..d5cf479 100755
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
---
-1.7.3
-
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