diff options
| author | wiz <wiz@pkgsrc.org> | 2009-10-06 21:37:10 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2009-10-06 21:37:10 +0000 |
| commit | f3b2397155d5593eb25be232f1384ce6ff450440 (patch) | |
| tree | 41a672a9b2e1b8407ba75e8aea28373db5c59e78 /textproc | |
| parent | e773b0970c9fe6d823cd684fe99587881007669a (diff) | |
| download | pkgsrc-f3b2397155d5593eb25be232f1384ce6ff450440.tar.gz | |
Replace highly fought over patch with sed statement.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/convertlit/Makefile | 9 | ||||
| -rw-r--r-- | textproc/convertlit/distinfo | 3 | ||||
| -rw-r--r-- | textproc/convertlit/patches/patch-aa | 16 |
3 files changed, 9 insertions, 19 deletions
diff --git a/textproc/convertlit/Makefile b/textproc/convertlit/Makefile index 862b3574536..fd5e0d05836 100644 --- a/textproc/convertlit/Makefile +++ b/textproc/convertlit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2009/09/03 13:39:39 hasso Exp $ +# $NetBSD: Makefile,v 1.9 2009/10/06 21:37:10 wiz 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 @@ -29,6 +29,13 @@ SUBST_MESSAGE.d2u= Stripping CRLF line ends. SUBST_FILES.d2u+= *.h *.c */*.h */*.c */*/*.h */*/*.c SUBST_FILTER_CMD.d2u= ${TR} -d '\r' +SUBST_CLASSES+= flags +SUBST_STAGE.flags= pre-configure +SUBST_MESSAGE.flags= Fixing CFLAGS and compiler invocation. +SUBST_FILES.flags+= clit18/Makefile +SUBST_SED.flags+= -e 's,^CFLAGS=.*,CFLAGS+=-funsigned-char -Wall -I ../lib -I ../lib/des -I .,' +SUBST_SED.flags+= -e 's,gcc -o clit .. ../libtommath-0.30/libtommath.a,gcc $$(LDFLAGS) -o clit $$^ -ltommath,' + RESTRICTED= Possible legal problems NO_SRC_ON_FTP= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/textproc/convertlit/distinfo b/textproc/convertlit/distinfo index 32b3dc595b3..c1b9e0dc465 100644 --- a/textproc/convertlit/distinfo +++ b/textproc/convertlit/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.5 2009/10/06 17:16:47 joerg Exp $ +$NetBSD: distinfo,v 1.6 2009/10/06 21:37:11 wiz Exp $ SHA1 (clit18src.zip) = 0fa9aead468bd8640c49374d46d78d2a3e79489f RMD160 (clit18src.zip) = 6104a7d951ed60ea73705e401be8b55633ea2d47 Size (clit18src.zip) = 135120 bytes -SHA1 (patch-aa) = ab1545705a84263b8a45a7e72f3d004788bf12c7 diff --git a/textproc/convertlit/patches/patch-aa b/textproc/convertlit/patches/patch-aa deleted file mode 100644 index 50f1aeda030..00000000000 --- a/textproc/convertlit/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2009/10/06 17:16:47 joerg Exp $ - ---- clit18/Makefile.orig 2004-07-04 16:52:14.000000000 +0200 -+++ clit18/Makefile -@@ -1,9 +1,9 @@ - all: clit
-
--CFLAGS=-funsigned-char -Wall -O2 -I ../libtommath-0.30/ -I ../lib -I ../lib/des -I .
-+CFLAGS+=-funsigned-char -Wall -I ../lib -I ../lib/des -I .
- clean:
- rm -f *.o clit
-
- clit: clit.o hexdump.o drm5.o explode.o transmute.o display.o utils.o manifest.o ../lib/openclit.a
-- gcc -o clit $^ ../libtommath-0.30/libtommath.a
-+ gcc $(LDFLAGS) -o clit $^ -ltommath
-
|