SF.net SVN: gar:[25165] csw/mgar/pkg/doxygen/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Thu Jul 9 13:37:06 CEST 2015


Revision: 25165
          http://sourceforge.net/p/gar/code/25165
Author:   dmichelsen
Date:     2015-07-09 11:37:05 +0000 (Thu, 09 Jul 2015)
Log Message:
-----------
doxygen/trunk: Update to 1.8.10, switch to cmake

Modified Paths:
--------------
    csw/mgar/pkg/doxygen/trunk/Makefile
    csw/mgar/pkg/doxygen/trunk/checksums

Modified: csw/mgar/pkg/doxygen/trunk/Makefile
===================================================================
--- csw/mgar/pkg/doxygen/trunk/Makefile	2015-07-09 11:29:20 UTC (rev 25164)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2015-07-09 11:37:05 UTC (rev 25165)
@@ -1,5 +1,5 @@
 NAME = doxygen
-VERSION = 1.8.9
+VERSION = 1.8.10
 GARTYPE = v2
 
 DESCRIPTION = A documentation system for programming languages
@@ -28,50 +28,34 @@
 # There are some Python examples in there, but pulling in Python unconditionally
 # for these tiny examples seems overkill.
 CHECKPKG_OVERRIDES_CSWdoxygen-doc = missing-dependency|CSWpython
-OBSOLETED_BY_CSWdoxygen-doc = CSWdoxygendoc
-CATALOGNAME_CSWdoxygendoc = doxygen_doc_stub
 
-REINPLACEMENTS += cflags
-REINPLACE_MATCH_cflags = (TMAKE_CFLAGS_RELEASE\s*=\s*).*
-REINPLACE_WITH_cflags = \1$(CFLAGS)
-REINPLACE_FILES_cflags += tmake/lib/solaris-cc/tmake.conf
+# I have no idea ow to pass '-norunpath' during linkage to CMake
+CHECKPKG_OVERRIDES_CSWdoxygen += bad-rpath-entry|/opt/solarisstudio12.3/lib|opt/csw/bin/doxygen
+CHECKPKG_OVERRIDES_CSWdoxygen += bad-rpath-entry|/opt/solarisstudio12.3/lib/sparc|opt/csw/bin/doxygen
 
-REINPLACEMENTS += cxxflags
-REINPLACE_MATCH_cxxflags = (TMAKE_CXXFLAGS_RELEASE\s*=\s*).*
-REINPLACE_WITH_cxxflags = \1$(CXXFLAGS)
-REINPLACE_FILES_cxxflags += tmake/lib/solaris-cc/tmake.conf
-
-REINPLACEMENTS += ldflags
-REINPLACE_MATCH_ldflags = (TMAKE_LFLAGS_RELEASE\s*=).*
-REINPLACE_WITH_ldflags = \1 $(LDFLAGS)
-REINPLACE_FILES_ldflags += tmake/lib/solaris-cc/tmake.conf
-
 # Sun Studio 12 is too old and actually does not work any more
 GARCOMPILER = SOS12U3
 
-EXTRA_CXXFLAGS += -features=tmplrefstatic
-EXTRA_CXXFLAGS += -features=extensions -D__FUNCTION__=__func__
-EXTRA_LINKER_FLAGS = -norunpath
+CONFIGURE_SCRIPTS = cmake
+BUILD_SCRIPTS = $(WORKSRC)/solaris/Makefile
+BUILD_ARGS += docs
 
-CONFIGURE_ARGS = --prefix $(prefix)
-CONFIGURE_ARGS += --release
-CONFIGURE_ARGS += --docdir $(docdir)/doxygen
-CONFIGURE_ARGS += --dot /opt/csw/bin/dot
-CONFIGURE_ARGS += --platform solaris-cc
+TEST_SCRIPTS = $(WORKSRC)/solaris/Makefile
+TEST_TARGET = tests
 
-# There is no testsuite
-TEST_SCRIPTS =
+INSTALL_SCRIPTS = $(WORKSRC)/solaris/Makefile
 
-INSTALL_ARGS = install_docs
-
 EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),'
+EXTRA_PAX_ARGS += -s ',^\.$(docdir)/packages/,.$(docdir)/,'
 
-# These are from 'dot', pretty ugly, don't package at least for now
-EXTRA_MERGE_EXCLUDE_FILES = .*/core
-
 # Use CSW Perl instead of #!/usr/local/bin/perl in
 #   /opt/csw/share/doc/doxygen/examples/Makefile
 # some time...
 
 include gar/category.mk
 
+configure-cmake:
+	mkdir $(WORKSRC)/solaris
+	@# The -DMAKE= is needed because docs generation uses $(MAKE) -C which the default /usr/ccs/bin/make does not understand
+	cd $(WORKSRC)/solaris && cmake -DMAKE=/opt/csw/bin/gmake -Dbuild_doc=YES -DCMAKE_INSTALL_PREFIX:PATH=$(prefix) -G 'Unix Makefiles' $(abspath $(WORKSRC))
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2015-07-09 11:29:20 UTC (rev 25164)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2015-07-09 11:37:05 UTC (rev 25165)
@@ -1 +1 @@
-753c1b135086c4771035622532652552  doxygen-1.8.9.src.tar.gz
+79767ccd986f12a0f949015efb5f058f  doxygen-1.8.10.src.tar.gz

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