use DOCSDIR

   -- mharo

add -DHAVE_ZLIB to Makefile to use system libz and fix a bug
   -- Matthew Reimer <mreimer@vpop.net>

PR:		55844
Submitted by:	Matthew Reimer <mreimer@vpop.net>

3 files changed, 73 insertions, 72 deletions

diff --git a/www/analog/Makefile b/www/analog/Makefile
index c7158035d10b..93b6b0534370 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -49,8 +49,8 @@ do-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg-dist
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/analog
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${WRKSRC}/analog.man ${PREFIX}/man/man1/analog.1
 
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa
index 299b723ddba4..c3033542875a 100644
--- a/www/analog/files/patch-aa
+++ b/www/analog/files/patch-aa
@@ -1,7 +1,7 @@
---- src/Makefile.orig	Sun Mar 23 13:57:02 2003
-+++ src/Makefile	Sun May 11 09:24:47 2003
-@@ -2,15 +2,21 @@
- # Please read docs/Readme.html, or http://www.analog.cx/
+--- src/Makefile.orig	Sun Mar 23 05:57:02 2003
++++ src/Makefile	Thu Aug 21 10:26:26 2003
+@@ -2,15 +2,22 @@
+ # Please read docs/Readme.html, or <A HREF="http://www.analog.cx/">http://www.analog.cx/</A>
  # This is a general Unix-like Makefile: Makefiles for other OS's can be found
  #   in the "build" directory.
 -CC = gcc           # which compiler to use: eg cc, acc, gcc. NB Different
@@ -20,12 +20,13 @@
 +       -DIMAGEDIR=\"/images/\" \
 +       -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" \
 +       -DLANGDIR=\"${PREFIX}/share/analog/lang/\" \
-+       -DCONFIGDIR=\"$(PREFIX)/share/analog/\"
++       -DCONFIGDIR=\"$(PREFIX)/share/analog/\" \
++       -DHAVE_ZLIB
 +#DEFS =          # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ...
  #                 ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ...
  #                 ... -DEBCDIC -DUSE_PLAIN_SETJMP ...
  #                 ... -DHAVE_GD -DHAVE_ZLIB -DHAVE_PCRE ...
-@@ -30,6 +36,12 @@
+@@ -30,6 +37,12 @@
  OS = UNIX         # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS
  #                   RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390
  LIBS = -lm  # extra libraries needed; most platforms (but not OS X or BeOS)
diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist
index 1d90e71105be..c400d39803dd 100644
--- a/www/analog/pkg-plist
+++ b/www/analog/pkg-plist
@@ -165,70 +165,70 @@ share/analog/lang/usform.html
 share/analog/lang/yu.lng
 share/analog/lang/yua.lng
 share/analog/lang/yudom.tab
-%%PORTDOCS%%share/doc/analog/LicBSD.txt
-%%PORTDOCS%%share/doc/analog/Licapach.txt
-%%PORTDOCS%%share/doc/analog/Licence.txt
-%%PORTDOCS%%share/doc/analog/Licgd.txt
-%%PORTDOCS%%share/doc/analog/Licpcre.txt
-%%PORTDOCS%%share/doc/analog/Licpng.txt
-%%PORTDOCS%%share/doc/analog/Liczlib.txt
-%%PORTDOCS%%share/doc/analog/Readme.html
-%%PORTDOCS%%share/doc/analog/acknow.html
-%%PORTDOCS%%share/doc/analog/alias.html
-%%PORTDOCS%%share/doc/analog/analogo.gif
-%%PORTDOCS%%share/doc/analog/anlgdocs.css
-%%PORTDOCS%%share/doc/analog/args.html
-%%PORTDOCS%%share/doc/analog/bara8.gif
-%%PORTDOCS%%share/doc/analog/barb1.gif
-%%PORTDOCS%%share/doc/analog/barb32.gif
-%%PORTDOCS%%share/doc/analog/barb8.gif
-%%PORTDOCS%%share/doc/analog/barc8.gif
-%%PORTDOCS%%share/doc/analog/bard8.gif
-%%PORTDOCS%%share/doc/analog/bare8.gif
-%%PORTDOCS%%share/doc/analog/barf8.gif
-%%PORTDOCS%%share/doc/analog/barg8.gif
-%%PORTDOCS%%share/doc/analog/barh8.gif
-%%PORTDOCS%%share/doc/analog/bari8.gif
-%%PORTDOCS%%share/doc/analog/barj8.gif
-%%PORTDOCS%%share/doc/analog/basiccmd.html
-%%PORTDOCS%%share/doc/analog/cache.html
-%%PORTDOCS%%share/doc/analog/custom.html
-%%PORTDOCS%%share/doc/analog/compout.html
-%%PORTDOCS%%share/doc/analog/debug.html
-%%PORTDOCS%%share/doc/analog/defns.html
-%%PORTDOCS%%share/doc/analog/dns.html
-%%PORTDOCS%%share/doc/analog/domfile.html
-%%PORTDOCS%%share/doc/analog/errors.html
-%%PORTDOCS%%share/doc/analog/faq.html
-%%PORTDOCS%%share/doc/analog/favicon.ico
-%%PORTDOCS%%share/doc/analog/form.html
-%%PORTDOCS%%share/doc/analog/helpers.html
-%%PORTDOCS%%share/doc/analog/hierreps.html
-%%PORTDOCS%%share/doc/analog/include.html
-%%PORTDOCS%%share/doc/analog/indx.html
-%%PORTDOCS%%share/doc/analog/logfile.html
-%%PORTDOCS%%share/doc/analog/logfmt.html
-%%PORTDOCS%%share/doc/analog/lowmem.html
-%%PORTDOCS%%share/doc/analog/mailing.html
-%%PORTDOCS%%share/doc/analog/map.html
-%%PORTDOCS%%share/doc/analog/meaning.html
-%%PORTDOCS%%share/doc/analog/othreps.html
-%%PORTDOCS%%share/doc/analog/output.html
-%%PORTDOCS%%share/doc/analog/quickref.html
-%%PORTDOCS%%share/doc/analog/reports.html
-%%PORTDOCS%%share/doc/analog/start.html
-%%PORTDOCS%%share/doc/analog/startmac.html
-%%PORTDOCS%%share/doc/analog/startpc.html
-%%PORTDOCS%%share/doc/analog/startux.html
-%%PORTDOCS%%share/doc/analog/syntax.html
-%%PORTDOCS%%share/doc/analog/timereps.html
-%%PORTDOCS%%share/doc/analog/update.html
-%%PORTDOCS%%share/doc/analog/wasnew1.html
-%%PORTDOCS%%share/doc/analog/wasnew2.html
-%%PORTDOCS%%share/doc/analog/wasnew3.html
-%%PORTDOCS%%share/doc/analog/wasnew4.html
-%%PORTDOCS%%share/doc/analog/webworks.html
-%%PORTDOCS%%share/doc/analog/whatsnew.html
+%%PORTDOCS%%%%DOCSDIR%%/LicBSD.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licapach.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licence.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licgd.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licpcre.txt
+%%PORTDOCS%%%%DOCSDIR%%/Licpng.txt
+%%PORTDOCS%%%%DOCSDIR%%/Liczlib.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme.html
+%%PORTDOCS%%%%DOCSDIR%%/acknow.html
+%%PORTDOCS%%%%DOCSDIR%%/alias.html
+%%PORTDOCS%%%%DOCSDIR%%/analogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/anlgdocs.css
+%%PORTDOCS%%%%DOCSDIR%%/args.html
+%%PORTDOCS%%%%DOCSDIR%%/bara8.gif
+%%PORTDOCS%%%%DOCSDIR%%/barb1.gif
+%%PORTDOCS%%%%DOCSDIR%%/barb32.gif
+%%PORTDOCS%%%%DOCSDIR%%/barb8.gif
+%%PORTDOCS%%%%DOCSDIR%%/barc8.gif
+%%PORTDOCS%%%%DOCSDIR%%/bard8.gif
+%%PORTDOCS%%%%DOCSDIR%%/bare8.gif
+%%PORTDOCS%%%%DOCSDIR%%/barf8.gif
+%%PORTDOCS%%%%DOCSDIR%%/barg8.gif
+%%PORTDOCS%%%%DOCSDIR%%/barh8.gif
+%%PORTDOCS%%%%DOCSDIR%%/bari8.gif
+%%PORTDOCS%%%%DOCSDIR%%/barj8.gif
+%%PORTDOCS%%%%DOCSDIR%%/basiccmd.html
+%%PORTDOCS%%%%DOCSDIR%%/cache.html
+%%PORTDOCS%%%%DOCSDIR%%/custom.html
+%%PORTDOCS%%%%DOCSDIR%%/compout.html
+%%PORTDOCS%%%%DOCSDIR%%/debug.html
+%%PORTDOCS%%%%DOCSDIR%%/defns.html
+%%PORTDOCS%%%%DOCSDIR%%/dns.html
+%%PORTDOCS%%%%DOCSDIR%%/domfile.html
+%%PORTDOCS%%%%DOCSDIR%%/errors.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/favicon.ico
+%%PORTDOCS%%%%DOCSDIR%%/form.html
+%%PORTDOCS%%%%DOCSDIR%%/helpers.html
+%%PORTDOCS%%%%DOCSDIR%%/hierreps.html
+%%PORTDOCS%%%%DOCSDIR%%/include.html
+%%PORTDOCS%%%%DOCSDIR%%/indx.html
+%%PORTDOCS%%%%DOCSDIR%%/logfile.html
+%%PORTDOCS%%%%DOCSDIR%%/logfmt.html
+%%PORTDOCS%%%%DOCSDIR%%/lowmem.html
+%%PORTDOCS%%%%DOCSDIR%%/mailing.html
+%%PORTDOCS%%%%DOCSDIR%%/map.html
+%%PORTDOCS%%%%DOCSDIR%%/meaning.html
+%%PORTDOCS%%%%DOCSDIR%%/othreps.html
+%%PORTDOCS%%%%DOCSDIR%%/output.html
+%%PORTDOCS%%%%DOCSDIR%%/quickref.html
+%%PORTDOCS%%%%DOCSDIR%%/reports.html
+%%PORTDOCS%%%%DOCSDIR%%/start.html
+%%PORTDOCS%%%%DOCSDIR%%/startmac.html
+%%PORTDOCS%%%%DOCSDIR%%/startpc.html
+%%PORTDOCS%%%%DOCSDIR%%/startux.html
+%%PORTDOCS%%%%DOCSDIR%%/syntax.html
+%%PORTDOCS%%%%DOCSDIR%%/timereps.html
+%%PORTDOCS%%%%DOCSDIR%%/update.html
+%%PORTDOCS%%%%DOCSDIR%%/wasnew1.html
+%%PORTDOCS%%%%DOCSDIR%%/wasnew2.html
+%%PORTDOCS%%%%DOCSDIR%%/wasnew3.html
+%%PORTDOCS%%%%DOCSDIR%%/wasnew4.html
+%%PORTDOCS%%%%DOCSDIR%%/webworks.html
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew.html
 %%IMGDIR%%/analogo.gif
 %%IMGDIR%%/analogo.png
 %%IMGDIR%%/bara1.gif