Re: ucblogo : update : request

On 2018/12/10 19:33, Mayuresh Kathe wrote:
> can ucblogo be updated from of 5.5 to currently available 6.0?
> https://people.eecs.berkeley.edu/~bh/downloads/ucblogo.tar.gz
>
> if possible, try to build it the same way as before, i.e. without any
> dependencies.
> i say this because the package available under ubuntu depends on wxwidgets
> now.
>
> thanks,
>
> -mayuresh
>

Please try this.

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ucblogo/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 23 Oct 2017 17:10:51 -0000 1.17
+++ Makefile 10 Dec 2018 14:46:25 -0000
@@ -1,30 +1,32 @@
# $OpenBSD: Makefile,v 1.17 2017/10/23 17:10:51 sthen Exp $

-COMMENT= Berkeley's implementation of the logo programming language
-DISTNAME= ucblogo-5.5
-REVISION= 4
+COMMENT= Berkeley's implementation of the logo programming language#'
+DISTNAME= ucblogo-6.0
+DISTFILES= ${DISTNAME}{ucblogo}${EXTRACT_SUFX}
+
CATEGORIES= lang

-HOMEPAGE= http://www.cs.berkeley.edu/~bh/logo.html
+HOMEPAGE= https://people.eecs.berkeley.edu/~bh/logo.html
+MASTER_SITES= https://people.eecs.berkeley.edu/~bh/downloads/

# BSD
PERMIT_PACKAGE_CDROM= Yes

-WANTLIB= ICE SM X11 c m termcap xcb
+WANTLIB += ICE SM X11 c curses m
+
NO_TEST= Yes

MAKE_FILE= makefile
ALL_TARGET= logo makehelp helpfiles helpfiles/HELPCONTENTS

CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--x-includes=${X11BASE}/include \
+CONFIGURE_ARGS+= --wx-disable \
+ --x-includes=${X11BASE}/include \
--x-libraries=${X11BASE}/lib

pre-configure:
- @perl -pi.beforesubst \
- -e 's:\@logopath@:${LOCALBASE}/share/ucblogo:g;' \
- -e 's:\@logohelp@:${LOCALBASE}/share/ucblogo/helpfiles:g;' \
- ${WRKSRC}/init.c
+ rm ${WRKSRC}/config.cache
+ ${SUBST_CMD} ${WRKSRC}/init.c

do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/ucblogo/helpfiles
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/ucblogo/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:14:20 -0000 1.4
+++ distinfo 10 Dec 2018 14:46:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (ucblogo-5.5.tar.gz) = opIuBlETJ03XAbo7A0SBNMzrBH89bK2+UyLiMGHi/50=
-SIZE (ucblogo-5.5.tar.gz) = 1290273
+SHA256 (ucblogo-6.0.tar.gz) = xlnpiekoTvwPkE69feJLVZwtdDSpi7nJLCPmwRtJzvM=
+SIZE (ucblogo-6.0.tar.gz) = 6694879
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/lang/ucblogo/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 6 Dec 2013 16:06:50 -0000 1.1
+++ patches/patch-configure 10 Dec 2018 14:46:25 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure,v 1.1 2013/12/06 16:06:50 jca Exp $
---- configure.orig Thu Dec 5 23:13:36 2013
-+++ configure Thu Dec 5 23:13:51 2013
-@@ -1582,7 +1582,7 @@ EOF
+Index: configure
+--- configure.orig
++++ configure
+@@ -1673,7 +1673,7 @@ EOF

fi

Index: patches/patch-graphics_c
===================================================================
RCS file: /cvs/ports/lang/ucblogo/patches/patch-graphics_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-graphics_c
--- patches/patch-graphics_c 25 May 2017 18:09:55 -0000 1.1
+++ patches/patch-graphics_c 10 Dec 2018 14:46:25 -0000
@@ -1,27 +1,18 @@
-$OpenBSD: patch-graphics_c,v 1.1 2017/05/25 18:09:55 espie Exp $
+$OpenBSD$

Index: graphics.c
--- graphics.c.orig
+++ graphics.c
-@@ -553,7 +553,7 @@ NODE *lback(NODE *arg) {
- }
+@@ -570,7 +570,7 @@ NODE *lback(NODE *arg) {

NODE *lshowturtle(NODE *args) {
+ if(!graphics_setup) graphics_setup++;
- prepare_to_draw;
+ prepare_to_draw_NULL;
if (!turtle_shown) {
turtle_shown = TRUE;
draw_turtle();
-@@ -563,7 +563,7 @@ NODE *lshowturtle(NODE *args) {
- }
-
- NODE *lhideturtle(NODE *args) {
-- prepare_to_draw;
-+ prepare_to_draw_NULL;
- if (turtle_shown) {
- draw_turtle();
- turtle_shown = FALSE;
-@@ -581,7 +581,7 @@ NODE *lsetheading(NODE *arg) {
+@@ -616,7 +616,7 @@ NODE *lsetheading(NODE *arg) {

val = numeric_arg(arg);
if (NOT_THROWING) {
@@ -30,7 +21,7 @@ Index: graphics.c
draw_turtle();
if (nodetype(val) == INT)
turtle_heading = (FLONUM)getint(val);
-@@ -685,7 +685,7 @@ NODE *lscrunch(NODE *args) {
+@@ -720,7 +720,7 @@ NODE *lscrunch(NODE *args) {
}

NODE *lhome(NODE *args) {
@@ -39,7 +30,7 @@ Index: graphics.c
out_of_bounds = FALSE;
setpos_bynumber((FLONUM)0.0, (FLONUM)0.0);
draw_turtle();
-@@ -841,7 +841,7 @@ NODE *lsety(NODE *args) {
+@@ -884,7 +884,7 @@ NODE *lsety(NODE *args) {
}

NODE *lwrap(NODE *args) {
@@ -48,7 +39,7 @@ Index: graphics.c
draw_turtle();
current_mode = wrapmode;
while (turtle_x > turtle_right_max) {
-@@ -864,7 +864,7 @@ NODE *lwrap(NODE *args) {
+@@ -907,7 +907,7 @@ NODE *lwrap(NODE *args) {

NODE *lfence(NODE *args) {
(void)lwrap(args); /* get turtle inside the fence */
@@ -57,7 +48,7 @@ Index: graphics.c
draw_turtle();
current_mode = fencemode;
draw_turtle();
-@@ -873,7 +873,7 @@ NODE *lfence(NODE *args) {
+@@ -916,7 +916,7 @@ NODE *lfence(NODE *args) {
}

NODE *lwindow(NODE *args) {
@@ -66,17 +57,17 @@ Index: graphics.c
draw_turtle();
current_mode = windowmode;
draw_turtle();
-@@ -892,7 +892,7 @@ NODE *lturtlemode(NODE *args) {
+@@ -935,7 +935,7 @@ NODE *lturtlemode(NODE *args) {
}

- NODE *lfill(NODE *args) {
+ NODE *lfill(NODE *args) {
- prepare_to_draw;
+ prepare_to_draw_NULL;
draw_turtle();
logofill();
draw_turtle();
-@@ -914,7 +914,7 @@ NODE *llabel(NODE *arg) {
- *print_stringptr = '\0';
+@@ -964,7 +964,7 @@ NODE *llabel(NODE *arg) {
+ print_stringlen = old_stringlen;

if (NOT_THROWING) {
- prepare_to_draw;
@@ -84,43 +75,34 @@ Index: graphics.c
draw_turtle();
theLength = strlen(textbuf);
#ifdef mac
-@@ -1027,7 +1027,7 @@ NODE *lsetpencolor(NODE *arg) {
+@@ -1085,7 +1085,7 @@ NODE *lsetpencolor(NODE *arg) {
NODE *val;

if (NOT_THROWING) {
- prepare_to_draw;
+ prepare_to_draw_NULL;
if (is_list(car(arg))) {
- val = make_intnode(-1);
+ val = make_intnode(PEN_COLOR_OFFSET);
lsetpalette(cons(val,arg));
-@@ -1044,7 +1044,7 @@ NODE *lsetbackground(NODE *arg) {
- NODE *val;
+@@ -1107,7 +1107,7 @@ NODE *lsetbackground(NODE *arg) {
+ }

if (NOT_THROWING) {
- prepare_to_draw;
+ prepare_to_draw_NULL;
if (is_list(car(arg))) {
- val = make_intnode(-2);
+ val = make_intnode(BACKGROUND_COLOR_OFFSET);
lsetpalette(cons(val,arg));
-@@ -1064,7 +1064,7 @@ NODE *lsetpalette(NODE *args) {
- if (slotnum < -2) {
- err_logo(BAD_DATA_UNREC, slot);
- } else if (NOT_THROWING && ((slotnum > 7) || (slotnum < 0))) {
-- prepare_to_draw;
-+ prepare_to_draw_NULL;
- set_palette(slotnum,
- (unsigned int)getint(car(arg)),
- (unsigned int)getint(cadr(arg)),
-@@ -1117,7 +1117,7 @@ NODE *lsetpensize(NODE *args) {
+@@ -1188,7 +1188,7 @@ void restore_palette(FILE *fp) {
+ NODE *lsetpensize(NODE *args) {
NODE *arg;

- if (NOT_THROWING) {
-- prepare_to_draw;
-+ prepare_to_draw_NULL;
- if (is_list(car(args))) {
- arg = pos_int_vector_arg(args);
- set_pen_width((int)getint(car(arg)));
-@@ -1141,7 +1141,7 @@ NODE *lsetpenpattern(NODE *args) {
+- prepare_to_draw;
++ prepare_to_draw_NULL;
+ if (is_list(car(args))) {
+ arg = pos_int_vector_arg(args);
+ if (NOT_THROWING) {
+@@ -1216,7 +1216,7 @@ NODE *lsetpenpattern(NODE *args) {
arg = err_logo(BAD_DATA, arg);

if (NOT_THROWING) {
@@ -129,7 +111,7 @@ Index: graphics.c
set_list_pen_pattern(arg);
save_pattern();
done_drawing;
-@@ -1157,7 +1157,7 @@ NODE *lsetscrunch(NODE *args) {
+@@ -1232,7 +1232,7 @@ NODE *lsetscrunch(NODE *args) {
ynode = numeric_arg(cdr(args));

if (NOT_THROWING) {
@@ -138,16 +120,16 @@ Index: graphics.c
draw_turtle();
x_scale = (nodetype(xnode) == FLOATT) ? getfloat(xnode) :
(FLONUM)getint(xnode);
-@@ -1294,7 +1294,7 @@ NODE *larc(NODE *arg) {
- else
+@@ -1390,7 +1390,7 @@ NODE *larc(NODE *arg) {
radius = getfloat(val2);

+ internal_hideturtle();
- prepare_to_draw;
+ prepare_to_draw_NULL;
draw_turtle();

/* save and force turtle state */
-@@ -1671,7 +1671,7 @@ NODE *lloadpict(NODE *args) {
+@@ -2074,7 +2074,7 @@ NODE *lloadpict(NODE *args) {
lopenread(args);