From 5e7b13a24e020e183d482d0d682db2c68b3fabe0 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Wed, 17 Apr 2002 04:45:06 +0000
Subject: Update dependency on xforms. We're mainly bumping the dependency and
 package revision, since we may now link against the forms shared library, and
 because we also have to add a dependency on jpeg lib.

---
 databases/xsqlmenu/Makefile         |  7 +++++--
 databases/xsqlmenu/distinfo         |  4 ++--
 databases/xsqlmenu/patches/patch-aa | 16 ++++++++++++----
 3 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'databases/xsqlmenu')

diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index 8ee38d6685a..c92933e2771 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/04/15 01:11:16 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/17 04:45:12 fredb Exp $
 #
 
 DISTNAME=	xsqlmenu-2.10
+PKGREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.jlab.org/~saw/xsqlmenu/
 
@@ -9,10 +10,12 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.jlab.org/~saw/xsqlmenu/
 COMMENT=	X based GUI for MySQL
 
-DEPENDS+=	xforms-0.8*:../../x11/xforms
 DEPENDS+=	mysql-client-3.*:../mysql-client
+DEPENDS+=	jpeg-6b:../../graphics/jpeg
+DEPENDS+=	xforms>=0.9999:../../x11/xforms
 
 USE_GMAKE=	yes
+USE_XPM=	yes
 MAKE_ENV+=	MAKE=gmake
 
 do-install:
diff --git a/databases/xsqlmenu/distinfo b/databases/xsqlmenu/distinfo
index 8267e436748..1bc48778686 100644
--- a/databases/xsqlmenu/distinfo
+++ b/databases/xsqlmenu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2002/04/17 04:45:13 fredb Exp $
 
 SHA1 (xsqlmenu-2.10.tar.gz) = d97c3237d5bfd2213648067196b5f6d4a57fe706
 Size (xsqlmenu-2.10.tar.gz) = 31458 bytes
-SHA1 (patch-aa) = 854bdd562eaa93bfaa3979baa87049898794154b
+SHA1 (patch-aa) = 68c45a0787adf3a840343cf968d1c2172822a080
diff --git a/databases/xsqlmenu/patches/patch-aa b/databases/xsqlmenu/patches/patch-aa
index 34d7d450a13..c387773818d 100644
--- a/databases/xsqlmenu/patches/patch-aa
+++ b/databases/xsqlmenu/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/27 02:18:07 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/04/17 04:45:13 fredb Exp $
 
---- Makefile.orig	Mon Aug 28 05:57:00 2000
+--- Makefile.orig	Sun Aug 27 22:57:00 2000
 +++ Makefile
-@@ -8,13 +8,13 @@
+@@ -8,36 +8,43 @@
  all: xsqlmenu
  
  #XFORMSBASE = /opt/lib
@@ -18,7 +18,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 02:18:07 hubertf Exp $
  endif
  
  ifeq (${DB},msql)
-@@ -26,18 +26,21 @@
+ CFLAGS  = -O -Wall -I$(MSQLBASE)/include
+ LDFLAGS = -L $(MSQLBASE)/lib -lmsql -L$(XFORMSBASE) -lforms -lXpm \
++	  -L$(LOCALBASE)/lib -ljpeg \
+           -L/usr/X11R6/lib -lX11 -lm
+ LDSTATICFLAGS= -L $(MSQLBASE)/lib -lmsql $(XFORMSBASE)/libforms.a \
++	  $(LOCALBASE)/lib/libjpeg.a \
+           $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm
  .msql:
  	touch .msql
  	rm -f .mysql
@@ -34,8 +40,10 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/27 02:18:07 hubertf Exp $
 +	  -I${X11BASE}/include \
 +	  -I${LOCALBASE}/include
 +LDFLAGS = -L$(MYSQLPREFIX)/lib/mysql -Wl,-R$(MYSQLPREFIX)/lib/mysql -lmysqlclient -L$(XFORMSBASE) -Wl,-R$(XFORMSBASE) -lforms \
++	  -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ljpeg \
 +	-lXpm -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lm
  LDSTATICFLAGS= -L $(MYSQLPREFIX)/lib/mysql -lmysqlclient $(XFORMSBASE)/libforms.a \
++	  $(LOCALBASE)/lib/libjpeg.a \
            $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm
  .mysql:
  	touch .mysql
-- 
cgit v1.2.3