From owner-freebsd-ports  Tue Mar 28 10:10:31 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 0759C37C083
	for <freebsd-ports@FreeBSD.org>; Tue, 28 Mar 2000 10:10:11 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id KAA40166;
	Tue, 28 Mar 2000 10:10:10 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id A7DA937BF59
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 28 Mar 2000 10:08:25 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id KAA39781;
	Tue, 28 Mar 2000 10:08:25 -0800 (PST)
	(envelope-from nobody@FreeBSD.org)
Message-Id: <200003281808.KAA39781@freefall.freebsd.org>
Date: Tue, 28 Mar 2000 10:08:25 -0800 (PST)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/17647: Update port: math/wmcalc
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         17647
>Category:       ports
>Synopsis:       Update port: math/wmcalc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 28 10:10:10 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Support CC/X11BASE properly

Remove file:
patches/patch-ab  patches/patch-ac

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/math/wmcalc/patches/patch-aa math/wmcalc/patches/patch-aa
--- /usr/ports/math/wmcalc/patches/patch-aa	Tue Mar 28 21:46:19 2000
+++ math/wmcalc/patches/patch-aa	Wed Mar 29 02:11:33 2000
@@ -1,11 +1,11 @@
---- Makefile.orig	Sat Nov 27 01:40:16 1999
-+++ Makefile	Tue Mar 28 07:35:20 2000
+--- Makefile.orig	Sat Nov 27 15:40:16 1999
++++ Makefile	Wed Mar 29 02:11:13 2000
 @@ -1,15 +1,15 @@
 -INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
 -LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
 -LIBS = -lX11 -lXpm -lXext
-+INCLUDES=-I${PREFIX}/include
-+LIBINC=-L${PREFIX}/lib
++INCLUDES =-I${X11BASE}/include/X11 -I${X11BASE}/include
++LIBINC =-L${X11BASE}/lib
 +LIBS = -lX11 -lXpm -lXext -lm
  
  TARGET = wmcalc
@@ -13,11 +13,11 @@
  
  .c.o:
 -	gcc -O2 -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
-+	gcc ${CFLAGS} -c -Wall ${INCLUDES} ${FLAGS} $< -o $*.o
++	${CC} ${CFLAGS} -c ${INCLUDES} $< -o $*.o
  
  ${TARGET}: ${OBJECTS}
 -	gcc -O2 -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
-+	gcc ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
++	${CC} ${CFLAGS} -o ${TARGET} ${OBJECTS} ${LIBINC} ${LIBS}
  
  clean::
  	for i in ${OBJECTS}; do if [ -e $$i ] ; then rm $$i; fi; done 
diff -urN /usr/ports/math/wmcalc/patches/patch-ab math/wmcalc/patches/patch-ab
--- /usr/ports/math/wmcalc/patches/patch-ab	Tue Mar 28 21:46:19 2000
+++ math/wmcalc/patches/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
---- wmcalc.c.orig	Mon Dec 20 00:17:29 1999
-+++ wmcalc.c	Tue Mar 28 07:34:28 2000
-@@ -10,11 +10,11 @@
-  *    development of wmbutton.  I'm listing them here partially as thanks for 
-  *    helping out, catching bugs in the code, etc.
-  ***********************************************************************/
--#include <Xlib.h>
--#include <Xutil.h>
--#include <xpm.h>
--#include <extensions/shape.h>
--#include <keysym.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/xpm.h>
-+#include <X11/extensions/shape.h>
-+#include <X11/keysym.h>
- #include <stdio.h>
- #include <math.h>
- #include <stdlib.h>
diff -urN /usr/ports/math/wmcalc/patches/patch-ac math/wmcalc/patches/patch-ac
--- /usr/ports/math/wmcalc/patches/patch-ac	Tue Mar 28 21:46:20 2000
+++ math/wmcalc/patches/patch-ac	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
---- wmcalc.h.orig	Mon Dec 20 00:03:03 1999
-+++ wmcalc.h	Tue Mar 28 07:35:01 2000
-@@ -3,11 +3,11 @@
-  */
- 
- /***** Includes ********************************************************/
--#include <Xlib.h>
--#include <Xutil.h>
--#include <xpm.h>
--#include <extensions/shape.h>
--#include <keysym.h>
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+#include <X11/xpm.h>
-+#include <X11/extensions/shape.h>
-+#include <X11/keysym.h>
- #include <stdio.h>
- #include <math.h>
- #include <stdlib.h>


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message