ports/68654: [patch] Small update to make HamFax compile under 4.x

[Carl Makin]

>Number:         68654
>Category:       ports
>Synopsis:       [patch] Small update to make HamFax compile under 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 04 13:10:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Carl Makin
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD bumper.stagecraft.cx 4.10-STABLE FreeBSD 4.10-STABLE #16: Thu Jun 24 18:37:48 EST 2004 carl at bumper.stagecraft.cx:/usr/obj/usr/src/sys/BUMPER i386


	
>Description:

The patch to Makefile and complete changed patch below let HamFax detect and compile
under 4.x.
	
>How-To-Repeat:
	
>Fix:

Patch to Makefile
--- Makefile.orig	Sun Jul  4 22:58:37 2004
+++ Makefile	Sun Jul  4 22:58:24 2004
@@ -6,7 +6,7 @@
 
 PORTNAME=	hamfax
 PORTVERSION=	0.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	hamfax
@@ -26,10 +26,4 @@
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		"Configure fails on 4.x"
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


Please replace "files/patch-configure" with this file below.
--- configure.orig	Fri Jan 31 08:25:15 2003
+++ configure	Sun Jul  4 22:14:15 2004
@@ -3714,7 +3714,7 @@
         bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt* | sed -n 1p |
                      sed s@$bnv_qt_lib_dir/lib@@ | sed s@[.].*@@`"
       fi
-      bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+      bnv_qt_LIBS="-pthread -L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS -lcipher"
     else
       # Use cached value or do search, starting with suggestions from
       # the command line
@@ -4172,7 +4172,7 @@
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-            bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out`
+            bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out | grep -vi warning:`
             if test x"$bnv_err_4" != x; then
               echo "$bnv_err_4" >&5
             else


Thanks!


Carl.

>Release-Note:
>Audit-Trail:
>Unformatted: