pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc Add convenience meta-pkg "pkgsrc-guide-tools-1.0", wit...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2d34828436c
branches:  trunk
changeset: 502167:e2d34828436c
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Nov 03 01:57:15 2005 +0000

description:
Add convenience meta-pkg "pkgsrc-guide-tools-1.0", with runtime
dependencies on the tools used to build doc/guide.  doc/guide still uses
BUILD_DEPENDS on the tools (so that it's still possible to build for
certain output types with minimal dependencies); it does not depend on
the meta-pkg.

diffstat:

 doc/guide/Makefile                    |  33 ++++++--------------------
 doc/guide/Makefile.common             |  42 +++++++++++++++++++++++++++++++++++
 meta-pkgs/Makefile                    |   3 +-
 meta-pkgs/pkgsrc-guide-tools/DESCR    |   2 +
 meta-pkgs/pkgsrc-guide-tools/Makefile |  24 ++++++++++++++++++++
 meta-pkgs/pkgsrc-guide-tools/PLIST    |   1 +
 6 files changed, 79 insertions(+), 26 deletions(-)

diffs (153 lines):

diff -r d9b89c035501 -r e2d34828436c doc/guide/Makefile
--- a/doc/guide/Makefile        Thu Nov 03 01:56:45 2005 +0000
+++ b/doc/guide/Makefile        Thu Nov 03 01:57:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/07 12:14:26 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/03 01:57:15 tv Exp $
 #
 
 DISTNAME=              htdocs-share-20050727
@@ -31,34 +31,17 @@
 BUILD_DEFS+=           OUTPUTS
 OUTPUTS?=              lint html html-split ascii pdf
 
+.if defined(OUTPUTS)
+.  if !empty(OUTPUTS:Mascii)
 # the html is needed to build the ascii version.
-.if !empty(OUTPUTS:Mascii)
 OUTPUTS+=              html
+.  endif
+
+# only override the Makefile.common default if it is explicitly set
+_GUIDE_OUTPUTS=                ${OUTPUTS}
 .endif
 
-# html output
-BUILD_DEPENDS+=                docbook>=4.0:../../textproc/docbook
-BUILD_DEPENDS+=                docbook-xml>=4.0:../../textproc/docbook-xml
-BUILD_DEPENDS+=                docbook-xsl>=1.62.4:../../textproc/docbook-xsl
-BUILD_DEPENDS+=                dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
-BUILD_DEPENDS+=                opensp>=1.5:../../textproc/opensp
-BUILD_DEPENDS+=                libxslt>=1.0.30:../../textproc/libxslt
-
-.if !empty(OUTPUTS:Mhtml*)
-BUILD_DEPENDS+=                tidy>=20021108:../../www/tidy
-.endif
-
-.if !empty(OUTPUTS:Mascii)
-BUILD_DEPENDS+=                w3m>=0.4:../../www/w3m
-.endif
-
-.if !empty(OUTPUTS:Mps) || !empty(OUTPUTS:Mpdf)
-BUILD_DEPENDS+=                openjade>=1.3.2:../../textproc/openjade
-BUILD_DEPENDS+=                tex-jadetex>=3.13:../../print/tex-jadetex
-USE_GHOSTSCRIPT=       build
-GHOSTSCRIPT_REQD=      7.05
-.  include "../../mk/ghostscript.mk"
-.endif
+.include "Makefile.common"
 
 pre-extract:
        ${MKDIR} ${WRKSRC}
diff -r d9b89c035501 -r e2d34828436c doc/guide/Makefile.common
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/guide/Makefile.common Thu Nov 03 01:57:15 2005 +0000
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile.common,v 1.1 2005/11/03 01:57:15 tv Exp $
+#
+# This is included by doc/guide and meta-pkgs/pkgsrc-guide-tools.
+#
+# Because the outputs are configurable, this functions as a build-time
+# dependency in doc/guide (customized to the desired output types),
+# and a runtime dependency in meta-pkgs/pkgsrc-guide-tools (depending
+# on all possible output tools).
+#
+
+_GUIDE_DEPTYPE?=       build
+_GUIDE_OUTPUTS?=       lint html html-split ascii pdf
+
+# html output
+_GUIDE_DEPENDS+=       docbook>=4.0:../../textproc/docbook
+_GUIDE_DEPENDS+=       docbook-xml>=4.0:../../textproc/docbook-xml
+_GUIDE_DEPENDS+=       docbook-xsl>=1.62.4:../../textproc/docbook-xsl
+_GUIDE_DEPENDS+=       dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
+_GUIDE_DEPENDS+=       opensp>=1.5:../../textproc/opensp
+_GUIDE_DEPENDS+=       libxslt>=1.0.30:../../textproc/libxslt
+
+.if !empty(_GUIDE_OUTPUTS:Mhtml*)
+_GUIDE_DEPENDS+=       tidy>=20021108:../../www/tidy
+.endif
+
+.if !empty(_GUIDE_OUTPUTS:Mascii)
+_GUIDE_DEPENDS+=       w3m>=0.4:../../www/w3m
+.endif
+
+.if !empty(_GUIDE_OUTPUTS:Mps) || !empty(_GUIDE_OUTPUTS:Mpdf)
+_GUIDE_DEPENDS+=       openjade>=1.3.2:../../textproc/openjade
+_GUIDE_DEPENDS+=       tex-jadetex>=3.13:../../print/tex-jadetex
+USE_GHOSTSCRIPT?=      ${_GUIDE_DEPTYPE}
+GHOSTSCRIPT_REQD=      7.05
+.  include "../../mk/ghostscript.mk"
+.endif
+
+.if ${_GUIDE_DEPTYPE} == "run"
+DEPENDS+=              ${_GUIDE_DEPENDS}
+.else
+BUILD_DEPENDS+=                ${_GUIDE_DEPENDS}
+.endif
diff -r d9b89c035501 -r e2d34828436c meta-pkgs/Makefile
--- a/meta-pkgs/Makefile        Thu Nov 03 01:56:45 2005 +0000
+++ b/meta-pkgs/Makefile        Thu Nov 03 01:57:15 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/07 22:52:21 wulf Exp $
+# $NetBSD: Makefile,v 1.29 2005/11/03 01:57:15 tv Exp $
 #
 
 COMMENT=       Collections of other packages
@@ -18,6 +18,7 @@
 SUBDIR+=       netbsd-www
 SUBDIR+=       php4-extensions
 SUBDIR+=       php5-extensions
+SUBDIR+=       pkgsrc-guide-tools
 SUBDIR+=       suse9
 SUBDIR+=       web-server
 SUBDIR+=       windowmaker-desktop
diff -r d9b89c035501 -r e2d34828436c meta-pkgs/pkgsrc-guide-tools/DESCR
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/pkgsrc-guide-tools/DESCR        Thu Nov 03 01:57:15 2005 +0000
@@ -0,0 +1,2 @@
+Meta-package that includes all packages needed for converting
+the XML-based pkgsrc/doc/guide to published formats.
diff -r d9b89c035501 -r e2d34828436c meta-pkgs/pkgsrc-guide-tools/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/pkgsrc-guide-tools/Makefile     Thu Nov 03 01:57:15 2005 +0000
@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.1 2005/11/03 01:57:15 tv Exp $
+#
+
+DISTNAME=      pkgsrc-guide-tools-1.0
+CATEGORIES=    meta-pkgs
+MASTER_SITES=  # empty
+DISTFILES=     # empty
+
+MAINTAINER=    tv%NetBSD.org@localhost
+COMMENT=       Packages required to build the pkgsrc Guide
+
+_GUIDE_DEPTYPE=        run
+
+.include "../../doc/guide/Makefile.common"
+
+NO_CHECKSUM=   yes
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+NO_MTREE=      yes
+
+do-install:
+       @${DO_NADA}
+
+.include "../../mk/bsd.pkg.mk"
diff -r d9b89c035501 -r e2d34828436c meta-pkgs/pkgsrc-guide-tools/PLIST
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/meta-pkgs/pkgsrc-guide-tools/PLIST        Thu Nov 03 01:57:15 2005 +0000
@@ -0,0 +1,1 @@
+@comment $NetBSD: PLIST,v 1.1 2005/11/03 01:57:15 tv Exp $



Home | Main Index | Thread Index | Old Index