pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/devel/cvs2p4 Use SUBST framework.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2c0e2d57c4ce
branches:  trunk
changeset: 505740:2c0e2d57c4ce
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Jan 06 18:56:08 2006 +0000

description:
Use SUBST framework.

diffstat:

 devel/cvs2p4/Makefile |  15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 8e32b96c2ee8 -r 2c0e2d57c4ce devel/cvs2p4/Makefile
--- a/devel/cvs2p4/Makefile     Fri Jan 06 18:36:52 2006 +0000
+++ b/devel/cvs2p4/Makefile     Fri Jan 06 18:56:08 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/29 06:21:36 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/01/06 18:56:08 joerg Exp $
 #
 
 DISTNAME=      cvs2p4-2.3.3
@@ -25,14 +25,18 @@
 PLIST_SUBST+=  DOCDIR=${DOCDIR:Q}
 PLIST_SUBST+=  EGDIR=${EGDIR:Q}
 
-FILES_SUBST+=  P4ROOT=${P4ROOT:Q}
-FILES_SUBST+=  P4PORT=${P4PORT:Q}
-
 CVS2P4_INLIB=  $$Mydir/lib/util\.pl
 CVS2P4_OUTLIB= ${LIBDIR}/${PKGBASE}-util.pl
 
 INSTALLATION_DIRS=     bin ${LIBDIR}
 
+SUBST_CLASSES+=                paths
+SUBST_FILES.paths=     test/config
+SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+=      -e 's,@P4PORT@,${P4PORT},g'
+SUBST_SED.paths+=      -e 's,@P4ROOT@,${P4ROOT},g'
+SUBST_STAGE.paths=     post-patch
+
 do-configure:
        for f in ${WRKSRC}/bin/*; do \
                ( ${ECHO} \#!${PERL5}; ${CAT} $${f} ) | ${SED} -e '2,5d' \
@@ -40,9 +44,6 @@
                        > $${f}.new; \
                ${MV} -f $${f}.new $${f}; \
        done
-       @${SED} ${FILES_SUBST_SED} ${WRKSRC}/test/config \
-               > ${WRKSRC}/test/config.new
-       @${MV} -f ${WRKSRC}/test/config.new ${WRKSRC}/test/config
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/lib/util.pl ${PREFIX}/${CVS2P4_OUTLIB}



Home | Main Index | Thread Index | Old Index