pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/nbitools Fixed some pkglint warnings.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e06711d580f6
branches:  trunk
changeset: 514726:e06711d580f6
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Jun 17 16:50:27 2006 +0000

description:
Fixed some pkglint warnings.

diffstat:

 devel/nbitools/Makefile      |  16 ++++++++--------
 devel/nbitools/buildlink3.mk |   9 ++++-----
 2 files changed, 12 insertions(+), 13 deletions(-)

diffs (58 lines):

diff -r fedf02f23c17 -r e06711d580f6 devel/nbitools/Makefile
--- a/devel/nbitools/Makefile   Sat Jun 17 16:17:12 2006 +0000
+++ b/devel/nbitools/Makefile   Sat Jun 17 16:50:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/02 22:59:40 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/17 16:50:27 rillig Exp $
 #
 
 DISTNAME=      nbitools-R6.3
@@ -23,13 +23,13 @@
 USE_TOOLS+=    gmake
 .endif
 
-post-extract:
-       @${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf
-
+SUBST_CLASSES+=                nbi
+SUBST_STAGE.nbi=       pre-configure
+SUBST_MESSAGE.nbi=     Fixing definition of ProjectRoot.
+SUBST_FILES.nbi=       config/cf/site.def
+SUBST_SED.nbi=         -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|'
 
-post-patch:
-       @${MV} ${WRKSRC}/config/cf/site.def ${WRKSRC}/config/cf/site.def.orig
-       @${SED} -e 's|^\(\#define[ \t]*ProjectRoot\).*|\1 ${PREFIX}|' \
-               ${WRKSRC}/config/cf/site.def.orig > ${WRKSRC}/config/cf/site.def
+post-extract:
+       ${CP} ${FILESDIR}/DragonFly.cf ${WRKSRC}/config/cf
 
 .include "../../mk/bsd.pkg.mk"
diff -r fedf02f23c17 -r e06711d580f6 devel/nbitools/buildlink3.mk
--- a/devel/nbitools/buildlink3.mk      Sat Jun 17 16:17:12 2006 +0000
+++ b/devel/nbitools/buildlink3.mk      Sat Jun 17 16:50:27 2006 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/12 10:27:12 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/06/17 16:50:27 rillig Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 NBITOOLS_BUILDLINK3_MK:=       ${NBITOOLS_BUILDLINK3_MK}+
 
-.include "../../mk/bsd.prefs.mk"
-
 .if !empty(BUILDLINK_DEPTH:M+)
 BUILDLINK_DEPENDS+=    nbitools
 .endif
@@ -21,9 +19,10 @@
 
 XMKMF_CMD=     ${BUILDLINK_PREFIX.nbitools}/libexec/itools/xmkmf
 
-.if ${OPSYS} == "Linux"
+.  include "../../mk/bsd.prefs.mk"
+.  if ${OPSYS} == "Linux"
 USE_TOOLS+=    gmake
-.endif
+.  endif
 
 .endif # NBITOOLS_BUILDLINK3_MK
 



Home | Main Index | Thread Index | Old Index