From 521be04ca3cacd7d3748368889954f957c8d9f21 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Tue, 15 Jun 2004 04:11:15 +0000
Subject: Honor CC and LDFLAGS to create correctly linked binaries when pkgsrc
 bzip2 library is used instead of native one.

---
 archivers/xmill/distinfo         |  3 ++-
 archivers/xmill/patches/patch-aa | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 archivers/xmill/patches/patch-aa

(limited to 'archivers/xmill')

diff --git a/archivers/xmill/distinfo b/archivers/xmill/distinfo
index 74426017e45..bbb8696b843 100644
--- a/archivers/xmill/distinfo
+++ b/archivers/xmill/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/03/29 05:12:01 ben Exp $
+$NetBSD: distinfo,v 1.4 2004/06/15 04:11:15 minskim Exp $
 
 SHA1 (xmill-0.9.1.tar.gz) = 491e44ea9a66293af6837db4dc54ed63065c0d67
 Size (xmill-0.9.1.tar.gz) = 1021363 bytes
+SHA1 (patch-aa) = b4f10f11906bdcc927214823f93ef597c0d4b750
diff --git a/archivers/xmill/patches/patch-aa b/archivers/xmill/patches/patch-aa
new file mode 100644
index 00000000000..3730f16bf6c
--- /dev/null
+++ b/archivers/xmill/patches/patch-aa
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.3 2004/06/15 04:11:15 minskim Exp $
+
+--- makefile.orig	2004-03-15 18:17:57.000000000 -0600
++++ makefile
+@@ -43,11 +43,11 @@ INSPECTSRC = ./xmillinspect
+ PPMZIPSRC = ./ppmzip
+ PPMSRC = ./ppmdi
+ 
+-CPP = g++
+-CC = gcc
+-LINK = g++
++CPP = ${CXX}
++#CC = gcc
++LINK = ${CXX}
+ 
+-CFLAGS = -c
++CFLAGS += -c
+ 
+ # To use MSXML.  Does not work with GCC on Windows (mingw)
+ #CFLAGS = -c -DHAVE_MSXML
+@@ -84,7 +84,7 @@ CPPFLAGS_XDEMILL = $(CFLAGS) ${CPPFLAGS_
+ CPPFLAGS_XMILLTEST = $(CFLAGS) -IXMill
+ CPPFLAGS_PPMZIP = $(CFLAGS) -Ippmdi
+ 
+-LDLIBS=${ZLIB_LDFLAGS} ${BZLIB_LDFLAGS}
++LDLIBS=${LDFLAGS} ${ZLIB_LDFLAGS} ${BZLIB_LDFLAGS}
+ # LINK_FLAGS = -L.
+ 
+ XMILLLIB_MISC  =  \
-- 
cgit v1.2.3