Fixes to Makefiles and Packages by Tim Rice

 - Standardises defines included in Makefile Headers among the subdirectorys.

 - Fixes up stuff(fonts etc) in the package directory.

diff --git a/faxstat/Makefile.in b/faxstat/Makefile.in
index bbeebbce17f58cdf763c74fe3f6704bbc1115e33..96477a3ca6bc44c29f8601444bfc1cacbdfdf711 100644 (file)
--- a/faxstat/Makefile.in
+++ b/faxstat/Makefile.in
@@ -34,7 +34,7 @@
 # DATE:                @DATE@
 # TARGET:      @TARGET@
 # CCOMPILER:   @CCOMPILER@
-# CXXCOMPILER: @CXXCOMPILER
+# CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@

diff --git a/pkg/depend b/pkg/depend
index b563428099e48e0bd1f79d463f7b9cb759f25408..a1327396f443d2ff2cd97f2ef519772c161fb295 100644 (file)
--- a/pkg/depend
+++ b/pkg/depend
@@ -7,5 +7,5 @@
 ##P    tifftools       tiff-v3.4beta035
 ##     (i386)  v3.4beta035
 #
-##P    gs403   Aladdin Ghostscript 4.03
-##     (i386)  4.03pl1
+##P    gs510   Aladdin Ghostscript 5.10
+##     (i386)  5.10

diff --git a/pkg/make.links b/pkg/make.links
index 58cc57950e318ec9939a88c8890431f2ee2787c7..09c07277074469a52514cc197f877965e3b4c378 100644 (file)
--- a/pkg/make.links
+++ b/pkg/make.links
@@ -41,6 +41,7 @@ case `basename $0` in
                echo "Making symbolic links for man pages \n in ${MAN_DIR}"
                for j in `ls man`
                do
+                       [ -d ${MAN_DIR}/$j ]  ||  mkdir ${MAN_DIR}/$j
                        for i in `ls man/$j`
                        do
                                [ ! -f ${MAN_DIR}/${j}/${i} ] && ln -s `pwd`/man/${j}/${i} ${MAN_DIR}/${j}/${i}

diff --git a/pkg/postinstall.in b/pkg/postinstall.in
index 1480897a8cc1d6944e0c0bf6ff5d1271ea5e17fc..8243c2885b870d379f45c8f375995f2c38b5468e 100644 (file)
--- a/pkg/postinstall.in
+++ b/pkg/postinstall.in
@@ -10,6 +10,24 @@
 if test -d @SPOOL@/recvq
 then
        echo "\n\nRun @SBIN@/faxsetup\n"
+       cat >/tmp/root.crontab <<EOF
+#      crontab(1)
+# (minutes) (hour) (day of the month) (month of the year) (day of the week)
+# faxqclean - HylaFAX queue cleaner process
+0   0    *    *    *   @SBIN@/faxqclean
+EOF
+
+       cat >/tmp/uucp.crontab <<EOF
+#      crontab(1)
+# (minutes) (hour) (day of the month) (month of the year) (day of the week)
+# faxcron - HylaFAX routine maintenance script
+25   23    *    *    0   sh @SBIN@/faxcron -rcv 20 | mailx -s "Fax Reports" FaxMaster
+EOF
+
+       echo "See sample crontab(1) entries for root and fax (uucp)"
+       echo "/tmp/root.crontab"
+       echo "/tmp/uucp.crontab"
+
 else
        echo "\n\nRun @SBIN@/faxsetup -client\n"
 fi

diff --git a/pkg/postremove.in b/pkg/postremove.in
index 0ffde2872724ccfa2f47ca0bcc3faffc7720a068..a5ba5f6a0b8bdee2f8c0f54d75e5e048573ccaaf 100644 (file)
--- a/pkg/postremove.in
+++ b/pkg/postremove.in
@@ -7,8 +7,13 @@
 
 if test -d @SPOOL@
 then
-       echo "\n\nYou will need to remove @SPOOL@\n"
+       echo "\n\nYou will need to remove @SPOOL@"
+       echo "after saving any files you want to save\n"
        echo "rm -fr @SPOOL@\n"
+
+# I'll automate this part when I get time
+       echo "Remove @SBIN@/faxqclean from root's crontab"
+       echo "Remove @SBIN@/faxcron from uucp's crontab"
 fi
 
 exit 0

diff --git a/pkg/sproto.stub.in b/pkg/sproto.stub.in
index 73a1c9a03e9b72d17ac4094bc535ed9da4bf78f5..07c85bface036a85b7fc178550a67433b68a6989 100644 (file)
--- a/pkg/sproto.stub.in
+++ b/pkg/sproto.stub.in
@@ -195,49 +195,10 @@ d none @SPOOL@/pollq 0700 @FAXUID@ @FAXGID@
 d none @SPOOL@/archive 0700 @FAXUID@ @FAXGID@
 p none @SPOOL@/FIFO 0600 @FAXUID@ @FAXGID@
 f none @SPOOL@/COPYRIGHT=../@SRCDIR@/COPYRIGHT 0444 @SYSUID@ @SYSGID@
-d fonts @AFMDIR@ ? ? ?
-f fonts @AFMDIR@/AvantGarde-Book=../@SRCDIR@/afm/AvantGarde-Book.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/AvantGarde-BookOblique=../@SRCDIR@/afm/AvantGarde-BookOblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/AvantGarde-Demi=../@SRCDIR@/afm/AvantGarde-Demi.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/AvantGarde-DemiOblique=../@SRCDIR@/afm/AvantGarde-DemiOblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Bookman-Demi=../@SRCDIR@/afm/Bookman-Demi.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Bookman-DemiItalic=../@SRCDIR@/afm/Bookman-DemiItalic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Bookman-Light=../@SRCDIR@/afm/Bookman-Light.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Bookman-LightItalic=../@SRCDIR@/afm/Bookman-LightItalic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Courier-Bold=../@SRCDIR@/afm/Courier-Bold.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Courier-BoldOblique=../@SRCDIR@/afm/Courier-BoldOblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Courier-Oblique=../@SRCDIR@/afm/Courier-Oblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Courier=../@SRCDIR@/afm/Courier.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-Bold=../@SRCDIR@/afm/Helvetica-Bold.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-BoldOblique=../@SRCDIR@/afm/Helvetica-BoldOblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-Narrow-Bold=../@SRCDIR@/afm/Helvetica-Narrow-Bold.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-Narrow-BoldOblique=../@SRCDIR@/afm/Helvetica-Narrow-BoldOblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-Narrow-Oblique=../@SRCDIR@/afm/Helvetica-Narrow-Oblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-Narrow=../@SRCDIR@/afm/Helvetica-Narrow.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica-Oblique=../@SRCDIR@/afm/Helvetica-Oblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Helvetica=../@SRCDIR@/afm/Helvetica.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/NewCenturySchlbk-Bold=../@SRCDIR@/afm/NewCenturySchlbk-Bold.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/NewCenturySchlbk-BoldItalic=../@SRCDIR@/afm/NewCenturySchlbk-BoldItalic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/NewCenturySchlbk-Italic=../@SRCDIR@/afm/NewCenturySchlbk-Italic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/NewCenturySchlbk-Roman=../@SRCDIR@/afm/NewCenturySchlbk-Roman.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Palatino-Bold=../@SRCDIR@/afm/Palatino-Bold.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Palatino-BoldItalic=../@SRCDIR@/afm/Palatino-BoldItalic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Palatino-Italic=../@SRCDIR@/afm/Palatino-Italic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Palatino-Oblique=../@SRCDIR@/afm/Palatino-Oblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Palatino-Roman=../@SRCDIR@/afm/Palatino-Roman.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Symbol=../@SRCDIR@/afm/Symbol.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Times-Bold=../@SRCDIR@/afm/Times-Bold.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Times-BoldItalic=../@SRCDIR@/afm/Times-BoldItalic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Times-Italic=../@SRCDIR@/afm/Times-Italic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Times-Oblique=../@SRCDIR@/afm/Times-Oblique.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/Times-Roman=../@SRCDIR@/afm/Times-Roman.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/ZapfChancery-MediumItalic=../@SRCDIR@/afm/ZapfChancery-MediumItalic.afm 0444 @SYSUID@ @SYSGID@
-f fonts @AFMDIR@/ZapfDingbats=../@SRCDIR@/afm/ZapfDingbats.afm 0444 @SYSUID@ @SYSGID@
 d html @CGIDIR@ ? ? ?
 f html @CGIDIR@/man2html=../html/tools/man2html 0555 @SYSUID@ @SYSGID@
 f html @CGIDIR@/unquote=../html/tools/unquote 0555 @SYSUID@ @SYSGID@
 f html @CGIDIR@/manpage=../html/tools/manpage.sh 0555 @SYSUID@ @SYSGID@
-f html @CGIDIR@/faxsurvey=../html/tools/faxsurvey.sh 0555 @SYSUID@ @SYSGID@
 d html @HTMLDIR@ 0755 @SYSUID@ @SYSGID@
 d html @HTMLDIR@/icons 0755 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/icons/at_work_icon.gif=../@SRCDIR@/html/icons/at_work_icon.gif 0444 @SYSUID@ @SYSGID@
@@ -316,9 +277,6 @@ f html @HTMLDIR@/setup-advanced.html=../@SRCDIR@/html/setup-advanced.html 0444 @
 f html @HTMLDIR@/setup-client.html=../@SRCDIR@/html/setup-client.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/setup.html=../@SRCDIR@/html/setup.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/source.html=../@SRCDIR@/html/source.html 0444 @SYSUID@ @SYSGID@
-f html @HTMLDIR@/survey-help.html=../@SRCDIR@/html/survey-help.html 0444 @SYSUID@ @SYSGID@
-f html @HTMLDIR@/survey-query.html=../@SRCDIR@/html/survey-query.html 0444 @SYSUID@ @SYSGID@
-f html @HTMLDIR@/survey.html=../@SRCDIR@/html/survey.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/toc.html=../@SRCDIR@/html/toc.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/troubleshooting.html=../@SRCDIR@/html/troubleshooting.html 0444 @SYSUID@ @SYSGID@
 f html @HTMLDIR@/upgrade4.0.html=../@SRCDIR@/html/upgrade4.0.html 0444 @SYSUID@ @SYSGID@

diff --git a/pkg/srequest.in b/pkg/srequest.in
index 09609e27c61ecb11ce43449453acf4150b48a82b..bdd6075d2835d326f3e5968a3fdf1a96c5c50b28 100644 (file)
--- a/pkg/srequest.in
+++ b/pkg/srequest.in
@@ -8,11 +8,6 @@ then
         CLASSES="$CLASSES man"
 fi
 
-if [ "@AFM@" = yes ]
-then
-        CLASSES="$CLASSES fonts"
-fi
-
 if [ "@HTML@" = yes ]
 then
 # determine if html man pages should be installed

diff --git a/regex/Makefile.in b/regex/Makefile.in
index 0352278b87609ad1c8a9f5bf16813363888443d6..2334a97ef325846fda4f84e2c68df3f538e54acc 100644 (file)
--- a/regex/Makefile.in
+++ b/regex/Makefile.in
@@ -30,11 +30,11 @@
 #
 
 #
-# VERSION:     $VERSION
-# DATE:                $DATE
-# TARGET:      $TARGET
-# CCOMPILER:   $CCOMPILER
-# CXXCOMPILER: $CXXCOMPILER
+# VERSION:     @VERSION@
+# DATE:                @DATE@
+# TARGET:      @TARGET@
+# CCOMPILER:   @CCOMPILER@
+# CXXCOMPILER: @CXXCOMPILER@
 #
 DEPTH=..
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@

diff --git a/zlib/Makefile.in b/zlib/Makefile.in
index b0cd8979d43cdd71a69987a8c208fad7e17bc8d4..b36a73a3e5eb50066fbf1680fbdc02b3fb3a7712 100644 (file)
--- a/zlib/Makefile.in
+++ b/zlib/Makefile.in
@@ -1,4 +1,7 @@
 # Makefile for zlib
+#
+# @WARNING@
+#
 # Copyright (C) 1995-1998 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 
@@ -12,6 +15,12 @@
 # To install in $HOME instead of /usr/local, use:
 #    make install prefix=$HOME
 
+# VERSION:  @VERSION@
+# DATE:     @DATE@
+# TARGET:   @TARGET@
+# CCOMPILER:    @CCOMPILER@
+# CXXCOMPILER:  @CXXCOMPILER@
+
 DEPTH=..
 @MAKEINCLUDE@ @MAKELQUOTE@${DEPTH}/defs@MAKERQUOTE@