make build honor LDFLAGS

fixes build on platforms not using builtin libiconv PR#44105

4 files changed, 33 insertions, 3 deletions

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 3be495a889c..175f8ae4d25 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2010/11/17 16:47:37 dholland Exp $
+# $NetBSD: Makefile,v 1.79 2010/11/19 19:21:37 tez Exp $
 
 DISTNAME=	doxygen-1.6.3.src
 PKGNAME=	${DISTNAME:S/.src//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/ \
 		http://ftp.stack.nl/pub/users/dimitri/
diff --git a/devel/doxygen/distinfo b/devel/doxygen/distinfo
index c85ae994ec0..2df844bdf25 100644
--- a/devel/doxygen/distinfo
+++ b/devel/doxygen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2010/08/05 15:49:30 drochner Exp $
+$NetBSD: distinfo,v 1.42 2010/11/19 19:21:37 tez Exp $
 
 SHA1 (doxygen-1.6.3.src.tar.gz) = 36e4f479a136a439307456e539a4bd6c2fefa8b7
 RMD160 (doxygen-1.6.3.src.tar.gz) = 3c205185316675a78dba390ef83942d5abda0815
@@ -10,3 +10,5 @@ SHA1 (patch-af) = 0942cc0fdcb49e74ce018d7e790dba36b21b4d08
 SHA1 (patch-ag) = a7cf7cd0b510e9a8293e5f8a43517cfc80a60d15
 SHA1 (patch-ah) = 8ec4502a6324cbdb4821887bcfe808f086aaa78b
 SHA1 (patch-ai) = 5c2d68e4755fa2e5cedfc9fdbf09d528e565bf7f
+SHA1 (patch-aj) = 13e3e441fb47e02e83097145c8e7dfa76a4eb6f9
+SHA1 (patch-ak) = 2090eb6cd3146374993f352cbf82744db0c1bb60
diff --git a/devel/doxygen/patches/patch-aj b/devel/doxygen/patches/patch-aj
new file mode 100644
index 00000000000..699b6bb2580
--- /dev/null
+++ b/devel/doxygen/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2010/11/19 19:21:38 tez Exp $
+
+make build honor LDFLAGS
+
+--- src/doxygen.pro.in.orig	2010-11-15 15:39:11.071338100 -0600
++++ src/doxygen.pro.in	2010-11-15 15:39:52.485412900 -0600
+@@ -19,6 +19,7 @@
+ HEADERS      =	doxygen.h 
+ SOURCES      =	main.cpp 
+ unix:LIBS                  += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
++unix:TMAKE_LFLAGS          += $(LDFLAGS)
+ win32:INCLUDEPATH          += .
+ win32-mingw:LIBS           += -L../lib -ldoxygen -ldoxycfg -lqtools -lmd5 
+ win32-msvc:LIBS            += qtools.lib md5.lib doxygen.lib doxycfg.lib shell32.lib iconv.lib
diff --git a/devel/doxygen/patches/patch-ak b/devel/doxygen/patches/patch-ak
new file mode 100644
index 00000000000..25154ea12ae
--- /dev/null
+++ b/devel/doxygen/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2010/11/19 19:21:38 tez Exp $
+
+make build honor LDFLAGS
+
+--- src/doxytag.pro.in.orig	2010-11-15 15:43:22.969750700 -0600
++++ src/doxytag.pro.in	2010-11-15 15:43:56.910180400 -0600
+@@ -19,6 +19,7 @@
+ HEADERS      =  logos.h version.h
+ SOURCES      =	doxytag.cpp logos.cpp version.cpp 
+ unix:LIBS                  += -L../lib -lqtools
++unix:TMAKE_LFLAGS          += $(LDFLAGS)
+ win32:INCLUDEPATH          += .
+ win32-mingw:LIBS           += -L../lib -lqtools
+ win32-msvc:LIBS            += qtools.lib shell32.lib