Attachment #68121 for bug #100227

View | Details | Raw Unified | Return to bug 100227
Collapse All | Expand All





PORTNAME=	calctool
PORTVERSION=	2.4.13
PORTREVISION=	2
CATEGORIES=	math
MASTER_SITES=	${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	nsayer
DISTNAME=	calctool-2.4pl13

MAINTAINER=	ssedov@mbsd.msk.ru
COMMENT=	A multi-GUI (terminal, X, XView) calculator program

USE_LDCONFIG=	yes

OPTIONS=	X11	"Build X11 version of calctool" on \
		TTY	"Build tty version of calctool" on \
		XVIEW	"Build tty version of calctool" off

MAN1=		calctool.1


PLIST_SUB+=	TTY=""
.else
PLIST_SUB+=	TTY="@comment "
.endif

.if defined(WITH_XVIEW)
BINARIES+=	xv_calctool
LIB_DEPENDS+=	xview.3:${PORTSDIR}/x11-toolkits/xview
PLIST_SUB+=	XVIEW=""
.else
PLIST_SUB+=	XVIEW="@comment "
.endif

.if ${ARCH} == "sparc64"




--- Makefile.orig	Sat May 29 20:35:43 1993
+++ Makefile	Thu Jul 13 12:05:36 2006
@@ -28,7 +28,7 @@
 #  It can also be specified here by uncommenting the following
 #  macro definition and setting appropriately.

 #
-XVIEWINCDIR      = -I$(OPENWINHOME)/include
-XVIEWLIBDIR      = -L$(OPENWINHOME)/lib
+XVIEWINCDIR      = -I%%X11BASE%%/include
+XVIEWLIBDIR      = -L%%X11BASE%%/lib
 #
 #=========================================================================
 #

 
 LIBSRCS         = graphics.c display.c functions.c get.c
 LIBOBJS         = graphics.o display.o functions.o get.o
@@ -208,19 +207,16 @@
 		$(CC) -o sv_calctool $(CFLAGS) $(STDOBJS) sunview.o $(SVIEWLIBS)
 		-cp sv_calctool calctool
 

+xcalctool:      $(OBJS) x11.o
 		$(CC) -o xcalctool $(X11LIBDIR) $(CFLAGS) $(STDOBJS) x11.o \
 				$(X11LIBS)
-		-cp xcalctool calctool
 
-xview:          $(OBJS) xview.o
+xv_calctool:    $(OBJS) xview.o
 		$(CC) -o xv_calctool $(XVIEWLIBDIR) $(CFLAGS) $(STDOBJS) \
 				xview.o $(XVIEWLIBS)
-		-cp xv_calctool calctool
 
 libcalctool.a:  $(LIBOBJS)
 		ar rv $@ $?
@@ -229,8 +225,9 @@
 #  These are the library creation rules for making the shared calctool
 #  library (available with SunOS v4.x).
  




--- xview.c.orig	Thu Jul 13 12:10:02 2006
+++ xview.c	Thu Jul 13 12:11:30 2006
@@ -525,7 +525,7 @@
                       XV_HEIGHT,         16,
                       SERVER_IMAGE_BITS, help_cursor_array,
                       0) ;
-  help_cursor = xv_create(NULL, CURSOR,
+  help_cursor = xv_create(0, CURSOR,
                           CURSOR_XHOT,  0,
                           CURSOR_YHOT,  0,
                           CURSOR_OP,    PIX_SRC | PIX_DST,
@@ -590,7 +590,7 @@
 {
   int choice ;
 
-  choice = (int) menu_get(menu_item, MENU_VALUE,NULL) ;
+  choice = (int) menu_get(menu_item, MENU_VALUE, 0) ;
   if (choice) handle_menu_selection(curmenu, choice) ;
 }
 

Lines 3-9 Link Here

(-)/work/src/ports/calctool/pkg-descr (-1 / +1 lines)
3	calctool - README - November 1989.	3	calctool - README - November 1989.
4		4
5	This is V2.4 of a simple desktop calculator.	5	This is V2.4 of a simple desktop calculator.
6	This version works under X11 and dumb tty terminals.	6	This version works under X11, XView and dumb tty terminals.
7		7
8	It is almost visually identical to V2.1 which was released in August	8	It is almost visually identical to V2.1 which was released in August
9	1988, but internally most of the code has been reworked to include a	9	1988, but internally most of the code has been reworked to include a

Lines 1-5 Link Here

(-)/work/src/ports/calctool/pkg-plist (+1 lines)
1	%%TTY%%bin/tty_calctool	1	%%TTY%%bin/tty_calctool
2	%%X11%%bin/xcalctool	2	%%X11%%bin/xcalctool
		3	%%XVIEW%%bin/xv_calctool
3	lib/libcalctool.so	4	lib/libcalctool.so
4	lib/libcalctool.so.1	5	lib/libcalctool.so.1
5	%%DATADIR%%/calctool.help	6	%%DATADIR%%/calctool.help

Return to bug 100227

Lines 7-25 Link Here

(-)/work/src/ports/calctool/Makefile (-4 / +13 lines)
7		7
8	PORTNAME= calctool	8	PORTNAME= calctool
9	PORTVERSION= 2.4.13	9	PORTVERSION= 2.4.13
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= math	11	CATEGORIES= math
12	MASTER_SITES= ${MASTER_SITE_LOCAL}	12	MASTER_SITES= ${MASTER_SITE_LOCAL}
13	MASTER_SITE_SUBDIR= nsayer	13	MASTER_SITE_SUBDIR= nsayer
14	DISTNAME= calctool-2.4pl13	14	DISTNAME= calctool-2.4pl13
15		15
16	MAINTAINER= ssedov@mbsd.msk.ru	16	MAINTAINER= ssedov@mbsd.msk.ru
17	COMMENT= A multi-GUI (terminal, X) calculator program	17	COMMENT= A multi-GUI (terminal, X, XView) calculator program
18		18
19	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
20		20
21	OPTIONS= X11 "Build X11 version of calctool" on \	21	OPTIONS= X11 "Build X11 version of calctool" on \
22	TTY "Build tty version of calctool" on	22	TTY "Build tty version of calctool" on \
		23	XVIEW "Build tty version of calctool" off
23		24
24	MAN1= calctool.1	25	MAN1= calctool.1
25		26
Lines 38-43 Link Here
38	PLIST_SUB+= TTY=""	39	PLIST_SUB+= TTY=""
39	.else	40	.else
40	PLIST_SUB+= TTY="@comment "	41	PLIST_SUB+= TTY="@comment "
		42	.endif
		43
		44	.if defined(WITH_XVIEW)
		45	BINARIES+= xv_calctool
		46	LIB_DEPENDS+= xview.3:${PORTSDIR}/x11-toolkits/xview
		47	PLIST_SUB+= XVIEW=""
		48	.else
		49	PLIST_SUB+= XVIEW="@comment "
41	.endif	50	.endif
42		51
43	.if ${ARCH} == "sparc64"	52	.if ${ARCH} == "sparc64"

Lines 1-5 Link Here

(-)/work/src/ports/calctool/files/patch-ab (-6 / +15 lines)
1	--- Makefile.orig Sat May 29 20:35:43 1993	1	--- Makefile.orig Sat May 29 20:35:43 1993
2	+++ Makefile Thu Jul 13 01:33:02 2006	2	+++ Makefile Thu Jul 13 12:05:36 2006
3	@@ -28,7 +28,7 @@	3	@@ -28,7 +28,7 @@
4	# It can also be specified here by uncommenting the following	4	# It can also be specified here by uncommenting the following
5	# macro definition and setting appropriately.	5	# macro definition and setting appropriately.
Lines 42-49 Link Here
42	#	42	#
43	-XVIEWINCDIR = -I$(OPENWINHOME)/include	43	-XVIEWINCDIR = -I$(OPENWINHOME)/include
44	-XVIEWLIBDIR = -L$(OPENWINHOME)/lib	44	-XVIEWLIBDIR = -L$(OPENWINHOME)/lib
45	+#XVIEWINCDIR = -I$(OPENWINHOME)/include	45	+XVIEWINCDIR = -I%%X11BASE%%/include
46	+#XVIEWLIBDIR = -L$(OPENWINHOME)/lib	46	+XVIEWLIBDIR = -L%%X11BASE%%/lib
47	#	47	#
48	#=========================================================================	48	#=========================================================================
49	#	49	#
Lines 78-84 Link Here
78		78
79	LIBSRCS = graphics.c display.c functions.c get.c	79	LIBSRCS = graphics.c display.c functions.c get.c
80	LIBOBJS = graphics.o display.o functions.o get.o	80	LIBOBJS = graphics.o display.o functions.o get.o
81	@@ -208,11 +207,10 @@	81	@@ -208,19 +207,16 @@
82	$(CC) -o sv_calctool $(CFLAGS) $(STDOBJS) sunview.o $(SVIEWLIBS)	82	$(CC) -o sv_calctool $(CFLAGS) $(STDOBJS) sunview.o $(SVIEWLIBS)
83	-cp sv_calctool calctool	83	-cp sv_calctool calctool
84		84
Lines 91-98 Link Here
91	+xcalctool: $(OBJS) x11.o	91	+xcalctool: $(OBJS) x11.o
92	$(CC) -o xcalctool $(X11LIBDIR) $(CFLAGS) $(STDOBJS) x11.o \	92	$(CC) -o xcalctool $(X11LIBDIR) $(CFLAGS) $(STDOBJS) x11.o \
93	$(X11LIBS)	93	$(X11LIBS)
94	-cp xcalctool calctool	94	- -cp xcalctool calctool
95	@@ -229,8 +227,9 @@	95
		96	-xview: $(OBJS) xview.o
		97	+xv_calctool: $(OBJS) xview.o
		98	$(CC) -o xv_calctool $(XVIEWLIBDIR) $(CFLAGS) $(STDOBJS) \
		99	xview.o $(XVIEWLIBS)
		100	- -cp xv_calctool calctool
		101
		102	libcalctool.a: $(LIBOBJS)
		103	ar rv $@ $?
		104	@@ -229,8 +225,9 @@
96	# These are the library creation rules for making the shared calctool	105	# These are the library creation rules for making the shared calctool
97	# library (available with SunOS v4.x).	106	# library (available with SunOS v4.x).
98		107

Line 0 Link Here

(-)/work/src/ports/calctool/files/patch-ac (+20 lines)
	1	--- xview.c.orig Thu Jul 13 12:10:02 2006
	2	+++ xview.c Thu Jul 13 12:11:30 2006
	3	@@ -525,7 +525,7 @@
	4	XV_HEIGHT, 16,
	5	SERVER_IMAGE_BITS, help_cursor_array,
	6	0) ;
	7	- help_cursor = xv_create(NULL, CURSOR,
	8	+ help_cursor = xv_create(0, CURSOR,
	9	CURSOR_XHOT, 0,
	10	CURSOR_YHOT, 0,
	11	CURSOR_OP, PIX_SRC \| PIX_DST,
	12	@@ -590,7 +590,7 @@
	13	{
	14	int choice ;
	15
	16	- choice = (int) menu_get(menu_item, MENU_VALUE,NULL) ;
	17	+ choice = (int) menu_get(menu_item, MENU_VALUE, 0) ;
	18	if (choice) handle_menu_selection(curmenu, choice) ;
	19	}
	20