Date: Mon, 10 Sep 2001 10:06:26 -0700 (PDT) From: david quattlebaum <david.quattlebaum@sas.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/30491: zephyr DATADIR descrepancy Message-ID: <200109101706.f8AH6QY85588@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 30491
>Category: ports
>Synopsis: zephyr DATADIR descrepancy
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 10 10:10:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: david quattlebaum
>Release: 4.3-STABLE-20010625
>Organization:
sas institute, inc.
>Environment:
FreeBSD gamecock.unx.sas.com 4.3-STABLE-20010625
FreeBSD 4.3-STABLE-20010625 #3: Tue Jul 10 13:20:33 EDT 2001
toor@gamecock.unx.sas.com:/usr/src/sys/compile/GAMECOCK i386
>Description:
zwgc and xzwrite are looking for system files in the wrong place.
DATADIR is set to: /usr/local/share/zephyr during configure and so
"make install" puts the files there.
zwgc and xzwrite look for the system files in:
/usr/local/share/zephyr/zephyr (one too many zephyr's in path).
the following patch will correct the problem.
>How-To-Repeat:
install zephyr and try to zwgc from a user that has NO .zwgc.desc
>Fix:
--- zwgc/main.c.orig Fri Jan 22 18:20:22 1999
+++ zwgc/main.c Fri Sep 7 09:52:01 2001
@@ -141,7 +141,7 @@
/* var_clear_all_variables(); <<<>>> */
- sprintf(defdesc, "%s/zephyr/%s", DATADIR, DEFDESC);
+ sprintf(defdesc, "%s/%s", DATADIR, DEFDESC);
input_file = locate_file(description_filename_override, USRDESC,
defdesc);
if (input_file)
program = parse_file(input_file);
--- zwgc/X_driver.c.orig Fri Jan 22 18:20:06 1999
+++ zwgc/X_driver.c Fri Sep 7 09:52:27 2001
@@ -264,7 +264,7 @@
return(1);
/* Read in our application-specific resources: */
- sprintf(dbasename, "%s/zephyr/zwgc_resources", DATADIR);
+ sprintf(dbasename, "%s/zwgc_resources", DATADIR);
temp_db1 = XrmGetFileDatabase(dbasename);
/*
--- clients/xzwrite/interface.c.orig Thu Apr 30 16:03:32 1998
+++ clients/xzwrite/interface.c Fri Sep 7 09:56:56 2001
@@ -140,11 +140,11 @@
strlen(DATADIR) + 12);
if (path2 != NULL) {
#ifdef HAVE_PUTENV
- sprintf(path2, "XFILESEARCHPATH=%s:%s/zephyr/%%N", path1,
+ sprintf(path2, "XFILESEARCHPATH=%s:%s/%%N", path1,
DATADIR);
putenv(path2);
#else
- sprintf(path2, "%s:%s/zephyr/%%N", path1, DATADIR);
+ sprintf(path2, "%s:%s/%%N", path1, DATADIR);
setenv("XFILESEARCHPATH", path2, 1);
free(path2);
#endif
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109101706.f8AH6QY85588>