Update to 3.31.

This commit is contained in:
form 1999-07-05 19:35:57 +00:00
parent ce8cecfdd4
commit ad72b49b62
8 changed files with 305 additions and 92 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.5 1999/04/09 04:11:58 brad Exp $
# $OpenBSD: Makefile,v 1.6 1999/07/05 19:35:57 form Exp $
DISTNAME= analog3.11
PKGNAME= analog-3.11
DISTNAME= analog3.31
PKGNAME= analog-3.31
CATEGORIES= www
MASTER_SITES= http://www.statslab.cam.ac.uk/~sret1/analog/ \
http://www.magma.ca/~brendanr/analog/ \
@ -14,31 +14,35 @@ MASTER_SITES= http://www.statslab.cam.ac.uk/~sret1/analog/ \
http://analog.wizard.net/ \
ftp://ftp.netcasting.net/pub/packages/analog/
MAINTAINER= ports@openbsd.org
MAINTAINER= form@OpenBSD.ORG
ETCDIR= /etc
ANALOGDIR= ${PREFIX}/lib/analog
CONFIGFILE= ${ETCDIR}/analog.cfg
DOCDIR= ${PREFIX}/share/doc/analog
HTTPDIR= /var/www
IMAGEDIR= /analog-images
CFLAGS+= -DANALOGDIR=\\\"${ANALOGDIR}/\\\" \
-DHTTPDIR=\\\"${HTTPDIR}/\\\" -DETCDIR=\\\"${ETCDIR}/\\\" \
-DDEFAULTCONFIGFILE=\\\"${CONFIGFILE}\\\" \
-DHTTPDIR=\\\"${HTTPDIR}/\\\" \
-DIMAGEDIR=\\\"${IMAGEDIR}/\\\" \
-DANALOG=\\\"${PREFIX}/bin/analog\\\"
do-install:
@${MKDIR} ${DOCDIR}
@${MKDIR} ${ANALOGDIR}/lang
@${MKDIR} ${HTTPDIR}/htdocs/images
${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/images/* ${HTTPDIR}/htdocs/images
${INSTALL_DATA} ${WRKSRC}/lang/* ${ANALOGDIR}/lang
@${INSTALL_DATA_DIR} ${DOCDIR}
@${INSTALL_DATA_DIR} ${ANALOGDIR}/lang
@${INSTALL_DATA_DIR} ${ANALOGDIR}/images
@${INSTALL_DATA_DIR} ${HTTPDIR}/htdocs${IMAGEDIR}
${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/images/* ${ANALOGDIR}/images
${INSTALL_DATA} ${WRKSRC}/lang/* ${ANALOGDIR}/lang
${INSTALL_DATA} ${WRKSRC}/analog.cfg ${ANALOGDIR}
.if !exists(${ETCDIR}/analog.cfg)
${INSTALL_DATA} ${WRKSRC}/analog.cfg ${ETCDIR}
.endif
${INSTALL_DATA} ${WRKSRC}/domains.tab ${ANALOGDIR}
${INSTALL_PROGRAM} ${WRKSRC}/anlgform.cgi ${ANALOGDIR}
${INSTALL_PROGRAM} ${WRKSRC}/anlgform.cgi ${HTTPDIR}/cgi-bin
${INSTALL_DATA} ${WRKSRC}/anlgform.html ${ANALOGDIR}
${INSTALL_DATA} ${WRKSRC}/anlgform.cgi ${ANALOGDIR}
post-install:
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
MD5 (analog3.11.tar.gz) = 7761f7d39f7997eb1ac89a4b3188c559
RMD160 (analog3.11.tar.gz) = 3e47af41481e294d92fe5ac951adfd60e83d2414
SHA1 (analog3.11.tar.gz) = 9b0071cbcdf1978cc7045023f3fbd908329617d8
MD5 (analog3.31.tar.gz) = 30d93a68cf2a4702f6c2568e8a5095c3
RMD160 (analog3.31.tar.gz) = c1b32a10e6ccd71b3e7c29368b03adfb42b8883c
SHA1 (analog3.31.tar.gz) = 1eba7ec35f1dec824aad4a275804e488e064a0dd

View File

@ -1,29 +1,117 @@
--- Makefile.orig Wed Feb 24 01:55:34 1999
+++ Makefile Wed Feb 24 01:57:58 1999
@@ -2,7 +2,7 @@
# $OpenBSD: patch-aa,v 1.3 1999/07/05 19:35:58 form Exp $
--- Makefile.orig Sat Jun 19 18:19:18 1999
+++ Makefile Tue Jul 6 00:29:54 1999
@@ -1,8 +1,8 @@
# Makefile for analog 3.31
# 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
-CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different
+#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.
+#CFLAGS = -O2 ${CFLAGS} # 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
DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOSTRCMP -DEBCDIC
@@ -28,13 +28,15 @@
-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 ...
@@ -25,76 +25,78 @@
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)
# 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
+all: $(FORMPROG) $(PROGRAM)
- $(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+all: $(PROGRAM) $(FORMPROG)
+
+$(PROGRAM): $(OBJS) $(HEADERS)
$(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
+ $(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
@echo '***'
@echo '***IMPORTANT: You must read the licence before using analog'
@echo '***'
-$(OBJS): $(HEADERS) Makefile
+$(OBJS): $(HEADERS)
$(CC) $(CFLAGS) $(DEFS) -D$(OS) -c $*.c
# There doesn't seem to be a good way to write all these rules in a generic
# form that works for all "make" programs
-alias.o: alias.c $(HEADERS) Makefile
+alias.o: alias.c $(HEADERS)
$(CC) $(CFLAGS) -c alias.c
-analog.o: analog.c $(HEADERS) Makefile
+analog.o: analog.c $(HEADERS)
$(CC) $(CFLAGS) -c analog.c
-cache.o: cache.c $(HEADERS) Makefile
+cache.o: cache.c $(HEADERS)
$(CC) $(CFLAGS) -c cache.c
-dates.o: dates.c $(HEADERS) Makefile
+dates.o: dates.c $(HEADERS)
$(CC) $(CFLAGS) -c dates.c
-hash.o: hash.c $(HEADERS) Makefile
+hash.o: hash.c $(HEADERS)
$(CC) $(CFLAGS) -c hash.c
-init.o: init.c $(HEADERS) Makefile
+init.o: init.c $(HEADERS)
$(CC) $(CFLAGS) -c init.c
-init2.o: init2.c $(HEADERS) Makefile
+init2.o: init2.c $(HEADERS)
$(CC) $(CFLAGS) -c init2.c
-input.o: input.c $(HEADERS) Makefile
+input.o: input.c $(HEADERS)
$(CC) $(CFLAGS) -c input.c
-macinput.o: macinput.c $(HEADERS) Makefile
+macinput.o: macinput.c $(HEADERS)
$(CC) $(CFLAGS) -c macinput.c
-macstuff.o: macstuff.c $(HEADERS) Makefile
+macstuff.o: macstuff.c $(HEADERS)
$(CC) $(CFLAGS) -c macstuff.c
-output.o: output.c $(HEADERS) Makefile
+output.o: output.c $(HEADERS)
$(CC) $(CFLAGS) -c output.c
-output2.o: output2.c $(HEADERS) Makefile
+output2.o: output2.c $(HEADERS)
$(CC) $(CFLAGS) -c output2.c
-process.o: process.c $(HEADERS) Makefile
+process.o: process.c $(HEADERS)
$(CC) $(CFLAGS) -c process.c
-settings.o: settings.c $(HEADERS) Makefile
+settings.o: settings.c $(HEADERS)
$(CC) $(CFLAGS) -c settings.c
-sort.o: sort.c $(HEADERS) Makefile
+sort.o: sort.c $(HEADERS)
$(CC) $(CFLAGS) -c sort.c
-tree.o: tree.c $(HEADERS) Makefile
+tree.o: tree.c $(HEADERS)
$(CC) $(CFLAGS) -c tree.c
-utils.o: utils.c $(HEADERS) Makefile
+utils.o: utils.c $(HEADERS)
$(CC) $(CFLAGS) -c utils.c
-win32.o: win32.c $(HEADERS) Makefile
+win32.o: win32.c $(HEADERS)
$(CC) $(CFLAGS) -c win32.c
-$(FORMPROG): $(FORMSRC) Makefile
- $(CC) $(CEXTRAFLAGS) $(FORMSRC) -o $(FORMPROG)
+$(FORMPROG): $(FORMSRC)
+ $(CC) $(CFLAGS) $(FORMSRC) -o $(FORMPROG)
form: $(FORMPROG)
$(FORMPROG): $(FORMSRC) Makefile

View File

@ -1,37 +0,0 @@
--- analhead.h.orig Wed Nov 25 16:46:10 1998
+++ analhead.h Wed Feb 24 01:47:54 1999
@@ -18,8 +18,14 @@
/* the URL of your host's home page, for linking to at the top of the
output; use "none" for no linking. */
-#define HTTPDIR "/usr/local/etc/httpd/"
-#define ANALOGDIR HTTPDIR"analog/"
+#ifndef HTTPDIR
+#define HTTPDIR "/var/www/"
+#endif
+
+#ifndef ANALOGDIR
+#define ANALOGDIR "/usr/local/lib/analog/"
+#endif
+
/* The directories where your HTTP stuff lives and where your analog stuff
lives. You don't really need these; they are just used in this file to
build up other filenames. Note how you can stick together names by
@@ -33,7 +39,7 @@
/* The name of the default logfile. Can be a list, separated by commas
(but no spaces), and can include wild cards. */
-#define IMAGEDIR "images/"
+#define IMAGEDIR "/images/"
/* URL of the directory where the images for the graphical reports live.
The URL can be absolute, or relative to the output page: e.g., just the
empty string "" for the same directory as the output page. */
@@ -41,7 +47,7 @@
#define LANGDIR ANALOGDIR"lang/"
/* Directory where the language files live. */
-#define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
+#define DEFAULTCONFIGFILE ETCDIR"analog.cfg"
/* the name of the default configuration file; see README.html for a
description of this file. Use "none" (NOT ANALOGDIR"none"!) for no
configuration file. */

View File

@ -1,5 +1,7 @@
--- analog.cfg.orig Wed Nov 25 16:49:33 1998
+++ analog.cfg Wed Feb 24 01:43:55 1999
# $OpenBSD: patch-ac,v 1.3 1999/07/05 19:35:58 form Exp $
--- analog.cfg.orig Tue Jul 6 00:01:47 1999
+++ analog.cfg Tue Jul 6 00:02:13 1999
@@ -8,7 +8,7 @@
# REQINCLUDE pages
#
@ -8,4 +10,4 @@
+LOGFILE /var/www/logs/access_log
HOSTNAME "[my organisation]"
LINKINCLUDE pages
UNCOMPRESS *.gz,*.Z "gzip -cd"
REFLINKINCLUDE pages

34
www/analog/pkg/DEINSTALL Normal file
View File

@ -0,0 +1,34 @@
#!/bin/sh
# $OpenBSD: DEINSTALL,v 1.1 1999/07/05 19:35:58 form Exp $
#
# analog deinstallation
IMAGES="analogo.gif bara1.gif bara16.gif bara2.gif bara32.gif bara4.gif \
bara8.gif barb1.gif barb16.gif barb2.gif barb32.gif barb4.gif \
barb8.gif barc1.gif barc16.gif barc2.gif barc32.gif barc4.gif \
barc8.gif bard1.gif bard16.gif bard2.gif bard32.gif bard4.gif \
bard8.gif bare1.gif bare16.gif bare2.gif bare32.gif bare4.gif \
bare8.gif barf1.gif barf16.gif barf2.gif barf32.gif barf4.gif \
barf8.gif barg1.gif barg16.gif barg2.gif barg32.gif barg4.gif \
barg8.gif barh1.gif barh16.gif barh2.gif barh32.gif barh4.gif \
barh8.gif html2.gif"
# exit on errors, use a sane path and prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
for img in ${IMAGES}; do rm -f /var/www/htdocs/analog-images/${img}; done
rmdir /var/www/htdocs/analog-images
rm -f /var/www/cgi-bin/anlgform.cgi
if [ -f /etc/analog.cfg ]; then
echo ""
echo "+---------------"
echo "| To completely deinstall the $1 package you need to remove"
echo "| /etc/analog.cfg file manually."
echo "|"
echo "+---------------"
echo ""
fi
exit 0

55
www/analog/pkg/INSTALL Normal file
View File

@ -0,0 +1,55 @@
#!/bin/sh
# $OpenBSD: INSTALL,v 1.1 1999/07/05 19:35:58 form Exp $
#
# Pre/post-installation setup of analog
IMAGES="analogo.gif bara1.gif bara16.gif bara2.gif bara32.gif bara4.gif \
bara8.gif barb1.gif barb16.gif barb2.gif barb32.gif barb4.gif \
barb8.gif barc1.gif barc16.gif barc2.gif barc32.gif barc4.gif \
barc8.gif bard1.gif bard16.gif bard2.gif bard32.gif bard4.gif \
bard8.gif bare1.gif bare16.gif bare2.gif bare32.gif bare4.gif \
bare8.gif barf1.gif barf16.gif barf2.gif barf32.gif barf4.gif \
barf8.gif barg1.gif barg16.gif barg2.gif barg32.gif barg4.gif \
barg8.gif barh1.gif barh16.gif barh2.gif barh32.gif barh4.gif \
barh8.gif html2.gif"
# exit on errors, use a sane path and install prefix
#
set -e
PATH=/bin:/usr/bin:/sbin:/usr/sbin
PREFIX=${PKG_PREFIX:-/usr/local}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
: nothing to pre-install for this port
;;
POST-INSTALL)
install -d -o root -g bin -m 755 /var/www/htdocs/analog-images
[ -d /var/www/cgi-bin ] || \
install -d -o root -g daemon -m 755 /var/www/cgi-bin
for img in ${IMAGES}; do
install -o root -g bin -m 444 \
${PREFIX}/lib/analog/images/${img} \
/var/www/htdocs/analog-images
done
install -o root -g bin -m 111 ${PREFIX}/lib/analog/anlgform.cgi \
/var/www/cgi-bin
[ -f /etc/analog.cfg ] || install -o root -g wheel -m 444 \
${PREFIX}/lib/analog/analog.cfg /etc
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,41 +1,53 @@
bin/analog
lib/analog/lang/bra.lng
lib/analog/lang/brh.lng
lib/analog/lang/cata.lng
lib/analog/lang/cath.lng
lib/analog/lang/cn.lng
lib/analog/lang/cz1250.lng
lib/analog/lang/cza.lng
lib/analog/lang/czh.lng
lib/analog/lang/dea.lng
lib/analog/lang/deadom.tab
lib/analog/lang/deh.lng
lib/analog/lang/dehdom.tab
lib/analog/lang/dka.lng
lib/analog/lang/dkh.lng
lib/analog/lang/domdea.tab
lib/analog/lang/domdeh.tab
lib/analog/lang/domesa.tab
lib/analog/lang/domesh.tab
lib/analog/lang/domfra.tab
lib/analog/lang/domfrh.tab
lib/analog/lang/dompla.tab
lib/analog/lang/domplh.tab
lib/analog/lang/esa.lng
lib/analog/lang/esadom.tab
lib/analog/lang/esh.lng
lib/analog/lang/eshdom.tab
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
lib/analog/lang/grh.lng
lib/analog/lang/hua.lng
lib/analog/lang/huh.lng
lib/analog/lang/is.lng
lib/analog/lang/isa.lng
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
lib/analog/lang/lvh.lng
lib/analog/lang/nl.lng
lib/analog/lang/no2a.lng
lib/analog/lang/no2h.lng
lib/analog/lang/noa.lng
lib/analog/lang/noh.lng
lib/analog/lang/pla.lng
lib/analog/lang/pladom.tab
lib/analog/lang/plh.lng
lib/analog/lang/plhdom.tab
lib/analog/lang/pta.lng
lib/analog/lang/pth.lng
lib/analog/lang/ro.lng
@ -51,14 +63,73 @@ lib/analog/lang/skh.lng
lib/analog/lang/tra.lng
lib/analog/lang/trh.lng
lib/analog/lang/uk.lng
lib/analog/lang/ukdom.tab
lib/analog/lang/us.lng
lib/analog/images/analogo.gif
lib/analog/images/bara1.gif
lib/analog/images/bara16.gif
lib/analog/images/bara2.gif
lib/analog/images/bara32.gif
lib/analog/images/bara4.gif
lib/analog/images/bara8.gif
lib/analog/images/barb1.gif
lib/analog/images/barb16.gif
lib/analog/images/barb2.gif
lib/analog/images/barb32.gif
lib/analog/images/barb4.gif
lib/analog/images/barb8.gif
lib/analog/images/barc1.gif
lib/analog/images/barc16.gif
lib/analog/images/barc2.gif
lib/analog/images/barc32.gif
lib/analog/images/barc4.gif
lib/analog/images/barc8.gif
lib/analog/images/bard1.gif
lib/analog/images/bard16.gif
lib/analog/images/bard2.gif
lib/analog/images/bard32.gif
lib/analog/images/bard4.gif
lib/analog/images/bard8.gif
lib/analog/images/bare1.gif
lib/analog/images/bare16.gif
lib/analog/images/bare2.gif
lib/analog/images/bare32.gif
lib/analog/images/bare4.gif
lib/analog/images/bare8.gif
lib/analog/images/barf1.gif
lib/analog/images/barf16.gif
lib/analog/images/barf2.gif
lib/analog/images/barf32.gif
lib/analog/images/barf4.gif
lib/analog/images/barf8.gif
lib/analog/images/barg1.gif
lib/analog/images/barg16.gif
lib/analog/images/barg2.gif
lib/analog/images/barg32.gif
lib/analog/images/barg4.gif
lib/analog/images/barg8.gif
lib/analog/images/barh1.gif
lib/analog/images/barh16.gif
lib/analog/images/barh2.gif
lib/analog/images/barh32.gif
lib/analog/images/barh4.gif
lib/analog/images/barh8.gif
lib/analog/images/html2.gif
lib/analog/analog.cfg
lib/analog/domains.tab
lib/analog/anlgform.html
lib/analog/anlgform.cgi
share/doc/analog/Licence.txt
share/doc/analog/Readme.html
share/doc/analog/acknow.html
share/doc/analog/alias.html
share/doc/analog/bara8.gif
share/doc/analog/barb8.gif
share/doc/analog/barc8.gif
share/doc/analog/bard8.gif
share/doc/analog/bare8.gif
share/doc/analog/barf8.gif
share/doc/analog/barg8.gif
share/doc/analog/barh8.gif
share/doc/analog/basiccmd.html
share/doc/analog/cache.html
share/doc/analog/compout.html
@ -70,10 +141,12 @@ share/doc/analog/domfile.html
share/doc/analog/errors.html
share/doc/analog/faq.html
share/doc/analog/form.html
share/doc/analog/helpers.html
share/doc/analog/hierreps.html
share/doc/analog/include.html
share/doc/analog/indx.html
share/doc/analog/logfile.html
share/doc/analog/logfmt.html
share/doc/analog/lowmem.html
share/doc/analog/mailing.html
share/doc/analog/map.html
@ -94,12 +167,6 @@ share/doc/analog/webworks.html
share/doc/analog/whatsnew.html
share/doc/analog/whole.html
@dirrm share/doc/analog
@dirrm lib/analog/images
@dirrm lib/analog/lang
@dirrm lib/analog
@exec [ -f /etc/analog.cfg ] || cp -f %D/lib/analog/analog.cfg /etc
@exec cp -fp %D/lib/analog/anlgform.cgi /var/www/cgi-bin
@unexec rm -f /var/www/cgi-bin/anlgform.cgi
@unexec echo "***"
@unexec echo "*** Please remove /etc/analog.cfg manually to complete"
@unexec echo "*** uninstall procedure."
@unexec echo "***"