pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/doxygen Add DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/fb076ba70769
branches:  trunk
changeset: 533682:fb076ba70769
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Sep 23 17:49:08 2007 +0000

description:
Add DESTDIR support.

diffstat:

 devel/doxygen/Makefile         |   9 ++++---
 devel/doxygen/distinfo         |   4 +-
 devel/doxygen/patches/patch-ab |  44 ++++++++++++++++++++++++-----------------
 3 files changed, 33 insertions(+), 24 deletions(-)

diffs (125 lines):

diff -r 3f28b4b8f787 -r fb076ba70769 devel/doxygen/Makefile
--- a/devel/doxygen/Makefile    Sun Sep 23 17:17:12 2007 +0000
+++ b/devel/doxygen/Makefile    Sun Sep 23 17:49:08 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2007/01/20 14:26:58 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2007/09/23 17:49:08 joerg Exp $
 
 DISTNAME=      doxygen-1.5.1.src
 PKGNAME=       doxygen-1.5.1
@@ -11,6 +11,8 @@
 HOMEPAGE=      http://www.doxygen.org/
 COMMENT=       Documentation system for C++, Java, IDL and C
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 TEX_ACCEPTED=  teTeX3
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=            gmake gs:run perl:run flex
@@ -42,6 +44,8 @@
 SUBST_FILES.perlbin=   examples/tag.cfg
 SUBST_SED.perlbin=     -e 's,^PERL_PATH.*,PERL_PATH = ${PERL5},'
 
+INSTALL_TARGET=                install install_docs
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "DragonFly"
@@ -51,9 +55,6 @@
 post-patch:
        touch ${WRKSRC}/src/doxytag.l
 
-post-install:
-       cd ${WRKSRC} && gmake install_docs
-
 BUILDLINK_API_DEPENDS.graphviz+=       graphviz>=2.12nb1
 
 .include "../../graphics/graphviz/buildlink3.mk"
diff -r 3f28b4b8f787 -r fb076ba70769 devel/doxygen/distinfo
--- a/devel/doxygen/distinfo    Sun Sep 23 17:17:12 2007 +0000
+++ b/devel/doxygen/distinfo    Sun Sep 23 17:49:08 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.28 2007/01/08 12:20:24 adam Exp $
+$NetBSD: distinfo,v 1.29 2007/09/23 17:49:08 joerg Exp $
 
 SHA1 (doxygen-1.5.1.src.tar.gz) = eac525c670ef3f1f81c3038588b42e111a9ec6a6
 RMD160 (doxygen-1.5.1.src.tar.gz) = bacd34a5a69833e42e116d997c99df03dd837062
 Size (doxygen-1.5.1.src.tar.gz) = 2888159 bytes
 SHA1 (patch-aa) = dd970fa86865ee1eca0d41a86366a608e19b582a
-SHA1 (patch-ab) = 70ce109f41f0952eaa1fa08cb02c48d7f38a32af
+SHA1 (patch-ab) = e5e186f792180de45ac2bb3aeffca4e33473b65a
 SHA1 (patch-ac) = 5523e5b146436a50b008f963a0b809379a9e4974
 SHA1 (patch-af) = b52845ca3d4d58a876538e8b4780a19419aabe75
 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
diff -r 3f28b4b8f787 -r fb076ba70769 devel/doxygen/patches/patch-ab
--- a/devel/doxygen/patches/patch-ab    Sun Sep 23 17:17:12 2007 +0000
+++ b/devel/doxygen/patches/patch-ab    Sun Sep 23 17:49:08 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2006/10/31 20:06:57 dsainty Exp $
+$NetBSD: patch-ab,v 1.9 2007/09/23 17:49:08 joerg Exp $
 
 install_docs:
 
@@ -8,29 +8,31 @@
 
   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
-@@ -50,8 +50,8 @@
+--- Makefile.in.orig   2006-10-19 20:28:46.000000000 +0200
++++ Makefile.in
+@@ -50,29 +50,22 @@ DATE=$(shell date "+%B %Y")
+ MAN1DIR = man/man1
  
  install: doxywizard_install 
-       $(INSTTOOL) -d $(INSTALL)/bin
+-      $(INSTTOOL) -d $(INSTALL)/bin
 -      $(INSTTOOL) -m 755 bin/doxygen    $(INSTALL)/bin
 -      $(INSTTOOL) -m 755 bin/doxytag    $(INSTALL)/bin
-+      $(INSTTOOL) -c -m 755 bin/doxygen    $(INSTALL)/bin
-+      $(INSTTOOL) -c -m 755 bin/doxytag    $(INSTALL)/bin
-       $(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 ; \
-@@ -59,19 +59,12 @@
+-      $(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 ; \
+-      cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > $(INSTALL)/$(MAN1DIR)/doxywizard.1 ;
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(INSTALL)/bin
++      $(BSD_INSTALL_PROGRAM) bin/doxygen ${DESTDIR}$(INSTALL)/bin
++      $(BSD_INSTALL_PROGRAM) bin/doxytag ${DESTDIR}$(INSTALL)/bin
++      $(BSD_INSTALL_MAN_DIR) ${DESTDIR}$(INSTALL)/$(MAN1DIR)
++      cat doc/doxygen.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxygen.1
++      cat doc/doxytag.1    | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxytag.1
++      cat doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > ${DESTDIR}$(INSTALL)/$(MAN1DIR)/doxywizard.1
  
  install_docs: 
-       $(INSTTOOL) -d $(DOCDIR)
+-      $(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)
+-      cp -r examples $(DOCDIR)
 -      echo "DOXYGEN  = $(INSTALL)" >  $(DOCDIR)/doc/Makefile
 -      echo "DOXYDOCS = .."         >> $(DOCDIR)/doc/Makefile
 -      echo "VERSION  = $(VERSION)" >> $(DOCDIR)/doc/Makefile
@@ -42,7 +44,13 @@
 -      cd $(DOCDIR)/latex ; $(MAKE)
 -      cp $(DOCDIR)/latex/doxygen_manual.pdf $(DOCDIR)
 -      rm -rf $(DOCDIR)/latex
-+      cp -r html $(DOCDIR)
++      $(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(DOCDIR)
++      $(MAKE) -C examples
++      $(MAKE) -C doc 
++      $(MAKE) -C latex 
++      cp latex/doxygen_manual.pdf ${DESTDIR}$(DOCDIR)
++      cp -r examples ${DESTDIR}$(DOCDIR)
++      cp -r html ${DESTDIR}$(DOCDIR)
  
  docs: FORCE
        cd examples ; $(MAKE)



Home | Main Index | Thread Index | Old Index