Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY.

9 files changed, 50 insertions, 21 deletions

diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 69f7bd771ba..a9866a1b4cc 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:44 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/02 21:54:19 jlam Exp $
 
 DISTNAME=	nedit-5.1.1-src
 PKGNAME=	nedit-5.1.1
@@ -9,11 +9,10 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.nedit.org/
 COMMENT=	Motif based standard GUI style text editor
 
-USE_MOTIF=	YES
-USE_XPM=	YES
+USE_BUILDLINK_ONLY=	YES
+ALL_TARGET=		netbsd
 
-NO_CONFIGURE=	YES
-ALL_TARGET=	netbsd
+CFLAGS+=	-I${X11BASE}/include
 
 WRKSRC=	${WRKDIR}/${PKGNAME}
 
@@ -25,4 +24,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nedit
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nedit
 
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/nedit/distinfo b/editors/nedit/distinfo
index 8f21399cbf8..da0a04936a7 100644
--- a/editors/nedit/distinfo
+++ b/editors/nedit/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/02 21:54:19 jlam Exp $
 
 SHA1 (nedit-5.1.1-src.tar.gz) = 29332e39f0d5b3beb62323ea54218571c3b75960
 Size (nedit-5.1.1-src.tar.gz) = 617036 bytes
-SHA1 (patch-aa) = 7387fb085a9a4cf19f033ecc73d79d3c29899e36
+SHA1 (patch-aa) = 435eee2192f7e9f40306b21ce298d04dfc8cfb7b
 SHA1 (patch-ab) = 1d566822879aa6519bea91acb03cdba139edd250
diff --git a/editors/nedit/patches/patch-aa b/editors/nedit/patches/patch-aa
index 38fc07aebeb..1847c0ac981 100644
--- a/editors/nedit/patches/patch-aa
+++ b/editors/nedit/patches/patch-aa
@@ -1,15 +1,15 @@
-$NetBSD: patch-aa,v 1.7 2000/12/28 12:49:51 abs Exp $
+$NetBSD: patch-aa,v 1.8 2001/07/02 21:54:22 jlam Exp $
 
---- makefiles/Makefile.netbsd.orig	Fri Dec 10 23:07:06 1999
+--- makefiles/Makefile.netbsd.orig	Fri Dec 10 18:07:06 1999
 +++ makefiles/Makefile.netbsd
 @@ -2,8 +2,8 @@
  AR=ar
  
  # For editres, add -DEDITRES to CFLAGS and -lXmu to LIBS
 -CFLAGS=-O -I/usr/X11R6/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
-+CFLAGS+=-O -I${X11BASE}/include -I${PREFIX}/include -DUSE_DIRENT -DUSE_LPR_PRINT_CMD
++CFLAGS+=-DUSE_DIRENT -DUSE_LPR_PRINT_CMD
  ARFLAGS=-ur
 -LIBS= -L/usr/X11R6/lib -lm -lXm -lXpm -lXext -lXt -lSM -lICE -lX11
-+LIBS= ${MOTIFLIB} -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lm -lXpm -lXext -lXt -lSM -lICE -lX11
++LIBS= ${LDFLAGS} ${MOTIFLIB} -lm -lXpm -lXext -lXt -lSM -lICE -lX11
  
  include Makefile.common
diff --git a/finance/xinvest/Makefile b/finance/xinvest/Makefile
index f08a3b878d4..af43f47d537 100644
--- a/finance/xinvest/Makefile
+++ b/finance/xinvest/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:46:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/07/02 22:07:04 jlam Exp $
 
 DISTNAME=		xinvest-2.6
 CATEGORIES=		finance x11
@@ -9,13 +9,13 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://sunsite.dk/xinvest/xinvest.html
 COMMENT=		Personal finance tracking and performance tool
 
+USE_BUILDLINK_ONLY=	YES
 USE_IMAKE=		YES
-USE_MOTIF=		YES
-USE_XPM=		YES
-
 NO_INSTALL_MANPAGES=	YES
 
 post-patch:
 	${TOUCH} ${WRKSRC}/Xinvest.man
 
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/xinvest/distinfo b/finance/xinvest/distinfo
index 4b1fdda8763..1faae49af71 100644
--- a/finance/xinvest/distinfo
+++ b/finance/xinvest/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:44:03 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/02 22:07:04 jlam Exp $
 
 SHA1 (xinvest-2.6.tar.gz) = 6593e1ba8025f17032c8bf3227aad7588a364cd4
 Size (xinvest-2.6.tar.gz) = 262494 bytes
 SHA1 (patch-aa) = c3a26cb5779886112af31661934698cd76979e79
 SHA1 (patch-ab) = 7a1709d68a91e2983c73cd565b24467244e6c4ab
+SHA1 (patch-ac) = f605cc559aecc41c71c1c4ee6f37f12e481fcee5
diff --git a/finance/xinvest/patches/patch-ac b/finance/xinvest/patches/patch-ac
new file mode 100644
index 00000000000..7e915956827
--- /dev/null
+++ b/finance/xinvest/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2001/07/02 22:07:05 jlam Exp $
+
+--- Imakefile.orig	Fri Feb  4 17:59:08 2000
++++ Imakefile
+@@ -10,7 +10,7 @@
+ XCOMM 'SHAPE' for a transparent icon.
+ 
+ DEFINES = -DSHAPE
+-INCLUDES = -I$(INCROOT)/X11
++INCLUDES = -I$(BUILDLINK_DIR)/include/X11
+ SYS_LIBRARIES = -lXm -lXpm $(XTOOLLIB) -lXext $(XLIB) -lm
+ DEPLIBS = 
+ 
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 9d863165d0a..4ba320863ee 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/16 14:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/07/02 22:08:35 jlam Exp $
 
 DISTNAME=		xquote-2.2
 CATEGORIES=		finance x11
@@ -9,13 +9,13 @@ MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://sunsite.dk/xinvest/xquote.html
 COMMENT=		WWW ticker symbol quote retrieval program
 
+USE_BUILDLINK_ONLY=	YES
 USE_IMAKE=		YES
-USE_MOTIF=		YES
-USE_XPM=		YES
-
 NO_INSTALL_MANPAGES=	YES
 
 post-patch:
 	${TOUCH} ${WRKSRC}/Xquote.man
 
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/finance/xquote/distinfo b/finance/xquote/distinfo
index f6e5cc9d503..61881654976 100644
--- a/finance/xquote/distinfo
+++ b/finance/xquote/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 13:44:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/02 22:08:36 jlam Exp $
 
 SHA1 (xquote-2.2.tar.gz) = 2b32bfe25f826e9ae0bb28ee608ccbeae39350a6
 Size (xquote-2.2.tar.gz) = 82814 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 26c943dc5e22ea91641503cb7da35e6eeb47cec4
 SHA1 (patch-ac) = 2d9b18f22724f2ba92931077cafca38115a10eb4
 SHA1 (patch-ad) = 36f3d15cddd53b4cf0de17a96213a6fee84c38a2
 SHA1 (patch-ae) = 4aeb6076e76b40bd07d29530a5d2ed029bff7a63
+SHA1 (patch-af) = 4e49b00531a22465470b0b2940678c55e9602d8c
diff --git a/finance/xquote/patches/patch-af b/finance/xquote/patches/patch-af
new file mode 100644
index 00000000000..905a3170298
--- /dev/null
+++ b/finance/xquote/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2001/07/02 22:08:37 jlam Exp $
+
+--- Imakefile.orig	Mon Nov 20 19:20:42 2000
++++ Imakefile
+@@ -12,7 +12,7 @@
+ XCOMM price communication.
+ 
+ DEFINES = -DSHAPE -DXQUOTE
+-INCLUDES = -I$(INCROOT)/X11
++INCLUDES = -I$(BUILDLINK_DIR)/include/X11
+ SYS_LIBRARIES = -lXm -lXpm $(XMULIB) $(XTOOLLIB) -lXext $(XLIB) -lm
+ DEPLIBS = 
+