[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.17 and 1.18

version 1.17, 2013/05/21 18:36:52 version 1.18, 2014/03/14 15:59:29
Line 1 
Line 1 
 $NetBSD$  $NetBSD$
   
 - Configure for pkgsrc.  * Customize paths.
 - Recognize libtiff 4.x.  * Configure for pkgsrc.
 - ...  
   
 --- configure.orig      2005-12-16 22:40:30.000000000 +0000  --- configure.orig      2012-06-06 00:58:38.000000000 +0000
 +++ configure  +++ configure
 @@ -37,23 +37,23 @@  @@ -37,23 +37,23 @@
  #   #
Line 16  $NetBSD$
Line 15  $NetBSD$
 -DIR_LIB=/usr/local/lib  -DIR_LIB=/usr/local/lib
 -DIR_LIBEXEC=$DIR_SBIN  -DIR_LIBEXEC=$DIR_SBIN
 -DIR_SPOOL=/var/spool/hylafax  -DIR_SPOOL=/var/spool/hylafax
 -DIR_HTML=/var/httpd/htdocs/hylafax  -DIR_LOCALE=/usr/local/share/locale
 -DIR_CGI=/var/httpd/cgi-bin  -DIR_CGI=/var/httpd/cgi-bin
 +DIR_BIN=${PREFIX}/bin  +DIR_BIN=${PREFIX}/bin
 +DIR_SBIN=${PREFIX}/sbin  +DIR_SBIN=${PREFIX}/sbin
Line 24  $NetBSD$
Line 23  $NetBSD$
 +DIR_LIB=${PREFIX}/lib  +DIR_LIB=${PREFIX}/lib
 +DIR_LIBEXEC=${PREFIX}/libexec  +DIR_LIBEXEC=${PREFIX}/libexec
 +DIR_SPOOL=${VARBASE}/spool/hylafax  +DIR_SPOOL=${VARBASE}/spool/hylafax
 +DIR_HTML=${PREFIX}/http/htdocs/hylafax  +DIR_LOCALE=${PREFIX}/share/locale
 +DIR_CGI=${PREFIX}/http/cgi-bin  +DIR_CGI=${PREFIX}/http/cgi-bin
  PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe   PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
 -PATH_IMPRIP=/usr/lib/print/psrip  -PATH_IMPRIP=/usr/lib/print/psrip
 +PATH_IMPRIP=${PREFIX}/lib/print/psrip  +PATH_IMPRIP=${PREFIX}/lib/print/psrip
  HTMLPATH=/hylafax  
  CGIPATH=/cgi-bin   CGIPATH=/cgi-bin
    LOCALE_DOMAIN=hylafax
  DEFVRES=98   DEFVRES=98
  PAGESIZE="North American Letter"   PAGESIZE="North American Letter"
  FAXUID=uucp   FAXUID=uucp
Line 40  $NetBSD$
Line 39  $NetBSD$
  SYSGID=   SYSGID=
  DSO=auto   DSO=auto
  GETTY=auto   GETTY=auto
 @@ -72,9 +72,8 @@ DPS=no  @@ -70,11 +70,10 @@ GS=no
  GS=no  
  IMP=no   IMP=no
  UTMP=auto   UTMP=auto
    NLS=auto
 -OPTIMIZER="-O"  -OPTIMIZER="-O"
 -LIBTIFF="-L/usr/local/lib -ltiff"   LIBCRYPT=
 -TIFFINC=/usr/local/include   LIBPAM=
 +LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"  -LIBTIFF="-ltiff"
 +TIFFINC=${PREFIX}/include  -TIFFINC=
   +LIBTIFF=`pkg-config --libs libtiff-4`
   +TIFFINC=`pkg-config --cflags libtiff-4`
  TIFFBIN=   TIFFBIN=
  LIBZ=   LIBUTIL=
  ZLIBINC=   LIBZ=-lz
 @@ -82,8 +81,8 @@ REGEX=yes  @@ -229,6 +228,7 @@ PKG_ARCH
  LIBREGEX='-L${DEPTH}/regex -lregex'   PKG_EMAIL
  REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'  
  DBLIB=no  
 -LIBDB="-L/usr/local/lib -ldb"  
 -DBLIBINC=/usr/local/include  
 +LIBDB="-L${PREFIX}/lib -ldb"  
 +DBLIBINC=${PREFIX}/include  
  FAXD=  
  LIBFAXSERVER='libfaxserver.${DSO}'  
  LIBUTIL='${UTIL}/libfaxutil.${DSO}'  
 @@ -224,6 +223,7 @@ PKG_EMAIL  
  PKG_VENDOR   PKG_VENDOR
  PORT  
  PORTFUNCS   PORTFUNCS
 +PREFIX  +PREFIX
  PROTOTYPES   PROTOTYPES
  PSPACKAGE      PS   PSPACKAGE      PS
  PWDCMD   PWDCMD
 @@ -290,7 +290,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd  @@ -300,7 +300,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 80  $NetBSD$
Line 70  $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
 @@ -809,7 +809,7 @@ checkGCCVersion()  @@ -831,7 +831,7 @@ checkGCCVersion()
  # NB: use ANSI C prototype to weed out non-ANSI compilers.   # NB: use ANSI C prototype to weed out non-ANSI compilers.
  #   #
  cat>dummy.c<<EOF   cat>dummy.c<<EOF
Line 89  $NetBSD$
Line 79  $NetBSD$
  EOF   EOF
   
  checkCompiler()   checkCompiler()
 @@ -958,7 +958,7 @@ fi  @@ -982,7 +982,7 @@ fi
  # Make dependency information.   # Make dependency information.
  #   #
  cat>dummy.c<<EOF   cat>dummy.c<<EOF
Line 98  $NetBSD$
Line 88  $NetBSD$
  EOF   EOF
  capture cat dummy.c   capture cat dummy.c
  if capture "$CCOMPILER -c -M $MKDEPCOPTS dummy.c | grep '^dummy.o[     ]*:[    ]*dummy.c'"; then   if capture "$CCOMPILER -c -M $MKDEPCOPTS dummy.c | grep '^dummy.o[     ]*:[    ]*dummy.c'"; then
 @@ -1418,12 +1418,22 @@ runMake()  @@ -1629,7 +1629,7 @@ pamconv(int num_msg, const struct pam_me
  CheckForCXXRuntime()  
  {  
  cat>t.c++<<EOF  
 +#include <iostream>  
 +int main(){ std::cout << "Hello World!" << std::endl; return 0;}  
 +EOF  
 +    runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}" || return $?  
 +    Note "Looks like the system has a CXX runtime"  
 +}  
 +CheckForDeprecatedCXXRuntime()  
 +{  
 +cat>t.c++<<EOF  
  #include "iostream.h"  
  int main(){ cout << "Hello World!" << endl; return 0;}  
  EOF  
 -    runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}"  
 +    runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}" || return $?  
 +    Note "Looks like the system has a CXX runtime with deprecated headers"  
  }  
 -CheckForCXXRuntime || {  
 +CheckForCXXRuntime || CheckForDeprecatedCXXRuntime || {  
      cat 1>&2 <<EOF  
   
  Missing C++ runtime support for $CXX ($CXXCOMPILER).  
 @@ -1591,7 +1601,7 @@ pamconv(int num_msg, const struct pam_me  
  {   {
      return(0);       return(0);
  }   }
Line 132  $NetBSD$
Line 97  $NetBSD$
  {   {
      struct pam_conv conv = { pamconv };       struct pam_conv conv = { pamconv };
  }   }
 @@ -2062,7 +2072,7 @@ EmitConfigurationDefinitions()  @@ -2176,7 +2176,7 @@ EmitConfigurationDefinitions()
  #   #
  CheckForFunc()   CheckForFunc()
  {   {
 -    echo "extern int $1(); main(){$1();exit(0);}" >t.c  -    echo "extern int $1(); main(){$1($2);exit(0);}" >t.c
 +    echo "extern int $1(); int main(){$1();exit(0);}" >t.c  +    echo "extern int $1(); int main(){$1($2);exit(0);}" >t.c
      capture cat t.c       capture cat t.c
      runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"       runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
  }   }
 @@ -2315,7 +2325,7 @@ CheckForStructExitStatus()  @@ -2448,7 +2448,7 @@ CheckForStructExitStatus()
         echo "$i"          echo "$i"
      done       done
      cat<<EOF       cat<<EOF
Line 150  $NetBSD$
Line 115  $NetBSD$
  {   {
      struct $decl x;       struct $decl x;
      x.ut_exit.e_exit = 0;       x.ut_exit.e_exit = 0;
 @@ -2332,7 +2342,7 @@ CheckForTimeZoneHandling()  @@ -2465,7 +2465,7 @@ CheckForTimeZoneHandling()
  {   {
      (echo '#include <time.h>'       (echo '#include <time.h>'
      cat<<EOF       cat<<EOF
Line 159  $NetBSD$
Line 124  $NetBSD$
  {   {
      struct tm x;       struct tm x;
      char* cp;       char* cp;
 @@ -2351,7 +2361,7 @@ CheckForTXCD()  @@ -2484,7 +2484,7 @@ CheckForTXCD()
  {   {
      cat>t.c<<EOF       cat>t.c<<EOF
  #include <sys/ioctl.h>   #include <sys/ioctl.h>
Line 168  $NetBSD$
Line 133  $NetBSD$
  {   {
      ioctl(0, TXADDCD, "rts");       ioctl(0, TXADDCD, "rts");
      ioctl(0, TXDELCD, "rts");       ioctl(0, TXDELCD, "rts");
 @@ -2400,7 +2410,7 @@ CheckLibtiff()  @@ -2538,7 +2538,7 @@ CheckLibtiff()
      cat>t.c<<EOF       cat>t.c<<EOF
  #include <stdio.h>   #include <stdio.h>
  #include "tiffio.h"   #include "tiffio.h"
Line 177  $NetBSD$
Line 142  $NetBSD$
  {   {
      printf( "header_ver=%d lib_ver=%s", TIFFLIB_VERSION, TIFFGetVersion() );       printf( "header_ver=%d lib_ver=%s", TIFFLIB_VERSION, TIFFGetVersion() );
      exit(0);       exit(0);
 @@ -2418,7 +2428,7 @@ EOF  @@ -3281,7 +3281,7 @@ CheckForSyslog()
         if [ ${header_ver} -ge 19960307 ]; then  
             case ${lib_ver} in  
                 3.4)            tiff_runlen_t="uint16" ;;  
 -               3.[567])        tiff_runlen_t="uint32" ;;  
 +               3.[56789]|4*)   tiff_runlen_t="uint32" ;;  
             esac  
         fi  
      else  
 @@ -3102,7 +3112,7 @@ CheckForSyslog()  
  {   {
      (echo '#include <syslog.h>';       (echo '#include <syslog.h>';
       echo '#include "port.h"';        echo '#include "port.h"';
Line 195  $NetBSD$
Line 151  $NetBSD$
      capture cat t.c       capture cat t.c
      runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"       runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
  }   }
 @@ -3111,7 +3121,7 @@ CheckForVSyslog()  @@ -3290,7 +3290,7 @@ CheckForVSyslog()
      (echo '#include <syslog.h>';       (echo '#include <syslog.h>';
       echo '#include <stdarg.h>';        echo '#include <stdarg.h>';
       echo '#include "port.h"';        echo '#include "port.h"';
Line 204  $NetBSD$
Line 160  $NetBSD$
      capture cat t.c       capture cat t.c
      runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"       runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
  }   }
 @@ -3139,19 +3149,13 @@ Note "Checking ZLIB support."  @@ -3314,19 +3314,13 @@ Note "Checking ZLIB support."
  #   #
  cat>t.c<<EOF   cat>t.c<<EOF
  #include "zlib.h"   #include "zlib.h"
Line 225  $NetBSD$
Line 181  $NetBSD$
  }   }
  EOF   EOF
  capture cat t.c   capture cat t.c
 @@ -3213,7 +3217,7 @@ Note "Checking TIFF support."  @@ -3385,7 +3379,7 @@ Note "Checking TIFF support."
  # Location of TIFF binaries   # Location of TIFF binaries
  #   #
  if [ -z "$TIFFBIN" ]; then   if [ -z "$TIFFBIN" ]; then
Line 234  $NetBSD$
Line 190  $NetBSD$
      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
 @@ -3245,7 +3249,7 @@ if [ -f $SRCDIR/MLA/VERSION -a $DBLIB =  @@ -3806,6 +3800,7 @@ if [ -z "$FAXGID" ]; then
  #include <stdio.h>  
  #include <string.h>  
  #include "db.h"  
 -main()  
 +int main()  
  {  
      DBT key, data;  
      const char d[] = "some random string";  
 @@ -3722,6 +3726,7 @@ if [ -z "$FAXGID" ]; then  
      *-bsdi*)   FAXGID=uucp;;       *-bsdi*)   FAXGID=uucp;;
      *freebsd2.1*) FAXGID=uucp; break;; # Not sure when this changed..       *freebsd2.1*) FAXGID=uucp; break;; # Not sure when this changed..
      *bsd*)     FAXGID=dialer;;       *bsd*)     FAXGID=dialer;;
Line 251  $NetBSD$
Line 198  $NetBSD$
      *-hpux*)   FAXGID=sys;;       *-hpux*)   FAXGID=sys;;
      *-irix*)   FAXGID=nuucp;;       *-irix*)   FAXGID=nuucp;;
      *-isc*)    FAXGID=uucp;;       *-isc*)    FAXGID=uucp;;
 @@ -3750,6 +3755,7 @@ if [ -z "$SYSGID" ]; then  @@ -3834,6 +3829,7 @@ if [ -z "$SYSGID" ]; then
      *-aix*)    SYSGID=sys;;       *-aix*)    SYSGID=sys;;
      *netbsd*)  SYSGID=wheel;;       *netbsd*)  SYSGID=wheel;;
      *bsd*)     SYSGID=bin;;       *bsd*)     SYSGID=bin;;
Line 259  $NetBSD$
Line 206  $NetBSD$
      *-hpux*)   SYSGID=bin;;       *-hpux*)   SYSGID=bin;;
      *-irix*)   SYSGID=sys;;       *-irix*)   SYSGID=sys;;
      *-isc*)    SYSGID=sys;;       *-isc*)    SYSGID=sys;;
 @@ -3794,6 +3800,7 @@ fi  @@ -3878,6 +3874,7 @@ fi
  if [ "$GETTY" = auto ]; then   if [ "$GETTY" = auto ]; then
      case $TARGET in       case $TARGET in
      *bsd*)     GETTY=BSD;;       *bsd*)     GETTY=BSD;;
Line 267  $NetBSD$
Line 214  $NetBSD$
      *-sunos*)  GETTY=BSD;;       *-sunos*)  GETTY=BSD;;
      *-ultrix*) GETTY=BSD;;       *-ultrix*) GETTY=BSD;;
      *darwin*)   GETTY=BSD;;       *darwin*)   GETTY=BSD;;
 @@ -3836,7 +3843,7 @@ fi  @@ -3920,7 +3917,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 276  $NetBSD$
Line 223  $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 +3856,7 @@ fi  @@ -3933,7 +3930,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 285  $NetBSD$
Line 232  $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."
 @@ -3871,6 +3878,7 @@ if [ "$LOCKS" = auto ]; then  @@ -3956,6 +3953,7 @@ if [ "$LOCKS" = auto ]; then
      *-sysv5*)  LOCKS="+ascii";;       *-sysv5*)  LOCKS="+ascii";;
      *-solaris*)        LOCKS="+ascii";;       *-solaris*)        LOCKS="+ascii";;
      *-freebsd*)        LOCKS=ascii;;       *-freebsd*)        LOCKS=ascii;;
Line 293  $NetBSD$
Line 240  $NetBSD$
      *-netbsd*) LOCKS=ascii;;       *-netbsd*) LOCKS=ascii;;
      *bsd*)     LOCKS=binary;;       *bsd*)     LOCKS=binary;;
      *)         LOCKS=ascii;;       *)         LOCKS=ascii;;
 @@ -3920,6 +3928,7 @@ PickRIP()  @@ -4005,6 +4003,7 @@ PickRIP()
  {   {
      if [ -z "$PATH_GSRIP" ]; then       if [ -z "$PATH_GSRIP" ]; then
         GSLOCS="          GSLOCS="
Line 301  $NetBSD$
Line 248  $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 +3976,7 @@ fax software to operate correctly.  See  @@ -4052,7 +4051,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 310  $NetBSD$
Line 257  $NetBSD$
         PATH_GSRIP=$PATH_PSRIP          PATH_GSRIP=$PATH_PSRIP
      fi       fi
  }   }
 @@ -4034,9 +4043,9 @@ if [ -z "$PATH_AFM" ]; then  @@ -4119,9 +4118,9 @@ if [ -z "$PATH_AFM" ]; then
      else       else
          DIR_AFMS="           DIR_AFMS="
             /usr/lib/afm              /usr/lib/afm
Line 323  $NetBSD$
Line 270  $NetBSD$
             /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 +4065,7 @@ if [ -z "$PATH_AFM" ]; then  @@ -4141,7 +4140,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 332  $NetBSD$
Line 279  $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 +4084,7 @@ fi  @@ -4160,7 +4159,7 @@ fi
  #   #
  if [ -z "$DIR_MAN" ]; then   if [ -z "$DIR_MAN" ]; then
      MANPATH="       MANPATH="
Line 341  $NetBSD$
Line 288  $NetBSD$
         /usr/local/man          /usr/local/man
         /usr/contrib/man          /usr/contrib/man
         /usr/catman/local          /usr/catman/local
 @@ -4084,43 +4093,11 @@ if [ -z "$DIR_MAN" ]; then  @@ -4169,43 +4168,11 @@ 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.17  
changed lines
  Added in v.1.18

CVSweb <webmaster@jp.NetBSD.org>