From kline@tao.thought.org  Sat May 20 17:07:39 2000
Return-Path: <kline@tao.thought.org>
Received: from gershwin.tera.com (gershwin.tera.com [207.224.230.28])
	by hub.freebsd.org (Postfix) with ESMTP id 9F73D37B7BE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 May 2000 17:07:26 -0700 (PDT)
	(envelope-from kline@tao.thought.org)
Received: from tao.thought.org (tao.sea.tera.com [207.108.223.55])
	by gershwin.tera.com (8.9.3/8.9.3) with ESMTP id RAA02744
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 May 2000 17:07:44 -0700 (PDT)
Received: (from kline@localhost) by tao.thought.org (8.9.3/8.7.3) id RAA91041; Sat, 20 May 2000 17:07:12 -0700 (PDT)
Message-Id: <200005210007.RAA91041@tao.thought.org>
Date: Sat, 20 May 2000 17:07:12 -0700 (PDT)
From: Gary Kline <kline@tao.thought.org>
Reply-To: kline@tao.thought.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: Forward rev of muuz port: 0.27.1 to 0.27.2
X-Send-Pr-Version: 3.2

>Number:         18696
>Category:       ports
>Synopsis:       Forward rev of muuz port: 0.27.1 to 0.27.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    knu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 20 17:10:01 PDT 2000
>Closed-Date:    Tue May 30 17:52:42 JST 2000
>Last-Modified:  Tue May 30 17:55:28 JST 2000
>Originator:     Gary Kline
>Release:        FreeBSD 3.2-RELEASE i386
>Organization:
Thought Unlimited
>Environment:

	Env requires Sound-card and the X Window System ...

>Description:

	Upgrade via patch....   This version has several minor fixes,
	and a few not-so-minor.  

>How-To-Repeat:

	

>Fix:
	
	

diff -ruN muuz.271/Makefile muuz.272/Makefile
--- muuz.271/Makefile	Sun Apr 30 13:24:05 2000
+++ muuz.272/Makefile	Fri May 19 14:05:33 2000
@@ -1,21 +1,20 @@
 # Ports collection makefile for:  muuz
-# Date created:			  21 March 2000
+# Date created:			  21 May 2000
 # Whom:				  kline@thought.org
 #
-# $FreeBSD: ports/misc/muuz/Makefile,v 1.1.1.1 2000/04/30 20:24:05 steve Exp $
+# $FreeBSD: ports/misc/muuz/Makefile,v 1.23 2000/02/13 03:23:26 obrien Exp $
 #
 
-PORTNAME=	muuz
-PORTVERSION=	0.27.1
-CATEGORIES=	misc
+PORTNAME=       muuz
+PORTVERSION=    0.27.2
+CATEGORIES=     misc games
 MASTER_SITES=	ftp://toxic.magnesium.net/pub/FreeBSD/muuz/
 
 MAINTAINER=	kline@thought.org
 
 LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
-#USE_IMAKE=	yes        (... no, not yet)
-USE_X_PREFIX=	yes
+USE_IMAKE=	yes
 MAN1=		muuz.1
 
 .include <bsd.port.mk>
diff -ruN muuz.271/files/md5 muuz.272/files/md5
--- muuz.271/files/md5	Sun Apr 30 13:24:05 2000
+++ muuz.272/files/md5	Sat May 20 10:35:39 2000
@@ -1 +1 @@
-MD5 (muuz-0.27.1.tar.gz) = 0bd78bf700a50496e1346b4acea05fe3
+MD5 (muuz-0.27.2.tar.gz) = 9ea52f17f310988e012fbd29e5304c7f
diff -ruN muuz.271/files/md5~ muuz.272/files/md5~
--- muuz.271/files/md5~	Wed Dec 31 16:00:00 1969
+++ muuz.272/files/md5~	Fri May 19 19:02:56 2000
@@ -0,0 +1 @@
+MD5 (muuz-0.27.2.tar.gz) = 9356c6eae1c575bd09867b4f78a69b42
diff -ruN muuz.271/patches/patch-aa muuz.272/patches/patch-aa
--- muuz.271/patches/patch-aa	Sun Apr 30 13:24:05 2000
+++ muuz.272/patches/patch-aa	Wed Dec 31 16:00:00 1969
@@ -1,11 +0,0 @@
---- errMessage.h.orig	Sun Apr 30 13:24:41 2000
-+++ errMessage.h	Sun Apr 30 13:25:15 2000
-@@ -34,7 +34,7 @@
-   void setProgname(char *argv0, char *def)
-     { ___progn = (argv0 != NULL && (char *)*argv0 != NULL)?argv0:def;}
-   // Return program name set by setProgname, or an empty string if not set.
--  char *getProgname(void) { return ___progn != NULL ? ___progn : ""; }
-+  char *getProgname(void) { return ___progn != NULL ? ___progn : (char *)""; }
- 
-   void msgExit(ecategory_t category);
-   void msg_printf(const char *fmt, ...);
diff -ruN muuz.271/patches/patch-ab muuz.272/patches/patch-ab
--- muuz.271/patches/patch-ab	Sun Apr 30 13:24:06 2000
+++ muuz.272/patches/patch-ab	Wed Dec 31 16:00:00 1969
@@ -1,20 +0,0 @@
---- muuzmenu.c.orig	Sun Apr 30 13:26:12 2000
-+++ muuzmenu.c	Sun Apr 30 13:26:37 2000
-@@ -162,14 +162,14 @@
-   
-   entry = XtCreateManagedWidget("New File", smeBSBObjectClass, menu1, NULL, 0);
-   
--  XtAddCallback(entry, XtNcallback, print_string, "one");
-+  XtAddCallback(entry, XtNcallback, print_string, (char *)"one");
-   
-   entry = XtCreateManagedWidget("Open File", smeBSBObjectClass, menu1, NULL, 0);
-   
--  XtAddCallback(entry, XtNcallback, print_string, "two");
-+  XtAddCallback(entry, XtNcallback, print_string, (char *)"two");
-   
-   entry = XtCreateManagedWidget("View File", smeBSBObjectClass, menu1, NULL, 0);
--  XtAddCallback(entry, XtNcallback, print_string, "ViewFile"); 
-+  XtAddCallback(entry, XtNcallback, print_string, (char *)"ViewFile"); 
-   
-   entry = XtCreateManagedWidget("Iconify", smeBSBObjectClass, menu1, NULL, 0);
-   XtAddCallback(entry, XtNcallback, iconifyCB, NULL); 

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: knu 
State-Changed-When: Sun May 21 20:17:31 JST 2000 
State-Changed-Why:  
Waiting for the originator to review the additional patches. 


Responsible-Changed-From-To: freebsd-ports->knu 
Responsible-Changed-By: knu 
Responsible-Changed-When: Sun May 21 20:17:31 JST 2000 
Responsible-Changed-Why:  
I'll do with this. 

From: "Akinori -Aki- MUSHA" <knu@idaemons.org>
To: kline@tao.thought.org
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/18696: Forward rev of muuz port: 0.27.1 to 0.27.2
Date: Sun, 21 May 2000 20:16:31 +0900

 Looking over your submission, I found you need to add the following
 patches.  The first one is obvious, and the second one is to make it
 compile with the newer gcc, i.e. on 4.0+ systems:
 
 [patch-ac]
 --- Imakefile.orig	Sat May 20 10:55:46 2000
 +++ Imakefile	Sun May 21 19:01:32 2000
 @@ -53,6 +53,7 @@
  	@grep -v "^#"  helpOverview.h > ./helpOverview.text
  	@grep -v "^#"  acknowledgement.h > ./acknowledgement.text
  	@grep -v "^#"  aboutMuuz.h > ./aboutMuuz.text
 +	@mkdir $(PROJECTROOT)/share/muuz
  	@cp -pf helpUserPrep.text   $(PROJECTROOT)/share/muuz/helpUserPrep.text
  	@cp -pf helpPrep.text       $(PROJECTROOT)/share/muuz/helpPrep.text
  	@cp -pf helpOverview.text   $(PROJECTROOT)/share/muuz/helpOverview.text
 [/patch-ac]
 
 [patch-ad]
 --- main.c.orig	Sat May 20 04:57:58 2000
 +++ main.c	Sun May 21 18:49:43 2000
 @@ -532,6 +532,7 @@
    }
  
  }
 +void
  usage(char *progname)
  {
    fprintf(stderr, "Usage: %s: [-hV]\n", progname);
 [/patch-ad]
 
 Please review these patches and send a report to the original author
 as well as us, if they seem to work right.
 
 
 Also, it seems you'd like the port to be categorized in both "misc"
 plus "games", but the category "misc" is for those ports which have no
 appropriate categories to put in, by definition. (except language
 specific categories)  Please refer to the handbook for details.
 
 If you are okay with it (that I transfer the port from "misc" to
 "games" after a repository copy), let me know.
 
 Thanks for taking care of the port!
 
 -- 
                            /
                           /__  __       
                          / )  )  ) )  /
 Akinori -Aki- MUSHA aka / (_ /  ( (__(  @ idaemons.org / FreeBSD.org
 
 "We're only at home when we're on the run, on the wing, on the fly"
 
State-Changed-From-To: feedback->closed 
State-Changed-By: knu 
State-Changed-When: Tue May 30 17:52:42 JST 2000 
State-Changed-Why:  
Committed, thanks.  Please include `patch-ad' in your next release. 

Next time please do not touch "Date created" nor "$FreeBSD ..$" lines. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=18696 
>Unformatted:
