From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Oct 18 10:00:45 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F271F16A4BF for ; Sat, 18 Oct 2003 10:00:44 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EF2243FA3 for ; Sat, 18 Oct 2003 10:00:38 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h9IH0cFY094376 for ; Sat, 18 Oct 2003 10:00:38 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h9IH0cAV094375; Sat, 18 Oct 2003 10:00:38 -0700 (PDT) (envelope-from gnats) Resent-Date: Sat, 18 Oct 2003 10:00:38 -0700 (PDT) Resent-Message-Id: <200310181700.h9IH0cAV094375@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E6DB16A4C4 for ; Sat, 18 Oct 2003 09:47:33 -0700 (PDT) Received: from hfep08.dion.ne.jp (hfep08.dion.ne.jp [203.181.105.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98A0A43F93 for ; Sat, 18 Oct 2003 09:47:31 -0700 (PDT) (envelope-from tkato@prontomail.com) Received: from localhost ([61.198.241.31]) by hfep08.dion.ne.jp with SMTP id <20031018164726439.PHQT@hfep08.dion.ne.jp> for ; Sun, 19 Oct 2003 01:47:26 +0900 Message-Id: <20031019014549.51a1c8a2.tkato@prontomail.com> Date: Sun, 19 Oct 2003 01:45:49 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58223: Update port: math/rascal X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Oct 2003 17:00:45 -0000 X-List-Received-Date: Sat, 18 Oct 2003 17:00:45 -0000 X-List-Received-Date: Sat, 18 Oct 2003 17:00:45 -0000 X-List-Received-Date: Sat, 18 Oct 2003 17:00:45 -0000 >Number: 58223 >Category: ports >Synopsis: Update port: math/rascal >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Oct 18 10:00:38 PDT 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.8-RELEASE-p13 i386 >Organization: >Environment: >Description: - Fix build on -current - Utilize NOPORTDOCS Remove file: files/patch-Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/math/rascal/Makefile math/rascal/Makefile --- /usr/ports/math/rascal/Makefile Sat Aug 9 03:03:18 2003 +++ math/rascal/Makefile Sat Oct 18 15:02:13 2003 @@ -14,32 +14,52 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org -COMMENT= Rascal, the Advanced Scientific CALculator +COMMENT= The Advanced Scientific CALculator -BROKEN= Does not compile +WRKSRC= ${WRKDIR}/Rascal-${PORTVERSION} -USE_GETOPT_LONG=yes -USE_REINPLACE= yes +USE_GETOPT_LONG= yes USE_BISON= yes -#USE_GNOME= yes -WRKSRC= ${WRKDIR}/Rascal-${PORTVERSION} +WANT_GNOME= yes +USE_REINPLACE= yes USE_GMAKE= yes -#ALL_TARGET= rascal grascal +MAKE_ENV= CC="${CXX}" CFLAGS="${CXXFLAGS}" \ + CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +ALL_TARGET= ${PROGRAMS} MAN1= rascal.1 +.include + +.if ${OSVERSION} < 500018 +BROKEN= "Requires readline 4.2 or newer" +.endif + +.if ${HAVE_GNOME:Mgnomelibs}!="" +PKGNAMESUFFIX= -gnome +USE_GNOME+= gnomelibs +PROGRAMS= rascal grascal +.else +PROGRAMS= rascal +.endif + post-patch: - @${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g ; \ - s,g\+\+,${CXX},g ; \ - s,doc/,share/doc/,g ; \ - s,gnome-config,${GNOME_CONFIG},g ; \ - s,CC,CXX,g" ${WRKSRC}/Makefile -.for file in hoc.y rascal.1 - @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file} + @${REINPLACE_CMD} -e 's|^CC=|CC?=|g ; \ + s|^CFLAGS=-|CFLAGS+=$${CPPFLAGS} -|g ; \ + s|-O0 -fno-rtti -g||g ; \ + s|^LIBS=-|LIBS+=$${LDFLAGS} -|g ; \ + s|doc/|share/doc/|g ; \ + s|g++|$${CC}|g ; \ + s|-Os||g ; \ + s|gnome-config|$${GNOME_CONFIG}|g' ${WRKSRC}/Makefile +.for file in hoc.y rascal.1 grascal.cpp + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${file} .endfor do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rascal ${PREFIX}/bin +.for file in ${PROGRAMS} + ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin +.endfor ${INSTALL_DATA} ${WRKSRC}/rascal.rc ${PREFIX}/etc ${INSTALL_MAN} ${WRKSRC}/rascal.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) @@ -50,4 +70,4 @@ ${INSTALL_DATA} ${WRKSRC}/rascal_html/* ${DOCSDIR}/html .endif -.include +.include diff -urN /usr/ports/math/rascal/files/patch-Makefile math/rascal/files/patch-Makefile --- /usr/ports/math/rascal/files/patch-Makefile Mon Jul 21 01:33:56 2003 +++ math/rascal/files/patch-Makefile Thu Jan 1 09:00:00 1970 @@ -1,28 +0,0 @@ ---- Makefile.orig Mon Dec 2 11:51:54 2002 -+++ Makefile Mon Dec 2 11:53:24 2002 -@@ -19,8 +19,7 @@ - - VERSION=0.3.2 - --CC=g++ --CFLAGS=-O0 -fno-rtti -g -DVERSION=\"$(VERSION)\" -+CFLAGS+=-DVERSION=\"$(VERSION)\" -I%%LOCALBASE%%/include - # With the following options you may generate an optimized version of - # Rascal, but you will need a lot of time (takes 20min, that is 15* - # longer, on my machine) and physical memory (256 MB physical memory -@@ -38,10 +37,14 @@ - RMDIR=rm -rf - INSTDIR=install -d - --LIBS=-lm -lreadline -lcurses -+LIBS+=-lm -lreadline -lcurses ${LDFLAGS} - OBJS=y.tab.o lex.yy.o symtab.o value.o - - -include value.mak -+ -+.SUFFIXES: .o .c -+ -+.c.o: ; ${CXX} ${CFLAGS} -c $*.c - - all: rascal - diff -urN /usr/ports/math/rascal/files/patch-grascal.cpp math/rascal/files/patch-grascal.cpp --- /usr/ports/math/rascal/files/patch-grascal.cpp Fri Jul 13 11:12:41 2001 +++ math/rascal/files/patch-grascal.cpp Sat Oct 18 14:51:32 2003 @@ -1,5 +1,14 @@ ---- grascal.cpp.orig Fri Jul 13 10:04:16 2001 -+++ grascal.cpp Fri Jul 13 10:05:23 2001 +--- grascal.cpp.orig Tue May 14 07:09:26 2002 ++++ grascal.cpp Sat Oct 18 14:51:09 2003 +@@ -76,7 +76,7 @@ + + int main(int argc,char **argv) + { +- Calterm a(string("grascal ")+string(VERSION),"/usr/local/bin/rascal","--shellcolour 4 --outputcolour 0"); ++ Calterm a(string("grascal ")+string(VERSION),"%%PREFIX%%/bin/rascal","--shellcolour 4 --outputcolour 0"); + + if(exist("./rascal")) + a.setClientPath("./rascal"); @@ -91,7 +91,7 @@ a.addMenu(new MenuFileSelect("/File/_Load","L","Load Rascal File",rascal_load)); a.addMenu(new MenuFileSelect("/File/_Save","S","Save Rascal File",rascal_save)); @@ -9,3 +18,12 @@ a.addMenu(new MenuTop("/_Show")); a.addMenu(new MenuSimpleSend("/Show/_Variables","","variables;\n")); +@@ -113,7 +113,7 @@ + a.addMenu(new MenuSimpleSend("/Help/Licence","","licence;\n")); + a.addMenu(new MenuSimpleSend("/Help/Changelog","","help changes;\n")); + a.addMenu(new MenuSeparator("/Help/sep2")); +- a.addMenu(new MenuShowUrl("/Help/Manual","","file:/usr/local/doc/rascal/html/index.html")); ++ a.addMenu(new MenuShowUrl("/Help/Manual","","file:%%PREFIX%%/share/doc/rascal/html/index.html")); + a.addMenu(new MenuSeparator("/Help/sep1")); + a.addMenu(new MenuShowUrl("/Help/Rascal Homepage","","http://rascal.sourceforge.net/")); + diff -urN /usr/ports/math/rascal/pkg-plist math/rascal/pkg-plist --- /usr/ports/math/rascal/pkg-plist Thu Dec 5 20:50:19 2002 +++ math/rascal/pkg-plist Sat Oct 18 15:18:50 2003 @@ -1,19 +1,20 @@ +%%GNOME:%%bin/grascal bin/rascal etc/rascal.rc -share/doc/rascal/rascal.pdf -share/doc/rascal/rascal.ps -share/doc/rascal/CHANGES -share/doc/rascal/TEST -share/doc/rascal/TOOLBOXTEST -share/doc/rascal/html/img1.gif -share/doc/rascal/html/img2.gif -share/doc/rascal/html/img3.gif -share/doc/rascal/html/img4.gif -share/doc/rascal/html/img5.gif -share/doc/rascal/html/img6.gif -share/doc/rascal/html/img7.gif -share/doc/rascal/html/index.html -share/doc/rascal/html/rascal.css -share/doc/rascal/html/rascal.html -@dirrm share/doc/rascal/html -@dirrm share/doc/rascal +%%PORTDOCS%%%%DOCSDIR%%/rascal.pdf +%%PORTDOCS%%%%DOCSDIR%%/rascal.ps +%%PORTDOCS%%%%DOCSDIR%%/CHANGES +%%PORTDOCS%%%%DOCSDIR%%/TEST +%%PORTDOCS%%%%DOCSDIR%%/TOOLBOXTEST +%%PORTDOCS%%%%DOCSDIR%%/html/img1.gif +%%PORTDOCS%%%%DOCSDIR%%/html/img2.gif +%%PORTDOCS%%%%DOCSDIR%%/html/img3.gif +%%PORTDOCS%%%%DOCSDIR%%/html/img4.gif +%%PORTDOCS%%%%DOCSDIR%%/html/img5.gif +%%PORTDOCS%%%%DOCSDIR%%/html/img6.gif +%%PORTDOCS%%%%DOCSDIR%%/html/img7.gif +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/rascal.css +%%PORTDOCS%%%%DOCSDIR%%/html/rascal.html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html +%%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: