diff options
| author | jlam <jlam> | 2006-04-04 17:16:28 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-04-04 17:16:28 +0000 |
| commit | a50b631f196f6dd3a0c41b1a41c2e7d02dc5dbba (patch) | |
| tree | 3d9bf389bf8efd58349c55f05b9b98697c7a18c6 | |
| parent | 33b0edccce7b0c1be36a582d34ce65bfd25c3b60 (diff) | |
| download | pkgsrc-a50b631f196f6dd3a0c41b1a41c2e7d02dc5dbba.tar.gz | |
* Honor PKGINFODIR and PKGMANDIR.
* Simplify the PLIST generation by just using PLIST_SUBST instead of
a post-build target.
| -rw-r--r-- | lang/gforth/Makefile | 30 | ||||
| -rw-r--r-- | lang/gforth/PLIST | 21 |
2 files changed, 19 insertions, 32 deletions
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile index 5eff2618803..3ef19e1eb9e 100644 --- a/lang/gforth/Makefile +++ b/lang/gforth/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:13 tv Exp $ +# $NetBSD: Makefile,v 1.22 2006/04/04 17:16:28 jlam Exp $ DISTNAME= gforth-0.6.2 -PKGREVISION= 1 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gforth/} MASTER_SITES+= http://www.complang.tuwien.ac.at/forth/gforth/ @@ -17,26 +17,30 @@ GNU_CONFIGURE= YES # Make sure elisp will be installed even if no emacs installed. CONFIGURE_ENV+= EMACS=${PREFIX}/bin/emacs CFLAGS+= -Dunix -INFO_FILES= gforth.info vmgen.info - -PLIST_SRC= ${WRKDIR}/PLIST +INFO_FILES= # PLIST +INSTALL_MAKE_FLAGS= infodir=${PREFIX:Q}/${PKGINFODIR:Q} \ + mandir=${PREFIX:Q}/${PKGMANDIR:Q} TEST_TARGET= test # Kernel image filename is arch dependent -KERNEL_FI= `cd ${WRKSRC} && (${ECHO} 'prkern:'; ${ECHO} ' @${ECHO} $$(kernel_fi)'; ${ECHO}; ${CAT} Makefile) | ${MAKE} -f - prkern` +KERNEL_FI_cmd= \ + if ${TEST} ! -f ${WRKSRC}/Makefile; then \ + ${ECHO} "__nonexistent__"; \ + exit 0; \ + fi; \ + cd ${WRKSRC} && \ + { ${ECHO} 'prkern:'; \ + ${ECHO} ' @${ECHO} $$(kernel_fi)'; \ + ${ECHO} ; \ + ${CAT} Makefile; } | ${MAKE_PROGRAM} -f - prkern +PLIST_SUBST+= KERNEL_FI=${KERNEL_FI_cmd:sh:Q} # XXX Need test. #.include "../../mk/dlopen.buildlink3.mk" - -post-build: - @${ECHO}; ${ECHO} building PLIST... - @k=${KERNEL_FI} && ${ECHO} "using kernel image: $$k" && \ - ${SED} -e "s/@KERNEL_FI@/$$k/g" <${PKGDIR}/PLIST >${PLIST_SRC} +.include "../../devel/ffcall/buildlink3.mk" pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp -.include "../../devel/ffcall/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/lang/gforth/PLIST b/lang/gforth/PLIST index 8f507b99861..58d380d74de 100644 --- a/lang/gforth/PLIST +++ b/lang/gforth/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2003/12/05 00:26:38 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.8 2006/04/04 17:16:28 jlam Exp $ bin/gforth bin/${PKGNAME} bin/gforth-fast @@ -10,24 +10,7 @@ bin/gforthmi-${PKGVERSION} bin/vmgen bin/vmgen-${PKGVERSION} info/gforth.info -info/gforth.info-1 -info/gforth.info-10 -info/gforth.info-11 -info/gforth.info-12 -info/gforth.info-13 -info/gforth.info-14 -info/gforth.info-15 -info/gforth.info-2 -info/gforth.info-3 -info/gforth.info-4 -info/gforth.info-5 -info/gforth.info-6 -info/gforth.info-7 -info/gforth.info-8 -info/gforth.info-9 info/vmgen.info -info/vmgen.info-1 -info/vmgen.info-2 lib/gforth/${PKGVERSION}/gforth-ditc lib/gforth/${PKGVERSION}/gforth.fi man/man1/gforth.1 @@ -136,7 +119,7 @@ share/gforth/${PKGVERSION}/kernel/saccept.fs share/gforth/${PKGVERSION}/kernel/tools.fs share/gforth/${PKGVERSION}/kernel/toolsext.fs share/gforth/${PKGVERSION}/kernel/vars.fs -share/gforth/${PKGVERSION}/@KERNEL_FI@ +share/gforth/${PKGVERSION}/${KERNEL_FI} share/gforth/${PKGVERSION}/lib.fs share/gforth/${PKGVERSION}/locals.fs share/gforth/${PKGVERSION}/locate.fs |