pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ucblogo ucblogo: Update to 6.2.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/b2722bdcd683
branches: trunk
changeset: 455802:b2722bdcd683
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Mon Jul 12 14:03:11 2021 +0000
description:
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
diffstat:
lang/ucblogo/Makefile | 42 ++---
lang/ucblogo/PLIST | 36 +---
lang/ucblogo/distinfo | 21 +--
lang/ucblogo/patches/patch-aa | 36 -----
lang/ucblogo/patches/patch-configure | 15 --
lang/ucblogo/patches/patch-docs_makefile | 19 --
lang/ucblogo/patches/patch-graphics.c | 222 -------------------------------
lang/ucblogo/patches/patch-intern.c | 20 --
lang/ucblogo/patches/patch-makehelp.c | 11 -
lang/ucblogo/patches/patch-print.c | 24 ---
lang/ucblogo/patches/patch-term.c | 105 --------------
lang/ucblogo/patches/patch-wrksp.c | 46 ------
lang/ucblogo/patches/patch-xgraphics.c | 33 ----
lang/ucblogo/patches/patch-xgraphics.h | 23 ---
14 files changed, 29 insertions(+), 624 deletions(-)
diffs (truncated from 733 to 300 lines):
diff -r 5d392688172a -r b2722bdcd683 lang/ucblogo/Makefile
--- a/lang/ucblogo/Makefile Mon Jul 12 13:18:14 2021 +0000
+++ b/lang/ucblogo/Makefile Mon Jul 12 14:03:11 2021 +0000
@@ -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@localhost
-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
+# Enable object oriented Logo features
+CONFIGURE_ARGS+= --enable-objects
+
+USE_TOOLS+= gmake makeinfo
INFO_FILES= yes
-post-extract:
- ${RM} ${WRKSRC}/config.cache
- ${RM} -rf ${WRKSRC}/csls/CVS
-
-BUILDLINK_DEPMETHOD.libXt= build
-
-.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 -r 5d392688172a -r b2722bdcd683 lang/ucblogo/PLIST
--- a/lang/ucblogo/PLIST Mon Jul 12 13:18:14 2021 +0000
+++ b/lang/ucblogo/PLIST Mon Jul 12 14:03:11 2021 +0000
@@ -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/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 -r 5d392688172a -r b2722bdcd683 lang/ucblogo/distinfo
--- a/lang/ucblogo/distinfo Mon Jul 12 13:18:14 2021 +0000
+++ b/lang/ucblogo/distinfo Mon Jul 12 14:03:11 2021 +0000
@@ -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 -r 5d392688172a -r b2722bdcd683 lang/ucblogo/patches/patch-aa
--- a/lang/ucblogo/patches/patch-aa Mon Jul 12 13:18:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5d392688172a -r b2722bdcd683 lang/ucblogo/patches/patch-configure
--- a/lang/ucblogo/patches/patch-configure Mon Jul 12 13:18:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5d392688172a -r b2722bdcd683 lang/ucblogo/patches/patch-docs_makefile
--- a/lang/ucblogo/patches/patch-docs_makefile Mon Jul 12 13:18:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5d392688172a -r b2722bdcd683 lang/ucblogo/patches/patch-graphics.c
--- a/lang/ucblogo/patches/patch-graphics.c Mon Jul 12 13:18:14 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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,
Home |
Main Index |
Thread Index |
Old Index