Annotation of pkgsrc/comms/hylafax/patches/patch-ae, Revision 1.10.8.1
1.10.8.1! salo 1: $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $
1.1 rh 2:
1.10.8.1! salo 3: --- configure.orig 2005-12-16 22:40:30.000000000 +0000
1.6 hubertf 4: +++ configure
5: @@ -37,23 +37,23 @@
1.2 abs 6: #
7: # Setup general configuration parameters.
8: #
9: -DIR_BIN=/usr/local/bin
10: -DIR_SBIN=/usr/local/sbin
11: -DIR_LIBDATA=/usr/local/lib/fax
1.6 hubertf 12: -DIR_LIB=/usr/local/lib
1.2 abs 13: -DIR_LIBEXEC=$DIR_SBIN
1.10.8.1! salo 14: -DIR_SPOOL=/var/spool/hylafax
! 15: -DIR_HTML=/var/httpd/htdocs/hylafax
! 16: -DIR_CGI=/var/httpd/cgi-bin
1.2 abs 17: +DIR_BIN=${PREFIX}/bin
18: +DIR_SBIN=${PREFIX}/sbin
19: +DIR_LIBDATA=${PREFIX}/libdata/hylafax
1.6 hubertf 20: +DIR_LIB=${PREFIX}/lib
1.2 abs 21: +DIR_LIBEXEC=${PREFIX}/libexec
1.10.8.1! salo 22: +DIR_SPOOL=${VARBASE}/spool/hylafax
1.8 heinz 23: +DIR_HTML=${PREFIX}/http/htdocs/hylafax
24: +DIR_CGI=${PREFIX}/http/cgi-bin
1.2 abs 25: PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
26: -PATH_IMPRIP=/usr/lib/print/psrip
27: +PATH_IMPRIP=${PREFIX}/lib/print/psrip
28: HTMLPATH=/hylafax
29: CGIPATH=/cgi-bin
30: DEFVRES=98
31: PAGESIZE="North American Letter"
1.5 bad 32: FAXUID=uucp
33: FAXGID=
34: -SYSUID=bin
35: +SYSUID=root
1.2 abs 36: SYSGID=
37: DSO=auto
1.5 bad 38: GETTY=auto
1.10 adam 39: @@ -72,9 +72,8 @@ DPS=no
40: GS=no
1.2 abs 41: IMP=no
42: UTMP=auto
1.10 adam 43: -OPTIMIZER="-O"
1.2 abs 44: -LIBTIFF="-L/usr/local/lib -ltiff"
45: -TIFFINC=/usr/local/include
46: +LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
47: +TIFFINC=${PREFIX}/include
48: TIFFBIN=
1.4 abs 49: LIBZ=
50: ZLIBINC=
1.10 adam 51: @@ -82,8 +81,8 @@ REGEX=yes
1.2 abs 52: LIBREGEX='-L${DEPTH}/regex -lregex'
53: REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
54: DBLIB=no
55: -LIBDB="-L/usr/local/lib -ldb"
56: -DBLIBINC=/usr/local/include
57: +LIBDB="-L${PREFIX}/lib -ldb"
58: +DBLIBINC=${PREFIX}/include
1.6 hubertf 59: FAXD=
60: LIBFAXSERVER='libfaxserver.${DSO}'
61: LIBUTIL='${UTIL}/libfaxutil.${DSO}'
1.10.8.1! salo 62: @@ -224,6 +223,7 @@ PKG_EMAIL
1.2 abs 63: PKG_VENDOR
64: PORT
65: PORTFUNCS
66: +PREFIX
1.5 bad 67: PROTOTYPES
1.2 abs 68: PSPACKAGE PS
1.6 hubertf 69: PWDCMD
1.10.8.1! salo 70: @@ -290,7 +290,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
1.2 abs 71: test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others
72: test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi
73: test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others
74: -test -d /usr/local/bin && PATH=/usr/local/bin:$PATH # for GNU stuff
75: +test -d ${PREFIX}/bin && PATH=${PREFIX}/bin:$PATH # for packages stuff
76: PATH=$PATH:$OPATH
77:
78: POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
1.10.8.1! salo 79: @@ -2418,7 +2418,7 @@ EOF
! 80: if [ ${header_ver} -ge 19960307 ]; then
! 81: case ${lib_ver} in
! 82: 3.4) tiff_runlen_t="uint16" ;;
! 83: - 3.[567]) tiff_runlen_t="uint32" ;;
! 84: + 3.[5678]) tiff_runlen_t="uint32" ;;
! 85: esac
! 86: fi
! 87: else
! 88: @@ -3145,13 +3145,7 @@ main()
1.4 abs 89: printf("old include files: version %u\n", ZLIB_VERSION);
1.2 abs 90: exit(-1);
91: }
1.4 abs 92: - if (strncmp(zlib_version, ZLIB_VERSION, 4) != 0) {
93: - printf("library/header file incompatibility: %s %s\n",
94: - zlib_version, ZLIB_VERSION);
95: - exit(-1);
96: - } else {
97: exit(0);
98: - }
1.1 rh 99: }
1.2 abs 100: EOF
1.4 abs 101: capture cat t.c
1.10.8.1! salo 102: @@ -3213,7 +3207,7 @@ Note "Checking TIFF support."
1.6 hubertf 103: # Location of TIFF binaries
104: #
105: if [ -z "$TIFFBIN" ]; then
106: - DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
1.10.8.1! salo 107: + DIRS="${PREFIX}/bin /usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
1.6 hubertf 108: for i in $DIRS; do
109: test -x $i/tiff2ps && { TIFFBIN=$i; break; }
110: done
1.10.8.1! salo 111: @@ -3836,7 +3830,7 @@ fi
1.2 abs 112: if [ -z "$PATH_VGETTY" ]; then
113: PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
114: if [ -z "$PATH_VGETTY" ]; then
115: - PATH_VGETTY=/bin/vgetty
116: + PATH_VGETTY=${PREFIX}/bin/vgetty
117: Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
118: else
119: Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
1.10.8.1! salo 120: @@ -3849,7 +3843,7 @@ fi
1.2 abs 121: if [ -z "$PATH_EGETTY" ]; then
122: PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`
123: if [ -z "$PATH_EGETTY" ]; then
124: - PATH_EGETTY=/bin/egetty
125: + PATH_EGETTY=${PREFIX}/bin/egetty
126: Note "WARNING, no egetty program found, using $PATH_EGETTY."
127: else
128: Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
1.10.8.1! salo 129: @@ -3920,6 +3914,7 @@ PickRIP()
1.2 abs 130: {
131: if [ -z "$PATH_GSRIP" ]; then
132: GSLOCS="
133: + ${PREFIX}/bin/gs
134: /usr/local/bin/gs
135: /usr/contrib/bin/gs
136: /usr/gnu/bin/gs
1.10.8.1! salo 137: @@ -3967,7 +3962,7 @@ fax software to operate correctly. See
1.2 abs 138: on building Ghostscript with the necessary TIFF driver.
1.1 rh 139:
1.2 abs 140: EOF
141: - PATH_PSRIP=/usr/local/bin/gs
142: + PATH_PSRIP=${PREFIX}/bin/gs
143: PATH_GSRIP=$PATH_PSRIP
144: fi
1.1 rh 145: }
1.10.8.1! salo 146: @@ -4034,9 +4029,9 @@ if [ -z "$PATH_AFM" ]; then
1.2 abs 147: else
148: DIR_AFMS="
149: /usr/lib/afm
150: - /usr/local/lib/afm
151: - /usr/local/share/ghostscript/fonts
152: - /usr/local/lib/ghostscript/fonts
153: + ${PREFIX}/lib/afm
154: + ${PREFIX}/share/ghostscript/fonts
1.10.8.1! salo 155: + ${PREFIX}/lib/ghostscript/fonts
1.2 abs 156: /usr/share/ghostscript/fonts
157: /usr/gnu/lib/ghostscript/fonts
158: /opt/gnu/lib/ghostscript/fonts
1.10.8.1! salo 159: @@ -4056,7 +4051,7 @@ if [ -z "$PATH_AFM" ]; then
1.2 abs 160: fi
161: if [ -z "$PATH_AFM" ]; then
162: # put it where ghostscript normally puts things
163: - PATH_AFM=/usr/local/lib/ghostscript/fonts
164: + PATH_AFM=${PREFIX}/share/ghostscript/fonts
165: Note "WARNING, could not locate a directory with font metric information,"
166: Note "guessing that font metric information goes in $PATH_AFM."
167: else
1.10.8.1! salo 168: @@ -4075,7 +4070,7 @@ fi
1.2 abs 169: #
170: if [ -z "$DIR_MAN" ]; then
171: MANPATH="
1.10.8.1! salo 172: - $MANPATH
1.2 abs 173: + ${PREFIX}/man
174: /usr/local/man
175: /usr/contrib/man
1.10.8.1! salo 176: /usr/catman/local
! 177: @@ -4084,7 +4079,7 @@ if [ -z "$DIR_MAN" ]; then
1.2 abs 178: for i in $MANPATH; do
179: test -d $i && { DIR_MAN=$i; break; }
180: done
181: - test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
182: + test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man
183: fi
184: Note "Looks like manual pages go in $DIR_MAN."
185: if [ -z "$MANSCHEME" ]; then
CVSweb <webmaster@jp.NetBSD.org>
![[BACK]](/icons/back.gif){kind=icon}
Return to patch-ae CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [cvs.NetBSD.org] / pkgsrc / comms / hylafax / patches