From su_paul@everlund.homeip.net  Thu Jul  3 11:30:41 2003
Return-Path: <su_paul@everlund.homeip.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 940E837B405
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Jul 2003 11:30:38 -0700 (PDT)
Received: from freebsd.everlund.homeip.net (h91n5c1o1023.bredband.skanova.com [81.224.104.91])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 90DA043FF5
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Jul 2003 11:30:37 -0700 (PDT)
	(envelope-from su_paul@everlund.homeip.net)
Received: from everlund.homeip.net (localhost [127.0.0.1])
	by freebsd.everlund.homeip.net (8.12.8p1/8.12.8) with ESMTP id h63IUcRV009095
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Jul 2003 20:30:39 +0200 (CEST)
	(envelope-from su_paul@everlund.homeip.net)
Received: (from root@localhost)
	by everlund.homeip.net (8.12.8p1/8.12.8/Submit) id h63IUcPt009094;
	Thu, 3 Jul 2003 20:30:38 +0200 (CEST)
Message-Id: <200307031830.h63IUcPt009094@everlund.homeip.net>
Date: Thu, 3 Jul 2003 20:30:38 +0200 (CEST)
From: Paul Everlund <tdv94ped@cs.umu.se>
Reply-To: Paul Everlund <tdv94ped@cs.umu.se>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [Update & Change-request] comms/hylafax 4.1.5 -> 4.1.6
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         54070
>Category:       ports
>Synopsis:       [Update & Change-request] comms/hylafax 4.1.5 -> 4.1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 03 11:40:15 PDT 2003
>Closed-Date:    Fri Jul 04 06:14:22 PDT 2003
>Last-Modified:  Fri Jul 04 06:14:22 PDT 2003
>Originator:     Paul Everlund
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
	System: FreeBSD freebsd.everlund.homeip.net 4.8-RELEASE
	FreeBSD 4.8-RELEASE #0: Sun Apr 6 15:45:59 CEST 2003
	su_paul@freebsd.everlund.homeip.net:/usr/obj/usr/src/sys/I686_CPU_KERNEL i386

>Description:
	Update:         comms/hylafax 4.1.5 -> 4.1.6.
	Change-request: Taking over maintainer from ports@FreeBSD.org.

	Question to anyone who may know the Hylafax-port...
		Why did distinfo contain various references to patches, none of them 
		to be used? Is it safe to remove them?

>How-To-Repeat:

>Fix:

--- Makefile begins here ---
--- ../hylafax/Makefile	Mon Mar 10 20:35:22 2003
+++ Makefile	Thu Jul  3 20:14:31 2003
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	hylafax
-PORTVERSION=	4.1.5
+PORTVERSION=	4.1.6
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tdv94ped@cs.umu.se
 COMMENT=	Fax software
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
+
 # no dependency on ghostscript because we don't know which
 # version the user prefers
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
@@ -28,15 +29,17 @@
 		--with-GCOPTS=" " --with-GCXXOPTS=" " \
 		--with-REGEX=no --with-LIBREGEX='' --with-REGEXINC=none \
 		--with-DIR_HTML="${LOCALBASE}/share/doc/hylafax"
+
 # Defaults to "North American Letter".  Use "ISO A4" for A4.
 .ifdef PAGESIZE
 CONFIGURE_ARGS+=--with-PAGESIZE="${PAGESIZE}"
 .endif
+
 .if defined(PACKAGE_BUILDING) || defined(BATCH)
 CONFIGURE_ARGS+=--nointeractive
 .endif
-MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
 
+MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
 
@@ -61,6 +64,9 @@
 
 post-extract:
 	${RM} -rf ${WRKSRC}/zlib ${WRKSRC}/regex
+
+pre-install:
+PLIST_SUB=	SPOOL="`${GREP} SPOOL ${WRKSRC}/defs | ${CUT} -c10-`"
 
 post-install:
 	${CHOWN} uucp ${SUID_EXES}
--- Makefile ends here ---



--- distinfo begins here ---
--- ../hylafax/distinfo	Sun Oct 27 20:01:09 2002
+++ distinfo	Thu Jun 26 16:28:16 2003
@@ -1,4 +1 @@
-MD5 (hylafax/hylafax-4.1.5.tar.gz) = 67135ae721f7a927e0f9a96644694617
-MD5 (hylafax/tiff-3.5-interfaces.patch) = c1d2847c9967a10961bb7fe123ecd8e6
-MD5 (hylafax/cvtDateTime.patch) = 57b2d1218e83504c85cf31c1e3746e4e
-MD5 (hylafax/rings-cid-passing.patch) = ade1d9adc9dd236e45176b7a0e3b5d78
+MD5 (hylafax/hylafax-4.1.6.tar.gz) = b58d453c202ed521f5e4dbe6cfb430b2
--- distinfo ends here ---



--- pkg-plist begins here ---
--- ../hylafax/pkg-plist	Thu Jan 16 11:07:14 2003
+++ pkg-plist	Thu Jul  3 20:11:45 2003
@@ -52,16 +52,18 @@
 sbin/typetest
 sbin/xferfaxstats
 @dirrm lib/fax
-@cwd /var/spool/hylafax
+@cwd %%SPOOL%%
 COPYRIGHT
 bin/archive
 bin/faxrcvd
 bin/mkcover
 bin/notify
 bin/notify.awk
+@unexec if [ -f %D/bin/pdf2fax ]; then rm %D/bin/pdf2fax; fi
 bin/pdf2fax.gs
 bin/pcl2fax
 bin/pollrcvd
+@unexec if [ -f %D/bin/ps2fax ]; then rm %D/bin/ps2fax; fi
 bin/ps2fax.dps
 bin/ps2fax.gs
 bin/ps2fax.imp
@@ -128,6 +130,7 @@
 config/zyxel-1496e-1
 config/zyxel-1496e-2.0
 config/zyxel-2864
+@unexec if [ -f %D/dev/null ]; then rm %D/dev/null; fi
 etc/cover.templ
 etc/dialrules
 etc/dialrules.europe
@@ -141,7 +144,7 @@
 @exec mkfifo %D/FIFO
 @exec chown uucp:dialer %D/FIFO
 @exec chmod 600 %D/FIFO
-@unexec rm %D/FIFO
+@unexec rm %D/FIFO*
 @exec mkdir %D/archive
 @exec chown uucp:dialer %D/archive
 @exec chmod 700 %D/archive
@@ -193,5 +196,5 @@
 @dirrm sendq
 @dirrm status
 @dirrm tmp
-@cwd /var/spool
-@dirrm hylafax
+@cwd /
+@dirrm %%SPOOL%%
--- pkg-plist ends here ---



--- hylafax.sh.sample begins here ---
--- ../hylafax/files/hylafax.sh.sample	Wed Jul  5 14:36:20 2000
+++ files/hylafax.sh.sample	Tue Jul  1 01:33:05 2003
@@ -7,12 +7,14 @@
 
 case "$1" in
 start)
-	if [ -x /usr/local/sbin/faxq ]; then 
-		/usr/local/sbin/faxq && echo -n ' hylafax' 
+	if [ -x /usr/local/sbin/hylafax ]; then 
+		/usr/local/sbin/hylafax start > /dev/null && echo -n ' hylafax' 
 	fi
 	;;
 stop)
-	killall faxq && echo -n ' hylafax'
+	if [ -x /usr/local/sbin/hylafax ]; then
+		/usr/local/sbin/hylafax stop > /dev/null && echo -n ' hylafax (stopped)'
+	fi
 	;;
 *)
 	echo "Usage: `basename $0` {start|stop}" >&2
--- hylafax.sh.sample ends here ---
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: osa 
State-Changed-When: Fri Jul 4 05:32:46 PDT 2003 
State-Changed-Why:  
Looks good for me. 
Any chance to use ${DOCSDIR} instead of 
${LOCALBASE}/share/doc/hylafax for --with-DIR_HTML key? 

Thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54070 

From: Paul Everlund <tdv94ped@cs.umu.se>
To: freebsd-gnats-submit@FreeBSD.org, tdv94ped@cs.umu.se
Cc:  
Subject: Re: ports/54070: [Update & Change-request] comms/hylafax 4.1.5 ->
 4.1.6
Date: Fri, 04 Jul 2003 14:53:37 +0200

 Thanks for pointing that out: DOCSDIR! Here's an updated Makefile-
 diff.
 
 --- ../hylafax/Makefile Mon Mar 10 20:35:22 2003
 +++ Makefile    Fri Jul  4 14:49:00 2003
 @@ -6,14 +6,15 @@
   #
 
   PORTNAME=      hylafax
 -PORTVERSION=   4.1.5
 +PORTVERSION=   4.1.6
   CATEGORIES=    comms
   MASTER_SITES=  ftp://ftp.hylafax.org/source/
 
 -MAINTAINER=    ports@FreeBSD.org
 +MAINTAINER=    tdv94ped@cs.umu.se
   COMMENT=       Fax software
 
   BUILD_DEPENDS= ${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
 +
   # no dependency on ghostscript because we don't know which
   # version the user prefers
   LIB_DEPENDS=   tiff.4:${PORTSDIR}/graphics/tiff \
 @@ -27,16 +28,18 @@
                  --with-TIFFINC="${LOCALBASE}/include" \
                  --with-GCOPTS=" " --with-GCXXOPTS=" " \
                  --with-REGEX=no --with-LIBREGEX='' --with-REGEXINC=none \
 -               --with-DIR_HTML="${LOCALBASE}/share/doc/hylafax"
 +               --with-DIR_HTML="${DOCSDIR}"
 +
   # Defaults to "North American Letter".  Use "ISO A4" for A4.
   .ifdef PAGESIZE
   CONFIGURE_ARGS+=--with-PAGESIZE="${PAGESIZE}"
   .endif
 +
   .if defined(PACKAGE_BUILDING) || defined(BATCH)
   CONFIGURE_ARGS+=--nointeractive
   .endif
 -MAKE_ARGS+=    OPTIMIZER="" -EOPTIMIZER
 
 +MAKE_ARGS+=    OPTIMIZER="" -EOPTIMIZER
   HAS_CONFIGURE= yes
   CONFIGURE_ENV= ENVOPTS="${CFLAGS}"
 
 @@ -61,6 +64,9 @@
 
   post-extract:
          ${RM} -rf ${WRKSRC}/zlib ${WRKSRC}/regex
 +
 +pre-install:
 +PLIST_SUB=     SPOOL="`${GREP} SPOOL ${WRKSRC}/defs | ${CUT} -c10-`"
 
   post-install:
          ${CHOWN} uucp ${SUID_EXES}
 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: osa 
State-Changed-When: Fri Jul 4 06:14:04 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54070 
>Unformatted:
