update to 4.0
This commit is contained in:
form
parent
ee58b32756
commit
663f31d987
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.7 1999/09/16 14:09:25 form Exp $
|
||||
# $OpenBSD: Makefile,v 1.8 1999/12/13 17:26:55 form Exp $
|
||||
|
||||
DISTNAME= analog3.32
|
||||
PKGNAME= analog-3.32
|
||||
DISTNAME= analog4.0
|
||||
PKGNAME= analog-4.0
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://www.statslab.cam.ac.uk/~sret1/analog/ \
|
||||
http://www.magma.ca/~brendanr/analog/ \
|
||||
@ -29,6 +29,11 @@ CFLAGS+= -DANALOGDIR=\\\"${ANALOGDIR}/\\\" \
|
||||
-DIMAGEDIR=\\\"${IMAGEDIR}/\\\" \
|
||||
-DANALOG=\\\"${PREFIX}/bin/analog\\\"
|
||||
|
||||
post-patch:
|
||||
@${MV} ${WRKSRC}/anlgform.pl ${WRKSRC}/anlgform.pl.src
|
||||
@${SED} -e "s,@PREFIX@,${PREFIX},g" < ${WRKSRC}/anlgform.pl.src \
|
||||
> ${WRKSRC}/anlgform.pl
|
||||
|
||||
do-install:
|
||||
@${INSTALL_DATA_DIR} ${DOCDIR}
|
||||
@${INSTALL_DATA_DIR} ${ANALOGDIR}/lang
|
||||
@ -40,7 +45,7 @@ do-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/lang/* ${ANALOGDIR}/lang
|
||||
${INSTALL_DATA} ${WRKSRC}/analog.cfg ${ANALOGDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/anlgform.html ${ANALOGDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/anlgform.cgi ${ANALOGDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/anlgform.pl ${ANALOGDIR}
|
||||
|
||||
post-install:
|
||||
@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (analog3.32.tar.gz) = d3e53dd67409dcaccb4cf92d2f458c1a
|
||||
RMD160 (analog3.32.tar.gz) = e65a2033326fd66c70ac2f2682c3d5d2eef2f864
|
||||
SHA1 (analog3.32.tar.gz) = d8f3d3a75165d228123a9a3261816b1d3cc5e8c6
|
||||
MD5 (analog4.0.tar.gz) = 9923d45c2cffbd1efc563be0a0f45dbb
|
||||
RMD160 (analog4.0.tar.gz) = 3f7ecd1fa46df0e0e86178b27c78a033d3ff32ca
|
||||
SHA1 (analog4.0.tar.gz) = 1605164d8bdd79a4f0da47c47c41240ebb9cccc6
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: patch-aa,v 1.3 1999/07/05 19:35:58 form Exp $
|
||||
# $OpenBSD: patch-aa,v 1.4 1999/12/13 17:26:55 form Exp $
|
||||
|
||||
--- Makefile.orig Sat Jun 19 18:19:18 1999
|
||||
+++ Makefile Tue Jul 6 00:29:54 1999
|
||||
--- Makefile.orig Mon Dec 13 22:46:44 1999
|
||||
+++ Makefile Mon Dec 13 22:49:42 1999
|
||||
@@ -1,8 +1,8 @@
|
||||
# Makefile for analog 3.31
|
||||
# Makefile for analog 4.0
|
||||
# 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
|
||||
@ -12,27 +12,19 @@
|
||||
+#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 \
|
||||
DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ...
|
||||
@@ -25,7 +25,9 @@
|
||||
input.o 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
|
||||
HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.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
|
||||
- $(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
|
||||
+all: $(PROGRAM) $(FORMPROG)
|
||||
+
|
||||
+$(PROGRAM): $(OBJS) $(HEADERS)
|
||||
+ $(CC) $(CFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
|
||||
@echo '***'
|
||||
@echo '***IMPORTANT: You must read the licence before using analog'
|
||||
@echo '***'
|
||||
+all: $(PROGRAM)
|
||||
|
||||
$(PROGRAM): $(OBJS) $(HEADERS) Makefile
|
||||
$(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS)
|
||||
@@ -35,61 +37,61 @@
|
||||
|
||||
# There doesn't seem to be a good way to write all these rules in a generic
|
||||
# form that works for all "make" programs
|
||||
@ -52,6 +44,10 @@
|
||||
+dates.o: dates.c $(HEADERS)
|
||||
$(CC) $(CFLAGS) -c dates.c
|
||||
|
||||
-globals.o: globals.c $(HEADERS) Makefile
|
||||
+globals.o: globals.c $(HEADERS)
|
||||
$(CC) $(CFLAGS) -c globals.c
|
||||
|
||||
-hash.o: hash.c $(HEADERS) Makefile
|
||||
+hash.o: hash.c $(HEADERS)
|
||||
$(CC) $(CFLAGS) -c hash.c
|
||||
@ -108,10 +104,4 @@
|
||||
+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)
|
||||
|
||||
force:
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
# $OpenBSD: patch-ac,v 1.3 1999/07/05 19:35:58 form Exp $
|
||||
# $OpenBSD: patch-ac,v 1.4 1999/12/13 17:26:55 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
|
||||
--- analog.cfg.orig Mon Dec 13 23:12:31 1999
|
||||
+++ analog.cfg Mon Dec 13 23:13:08 1999
|
||||
@@ -7,7 +7,7 @@
|
||||
# There is a much more extensive configuration file in examples/big.cfg
|
||||
#
|
||||
# If you have a LOGFORMAT command it must go here, above the LOGFILE command.
|
||||
-LOGFILE logfile.log
|
||||
+LOGFILE /var/www/logs/access_log
|
||||
HOSTNAME "[my organisation]"
|
||||
# If you need a LOGFORMAT command it must go here, above the LOGFILE command.
|
||||
-# LOGFILE logfile.log
|
||||
+# LOGFILE /var/www/logs/access_log
|
||||
# HOSTNAME "[my organisation]"
|
||||
# REQINCLUDE pages
|
||||
LINKINCLUDE pages
|
||||
REFLINKINCLUDE pages
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: DEINSTALL,v 1.1 1999/07/05 19:35:58 form Exp $
|
||||
# $OpenBSD: DEINSTALL,v 1.2 1999/12/13 17:26:55 form Exp $
|
||||
#
|
||||
# analog deinstallation
|
||||
|
||||
@ -20,7 +20,7 @@ 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
|
||||
rm -f /var/www/cgi-bin/anlgform.pl
|
||||
if [ -f /etc/analog.cfg ]; then
|
||||
echo ""
|
||||
echo "+---------------"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: INSTALL,v 1.1 1999/07/05 19:35:58 form Exp $
|
||||
# $OpenBSD: INSTALL,v 1.2 1999/12/13 17:26:55 form Exp $
|
||||
#
|
||||
# Pre/post-installation setup of analog
|
||||
|
||||
@ -41,7 +41,7 @@ case $2 in
|
||||
${PREFIX}/lib/analog/images/${img} \
|
||||
/var/www/htdocs/analog-images
|
||||
done
|
||||
install -o root -g bin -m 111 ${PREFIX}/lib/analog/anlgform.cgi \
|
||||
install -o root -g bin -m 111 ${PREFIX}/lib/analog/anlgform.pl \
|
||||
/var/www/cgi-bin
|
||||
[ -f /etc/analog.cfg ] || install -o root -g wheel -m 444 \
|
||||
${PREFIX}/lib/analog/analog.cfg /etc
|
||||
|
||||
@ -1,4 +1,57 @@
|
||||
bin/analog
|
||||
lib/analog/analog.cfg
|
||||
lib/analog/anlgform.html
|
||||
lib/analog/anlgform.pl
|
||||
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/lang/bra.lng
|
||||
lib/analog/lang/brh.lng
|
||||
lib/analog/lang/cata.lng
|
||||
@ -9,6 +62,7 @@ lib/analog/lang/cza.lng
|
||||
lib/analog/lang/czh.lng
|
||||
lib/analog/lang/dea.lng
|
||||
lib/analog/lang/deadom.tab
|
||||
lib/analog/lang/deform.html
|
||||
lib/analog/lang/deh.lng
|
||||
lib/analog/lang/dehdom.tab
|
||||
lib/analog/lang/dka.lng
|
||||
@ -68,64 +122,15 @@ lib/analog/lang/trh.lng
|
||||
lib/analog/lang/uk.lng
|
||||
lib/analog/lang/ukdom.tab
|
||||
lib/analog/lang/us.lng
|
||||
lib/analog/lang/yu.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/anlgform.html
|
||||
lib/analog/anlgform.cgi
|
||||
lib/analog/lang/usform.html
|
||||
lib/analog/lang/yua.lng
|
||||
lib/analog/lang/yudom.tab
|
||||
lib/analog/lang/yuh.lng
|
||||
share/doc/analog/Licence.txt
|
||||
share/doc/analog/Readme.html
|
||||
share/doc/analog/acknow.html
|
||||
share/doc/analog/alias.html
|
||||
share/doc/analog/args.html
|
||||
share/doc/analog/bara8.gif
|
||||
share/doc/analog/barb1.gif
|
||||
share/doc/analog/barb32.gif
|
||||
@ -171,10 +176,11 @@ share/doc/analog/timereps.html
|
||||
share/doc/analog/update.html
|
||||
share/doc/analog/wasnew1.html
|
||||
share/doc/analog/wasnew2.html
|
||||
share/doc/analog/wasnew3.html
|
||||
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/images
|
||||
@dirrm lib/analog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user