From mi@misha.cisco.com Wed Feb 17 16:09:37 1999
Return-Path: <mi@misha.cisco.com>
Received: from misha.cisco.com (misha.cisco.com [171.69.206.50])
	by hub.freebsd.org (Postfix) with ESMTP id 36B1B1101A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 17 Feb 1999 16:09:34 -0800 (PST)
	(envelope-from mi@misha.cisco.com)
Received: (from root@localhost)
	by misha.cisco.com (8.9.1/8.9.1) id TAA02225;
	Wed, 17 Feb 1999 19:09:30 -0500 (EST)
	(envelope-from mi)
Message-Id: <199902180009.TAA02225@misha.cisco.com>
Date: Wed, 17 Feb 1999 19:09:30 -0500 (EST)
From: Mikhail Teterin <mi@misha.cisco.com>
Reply-To: mi@aldan.algebra.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: zephyr port problems
X-Send-Pr-Version: 3.2

>Number:         10139
>Category:       ports
>Synopsis:       zephyr port problems
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 17 16:10:01 PST 1999
>Closed-Date:    Sun Mar 14 18:22:08 PST 1999
>Last-Modified:  Sun Mar 14 18:24:00 PST 1999
>Originator:     Mikhail Teterin
>Release:        FreeBSD 3.0-RELEASE i386
>Organization:
Virtual Estates, Inc.
>Environment:

>Description:

	Besides minor problem of ignroing the local setting of CFLAGS,
	there is another one. When starting xzwrite:

	Warning: Cannot convert string "${prefix}/share/xzwrite.bitmap" to type Pixmap
	Warning: Cannot convert string "on" to type ResizeMode

	In addition, the DATADIR should, probably, be /usr/local/share/zephyr,
	rather then just plain /usr/local/share

>How-To-Repeat:

	Build and install the port as is. Try to bring up xzwrite.

>Fix:
	Somewhere, the ${prefix} is not expanded at compile/configure time,
	because the /usr/local/share/xzwrite.bitmap is in place...

>Release-Note:
>Audit-Trail:

From: Sheldon Hearn <sheldonh@iafrica.com>
To: freebsd-gnats-submit@freebsd.org
Cc: Mikhail Teterin <mi@aldan.algebra.com>
Subject: Re: ports/10139: zephyr port problems
Date: Wed, 03 Mar 1999 21:48:30 +0200

 The following diffs against the existing port achieve the following:
 
 	Move files in share/* to share/zephyr/
 	Fix bogus path to xzwrite.bitmap in XZwrite
 	Remove appropriate directories in PLIST
 
 With these diffs applied, xzwrite launches. I'm not a zephyr user, so I
 can't test my fixes beyond that.
 
 Ciao,
 Sheldon.
 
 
 Index: patches/patch-aa
 ===================================================================
 RCS file: /home/ncvs/ports/net/zephyr/patches/patch-aa,v
 retrieving revision 1.1.1.1
 diff -u -d -r1.1.1.1 patch-aa
 --- patch-aa	1995/08/02 05:20:34	1.1.1.1
 +++ patch-aa	1999/03/03 18:44:12
 @@ -1,7 +1,24 @@
 -*** configure	Sun Jul 23 09:11:27 1995
 ---- configure	Tue Aug  1 21:51:42 1995
 +*** configure.orig	Wed Mar  3 20:37:09 1999
 +--- configure	Wed Mar  3 20:39:35 1999
  ***************
 -*** 430,446 ****
 +*** 44,50 ****
 +  bindir='${exec_prefix}/bin'
 +  sbindir='${exec_prefix}/sbin'
 +  libexecdir='${exec_prefix}/libexec'
 +! datadir='${prefix}/share'
 +  sysconfdir='${prefix}/etc'
 +  sharedstatedir='${prefix}/com'
 +  localstatedir='${prefix}/var'
 +--- 44,50 ----
 +  bindir='${exec_prefix}/bin'
 +  sbindir='${exec_prefix}/sbin'
 +  libexecdir='${exec_prefix}/libexec'
 +! datadir='${prefix}/share/zephyr'
 +  sysconfdir='${prefix}/etc'
 +  sharedstatedir='${prefix}/com'
 +  localstatedir='${prefix}/var'
 +***************
 +*** 547,563 ****
    	       confdir=${confdir-'$(prefix)/etc/zephyr'}
    	       sbindir=${sbindir-'$(exec_prefix)/sbin'}
    	       lsbindir=${lsbindir-'$(exec_prefix)/sbin'}
 @@ -19,7 +36,7 @@
    fi
    
    
 ---- 430,449 ----
 +--- 547,566 ----
    	       confdir=${confdir-'$(prefix)/etc/zephyr'}
    	       sbindir=${sbindir-'$(exec_prefix)/sbin'}
    	       lsbindir=${lsbindir-'$(exec_prefix)/sbin'}
 Index: patches/patch-ab
 ===================================================================
 RCS file: patch-ab
 diff -N patch-ab
 --- /dev/null	Wed Mar  3 20:48:01 1999
 +++ patch-ab	Wed Mar  3 19:56:44 1999
 @@ -0,0 +1,20 @@
 +--- clients/xzwrite/Makefile.in.orig	Fri Jul  7 23:55:14 1995
 ++++ clients/xzwrite/Makefile.in	Wed Mar  3 19:29:01 1999
 +@@ -17,6 +17,7 @@
 + VPATH=@srcdir@
 + CC=@CC@
 + INSTALL=@INSTALL@
 ++SED=/usr/bin/sed
 + 
 + DEBUG=-O
 + CFLAGS=$(DEBUG) -DDATADIR=\"$(datadir)\" -I$(top_srcdir)/h -I$(BUILDTOP)/h \
 +@@ -41,7 +42,8 @@
 + install: xzwrite XZwrite
 + 	$(INSTALL) -m 755 -s xzwrite $(bindir)
 + 	$(INSTALL) -m 644 $(srcdir)/xzwrite.1 $(mandir)/man1
 +-	$(INSTALL) -m 644 XZwrite $(datadir)
 ++	$(SED) -e 's#XX_PREFIX_XX#$(prefix)#' < XZwrite >XZwrite.tmp
 ++	$(INSTALL) -m 644 XZwrite.tmp $(datadir)/XZwrite
 + 	$(INSTALL) -m 644 $(srcdir)/xzwrite.bitmap $(datadir)
 + 
 + clean:
 Index: patches/patch-ac
 ===================================================================
 RCS file: patch-ac
 diff -N patch-ac
 --- /dev/null	Wed Mar  3 20:48:01 1999
 +++ patch-ac	Wed Mar  3 20:48:41 1999
 @@ -0,0 +1,11 @@
 +--- clients/xzwrite/XZwrite.in.orig	Wed Mar  3 19:57:39 1999
 ++++ clients/xzwrite/XZwrite.in	Wed Mar  3 20:05:46 1999
 +@@ -17,7 +17,7 @@
 + *readAnyone:		on
 + *readXzwrite:		on
 + 
 +-*icon.bitmap:		@datadir@/xzwrite.bitmap
 ++*icon.bitmap:		XX_PREFIX_XX/share/zephyr/xzwrite.bitmap
 + *icon.translations:	#override\
 + 	<BtnDown>:	set() \n\
 + 	<Btn1Up>:	OpenSend() unset() \n\
 Index: pkg/PLIST
 ===================================================================
 RCS file: /home/ncvs/ports/net/zephyr/pkg/PLIST,v
 retrieving revision 1.6
 diff -u -d -r1.6 PLIST
 --- PLIST	1998/08/18 19:48:45	1.6
 +++ PLIST	1999/03/03 18:46:34
 @@ -66,12 +66,17 @@
  sbin/zmailnotify
  sbin/zpopnotify
  sbin/zshutdown_notify
 -share/XZwrite
 +share/zephyr/XZwrite
  share/doc/zephyr/INSTALL
  share/doc/zephyr/NOTES
  share/doc/zephyr/OPERATING
  share/doc/zephyr/README
  share/doc/zephyr/USING
 -share/xzwrite.bitmap
 -share/zwgc.desc
 -share/zwgc_resources
 +share/zephyr/xzwrite.bitmap
 +share/zephyr/zwgc.desc
 +share/zephyr/zwgc_resources
 +@dirrm etc/zephyr/acl
 +@dirrm etc/zephyr
 +@dirrm include/zephyr
 +@dirrm share/doc/zephyr
 +@dirrm share/zephyr
 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Mar 14 18:22:08 PST 1999 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
