pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/www/wdg-validate Use subst.mk instead of patch+sed.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/372f2a610720
branches:  trunk
changeset: 468820:372f2a610720
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Feb 17 01:58:08 2004 +0000

description:
Use subst.mk instead of patch+sed.

diffstat:

 www/wdg-validate/Makefile         |  18 +++++++++++-------
 www/wdg-validate/distinfo         |   3 +--
 www/wdg-validate/patches/patch-aa |  17 -----------------
 3 files changed, 12 insertions(+), 26 deletions(-)

diffs (73 lines):

diff -r 91a99ea00fae -r 372f2a610720 www/wdg-validate/Makefile
--- a/www/wdg-validate/Makefile Tue Feb 17 01:52:31 2004 +0000
+++ b/www/wdg-validate/Makefile Tue Feb 17 01:58:08 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/17 01:29:30 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/17 01:58:08 minskim Exp $
 #
 
 DISTNAME=      validate-1.2
@@ -21,18 +21,22 @@
 SITES_wdg-sgml-lib-1.1.3.tar.gz=       http://www.htmlhelp.com/tools/validator/src/
 
 USE_BUILDLINK3=        YES
-REPLACE_PERL=  validate.netbsd
+REPLACE_PERL=  validate
+NO_BUILD=      YES
+
+SUBST_CLASSES+=                paths
+SUBST_MESSAGE.paths=   "Fixing hardcoded paths."
+SUBST_STAGE.paths=     post-patch
+SUBST_FILES.paths=     validate
+SUBST_SED.paths=       -e 's,/usr/local/share,${PREFIX}/share,g' \
+                       -e 's,/usr/local/bin/lq-nsgmls,${LOCALBASE}/bin/lq-nsgmls,g'
 
 INSTALLATION_DIRS+=    bin share/doc
 
 post-extract:
-       ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/validate.netbsd
+       ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}/validate
        ${CP} ${DISTDIR}/${DIST_SUBDIR}/README ${WRKSRC}/README
 
-do-build:
-       ${SED}  -e "s|@PREFIX@|${PREFIX}|g" \
-               ${WRKSRC}/validate.netbsd > ${WRKSRC}/validate
-
 do-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/wdg/sgml-lib
        ${INSTALL_SCRIPT} ${WRKSRC}/validate ${PREFIX}/bin
diff -r 91a99ea00fae -r 372f2a610720 www/wdg-validate/distinfo
--- a/www/wdg-validate/distinfo Tue Feb 17 01:52:31 2004 +0000
+++ b/www/wdg-validate/distinfo Tue Feb 17 01:58:08 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2003/11/12 10:43:18 wiz Exp $
+$NetBSD: distinfo,v 1.11 2004/02/17 01:58:08 minskim Exp $
 
 SHA1 (validate/validate-1.2) = 38be485a1e2a7024cae927910bb89cd4f944220e
 Size (validate/validate-1.2) = 23258 bytes
@@ -6,4 +6,3 @@
 Size (validate/wdg-sgml-lib-1.1.3.tar.gz) = 319133 bytes
 SHA1 (validate/README) = 433bc1e5311fb4972a97f0c46de7b910a1e96526
 Size (validate/README) = 2424 bytes
-SHA1 (patch-aa) = 4dbad73aa4b9e2cc4ea5c753a5f73b4fa6e309de
diff -r 91a99ea00fae -r 372f2a610720 www/wdg-validate/patches/patch-aa
--- a/www/wdg-validate/patches/patch-aa Tue Feb 17 01:52:31 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/11/11 07:48:03 wiz Exp $
-
---- validate.netbsd.orig       Tue Nov 11 08:39:01 2003
-+++ validate.netbsd
-@@ -50,10 +50,10 @@ by Liam Quinn <liam\@htmlhelp.com>";
- my $usage = "Usage: validate [OPTION] [FILE...]";
- 
- # SGML directory (catalog, DTDs, SGML declarations)
--my $sgmlDir = '/usr/local/share/wdg/sgml-lib';
-+my $sgmlDir = '@PREFIX@/share/wdg/sgml-lib';
- 
- # Location of lq-nsgmls executable
--my $nsgmlsLocation = '/usr/local/bin/lq-nsgmls';
-+my $nsgmlsLocation = '@PREFIX@/bin/lq-nsgmls';
- 
- # lq-nsgmls command line
- # The SGML declaration and HTML document's filename will be appended



Home | Main Index | Thread Index | Old Index