[pkgsrc/trunk]: pkgsrc/textproc/convertlit Fixed wrong use of WRKSRC. gcc-2.9...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ca5bafd4e8a
branches:  trunk
changeset: 502453:6ca5bafd4e8a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 04 19:52:30 2005 +0000

description:
Fixed wrong use of WRKSRC. gcc-2.95 does not like CRLF line ends, so they
are stripped from all *.c and *.h files.

diffstat:

 textproc/convertlit/Makefile         |  14 ++++++++++----
 textproc/convertlit/distinfo         |   4 ++--
 textproc/convertlit/patches/patch-aa |   6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diffs (64 lines):

diff -r 21a2940700e3 -r 6ca5bafd4e8a textproc/convertlit/Makefile
--- a/textproc/convertlit/Makefile      Fri Nov 04 19:50:31 2005 +0000
+++ b/textproc/convertlit/Makefile      Fri Nov 04 19:52:30 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/02 11:10:45 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/04 19:52:30 rillig Exp $
 #
 # In order to ensure compliance with U.S. and international law, please
 # do not modify this file to provide pointers to the source or homepage
@@ -15,11 +15,17 @@
 HOMEPAGE=              ${CONVERTLIT_HOMEPAGE}
 COMMENT=               Convert Microsoft Legal Reader format eBooks into open format
 
-WRKSRC=                        ${WRKDIR}/clit18
-BUILD_DIRS=            ${WRKDIR}/lib ${WRKSRC}
+WRKSRC=                        ${WRKDIR}
+BUILD_DIRS=            lib clit18
 MAKEFILE=              makefile
 USE_TOOLS+=            gmake
 
+SUBST_CLASSES+=                d2u
+SUBST_STAGE.d2u=       pre-configure
+SUBST_MESSAGE.d2u=     "Stripping CRLF line ends."
+SUBST_FILES.d2u+=              *.h *.c */*.h */*.c */*/*.h */*/*.c
+SUBST_FILTER_CMD.d2u=  ${TR} -d '\r'
+
 RESTRICTED=            Possible legal problems
 NO_SRC_ON_FTP=         ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
@@ -27,7 +33,7 @@
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/clit ${PREFIX}/bin/convertlit
+       ${INSTALL_PROGRAM} ${WRKSRC}/clit18/clit ${PREFIX}/bin/convertlit
 
 .include "../../math/ltm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 21a2940700e3 -r 6ca5bafd4e8a textproc/convertlit/distinfo
--- a/textproc/convertlit/distinfo      Fri Nov 04 19:50:31 2005 +0000
+++ b/textproc/convertlit/distinfo      Fri Nov 04 19:52:30 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/10/02 11:10:45 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/11/04 19:52:30 rillig Exp $
 
 SHA1 (clit18src.zip) = 0fa9aead468bd8640c49374d46d78d2a3e79489f
 RMD160 (clit18src.zip) = 6104a7d951ed60ea73705e401be8b55633ea2d47
 Size (clit18src.zip) = 135120 bytes
-SHA1 (patch-aa) = d50deb241742f37ea04fac726c278222daf8ce2c
+SHA1 (patch-aa) = 60edfb550d157298aba38e39706681b44c663ef9
diff -r 21a2940700e3 -r 6ca5bafd4e8a textproc/convertlit/patches/patch-aa
--- a/textproc/convertlit/patches/patch-aa      Fri Nov 04 19:50:31 2005 +0000
+++ b/textproc/convertlit/patches/patch-aa      Fri Nov 04 19:52:30 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/02 11:10:45 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2005/11/04 19:52:30 rillig Exp $
 
---- makefile.orig      2004-07-04 16:52:14.000000000 +0200
-+++ makefile
+--- clit18/makefile.orig       2004-07-04 16:52:14.000000000 +0200
++++ clit18/makefile
 @@ -1,9 +1,9 @@
  all: clit