2008-08-16 Halton Huo <
[email protected]>
* SFEasciidoc.spec: Bump to 8.2.7
* SFExmlto.spec: Add Requires to SUNWgnome-xml-root and SUNWw3m
* base-specs/doxygen.spec: Bump to 1.5.6
* encumbered/.pkgtoolrc: (added)
* patches/doxygen-01-iconv.diff: remove upstreamed patch
* patches/doxygen-01-solaris-pkgtool.diff: (added)
* patches/doxygen-02-nameconflict.diff: remove upstreamed patch
* patches/doxygen-02-solaris-tmake-i386.diff: (added)
* patches/doxygen-02-solaris-tmake-sparc.diff: (added)
* patches/doxygen-03-solaris-i386.diff: (removed)
* patches/doxygen-03-solaris-sparc.diff: (removed)
* patches/doxygen-04-tmake-g++.diff: reordered
--- a/SFEasciidoc.spec Sat Aug 16 00:03:02 2008 +0000
+++ b/SFEasciidoc.spec Sat Aug 16 09:14:53 2008 +0000
@@ -8,7 +8,7 @@
Name: SFEasciidoc
Summary: AsciiDoc - Text based document generation
-Version: 8.2.6
+Version: 8.2.7
URL: http://www.methods.co.nz/asciidoc/
Source: %{sf_download}/asciidoc/asciidoc-%{version}.tar.gz
SUNW_BaseDir: %{_basedir}
@@ -56,6 +56,8 @@
%{_sysconfdir}/asciidoc
%changelog
+* Sat Aug 16 2008 - [email protected]
+- Bump to 8.2.7
* Mon May 05 2008 - [email protected]
- Bump to 8.2.6.
* Wed Dec 05 2007 - [email protected]
--- a/SFExmlto.spec Sat Aug 16 00:03:02 2008 +0000
+++ b/SFExmlto.spec Sat Aug 16 09:14:53 2008 +0000
@@ -16,7 +16,9 @@
%include default-depend.inc
Requires: SUNWlxsl
Requires: SUNWgnome-xml-share
+Requires: SUNWgnome-xml-root
Requires: SUNWgnugetopt
+Requires: SUNWw3m
%prep
rm -rf %name-%version
@@ -59,6 +61,8 @@
%{_mandir}/man1/*
%changelog
+* Sat Aug 16 2008 - [email protected]
+- Add Requires to SUNWgnome-xml-root and SUNWw3m
* Tue Jun 17 2008 - [email protected]
- Add patch 01-find.diff, remove depedency of
GNU find utility.
--- a/base-specs/doxygen.spec Sat Aug 16 00:03:02 2008 +0000
+++ b/base-specs/doxygen.spec Sat Aug 16 09:14:53 2008 +0000
@@ -8,17 +8,18 @@
Name: doxygen
License: GPL
-Version: 1.5.4
-URL: http://ftp.stack.nl/pub/users/dimitri
+Version: 1.5.6
+URL: http://www.doxygen.org/
Summary: Doxygen is a documentation system for various programming languages
-Source: http://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-Patch2: doxygen-02-nameconflict.diff
+#Source: http://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
+Source: http://gd.tuwien.ac.at/softeng/%{name}/%{name}-%{version}.src.tar.gz
+Patch1: doxygen-01-solaris-pkgtool.diff
%ifarch sparc
-Patch3: doxygen-03-solaris-sparc.diff
+Patch2: doxygen-02-solaris-tmake-sparc.diff
%else
-Patch3: doxygen-03-solaris-i386.diff
+Patch2: doxygen-02-solaris-tmake-i386.diff
%endif
-Patch4: doxygen-04-tmake-g++.diff
+Patch3: doxygen-03-tmake-g++.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
@@ -29,9 +30,9 @@
%prep
%setup -q
+%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%ifos linux
@@ -74,6 +75,12 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Aug 16 2008 - [email protected]
+- Bump to 1.5.6
+- Use a live Source URL.
+- Add solaris-pkgtool.diff
+- Add solaris-tmake-sparc.diff and solaris-tmake-i386.diff
+- Remove solaris-sparc.diff and solaris-i386.diff and reorder
* Sun Feb 17 2008 - [email protected]
- build using the C/C++ compiler specified by the CC/CXX env variables
* Fri Jan 18 2008 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/encumbered/.pkgtoolrc Sat Aug 16 09:14:53 2008 +0000
@@ -0,0 +1,14 @@
+# tarballdirs [string]: colon (:) separated list of directories where source tarballs are searched for
+tarballdirs: /jds/packages/SOURCES:${tarballdirs}
+
+# logdir [string]: the directory for saving log files
+# logdir: /tmp
+
+# patchdirs [string]: colon (:) separated list of directories where source patches are searched for
+patchdirs: ${MYDIR}/../patches
+
+# specdirs [string]: colon (:) separated list of directories where spec files are searched for
+specdirs: ${MYDIR}:${MYDIR}../:${MYDIR}/../linux-specs:${MYDIR}/../base-specs:${MYDIR}/../include
+
+# sourcedirs [string]: colon (:) separated list of directories where extra sources (not tarballs) are searched for
+sourcedirs: ${MYDIR}/../ext-sources:${MYDIR}/../copyright
--- a/patches/doxygen-01-iconv.diff Sat Aug 16 00:03:02 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-diff -ur doxygen-1.5.2-orig/src/portable.cpp doxygen-1.5.2/src/portable.cpp
---- doxygen-1.5.2-orig/src/portable.cpp 2007-03-13 23:58:17.000000000 +0700
-+++ doxygen-1.5.2/src/portable.cpp 2007-04-21 19:07:44.101394160 +0700
-@@ -376,13 +376,13 @@
- #if (defined(_LIBICONV_VERSION) && (_LIBICONV_VERSION==0x0109))
- #define CASTNEEDED(x) (x)
- #else
--#define CASTNEEDED(x) (char **)(x)
-+#define CASTNEEDED(x) (const char **)(x)
- #endif
-- return iconv(cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft);
-+ return iconv((iconv_t) cd,CASTNEEDED(inbuf),inbytesleft,outbuf,outbytesleft);
- }
-
- int portable_iconv_close (void *cd)
- {
-- return iconv_close(cd);
-+ return iconv_close((iconv_t)cd);
- }
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/doxygen-01-solaris-pkgtool.diff Sat Aug 16 09:14:53 2008 +0000
@@ -0,0 +1,60 @@
+Index: trunk/configure
+===================================================================
+--- trunk/configure (revision 644)
++++ trunk/configure (working copy)
+@@ -213,9 +213,9 @@
+ f_platform=sunos-g++
+ ;;
+ SunOS:5*)
+- f_platform=solaris-g++
++ f_platform=solaris-cc
+ if test "$f_insttool" = NO; then
+- f_insttool=/usr/bin/install
++ f_insttool=install
+ fi
+ ;;
+ ULTRIX:*)
+Index: trunk/Makefile.in
+===================================================================
+--- trunk/Makefile.in (revision 644)
++++ trunk/Makefile.in (working copy)
+@@ -50,28 +50,28 @@
+
+ DATE=$(shell date "+%B %Y")
+
+-MAN1DIR = man/man1
++MAN1DIR = share/man/man1
+
+ install: doxywizard_install
+- $(INSTTOOL) -d $(INSTALL)/bin
+- $(INSTTOOL) -m 755 bin/doxygen $(INSTALL)/bin
+- $(INSTTOOL) -m 755 bin/doxytag $(INSTALL)/bin
+- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
++ mkdir -p $(DESTDIR)/$(INSTALL)/bin
++ $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
++ $(INSTTOOL) -m 755 bin/doxytag $(DESTDIR)/$(INSTALL)/bin
++ mkdir -p $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
+ cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1
+- $(INSTTOOL) -m 644 doxygen.1 $(INSTALL)/$(MAN1DIR)/doxygen.1
++ $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
+ rm doxygen.1
+ cat doc/doxytag.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1
+- $(INSTTOOL) -m 644 doxytag.1 $(INSTALL)/$(MAN1DIR)/doxytag.1
++ $(INSTTOOL) -m 644 doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
+ rm doxytag.1
+
+ install_docs:
+- $(INSTTOOL) -d $(DOCDIR)
++ mkdir -p $(DESTDIR)/$(DOCDIR)
+ $(MAKE) -C examples
+ $(MAKE) -C doc
+ $(MAKE) -C latex
+- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DOCDIR)
+- cp -r examples $(DOCDIR)
+- cp -r html $(DOCDIR)
++ $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
++ cp -r examples $(DESTDIR)/$(DOCDIR)
++ cp -r html $(DESTDIR)/$(DOCDIR)
+
+ docs: FORCE
+ cd examples ; $(MAKE)
--- a/patches/doxygen-02-nameconflict.diff Sat Aug 16 00:03:02 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-diff -ur doxygen-1.5.2-orig/qtools/qxml.cpp doxygen-1.5.2/qtools/qxml.cpp
---- doxygen-1.5.2-orig/qtools/qxml.cpp 2006-07-22 02:54:13.000000000 +0700
-+++ doxygen-1.5.2/qtools/qxml.cpp 2007-04-21 19:10:59.310037082 +0700
-@@ -4772,7 +4772,7 @@
- {
- const signed char Init = 0;
- const signed char Ws1 = 1; // eat whitespace
-- const signed char CS = 2; // choice or set
-+ const signed char ChS = 2; // choice or set
- const signed char Ws2 = 3; // eat whitespace
- const signed char More = 4; // more cp to read
- const signed char Name = 5; // read name
-@@ -4792,11 +4792,11 @@
- static signed char table[6][9] = {
- /* InpWs InpOp InpCp InpQm InpAst InpPlus InpPipe InpComm InpUnknown */
- { -1, Ws1, -1, -1, -1, -1, -1, -1, Name }, // Init
-- { -1, CS, -1, -1, -1, -1, -1, -1, CS }, // Ws1
-- { Ws2, -1, Done, Ws2, Ws2, Ws2, More, More, -1 }, // CS
-+ { -1, ChS, -1, -1, -1, -1, -1, -1, ChS }, // Ws1
-+ { Ws2, -1, Done, Ws2, Ws2, Ws2, More, More, -1 }, // ChS
- { -1, -1, Done, -1, -1, -1, More, More, -1 }, // Ws2
- { -1, Ws1, -1, -1, -1, -1, -1, -1, Name }, // More (same as Init)
-- { Ws2, -1, Done, Ws2, Ws2, Ws2, More, More, -1 } // Name (same as CS)
-+ { Ws2, -1, Done, Ws2, Ws2, Ws2, More, More, -1 } // Name (same as ChS)
- };
- signed char state = Init;
- signed char input;
-@@ -4837,7 +4837,7 @@
- case Ws1:
- next_eat_ws();
- break;
-- case CS:
-+ case ChS:
- parseOk = parseChoiceSeq();
- break;
- case Ws2:
-@@ -4855,7 +4855,7 @@
- }
- // no input is read after this
- switch ( state ) {
-- case CS:
-+ case ChS:
- if ( !parseOk ) {
- d->error = XMLERR_ERRORPARSINGCHOICE;
- goto parseError;
---- doxygen-1.5.4/src/index.h 2007-10-20 23:00:08.000000000 +0530
-+++ doxygen-1.5.4/src/index.h.new 2008-01-18 10:24:50.038397000 +0530
-@@ -47,19 +47,19 @@
- {
- QListIterator<IndexIntf> li(m_intfs);
- for (li.toFirst();li.current();++li) (li.current()->*methodPtr)();
-- };
-- template<typename A1>
-- void foreach(void (IndexIntf::*methodPtr)(A1),A1 a1)
-+ }
-+ template<typename _A1>
-+ void foreach(void (IndexIntf::*methodPtr)(_A1),_A1 a1)
- {
- QListIterator<IndexIntf> li(m_intfs);
- for (li.toFirst();li.current();++li) (li.current()->*methodPtr)(a1);
-- };
-- template<typename A1,typename A2,typename A3,typename A4,typename A5>
-- void foreach(void (IndexIntf::*methodPtr)(A1,A2,A3,A4,A5),A1 a1,A2 a2,A3 a3,A4 a4,A5 a5)
-+ }
-+ template<typename _A1,typename _A2,typename _A3,typename _A4,typename _A5>
-+ void foreach(void (IndexIntf::*methodPtr)(_A1,_A2,_A3,_A4,_A5),_A1 a1,_A2 a2,_A3 a3,_A4 a4,_A5 a5)
- {
- QListIterator<IndexIntf> li(m_intfs);
- for (li.toFirst();li.current();++li) (li.current()->*methodPtr)(a1,a2,a3,a4,a5);
-- };
-+ }
-
- public:
- IndexList() { m_intfs.setAutoDelete(TRUE); }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/doxygen-02-solaris-tmake-i386.diff Sat Aug 16 09:14:53 2008 +0000
@@ -0,0 +1,31 @@
+Index: trunk/tmake/lib/solaris-cc/tmake.conf
+===================================================================
+--- trunk/tmake/lib/solaris-cc/tmake.conf (revision 644)
++++ trunk/tmake/lib/solaris-cc/tmake.conf (working copy)
+@@ -11,7 +11,7 @@
+ TMAKE_CFLAGS =
+ TMAKE_CFLAGS_WARN_ON =
+ TMAKE_CFLAGS_WARN_OFF = -w
+-TMAKE_CFLAGS_RELEASE = -O
++TMAKE_CFLAGS_RELEASE = -xO4 -xspace -xstrconst -mr -xregs=no%frameptr
+ TMAKE_CFLAGS_DEBUG = -g
+ TMAKE_CFLAGS_SHLIB = -KPIC
+ TMAKE_CFLAGS_YACC =
+@@ -20,7 +20,7 @@
+ TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
+ TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
+ TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
+-TMAKE_CXXFLAGS_RELEASE = -O2
++TMAKE_CXXFLAGS_RELEASE = -xO4 -xspace -mr -xregs=no%frameptr
+ TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG
+ TMAKE_CXXFLAGS_SHLIB = -PIC
+ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC
+@@ -38,7 +38,7 @@
+ # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
+ TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib
+ TMAKE_LFLAGS =
+-TMAKE_LFLAGS_RELEASE =
++TMAKE_LFLAGS_RELEASE = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
+ TMAKE_LFLAGS_DEBUG =
+ TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1)
+ TMAKE_LFLAGS_SONAME =
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/doxygen-02-solaris-tmake-sparc.diff Sat Aug 16 09:14:53 2008 +0000
@@ -0,0 +1,31 @@
+Index: trunk/tmake/lib/solaris-cc/tmake.conf
+===================================================================
+--- trunk/tmake/lib/solaris-cc/tmake.conf (revision 644)
++++ trunk/tmake/lib/solaris-cc/tmake.conf (working copy)
+@@ -11,7 +11,7 @@
+ TMAKE_CFLAGS =
+ TMAKE_CFLAGS_WARN_ON =
+ TMAKE_CFLAGS_WARN_OFF = -w
+-TMAKE_CFLAGS_RELEASE = -O
++TMAKE_CFLAGS_RELEASE = -xO4 -xspace -xstrconst -mr
+ TMAKE_CFLAGS_DEBUG = -g
+ TMAKE_CFLAGS_SHLIB = -KPIC
+ TMAKE_CFLAGS_YACC =
+@@ -20,7 +20,7 @@
+ TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
+ TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
+ TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
+-TMAKE_CXXFLAGS_RELEASE = -O2
++TMAKE_CXXFLAGS_RELEASE = -xO4 -xspace -mr
+ TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG
+ TMAKE_CXXFLAGS_SHLIB = -PIC
+ TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC
+@@ -38,7 +38,7 @@
+ # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
+ TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib
+ TMAKE_LFLAGS =
+-TMAKE_LFLAGS_RELEASE =
++TMAKE_LFLAGS_RELEASE = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
+ TMAKE_LFLAGS_DEBUG =
+ TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1)
+ TMAKE_LFLAGS_SONAME =
--- a/patches/doxygen-03-solaris-i386.diff Sat Aug 16 00:03:02 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-diff -ur doxygen-1.5.3-orig/Makefile.in doxygen-1.5.3/Makefile.in
---- doxygen-1.5.3-orig/Makefile.in 2007-07-16 19:06:15.000000000 +0000
-+++ doxygen-1.5.3/Makefile.in 2007-07-30 00:07:16.459424949 +0000
-@@ -47,31 +47,31 @@
-
- DATE=$(shell date "+%B %Y")
-
--MAN1DIR = man/man1
-+MAN1DIR = share/man/man1
-
- install: doxywizard_install
-- $(INSTTOOL) -d $(INSTALL)/bin
-- $(INSTTOOL) -m 755 bin/doxygen $(INSTALL)/bin
-- $(INSTTOOL) -m 755 bin/doxytag $(INSTALL)/bin
-- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
-+ mkdir -p $(DESTDIR)/$(INSTALL)/bin
-+ $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
-+ $(INSTTOOL) -m 755 bin/doxytag $(DESTDIR)/$(INSTALL)/bin
-+ mkdir -p $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
- cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1
-- $(INSTTOOL) -m 644 doxygen.1 $(INSTALL)/$(MAN1DIR)/doxygen.1
-+ $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
- rm doxygen.1
- cat doc/doxytag.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1
-- $(INSTTOOL) -m 644 doxytag.1 $(INSTALL)/$(MAN1DIR)/doxytag.1
-+ $(INSTTOOL) -m 644 doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
- rm doxytag.1
- cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
-+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxywizard.1
- rm doxywizard.1
-
- install_docs:
-- $(INSTTOOL) -d $(DOCDIR)
-+ mkdir -p $(DESTDIR)/$(DOCDIR)
- $(MAKE) -C examples
- $(MAKE) -C doc
- $(MAKE) -C latex
-- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DOCDIR)
-- cp -r examples $(DOCDIR)
-- cp -r html $(DOCDIR)
-+ $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
-+ cp -r examples $(DESTDIR)/$(DOCDIR)
-+ cp -r html $(DESTDIR)/$(DOCDIR)
-
- docs: FORCE
- cd examples ; $(MAKE)
-diff -ur doxygen-1.5.3-orig/configure doxygen-1.5.3/configure
---- doxygen-1.5.3-orig/configure 2007-07-26 15:28:30.000000000 +0000
-+++ doxygen-1.5.3/configure 2007-07-30 00:09:44.262169111 +0000
-@@ -203,9 +203,9 @@
- f_platform=sunos-g++
- ;;
- SunOS:5*)
-- f_platform=solaris-g++
-+ f_platform=solaris-cc
- if test "$f_insttool" = NO; then
-- f_insttool=/usr/bin/install
-+ f_insttool=install
- fi
- ;;
- ULTRIX:*)
-@@ -329,7 +329,7 @@
- echo -n " Checking for GNU install tool... "
- if test "$f_insttool" = NO; then
- install_names="ginstall install"
-- install_dirs="/usr/bin /usr/local/bin /bin /sbin /usr/ucb $bin_dirs"
-+ install_dirs="/opt/jdsbld/bin /usr/sfw/bin /usr/bin /usr/local/bin /bin /sbin /usr/ucb $bin_dirs"
- install_prog=NO
- install_found=NO
- for i in $install_names; do
-diff -ur doxygen-1.5.3-orig/tmake/lib/solaris-cc/tmake.conf
---- doxygen-1.5.3-orig/tmake/lib/solaris-cc/tmake.conf 2006-07-21 19:54:14.000000000 +0000
-+++ doxygen-1.5.3/tmake/lib/solaris-cc/tmake.conf 2007-07-30 00:11:27.287858767 +0000
-@@ -11,7 +11,7 @@
- TMAKE_CFLAGS =
- TMAKE_CFLAGS_WARN_ON =
- TMAKE_CFLAGS_WARN_OFF = -w
--TMAKE_CFLAGS_RELEASE = -O
-+TMAKE_CFLAGS_RELEASE = -xO4 -xspace -xstrconst -mr -xregs=no%frameptr
- TMAKE_CFLAGS_DEBUG = -g
- TMAKE_CFLAGS_SHLIB = -KPIC
- TMAKE_CFLAGS_YACC =
-@@ -20,7 +20,7 @@
- TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
- TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
- TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
--TMAKE_CXXFLAGS_RELEASE = -O2
-+TMAKE_CXXFLAGS_RELEASE = -xO4 -xspace -mr -xregs=no%frameptr
- TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG
- TMAKE_CXXFLAGS_SHLIB = -PIC
- TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC
-@@ -38,7 +38,7 @@
- # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
- TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib
- TMAKE_LFLAGS =
--TMAKE_LFLAGS_RELEASE =
-+TMAKE_LFLAGS_RELEASE = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
- TMAKE_LFLAGS_DEBUG =
- TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1)
- TMAKE_LFLAGS_SONAME =
--- a/patches/doxygen-03-solaris-sparc.diff Sat Aug 16 00:03:02 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-diff -ur doxygen-1.5.3-orig/Makefile.in doxygen-1.5.3/Makefile.in
---- doxygen-1.5.3-orig/Makefile.in 2007-07-16 19:06:15.000000000 +0000
-+++ doxygen-1.5.3/Makefile.in 2007-07-30 00:07:16.459424949 +0000
-@@ -47,31 +47,31 @@
-
- DATE=$(shell date "+%B %Y")
-
--MAN1DIR = man/man1
-+MAN1DIR = share/man/man1
-
- install: doxywizard_install
-- $(INSTTOOL) -d $(INSTALL)/bin
-- $(INSTTOOL) -m 755 bin/doxygen $(INSTALL)/bin
-- $(INSTTOOL) -m 755 bin/doxytag $(INSTALL)/bin
-- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
-+ mkdir -p $(DESTDIR)/$(INSTALL)/bin
-+ $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
-+ $(INSTTOOL) -m 755 bin/doxytag $(DESTDIR)/$(INSTALL)/bin
-+ mkdir -p $(DESTDIR)/$(INSTALL)/$(MAN1DIR)
- cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxygen.1
-- $(INSTTOOL) -m 644 doxygen.1 $(INSTALL)/$(MAN1DIR)/doxygen.1
-+ $(INSTTOOL) -m 644 doxygen.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxygen.1
- rm doxygen.1
- cat doc/doxytag.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxytag.1
-- $(INSTTOOL) -m 644 doxytag.1 $(INSTALL)/$(MAN1DIR)/doxytag.1
-+ $(INSTTOOL) -m 644 doxytag.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxytag.1
- rm doxytag.1
- cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1
-- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1
-+ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)/$(INSTALL)/$(MAN1DIR)/doxywizard.1
- rm doxywizard.1
-
- install_docs:
-- $(INSTTOOL) -d $(DOCDIR)
-+ mkdir -p $(DESTDIR)/$(DOCDIR)
- $(MAKE) -C examples
- $(MAKE) -C doc
- $(MAKE) -C latex
-- $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DOCDIR)
-- cp -r examples $(DOCDIR)
-- cp -r html $(DOCDIR)
-+ $(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR)
-+ cp -r examples $(DESTDIR)/$(DOCDIR)
-+ cp -r html $(DESTDIR)/$(DOCDIR)
-
- docs: FORCE
- cd examples ; $(MAKE)
-diff -ur doxygen-1.5.3-orig/configure doxygen-1.5.3/configure
---- doxygen-1.5.3-orig/configure 2007-07-26 15:28:30.000000000 +0000
-+++ doxygen-1.5.3/configure 2007-07-30 00:09:44.262169111 +0000
-@@ -203,9 +203,9 @@
- f_platform=sunos-g++
- ;;
- SunOS:5*)
-- f_platform=solaris-g++
-+ f_platform=solaris-cc
- if test "$f_insttool" = NO; then
-- f_insttool=/usr/bin/install
-+ f_insttool=install
- fi
- ;;
- ULTRIX:*)
-@@ -329,7 +329,7 @@
- echo -n " Checking for GNU install tool... "
- if test "$f_insttool" = NO; then
- install_names="ginstall install"
-- install_dirs="/usr/bin /usr/local/bin /bin /sbin /usr/ucb $bin_dirs"
-+ install_dirs="/opt/jdsbld/bin /usr/sfw/bin /usr/bin /usr/local/bin /bin /sbin /usr/ucb $bin_dirs"
- install_prog=NO
- install_found=NO
- for i in $install_names; do
-diff -ur doxygen-1.5.3-orig/tmake/lib/solaris-cc/tmake.conf
---- doxygen-1.5.3-orig/tmake/lib/solaris-cc/tmake.conf 2006-07-21 19:54:14.000000000 +0000
-+++ doxygen-1.5.3/tmake/lib/solaris-cc/tmake.conf 2007-07-30 00:11:27.287858767 +0000
-@@ -11,7 +11,7 @@
- TMAKE_CFLAGS =
- TMAKE_CFLAGS_WARN_ON =
- TMAKE_CFLAGS_WARN_OFF = -w
--TMAKE_CFLAGS_RELEASE = -O
-+TMAKE_CFLAGS_RELEASE = -xO4 -xspace -xstrconst -mr
- TMAKE_CFLAGS_DEBUG = -g
- TMAKE_CFLAGS_SHLIB = -KPIC
- TMAKE_CFLAGS_YACC =
-@@ -20,7 +20,7 @@
- TMAKE_CXXFLAGS = $$TMAKE_CFLAGS
- TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON
- TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF
--TMAKE_CXXFLAGS_RELEASE = -O2
-+TMAKE_CXXFLAGS_RELEASE = -xO4 -xspace -mr
- TMAKE_CXXFLAGS_DEBUG = $$TMAKE_CFLAGS_DEBUG
- TMAKE_CXXFLAGS_SHLIB = -PIC
- TMAKE_CXXFLAGS_YACC = $$TMAKE_CFLAGS_YACC
-@@ -38,7 +38,7 @@
- # Jan Wortelboer <[email protected]> suggests avoiding $LD_LIBRARY_PATH:
- TMAKE_LINK_SHLIB = CC -R$(QTDIR)/lib:/usr/openwin/lib
- TMAKE_LFLAGS =
--TMAKE_LFLAGS_RELEASE =
-+TMAKE_LFLAGS_RELEASE = -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect
- TMAKE_LFLAGS_DEBUG =
- TMAKE_LFLAGS_SHLIB = -G -h $(TARGET1)
- TMAKE_LFLAGS_SONAME =
--- a/patches/doxygen-04-tmake-g++.diff Sat Aug 16 00:03:02 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- doxygen-1.5.4/tmake/lib/solaris-g++/tmake.conf.orig 2008-01-18 13:36:59.690049000 +0530
-+++ doxygen-1.5.4/tmake/lib/solaris-g++/tmake.conf 2008-01-18 13:38:16.873357000 +0530
-@@ -43,7 +43,7 @@
- TMAKE_LFLAGS_SHLIB = -shared -h $(TARGET1)
- TMAKE_LFLAGS_SONAME =
-
--TMAKE_LIBS = -liconv
-+TMAKE_LIBS = -L/usr/gnu/lib -R/usr/gnu/lib -liconv
- TMAKE_LIBS_X11 = -lXext -lX11 -lm
- TMAKE_LIBS_QT = -lqt
- TMAKE_LIBS_QT_MT = -lqt-mt