From owner-svn-ports-head@freebsd.org Fri Mar 15 10:06:08 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF3361544AB6; Fri, 15 Mar 2019 10:06:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 61B8991068; Fri, 15 Mar 2019 10:06:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 51E7988F4; Fri, 15 Mar 2019 10:06:08 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2FA680O029226; Fri, 15 Mar 2019 10:06:08 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2FA677B029222; Fri, 15 Mar 2019 10:06:07 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201903151006.x2FA677B029222@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 15 Mar 2019 10:06:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495782 - in head/math: . grpn grpn/files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/math: . grpn grpn/files X-SVN-Commit-Revision: 495782 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 61B8991068 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Mar 2019 10:06:09 -0000 Author: danfe Date: Fri Mar 15 10:06:07 2019 New Revision: 495782 URL: https://svnweb.freebsd.org/changeset/ports/495782 Log: Resurrect `math/grpn' removed in r487992 because it used obsolete GTK+ stack. This version is a picked up fork on GitHub which now supports GTK+ 2.0 and include a number of bugfixes, so welcome back! Requested by: someone on #bsdports Added: head/math/grpn/ - copied from r487991, head/math/grpn/ Deleted: head/math/grpn/files/patch-complex.c head/math/grpn/files/patch-help.c head/math/grpn/files/patch-lcd.c head/math/grpn/files/patch-main.c head/math/grpn/files/patch-mode.c head/math/grpn/files/patch-process_input.c head/math/grpn/files/patch-run_cmd.c Modified: head/math/Makefile head/math/grpn/Makefile head/math/grpn/distinfo head/math/grpn/files/patch-Makefile head/math/grpn/pkg-descr Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Fri Mar 15 09:40:47 2019 (r495781) +++ head/math/Makefile Fri Mar 15 10:06:07 2019 (r495782) @@ -265,6 +265,7 @@ SUBDIR += gretl SUBDIR += gri SUBDIR += gringo + SUBDIR += grpn SUBDIR += gsl SUBDIR += hexcalc SUBDIR += hipmcl Modified: head/math/grpn/Makefile ============================================================================== --- head/math/grpn/Makefile Fri Dec 21 12:50:28 2018 (r487991) +++ head/math/grpn/Makefile Fri Mar 15 10:06:07 2019 (r495782) @@ -2,25 +2,33 @@ # $FreeBSD$ PORTNAME= grpn -PORTVERSION= 1.1.2 -PORTREVISION= 8 +PORTVERSION= 1.5.2 +DISTVERSIONPREFIX= v CATEGORIES= math -MASTER_SITES= http://lashwhip.com/grpn/ MAINTAINER= ports@FreeBSD.org COMMENT= GTK+-based reverse polish notation (RPN) calculator -DEPRECATED= Uses obsolete glib12 -EXPIRATION_DATE= 2018-12-20 +LICENSE= GPLv2 -USE_GNOME= gtk12 +USES= gnome pkgconfig +USE_GNOME= gtk20 +USE_GITHUB= yes +GH_ACCOUNT= utopiabound -ALL_TARGET= +WRKSRC_SUBDIR= src PLIST_FILES= bin/grpn man/man1/grpn.1.gz +PORTDOCS= CHANGES -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/grpn ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/grpn.1 ${STAGEDIR}${PREFIX}/man/man1 +OPTIONS_DEFINE= DOCS + +post-patch: + @${REINPLACE_CMD} -e 's,ulong,unsigned long,g' \ + ${WRKSRC}/real.c + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/math/grpn/distinfo ============================================================================== --- head/math/grpn/distinfo Fri Dec 21 12:50:28 2018 (r487991) +++ head/math/grpn/distinfo Fri Mar 15 10:06:07 2019 (r495782) @@ -1,2 +1,3 @@ -SHA256 (grpn-1.1.2.tar.gz) = 396274b31588e9df26f28704e95456bd2c3b859e5aa1740e47143fc27884e560 -SIZE (grpn-1.1.2.tar.gz) = 46153 +TIMESTAMP = 1543025897 +SHA256 (utopiabound-grpn-v1.5.2_GH0.tar.gz) = 36a306ee7ac840c2f114877b07ee70688d53dd3111773938ae816c8b90d3e99d +SIZE (utopiabound-grpn-v1.5.2_GH0.tar.gz) = 61799 Modified: head/math/grpn/files/patch-Makefile ============================================================================== --- head/math/grpn/files/patch-Makefile Fri Dec 21 12:50:28 2018 (r487991) +++ head/math/grpn/files/patch-Makefile Fri Mar 15 10:06:07 2019 (r495782) @@ -1,32 +1,38 @@ ---- Makefile.orig 2002-04-05 05:56:05.000000000 +0200 -+++ Makefile 2013-11-05 16:39:16.000000000 +0100 -@@ -6,7 +6,7 @@ - PREFIX = /usr/local/ +--- Makefile.orig 2018-11-24 02:18:17 UTC ++++ Makefile +@@ -3,11 +3,11 @@ + # Please read the next few lines and enter the correct values. + # where to install GRPN +-PREFIX = /usr/local +-MANDIR = ${PREFIX}/man ++PREFIX ?= /usr/local ++MANDIR ?= ${MANPREFIX}/man + # What compiler should be used -CC = gcc -+CC?= gcc ++CC ?= gcc - # Where to find the gtk-config script - GTK_DIR = -@@ -20,9 +20,9 @@ GTK_DIR = + # NOTE: + # +@@ -16,10 +16,8 @@ CC = gcc # add -DUSE_GNOME if you want to make grpn GNOME compliant. --CFLAGS = -g -O2 -I/usr/X11/include `$(GTK_DIR)gtk-config --cflags` -DGTK_VER_1_1 -+CFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include `${GTK_CONFIG} --cflags` -DGTK_VER_1_1 +-CFLAGS = -Wall -g -O2 -I/usr/X11/include -DUSE_PANGO `pkg-config --cflags gtk+-2.0` -DGTK_VER_1_1 ++CFLAGS += -Wall -DUSE_PANGO `pkg-config --cflags gtk+-2.0` -DGTK_VER_1_1 -DFLAGS = -L/usr/X11/lib -+DFLAGS = -L${LOCALBASE}/lib -L${PREFIX}/lib - +- # end of user configurable section -@@ -37,7 +37,7 @@ OBJS = test_gtk_ver.o real.o complex.o m +@@ -32,6 +30,8 @@ OBJS = test_gtk_ver.o real.o complex.o matrix.o number + error.o help.o mode.o undo.o + LIBS = `pkg-config --libs gtk+-2.0` -lX11 -lm ++ ++all: grpn --LIBS = `$(GTK_DIR)gtk-config --libs` -lX11 -lm -+LIBS = `${GTK_CONFIG} --libs` -lX11 -lm - - grpn: $(OBJS) + $(CC) $(DFLAGS) -o $@ $(OBJS) $(LIBS) Modified: head/math/grpn/pkg-descr ============================================================================== --- head/math/grpn/pkg-descr Fri Dec 21 12:50:28 2018 (r487991) +++ head/math/grpn/pkg-descr Fri Mar 15 10:06:07 2019 (r495782) @@ -6,4 +6,4 @@ complex matrices. Numbers can be displayed in 4 diffe radix modes, and complex numbers can be displayed in either Cartesian or polar form. -WWW: http://lashwhip.com/grpn/ +WWW: https://github.com/utopiabound/grpn