adjust Makefiles to honor LDFLAGS, and set LDFLAGS to -L/-R both

${PREFIX}/lib and also ${QT3_LIBDIR}.  (This is probably not right due
to -R portability issues, but I'd rather make upstream lprof use auto*
than deal with that now.)

7 files changed, 75 insertions, 3 deletions

diff --git a/graphics/lprof/Makefile b/graphics/lprof/Makefile
index a02e0dd0bf9..3f43f5b4208 100644
--- a/graphics/lprof/Makefile
+++ b/graphics/lprof/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/06 00:51:48 gdt Exp $
+# $NetBSD: Makefile,v 1.2 2005/11/06 01:47:47 gdt Exp $
 #
 
 DISTNAME=		lprof-1.10.1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lprof/}
+PKGREVISION=		1
 
 MAINTAINER=		gdt@NetBSD.org
 HOMEPAGE=		http://lprof.sourceforge.net/
@@ -11,7 +12,8 @@ COMMENT=		ICC Profile generation tool (for IT8.7 targets)
 
 USE_TOOLS+=	gmake
 
-MAKE_ENV+=	QTDIR=${PREFIX} BASEDIR=${PREFIX}
+MAKE_ENV+=	BASEDIR=${PREFIX} QTDIR=${PREFIX} QTDIR=${PREFIX}/qt3/lib
+MAKE_ENV+=	LDFLAGS="-L${PREFIX}/lib -L{$QTDIR} -R${PREFIX}/lib -R{$QTDIR}"
 
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
diff --git a/graphics/lprof/distinfo b/graphics/lprof/distinfo
index a8579715bf3..89a8c4d11d0 100644
--- a/graphics/lprof/distinfo
+++ b/graphics/lprof/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/06 00:51:48 gdt Exp $
+$NetBSD: distinfo,v 1.2 2005/11/06 01:47:47 gdt Exp $
 
 SHA1 (lprof-1.10.1.tar.gz) = ad7cc5fff5d6dfff9d0993d201232d7bb71a46aa
 RMD160 (lprof-1.10.1.tar.gz) = d4a20cffe42a2ca12a1321a2e6013756e447300f
 Size (lprof-1.10.1.tar.gz) = 1244587 bytes
 SHA1 (patch-aa) = 8ce9546f07a51ed058764bffb1a6ece5d71c5273
+SHA1 (patch-ab) = 985c93fb70f1a947d0feb1785eb5a00d46ade8a2
+SHA1 (patch-ac) = 24fe5629f7f02b4c737b5cbbe81edff01c5a33e9
+SHA1 (patch-ad) = 48c7e62c4bed40607dfce8dfb557f172d2c9b85a
+SHA1 (patch-ae) = 95ea6012a05500ad6ef0c919ac8d818b23ddc6a7
+SHA1 (patch-af) = 4858e11e9905beb95bb89949c6a03067babf8c9a
diff --git a/graphics/lprof/patches/patch-ab b/graphics/lprof/patches/patch-ab
new file mode 100644
index 00000000000..a66199f3a41
--- /dev/null
+++ b/graphics/lprof/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2005/11/06 01:47:47 gdt Exp $
+
+--- src/ICCtoIT8/Makefile.orig	2005-08-19 21:11:52.000000000 -0400
++++ src/ICCtoIT8/Makefile
+@@ -30,7 +30,7 @@ PROGRAM=icc2it8
+ all:	icc2it8
+ 
+ icc2it8: icc2it8.o getopt.o
+-	$(CC) $(CFLAGS) icc2it8.o getopt.o -o $@ -lm -llprof -llcms
++	$(CC) $(CFLAGS) $(LDFLAGS) icc2it8.o getopt.o -o $@ -lm -llprof -llcms
+ 
+ install: icc2it8
+ 	cp $(PROGRAM)$(EXESUFFIX) $(DESTDIR)$(BINDIR)
diff --git a/graphics/lprof/patches/patch-ac b/graphics/lprof/patches/patch-ac
new file mode 100644
index 00000000000..224be3636ab
--- /dev/null
+++ b/graphics/lprof/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2005/11/06 01:47:47 gdt Exp $
+
+--- src/qtMeasurementTool/Makefile.orig	2005-08-19 21:11:46.000000000 -0400
++++ src/qtMeasurementTool/Makefile
+@@ -73,7 +73,7 @@ all: $(PROGRAM)
+ 
+ $(PROGRAM):  $(OBJECTS)
+ 	@echo "Building measurement tool program ..."
+-	$(CC) $(LIBS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
++	$(CC) $(LIBS) $(LDFLAGS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
+ 
+ # general rules how to build files
+ %.h: %.ui
diff --git a/graphics/lprof/patches/patch-ad b/graphics/lprof/patches/patch-ad
new file mode 100644
index 00000000000..473f71da561
--- /dev/null
+++ b/graphics/lprof/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/11/06 01:47:47 gdt Exp $
+
+--- src/qtMonitorProfiler/Makefile.orig	2005-08-19 21:11:31.000000000 -0400
++++ src/qtMonitorProfiler/Makefile
+@@ -73,7 +73,7 @@ all: $(PROGRAM)
+ 
+ $(PROGRAM):  $(OBJECTS)
+ 	@echo "Building monitor profiler ..."
+-	$(CC) $(LIBS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
++	$(CC) $(LIBS) $(LDFLAGS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
+ 
+ # general rules how to build files
+ %.h: %.ui
diff --git a/graphics/lprof/patches/patch-ae b/graphics/lprof/patches/patch-ae
new file mode 100644
index 00000000000..2a9e37a5bc7
--- /dev/null
+++ b/graphics/lprof/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/11/06 01:47:47 gdt Exp $
+
+--- src/qtProfileChecker/Makefile.orig	2005-08-19 21:11:25.000000000 -0400
++++ src/qtProfileChecker/Makefile
+@@ -74,7 +74,7 @@ all: $(PROGRAM)
+ 
+ $(PROGRAM):  $(OBJECTS)
+ 	@echo "Building profile checker ..."
+-	$(CC) $(LIBS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
++	$(CC) $(LIBS) $(LDFLAGS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
+ 
+ # general rules how to build files
+ %.h: %.ui
diff --git a/graphics/lprof/patches/patch-af b/graphics/lprof/patches/patch-af
new file mode 100644
index 00000000000..17284b832bb
--- /dev/null
+++ b/graphics/lprof/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/11/06 01:47:47 gdt Exp $
+
+--- src/qtScannerProfiler/Makefile.orig	2005-08-19 21:11:41.000000000 -0400
++++ src/qtScannerProfiler/Makefile
+@@ -73,7 +73,7 @@ all: $(PROGRAM)
+ 
+ $(PROGRAM):  $(OBJECTS)
+ 	@echo "Building scanner profiler ..."
+-	$(CC) $(LIBS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
++	$(CC) $(LIBS) $(LDFLAGS) $(OBJECTS) -o $(PROGRAM) $(POSTLIB)
+ 
+ # general rules how to build files
+ %.h: %.ui