From 80adf730e4f4f7bd43e06a3e29c7dd89950ea573 Mon Sep 17 00:00:00 2001 From: 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/xmysql/Makefile | 8 +++++--- databases/xmysql/distinfo | 4 ++-- databases/xmysql/patches/patch-aa | 17 +++++++++++++---- databases/xmysqladmin/Makefile | 6 ++++-- databases/xmysqladmin/distinfo | 4 ++-- databases/xmysqladmin/patches/patch-aa | 11 ++++++----- databases/xsqlmenu/Makefile | 7 +++++-- databases/xsqlmenu/distinfo | 4 ++-- databases/xsqlmenu/patches/patch-aa | 16 ++++++++++++---- 9 files changed, 51 insertions(+), 26 deletions(-) (limited to 'databases') diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 3d5e29ecd8c..c35c9290d70 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2001/03/26 14:54:20 bad Exp $ +# $NetBSD: Makefile,v 1.9 2002/04/17 04:45:09 fredb Exp $ # DISTNAME= xmysql-1.10 +PKGREVISION= 1 CATEGORIES= databases x11 MASTER_SITES= http://web.wt.net/~dblhack/ @@ -9,8 +10,9 @@ MAINTAINER= bad@netbsd.org HOMEPAGE= http://web.wt.net/~dblhack COMMENT= Graphical front end to the MySQL database engine -DEPENDS= mysql-client>=3.23.35:../../databases/mysql-client -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= mysql-client>=3.23.35:../../databases/mysql-client +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms MAKE_ENV+= X11PREFIX=${X11PREFIX} USE_X11= YES diff --git a/databases/xmysql/distinfo b/databases/xmysql/distinfo index 852744534ed..5c535eef95d 100644 --- a/databases/xmysql/distinfo +++ b/databases/xmysql/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:10 fredb Exp $ SHA1 (xmysql-1.10.tar.gz) = 241860b2c4550f70acbd7ef6cf327cb5df403b78 Size (xmysql-1.10.tar.gz) = 187321 bytes -SHA1 (patch-aa) = 48dc8992d6c7b25049d04fd8415d7572f077f80d +SHA1 (patch-aa) = 3522b0f39ff5d18bc9cadd62192b4d7f0e401d48 diff --git a/databases/xmysql/patches/patch-aa b/databases/xmysql/patches/patch-aa index f0e824a7791..7d10b0183a5 100644 --- a/databases/xmysql/patches/patch-aa +++ b/databases/xmysql/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2000/11/03 20:52:47 veego Exp $ +$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:10 fredb Exp $ ---- Makefile.orig Wed Nov 18 05:19:06 1998 -+++ Makefile Thu Aug 5 18:57:34 1999 +--- Makefile.orig Tue Nov 17 22:19:06 1998 ++++ Makefile @@ -31,24 +31,24 @@ PROGRAM = xmysql @@ -31,13 +31,22 @@ $NetBSD: patch-aa,v 1.2 2000/11/03 20:52:47 veego Exp $ +STDLFLAGS = ${LDFLAGS} +MYSQLINC = -I${PREFIX}/include/mysql +MYSQLLOAD = -Wl,-R${PREFIX}/lib/mysql -L${PREFIX}/lib/mysql -lmysqlclient -+XFORMLIBDIR = ++XFORMLIBDIR = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib +XFORMINCDIR = -I${X11PREFIX}/include/X11 +XINC = -I${X11BASE}/include +XLOAD = -lX11 # objects needed for the program OBJS = Xmysql.o \ +@@ -60,7 +60,7 @@ + ${PROGRAM}: $(OBJS) + $(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \ + $(XINC) $(STDLFLAGS) $(MYSQLLOAD) \ +- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm ++ $(XLOAD) $(XFORMLIBDIR) -lforms -ljpeg -lXpm -lm + + .c.o: + $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC) @@ -69,8 +69,8 @@ rm -f ${PROGRAM} $(OBJS) diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 1b566a470df..2d8dc9775ec 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2001/03/26 14:54:20 bad Exp $ +# $NetBSD: Makefile,v 1.9 2002/04/17 04:45:11 fredb Exp $ # DISTNAME= xmysqladmin-1.0 +PKGREVISION= 1 CATEGORIES= databases x11 MASTER_SITES= http://www.mysql.com/Contrib/ @@ -10,7 +11,8 @@ HOMEPAGE= http://www.mysql.com/ COMMENT= Graphical front end for administering MySQL databases DEPENDS= mysql-client>=3.23.35:../../databases/mysql-client -DEPENDS+= xforms>=0.88nb1:../../x11/xforms +DEPENDS+= jpeg-6b:../../graphics/jpeg +DEPENDS+= xforms>=0.9999:../../x11/xforms MAKE_ENV+= X11PREFIX=${X11PREFIX} diff --git a/databases/xmysqladmin/distinfo b/databases/xmysqladmin/distinfo index 35491019d24..f40200ae13d 100644 --- a/databases/xmysqladmin/distinfo +++ b/databases/xmysqladmin/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:11 fredb Exp $ SHA1 (xmysqladmin-1.0.tar.gz) = 60697568fef51c2361a7a31262cb1691c25c3d46 Size (xmysqladmin-1.0.tar.gz) = 65673 bytes -SHA1 (patch-aa) = a72cc20c578c90cfc668ac539c5a660ba01ea0ef +SHA1 (patch-aa) = 64fd43bbbdf96614d7ac9121be21a3f1c30ced3c diff --git a/databases/xmysqladmin/patches/patch-aa b/databases/xmysqladmin/patches/patch-aa index 910ba31ae25..177678b8e2e 100644 --- a/databases/xmysqladmin/patches/patch-aa +++ b/databases/xmysqladmin/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ +$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:12 fredb Exp $ ---- Makefile.orig Mon Dec 7 12:52:39 1998 -+++ Makefile Thu Aug 5 19:08:30 1999 +--- Makefile.orig Mon Dec 7 05:52:39 1998 ++++ Makefile @@ -34,7 +34,7 @@ # This is used by 'make install' command #------------------------------------------------------- @@ -76,7 +76,7 @@ $NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ #------------------------------------------------------- #XFORMLIBDIR = -L/opt/local/i386/lib -XFORMLIBDIR = -L/usr/lib -+XFORMLIBDIR = ++XFORMLIBDIR = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}lib ######################################################## @@ -107,8 +107,9 @@ $NetBSD: patch-aa,v 1.2 2000/11/03 20:56:32 veego Exp $ ${PROGRAM}: $(OBJS) $(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \ $(XINC) $(STDLFLAGS) $(MYSQLLOAD) \ - $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS) +- $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS) - ./$(PROGRAM) ++ $(XLOAD) $(XFORMLIBDIR) -lforms -ljpeg $(LIBS) .c.o: $(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC) 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