# HG changeset patch
# User Rich Burridge <rich.burridge@oracle.com>
# Date 1407192115 25200
# Node ID d590db614c663ce70f8395b35010c40914f944e5
# Parent  9a6f17b2de191a3b47ee62c18ef2bd5b283a38ae
PSARC 2014/156 doxygen version 1.8.7
18671761 Update doxygen to the latest version.
18685156 Add COMPONENT_TEST_DIR to Userland.

diff -r 9a6f17b2de19 -r d590db614c66 components/doxygen/Makefile
--- a/components/doxygen/Makefile	Mon Aug 04 15:38:32 2014 -0700
+++ b/components/doxygen/Makefile	Mon Aug 04 15:41:55 2014 -0700
@@ -23,22 +23,22 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		doxygen
-COMPONENT_VERSION=	1.7.6.1
+COMPONENT_VERSION=	1.8.7
 COMPONENT_PROJECT_URL=	http://www.stack.nl/~dimitri/doxygen/index.html
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).src.tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd
+    sha256:c6eac6b6e82148ae15ec5aecee4631547359f284af1ce94474d046ebca6ee3d9
 COMPONENT_ARCHIVE_URL=	http://ftp.stack.nl/pub/users/dimitri/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/doxygen
 
 # Download the manual so that we don't have to keep updating it in the gate.
 COMPONENT_ARCHIVE_1 =	$(COMPONENT_NAME)_manual-$(COMPONENT_VERSION).pdf.zip
 COMPONENT_ARCHIVE_HASH_1 =	\
-    sha256:abe8ea7db00fe68632edeb2d6e44f94ad96a0dc798702b044afbc1752c7b2a61
+    sha256:6796de1e77f723dcb52f36395161fdfbeaeebf769a297eb78b73e19b9542aa59
 COMPONENT_ARCHIVE_URL_1 =	ftp://ftp.stack.nl/pub/users/dimitri/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			6511
+TPNO=			17646
 
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
@@ -58,12 +58,19 @@
 # understand CC, CXX, etc.
 CONFIGURE_OPTIONS =	--platform solaris-cc-64
 CONFIGURE_OPTIONS +=	--prefix /usr
-CONFIGURE_OPTIONS +=	--enable-langs nl,sv,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa
+CONFIGURE_OPTIONS +=	--enable-langs am,ar,br,ca,cn,cz,de,dk,en,eo,es,fa,fi,fr,gr,hr,hu,id,it,je,jp,ke,kr,lt,lv,mk,nl,no,pl,pt,ro,ru,sc,si,sk,sr,sv,tr,tw,ua,vi,za
 
-# It was found that 64-bit doxygen crashes when built with the 12.3 compiler
-# if ASLR is enabled.  Sun Studio bug #16984930 was filed about this.
+# Tests not available from the top-level Makefile, nor via a standard target.
+# We need to add /usr/gnu/bin to the front of the PATH environment variable
+# for "diff -u" and we need to use our latest doxygen binary, not the one
+# installed on the system.
 #
-ASLR_MODE = $(ASLR_DISABLE)
+# Test 12 is a known failure (we don't have bibtex in Solaris).
+COMPONENT_TEST_ENV =		PATH="$(GNUBIN):$(PROTO_DIR)/usr/bin:$(PATH)"
+COMPONENT_TEST_DIR =		$(BUILD_DIR_64)/testing
+COMPONENT_TEST_TARGETS =	tests
+
+ASLR_MODE = $(ASLR_ENABLE)
 
 # common targets
 build:		$(BUILD_64)
@@ -71,7 +78,7 @@
 install:	$(INSTALL_64)
 	cd $(PROTO_DIR) ; $(UNPACK) ../../../$(COMPONENT_ARCHIVE_1) 
 
-test:	$(NO_TESTS)
+test:		$(TEST_64)
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
diff -r 9a6f17b2de19 -r d590db614c66 components/doxygen/doxygen.p5m
--- a/components/doxygen/doxygen.p5m	Mon Aug 04 15:38:32 2014 -0700
+++ b/components/doxygen/doxygen.p5m	Mon Aug 04 15:41:55 2014 -0700
@@ -34,12 +34,10 @@
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid \
-    value=LSARC/2008/612
+    value=LSARC/2008/612 value=PSARC/2014/156
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/doxygen
-file path=usr/bin/doxytag
 file doxygen_manual-$(IPS_COMPONENT_VERSION).pdf \
     path=usr/share/doc/doxygen-$(IPS_COMPONENT_VERSION)/doxygen_manual-$(IPS_COMPONENT_VERSION).pdf
 file usr/man/man1/doxygen.1 path=usr/share/man/man1/doxygen.1
-file usr/man/man1/doxytag.1 path=usr/share/man/man1/doxytag.1
 license doxygen.license license=GPLv2
diff -r 9a6f17b2de19 -r d590db614c66 make-rules/attpackagemake.mk
--- a/make-rules/attpackagemake.mk	Mon Aug 04 15:38:32 2014 -0700
+++ b/make-rules/attpackagemake.mk	Mon Aug 04 15:41:55 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # Rules and Macros for building opens source software that uses AT&T's package
@@ -91,7 +91,7 @@
 # test the built source
 $(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
-	cd $(@D); $(ENV) $(COMPONENT_TEST_ENV) \
+	cd $(COMPONENT_TEST_DIR); $(ENV) $(COMPONENT_TEST_ENV) \
 		bin/package test $(COMPONENT_TEST_TARGETS) \
 		$(COMPONENT_TEST_ARGS)
 	$(COMPONENT_POST_TEST_ACTION)
diff -r 9a6f17b2de19 -r d590db614c66 make-rules/configure.mk
--- a/make-rules/configure.mk	Mon Aug 04 15:38:32 2014 -0700
+++ b/make-rules/configure.mk	Mon Aug 04 15:41:55 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -137,7 +137,7 @@
 # test the built source
 $(BUILD_DIR)/%/.tested:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
-	(cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
+	(cd $(COMPONENT_TEST_DIR) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
 			$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
 	$(COMPONENT_POST_TEST_ACTION)
 	$(TOUCH) $@
diff -r 9a6f17b2de19 -r d590db614c66 make-rules/justmake.mk
--- a/make-rules/justmake.mk	Mon Aug 04 15:38:32 2014 -0700
+++ b/make-rules/justmake.mk	Mon Aug 04 15:41:55 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 #
 # Rules and Macros for building opens source software that just uses their
@@ -71,7 +71,7 @@
 # test the built source
 $(BUILD_DIR)/%/.tested: $(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
-	(cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
+	(cd $(COMPONENT_TEST_DIR) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
 		$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
 	$(COMPONENT_POST_TEST_ACTION)
 	$(TOUCH) $@
diff -r 9a6f17b2de19 -r d590db614c66 make-rules/makemaker.mk
--- a/make-rules/makemaker.mk	Mon Aug 04 15:38:32 2014 -0700
+++ b/make-rules/makemaker.mk	Mon Aug 04 15:41:55 2014 -0700
@@ -99,7 +99,7 @@
 COMPONENT_TEST_ENV +=	$(COMMON_PERL_ENV)
 $(BUILD_DIR)/%/.tested:	$(BUILD_DIR)/%/.built
 	$(COMPONENT_PRE_TEST_ACTION)
-	(cd $(@D) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
+	(cd $(COMPONENT_TEST_DIR) ; $(ENV) $(COMPONENT_TEST_ENV) $(GMAKE) \
 			$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
 	$(COMPONENT_POST_TEST_ACTION)
 	$(TOUCH) $@
diff -r 9a6f17b2de19 -r d590db614c66 make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk	Mon Aug 04 15:38:32 2014 -0700
+++ b/make-rules/shared-macros.mk	Mon Aug 04 15:41:55 2014 -0700
@@ -232,6 +232,9 @@
 # set the default target for test of the component
 COMPONENT_TEST_TARGETS =	check
 
+# set the default directory for test of the component
+COMPONENT_TEST_DIR =		$(@D)
+
 # BUILD_TOOLS is the root of all tools not normally installed on the system.
 BUILD_TOOLS ?=	/ws/on12-tools