pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/misc/ascii Correct the error on previous commit.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/230ac7f8c2ee
branches:  trunk
changeset: 643489:230ac7f8c2ee
user:      mef <mef%pkgsrc.org@localhost>
date:      Sat Dec 20 23:51:52 2014 +0000

description:
Correct the error on previous commit.
(1) ${PREFIX} handling was not correct
(2) It is said ascii.cgi is deleted in ChangeLog, it was not taken care
   properly.
   3.14: 2013-11-27
      ascii.cgi deleted: the <isindex> it relies on is archaic and nonconformant.
Thanks joerg@ for review.

diffstat:

 misc/ascii/Makefile |  9 +++++++--
 misc/ascii/PLIST    |  3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r aaaaf27bb128 -r 230ac7f8c2ee misc/ascii/Makefile
--- a/misc/ascii/Makefile       Sat Dec 20 22:12:20 2014 +0000
+++ b/misc/ascii/Makefile       Sat Dec 20 23:51:52 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/12/13 01:05:44 mef Exp $
+# $NetBSD: Makefile,v 1.15 2014/12/20 23:51:52 mef Exp $
 #
 
 DISTNAME=      ascii-3.14
@@ -16,8 +16,13 @@
 BUILD_TARGET=          ascii
 EGDIR=                 ${PREFIX}/share/examples/${PKGBASE}
 
+SUBST_CLASSES+=                prefix
+SUBST_MESSAGE.prefix=  Install PATH to ${PREFIX}
+SUBST_FILES.prefix=    Makefile
+SUBST_STAGE.prefix=    post-patch
+SUBST_SED.prefix=      -e '/PREFIX/s,/usr,${PREFIX},'
+
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/ascii.cgi ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r aaaaf27bb128 -r 230ac7f8c2ee misc/ascii/PLIST
--- a/misc/ascii/PLIST  Sat Dec 20 22:12:20 2014 +0000
+++ b/misc/ascii/PLIST  Sat Dec 20 23:51:52 2014 +0000
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/12/20 23:51:52 mef Exp $
 bin/ascii
 man/man1/ascii.1
-share/examples/ascii/ascii.cgi



Home | Main Index | Thread Index | Old Index