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

4 files changed, 20 insertions, 16 deletions

diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 1c926375029..4325538a1a8 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/04/30 04:16:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/07/03 01:46:07 jlam Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -12,8 +12,10 @@ BUILD_DEPENDS=	perl>=${PERL5_REQD}:../../lang/perl5
 
 USE_GMAKE=	# defined
 USE_X11BASE=	# defined
-USE_MOTIF=	# defined
 
-GNU_CONFIGURE=	# defined
+USE_BUILDLINK_ONLY=	# defined
+GNU_CONFIGURE=		# defined
+CONFIGURE_ENV+=		XINCLUDES="-I${X11BASE}/include"
 
+.include "../../x11/lesstif/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/xps/distinfo b/sysutils/xps/distinfo
index fb4cfe7f457..d114a409b3d 100644
--- a/sysutils/xps/distinfo
+++ b/sysutils/xps/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:13 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/03 01:46:07 jlam Exp $
 
 SHA1 (xps-3.14.tar.gz) = 0c21a13b99f3375d8fc1b94b9bdabec2dd232a59
 Size (xps-3.14.tar.gz) = 168772 bytes
-SHA1 (patch-aa) = 6b8ad36ce378490a5e5cd4a7ccac0910ae2b6ecb
+SHA1 (patch-ab) = 7dc58c1627b61f85e5656d364dd67c33281ce82f
diff --git a/sysutils/xps/patches/patch-aa b/sysutils/xps/patches/patch-aa
deleted file mode 100644
index bbf0a96dc34..00000000000
--- a/sysutils/xps/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2000/05/11 20:54:53 dmcmahill Exp $
-
---- configure.orig	Sat Jul  3 08:20:28 1999
-+++ configure	Thu May 11 15:50:37 2000
-@@ -1707,5 +1707,5 @@
-   # It would also be nice to do this for all -L options, not just this one.
-   if test -n "$x_libraries"; then
--    X_LIBS="$X_LIBS -L$x_libraries"
-+    X_LIBS="$X_LIBS -L$x_libraries -Wl,-R$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
diff --git a/sysutils/xps/patches/patch-ab b/sysutils/xps/patches/patch-ab
new file mode 100644
index 00000000000..c0d1dd6c550
--- /dev/null
+++ b/sysutils/xps/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2001/07/03 01:46:07 jlam Exp $
+
+--- Makefile.in.orig	Mon Jul  5 18:32:56 1999
++++ Makefile.in
+@@ -57,7 +57,7 @@
+ INCLUDES        = -I. @XINCLUDES@
+ LIBS            = @LIBS@
+ ALL_CFLAGS      = $(CFLAGS) $(X_CFLAGS) $(INCLUDES) 
+-ALL_LIBS	= $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
++ALL_LIBS	= $(LDFLAGS) $(LIBS) $(X_LIBS) $(X_PRE_LIBS) $(X_EXTRA_LIBS)
+ 
+ PERL 		= perl
+