Honor LDFLAGS from pkgsrc.

6 files changed, 34 insertions, 14 deletions

diff --git a/emulators/ROMInfo/distinfo b/emulators/ROMInfo/distinfo
index 5966b451df3..5fd40cd4e0a 100644
--- a/emulators/ROMInfo/distinfo
+++ b/emulators/ROMInfo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2007/02/26 00:01:18 wiz Exp $
+$NetBSD: distinfo,v 1.6 2011/11/29 06:24:02 sbd Exp $
 
 SHA1 (rinfo27.zip) = f6ef7ac9ce30d92e646f040ee82f264ef71f59c0
 RMD160 (rinfo27.zip) = c61b42578d35e815be50e7c9077e1e728d2d72f5
 Size (rinfo27.zip) = 140306 bytes
-SHA1 (patch-aa) = 5006204b7b458068be13f0258eddf739a984f23a
+SHA1 (patch-aa) = e2a586daa96d03fcad4bec08e76b9e01c30fdb61
 SHA1 (patch-ab) = c8667dc5c0ba3085e14b56b88d1693a5a8abf329
diff --git a/emulators/ROMInfo/patches/patch-aa b/emulators/ROMInfo/patches/patch-aa
index b7a71fc96d2..54a23e322c7 100644
--- a/emulators/ROMInfo/patches/patch-aa
+++ b/emulators/ROMInfo/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2011/11/29 06:24:03 sbd Exp $
 
---- makefile.orig	2005-02-24 23:39:06.000000000 +0100
+--- makefile.orig	2005-02-24 09:39:06.000000000 +0000
 +++ makefile
 @@ -3,7 +3,7 @@
  #
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.2 2005/03/14 16:20:58 wiz Exp $
  	@echo Linking $@...
 -	$(LD) $(OBJS) $(LIBS) -o $@
 -	$(UPX) $@
-+	$(CC) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
++	$(CC) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ -ldatlib -lm -lz
  
  #
  # Complete removal of built objects
diff --git a/textproc/GutenMark/distinfo b/textproc/GutenMark/distinfo
index 8f96df8ad21..ac0a3c6b797 100644
--- a/textproc/GutenMark/distinfo
+++ b/textproc/GutenMark/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2011/02/06 10:58:29 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2011/11/29 06:21:02 sbd Exp $
 
 SHA1 (GutenMark_source_dev-20090510.tar.gz) = d014d982a86f025b1390d48aa130a6ddf107e4a9
 RMD160 (GutenMark_source_dev-20090510.tar.gz) = d6b25878e53110ce18745c611eb9df6ef2185561
 Size (GutenMark_source_dev-20090510.tar.gz) = 432065 bytes
+SHA1 (patch-Makefile) = 59e639fd9233c0a0ef23504ffce803bf61a10814
diff --git a/textproc/GutenMark/patches/patch-Makefile b/textproc/GutenMark/patches/patch-Makefile
new file mode 100644
index 00000000000..ae3b1926bc4
--- /dev/null
+++ b/textproc/GutenMark/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2011/11/29 06:21:02 sbd Exp $
+
+Honor CFLAGS and LDFLAGS from pkgsrc.
+
+--- Makefile.orig	2009-05-10 12:11:21.000000000 +0000
++++ Makefile
+@@ -257,7 +257,7 @@ snapshot2: source-snapshot all-archs2
+ # and I guess you'll want to substitute "gcc" for "cc".  The reason it's 
+ # set to "cc" rather than directly to "gcc" is for the benefit of MacOS-X. 
+ GutenMark: $(SOURCES) AutoMark.h
+-	${CC} ${ARCH32} -O3 -Wall -funsigned-char \
++	${CC} ${CFLAGS} ${LDFLAGS} ${ARCH32} -O3 -Wall -funsigned-char \
+ 		-o GutenMark $(SOURCES) -lz
+ 	strip $@
+ 	./GutenMark bldhb10.txt bldhb10.html
diff --git a/textproc/makeztxt/distinfo b/textproc/makeztxt/distinfo
index 59bd35d6b28..b373db85610 100644
--- a/textproc/makeztxt/distinfo
+++ b/textproc/makeztxt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/12/08 17:28:31 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/11/29 06:21:41 sbd Exp $
 
 SHA1 (makeztxt-1.40b-src.tar.gz) = 10cf3c89003a3b113aa51a668dbdfcfd7a94eeb3
 RMD160 (makeztxt-1.40b-src.tar.gz) = c45ab3e2e43da3e9f9f1d472dc73af517d50c4c1
 Size (makeztxt-1.40b-src.tar.gz) = 24272 bytes
-SHA1 (patch-aa) = 33b9234edd019e605f824a26ca12800b3ff82e83
+SHA1 (patch-aa) = ef53c73636d3ae61d6a3c79625a8ff3343b87dd7
 SHA1 (patch-ab) = 5fc03cd447f694f12bc2a43f52e4df05741bc73c
 SHA1 (patch-ac) = ff2d4710cf86527c342e4ced10274750022b8b29
 SHA1 (patch-ad) = 577e0d35be10f3f86055927a92be839726c7ac5c
diff --git a/textproc/makeztxt/patches/patch-aa b/textproc/makeztxt/patches/patch-aa
index 3bf15965598..cc12f1992a9 100644
--- a/textproc/makeztxt/patches/patch-aa
+++ b/textproc/makeztxt/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2001/02/19 15:14:59 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2011/11/29 06:21:41 sbd Exp $
 
---- Makefile.orig	Fri Feb 16 20:23:19 2001
-+++ Makefile	Fri Feb 16 20:23:21 2001
-@@ -7,8 +7,9 @@
+--- Makefile.orig	2001-02-14 22:27:15.000000000 +0000
++++ Makefile
+@@ -7,8 +7,9 @@ VERSION	= 1.40b
  LIBS	= -lz -lztxt
  INCLUDE	= -I../common -I.
  
@@ -14,8 +14,12 @@ $NetBSD: patch-aa,v 1.1 2001/02/19 15:14:59 wiz Exp $
  
  # If you're compiling on a Sun (with gcc), you'll need this
  #CFLAGS	+= -fpack-struct
-@@ -32,11 +33,11 @@
- 	$(CC) -Llibztxt -o makeztxt $(OBJS) $(LIBS)
+@@ -29,14 +30,14 @@ all: makeztxt
+ 	$(CC) $(CFLAGS) -c $<
+ 
+ makeztxt: $(OBJS) libztxt
+-	$(CC) -Llibztxt -o makeztxt $(OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -Llibztxt -o makeztxt $(OBJS) $(LIBS)
  
  libztxt::
 -	+make -C libztxt all