Fix build under Mac OS X: link directly against the generated libtidy.a

instead of using -ltidy, which picked up the (incompatible) libtidy.dylib
from /usr/lib.  I'm wondering if buildlink3 could help here in some way...

2 files changed, 19 insertions, 10 deletions

diff --git a/www/tidy/distinfo b/www/tidy/distinfo
index 842ffd48ae3..bc94e27a140 100644
--- a/www/tidy/distinfo
+++ b/www/tidy/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/10/04 18:00:49 wiz Exp $
+$NetBSD: distinfo,v 1.11 2006/01/20 12:09:21 jmmv Exp $
 
 SHA1 (tidy_src_050921.tgz) = 4a53aa129e2575004dcbaf0cf4c5c3f1637723b0
 RMD160 (tidy_src_050921.tgz) = 958f532245412e3f8ac5bdd56edc5693cadf4b5b
@@ -8,4 +8,4 @@ RMD160 (tidy_docs_050705.tgz) = 49b8c2eaf87a0291b1bef6479cf1eeda6b720f52
 Size (tidy_docs_050705.tgz) = 150359 bytes
 SHA1 (patch-aa) = e27b9b82ee47b9b54004c4a4a5bccba944847040
 SHA1 (patch-ab) = b243b9021f922e123b18a79566923a57d904b0d3
-SHA1 (patch-ac) = acc5e591182217a8cb7555c02e6954b7ceb60987
+SHA1 (patch-ac) = 89276af68ee4d18f0f5710a939845ed2314992eb
diff --git a/www/tidy/patches/patch-ac b/www/tidy/patches/patch-ac
index a1463911fef..ef5f8986b09 100644
--- a/www/tidy/patches/patch-ac
+++ b/www/tidy/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2006/01/20 12:09:21 jmmv Exp $
 
---- build/gmake/Makefile.orig	2005-05-03 08:58:08.000000000 +0200
-+++ build/gmake/Makefile	2005-07-03 14:56:45.000000000 +0200
-@@ -58,8 +58,8 @@
+--- build/gmake/Makefile.orig	2005-07-15 08:58:10.000000000 +0200
++++ build/gmake/Makefile
+@@ -58,8 +58,8 @@ SHELL=/bin/sh
  PROJECT=tidy
  
  # Installation variables.  Spaces OK, only dir create and file copy operations.
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $
  
  bininst = ${runinst_prefix}/bin
  libinst = ${devinst_prefix}/lib
-@@ -79,14 +79,14 @@
+@@ -79,14 +79,14 @@ DOCDIR = ${TOPDIR}/htmldoc
  # CFLAGS etc..
  # For optimised builds, flags such as "-O2" should be added and -D_DEBUG=1
  # disabled.
@@ -31,7 +31,7 @@ $NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $
  ifdef SUPPORT_UTF16_ENCODINGS
  CFLAGS += -DSUPPORT_UTF16_ENCODINGS=$(SUPPORT_UTF16_ENCODINGS)
  endif
-@@ -115,7 +115,7 @@
+@@ -115,7 +115,7 @@ LIBSUFFIX = .a
  OBJSUF = .o
  
  LIBRARY = $(LIBDIR)/$(LIBPREFIX)$(PROJECT)$(LIBSUFFIX)
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $
  
  XSLTPROC = xsltproc
  
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ doc:    $(DOCS)
  
  $(LIBRARY): $(OBJFILES)
  	if [ ! -d $(LIBDIR) ]; then mkdir $(LIBDIR); fi
@@ -49,7 +49,16 @@ $NetBSD: patch-ac,v 1.2 2005/10/04 18:00:49 wiz Exp $
  ifdef RANLIB
  	$(RANLIB) $@
  endif
-@@ -205,19 +205,19 @@
+@@ -175,7 +175,7 @@ $(OBJDIR)/%$(OBJSUF):	$(SRCDIR)/%.c $(HF
+ 
+ $(BINDIR)/$(PROJECT):	$(APPDIR)/tidy.c $(HFILES) $(LIBRARY)
+ 	if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
+-	$(CC) $(CFLAGS) $(OTHERCFLAGS) -o $@ $(APPDIR)/tidy.c -I$(INCDIR) -L$(LIBDIR) -l$(PROJECT)
++	$(CC) $(CFLAGS) $(OTHERCFLAGS) -o $@ $(APPDIR)/tidy.c -I$(INCDIR) $(LIBRARY)
+ 
+ $(BINDIR)/tab2space: $(APPDIR)/tab2space.c
+ 	if [ ! -d $(BINDIR) ]; then mkdir $(BINDIR); fi
+@@ -205,19 +205,19 @@ clean:
  	if [ "$(BINDIR)" != "$(TOPDIR)" -a -d $(BINDIR) ]; then rmdir $(BINDIR); fi
  
  installhdrs: $(HFILES)