[BACK]Return to patch-ae CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / comms / hylafax / patches

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/comms/hylafax/patches/patch-ae between version 1.10.8.1 and 1.11

version 1.10.8.1, 2006/01/22 19:25:26 version 1.11, 2006/01/04 22:36:50
Line 1 
Line 1 
 $NetBSD$  $NetBSD$
   
 --- configure.orig      2005-12-16 22:40:30.000000000 +0000  --- configure.orig      2005-08-08 19:38:08.000000000 +0000
 +++ configure  +++ configure
 @@ -37,23 +37,23 @@  @@ -37,23 +37,23 @@
  #   #
Line 11  $NetBSD$
Line 11  $NetBSD$
 -DIR_LIBDATA=/usr/local/lib/fax  -DIR_LIBDATA=/usr/local/lib/fax
 -DIR_LIB=/usr/local/lib  -DIR_LIB=/usr/local/lib
 -DIR_LIBEXEC=$DIR_SBIN  -DIR_LIBEXEC=$DIR_SBIN
 -DIR_SPOOL=/var/spool/hylafax  
 -DIR_HTML=/var/httpd/htdocs/hylafax  
 -DIR_CGI=/var/httpd/cgi-bin  
 +DIR_BIN=${PREFIX}/bin  +DIR_BIN=${PREFIX}/bin
 +DIR_SBIN=${PREFIX}/sbin  +DIR_SBIN=${PREFIX}/sbin
 +DIR_LIBDATA=${PREFIX}/libdata/hylafax  +DIR_LIBDATA=${PREFIX}/libdata/hylafax
 +DIR_LIB=${PREFIX}/lib  +DIR_LIB=${PREFIX}/lib
 +DIR_LIBEXEC=${PREFIX}/libexec  +DIR_LIBEXEC=${PREFIX}/libexec
 +DIR_SPOOL=${VARBASE}/spool/hylafax   DIR_SPOOL=/var/spool/hylafax
   -DIR_HTML=/var/httpd/htdocs/hylafax
   -DIR_CGI=/var/httpd/cgi-bin
 +DIR_HTML=${PREFIX}/http/htdocs/hylafax  +DIR_HTML=${PREFIX}/http/htdocs/hylafax
 +DIR_CGI=${PREFIX}/http/cgi-bin  +DIR_CGI=${PREFIX}/http/cgi-bin
  PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe   PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
Line 59  $NetBSD$
Line 58  $NetBSD$
  FAXD=   FAXD=
  LIBFAXSERVER='libfaxserver.${DSO}'   LIBFAXSERVER='libfaxserver.${DSO}'
  LIBUTIL='${UTIL}/libfaxutil.${DSO}'   LIBUTIL='${UTIL}/libfaxutil.${DSO}'
 @@ -224,6 +223,7 @@ PKG_EMAIL  @@ -222,6 +221,7 @@ PKG_EMAIL
  PKG_VENDOR   PKG_VENDOR
  PORT   PORT
  PORTFUNCS   PORTFUNCS
Line 67  $NetBSD$
Line 66  $NetBSD$
  PROTOTYPES   PROTOTYPES
  PSPACKAGE      PS   PSPACKAGE      PS
  PWDCMD   PWDCMD
 @@ -290,7 +290,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd  @@ -288,7 +288,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
  test -d /usr/ucb && PATH=$PATH:/usr/ucb                        # Sun and others   test -d /usr/ucb && PATH=$PATH:/usr/ucb                        # Sun and others
  test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin        # BSDi   test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin        # BSDi
  test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc     # Sun and others   test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc     # Sun and others
Line 76  $NetBSD$
Line 75  $NetBSD$
  PATH=$PATH:$OPATH   PATH=$PATH:$OPATH
   
  POSIXLY_CORRECT=1; export POSIXLY_CORRECT              # disable GNU extensions   POSIXLY_CORRECT=1; export POSIXLY_CORRECT              # disable GNU extensions
 @@ -2418,7 +2418,7 @@ EOF  @@ -2399,7 +2399,7 @@ EOF
         if [ ${header_ver} -ge 19960307 ]; then          if [ ${header_ver} -ge 19960307 ]; then
             case ${lib_ver} in              if [ "${lib_ver}" = "3.4" ]; then
                 3.4)            tiff_runlen_t="uint16" ;;                  tiff_runlen_t="uint16"
 -               3.[567])        tiff_runlen_t="uint32" ;;  -           elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" -o "${lib_ver}" = "3.7" ]; then
 +               3.[5678])       tiff_runlen_t="uint32" ;;  +           elif [ "${lib_ver}" = "3.5" -o "${lib_ver}" = "3.6" -o "${lib_ver}" = "3.7"  -o "${lib_ver}" = "3.8" ]; then
             esac                  tiff_runlen_t="uint32"
               fi
         fi          fi
      else  @@ -3127,13 +3127,7 @@ main()
 @@ -3145,13 +3145,7 @@ main()  
          printf("old include files: version %u\n", ZLIB_VERSION);           printf("old include files: version %u\n", ZLIB_VERSION);
          exit(-1);           exit(-1);
      }       }
Line 99  $NetBSD$
Line 98  $NetBSD$
  }   }
  EOF   EOF
  capture cat t.c   capture cat t.c
 @@ -3213,7 +3207,7 @@ Note "Checking TIFF support."  @@ -3195,7 +3189,7 @@ Note "Checking TIFF support."
  # Location of TIFF binaries   # Location of TIFF binaries
  #   #
  if [ -z "$TIFFBIN" ]; then   if [ -z "$TIFFBIN" ]; then
 -    DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"  -    DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
 +    DIRS="${PREFIX}/bin /usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"  +    DIRS="${PREFIX}/bin /usr/local/bin /usr/gnu/bin /usr/bin"
      for i in $DIRS; do       for i in $DIRS; do
          test -x $i/tiff2ps && { TIFFBIN=$i; break; }           test -x $i/tiff2ps && { TIFFBIN=$i; break; }
      done       done
 @@ -3836,7 +3830,7 @@ fi  @@ -3818,7 +3812,7 @@ fi
  if [ -z "$PATH_VGETTY" ]; then   if [ -z "$PATH_VGETTY" ]; then
      PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`       PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
      if [ -z "$PATH_VGETTY" ]; then       if [ -z "$PATH_VGETTY" ]; then
Line 117  $NetBSD$
Line 116  $NetBSD$
         Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."          Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
      else       else
         Note "Looks like $PATH_VGETTY is the program to exec for a voice call."          Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
 @@ -3849,7 +3843,7 @@ fi  @@ -3831,7 +3825,7 @@ fi
  if [ -z "$PATH_EGETTY" ]; then   if [ -z "$PATH_EGETTY" ]; then
      PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`       PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`
      if [ -z "$PATH_EGETTY" ]; then       if [ -z "$PATH_EGETTY" ]; then
Line 126  $NetBSD$
Line 125  $NetBSD$
         Note "WARNING, no egetty program found, using $PATH_EGETTY."          Note "WARNING, no egetty program found, using $PATH_EGETTY."
      else       else
         Note "Looks like $PATH_EGETTY is the program to exec for an extern call."          Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
 @@ -3920,6 +3914,7 @@ PickRIP()  @@ -3902,6 +3896,7 @@ PickRIP()
  {   {
      if [ -z "$PATH_GSRIP" ]; then       if [ -z "$PATH_GSRIP" ]; then
         GSLOCS="          GSLOCS="
Line 134  $NetBSD$
Line 133  $NetBSD$
             /usr/local/bin/gs              /usr/local/bin/gs
             /usr/contrib/bin/gs              /usr/contrib/bin/gs
             /usr/gnu/bin/gs              /usr/gnu/bin/gs
 @@ -3967,7 +3962,7 @@ fax software to operate correctly.  See  @@ -3949,7 +3944,7 @@ fax software to operate correctly.  See
  on building Ghostscript with the necessary TIFF driver.   on building Ghostscript with the necessary TIFF driver.
   
  EOF   EOF
Line 143  $NetBSD$
Line 142  $NetBSD$
         PATH_GSRIP=$PATH_PSRIP          PATH_GSRIP=$PATH_PSRIP
      fi       fi
  }   }
 @@ -4034,9 +4029,9 @@ if [ -z "$PATH_AFM" ]; then  @@ -4016,9 +4011,9 @@ if [ -z "$PATH_AFM" ]; then
      else       else
          DIR_AFMS="           DIR_AFMS="
             /usr/lib/afm              /usr/lib/afm
Line 152  $NetBSD$
Line 151  $NetBSD$
 -           /usr/local/lib/ghostscript/fonts  -           /usr/local/lib/ghostscript/fonts
 +           ${PREFIX}/lib/afm  +           ${PREFIX}/lib/afm
 +           ${PREFIX}/share/ghostscript/fonts  +           ${PREFIX}/share/ghostscript/fonts
 +           ${PREFIX}/lib/ghostscript/fonts  +           ${PREFIX}/lib/ghostscript/fonts
             /usr/share/ghostscript/fonts              /usr/share/ghostscript/fonts
             /usr/gnu/lib/ghostscript/fonts              /usr/gnu/lib/ghostscript/fonts
             /opt/gnu/lib/ghostscript/fonts              /opt/gnu/lib/ghostscript/fonts
 @@ -4056,7 +4051,7 @@ if [ -z "$PATH_AFM" ]; then  @@ -4038,7 +4033,7 @@ if [ -z "$PATH_AFM" ]; then
  fi   fi
  if [ -z "$PATH_AFM" ]; then   if [ -z "$PATH_AFM" ]; then
      # put it where ghostscript normally puts things       # put it where ghostscript normally puts things
Line 165  $NetBSD$
Line 164  $NetBSD$
      Note "WARNING, could not locate a directory with font metric information,"       Note "WARNING, could not locate a directory with font metric information,"
      Note "guessing that font metric information goes in $PATH_AFM."       Note "guessing that font metric information goes in $PATH_AFM."
  else   else
 @@ -4075,7 +4070,7 @@ fi  @@ -4057,6 +4052,7 @@ fi
  #   #
  if [ -z "$DIR_MAN" ]; then   if [ -z "$DIR_MAN" ]; then
      MANPATH="       MANPATH="
 -       $MANPATH  
 +       ${PREFIX}/man  +       ${PREFIX}/man
           $MANPATH
         /usr/local/man          /usr/local/man
         /usr/contrib/man          /usr/contrib/man
         /usr/catman/local  @@ -4066,7 +4062,7 @@ if [ -z "$DIR_MAN" ]; then
 @@ -4084,7 +4079,7 @@ if [ -z "$DIR_MAN" ]; then  
      for i in $MANPATH; do       for i in $MANPATH; do
         test -d $i && { DIR_MAN=$i; break; }          test -d $i && { DIR_MAN=$i; break; }
      done       done

Legend:
Removed from v.1.10.8.1  
changed lines
  Added in v.1.11

CVSweb <webmaster@jp.NetBSD.org>