--- a/components/doxygen/Makefile Thu Mar 22 14:20:01 2012 -0700
+++ b/components/doxygen/Makefile Fri Mar 23 07:47:32 2012 -0700
@@ -18,18 +18,23 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= doxygen
-COMPONENT_VERSION= 1.5.7.1
+COMPONENT_VERSION= 1.7.6.1
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= sha1:aecb0c453f76e900eb2aa8132ad063215005fca3
+COMPONENT_ARCHIVE_HASH= sha1:6203d4423d12315f1094b56a4d7393347104bc4a
COMPONENT_ARCHIVE_URL= http://ftp.stack.nl/pub/users/dimitri/$(COMPONENT_ARCHIVE)
+# 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 = sha1:e7d35dd1e23ec4572e98a36028e136a9c4bde1af
+COMPONENT_ARCHIVE_URL_1 = ftp://ftp.stack.nl/pub/users/dimitri/$(COMPONENT_ARCHIVE_1)
+
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
@@ -44,12 +49,13 @@
# understand CC, CXX, etc.
CONFIGURE_OPTIONS = --platform solaris-cc
CONFIGURE_OPTIONS += --prefix /usr
-CONFIGURE_OPTIONS += --enable-langs nl,se,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 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
# common targets
build: $(BUILD_32)
install: $(INSTALL_32)
+ cd $(PROTO_DIR) ; $(UNPACK) ../../../$(COMPONENT_ARCHIVE_1)
test: $(NO_TESTS)
--- a/components/doxygen/doxygen.p5m Thu Mar 22 14:20:01 2012 -0700
+++ b/components/doxygen/doxygen.p5m Fri Mar 23 07:47:32 2012 -0700
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -38,13 +38,13 @@
dir path=usr/bin
dir path=usr/share
dir path=usr/share/doc
-dir path=usr/share/doc/doxygen-1.5.7.1
+dir path=usr/share/doc/doxygen-$(IPS_COMPONENT_VERSION)
dir path=usr/share/man
dir path=usr/share/man/man1
file path=usr/bin/doxygen
file path=usr/bin/doxytag
-file doxygen_manual-1.5.7.1.pdf \
- path=usr/share/doc/doxygen-1.5.7.1/doxygen_manual-1.5.7.1.pdf
+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