ports/135363: [PATCH] update ftwin

[Bapt]

>Number:         135363
>Category:       ports
>Synopsis:       [PATCH] update ftwin
>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:   Mon Jun 08 09:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Bapt
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD wicklow.lan 8.0-CURRENT FreeBSD 8.0-CURRENT #10: Fri May 22 13:46:33 CEST 2009 root at wicklow.lan:/usr/obj/usr/src/sys/WICKLOW i386


	
>Description:
	Update ftwin to 0.8.5 version, fix detection of libarchive on -current and remove useless CONFIGURE_ARGS
>How-To-Repeat:
	
>Fix:

	

--- ftwin-0.8.5.patch begins here ---
diff -Nrau ftwin.orig/Makefile ftwin/Makefile
--- ftwin.orig/Makefile	2009-05-25 14:57:57.000000000 +0200
+++ ftwin/Makefile	2009-06-08 11:06:56.473742549 +0200
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ftwin
-PORTVERSION=	0.8.3
+PORTVERSION=	0.8.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.meroware.org/ftwin/
 
@@ -20,7 +20,7 @@
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:262 aclocal:110 automake:110 autoheader:262
-CONFIGURE_ARGS+=	--with-check=${LOCALBASE} --with-puzzle=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-puzzle=${LOCALBASE}
 PLIST_FILES=	bin/ftwin
 
 MAKE_JOBS_SAFE=	yes
diff -Nrau ftwin.orig/distinfo ftwin/distinfo
--- ftwin.orig/distinfo	2009-05-25 14:57:57.000000000 +0200
+++ ftwin/distinfo	2009-06-08 10:37:38.872161647 +0200
@@ -1,3 +1,3 @@
-MD5 (ftwin-0.8.3.tar.bz2) = dae682c8f4805f7c25935bf422fc1893
-SHA256 (ftwin-0.8.3.tar.bz2) = b2ed0685f1dcd620de306a29b7529bf66185a193ae4df426e4b77c740b4e92bd
-SIZE (ftwin-0.8.3.tar.bz2) = 164160
+MD5 (ftwin-0.8.5.tar.bz2) = 01a3c91156c8f6fc2a116c426f0af25e
+SHA256 (ftwin-0.8.5.tar.bz2) = 03dec36503b3c781f287b4427e99d9d1ccc704f1d9e11eadcd630e4c29dea0ce
+SIZE (ftwin-0.8.5.tar.bz2) = 164234
diff -Nrau ftwin.orig/files/patch-acinclude-check-cflags-ldflags ftwin/files/patch-acinclude-check-cflags-ldflags
--- ftwin.orig/files/patch-acinclude-check-cflags-ldflags	2007-12-18 17:00:00.000000000 +0100
+++ ftwin/files/patch-acinclude-check-cflags-ldflags	2009-06-08 11:05:07.993588895 +0200
@@ -1,5 +1,5 @@
---- acinclude.m4.orig	2007-12-07 23:19:51.000000000 +0100
-+++ acinclude.m4	2007-12-18 14:29:44.000000000 +0100
+--- ./acinclude.m4.orig	2008-11-03 18:03:37.000000000 +0100
++++ ./acinclude.m4	2009-06-08 11:04:57.456599653 +0200
 @@ -141,8 +141,8 @@
      ])
  
@@ -23,7 +23,7 @@
  		AC_CHECK_LIB(puzzle, puzzle_init_context,
  		    [
  		     AC_DEFINE([HAVE_PUZZLE], 1, [for image comparison mode])
-@@ -216,9 +218,11 @@
+@@ -216,16 +218,18 @@
  	    # Make sure we have "archive.h".  If we don't, it means we probably
  	    # don't have libarchive, so don't use it.
  	    #
@@ -31,7 +31,15 @@
  	    AC_CHECK_HEADER(archive.h,
  		[
  		# Check if the lib is OK
-+		LDFLAGS="$LDFLAGS -L$archive/lib"
++		LDFLAGS="$LDFLAGS -L$archive/lib -lmd -lcrypto"
  		AC_CHECK_LIB(archive, archive_version,
  		    [
  		     AC_DEFINE([HAVE_ARCHIVE], 1, [for inside archive comparison mode])
+ 		     with_archive=yes
+ 		     ARCHIVE_CPPFLAGS="-I$archive/include"
+ 		     ARCHIVE_LDFLAGS="-L$archive/lib"
+-		     ARCHIVE_LDADD="-larchive"
++		     ARCHIVE_LDADD="-larchive -lmd -lcrypto"
+ 		    ],
+ 		    [
+ 		     with_archive=no
--- ftwin-0.8.5.patch ends here ---


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