Tue Nov 29 06:21:41 2011 UTC ()
Honor LDFLAGS from pkgsrc.


(sbd)
diff -r1.4 -r1.5 pkgsrc/textproc/makeztxt/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/makeztxt/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/textproc/makeztxt/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/makeztxt/distinfo 2005/12/08 17:28:31 1.4
+++ pkgsrc/textproc/makeztxt/distinfo 2011/11/29 06:21:41 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2005/12/08 17:28:31 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2011/11/29 06:21:41 sbd Exp $
2 2
3SHA1 (makeztxt-1.40b-src.tar.gz) = 10cf3c89003a3b113aa51a668dbdfcfd7a94eeb3 3SHA1 (makeztxt-1.40b-src.tar.gz) = 10cf3c89003a3b113aa51a668dbdfcfd7a94eeb3
4RMD160 (makeztxt-1.40b-src.tar.gz) = c45ab3e2e43da3e9f9f1d472dc73af517d50c4c1 4RMD160 (makeztxt-1.40b-src.tar.gz) = c45ab3e2e43da3e9f9f1d472dc73af517d50c4c1
5Size (makeztxt-1.40b-src.tar.gz) = 24272 bytes 5Size (makeztxt-1.40b-src.tar.gz) = 24272 bytes
6SHA1 (patch-aa) = 33b9234edd019e605f824a26ca12800b3ff82e83 6SHA1 (patch-aa) = ef53c73636d3ae61d6a3c79625a8ff3343b87dd7
7SHA1 (patch-ab) = 5fc03cd447f694f12bc2a43f52e4df05741bc73c 7SHA1 (patch-ab) = 5fc03cd447f694f12bc2a43f52e4df05741bc73c
8SHA1 (patch-ac) = ff2d4710cf86527c342e4ced10274750022b8b29 8SHA1 (patch-ac) = ff2d4710cf86527c342e4ced10274750022b8b29
9SHA1 (patch-ad) = 577e0d35be10f3f86055927a92be839726c7ac5c 9SHA1 (patch-ad) = 577e0d35be10f3f86055927a92be839726c7ac5c
cvs diff -r1.1 -r1.2 pkgsrc/textproc/makeztxt/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/makeztxt/patches/patch-aa 2001/02/19 15:14:59 1.1
+++ pkgsrc/textproc/makeztxt/patches/patch-aa 2011/11/29 06:21:41 1.2
@@ -1,30 +1,34 @@ @@ -1,30 +1,34 @@
1$NetBSD: patch-aa,v 1.1 2001/02/19 15:14:59 wiz Exp $ 1$NetBSD: patch-aa,v 1.2 2011/11/29 06:21:41 sbd Exp $
2 2
3--- Makefile.orig Fri Feb 16 20:23:19 2001 3--- Makefile.orig 2001-02-14 22:27:15.000000000 +0000
4+++ Makefile Fri Feb 16 20:23:21 2001 4+++ Makefile
5@@ -7,8 +7,9 @@ 5@@ -7,8 +7,9 @@ VERSION = 1.40b
6 LIBS = -lz -lztxt 6 LIBS = -lz -lztxt
7 INCLUDE = -I../common -I. 7 INCLUDE = -I../common -I.
8  8
9-CC = gcc 9-CC = gcc
10-CFLAGS = -Wall -O2 -pipe $(INCLUDE) 10-CFLAGS = -Wall -O2 -pipe $(INCLUDE)
11+#CC = gcc 11+#CC = gcc
12+#CFLAGS = -Wall -O2 -pipe $(INCLUDE) 12+#CFLAGS = -Wall -O2 -pipe $(INCLUDE)
13+CFLAGS += $(INCLUDE) 13+CFLAGS += $(INCLUDE)
14  14
15 # If you're compiling on a Sun (with gcc), you'll need this 15 # If you're compiling on a Sun (with gcc), you'll need this
16 #CFLAGS += -fpack-struct 16 #CFLAGS += -fpack-struct
17@@ -32,11 +33,11 @@ 17@@ -29,14 +30,14 @@ all: makeztxt
18 $(CC) -Llibztxt -o makeztxt $(OBJS) $(LIBS) 18 $(CC) $(CFLAGS) -c $<
 19
 20 makeztxt: $(OBJS) libztxt
 21- $(CC) -Llibztxt -o makeztxt $(OBJS) $(LIBS)
 22+ $(CC) $(LDFLAGS) -Llibztxt -o makeztxt $(OBJS) $(LIBS)
19  23
20 libztxt:: 24 libztxt::
21- +make -C libztxt all 25- +make -C libztxt all
22+ cd libztxt && ${MAKE} all 26+ cd libztxt && ${MAKE} all
23  27
24 # Cleaning and Makefile maintainence 28 # Cleaning and Makefile maintainence
25 clean: 29 clean:
26- make -C libztxt clean 30- make -C libztxt clean
27+ cd libztxt && ${MAKE} clean 31+ cd libztxt && ${MAKE} clean
28 -rm -f *.o *~ 32 -rm -f *.o *~
29  33
30 distclean: clean 34 distclean: clean