diff options
author | asau <asau@pkgsrc.org> | 2013-08-06 19:57:42 +0000 |
---|---|---|
committer | asau <asau@pkgsrc.org> | 2013-08-06 19:57:42 +0000 |
commit | ec9ddcb954ace8ecc87ca77535ca1909c98da917 (patch) | |
tree | 37c4ac743c558b189b78e614d1b70ca8cd68546a /lang | |
parent | 7c0780122c930faa88078bccedf2a4c54eb0adf5 (diff) | |
download | pkgsrc-ec9ddcb954ace8ecc87ca77535ca1909c98da917.tar.gz |
Fix staged installation.
Pass installation directories to configure script.
Don't install manual twice into different directories.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/scheme48/Makefile | 18 | ||||
-rw-r--r-- | lang/scheme48/PLIST | 26 | ||||
-rw-r--r-- | lang/scheme48/distinfo | 3 | ||||
-rw-r--r-- | lang/scheme48/patches/patch-Makefile.in | 34 |
4 files changed, 43 insertions, 38 deletions
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile index 4ca771a0d92..0ea950b4795 100644 --- a/lang/scheme48/Makefile +++ b/lang/scheme48/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.36 2013/07/02 13:57:22 wen Exp $ +# $NetBSD: Makefile,v 1.37 2013/08/06 19:57:42 asau Exp $ DISTNAME= scheme48-1.9 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://s48.org/1.9/ EXTRACT_SUFX= .tgz @@ -14,19 +15,17 @@ NOT_FOR_PLATFORM= *-*-alpha # *severe* problems. Bus error, alignment MAKE_JOBS_SAFE= no -INSTALLATION_DIRS+= share/doc/${PKGNAME_NOREV} -INSTALLATION_DIRS+= share/doc/${PKGNAME_NOREV}/html - # bin/scheme-r5rs CONFLICTS+= gambc-[0-9]* GNU_CONFIGURE= yes +CONFIGURE_ARGS= --docdir=${PREFIX}/share/doc/${PKGNAME_NOREV} \ + --htmldir=${PREFIX}/share/doc/${PKGNAME_NOREV}/html \ + --mandir=${PREFIX}/${PKGMANDIR} USE_TOOLS= gmake BUILD_TARGET= enough TEST_TARGET= check # fail if USER == root directory owner -MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}/man1 - REPLACE_INTERPRETER+= scheme REPLACE.scheme.old= .*/bin/env scheme-srfi-7 REPLACE.scheme.new= ${PREFIX}/bin/scheme-srfi-7 @@ -41,12 +40,5 @@ SUBST_MESSAGE.pthr= Hardcoding -pthread in CFLAGS and LDFLAGS SUBST_SED.pthr= -e 's,pthreads_done=\"no\",pthreads_done=\"yes\"; CFLAGS=\"$$CFLAGS -pthread\"; LDFLAGS=\"$$LDFLAGS -pthread\",' .endif -post-install: - cd ${WRKSRC}/doc && ${INSTALL_DATA} *.txt *.ps \ - ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} - ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} - ${INSTALL_DATA} ${WRKSRC}/doc/html/* \ - ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}/html - .include "../../devel/sysexits/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/scheme48/PLIST b/lang/scheme48/PLIST index ed545e31d40..682abadbeed 100644 --- a/lang/scheme48/PLIST +++ b/lang/scheme48/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2013/07/02 13:57:22 wen Exp $ +@comment $NetBSD: PLIST,v 1.8 2013/08/06 19:57:42 asau Exp $ bin/scheme-r5rs bin/scheme-srfi-7 bin/scheme48 @@ -16,23 +16,7 @@ lib/${PKGNAME}/scheme48.image lib/${PKGNAME}/scheme48vm lib/${PKGNAME}/srfi-27.so man/man1/scheme48.1 -share/doc/manual-Z-G-D-1.gif -share/doc/manual-Z-H-1.html -share/doc/manual-Z-H-10.html -share/doc/manual-Z-H-11.html -share/doc/manual-Z-H-2.html -share/doc/manual-Z-H-3.html -share/doc/manual-Z-H-4.html -share/doc/manual-Z-H-5.html -share/doc/manual-Z-H-6.html -share/doc/manual-Z-H-7.html -share/doc/manual-Z-H-8.html -share/doc/manual-Z-H-9.html -share/doc/manual-Z-S.css -share/doc/manual.html share/doc/${PKGNAME}/COPYING -share/doc/${PKGNAME}/deriving.txt -share/doc/${PKGNAME}/hacking.txt share/doc/${PKGNAME}/html/manual-Z-G-D-1.gif share/doc/${PKGNAME}/html/manual-Z-H-1.html share/doc/${PKGNAME}/html/manual-Z-H-10.html @@ -48,14 +32,8 @@ share/doc/${PKGNAME}/html/manual-Z-H-9.html share/doc/${PKGNAME}/html/manual-Z-S.css share/doc/${PKGNAME}/html/manual.html share/doc/${PKGNAME}/html/unicode-Z-G-1.gif -share/doc/${PKGNAME}/install.txt -share/doc/${PKGNAME}/io.txt +share/doc/${PKGNAME}/manual.pdf share/doc/${PKGNAME}/manual.ps -share/doc/${PKGNAME}/news.txt -share/doc/${PKGNAME}/no-leaf-env.txt -share/doc/${PKGNAME}/todo.txt -share/doc/${PKGNAME}/type.txt -share/doc/unicode-Z-G-1.gif share/${PKGNAME}/big/array.scm share/${PKGNAME}/big/big-util.scm share/${PKGNAME}/big/callback.scm diff --git a/lang/scheme48/distinfo b/lang/scheme48/distinfo index 86d7b64664f..b7183882dc0 100644 --- a/lang/scheme48/distinfo +++ b/lang/scheme48/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.9 2013/07/02 13:57:22 wen Exp $ +$NetBSD: distinfo,v 1.10 2013/08/06 19:57:42 asau Exp $ SHA1 (scheme48-1.9.tgz) = 8fd78d328a8c39ecd848e849ade094c30c2bb4ba RMD160 (scheme48-1.9.tgz) = 273f7de5d3775d80e91e8e8876e0d1328320d9e2 Size (scheme48-1.9.tgz) = 3945425 bytes +SHA1 (patch-Makefile.in) = 0bebb77ceac6785476ec0ad7b3ddd2744e74b11c diff --git a/lang/scheme48/patches/patch-Makefile.in b/lang/scheme48/patches/patch-Makefile.in new file mode 100644 index 00000000000..6ddb5551813 --- /dev/null +++ b/lang/scheme48/patches/patch-Makefile.in @@ -0,0 +1,34 @@ +$NetBSD: patch-Makefile.in,v 1.1 2013/08/06 19:57:42 asau Exp $ + +--- Makefile.in.orig 2012-12-27 16:46:24.000000000 +0000 ++++ Makefile.in +@@ -47,6 +47,7 @@ mandir = @mandir@/man$(manext) + docdir = @docdir@ + datarootdir = @datarootdir@ + datadir = @datadir@ ++htmldir = @htmldir@ + + DYNAMIC_EXTERNALS_CFLAGS=@DYNAMIC_EXTERNALS_CFLAGS@ + DYNAMIC_EXTERNALS_LDFLAGS=@DYNAMIC_EXTERNALS_LDFLAGS@ +@@ -533,15 +534,15 @@ install-no-doc: enough dirs + $(INSTALL_PROGRAM) $(EXTERNALS) $(DESTDIR)$(LIB)/ + # install the documentation + $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) +- $(INSTALL_DATA) $(srcdir)/COPYING $(docdir) ++ $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir) + + install-doc: dirs doc +- $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) +- $(INSTALL_DATA) $(srcdir)/COPYING $(docdir) +- $(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(docdir) +- $(INSTALL_DATA) $(srcdir)/doc/manual.ps $(docdir) ++ $(srcdir)/mkinstalldirs $(DESTDIR)$(docdir) $(DESTDIR)$(htmldir) ++ $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(docdir) ++ $(INSTALL_DATA) $(srcdir)/doc/manual.pdf $(DESTDIR)$(docdir) ++ $(INSTALL_DATA) $(srcdir)/doc/manual.ps $(DESTDIR)$(docdir) + for f in $(srcdir)/doc/html/*; do \ +- $(INSTALL_DATA) $$f $(DESTDIR)$(docdir) || exit 1; \ ++ $(INSTALL_DATA) $$f $(DESTDIR)$(htmldir) || exit 1; \ + done + + # Script to run scheme48 in this directory. |