From 9ddc439a72c3ecc0fa6547546723eb79c9529a5c Mon Sep 17 00:00:00 2001 From: agc Date: Wed, 18 Aug 1999 09:08:10 +0000 Subject: Record build options in the BuildInfo file via BUILD_DEFS. These can be displayed using the -B option to pkg_info(1). Also clean up inclusion of files, and include a missing bsd.prefs.mk --- news/nn/Makefile | 8 +++++--- news/trn/Makefile | 11 ++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'news') diff --git a/news/nn/Makefile b/news/nn/Makefile index 4ac9025ea6c..85a257c2d7f 100644 --- a/news/nn/Makefile +++ b/news/nn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/07/26 19:47:37 tron Exp $ +# $NetBSD: Makefile,v 1.7 1999/08/18 09:08:10 agc Exp $ # $FreeBSD Id: Makefile,v 1.14 1997/07/30 18:17:48 adam Exp # @@ -10,7 +10,9 @@ MASTER_SITES= ftp://uniwa.uwa.edu.au/pub/nn/old/beta/ \ MAINTAINER= tron@netbsd.org -.include <../../mk/bsd.prefs.mk> +BUILD_DEFS+= USE_INN + +.include "../../mk/bsd.prefs.mk" .if defined(USE_INN) && ${USE_INN} == YES DEPENDS= inn-2.2:../inn @@ -25,4 +27,4 @@ post-extract: s#@@BINGRP@@#${BINGRP}#' \ <${FILESDIR}/s-netbsd.h >${WRKSRC}/conf/s-netbsd.h -.include <../../mk/bsd.pkg.mk> +.include "../../mk/bsd.pkg.mk" diff --git a/news/trn/Makefile b/news/trn/Makefile index 33d8155c14e..d4324eedc92 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1999/07/26 19:47:37 tron Exp $ +# $NetBSD: Makefile,v 1.3 1999/08/18 09:08:10 agc Exp $ # DISTNAME= trn-3.6 @@ -7,6 +7,10 @@ MASTER_SITES= ftp://ftp.wustl.edu/packages/news/readers/trn/ MAINTAINER= packages@netbsd.org +BUILD_DEFS+= USE_INN + +.include "../../mk/bsd.prefs.mk" + .if defined(USE_INN) && ${USE_INN} == YES DEPENDS= inn-2.2:../inn .else @@ -22,7 +26,8 @@ pre-configure: @${CP} ${FILESDIR}/config.sh ${WRKSRC} post-install: - @${LN} -sf trn ${PREFIX}/bin/rn - @${LN} -sf trn.1 ${PREFIX}/man/man1/rn.1 + @${RM} -f ${PREFIX}/bin/rn ${PREFIX}/man/man1/rn.1 ${PREFIX}/man/man1/rn.1.gz + @${LN} -s trn ${PREFIX}/bin/rn + @${LN} -s trn.1 ${PREFIX}/man/man1/rn.1 .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3