diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 9bb3051a91d0..67d662c9fdf9 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2006/02/07 09:55:20 markd Exp $ +# $NetBSD: Makefile,v 1.53 2006/05/15 19:02:47 joerg Exp $ VERS= 4.2.5 DISTNAME= hylafax-${VERS} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= comms MASTER_SITES_BETA= ftp://ftp.hylafax.org/source/BETA/ MASTER_SITES_RELEASE= ftp://ftp.hylafax.org/source/ \ diff --git a/comms/hylafax/PLIST b/comms/hylafax/PLIST index 0b3f9b360d3e..dedb3caa2662 100644 --- a/comms/hylafax/PLIST +++ b/comms/hylafax/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2005/11/13 22:50:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.11 2006/05/15 19:02:47 joerg Exp $ bin/faxalter bin/faxcover bin/faxmail @@ -34,71 +34,71 @@ libexec/lockname libexec/ondelay libexec/pagesend libexec/textfmt -man/cat1/edit-faxcover.0 -man/cat1/faxalter.0 -man/cat1/faxcover.0 -man/cat1/faxmail.0 -man/cat1/faxrm.0 -man/cat1/faxstat.0 -man/cat1/hylafax-client.0 -man/cat1/sendfax.0 -man/cat1/sendpage.0 -man/cat1/sgi2fax.0 -man/cat1/textfmt.0 -man/cat5/callid.0 -man/cat5/destctrls.0 -man/cat5/dialrules.0 -man/cat5/doneq.0 -man/cat5/hosts.hfaxd.0 -man/cat5/hylafax-config.0 -man/cat5/hylafax-info.0 -man/cat5/hylafax-log.0 -man/cat5/hylafax-server.0 -man/cat5/hylafax-shutdown.0 -man/cat5/pagermap.0 -man/cat5/pagesizes.0 -man/cat5/recvq.0 -man/cat5/sendq.0 -man/cat5/status.0 -man/cat5/tsi.0 -man/cat5/typerules.0 -man/cat5/xferfaxlog.0 -man/cat8/choptest.0 -man/cat8/cqtest.0 -man/cat8/dialtest.0 -man/cat8/faxabort.0 -man/cat8/faxaddmodem.0 -man/cat8/faxadduser.0 -man/cat8/faxanswer.0 -man/cat8/faxconfig.0 -man/cat8/faxcron.0 -man/cat8/faxdeluser.0 -man/cat8/faxgetty.0 -man/cat8/faxinfo.0 -man/cat8/faxlock.0 -man/cat8/faxmodem.0 -man/cat8/faxq.0 -man/cat8/faxqclean.0 -man/cat8/faxquit.0 -man/cat8/faxrcvd.0 -man/cat8/faxsend.0 -man/cat8/faxsetup.0 -man/cat8/faxstate.0 -man/cat8/faxwatch.0 -man/cat8/hfaxd.0 -man/cat8/mkcover.0 -man/cat8/notify.0 -man/cat8/pagesend.0 -man/cat8/pdf2fax.0 -man/cat8/pollrcvd.0 -man/cat8/ps2fax.0 -man/cat8/recvstats.0 -man/cat8/tagtest.0 -man/cat8/tiff2fax.0 -man/cat8/tiffcheck.0 -man/cat8/tsitest.0 -man/cat8/wedged.0 -man/cat8/xferfaxstats.0 +man/man1/edit-faxcover.1 +man/man1/faxalter.1 +man/man1/faxcover.1 +man/man1/faxmail.1 +man/man1/faxrm.1 +man/man1/faxstat.1 +man/man1/hylafax-client.1 +man/man1/sendfax.1 +man/man1/sendpage.1 +man/man1/sgi2fax.1 +man/man1/textfmt.1 +man/man5/callid.5 +man/man5/destctrls.5 +man/man5/dialrules.5 +man/man5/doneq.5 +man/man5/hosts.hfaxd.5 +man/man5/hylafax-config.5 +man/man5/hylafax-info.5 +man/man5/hylafax-log.5 +man/man5/hylafax-server.5 +man/man5/hylafax-shutdown.5 +man/man5/pagermap.5 +man/man5/pagesizes.5 +man/man5/recvq.5 +man/man5/sendq.5 +man/man5/status.5 +man/man5/tsi.5 +man/man5/typerules.5 +man/man5/xferfaxlog.5 +man/man8/choptest.8 +man/man8/cqtest.8 +man/man8/dialtest.8 +man/man8/faxabort.8 +man/man8/faxaddmodem.8 +man/man8/faxadduser.8 +man/man8/faxanswer.8 +man/man8/faxconfig.8 +man/man8/faxcron.8 +man/man8/faxdeluser.8 +man/man8/faxgetty.8 +man/man8/faxinfo.8 +man/man8/faxlock.8 +man/man8/faxmodem.8 +man/man8/faxq.8 +man/man8/faxqclean.8 +man/man8/faxquit.8 +man/man8/faxrcvd.8 +man/man8/faxsend.8 +man/man8/faxsetup.8 +man/man8/faxstate.8 +man/man8/faxwatch.8 +man/man8/hfaxd.8 +man/man8/mkcover.8 +man/man8/notify.8 +man/man8/pagesend.8 +man/man8/pdf2fax.8 +man/man8/pollrcvd.8 +man/man8/ps2fax.8 +man/man8/recvstats.8 +man/man8/tagtest.8 +man/man8/tiff2fax.8 +man/man8/tiffcheck.8 +man/man8/tsitest.8 +man/man8/wedged.8 +man/man8/xferfaxstats.8 sbin/choptest sbin/cqtest sbin/dialtest diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo index 4511e1dd14ad..3f04800c4884 100644 --- a/comms/hylafax/distinfo +++ b/comms/hylafax/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2006/01/22 14:06:02 adrianp Exp $ +$NetBSD: distinfo,v 1.19 2006/05/15 19:02:47 joerg Exp $ SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152 SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7 SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72 -SHA1 (patch-ae) = 24fd428a3bef64a4e4acf7d2852c8e83e2ef4f84 +SHA1 (patch-ae) = 3531b9f76d38af9c2246a12c4bc77f2a5247b286 SHA1 (patch-af) = 5c2429d08f2f4c6f5af19dd4775277434abc7ac4 SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441 diff --git a/comms/hylafax/hacks.mk b/comms/hylafax/hacks.mk new file mode 100644 index 000000000000..be1049f09313 --- /dev/null +++ b/comms/hylafax/hacks.mk @@ -0,0 +1,18 @@ +# $NetBSD: hacks.mk,v 1.1 2006/05/15 19:02:47 joerg Exp $ + +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "DragonFly" && ${PKGSRC_COMPILER} == "gcc" +# +# Workaround an ICE in the stack-smashing protection in GCC 3.4.x. +# +.if !defined(HAS_PROPOLICE) +HAS_PROPOLICE!= ( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no +MAKEVARS+= HAS_PROPOLICE +.endif + +.if ${HAS_PROPOLICE} != "no" +CFLAGS+= -fno-stack-protector +CXXFLAGS+= -fno-stack-protector +.endif +.endif diff --git a/comms/hylafax/patches/patch-ae b/comms/hylafax/patches/patch-ae index d567f87534cd..edd9c8af9b09 100644 --- a/comms/hylafax/patches/patch-ae +++ b/comms/hylafax/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ +$NetBSD: patch-ae,v 1.13 2006/05/15 19:02:47 joerg Exp $ --- configure.orig 2005-12-16 22:40:30.000000000 +0000 +++ configure @@ -108,7 +108,31 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ for i in $DIRS; do test -x $i/tiff2ps && { TIFFBIN=$i; break; } done -@@ -3836,7 +3830,7 @@ fi +@@ -3722,6 +3716,7 @@ if [ -z "$FAXGID" ]; then + *-bsdi*) FAXGID=uucp;; + *freebsd2.1*) FAXGID=uucp; break;; # Not sure when this changed.. + *bsd*) FAXGID=dialer;; ++ *-dragonfly*) FAXGID=dialer;; + *-hpux*) FAXGID=sys;; + *-irix*) FAXGID=nuucp;; + *-isc*) FAXGID=uucp;; +@@ -3750,6 +3745,7 @@ if [ -z "$SYSGID" ]; then + *-aix*) SYSGID=sys;; + *netbsd*) SYSGID=wheel;; + *bsd*) SYSGID=bin;; ++ *-dragonfly*) SYSGID=bin;; + *-hpux*) SYSGID=bin;; + *-irix*) SYSGID=sys;; + *-isc*) SYSGID=sys;; +@@ -3794,6 +3790,7 @@ fi + if [ "$GETTY" = auto ]; then + case $TARGET in + *bsd*) GETTY=BSD;; ++ *-dragonfly*) GETTY=BSD;; + *-sunos*) GETTY=BSD;; + *-ultrix*) GETTY=BSD;; + *darwin*) GETTY=BSD;; +@@ -3836,7 +3833,7 @@ fi if [ -z "$PATH_VGETTY" ]; then PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH` if [ -z "$PATH_VGETTY" ]; then @@ -117,7 +141,7 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ 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." -@@ -3849,7 +3843,7 @@ fi +@@ -3849,7 +3846,7 @@ fi if [ -z "$PATH_EGETTY" ]; then PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH` if [ -z "$PATH_EGETTY" ]; then @@ -126,7 +150,15 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ Note "WARNING, no egetty program found, using $PATH_EGETTY." else Note "Looks like $PATH_EGETTY is the program to exec for an extern call." -@@ -3920,6 +3914,7 @@ PickRIP() +@@ -3871,6 +3868,7 @@ if [ "$LOCKS" = auto ]; then + *-sysv5*) LOCKS="+ascii";; + *-solaris*) LOCKS="+ascii";; + *-freebsd*) LOCKS=ascii;; ++ *-dragonfly*) LOCKS=ascii;; + *-netbsd*) LOCKS=ascii;; + *bsd*) LOCKS=binary;; + *) LOCKS=ascii;; +@@ -3920,6 +3918,7 @@ PickRIP() { if [ -z "$PATH_GSRIP" ]; then GSLOCS=" @@ -134,7 +166,7 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ /usr/local/bin/gs /usr/contrib/bin/gs /usr/gnu/bin/gs -@@ -3967,7 +3962,7 @@ fax software to operate correctly. See +@@ -3967,7 +3966,7 @@ fax software to operate correctly. See on building Ghostscript with the necessary TIFF driver. EOF @@ -143,7 +175,7 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ PATH_GSRIP=$PATH_PSRIP fi } -@@ -4034,9 +4029,9 @@ if [ -z "$PATH_AFM" ]; then +@@ -4034,9 +4033,9 @@ if [ -z "$PATH_AFM" ]; then else DIR_AFMS=" /usr/lib/afm @@ -156,7 +188,7 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ /usr/share/ghostscript/fonts /usr/gnu/lib/ghostscript/fonts /opt/gnu/lib/ghostscript/fonts -@@ -4056,7 +4051,7 @@ if [ -z "$PATH_AFM" ]; then +@@ -4056,7 +4055,7 @@ if [ -z "$PATH_AFM" ]; then fi if [ -z "$PATH_AFM" ]; then # put it where ghostscript normally puts things @@ -165,7 +197,7 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ Note "WARNING, could not locate a directory with font metric information," Note "guessing that font metric information goes in $PATH_AFM." else -@@ -4075,7 +4070,7 @@ fi +@@ -4075,7 +4074,7 @@ fi # if [ -z "$DIR_MAN" ]; then MANPATH=" @@ -174,7 +206,7 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ /usr/local/man /usr/contrib/man /usr/catman/local -@@ -4084,7 +4079,7 @@ if [ -z "$DIR_MAN" ]; then +@@ -4084,43 +4083,11 @@ if [ -z "$DIR_MAN" ]; then for i in $MANPATH; do test -d $i && { DIR_MAN=$i; break; } done @@ -183,3 +215,40 @@ $NetBSD: patch-ae,v 1.12 2006/01/22 14:06:02 adrianp Exp $ fi Note "Looks like manual pages go in $DIR_MAN." if [ -z "$MANSCHEME" ]; then +- case $TARGET in +- *-bsdi*|*-netbsd*) MANSCHEME=bsd-nroff-gzip-0.gz;; +- *-freebsd*) MANSCHEME=bsd-source-cat;; +- *-linux*) MANSCHEME=bsd-source-cat;; +- *-ultrix*) MANSCHEME=bsd-source-cat;; +- *-sunos*) MANSCHEME=bsd-source-cat-strip;; +- *-sysv[234]*) MANSCHEME=sysv-source-cat-strip;; +- *-hpux*) MANSCHEME=sysv-source-cat-strip;; +- *-solaris*) MANSCHEME=sysv-source-cat-strip;; +- *-aix*) MANSCHEME=sysv-source-strip;; +- *-isc*|*-*-sco*) MANSCHEME=sysv-source-cat;; +- *-irix*) MANSCHEME=sysv-nroff-compress-Z;; +- *) +- # +- # Try to deduce the setup from existing manual pages. +- # XXX needs more work XXX +- # +- MANSCHEME=sysv-source-cat +- if [ -d /usr/share/man ]; then +- if [ -d /usr/share/man/u_man ]; then +- MANSCHEME=sysv-source-cat +- elif [ -d /usr/share/man/man8 ]; then +- MANSCHEME=bsd-source-cat +- fi +- elif [ -d /usr/share/catman ]; then +- if [ -d /usr/share/catman/u_man ]; then +- MANSCHEME=sysv-nroff-cat +- elif [ -d /usr/share/catman/man8 ]; then +- MANSCHEME=bsd-nroff-cat +- fi +- fi +- ;; +- esac ++ MANSCHEME=bsd-source-cat-strip + fi + Note "Looks like manual pages should be installed with $MANSCHEME." +