cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix xpm conflict with xmysqladmin

Browse Source
This commit is contained in:
margarida 2003-02-02 22:22:38 +00:00
parent 83f6ea2324
commit d5a55e5dfd
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
databases/xmysql/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.5 2002/12/29 18:28:25 margarida Exp $
$OpenBSD: patch-Makefile,v 1.6 2003/02/02 22:22:38 margarida Exp $
--- Makefile.orig Wed Nov 18 04:19:06 1998
+++ Makefile Wed Dec 25 10:53:17 2002
+++ Makefile Sun Feb 2 22:08:06 2003
@@ -31,24 +31,23 @@
PROGRAM = xmysql
@ -62,7 +62,7 @@ $OpenBSD: patch-Makefile,v 1.5 2002/12/29 18:28:25 margarida Exp $
- install --mode=744 mysql.xpm $(XMYSQL_XPMPATH)
- install --mode=744 sqlhelp.txt $(XMYSQL_HELPPATH)
+ install -s -m ${BINMODE} $(PROGRAM) $(INSTALLPATH)
+ install -m 444 mysql.xpm $(XMYSQL_XPMPATH)
+ install -m 444 mysql.xpm $(XMYSQL_XPMPATH)/Mysql.xpm
+ install -d -m 755 $(XMYSQL_HELPPATH)
+ install -m 444 sqlhelp.txt $(XMYSQL_HELPPATH)

12
databases/xmysql/patches/patch-Xmysql_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Xmysql_c,v 1.1 2003/02/02 22:22:38 margarida Exp $
--- Xmysql.c.orig Sun Feb 2 22:12:45 2003
+++ Xmysql.c Sun Feb 2 22:13:05 2003
@@ -78,7 +78,7 @@ create_form_Xmysql_main (void)
fdui->image = obj = fl_add_pixmap (FL_NORMAL_PIXMAP, 700, 20, 80, 40, "");
/* pixmap */
- sprintf (pixmapName, "%s/%s", CURRENT_RD, "mysql.xpm");
+ sprintf (pixmapName, "%s/%s", CURRENT_RD, "Mysql.xpm");
fl_set_pixmap_file (obj, pixmapName);
fdui->xmysql_main_status = obj = fl_add_input (FL_NORMAL_INPUT, 10, 280, 780, 30, "Status");

5
databases/xmysql/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2002/04/07 01:54:48 naddy Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/02/02 22:22:39 margarida Exp $
bin/xmysql
include/X11/pixmaps/mysql.xpm
include/X11/pixmaps/Mysql.xpm
lib/X11/xmysql/sqlhelp.txt
@dirrm lib/X11/xmysql
@dirrm include/X11/pixmaps