? wip/hylafax-devel/work Index: wip/hylafax-devel/Makefile =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- wip/hylafax-devel/Makefile 18 Jan 2010 09:38:25 -0000 1.12 +++ wip/hylafax-devel/Makefile 19 Oct 2010 09:04:13 -0000 @@ -1,9 +1,9 @@ # $NetBSD: Makefile,v 1.48 2005/12/05 23:55:03 rillig Exp $ -VERS= 4.4.0 +VERS= 4.4.7 PKGNAME= hylafax-devel-${VERS} DISTNAME= hylafax-${VERS} -PKGREVISION= 1 +#PKGREVISION= CATEGORIES= comms MASTER_SITES_BETA= ftp://ftp.hylafax.org/source/BETA/ MASTER_SITES_RELEASE= ftp://ftp.hylafax.org/source/ @@ -17,6 +17,7 @@ MAINTAINER= hallmann@ahatec.de HOMEPAGE= http://www.hylafax.org/ COMMENT= Telecommunication and fax server system +PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= mawk>=1.2.2:../../lang/mawk @@ -44,7 +45,7 @@ SUID_EXES= ${PREFIX}/libexec/faxgetty ${PREFIX}/sbin/faxq \ ${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter -INSTALLATION_DIRS = libdata +SPECIAL_PERMS+= ${SUID_EXES} ${FAXUSER} 4555 PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax PKG_SUPPORTED_OPTIONS= pam @@ -60,9 +61,6 @@ CONFIGURE_ARGS+= --disable-pam .endif -post-install: - ${CHOWN} ${FAXUSER} ${SUID_EXES} - ${CHMOD} 4555 ${SUID_EXES} .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" Index: wip/hylafax-devel/PLIST =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/PLIST,v retrieving revision 1.5 diff -u -r1.5 PLIST --- wip/hylafax-devel/PLIST 11 Oct 2009 10:44:46 -0000 1.5 +++ wip/hylafax-devel/PLIST 19 Oct 2010 09:04:13 -0000 @@ -6,12 +6,12 @@ bin/faxstat bin/sendfax bin/sendpage -libdata/hylafax/faxcover.ps -libdata/hylafax/faxcover_example_sgi.ps -libdata/hylafax/faxmail.ps -libdata/hylafax/hfaxd.conf -libdata/hylafax/pagesizes -libdata/hylafax/typerules +lib/fax/faxcover.ps +lib/fax/faxcover_example_sgi.ps +lib/fax/faxmail.ps +lib/fax/hfaxd.conf +lib/fax/pagesizes +lib/fax/typerules libexec/faxgetty libexec/faxsend libexec/hfaxd @@ -137,8 +137,6 @@ sbin/xferfaxstats share/doc/hylafax/COPYRIGHT share/examples/rc.d/hylafax -share/hylafax/config_template/agere-mp-2 -share/hylafax/config_template/agere-mp-21 share/hylafax/config_template/att-dataport share/hylafax/config_template/att-dataport-2 share/hylafax/config_template/att-dataport-2.0 @@ -166,6 +164,7 @@ share/hylafax/config_template/hayes share/hylafax/config_template/iaxmodem share/hylafax/config_template/intel-400e +share/hylafax/config_template/ip568x share/hylafax/config_template/linux-isdn-2 share/hylafax/config_template/lucent share/hylafax/config_template/lucent-isa @@ -173,6 +172,8 @@ share/hylafax/config_template/lucent-mt-2 share/hylafax/config_template/lucent-mt-20 share/hylafax/config_template/lucent-mt-21 +share/hylafax/config_template/mainpine-2 +share/hylafax/config_template/mainpine-21 share/hylafax/config_template/moto-288 share/hylafax/config_template/mt-1432 share/hylafax/config_template/nuvo-voyager Index: wip/hylafax-devel/distinfo =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/distinfo,v retrieving revision 1.10 diff -u -r1.10 distinfo --- wip/hylafax-devel/distinfo 7 Aug 2007 18:48:45 -0000 1.10 +++ wip/hylafax-devel/distinfo 19 Oct 2010 09:04:13 -0000 @@ -1,19 +1,19 @@ $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 (hylafax/hylafax-4.4.7.tar.gz) = ddd9d697178f723f5695221feb09c7e3d2cbe3d1 +RMD160 (hylafax/hylafax-4.4.7.tar.gz) = 03fdd2bd44ff9b19b1ec1e98b69096340218af2f +Size (hylafax/hylafax-4.4.7.tar.gz) = 1168793 bytes SHA1 (patch-aa) = 59f814f979f1e247a1a40c1e3ba31581dde99d62 SHA1 (patch-ab) = 8cc571b5d1f36a2353e4c407f153618bdae9d748 SHA1 (patch-ac) = 1f37405fd71840672f7f3916c8da9af4d3ff7333 SHA1 (patch-ad) = 5a71bd74d37a1a532d0175a3762e83c1e158de67 -SHA1 (patch-ae) = 211ee0917213dddb31cec6c64e11f5490cd4aa31 -SHA1 (patch-af) = 317db8be24db4dda56a4ce288f0ab9278bdeead2 +SHA1 (patch-ae) = c164ca5898bd5e08d2f9ae0feb3ea0993d104a6b +SHA1 (patch-af) = c6b56d0ddb0329664e7c7e90bec91a896679d6e4 SHA1 (patch-ag) = d23afb3285ccbd404647fe36bdab97e4c3e56554 -SHA1 (patch-ah) = ae7b9c79fcd54da311f1491bb4d8c2e17136acb6 +SHA1 (patch-ah) = 3445404892a06c695c08be7b914d9890c6ddd2cc SHA1 (patch-ai) = a1a882f63c23ca9f05fc85b80887cf1e852b38c5 SHA1 (patch-al) = d5ee8d2997ce03c148e9f031481221a79d93ee2a SHA1 (patch-am) = a5b5b0db0622a2da3a7d2ed858b901d4f1fae4e2 SHA1 (patch-an) = de84c3e6c9fb9cd52dcdfdc556ae805f01f79fe5 -SHA1 (patch-ao) = 64d2963c7211f1ef5a6ca4f7d286dcd2d51d29ef +SHA1 (patch-ao) = bd56bcab4de30a57a0fb6ae433e783a0b7b4f5a0 SHA1 (patch-ap) = e2eae5fdd247fdf4653b67b87b39e1c6b10c5316 Index: wip/hylafax-devel/patches/patch-ae =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-ae,v retrieving revision 1.2 diff -u -r1.2 patch-ae --- wip/hylafax-devel/patches/patch-ae 7 Mar 2007 09:56:21 -0000 1.2 +++ wip/hylafax-devel/patches/patch-ae 19 Oct 2010 09:04:13 -0000 @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.10 2005/01/27 16:22:37 adam Exp $ +$NetBSD$ ---- configure.orig 2007-02-23 23:36:23.000000000 +0100 -+++ configure -@@ -37,23 +37,23 @@ +--- configure.orig 2010-09-15 23:43:15.000000000 +0900 ++++ configure 2010-10-19 10:22:03.000000000 +0900 +@@ -37,21 +37,22 @@ # # Setup general configuration parameters. # @@ -11,20 +11,20 @@ -DIR_LIBDATA=/usr/local/lib/fax -DIR_LIB=/usr/local/lib -DIR_LIBEXEC=$DIR_SBIN +-DIR_SPOOL=/var/spool/hylafax +-DIR_CGI=/var/httpd/cgi-bin +-PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe +-PATH_IMPRIP=/usr/lib/print/psrip +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_SPOOL=/var/spool/hylafax --DIR_HTML=/var/httpd/htdocs/hylafax --DIR_CGI=/var/httpd/cgi-bin ++DIR_SPOOL=/var/spool/hylafax +DIR_HTML=${PREFIX}/http/htdocs/hylafax +DIR_CGI=${PREFIX}/http/cgi-bin - PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe --PATH_IMPRIP=/usr/lib/print/psrip -+PATH_IMPRIP=${PREFIX}/lib/print/psrip - HTMLPATH=/hylafax ++PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe ++PATH_IMPRIP=${PRERFIX}/lib/print/psrip CGIPATH=/cgi-bin DEFVRES=98 PAGESIZE="North American Letter" @@ -35,7 +35,7 @@ SYSGID= DSO=auto GETTY=auto -@@ -72,9 +72,8 @@ DPS=no +@@ -69,9 +70,8 @@ GS=no IMP=no UTMP=auto @@ -47,7 +47,7 @@ TIFFBIN= LIBZ= ZLIBINC= -@@ -82,8 +81,8 @@ REGEX=yes +@@ -79,8 +79,8 @@ LIBREGEX='-L${DEPTH}/regex -lregex' REGEXINC='${DEPTH}/${TOPSRCDIR}/regex' DBLIB=no @@ -58,7 +58,7 @@ FAXD= LIBFAXSERVER='libfaxserver.${DSO}' LIBUTIL='${UTIL}/libfaxutil.${DSO}' -@@ -226,6 +225,7 @@ PKG_EMAIL +@@ -220,6 +220,7 @@ PKG_VENDOR PORT PORTFUNCS @@ -66,7 +66,7 @@ PROTOTYPES PSPACKAGE PS PWDCMD -@@ -293,7 +293,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd +@@ -287,7 +288,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 @@ -75,7 +75,7 @@ PATH=$PATH:$OPATH POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions -@@ -3162,13 +3162,7 @@ main() +@@ -3196,13 +3197,7 @@ printf("old include files: version %u\n", ZLIB_VERSION); exit(-1); } @@ -89,7 +89,7 @@ } EOF capture cat t.c -@@ -3230,7 +3224,7 @@ Note "Checking TIFF support." +@@ -3264,7 +3259,7 @@ # Location of TIFF binaries # if [ -z "$TIFFBIN" ]; then @@ -98,7 +98,7 @@ for i in $DIRS; do test -x $i/tiff2ps && { TIFFBIN=$i; break; } done -@@ -3861,7 +3855,7 @@ fi +@@ -3896,7 +3891,7 @@ if [ -z "$PATH_VGETTY" ]; then PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` if [ -z "$PATH_VGETTY" ]; then @@ -107,7 +107,7 @@ 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." -@@ -3874,7 +3868,7 @@ fi +@@ -3909,7 +3904,7 @@ if [ -z "$PATH_EGETTY" ]; then PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` if [ -z "$PATH_EGETTY" ]; then @@ -116,7 +116,7 @@ Note "WARNING, no egetty program found, using $PATH_EGETTY." else Note "Looks like $PATH_EGETTY is the program to exec for an extern call." -@@ -3946,6 +3940,7 @@ PickRIP() +@@ -3981,6 +3976,7 @@ { if [ -z "$PATH_GSRIP" ]; then GSLOCS=" @@ -124,7 +124,7 @@ /usr/local/bin/gs /usr/contrib/bin/gs /usr/gnu/bin/gs -@@ -3993,7 +3988,7 @@ fax software to operate correctly. See +@@ -4028,7 +4024,7 @@ on building Ghostscript with the necessary TIFF driver. EOF @@ -133,7 +133,7 @@ PATH_GSRIP=$PATH_PSRIP fi } -@@ -4060,9 +4055,9 @@ if [ -z "$PATH_AFM" ]; then +@@ -4095,9 +4091,9 @@ else DIR_AFMS=" /usr/lib/afm @@ -146,7 +146,7 @@ /usr/share/ghostscript/fonts /usr/gnu/lib/ghostscript/fonts /opt/gnu/lib/ghostscript/fonts -@@ -4082,7 +4077,7 @@ if [ -z "$PATH_AFM" ]; then +@@ -4117,7 +4113,7 @@ fi if [ -z "$PATH_AFM" ]; then # put it where ghostscript normally puts things @@ -155,7 +155,7 @@ Note "WARNING, could not locate a directory with font metric information," Note "guessing that font metric information goes in $PATH_AFM." else -@@ -4101,6 +4096,7 @@ fi +@@ -4136,6 +4132,7 @@ # if [ -z "$DIR_MAN" ]; then MANPATH=" @@ -163,7 +163,7 @@ $MANPATH /usr/local/man /usr/contrib/man -@@ -4110,7 +4106,7 @@ if [ -z "$DIR_MAN" ]; then +@@ -4145,7 +4142,7 @@ for i in $MANPATH; do test -d $i && { DIR_MAN=$i; break; } done Index: wip/hylafax-devel/patches/patch-af =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-af,v retrieving revision 1.2 diff -u -r1.2 patch-af --- wip/hylafax-devel/patches/patch-af 7 Mar 2007 09:56:21 -0000 1.2 +++ wip/hylafax-devel/patches/patch-af 19 Oct 2010 09:04:13 -0000 @@ -1,16 +1,32 @@ -$NetBSD: patch-af,v 1.7 2005/01/27 16:22:37 adam Exp $ +$NetBSD$ ---- defs.in.orig 2006-01-31 20:03:34.000000000 +0100 -+++ defs.in -@@ -44,6 +44,7 @@ SHELL = @SCRIPT_SH@ +--- defs.in.orig 2010-09-15 23:43:15.000000000 +0900 ++++ defs.in 2010-10-19 16:35:13.000000000 +0900 +@@ -44,14 +44,15 @@ # to insufficient; you are better off rerunning the # configure script so that all uses are set correctly. # -+PREFIX = @PREFIX@ - SPOOL = @SPOOL@ - SBIN = @SBIN@ - BIN = @BIN@ -@@ -261,7 +262,7 @@ LDFLAGS = ${LDOPTS} ${LDLIBS} +-SPOOL = @SPOOL@ +-SBIN = @SBIN@ +-BIN = @BIN@ +-LIBDATA = @LIBDATA@ +-LIBDIR = @LIBDIR@ +-LIBEXEC = @LIBEXEC@ +-FONTMAP = @FONTMAP@ +-FONTPATH = @FONTPATH@ ++PREFIX = ${DESTDIR}@PREFIX@ ++SPOOL = ${DESTDIR}@SPOOL@ ++SBIN = ${DESTDIR}@SBIN@ ++BIN = ${DESTDIR}@BIN@ ++LIBDATA = ${DESTDIR}@LIBDATA@ ++LIBDIR = ${DESTDIR}@LIBDIR@ ++LIBEXEC = ${DESTDIR}@LIBEXEC@ ++FONTMAP = ${DESTDIR}@FONTMAP@ ++FONTPATH = ${DESTDIR}@FONTPATH@ + SENDMAIL = @SENDMAIL@ + # + TOPSRCDIR = @SRCDIR@ +@@ -260,7 +261,7 @@ LDOPTS = ${VLDOPTS} ${LLDOPTS} ${GLDOPTS} LDLIBS = ${VLDLIBS} ${LLDLIBS} ${GLDLIBS} @@ -19,3 +35,12 @@ GLDLIBS = ${SHDLIBC} # +@@ -321,7 +322,7 @@ + # MANSYS subdirectory for server & server-related apps + # MANFILES subdirectory for file format info + # +-MAN = @MANDIR@ ++MAN = ${DESTDIR}@MANDIR@ + MANAPPS = @MANAPPS@ + MANSYS = @MANSYS@ + MANFILES = @MANFILES@ Index: wip/hylafax-devel/patches/patch-ah =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-ah,v retrieving revision 1.2 diff -u -r1.2 patch-ah --- wip/hylafax-devel/patches/patch-ah 7 Mar 2007 09:56:21 -0000 1.2 +++ wip/hylafax-devel/patches/patch-ah 19 Oct 2010 09:04:13 -0000 @@ -1,16 +1,16 @@ -$NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $ +$NetBSD$ ---- etc/faxaddmodem.sh.in.orig 2006-07-21 19:46:10.000000000 +0200 -+++ etc/faxaddmodem.sh.in -@@ -46,6 +46,7 @@ - SPOOL=@SPOOL@ +--- etc/faxaddmodem.sh.in.orig 2010-09-15 23:43:15.000000000 +0900 ++++ etc/faxaddmodem.sh.in 2010-10-19 09:57:28.000000000 +0900 +@@ -51,6 +51,7 @@ + } SPEED= +TTY= + DOFUSER=no while [ x"$1" != x"" ] ; do case $1 in - -s) SPEED=$2; shift;; -@@ -117,7 +118,7 @@ CAT="$CAT -u" # something to do unbuff +@@ -124,7 +125,7 @@ FAX=@FAXUID@ # identity of the fax user GROUP=/etc/group # where to go for group entries PROTOGID=@FAXGID@ # group who's gid we use for FAX user @@ -19,7 +19,7 @@ MODEMCONFIG=$SPOOL/config # location of prototype modem config files RMCMD="$RM -f" # forced removal -@@ -811,7 +812,7 @@ SendToModem() +@@ -820,7 +821,7 @@ COMMAND=$* sleep 1 # wait for previous kill case $TARGET in @@ -28,7 +28,7 @@ *) onDev $STTY 0; sleep 1 ;; # reset the modem (hopefully) esac # start listening for output -@@ -1156,7 +1157,7 @@ EOF +@@ -1165,7 +1166,7 @@ done; MODEMCLASSES=`echo $MODEMCLASSES | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g' -e 's/ $//g'` SUPPORT=`echo $SUPPORT | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g'`. @@ -37,7 +37,7 @@ case "$MODEMCLASSES" in "") giveup;; "1") ModemType=Class1; configureClass1Modem;; -@@ -1167,7 +1168,7 @@ EOF +@@ -1176,7 +1177,7 @@ *) DEFAULTCLASS=`echo $MODEMCLASSES | $SED 's/\([^ ]*\).*/\1/g'` x="" Index: wip/hylafax-devel/patches/patch-ao =================================================================== RCS file: /cvsroot/pkgsrc-wip/wip/hylafax-devel/patches/patch-ao,v retrieving revision 1.2 diff -u -r1.2 patch-ao --- wip/hylafax-devel/patches/patch-ao 7 Mar 2007 09:56:21 -0000 1.2 +++ wip/hylafax-devel/patches/patch-ao 19 Oct 2010 09:04:13 -0000 @@ -1,8 +1,8 @@ -$NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $ +$NetBSD$ ---- hfaxd/User.c++.orig 2007-01-25 16:50:16.000000000 +0100 -+++ hfaxd/User.c++ -@@ -258,7 +258,7 @@ HylaFAXServer::userName(u_int id) +--- hfaxd/User.c++.orig 2010-09-15 23:43:15.000000000 +0900 ++++ hfaxd/User.c++ 2010-10-19 10:00:08.000000000 +0900 +@@ -257,7 +257,7 @@ if (id == uid) // user currently logged in return (const char*) the_user; if (id == FAXUID_ANON) // anonymous user @@ -11,7 +11,7 @@ if (idcache == NULL) // load cache from file fillIDCache(); const fxStr* hit = idcache->find(id); // check cache -@@ -277,7 +277,7 @@ HylaFAXServer::userID(const char* name, +@@ -276,7 +276,7 @@ { if (name == the_user) id = uid; @@ -20,12 +20,12 @@ id = FAXUID_ANON; else { if (idcache == NULL) -@@ -364,7 +364,7 @@ HylaFAXServer::findUser(FILE* db, const +@@ -363,7 +363,7 @@ if (faxuid < FAXUID_MAX) - SetBit(FAXUID_RESV); // reserved uid + SetBit(faxuid); // reserved uid else - logError("Internal error, \"fax\" UID (%u) too large.", faxuid); + logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid); + SetBit(0); // 0 uid is reserved SetBit(FAXUID_ANON); // anonymous uid is reserved while (nextRecord(db, line, sizeof (line))) { - if (line[0] == '!')