Date: Wed, 16 Oct 2002 12:47:54 +0400 (MSD) From: "Sergey A.Osokin" <osa@FreeBSD.org.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jmz@FreeBSD.org Subject: ports/44132: [NON-MAINTAINER] update math/calc to 2.11.5t4.5 Message-ID: <20021016084754.7353CBE@freebsd.org.ru>
next in thread | raw e-mail | index | archive | help
>Number: 44132 >Category: ports >Synopsis: [NON-MAINTAINER] update math/calc to 2.11.5t4.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Oct 16 01:50:03 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Sergey A. Osokin >Release: FreeBSD 4.7-STABLE i386 >Organization: FreeBSD.org.ru >Environment: System: FreeBSD 4.7-STABLE i386 >Description: update math/calc to 2.11.5t4.5 review port files/* use modern scheme of patch-* files bump PORTREVISION >How-To-Repeat: >Fix: diff -ruN calc.orig/Makefile calc/Makefile --- calc.orig/Makefile Wed Oct 16 12:42:35 2002 +++ calc/Makefile Wed Oct 16 12:31:48 2002 @@ -7,11 +7,12 @@ PORTNAME= calc PORTVERSION= 2.11.5 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= ftp://ftp.uu.net/pub/calc/ \ ftp://ftp.u-aizu.ac.jp/pub/SciEng/math/math-packs/calc/ \ ftp://ftp.batnet.com/pub/wombats/noll/ftp/pub/calc/ -DISTNAME= calc-2.11.5t4.4 +DISTNAME= calc-2.11.5t4.5 MAINTAINER= jmz@FreeBSD.org diff -ruN calc.orig/distinfo calc/distinfo --- calc.orig/distinfo Wed Oct 16 12:42:35 2002 +++ calc/distinfo Wed Oct 16 12:20:44 2002 @@ -1 +1 @@ -MD5 (calc-2.11.5t4.4.tar.gz) = dd6aaf70a365590e90c3aa3bd0499633 +MD5 (calc-2.11.5t4.5.tar.gz) = cf7401cd5571d34d18b522e42c68e338 diff -ruN calc.orig/files/patch-Makefile calc/files/patch-Makefile --- calc.orig/files/patch-Makefile Thu Jan 1 03:00:00 1970 +++ calc/files/patch-Makefile Wed Oct 16 12:27:28 2002 @@ -0,0 +1,68 @@ +--- Makefile.orig Wed Oct 16 12:23:06 2002 ++++ Makefile Wed Oct 16 12:26:59 2002 +@@ -510,16 +510,16 @@ + # LIBDIR= /usr/lib + # + #BINDIR= /usr/local/bin +-BINDIR= /usr/bin ++BINDIR= ${PREFIX}/bin + + #SHAREDIR= /usr/local/lib +-SHAREDIR= /usr/share ++SHAREDIR= ${PREFIX}/share + + #INCDIR= /usr/local/include +-INCDIR= /usr/include ++INCDIR= ${PREFIX}/include + + #LIBDIR= /usr/local/lib +-LIBDIR= /usr/lib ++LIBDIR= ${PREFIX}/lib + + # By default, these values are based on the above 4 values + # -------------------------------------------------------- +@@ -576,7 +576,7 @@ + #MANDIR= + #MANDIR= /usr/local/man/man1 + #MANDIR= /usr/man/man1 +-MANDIR= /usr/share/man/man1 ++MANDIR= ${PREFIX}/man/man1 + #MANDIR= /usr/man/u_man/man1 + #MANDIR= /usr/contrib/man/man1 + +@@ -669,8 +669,8 @@ + # + # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing. + # +-USE_READLINE= +-#USE_READLINE= -DUSE_READLINE ++#USE_READLINE= ++USE_READLINE= -DUSE_READLINE + # + #READLINE_LIB= + READLINE_LIB= -lreadline -lhistory -lncurses +@@ -765,6 +765,7 @@ + # + MAKE_FILE= Makefile + #MAKE_FILE= ++MANDIR= ${PREFIX}/man/man1 + + # If you do not wish to use purify, leave PURIFY commented out. + # +@@ -849,13 +850,13 @@ + CCOPT= ${DEBUG} ${NO_SHARED} + CCMISC= + # +-CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} +-ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ++CFLAGS= -DCALC_SRC ++ICFLAGS= ${CFLAGS} + # + LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} + ILDFLAGS= + # +-LCC= gcc ++LCC= cc + CC= ${PURIFY} ${LCC} + # + ### diff -ruN calc.orig/files/patch-aa calc/files/patch-aa --- calc.orig/files/patch-aa Wed Oct 16 12:42:35 2002 +++ calc/files/patch-aa Thu Jan 1 03:00:00 1970 @@ -1,19 +0,0 @@ -*** alloc.h~ Thu Mar 31 03:05:41 1994 ---- alloc.h Sun Apr 16 17:27:55 1995 -*************** -*** 10,16 **** - - #include "have_malloc.h" - #ifdef HAVE_MALLOC_H -! # include <malloc.h> - #else - # if defined(__STDC__) - extern void *malloc(); ---- 10,16 ---- - - #include "have_malloc.h" - #ifdef HAVE_MALLOC_H -! /* # include <malloc.h> */ - #else - # if defined(__STDC__) - extern void *malloc(); diff -ruN calc.orig/files/patch-ab calc/files/patch-ab --- calc.orig/files/patch-ab Wed Oct 16 12:42:35 2002 +++ calc/files/patch-ab Thu Jan 1 03:00:00 1970 @@ -1,68 +0,0 @@ ---- Makefile~ Wed Jun 6 12:07:35 2001 -+++ Makefile Sun Jul 8 03:48:21 2001 -@@ -504,16 +504,16 @@ - # ${LIBDIR} where *.a files are installed - # - #BINDIR= /usr/local/bin --BINDIR= /usr/bin -+BINDIR= ${PREFIX}/bin - - #SHAREDIR= /usr/local/lib --SHAREDIR= /usr/share -+SHAREDIR= ${PREFIX}/share - - #INCDIR= /usr/local/include --INCDIR= /usr/include -+INCDIR= ${PREFIX}/include - - #LIBDIR= /usr/local/lib --LIBDIR= /usr/lib -+LIBDIR= ${PREFIX}/lib - - # By default, these values are based on the above 4 values - # -------------------------------------------------------- -@@ -540,7 +540,7 @@ - #MANDIR= - #MANDIR= /usr/local/man/man1 - #MANDIR= /usr/man/man1 --MANDIR= /usr/share/man/man1 -+MANDIR= ${PREFIX}/man/man1 - #MANDIR= /usr/man/u_man/man1 - #MANDIR= /usr/contrib/man/man1 - -@@ -633,8 +633,8 @@ - # - # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing. - # --USE_READLINE= --#USE_READLINE= -DUSE_READLINE -+#USE_READLINE= -+USE_READLINE= -DUSE_READLINE - # - #READLINE_LIB= - READLINE_LIB= -lreadline -lhistory -lncurses -@@ -729,6 +729,7 @@ - # - MAKE_FILE= Makefile - #MAKE_FILE= -+MANDIR= ${PREFIX}/man/man1 - - # If you do not wish to use purify, leave PURIFY commented out. - # -@@ -813,13 +814,13 @@ - CCOPT= ${DEBUG} ${NO_SHARED} - CCMISC= - # --CFLAGS= -DSRC ${CCWARN} ${CCOPT} ${CCMISC} --ICFLAGS= -DSRC ${CCWARN} ${CCMISC} -+CFLAGS+= -DSRC -+ICFLAGS= ${CFLAGS} - # - LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} - ILDFLAGS= - # --LCC= gcc -+LCC= cc - CC= ${PURIFY} ${LCC} - # - ### diff -ruN calc.orig/files/patch-ae calc/files/patch-ae --- calc.orig/files/patch-ae Wed Oct 16 12:42:35 2002 +++ calc/files/patch-ae Thu Jan 1 03:00:00 1970 @@ -1,18 +0,0 @@ ---- lib_calc.c.orig Mon Feb 7 22:08:08 2000 -+++ lib_calc.c Mon Feb 7 22:10:42 2000 -@@ -407,9 +407,13 @@ - if (ent == NULL) { - /* just assume . is home if all else fails */ - home = "."; -+ } else { -+ home = (char *)malloc(strlen(ent->pw_dir)+1); -+ if (home == NULL) -+ home = "."; -+ else -+ strcpy(home, ent->pw_dir); - } -- home = (char *)malloc(strlen(ent->pw_dir)+1); -- strcpy(home, ent->pw_dir); - } - - /* determine the $PAGER value */ diff -ruN calc.orig/files/patch-alloc.h calc/files/patch-alloc.h --- calc.orig/files/patch-alloc.h Thu Jan 1 03:00:00 1970 +++ calc/files/patch-alloc.h Wed Oct 16 12:19:53 2002 @@ -0,0 +1,19 @@ +*** alloc.h~ Thu Mar 31 03:05:41 1994 +--- alloc.h Sun Apr 16 17:27:55 1995 +*************** +*** 10,16 **** + + #include "have_malloc.h" + #ifdef HAVE_MALLOC_H +! # include <malloc.h> + #else + # if defined(__STDC__) + extern void *malloc(); +--- 10,16 ---- + + #include "have_malloc.h" + #ifdef HAVE_MALLOC_H +! /* # include <malloc.h> */ + #else + # if defined(__STDC__) + extern void *malloc(); diff -ruN calc.orig/files/patch-lib_calc.c calc/files/patch-lib_calc.c --- calc.orig/files/patch-lib_calc.c Thu Jan 1 03:00:00 1970 +++ calc/files/patch-lib_calc.c Wed Oct 16 12:19:53 2002 @@ -0,0 +1,18 @@ +--- lib_calc.c.orig Mon Feb 7 22:08:08 2000 ++++ lib_calc.c Mon Feb 7 22:10:42 2000 +@@ -407,9 +407,13 @@ + if (ent == NULL) { + /* just assume . is home if all else fails */ + home = "."; ++ } else { ++ home = (char *)malloc(strlen(ent->pw_dir)+1); ++ if (home == NULL) ++ home = "."; ++ else ++ strcpy(home, ent->pw_dir); + } +- home = (char *)malloc(strlen(ent->pw_dir)+1); +- strcpy(home, ent->pw_dir); + } + + /* determine the $PAGER value */ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021016084754.7353CBE>