From f9e5b9fc5b4fa2a4cc78a26fbf778730a98ca74d Mon Sep 17 00:00:00 2001 From: tron Date: Sat, 29 May 1999 10:31:06 +0000 Subject: Update "analog" package to version 3.3. The following bugs were fixed since 3.2: - There were some crashes when outputting cache files. - Some people had trouble with the Makefile in 3.2. --- www/analog/Makefile | 6 ++--- www/analog/files/md5 | 4 +-- www/analog/patches/patch-aa | 62 +++++++++++---------------------------------- www/analog/pkg/PLIST | 4 ++- 4 files changed, 23 insertions(+), 53 deletions(-) (limited to 'www/analog') diff --git a/www/analog/Makefile b/www/analog/Makefile index 10c688c4b39..59ee2afdd7f 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 1999/05/10 22:37:13 tron Exp $ +# $NetBSD: Makefile,v 1.6 1999/05/29 10:31:06 tron Exp $ # FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp -DISTNAME= analog3.2 -PKGNAME= analog-3.2 +DISTNAME= analog3.3 +PKGNAME= analog-3.3 CATEGORIES= www MASTER_SITES= http://www.statslab.cam.ac.uk/~sret1/analog/ \ http://www.web42.com/analog/ \ diff --git a/www/analog/files/md5 b/www/analog/files/md5 index a7637600b2b..bea9a1e1c0b 100644 --- a/www/analog/files/md5 +++ b/www/analog/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.3 1999/05/11 09:07:09 tron Exp $ +$NetBSD: md5,v 1.4 1999/05/29 10:31:07 tron Exp $ -MD5 (analog3.2.tar.gz) = 72d8d2d7c19d23f829bafea4e8fa29cb +MD5 (analog3.3.tar.gz) = ff1ed8d18c6e41d4edcc8a7fb517bfff diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa index bd5fe147301..76da720d540 100644 --- a/www/analog/patches/patch-aa +++ b/www/analog/patches/patch-aa @@ -1,66 +1,34 @@ -$NetBSD: patch-aa,v 1.2 1999/05/09 16:41:15 tron Exp $ +$NetBSD: patch-aa,v 1.3 1999/05/29 10:31:07 tron Exp $ ---- Makefile.orig Tue May 4 12:02:27 1999 -+++ Makefile Sun May 9 17:40:24 1999 -@@ -2,17 +2,16 @@ +--- Makefile.orig Wed May 19 13:07:25 1999 ++++ Makefile Sat May 29 12:19:53 1999 +@@ -2,10 +2,10 @@ # Please read docs/Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/ CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different # compilers need different CFLAGS, e.g., -O instead of -O2. --CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. --# HP/UX cc needs -Aa (HP/UX 9) or -Ae (HP/UX 10) --# Some Linuces might need -I/usr/src/linux/include --# BS2000/OSD requires -XLLML -XLLMK --DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DEBCDIC ... -+CEXTRAFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. -+# HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ... -+# -Ae (HP/UX 10); BS2000/OSD requires -XLLML -XLLMK +-CEXTRAFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. ++#CEXTRAFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. + # HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ... + # -Ae (HP/UX 10); BS2000/OSD requires -XLLML -XLLMK +-DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DEBCDIC ... +DEFS = -DPREFIX=\"${PREFIX}\" -+ # any of -DNOPIPES -DNODNS -DNODIRENT -DEBCDIC ... # ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ... --# ... -DNEED_DIFFTIME -DNEED_FLOATINGPONT_H -+# ... -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H + # ... -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H # Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP - # SunOS 4 probably needs... --# DEFS = -DNEED_MEMMOVE -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPONT_H --# but even then it may have bugs. -+# DEFS = -DNEED_MEMMOVE -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H - OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, VMS - # RISCOS, BEOS, BS2000 - LIBS = # extra libraries needed; Solaris 2 (SunOS 5) needs -@@ -29,29 +28,31 @@ +@@ -25,14 +25,14 @@ macinput.o macstuff.o output.o output2.o process.o settings.o \ sort.o tree.o utils.o win32.o HEADERS = analhead.h analhea2.h macdir.h -+CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS) +-CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS) ++CFLAGS += $(DEFS) -D$(OS) # Form interface options: FORMPROG = anlgform.cgi # The program that processes the data from the form FORMSRC = anlgform.c # The source code for that program $(PROGRAM): $(OBJS) $(HEADERS) Makefile -- $(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS) -+ $(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS) +- $(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS) ++ $(CC) $(OBJS) -o $(PROGRAM) $(LIBS) @echo '***' @echo '***IMPORTANT: You must read the licence before using analog' @echo '***' - -+# Some make's won't pick up this rule but their .c.o rule should be good enough - %.o: %.c $(HEADERS) Makefile -- $(CC) $(CFLAGS) $(DEFS) -D$(OS) -c $< -+ $(CC) $(CFLAGS) -c $< - - $(FORMPROG): $(FORMSRC) Makefile -- $(CC) $(CFLAGS) $(FORMSRC) -o $(FORMPROG) -+ $(CC) $(CEXTRAFLAGS) $(FORMSRC) -o $(FORMPROG) - - form: $(FORMPROG) - - force: - rm -f $(OBJS) -- make $(PROGRAM) 'CFLAGS=$(CFLAGS)' 'LIBS=$(LIBS)' 'DEFS=$(DEFS)' \ -- CC=$(CC) -+ make $(PROGRAM) 'CEXTRAFLAGS=$(CEXTRAFLAGS)' 'LIBS=$(LIBS)' \ -+ 'DEFS=$(DEFS)' CC=$(CC) - - clean: - rm -f *.o analog *~ diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST index 647bf3592ff..20b8da03c00 100644 --- a/www/analog/pkg/PLIST +++ b/www/analog/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 1999/05/10 22:37:13 tron Exp $ +@comment $NetBSD: PLIST,v 1.6 1999/05/29 10:31:08 tron Exp $ bin/analog etc/analog.cfg.default @exec cp -p %F %D/etc/analog.cfg @@ -33,6 +33,7 @@ lib/analog/lang/fia.lng lib/analog/lang/fih.lng lib/analog/lang/fra.lng lib/analog/lang/fradom.tab +lib/analog/lang/frform.html lib/analog/lang/frh.lng lib/analog/lang/frhdom.tab lib/analog/lang/gra.lng @@ -45,6 +46,7 @@ lib/analog/lang/ish.lng lib/analog/lang/ita.lng lib/analog/lang/ith.lng lib/analog/lang/jp.lng +lib/analog/lang/jpform.html lib/analog/lang/kr.lng lib/analog/lang/lt.lng lib/analog/lang/lva.lng -- cgit v1.2.3