CVS commit: pkgsrc/lang/ucblogo

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Jul 12 14:03:11 UTC 2021

Modified Files:
        pkgsrc/lang/ucblogo: Makefile PLIST distinfo
Removed Files:
        pkgsrc/lang/ucblogo/patches: patch-aa patch-configure
            patch-docs_makefile patch-graphics.c patch-intern.c
            patch-makehelp.c patch-print.c patch-term.c patch-wrksp.c
            patch-xgraphics.c patch-xgraphics.h

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/ucblogo/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ucblogo/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ucblogo/distinfo
cvs rdiff -u -r1.6 -r0 pkgsrc/lang/ucblogo/patches/patch-aa
cvs rdiff -u -r1.2 -r0 pkgsrc/lang/ucblogo/patches/patch-configure \
    pkgsrc/lang/ucblogo/patches/patch-docs_makefile \
    pkgsrc/lang/ucblogo/patches/patch-intern.c \
    pkgsrc/lang/ucblogo/patches/patch-makehelp.c \
    pkgsrc/lang/ucblogo/patches/patch-term.c \
    pkgsrc/lang/ucblogo/patches/patch-xgraphics.h
cvs rdiff -u -r1.4 -r0 pkgsrc/lang/ucblogo/patches/patch-graphics.c
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/ucblogo/patches/patch-print.c \
    pkgsrc/lang/ucblogo/patches/patch-wrksp.c \
    pkgsrc/lang/ucblogo/patches/patch-xgraphics.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ucblogo/Makefile
diff -u pkgsrc/lang/ucblogo/Makefile:1.30 pkgsrc/lang/ucblogo/Makefile:1.31
--- pkgsrc/lang/ucblogo/Makefile:1.30   Sun Nov  3 19:04:09 2019
+++ pkgsrc/lang/ucblogo/Makefile        Mon Jul 12 14:03:11 2021
@@ -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
-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"

Index: pkgsrc/lang/ucblogo/PLIST
diff -u pkgsrc/lang/ucblogo/PLIST:1.4 pkgsrc/lang/ucblogo/PLIST:1.5
--- pkgsrc/lang/ucblogo/PLIST:1.4       Sun Oct 11 07:02:39 2015
+++ pkgsrc/lang/ucblogo/PLIST   Mon Jul 12 14:03:11 2021
@@ -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

Index: pkgsrc/lang/ucblogo/distinfo
diff -u pkgsrc/lang/ucblogo/distinfo:1.13 pkgsrc/lang/ucblogo/distinfo:1.14
--- pkgsrc/lang/ucblogo/distinfo:1.13   Tue Dec 29 23:34:56 2015
+++ pkgsrc/lang/ucblogo/distinfo        Mon Jul 12 14:03:11 2021
@@ -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