ucblogo: Update to 6.2.1

* Update HOMEPAGE and COMMENT.
* Use tarball from GitHub.
* Use wxWidgets unconditionally (cannot disable wxWidgets anymore).
* Set LICENSE.

Changelog:
6.2.1
Corrects manual page name from logo to ucblogo to match executable.
(Note: Windows executable and Mac dmg installs do not need this so only
the .tar.gz is provided.)

6.2
This is a maintenance release of the UCB Logo programming language interpreter.
Fixes and Updates:

    multiple bug fixes
    a new autoconf based build system
    optional object oriented logo ( --enable-objects )
    Renamed executable from logo to ucblogo for unix.

This includes work from dmalec, Barak A. Pearlmutter, janekr, hosiet, reinerh,
atehwa, kilobyte, brianharvey, pahihu, and jrincayc.

6.1
This is a maintenance release of the UCB Logo programming language interpreter.
Fixes and Updates:

    64 bit support (fixes bug that prevented drawing large numbers of lines in 64 bit mode)
    wxWidgets 3.0 support
    License changed to GNU General Public License 3 or newer
    Support for compiling for 64 bit MacOS

14 files changed, 29 insertions, 624 deletions

diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index f917f9b46b3..b2418b4bcd6 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -1,39 +1,27 @@
-# $NetBSD: Makefile,v 1.30 2019/11/03 19:04:09 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2021/07/12 14:03:11 ryoon Exp $
 
-DISTNAME=	ucblogo
-PKGNAME=	${DISTNAME}-6.0
-PKGREVISION=	2
+GITHUB_PROJECT=	ucblogo-code
+GITHUB_RELEASE=	version_${PKGVERSION_NOREV}
+DISTNAME=	ucblogo-6.2.1
 CATEGORIES=	lang
-MASTER_SITES=	http://www.cs.berkeley.edu/~bh/downloads/
-# Not at GNU mirrors yet
-# ${MASTER_SITE_GNU:=non-gnu/ucblogo/}
-DIST_SUBDIR=	${PKGNAME_NOREV}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=jrincayc/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://http.cs.berkeley.edu/~bh/logo.html
-COMMENT=	Brian Harvey's logo language interpreter
+HOMEPAGE=	https://people.eecs.berkeley.edu/~bh/logo.html
+COMMENT=	UCB (Berkeley) Logo interpreter
+LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+USE_LANGUAGES+=		c c++
 
-MAKE_FILE=		makefile
-BUILD_TARGET=		# empty
 GNU_CONFIGURE=		yes
-# otherwise ./configure might find wxgtk
-CONFIGURE_ARGS+=	--wx-disable
-# otherwise ./configure guesses -L incorrectly
-LIBS+=			-L${X11BASE}/lib
 
-USE_TOOLS+=		makeinfo
-INSTALLATION_DIRS=	info
-INFO_FILES=		yes
-
-post-extract:
-	${RM} ${WRKSRC}/config.cache
-	${RM} -rf ${WRKSRC}/csls/CVS
+# Enable object oriented Logo features
+CONFIGURE_ARGS+=	--enable-objects
 
-BUILDLINK_DEPMETHOD.libXt=	build
+USE_TOOLS+=		gmake makeinfo
+INFO_FILES=		yes
 
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../x11/wxGTK30/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ucblogo/PLIST b/lang/ucblogo/PLIST
index 6dfa47ae31b..bd19fcf8a0a 100644
--- a/lang/ucblogo/PLIST
+++ b/lang/ucblogo/PLIST
@@ -1,31 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2015/10/11 07:02:39 ryoon Exp $
-bin/logo
+@comment $NetBSD: PLIST,v 1.5 2021/07/12 14:03:11 ryoon Exp $
+bin/ucblogo
 info/ucblogo.info
-share/doc/ucblogo/html/usermanual.html
-share/doc/ucblogo/html/usermanual_1.html
-share/doc/ucblogo/html/usermanual_10.html
-share/doc/ucblogo/html/usermanual_11.html
-share/doc/ucblogo/html/usermanual_12.html
-share/doc/ucblogo/html/usermanual_13.html
-share/doc/ucblogo/html/usermanual_14.html
-share/doc/ucblogo/html/usermanual_15.html
-share/doc/ucblogo/html/usermanual_16.html
-share/doc/ucblogo/html/usermanual_2.html
-share/doc/ucblogo/html/usermanual_3.html
-share/doc/ucblogo/html/usermanual_4.html
-share/doc/ucblogo/html/usermanual_5.html
-share/doc/ucblogo/html/usermanual_6.html
-share/doc/ucblogo/html/usermanual_7.html
-share/doc/ucblogo/html/usermanual_8.html
-share/doc/ucblogo/html/usermanual_9.html
-share/doc/ucblogo/html/usermanual_abt.html
-share/doc/ucblogo/html/usermanual_fot.html
-share/doc/ucblogo/html/usermanual_ovr.html
-share/doc/ucblogo/html/usermanual_toc.html
-share/doc/ucblogo/usermanual
-share/doc/ucblogo/usermanual.pdf
-share/doc/ucblogo/usermanual.ps
-share/doc/ucblogo/usermanual.texi
+man/man1/ucblogo.1
+share/applications/ucblogo.desktop
+share/doc/ucblogo/ucblogo.html
+share/doc/ucblogo/ucblogo.pdf
+share/icons/hicolor/256x256/apps/ucblogo.png
+share/pixmaps/ucblogo.xpm
 share/ucblogo/csls/algs
 share/ucblogo/csls/basic
 share/ucblogo/csls/buttons
@@ -211,6 +192,7 @@ share/ucblogo/helpfiles/last
 share/ucblogo/helpfiles/left
 share/ucblogo/helpfiles/lessequalp
 share/ucblogo/helpfiles/lessp
+share/ucblogo/helpfiles/linep
 share/ucblogo/helpfiles/list
 share/ucblogo/helpfiles/listp
 share/ucblogo/helpfiles/listtoarray
diff --git a/lang/ucblogo/distinfo b/lang/ucblogo/distinfo
index a8a7142c609..94da9010ea9 100644
--- a/lang/ucblogo/distinfo
+++ b/lang/ucblogo/distinfo
@@ -1,17 +1,6 @@
-$NetBSD: distinfo,v 1.13 2015/12/29 23:34:56 dholland Exp $
+$NetBSD: distinfo,v 1.14 2021/07/12 14:03:11 ryoon Exp $
 
-SHA1 (ucblogo-6.0/ucblogo.tar.gz) = ad62c689c264b1aeb7bd58dd9c08ca602bade8f1
-RMD160 (ucblogo-6.0/ucblogo.tar.gz) = 7cd9ec8eeff00fb3440f5036d57a9b29383ab310
-SHA512 (ucblogo-6.0/ucblogo.tar.gz) = 7ca0313d9ea8680a282757df52263b4eb165e46c1368b6693b2d10dbf53cbe4b63849c4233145768553cf999c0b642de95639083d156aede6edecbc93d072c10
-Size (ucblogo-6.0/ucblogo.tar.gz) = 6694879 bytes
-SHA1 (patch-aa) = 8a1e39b1c291cfc6a87f878c588fb49e200f2798
-SHA1 (patch-configure) = 58480ad9639bea09d00b4178b3a190c0a515fff9
-SHA1 (patch-docs_makefile) = a5459c9c7a1ae074113a9f91aef1f35c3c55851a
-SHA1 (patch-graphics.c) = 2f32ebafb1d0c8eaed6c1c574711dcfe33142d37
-SHA1 (patch-intern.c) = a9b6e6c83bc79c5204a056c2eb60be3be44d2b15
-SHA1 (patch-makehelp.c) = b4e2d7b1ce8bd79d65c1d2d13c0ed1a7e3283887
-SHA1 (patch-print.c) = 1efa1cd25a858f9f54d0648ebd9945c6f68cfefc
-SHA1 (patch-term.c) = 5b0c41497e2c6e282385bd395101f638a247b83a
-SHA1 (patch-wrksp.c) = 44212f1837f12b15d99a864038bc1e5bbf0c5da7
-SHA1 (patch-xgraphics.c) = b7cc001a6f8ec63126b2d5942b9093c17cb58576
-SHA1 (patch-xgraphics.h) = 935c9cbb0fb7e02ab7994e97e5ce418e88faaa2b
+SHA1 (ucblogo-6.2.1.tar.gz) = b79e5f55bbf0ff8b158a056e4cb5d56de06dad9c
+RMD160 (ucblogo-6.2.1.tar.gz) = b0a1d79d141da301e4d7546cde93fc948e8810ee
+SHA512 (ucblogo-6.2.1.tar.gz) = f6c42f5f97984717a39498f1fd050ba84371aee57fb234dc3b9101eab33f9013f3aaa7a8bcc9c4efef3603e4a11b2990b322837c0f0ce633e5070ba7b4b903fb
+Size (ucblogo-6.2.1.tar.gz) = 1652645 bytes
diff --git a/lang/ucblogo/patches/patch-aa b/lang/ucblogo/patches/patch-aa
deleted file mode 100644
index cd16450553a..00000000000
--- a/lang/ucblogo/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2015/12/29 23:34:56 dholland Exp $
-
-DESTDIR support.
-
---- makefile.in.orig	2008-09-13 23:27:17.000000000 +0000
-+++ makefile.in
-@@ -5,8 +5,9 @@ CXXFLAGS = -g @CXXFLAGS@
- LDFLAGS	= @LDFLAGS@
- LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
- prefix = @prefix@
-+datadir = @datadir@
- BINDIR        = $(prefix)/bin
--LIBLOC        = $(prefix)/lib/logo
-+LIBLOC        = $(datadir)/ucblogo
- LINKER = @LINKER@
- 
- # LIBLOC      = `pwd`
-@@ -70,12 +71,12 @@ ship:
- #	cd emacs; $(MAKE) ship
- 	cd docs; $(MAKE) ship
- 
--install: all
--	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
--	cp logo $(BINDIR)/.
--	cp -f logolib/* $(LIBLOC)/logolib/.
--	cp -f helpfiles/* $(LIBLOC)/helpfiles/.
--	cp -f csls/* $(LIBLOC)/csls/.
-+install:
-+	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $(DESTDIR)$$d ] || mkdir -p $(DESTDIR)$$d || exit 1; done
-+	cp logo $(DESTDIR)$(BINDIR)/.
-+	cp -f logolib/* $(DESTDIR)$(LIBLOC)/logolib/.
-+	cp -f helpfiles/* $(DESTDIR)$(LIBLOC)/helpfiles/.
-+	cp -f csls/* $(DESTDIR)$(LIBLOC)/csls/.
- #	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
- 	(cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
- #	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
diff --git a/lang/ucblogo/patches/patch-configure b/lang/ucblogo/patches/patch-configure
deleted file mode 100644
index 31a04ba3bb3..00000000000
--- a/lang/ucblogo/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2015/12/29 23:34:56 dholland Exp $
-
-Don't return values from void functions.
-
---- configure.orig	2013-07-17 14:28:44.000000000 +0000
-+++ configure
-@@ -1753,7 +1753,7 @@ int main() { return 0; }
- RETSIGTYPE t(int foo) {
- int i;
- signal(SIGINT,t);
--return 0; }
-+}
- EOF
- if { (eval echo configure:1672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
diff --git a/lang/ucblogo/patches/patch-docs_makefile b/lang/ucblogo/patches/patch-docs_makefile
deleted file mode 100644
index 978f36cfd58..00000000000
--- a/lang/ucblogo/patches/patch-docs_makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-docs_makefile,v 1.2 2015/12/29 23:34:56 dholland Exp $
-
-DESTDIR support.
-
---- docs/makefile.orig	2008-08-19 19:56:59.000000000 +0000
-+++ docs/makefile
-@@ -1,9 +1,9 @@
- BUILDIR	      = `pwd`
--INFODIR	      = $(prefix)/info
--DOCSDIR	      = $(LIBLOC)/docs
-+INFODIR	      = $(DESTDIR)$(prefix)/info
-+DOCSDIR	      = $(DESTDIR)$(prefix)/share/doc/ucblogo
- HTMLDIR	      = $(DOCSDIR)/html
- 
--all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info
-+all: html/usermanual_1.html ucblogo.info
- 
- ucblogo.info: usermanual.texi
- 	makeinfo usermanual.texi
diff --git a/lang/ucblogo/patches/patch-graphics.c b/lang/ucblogo/patches/patch-graphics.c
deleted file mode 100644
index 449a8e82f9c..00000000000
--- a/lang/ucblogo/patches/patch-graphics.c
+++ /dev/null
@@ -1,222 +0,0 @@
-$NetBSD: patch-graphics.c,v 1.4 2015/12/29 23:34:56 dholland Exp $
-
-Fix a number of cases of plainly invalid C and portability issues.
-
---- graphics.c.orig	2008-09-03 17:58:13.000000000 +0000
-+++ graphics.c
-@@ -231,7 +231,7 @@ void draw_turtle_helper(void) {
-     FLONUM delta_x, delta_y;
- #endif
-    
--    prepare_to_draw;
-+    prepare_to_draw(UNBOUND);
-     prepare_to_draw_turtle;
-     save_pen(&saved_pen);
-     plain_xor_pen();
-@@ -276,7 +276,7 @@ void save_string(char *, int);
- void save_arc(FLONUM, FLONUM, FLONUM, FLONUM, FLONUM, FLONUM, FLONUM, FLONUM);
- 
- void right(FLONUM a) {
--    prepare_to_draw;
-+    prepare_to_draw(UNBOUND);
-     draw_turtle();
-     turtle_heading += a;
-     turtle_heading = pfmod(turtle_heading,360.0);
-@@ -336,7 +336,7 @@ void forward(FLONUM d) {
-    // #ifndef WIN32
-     internal_hideturtle();
-    // #endif
--    prepare_to_draw;
-+    prepare_to_draw(UNBOUND);
-     draw_turtle();
-     forward_helper(d);
-     draw_turtle();
-@@ -570,7 +570,7 @@ NODE *lback(NODE *arg) {
- 
- NODE *lshowturtle(NODE *args) {
-     if(!graphics_setup) graphics_setup++;
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     if (!turtle_shown) {
- 	turtle_shown = TRUE;
- 	draw_turtle();
-@@ -582,7 +582,7 @@ NODE *lshowturtle(NODE *args) {
- 
- void internal_hideturtle() {
-     if(!graphics_setup) graphics_setup++;
--    prepare_to_draw;
-+    prepare_to_draw(UNBOUND);
-     if (turtle_shown) {
- 	draw_turtle();
- 	turtle_shown = FALSE;
-@@ -616,7 +616,7 @@ NODE *lsetheading(NODE *arg) {
-     
-     val = numeric_arg(arg);
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	draw_turtle();
- 	if (nodetype(val) == INT)
- 	    turtle_heading = (FLONUM)getint(val);
-@@ -720,7 +720,7 @@ NODE *lscrunch(NODE *args) {
- }
- 
- NODE *lhome(NODE *args) {
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     out_of_bounds = FALSE;
-     setpos_bynumber((FLONUM)0.0, (FLONUM)0.0);
-     draw_turtle();
-@@ -734,7 +734,7 @@ void cs_helper(int centerp) {    
- #if defined(x_window) && !HAVE_WX
-     clearing_screen++;
- #endif
--    prepare_to_draw;
-+    prepare_to_draw(UNBOUND);
-     clear_screen;
- #if defined(x_window) && !HAVE_WX
-     clearing_screen==0;
-@@ -814,7 +814,7 @@ void setpos_commonpart(FLONUM target_x, 
- 
- void setpos_bynumber(FLONUM target_x, FLONUM target_y) {
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw(UNBOUND);
- 	draw_turtle();
- 	move_to(g_round(screen_x_coord), g_round(screen_y_coord));
- 	setpos_commonpart(target_x, target_y);
-@@ -827,7 +827,7 @@ void setpos_helper(NODE *xnode, NODE *yn
-     
-     if (NOT_THROWING) {
- 	internal_hideturtle();
--	prepare_to_draw;
-+	prepare_to_draw(UNBOUND);
- 	draw_turtle();
- 	move_to(g_round(screen_x_coord), g_round(screen_y_coord));
- 	target_x = ((xnode == NIL) ?
-@@ -884,7 +884,7 @@ NODE *lsety(NODE *args) {
- }
- 
- NODE *lwrap(NODE *args) {
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     draw_turtle();
-     current_mode = wrapmode;
-     while (turtle_x > turtle_right_max) {
-@@ -907,7 +907,7 @@ NODE *lwrap(NODE *args) {
- 
- NODE *lfence(NODE *args) {
-     (void)lwrap(args);	    /* get turtle inside the fence */
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     draw_turtle();
-     current_mode = fencemode;
-     draw_turtle();
-@@ -916,7 +916,7 @@ NODE *lfence(NODE *args) {
- }
- 
- NODE *lwindow(NODE *args) {
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     draw_turtle();
-     current_mode = windowmode;
-     draw_turtle();
-@@ -935,7 +935,7 @@ NODE *lturtlemode(NODE *args) {
- }
- 
- NODE *lfill(NODE *args) {    
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     draw_turtle();
-     logofill();
-     draw_turtle();
-@@ -964,7 +964,7 @@ NODE *llabel(NODE *arg) {
-     print_stringlen = old_stringlen;
- 	
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	draw_turtle();
- 	theLength = strlen(textbuf);
- #ifdef mac
-@@ -1085,7 +1085,7 @@ NODE *lsetpencolor(NODE *arg) {
-     NODE *val;
- 
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	if (is_list(car(arg))) {
- 	    val = make_intnode(PEN_COLOR_OFFSET);
- 	    lsetpalette(cons(val,arg));
-@@ -1107,7 +1107,7 @@ NODE *lsetbackground(NODE *arg) {
-     }
- 
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	if (is_list(car(arg))) {
- 	    val = make_intnode(BACKGROUND_COLOR_OFFSET);
- 	    lsetpalette(cons(val,arg));
-@@ -1188,7 +1188,7 @@ void restore_palette(FILE *fp) {
- NODE *lsetpensize(NODE *args) {
-     NODE *arg;
- 
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     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) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	set_list_pen_pattern(arg);
- 	save_pattern();
- 	done_drawing;
-@@ -1232,7 +1232,7 @@ NODE *lsetscrunch(NODE *args) {
-     ynode = numeric_arg(cdr(args));
- 
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	draw_turtle();
- 	x_scale = (nodetype(xnode) == FLOATT) ? getfloat(xnode) :
- 			       (FLONUM)getint(xnode);
-@@ -1390,7 +1390,7 @@ NODE *larc(NODE *arg) {
- 	    radius = getfloat(val2);
- 
- 	internal_hideturtle();
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	draw_turtle();
- 
- 	/* save and force turtle state */
-@@ -1472,7 +1472,7 @@ NODE *lfilled(NODE *args) {
-     FLONUM x1,y1,lastx,lasty;
-     int old_refresh = refresh_p;
- 
--    prepare_to_draw;
-+    prepare_to_draw2(UNBOUND);
-     if (is_list(car(args))) {
- 	val = make_intnode(FILLED_COLOR_OFFSET);
- 	lsetpalette(cons(val,args));
-@@ -1834,7 +1834,7 @@ void redraw_graphics(void) {
- 	return;
-     }
- 
--    prepare_to_draw;
-+    prepare_to_draw(UNBOUND);
-     if(!graphics_setup){
-         done_drawing;
-         return;
-@@ -2074,7 +2074,7 @@ NODE *lloadpict(NODE *args) {
-     lopenread(args);
- #endif
-     if (NOT_THROWING) {
--	prepare_to_draw;
-+	prepare_to_draw2(UNBOUND);
- 	fp = (FILE *)file_list->n_obj;
- 	restore_palette(fp);
- 	fread(&rec_idx, sizeof(FIXNUM), 1, fp);
diff --git a/lang/ucblogo/patches/patch-intern.c b/lang/ucblogo/patches/patch-intern.c
deleted file mode 100644
index 377339cc8bb..00000000000
--- a/lang/ucblogo/patches/patch-intern.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-intern.c,v 1.2 2015/12/29 23:34:56 dholland Exp $
-
-Fix a number of cases of plainly invalid C and portability issues.
-
---- intern.c.orig	2015-11-06 16:15:17.000000000 +0000
-+++ intern.c
-@@ -39,11 +39,11 @@ FIXNUM hash(char *s, int len) {
-     /* and Ullman's book, Compilers: Principles, Techniques, and */
-     /* Tools; figure 7.35. */
- 
--    unsigned FIXNUM h = 0, g;
-+    unsigned long FIXNUM h = 0, g;
- 
-     while (--len >= 0) {
- 	h = (h << 4) + (FIXNUM)(*s++);
--	g = h & (0xf << (WORDSIZE-4));
-+	g = h & (0xfUL << (WORDSIZE-4));
- 	if (g != 0) {
- 	    h ^= g ^ (g >> (WORDSIZE-8));
- 	}
diff --git a/lang/ucblogo/patches/patch-makehelp.c b/lang/ucblogo/patches/patch-makehelp.c
deleted file mode 100644
index ef284446757..00000000000
--- a/lang/ucblogo/patches/patch-makehelp.c
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-makehelp.c,v 1.2 2015/12/29 23:34:56 dholland Exp $
-
-Use standard headers.
-
---- makehelp.c.orig	2013-07-17 14:25:25.000000000 +0000
-+++ makehelp.c
-@@ -1,3 +1,4 @@
-+#include <stdlib.h>
- #include <stdio.h>
- #include <ctype.h>
- 
diff --git a/lang/ucblogo/patches/patch-print.c b/lang/ucblogo/patches/patch-print.c
deleted file mode 100644
index 98cd773327e..00000000000
--- a/lang/ucblogo/patches/patch-print.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-print.c,v 1.3 2015/12/29 23:34:56 dholland Exp $
-
-Use snprintf; fix printf format types.
-
---- print.c.orig	2008-03-01 01:04:41.000000000 +0000
-+++ print.c
-@@ -254,7 +254,7 @@ void real_print_node(FILE *strm, NODE *n
-     } else if ((unsigned int)nd < 200) {    /* for debugging */
- 	char num[] = "{small}    ";
- 
--	sprintf(&num[7],"%d",nd);
-+	snprintf(&num[7], sizeof(num) - 7,"%u",(unsigned int)nd);
- 	ndprintf(strm,num);
-     } else if ((ndty = nodetype(nd)) & NT_PRIM) {
- 	ndprintf(strm, "PRIM");
-@@ -281,7 +281,7 @@ void real_print_node(FILE *strm, NODE *n
- 	if (print_backslashes && (getarrorg(nd) != 1)) {
- 	    char org[] = "@	";
- 
--	    sprintf(&org[1],"%d",getarrorg(nd));
-+	    sprintf(&org[1],"%ld",getarrorg(nd));
- 	    ndprintf(strm,org);
- 	}
-     } else if (ndty == QUOTE) {
diff --git a/lang/ucblogo/patches/patch-term.c b/lang/ucblogo/patches/patch-term.c
deleted file mode 100644
index eb73272cafb..00000000000
--- a/lang/ucblogo/patches/patch-term.c
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD: patch-term.c,v 1.2 2015/11/09 07:18:34 dholland Exp $
-
-- unconditionally use termios, not legacy termio or sgtty.h
-- unconditionally include term.h for termcap stuff
-
---- term.c.orig	2008-09-14 04:57:09.000000000 +0000
-+++ term.c
-@@ -30,26 +30,11 @@
- #include <console.h>
- #endif
- 
--#ifdef HAVE_TERMIO_H
--#ifdef HAVE_WX
--#include <termios.h>
--#else
--#include <termio.h>
--#endif
--#else
--#ifdef HAVE_SGTTY_H
--#include <sgtty.h>
--#endif
--#endif
--
- #undef TRUE
- #undef FALSE
- 
- #ifdef HAVE_TERMCAP_H
- #include <termcap.h>
--#ifdef HAVE_SGTTY_H
--#include <sgtty.h>
--#endif
- #else
- #ifdef HAVE_TERMLIB_H
- #include <termlib.h>
-@@ -60,6 +45,9 @@
- #endif
- #endif
- 
-+#include <term.h>
-+#include <termios.h>
-+
- #undef TRUE
- #undef FALSE
- 
-@@ -78,13 +66,7 @@ char cm_arr[40];
- char so_arr[40];
- char se_arr[40];
- 
--#ifdef HAVE_TERMIO_H
--struct termio tty_cooked, tty_cbreak;
--#else
--#ifdef HAVE_SGTTY_H
--struct sgttyb tty_cooked, tty_cbreak;
--#endif
--#endif
-+struct termios tty_cooked, tty_cbreak;
- 
- int interactive, tty_charmode;
- 
-@@ -132,18 +114,11 @@ void term_init(void) {
- #endif /* WIN32 */
- #else
-     if (interactive) {
--#ifdef HAVE_TERMIO_H
--	ioctl(0,TCGETA,(char *)(&tty_cooked));
-+	tcgetattr(0, &tty_cooked);
- 	tty_cbreak = tty_cooked;
- 	tty_cbreak.c_cc[VMIN] = '\01';
- 	tty_cbreak.c_cc[VTIME] = '\0';
- 	tty_cbreak.c_lflag &= ~(ECHO|ICANON);
--#else
--	ioctl(0,TIOCGETP,(char *)(&tty_cooked));
--	tty_cbreak = tty_cooked;
--	tty_cbreak.sg_flags |= CBREAK;
--	tty_cbreak.sg_flags &= ~ECHO;
--#endif
-     }
-     tty_charmode = 0;
-     tgetent(bp, getenv("TERM"));
-@@ -188,11 +163,7 @@ void term_init(void) {
- void charmode_on() {
- #ifdef unix
-     if ((readstream == stdin) && interactive && !tty_charmode) {
--#ifdef HAVE_TERMIO_H
--	ioctl(0,TCSETA,(char *)(&tty_cbreak));
--#else /* !HAVE_TERMIO_H */
--	ioctl(0,TIOCSETP,(char *)(&tty_cbreak));
--#endif /* HAVE_TERMIO_H */
-+	tcsetattr(0, TCSANOW, &tty_cbreak);
- 	tty_charmode++;
-     }
- #endif /* unix */
-@@ -204,11 +175,7 @@ void charmode_on() {
- void charmode_off() {
- #ifdef unix
-     if (tty_charmode) {
--#ifdef HAVE_TERMIO_H
--	ioctl(0,TCSETA,(char *)(&tty_cooked));
--#else /* !HAVE_TERMIO_H */
--	ioctl(0,TIOCSETP,(char *)(&tty_cooked));
--#endif /* HAVE_TERMIO_H */
-+	tcsetattr(0, TCSANOW, &tty_cooked);
- 	tty_charmode = 0;
-     }
- #endif /* unix */
diff --git a/lang/ucblogo/patches/patch-wrksp.c b/lang/ucblogo/patches/patch-wrksp.c
deleted file mode 100644
index 4711afb6cad..00000000000
--- a/lang/ucblogo/patches/patch-wrksp.c
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-wrksp.c,v 1.3 2015/12/29 23:34:56 dholland Exp $
-
-Use standard headers.
-Use <ctype.h> correctly.
-Use snprintf.
-Pass the right type for printf %.* lengths.
-
---- wrksp.c.orig	2008-08-23 19:51:14.000000000 +0000
-+++ wrksp.c
-@@ -38,6 +38,7 @@ int wxEditFile(char *);
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-+#include <sys/wait.h>
- 
- #ifdef ibm
- #include "process.h"
-@@ -55,6 +56,8 @@ int wxEditFile(char *);
- #endif
- #endif
- 
-+#include <ctype.h>
-+
- char *editor, *editorname, *tempdir;
- int to_pending = 0;
- 
-@@ -293,7 +296,7 @@ char *strncasestr(char *big, char *littl
-     FIXNUM i;
- 
-     while (*big != '\0') {
--	while ((pc = *big++) != '\0' && tolower(pc) != tolower(*little)) ;
-+	while ((pc = *big++) != '\0' && tolower((unsigned char)pc) != tolower((unsigned char)*little)) ;
- 	if (pc == '\0') return NULL;
- 	p = big; q = little+1; i = len;
- 	while (--i > 0 && (qc = *q++) != '\0') {
-@@ -1713,8 +1716,8 @@ NODE *cpdf_newname(NODE *name, NODE*titl
-     p1 = titlestr+strcspn(titlestr, " \t");
-     p1 = p1+strspn(p1, " \t");
-     p2 = p1+strcspn(p1, " \t");
--    sprintf(buf, "%.*s%.*s%s",
--	    p1-titlestr, titlestr, getstrlen(nname), namestr, p2);
-+    snprintf(buf, sizeof(buf), "%.*s%.*s%s",
-+	    (int)(p1-titlestr), titlestr, (int)getstrlen(nname), namestr, p2);
-     return make_strnode(buf, NULL, strlen(buf), STRING, strcpy);
- }
- 
diff --git a/lang/ucblogo/patches/patch-xgraphics.c b/lang/ucblogo/patches/patch-xgraphics.c
deleted file mode 100644
index 793ac452416..00000000000
--- a/lang/ucblogo/patches/patch-xgraphics.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-xgraphics.c,v 1.3 2015/12/29 23:34:56 dholland Exp $
-
-Fix a number of cases of plainly invalid C and portability issues.
-
---- xgraphics.c.orig	2007-12-05 21:00:23.000000000 +0000
-+++ xgraphics.c
-@@ -314,7 +314,7 @@ void check_X11_stop() {
- 
- int get_button()
- {
--  checkX;
-+  checkX2(-1);
- 
-   placate_x();
- 
-@@ -323,7 +323,7 @@ int get_button()
- 
- int get_mouse_x()
- {
--  checkX;
-+  checkX2(-1);
- 
-   placate_x();
- 
-@@ -333,7 +333,7 @@ int get_mouse_x()
- 
- int get_mouse_y()
- {
--  checkX;
-+  checkX2(-1);
- 
-   placate_x();
- 
diff --git a/lang/ucblogo/patches/patch-xgraphics.h b/lang/ucblogo/patches/patch-xgraphics.h
deleted file mode 100644
index bae721e4d28..00000000000
--- a/lang/ucblogo/patches/patch-xgraphics.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-xgraphics.h,v 1.2 2015/12/29 23:34:56 dholland Exp $
-
-Fix a number of cases of plainly invalid C and portability issues.
-
---- xgraphics.h.orig	2012-10-30 22:03:25.000000000 +0000
-+++ xgraphics.h
-@@ -30,6 +30,16 @@ void logofill(void);
- }
- 
- #define prepare_to_draw          {checkX; placate_x();}
-+
-+#define checkX2(err) { \
-+    if (have_x < 0) real_window_init(); \
-+    if (!have_x) { \
-+	err_logo(BAD_GRAPH_INIT,NIL); \
-+	return (err); \
-+    } \
-+}
-+
-+#define prepare_to_draw2(err)          {checkX2(err); placate_x();}
- #define done_drawing             XFlush(dpy)
- extern void placate_x();
-