diff options
| author | fredb <fredb@pkgsrc.org> | 2002-04-17 04:45:06 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2002-04-17 04:45:06 +0000 |
| commit | 9807afcb602d970ee86027a46a72552f83b0c0c3 (patch) | |
| tree | dc783e63ef8448e3a620be967f9233cff8ff8e71 /databases/xmysql | |
| parent | 6a1cfa23665b0a3668d7753fb1d0c41cfb290b90 (diff) | |
| download | pkgsrc-9807afcb602d970ee86027a46a72552f83b0c0c3.tar.gz | |
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.
Diffstat (limited to 'databases/xmysql')
| -rw-r--r-- | databases/xmysql/Makefile | 8 | ||||
| -rw-r--r-- | databases/xmysql/distinfo | 4 | ||||
| -rw-r--r-- | databases/xmysql/patches/patch-aa | 17 |
3 files changed, 20 insertions, 9 deletions
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) |