* Make this compile again after previous partial conversion to buildlink.

* Use lesstif/buildlink.mk instead of USE_MOTIF.
* Simplify patch to configure by fixing --with-graphic-libs check.
* Ensure that proper LDFLAGS are passed through to build process to ensure
  linking against proper libraries.

9 files changed, 116 insertions, 117 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 2eaf8f19a0c..afcf335f6fa 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2001/06/29 15:01:35 zuntum Exp $
+# $NetBSD: Makefile,v 1.10 2001/07/21 15:23:51 jlam Exp $
 
 DISTNAME=	amaya-src-4.3.2
 PKGNAME=	amaya-4.3.2
+WRKSRC=		${WRKDIR}/Amaya/work
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.w3.org/pub/amaya/
 EXTRACT_SUFX=	.tgz
@@ -10,23 +11,27 @@ MAINTAINER=	drochner@netbsd.org
 HOMEPAGE=	http://www.w3.org/Amaya/
 COMMENT=	Web Browser/Editor from the World Wide Web Consortium
 
-USE_BUILDLINK_ONLY=	YES
-WRKSRC=		${WRKDIR}/Amaya/work
-GNU_CONFIGURE=	yes
+USE_BUILDLINK_ONLY=	yes
+USE_GMAKE=		yes
+
+GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure
-CONFIGURE_ARGS+=	--with-motif --without-graphic-libs
-CONFIGURE_ENV+=	MOTIFBASE=${MOTIFBASE}
-CFLAGS+=	-Dunix
+CONFIGURE_ARGS+=	--without-graphic-libs
+CONFIGURE_ARGS+=	--with-motif
+CONFIGURE_ENV+=		ac_cv_path_motif="${ac_cv_path_motif}"
+CFLAGS+=		-Dunix
 
-USE_MOTIF=	yes
-USE_GMAKE=	yes
+# Craft the ac_cv_path_motif variable so that configure "finds" the Motif
+# files in the right place.
+#
+ac_cv_path_motif=	no_motif=
+ac_cv_path_motif+=	ac_motif_includes=${BUILDLINK_DIR}/include
+ac_cv_path_motif+=	ac_motif_libraries=${BUILDLINK_DIR}/lib
 
 post-extract:
 	${MKDIR} ${WRKSRC}
-	${RM} -rf ${WRKDIR}/Amaya/libjpeg
-	${RM} -rf ${WRKDIR}/Amaya/libpng/zlib
-	${RM} -rf ${WRKDIR}/Amaya/libpng
 
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/amaya/distinfo b/www/amaya/distinfo
index 8675c2c0f9f..c19a9b2e61e 100644
--- a/www/amaya/distinfo
+++ b/www/amaya/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/05/04 10:49:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/21 15:23:51 jlam Exp $
 
 SHA1 (amaya-src-4.3.2.tgz) = 045e5162fb12df65d5bc0ea798f4f77e35b8f599
 Size (amaya-src-4.3.2.tgz) = 5022936 bytes
-SHA1 (patch-aa) = cfeacf95e8cd2b3638acc9451aaa60eb29fa524d
-SHA1 (patch-ab) = 7a2c449b42814bb71544d4d4fcbc93d98b7ec336
-SHA1 (patch-af) = 66042e4a4299645d809150b3d70806892ed3f203
+SHA1 (patch-aa) = 23774632c468290132020c925823f09f66bae776
+SHA1 (patch-ab) = 701a106edc2d364f3eb848e98547c1446c327609
+SHA1 (patch-ac) = 215bc8e429c249c1c48bb1fcfe358d93ba8a5d38
+SHA1 (patch-ad) = 354e3769fb95c79fb75d872e73c4f39bf432ebff
+SHA1 (patch-ae) = 0392ac77a608950979abb68e02ac6cc93bf9de54
+SHA1 (patch-ag) = 76448c05844a763bbec4d405bdb6ba6bb47d706c
diff --git a/www/amaya/patches/patch-aa b/www/amaya/patches/patch-aa
index d9829906c96..5f493d2c5b4 100644
--- a/www/amaya/patches/patch-aa
+++ b/www/amaya/patches/patch-aa
@@ -1,82 +1,22 @@
-$NetBSD: patch-aa,v 1.5 2001/04/09 16:44:59 drochner Exp $
+$NetBSD: patch-aa,v 1.6 2001/07/21 15:23:52 jlam Exp $
 
---- ../configure.orig	Wed Feb 28 11:34:16 2001
+--- ../configure.orig	Wed Feb 28 02:34:16 2001
 +++ ../configure
-@@ -1651,57 +1651,11 @@
+@@ -1651,7 +1651,7 @@
    :
  fi
  
 -if test "$with_graphic-libs" = "no" ; then
--    echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
--echo "configure:1657: checking for libjpeg version = 6b" >&5
--    cat > conftest.$ac_ext <<EOF
--#line 1659 "configure"
--#include "confdefs.h"
--#include <jpeglib.h>
--         x JPEG_LIB_VERSION x
--EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "x 62 *x" >/dev/null 2>&1; then
--  rm -rf conftest*
--          echo "$ac_t""yes" 1>&6
-         LIBJPEG='-ljpeg'
-         MAKEJPEG='#'
--else
--  rm -rf conftest*
--          echo "$ac_t""no" 1>&6
--        LIBJPEG='../libjpeg.a'              
--fi
--rm -f conftest*
--
--    echo $ac_n "checking for libpng version = 1.0.x""... $ac_c" 1>&6
--echo "configure:1678: checking for libpng version = 1.0.x" >&5
--    cat > conftest.$ac_ext <<EOF
--#line 1680 "configure"
--#include "confdefs.h"
--#include <png.h>
--	x PNG_LIBPNG_VER_STRING x
--EOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  egrep "x \"1.0\..*\" *x" >/dev/null 2>&1; then
--  rm -rf conftest*
--          echo "$ac_t""yes" 1>&6
++if test "$with_graphic_libs" = "no" ; then
+     echo $ac_n "checking for libjpeg version = 6b""... $ac_c" 1>&6
+ echo "configure:1657: checking for libjpeg version = 6b" >&5
+     cat > conftest.$ac_ext <<EOF
+@@ -1686,7 +1686,7 @@
+   rm -rf conftest*
+           echo "$ac_t""yes" 1>&6
          LIBPNG='-lpng'
-         LIBZ=''
+-        LIBZ=''
++        LIBZ='-lz'
  	MAKEPNG='#'
--else
--  rm -rf conftest*
--          echo "$ac_t""no" 1>&6
--        LIBPNG='../libpng.a'
--        LIBZ='../libz.a'
--        
--fi
--rm -f conftest*
--
--else
--    LIBJPEG='../libjpeg.a'
--    LIBPNG='../libpng.a'
--    LIBZ='../libz.a'
--fi
- 
- 
- 
-@@ -6453,10 +6407,7 @@
- #there is a modified header file we need
- PNGINCL="-I\$(THOTDIR)/libpng -I\$(THOTDIR)/libpng/zlib"
- fi
--if test "${LIBJPEG}" = "../libjpeg.a" ; then
--#there is a modified header file we need
--JPEGINCL="-I\$(THOTDIR)/libjpeg"
--fi
-+JPEGINCL="-I${LOCALBASE}/include"
- 
- 
- THOTINCLUDES="-I${API} -I${VAR} -I${INCL} -I${FUNC} -I${SCHEMAS} ${JPEGINCL} ${PNGINCL}"
-@@ -6523,7 +6474,6 @@
- 
- EXTRA_MAKEFILE_IN=
- make_output="Makefile Options.orig:Options.in tools/Makefile \
--       libjpeg/Makefile libpng/Makefile libpng/zlib/Makefile \
-        tools/mkdep/Makefile \
-        tools/cextract-1.7/Makefile thotlib/Makefile \
-        thotlib/include/Makefile batch/Makefile tablelib/Makefile"
+ else
+   rm -rf conftest*
diff --git a/www/amaya/patches/patch-ab b/www/amaya/patches/patch-ab
index 32aa5b266a3..560e54f394e 100644
--- a/www/amaya/patches/patch-ab
+++ b/www/amaya/patches/patch-ab
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.4 2001/04/09 16:44:59 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2001/07/21 15:23:52 jlam Exp $
 
---- ../Makefile.in.orig	Fri Mar 23 22:50:48 2001
+--- ../Makefile.in.orig	Wed Feb 28 02:34:16 2001
 +++ ../Makefile.in
-@@ -364,11 +364,7 @@
- $(THOTDIR)/Options.in \
- $(THOTDIR)/configure.in \
- $(THOTDIR)/Makefile.in \
--$(THOTDIR)/libjpeg/Makefile.in \
- $(THOTDIR)/batch/Makefile.in \
--$(THOTDIR)/libjpeg/Makefile.in \
--$(THOTDIR)/libpng/Makefile.in \
--$(THOTDIR)/libpng/zlib/Makefile.in \
- $(THOTDIR)/tablelib/Makefile.in \
- $(THOTDIR)/thotlib/Makefile.in \
- $(THOTDIR)/thotlib/include/Makefile.in \
+@@ -186,8 +186,9 @@
+ 	  cd $(LIBWWW) ; unset LANG; \
+ 	  if [ ! -f Makefile -o ! -f wwwconf.h ] ; then \
+ 	  	$$libwwwdir/configure \
++			--prefix=${PREFIX} \
+ 			--disable-shared \
+-			--with-zlib="$$localdir/libz.a"; \
++			--with-zlib; \
+ 		$(ECHO) "libwww is configured" ; \
+ 	  fi)
+ 
diff --git a/www/amaya/patches/patch-ac b/www/amaya/patches/patch-ac
new file mode 100644
index 00000000000..025fde8796a
--- /dev/null
+++ b/www/amaya/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.5 2001/07/21 15:23:52 jlam Exp $
+
+--- ../../libwww/Library/src/Makefile.in.orig	Fri Sep 15 08:45:58 2000
++++ ../../libwww/Library/src/Makefile.in
+@@ -123,7 +123,7 @@
+ have_tn3270 = @have_tn3270@
+ subdirs = @subdirs@
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ 
+ lib_LTLIBRARIES =  	libwwwutils.la 	libwwwcore.la 	libwwwtrans.la 	libwwwstream.la 	libwwwcache.la 	libwwwdir.la 	libwwwfile.la 	libwwwftp.la 	libwwwgopher.la 	libwwwmime.la 	libwwwhttp.la 	libwwwnews.la 	libwwwtelnet.la 	libwwwhtml.la 	libwwwapp.la 	libwwwinit.la 	libwwwmux.la 	@WWWXML@ 	@WWWZIP@ 	@WWWWAIS@ 	@WWWSQL@
+ 
+@@ -217,7 +217,7 @@
+ 
+ libwwwsql_la_LDFLAGS = -rpath $(libdir)
+ 
+-INCLUDES =  	-I/usr/local/include 	-I${top_srcdir}/modules/md5 	-I${top_srcdir}/modules/expat/xmlparse
++INCLUDES =  	-I${top_srcdir}/modules/md5 	-I${top_srcdir}/modules/expat/xmlparse
+ 
+ 
+ BUILT_SOURCES =  	wwwsys.h 	HTAABrow.h 	HTAAUtil.h 	HTANSI.h 	HTAccess.h 	HTAlert.h 	HTAncMan.h 	HTAnchor.h 	HTArray.h 	HTAssoc.h 	HTAtom.h 	HTBInit.h 	HTBTree.h 	HTBind.h 	HTBind.h 	HTBound.h 	HTBufWrt.h 	HTCache.h 	HTChannl.h 	HTChunk.h 	HTConLen.h 	HTCookie.h 	HTDNS.h 	HTDemux.h 	HTDescpt.h 	HTDialog.h 	HTDigest.h 	HTDir.h 	HTEPtoCl.h 	HTError.h 	HTEscape.h 	HTEvent.h 	HTEvtLst.h 	HTFSave.h 	HTFTP.h 	HTFTPDir.h 	HTFWrite.h 	HTFile.h 	HTFilter.h 	HTFormat.h 	HTGopher.h 	HTGuess.h 	HTHInit.h 	HTHash.h 	HTHeader.h 	HTHist.h 	HTHome.h 	HTHost.h 	HTHstMan.h 	HTIOStream.h 	HTIcons.h 	HTInet.h 	HTInit.h 	HTLib.h 	HTLink.h 	HTList.h 	HTLocal.h 	HTLog.h 	HTMIME.h 	HTMIMERq.h 	HTMIMImp.h 	HTMIMPrs.h 	HTML.h 	HTMLGen.h 	HTMLPDTD.h 	HTMemLog.h 	HTMemory.h 	HTMerge.h 	HTMethod.h 	HTMulpar.h 	HTMulti.h 	HTMuxCh.h 	HTMuxHeader.h 	HTMuxTx.h 	HTNDir.h 	HTNet.h 	HTNetMan.h 	HTNetTxt.h 	HTNews.h 	HTNewsLs.h 	HTNewsRq.h 	HTNoFree.h 	HTPEP.h 	HTParse.h 	HTPlain.h 	HTProfil.h 	HTProt.h 	HTProxy.h 	HTRDF.h 	HTReader.h 	HTReq.h 	HTReqMan.h 	HTResMan.h 	HTResponse.h 	HTRules.h 	HTSChunk.h 	HTSQL.h 	HTSQLLog.h 	HTSocket.h 	HTStream.h 	HTString.h 	HTStruct.h 	HTStyle.h 	HTTCP.h 	HTTChunk.h 	HTTP.h 	HTTPGen.h 	HTTPReq.h 	HTTPRes.h 	HTTPServ.h 	HTTPUtil.h 	HTTeXGen.h 	HTTee.h 	HTTelnet.h 	HTTimer.h 	HTTrans.h 	HTUTree.h 	HTUU.h 	HTUser.h 	HTUtils.h 	HTWAIS.h 	HTWSRC.h 	HTWWWStr.h 	HTWriter.h 	HTXML.h 	HTXParse.h 	HTZip.h 	HText.h 	HTextImp.h 	SGML.h 	WWWApp.h 	WWWCache.h 	WWWCore.h 	WWWDir.h 	WWWFTP.h 	WWWFile.h 	WWWGophe.h 	WWWHTML.h 	WWWHTTP.h 	WWWInit.h 	WWWLib.h 	WWWMIME.h 	WWWMux.h 	WWWNews.h 	WWWSQL.h 	WWWStream.h 	WWWTelnt.h 	WWWTrans.h 	WWWUtil.h 	WWWWAIS.h 	WWWXML.h 	WWWZip.h
diff --git a/www/amaya/patches/patch-ad b/www/amaya/patches/patch-ad
new file mode 100644
index 00000000000..e232ac5e790
--- /dev/null
+++ b/www/amaya/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2001/07/21 15:23:52 jlam Exp $
+
+--- ../../libwww/modules/expat/xmlparse/Makefile.in.orig	Fri Sep 15 08:45:55 2000
++++ ../../libwww/modules/expat/xmlparse/Makefile.in
+@@ -124,7 +124,7 @@
+ icondir = @icondir@
+ subdirs = @subdirs@
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ 
+ CFLAGS = @CFLAGS@ -DXML_NS
+ 
diff --git a/www/amaya/patches/patch-ae b/www/amaya/patches/patch-ae
new file mode 100644
index 00000000000..d857df70df6
--- /dev/null
+++ b/www/amaya/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2001/07/21 15:23:52 jlam Exp $
+
+--- ../../libwww/modules/expat/xmltok/Makefile.in.orig	Fri Sep 15 08:45:54 2000
++++ ../../libwww/modules/expat/xmltok/Makefile.in
+@@ -124,7 +124,7 @@
+ icondir = @icondir@
+ subdirs = @subdirs@
+ 
+-LDFLAGS = -version-info "1:0:1"
++LDFLAGS = @LDFLAGS@ -version-info "1:0:1"
+ 
+ CFLAGS = @CFLAGS@ -DXML_NS
+ 
diff --git a/www/amaya/patches/patch-af b/www/amaya/patches/patch-af
deleted file mode 100644
index aa7e8722861..00000000000
--- a/www/amaya/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2001/04/09 16:45:00 drochner Exp $
-
---- ../amaya/Makefile.in.orig	Mon Apr  9 17:33:08 2001
-+++ ../amaya/Makefile.in	Mon Apr  9 17:35:24 2001
-@@ -411,7 +411,7 @@
- # amaya application
- ../bin/amaya : $(AMAYA_OBJ) $(AMAYA_OPTION_OBJ) $(AMAYA_LIBS)
- 	@(if test ! -d ../bin ; then $(MKDIR) ../bin ; fi)
--	$(CC) $(LDFLAGS) -o ../bin/amaya $(AMAYA_OBJ) $(AMAYA_OPTION_OBJ) libCSS.a $(LIBS)
-+	$(CC) -o ../bin/amaya $(AMAYA_OBJ) $(AMAYA_OPTION_OBJ) libCSS.a $(LIBS) $(LDFLAGS)
- 	@$(ECHO) "====>" amaya is done
- 
- ../bin/print :
diff --git a/www/amaya/patches/patch-ag b/www/amaya/patches/patch-ag
new file mode 100644
index 00000000000..5b0b4bcce66
--- /dev/null
+++ b/www/amaya/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.4 2001/07/21 15:23:52 jlam Exp $
+
+--- ../amaya/Makefile.libwww.orig	Fri Sep 15 07:24:40 2000
++++ ../amaya/Makefile.libwww
+@@ -45,9 +45,9 @@
+ 
+ AMAYA_LIBWWW_INCLUDES= -I../libwww \
+ 		-I$(THOTDIR)/../libwww/Library/src \
+-		-I$(THOTDIR)../libwww/modules/md5 \
+-		-I$(THOTDIR)../libwww/modules/expat/xmlparse \
+-		-I$(THOTDIR)../libwww/modules/expat/xmltok
++		-I$(THOTDIR)/../libwww/modules/md5 \
++		-I$(THOTDIR)/../libwww/modules/expat/xmlparse \
++		-I$(THOTDIR)/../libwww/modules/expat/xmltok
+ 
+ # this dependency calls the ../Makefile rule that compiles libwww
+ AMAYA_LIBWWW_SRC= ../libz.a amaya_comp_libwww