Annotation of pkgsrc/comms/hylafax/patches/patch-ae, Revision 1.10
1.10 ! adam 1: $NetBSD$
1.1 rh 2:
1.10 ! adam 3: --- configure.orig 2004-12-28 04:45:03.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
14: +DIR_BIN=${PREFIX}/bin
15: +DIR_SBIN=${PREFIX}/sbin
16: +DIR_LIBDATA=${PREFIX}/libdata/hylafax
1.6 hubertf 17: +DIR_LIB=${PREFIX}/lib
1.2 abs 18: +DIR_LIBEXEC=${PREFIX}/libexec
1.5 bad 19: DIR_SPOOL=/var/spool/hylafax
1.2 abs 20: -DIR_HTML=/var/httpd/htdocs/hylafax
21: -DIR_CGI=/var/httpd/cgi-bin
1.8 heinz 22: +DIR_HTML=${PREFIX}/http/htdocs/hylafax
23: +DIR_CGI=${PREFIX}/http/cgi-bin
1.2 abs 24: PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
25: -PATH_IMPRIP=/usr/lib/print/psrip
26: +PATH_IMPRIP=${PREFIX}/lib/print/psrip
27: HTMLPATH=/hylafax
28: CGIPATH=/cgi-bin
29: DEFVRES=98
30: PAGESIZE="North American Letter"
1.5 bad 31: FAXUID=uucp
32: FAXGID=
33: -SYSUID=bin
34: +SYSUID=root
1.2 abs 35: SYSGID=
36: DSO=auto
1.5 bad 37: GETTY=auto
1.10 ! adam 38: @@ -72,9 +72,8 @@ DPS=no
! 39: GS=no
1.2 abs 40: IMP=no
41: UTMP=auto
1.10 ! adam 42: -OPTIMIZER="-O"
1.2 abs 43: -LIBTIFF="-L/usr/local/lib -ltiff"
44: -TIFFINC=/usr/local/include
45: +LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
46: +TIFFINC=${PREFIX}/include
47: TIFFBIN=
1.4 abs 48: LIBZ=
49: ZLIBINC=
1.10 ! adam 50: @@ -82,8 +81,8 @@ REGEX=yes
1.2 abs 51: LIBREGEX='-L${DEPTH}/regex -lregex'
52: REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
53: DBLIB=no
54: -LIBDB="-L/usr/local/lib -ldb"
55: -DBLIBINC=/usr/local/include
56: +LIBDB="-L${PREFIX}/lib -ldb"
57: +DBLIBINC=${PREFIX}/include
1.6 hubertf 58: FAXD=
59: LIBFAXSERVER='libfaxserver.${DSO}'
60: LIBUTIL='${UTIL}/libfaxutil.${DSO}'
1.10 ! adam 61: @@ -222,6 +221,7 @@ PKG_EMAIL
1.2 abs 62: PKG_VENDOR
63: PORT
64: PORTFUNCS
65: +PREFIX
1.5 bad 66: PROTOTYPES
1.2 abs 67: PSPACKAGE PS
1.6 hubertf 68: PWDCMD
1.10 ! adam 69: @@ -287,7 +287,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
1.2 abs 70: test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others
71: test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi
72: test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others
73: -test -d /usr/local/bin && PATH=/usr/local/bin:$PATH # for GNU stuff
74: +test -d ${PREFIX}/bin && PATH=${PREFIX}/bin:$PATH # for packages stuff
75: PATH=$PATH:$OPATH
76:
77: POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
1.10 ! adam 78: @@ -3086,13 +3086,7 @@ main()
1.4 abs 79: printf("old include files: version %u\n", ZLIB_VERSION);
1.2 abs 80: exit(-1);
81: }
1.4 abs 82: - if (strncmp(zlib_version, ZLIB_VERSION, 4) != 0) {
83: - printf("library/header file incompatibility: %s %s\n",
84: - zlib_version, ZLIB_VERSION);
85: - exit(-1);
86: - } else {
87: exit(0);
88: - }
1.1 rh 89: }
1.2 abs 90: EOF
1.4 abs 91: capture cat t.c
1.10 ! adam 92: @@ -3154,7 +3148,7 @@ Note "Checking TIFF support."
1.6 hubertf 93: # Location of TIFF binaries
94: #
95: if [ -z "$TIFFBIN" ]; then
96: - DIRS="/usr/local/bin /usr/contrib/bin /usr/gnu/bin /usr/bin"
97: + DIRS="${PREFIX}/bin /usr/local/bin /usr/gnu/bin /usr/bin"
98: for i in $DIRS; do
99: test -x $i/tiff2ps && { TIFFBIN=$i; break; }
100: done
1.10 ! adam 101: @@ -3775,7 +3769,7 @@ fi
1.2 abs 102: if [ -z "$PATH_VGETTY" ]; then
103: PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
104: if [ -z "$PATH_VGETTY" ]; then
105: - PATH_VGETTY=/bin/vgetty
106: + PATH_VGETTY=${PREFIX}/bin/vgetty
107: Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
108: else
109: Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
1.10 ! adam 110: @@ -3788,7 +3782,7 @@ fi
1.2 abs 111: if [ -z "$PATH_EGETTY" ]; then
112: PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`
113: if [ -z "$PATH_EGETTY" ]; then
114: - PATH_EGETTY=/bin/egetty
115: + PATH_EGETTY=${PREFIX}/bin/egetty
116: Note "WARNING, no egetty program found, using $PATH_EGETTY."
117: else
118: Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
1.10 ! adam 119: @@ -3859,6 +3853,7 @@ PickRIP()
1.2 abs 120: {
121: if [ -z "$PATH_GSRIP" ]; then
122: GSLOCS="
123: + ${PREFIX}/bin/gs
124: /usr/local/bin/gs
125: /usr/contrib/bin/gs
126: /usr/gnu/bin/gs
1.10 ! adam 127: @@ -3906,7 +3901,7 @@ fax software to operate correctly. See
1.2 abs 128: on building Ghostscript with the necessary TIFF driver.
1.1 rh 129:
1.2 abs 130: EOF
131: - PATH_PSRIP=/usr/local/bin/gs
132: + PATH_PSRIP=${PREFIX}/bin/gs
133: PATH_GSRIP=$PATH_PSRIP
134: fi
1.1 rh 135: }
1.10 ! adam 136: @@ -3973,9 +3968,9 @@ if [ -z "$PATH_AFM" ]; then
1.2 abs 137: else
138: DIR_AFMS="
139: /usr/lib/afm
140: - /usr/local/lib/afm
141: - /usr/local/share/ghostscript/fonts
142: - /usr/local/lib/ghostscript/fonts
143: + ${PREFIX}/lib/afm
144: + ${PREFIX}/share/ghostscript/fonts
145: + ${PREFIX}/lib/ghostscript/fonts
146: /usr/share/ghostscript/fonts
147: /usr/gnu/lib/ghostscript/fonts
148: /opt/gnu/lib/ghostscript/fonts
1.10 ! adam 149: @@ -3995,7 +3990,7 @@ if [ -z "$PATH_AFM" ]; then
1.2 abs 150: fi
151: if [ -z "$PATH_AFM" ]; then
152: # put it where ghostscript normally puts things
153: - PATH_AFM=/usr/local/lib/ghostscript/fonts
154: + PATH_AFM=${PREFIX}/share/ghostscript/fonts
155: Note "WARNING, could not locate a directory with font metric information,"
156: Note "guessing that font metric information goes in $PATH_AFM."
157: else
1.10 ! adam 158: @@ -4014,6 +4009,7 @@ fi
1.2 abs 159: #
160: if [ -z "$DIR_MAN" ]; then
161: MANPATH="
162: + ${PREFIX}/man
163: $MANPATH
164: /usr/local/man
165: /usr/contrib/man
1.10 ! adam 166: @@ -4023,7 +4019,7 @@ if [ -z "$DIR_MAN" ]; then
1.2 abs 167: for i in $MANPATH; do
168: test -d $i && { DIR_MAN=$i; break; }
169: done
170: - test -z "$DIR_MAN" && DIR_MAN=/usr/local/man
171: + test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man
172: fi
173: Note "Looks like manual pages go in $DIR_MAN."
174: 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