From 316cd2ba430b057ee7da3a2b9844b5d8f2116d7b Mon Sep 17 00:00:00 2001 From: veego Date: Fri, 3 Nov 2000 20:56:31 +0000 Subject: [PATCH] Make it work with xpkwedge. --- databases/xmysqladmin/Makefile | 4 +++- databases/xmysqladmin/files/patch-sum | 4 ++-- databases/xmysqladmin/patches/patch-aa | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index acd693017421..a8df8746c413 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/09/28 20:34:04 fredb Exp $ +# $NetBSD: Makefile,v 1.6 2000/11/03 20:56:31 veego Exp $ # DISTNAME= xmysqladmin-1.0 @@ -11,6 +11,8 @@ HOMEPAGE= http://www.mysql.com/ DEPENDS= mysql-client-3.22.32:../../databases/mysql-client DEPENDS+= xforms>=0.88nb1:../../x11/xforms +MAKE_ENV+= X11PREFIX=${X11PREFIX} + USE_X11= YES USE_XPM= YES diff --git a/databases/xmysqladmin/files/patch-sum b/databases/xmysqladmin/files/patch-sum index 27534b4fdf98..7aa90567eedd 100644 --- a/databases/xmysqladmin/files/patch-sum +++ b/databases/xmysqladmin/files/patch-sum @@ -1,3 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/08/05 17:20:11 bad Exp $ +$NetBSD: patch-sum,v 1.2 2000/11/03 20:56:32 veego Exp $ -MD5 (patch-aa) = 92eaa4e6723f0ecaf1afd7ca54a3933c +MD5 (patch-aa) = e17d89b5f5cb7d2d6195719740ffad18 diff --git a/databases/xmysqladmin/patches/patch-aa b/databases/xmysqladmin/patches/patch-aa index 6eb945484794..910ba31ae252 100644 --- a/databases/xmysqladmin/patches/patch-aa +++ b/databases/xmysqladmin/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/08/05 17:20:11 bad Exp $ +$NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ --- Makefile.orig Mon Dec 7 12:52:39 1998 +++ Makefile Thu Aug 5 19:08:30 1999 @@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/08/05 17:20:11 bad Exp $ #------------------------------------------------------- #XFORMINCDIR = -I/opt/local/include -XFORMINCDIR = -I/usr/X11R6/include -+XFORMINCDIR = -I${X11BASE}/include -I${X11BASE}/include/X11 ++XFORMINCDIR = -I${X11BASE}/include -I${X11PREFIX}/include/X11 ########################################################