diff options
| author | dsainty <dsainty@pkgsrc.org> | 2006-10-31 20:06:57 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2006-10-31 20:06:57 +0000 |
| commit | 86a87c21bcf73fac299b6d9c702cdcabf51c3449 (patch) | |
| tree | 7ba87e9a3b5e713a91655d33a5e781c5c2a6187a /devel | |
| parent | 86d00754b497da9df6373d3665e1234f328cb17c (diff) | |
| download | pkgsrc-86a87c21bcf73fac299b6d9c702cdcabf51c3449.tar.gz | |
Re-do the Solaris install_docs fix in a different way, based on the
solution described on Doxygen's Bugzilla:
http://bugzilla.gnome.org/show_bug.cgi?id=366119
Tested on NetBSD, Solaris and SUSE Linux.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/doxygen/distinfo | 4 | ||||
| -rw-r--r-- | devel/doxygen/patches/patch-ab | 44 |
2 files changed, 34 insertions, 14 deletions
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo index 9914408c994..48be130ed28 100644 --- a/devel/doxygen/distinfo +++ b/devel/doxygen/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.26 2006/10/29 07:51:28 dsainty Exp $ +$NetBSD: distinfo,v 1.27 2006/10/31 20:06:57 dsainty Exp $ SHA1 (doxygen-1.4.7.src.tar.gz) = 42a33d676fbd471165d02f531bfe98f433ecb432 RMD160 (doxygen-1.4.7.src.tar.gz) = 4de02b866cef53a7fd6f54e0ba90111814a9d77a Size (doxygen-1.4.7.src.tar.gz) = 2928354 bytes SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a -SHA1 (patch-ab) = 13d2c5b2110765005e9022a970a947db874fc9d4 +SHA1 (patch-ab) = 70ce109f41f0952eaa1fa08cb02c48d7f38a32af SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974 SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15 diff --git a/devel/doxygen/patches/patch-ab b/devel/doxygen/patches/patch-ab index e72be3fba29..1c21d69d1fe 100644 --- a/devel/doxygen/patches/patch-ab +++ b/devel/doxygen/patches/patch-ab @@ -1,8 +1,12 @@ -$NetBSD: patch-ab,v 1.7 2006/10/28 03:18:58 dsainty Exp $ +$NetBSD: patch-ab,v 1.8 2006/10/31 20:06:57 dsainty Exp $ -The "cp -r doc" may by chance copy language.doc with an older -modification timestamp than some of its dependencies. Use -gmake's --assume-new to avoid this being a problem. +install_docs: + + The "cp -r doc" may by chance copy language.doc with an older modification + timestamp than some of its dependencies. The replacement rule is the + intended solution presented on: + + http://bugzilla.gnome.org/show_bug.cgi?id=366119 --- Makefile.in.orig 2005-11-21 07:05:07.000000000 +1300 +++ Makefile.in 2006-10-27 12:35:47.484445000 +1300 @@ -17,12 +21,28 @@ gmake's --assume-new to avoid this being a problem. $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) cat doc/doxygen.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxygen.1 ; \ cat doc/doxytag.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxytag.1 ; \ -@@ -67,7 +67,7 @@ - echo "PERL = $(PERL)" >> $(DOCDIR)/doc/Makefile - cat doc/Makefile.in >> $(DOCDIR)/doc/Makefile - cd $(DOCDIR)/examples ; $(MAKE) +@@ -59,19 +59,12 @@ + + install_docs: + $(INSTTOOL) -d $(DOCDIR) +- cp -r doc $(DOCDIR) ++ $(MAKE) -C examples ++ $(MAKE) -C doc ++ $(MAKE) -C latex ++ cp latex/doxygen_manual.pdf $(DOCDIR) + cp -r examples $(DOCDIR) +- echo "DOXYGEN = $(INSTALL)" > $(DOCDIR)/doc/Makefile +- echo "DOXYDOCS = .." >> $(DOCDIR)/doc/Makefile +- echo "VERSION = $(VERSION)" >> $(DOCDIR)/doc/Makefile +- echo "PERL = $(PERL)" >> $(DOCDIR)/doc/Makefile +- cat doc/Makefile.in >> $(DOCDIR)/doc/Makefile +- cd $(DOCDIR)/examples ; $(MAKE) - cd $(DOCDIR)/doc ; $(MAKE) -+ cd $(DOCDIR)/doc ; $(MAKE) --assume-new=language.doc - rm -rf $(DOCDIR)/doc - cd $(DOCDIR)/latex ; $(MAKE) - cp $(DOCDIR)/latex/doxygen_manual.pdf $(DOCDIR) +- rm -rf $(DOCDIR)/doc +- cd $(DOCDIR)/latex ; $(MAKE) +- cp $(DOCDIR)/latex/doxygen_manual.pdf $(DOCDIR) +- rm -rf $(DOCDIR)/latex ++ cp -r html $(DOCDIR) + + docs: FORCE + cd examples ; $(MAKE) |