[csw-devel] SF.net SVN: gar:[14028] csw/mgar/pkg/doxygen/trunk

[dmichelsen at users.sourceforge.net]

Revision: 14028
          http://gar.svn.sourceforge.net/gar/?rev=14028&view=rev
Author:   dmichelsen
Date:     2011-03-31 13:04:52 +0000 (Thu, 31 Mar 2011)

Log Message:
-----------
doxygen: Update to 1.7.4 and rework

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	2011-03-31 10:09:51 UTC (rev 14027)
+++ csw/mgar/pkg/doxygen/trunk/Makefile	2011-03-31 13:04:52 UTC (rev 14028)
@@ -1,5 +1,5 @@
 NAME = doxygen
-VERSION = 1.7.3
+VERSION = 1.7.4
 CATEGORIES = utils
 
 DESCRIPTION = A documentation system for programming languages
@@ -9,27 +9,33 @@
 endef
 
 MASTER_SITES = http://ftp.stack.nl/pub/users/dimitri/
-DISTFILES  = $(NAME)-$(VERSION).src.tar.gz
+DISTFILES  = $(DISTNAME).src.tar.gz
 
-PACKAGES = CSWdoxygen CSWdoxygendoc
-
+PACKAGES += CSWdoxygen
 CATALOGNAME_CSWdoxygen = doxygen
-CATALOGNAME_CSWdoxygendoc = doxygen_doc
-
 SPKG_DESC_CSWdoxygen = A documentation system for programming languages
-SPKG_DESC_CSWdoxygendoc = Documentation for doxygen
 
+PACKAGES += CSWdoxygen-doc
+CATALOGNAME_CSWdoxygen-doc = doxygen_doc
+SPKG_DESC_CSWdoxygen-doc = Documentation for doxygen
+PKGFILES_CSWdoxygen-doc = $(PKGFILES_DOC)
+ARCHALL_CSWdoxygen-doc = 1
+# 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
+# These are pure examples
+CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/config.html
+CHECKPKG_OVERRIDES_CSWdoxygen-doc += file-with-bad-content|/usr/local|root/opt/csw/share/doc/doxygen/html/install.html
+
 LICENSE = LICENSE
 
-SPKG_SOURCEURL = http://www.stack.nl/~dimitri/doxygen/
+VENDOR_URL = http://www.stack.nl/~dimitri/doxygen/
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).src.tar.gz
-UPSTREAM_MASTER_SITES = $(SPKG_SOURCEURL)
-
 BUILD_DEP_PKGS = CSWgraphviz
 
 EXTRA_CXXFLAGS = -features=tmplrefstatic
+EXTRA_LINKER_FLAGS = -norunpath
 
 CONFIGURE_ARGS = --prefix $(prefix)
 CONFIGURE_ARGS += --release
@@ -37,28 +43,25 @@
 CONFIGURE_ARGS += --dot /opt/csw/bin/dot
 CONFIGURE_ARGS += --platform solaris-cc
 
+# There is no testsuite
 TEST_SCRIPTS =
 
 INSTALL_ARGS = install_docs
 
 EXTRA_PAX_ARGS += -s ',^\.$(prefix)/man,.$(mandir),'
 
-ARCHALL_CSWdoxygendoc = 1
-PKGFILES_CSWdoxygendoc = $(PKGFILES_DOC)
+# These are from 'dot', pretty ugly, don't package at least for now
+EXTRA_MERGE_EXCLUDE_FILES = .*/core
 
-# There are some Python examples in there, but pulling in Python unconditionally
-# for these tiny examples seems overkill.
-CHECKPKG_OVERRIDES_CSWdoxygendoc = missing-dependency|CSWpython
-
 # Use CSW Perl instead of #!/usr/local/bin/perl in
 #   /opt/csw/share/doc/doxygen/examples/Makefile
 # some time...
 
 include gar/category.mk
 
-# For 'dot'
-PATH := $(PATH):/opt/csw/graphviz2/bin
-
 post-extract-modulated:
-	perl -pi -e ' s,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(CFLAGS),; s,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(CXXFLAGS),; s,(TMAKE_LFLAGS_RELEASE\s*=)(.*),\1$(LDFLAGS),; ' $(WORKSRC)/tmake/lib/solaris-cc/tmake.conf
+	perl -pi -e 's,(TMAKE_CFLAGS_RELEASE\s*=\s*)(.*),\1$(CFLAGS),;' \
+		-e 's,(TMAKE_CXXFLAGS_RELEASE\s*=\s*)(.*),\1$(CXXFLAGS),;' \
+		-e 's,(TMAKE_LFLAGS_RELEASE\s*=)(.*),\1$(LDFLAGS),;' \
+		$(WORKSRC)/tmake/lib/solaris-cc/tmake.conf
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/doxygen/trunk/checksums
===================================================================
--- csw/mgar/pkg/doxygen/trunk/checksums	2011-03-31 10:09:51 UTC (rev 14027)
+++ csw/mgar/pkg/doxygen/trunk/checksums	2011-03-31 13:04:52 UTC (rev 14028)
@@ -1 +1 @@
-6cc5ad566dbec5cf843dc600b1162808  doxygen-1.7.3.src.tar.gz
+ff908759ff7cd9464424b04ae6c68e48  doxygen-1.7.4.src.tar.gz


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.