? wip/hylafax-devel/work Index: wip/hylafax-devel/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- wip/hylafax-devel/Makefile 21 Oct 2010 07:46:21 -0000 1.13 +++ wip/hylafax-devel/Makefile 21 Oct 2010 13:55:37 -0000 @@ -1,9 +1,8 @@ # $NetBSD: Makefile,v 1.48 2005/12/05 23:55:03 rillig Exp $ -VERS= 4.4.0 +VERS= 6.0.5 PKGNAME= hylafax-devel-${VERS} DISTNAME= hylafax-${VERS} -PKGREVISION= 1 CATEGORIES= comms MASTER_SITES_BETA= ftp://ftp.hylafax.org/source/BETA/ MASTER_SITES_RELEASE= ftp://ftp.hylafax.org/source/ @@ -70,6 +69,7 @@ .endif .include "../../devel/zlib/buildlink3.mk" +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" Index: wip/hylafax-devel/distinfo =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/distinfo,v retrieving revision 1.12 diff -u -r1.12 distinfo --- wip/hylafax-devel/distinfo 21 Oct 2010 07:46:21 -0000 1.12 +++ wip/hylafax-devel/distinfo 21 Oct 2010 13:55:37 -0000 @@ -1,19 +1,7 @@ $NetBSD$ -SHA1 (hylafax/hylafax-4.4.0.tar.gz) = ed991ae3871682e9b9ea736e70bb4fcd6402784e -RMD160 (hylafax/hylafax-4.4.0.tar.gz) = 8ad79be321c890a3500952ad7beb7ab16a8f6ef0 -Size (hylafax/hylafax-4.4.0.tar.gz) = 1227784 bytes -SHA1 (patch-aa) = 59f814f979f1e247a1a40c1e3ba31581dde99d62 -SHA1 (patch-ab) = 8cc571b5d1f36a2353e4c407f153618bdae9d748 -SHA1 (patch-ac) = 1f37405fd71840672f7f3916c8da9af4d3ff7333 -SHA1 (patch-ad) = 5a71bd74d37a1a532d0175a3762e83c1e158de67 -SHA1 (patch-ae) = b40f2fffe2c1483b73b4e1ff63bee5332701a140 -SHA1 (patch-af) = a1d729d7bf490cda99af347e57a2817c481f5108 -SHA1 (patch-ag) = d23afb3285ccbd404647fe36bdab97e4c3e56554 -SHA1 (patch-ah) = ae7b9c79fcd54da311f1491bb4d8c2e17136acb6 -SHA1 (patch-ai) = a1a882f63c23ca9f05fc85b80887cf1e852b38c5 -SHA1 (patch-al) = d5ee8d2997ce03c148e9f031481221a79d93ee2a -SHA1 (patch-am) = a5b5b0db0622a2da3a7d2ed858b901d4f1fae4e2 -SHA1 (patch-an) = de84c3e6c9fb9cd52dcdfdc556ae805f01f79fe5 -SHA1 (patch-ao) = 64d2963c7211f1ef5a6ca4f7d286dcd2d51d29ef -SHA1 (patch-ap) = e2eae5fdd247fdf4653b67b87b39e1c6b10c5316 +SHA1 (hylafax/hylafax-6.0.5.tar.gz) = c02b8b5dd10ae94e35c429448ca9a5182b059c68 +RMD160 (hylafax/hylafax-6.0.5.tar.gz) = a75252ceeea991b2e66fbd2304e5be0a4dfb8c14 +Size (hylafax/hylafax-6.0.5.tar.gz) = 1295267 bytes +SHA1 (patch-ae) = 5e95b6023d8d092a1e3230c757d080d42507a0a8 +SHA1 (patch-af) = faf1116e1ad1258e2ef939e6f0e0fd82eff019d3 Index: wip/hylafax-devel/patches/patch-ae =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-ae,v retrieving revision 1.3 diff -u -r1.3 patch-ae --- wip/hylafax-devel/patches/patch-ae 21 Oct 2010 05:53:35 -0000 1.3 +++ wip/hylafax-devel/patches/patch-ae 21 Oct 2010 13:55:37 -0000 @@ -1,8 +1,8 @@ $NetBSD$ ---- configure.orig 2007-06-23 00:20:55.000000000 +0900 -+++ configure 2010-10-21 14:27:50.000000000 +0900 -@@ -37,15 +37,15 @@ +--- configure.orig 2010-09-15 23:42:36.000000000 +0900 ++++ configure 2010-10-21 21:26:34.000000000 +0900 +@@ -37,16 +37,16 @@ # # Setup general configuration parameters. # @@ -10,85 +10,40 @@ -DIR_SBIN=/usr/local/sbin -DIR_LIBDATA=/usr/local/lib/fax -DIR_LIB=/usr/local/lib --DIR_LIBEXEC=$DIR_SBIN +DIR_BIN=${PREFIX}/bin +DIR_SBIN=${PREFIX}/sbin -+DIR_LIBDATA=${PREFIX}/libdata/hylafax ++DIR_LIBDATA=${PREFIX}/lib/fax +DIR_LIB=${PREFIX}/lib -+DIR_LIBEXEC=${PREFIX}/libexec + DIR_LIBEXEC=$DIR_SBIN DIR_SPOOL=/var/spool/hylafax +-DIR_LOCALE=/usr/local/share/locale -DIR_CGI=/var/httpd/cgi-bin -+DIR_CGI={$PREFIX}/httpd/cgi-bin ++DIR_LOCALE=${PREFIX}/share/locale ++DIR_CGI=${PREFIX}/httpd/cgi-bin PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe -PATH_IMPRIP=/usr/lib/print/psrip +PATH_IMPRIP=${PREFIX}/lib/print/psrip CGIPATH=/cgi-bin + LOCALE_DOMAIN=hylafax DEFVRES=98 - PAGESIZE="North American Letter" -@@ -69,9 +69,8 @@ - GS=no - IMP=no - UTMP=auto --OPTIMIZER="-O" --LIBTIFF="-L/usr/local/lib -ltiff" --TIFFINC=/usr/local/include +@@ -73,13 +73,13 @@ + OPTIMIZER="-O" + LIBCRYPT= + LIBPAM= +-LIBTIFF="-ltiff" +-TIFFINC= +LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm" -+TIFFINC=${PREFIX}/include ++TIFFINC="-I${PREFIX}/include" TIFFBIN= - LIBZ= + LIBUTIL= + LIBZ=-lz ZLIBINC= -@@ -79,8 +78,8 @@ +-LIBINTL= ++LIBINTL="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lintl" + INTLINC= + REGEX=yes LIBREGEX='-L${DEPTH}/regex -lregex' - 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}' -@@ -220,6 +219,7 @@ - PKG_VENDOR - PORT - PORTFUNCS -+PREFIX - PROTOTYPES - PSPACKAGE PS - PWDCMD -@@ -287,7 +287,7 @@ - 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/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others --test -d /usr/local/bin && PATH=/usr/local/bin:$PATH # for GNU stuff -+test -d ${PREFIX}/bin && PATH=${PREFIX}/bin:$PATH # for packages stuff - PATH=$PATH:$OPATH - - POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions -@@ -2421,7 +2421,7 @@ - if [ ${header_ver} -ge 19960307 ]; then - case ${lib_ver} in - 3.4) tiff_runlen_t="uint16" ;; -- 3.[5678]) tiff_runlen_t="uint32" ;; -+ 3.[56789]) tiff_runlen_t="uint32" ;; - esac - fi - else -@@ -3168,13 +3168,7 @@ - printf("old include files: version %u\n", ZLIB_VERSION); - exit(-1); - } -- if (strncmp(zlib_version, ZLIB_VERSION, 4) != 0) { -- printf("library/header file incompatibility: %s %s\n", -- zlib_version, ZLIB_VERSION); -- exit(-1); -- } else { - exit(0); -- } - } - EOF - capture cat t.c -@@ -3236,7 +3230,7 @@ +@@ -3363,7 +3363,7 @@ # Location of TIFF binaries # if [ -z "$TIFFBIN" ]; then @@ -97,77 +52,3 @@ for i in $DIRS; do test -x $i/tiff2ps && { TIFFBIN=$i; break; } done -@@ -3868,7 +3862,7 @@ - if [ -z "$PATH_VGETTY" ]; then - PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` - if [ -z "$PATH_VGETTY" ]; then -- PATH_VGETTY=/bin/vgetty -+ PATH_VGETTY=${PREFIX}/bin/vgetty - Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY." - else - Note "Looks like $PATH_VGETTY is the program to exec for a voice call." -@@ -3881,7 +3875,7 @@ - if [ -z "$PATH_EGETTY" ]; then - PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` - if [ -z "$PATH_EGETTY" ]; then -- PATH_EGETTY=/bin/egetty -+ PATH_EGETTY=${PREFIX}/bin/egetty - Note "WARNING, no egetty program found, using $PATH_EGETTY." - else - Note "Looks like $PATH_EGETTY is the program to exec for an extern call." -@@ -3953,6 +3947,7 @@ - { - if [ -z "$PATH_GSRIP" ]; then - GSLOCS=" -+ ${PREFIX}/bin/gs - /usr/local/bin/gs - /usr/contrib/bin/gs - /usr/gnu/bin/gs -@@ -4000,7 +3995,7 @@ - on building Ghostscript with the necessary TIFF driver. - - EOF -- PATH_PSRIP=/usr/local/bin/gs -+ PATH_PSRIP=${PREFIX}/bin/gs - PATH_GSRIP=$PATH_PSRIP - fi - } -@@ -4067,9 +4062,9 @@ - else - DIR_AFMS=" - /usr/lib/afm -- /usr/local/lib/afm -- /usr/local/share/ghostscript/fonts -- /usr/local/lib/ghostscript/fonts -+ ${PREFIX}/lib/afm -+ ${PREFIX}/share/ghostscript/fonts -+ ${PREFIX}/lib/ghostscript/fonts - /usr/share/ghostscript/fonts - /usr/gnu/lib/ghostscript/fonts - /opt/gnu/lib/ghostscript/fonts -@@ -4089,7 +4084,7 @@ - fi - if [ -z "$PATH_AFM" ]; then - # put it where ghostscript normally puts things -- PATH_AFM=/usr/local/lib/ghostscript/fonts -+ PATH_AFM=${PREFIX}/share/ghostscript/fonts - Note "WARNING, could not locate a directory with font metric information," - Note "guessing that font metric information goes in $PATH_AFM." - else -@@ -4108,6 +4103,7 @@ - # - if [ -z "$DIR_MAN" ]; then - MANPATH=" -+ ${PREFIX}/man - $MANPATH - /usr/local/man - /usr/contrib/man -@@ -4117,7 +4113,7 @@ - for i in $MANPATH; do - test -d $i && { DIR_MAN=$i; break; } - done -- test -z "$DIR_MAN" && DIR_MAN=/usr/local/man -+ test -z "$DIR_MAN" && DIR_MAN=${PREFIX}/man - fi - Note "Looks like manual pages go in $DIR_MAN." - if [ -z "$MANSCHEME" ]; then Index: wip/hylafax-devel/patches/patch-af =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-af,v retrieving revision 1.3 diff -u -r1.3 patch-af --- wip/hylafax-devel/patches/patch-af 21 Oct 2010 07:46:21 -0000 1.3 +++ wip/hylafax-devel/patches/patch-af 21 Oct 2010 13:55:37 -0000 @@ -1,19 +1,16 @@ $NetBSD$ ---- defs.in.orig 2007-07-05 23:37:54.000000000 +0900 -+++ defs.in 2010-10-21 15:31:40.000000000 +0900 -@@ -44,12 +44,13 @@ - # to insufficient; you are better off rerunning the +--- defs.in.orig 2010-09-15 23:42:36.000000000 +0900 ++++ defs.in 2010-10-21 21:44:56.000000000 +0900 +@@ -49,11 +49,11 @@ # configure script so that all uses are set correctly. # --SPOOL = @SPOOL@ + SPOOL = @SPOOL@ -SBIN = @SBIN@ -BIN = @BIN@ -LIBDATA = @LIBDATA@ -LIBDIR = @LIBDIR@ -LIBEXEC = @LIBEXEC@ -+PREFIX = ${DESTDIR}@PREFIX@ -+SPOOL = ${DESTDIR}@SPOOL@ +SBIN = ${DESTDIR}@SBIN@ +BIN = ${DESTDIR}@BIN@ +LIBDATA = ${DESTDIR}@LIBDATA@ @@ -22,7 +19,18 @@ FONTMAP = @FONTMAP@ FONTPATH = @FONTPATH@ SENDMAIL = @SENDMAIL@ -@@ -321,7 +322,7 @@ +@@ -159,8 +159,8 @@ + # against. If the default "-lintl" is insufficient to locate + # the library, you can setup a config.local file that defines + # LIBINTL and/or INTLINC (used to find libintl.h) +-INTLINC = @INTLINC@ +-LIBINTL = @LIBINTL@ ++INTLINC = ${DESTDIR}@INTLINC@ ++LIBINTL = ${DESTDIR}@LIBINTL@ + # + # + # TIFF-related definitions. The source for the TIFF library +@@ -328,7 +328,7 @@ # MANSYS subdirectory for server & server-related apps # MANFILES subdirectory for file format info #